fix: BUG修改
This commit is contained in:
parent
9a1d6e05ed
commit
547c8549d3
@ -53,6 +53,8 @@ router.beforeEach(async (to, from, next) => {
|
|||||||
if (to.path === LOGIN_URL) {
|
if (to.path === LOGIN_URL) {
|
||||||
if (globalStore.token) return next(from.fullPath);
|
if (globalStore.token) return next(from.fullPath);
|
||||||
resetRouter();
|
resetRouter();
|
||||||
|
// globalStore.resetStore();
|
||||||
|
// globalStore.$reset();
|
||||||
return next();
|
return next();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -375,7 +375,7 @@ onMounted(async () => {
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
.video {
|
.video {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|||||||
@ -30,7 +30,7 @@
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
.video {
|
.video {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|||||||
@ -68,7 +68,7 @@
|
|||||||
<el-row :gutter="120">
|
<el-row :gutter="120">
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="建设单位:" prop="governmentSn">
|
<el-form-item label="建设单位:" prop="governmentSn">
|
||||||
<el-select style="width: 100%" v-model="ruleForm.governmentSn" placeholder="请选择所属住建局">
|
<el-select style="width: 100%" v-model="ruleForm.governmentSn" placeholder="请选择建设单位">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in governNameList"
|
v-for="item in governNameList"
|
||||||
:key="item.governmentSn"
|
:key="item.governmentSn"
|
||||||
|
|||||||
@ -68,7 +68,7 @@
|
|||||||
<el-row :gutter="120">
|
<el-row :gutter="120">
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="建设单位:" prop="governmentSn">
|
<el-form-item label="建设单位:" prop="governmentSn">
|
||||||
<el-select style="width: 100%" v-model="ruleForm.governmentSn" placeholder="请选择所属住建局">
|
<el-select style="width: 100%" v-model="ruleForm.governmentSn" placeholder="请选择建设单位">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in governNameList"
|
v-for="item in governNameList"
|
||||||
:key="item.governmentSn"
|
:key="item.governmentSn"
|
||||||
|
|||||||
@ -36,7 +36,7 @@
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
.video {
|
.video {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|||||||
@ -60,8 +60,8 @@
|
|||||||
</el-row>
|
</el-row>
|
||||||
<el-row :gutter="120">
|
<el-row :gutter="120">
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="所属住建局:" prop="governmentSn">
|
<el-form-item label="所属单位:" prop="governmentSn">
|
||||||
<el-select style="width: 100%" v-model="ruleForm.governmentSn" placeholder="请选择所属住建局">
|
<el-select style="width: 100%" v-model="ruleForm.governmentSn" placeholder="请选择所属单位">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in governNameList"
|
v-for="item in governNameList"
|
||||||
:key="item.governmentSn"
|
:key="item.governmentSn"
|
||||||
|
|||||||
@ -581,7 +581,7 @@ watch(
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.middleSize {
|
.middleSize {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
|||||||
@ -640,7 +640,7 @@ watch(
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.middleSize {
|
.middleSize {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
|||||||
@ -35,7 +35,7 @@
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.middleSize {
|
.middleSize {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
|||||||
@ -36,7 +36,7 @@
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.middleSize {
|
.middleSize {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
|||||||
@ -36,7 +36,7 @@
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.middleSize {
|
.middleSize {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
|||||||
@ -37,7 +37,7 @@
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.middleSize {
|
.middleSize {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
|||||||
@ -36,7 +36,7 @@
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.middleSize {
|
.middleSize {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
|||||||
@ -183,8 +183,8 @@ const getId = ref<number | undefined>(undefined);
|
|||||||
// 表格配置项
|
// 表格配置项
|
||||||
const columns: ColumnProps[] = [
|
const columns: ColumnProps[] = [
|
||||||
{ type: "index", label: "序号", width: 80 },
|
{ type: "index", label: "序号", width: 80 },
|
||||||
// 多级 prop
|
// 多级 prop{ prop: "projectName", label: "项目名称" },
|
||||||
{ prop: "projectName", label: "项目名称" },
|
|
||||||
{ prop: "name", label: "申报时段名称", search: { el: "input" } },
|
{ prop: "name", label: "申报时段名称", search: { el: "input" } },
|
||||||
{ prop: "applyTime", label: "申报日期" },
|
{ prop: "applyTime", label: "申报日期" },
|
||||||
{
|
{
|
||||||
|
|||||||
@ -29,7 +29,7 @@
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
.video {
|
.video {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|||||||
@ -36,7 +36,7 @@
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.middleSize {
|
.middleSize {
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
|
|||||||
@ -35,7 +35,7 @@
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.middleSize {
|
.middleSize {
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
|
|||||||
@ -35,7 +35,7 @@
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.middleSize {
|
.middleSize {
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
|
|||||||
@ -34,7 +34,7 @@
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.video {
|
.video {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@ -34,7 +34,7 @@
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.video {
|
.video {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@ -375,7 +375,7 @@ onMounted(async () => {
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.video {
|
.video {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@ -280,7 +280,7 @@
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.middleSize {
|
.middleSize {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
|||||||
@ -31,7 +31,7 @@
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.middleSize {
|
.middleSize {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
|||||||
@ -538,7 +538,7 @@ onMounted(async () => {
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.video {
|
.video {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@ -260,7 +260,7 @@ onMounted(async () => {
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.video {
|
.video {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@ -544,7 +544,7 @@ const dateList = computed(() => {
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.middleSize {
|
.middleSize {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
|||||||
@ -578,7 +578,7 @@ onMounted(async () => {
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.video {
|
.video {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@ -308,7 +308,7 @@ onMounted(async () => {
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.video {
|
.video {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@ -334,7 +334,7 @@ onMounted(async () => {
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.video {
|
.video {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@ -569,7 +569,7 @@ onMounted(async () => {
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.middleSize {
|
.middleSize {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
|||||||
@ -310,7 +310,7 @@ onMounted(async () => {
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.video {
|
.video {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@ -267,7 +267,7 @@ onMounted(async () => {
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.video {
|
.video {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@ -294,7 +294,7 @@ onMounted(async () => {
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.video {
|
.video {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@ -291,7 +291,7 @@ onMounted(async () => {
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.video {
|
.video {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@ -405,7 +405,7 @@ onMounted(async () => {
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.video {
|
.video {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@ -377,7 +377,7 @@ onBeforeMount(async () => {
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.video {
|
.video {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@ -255,7 +255,7 @@ onMounted(async () => {
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.video {
|
.video {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@ -37,7 +37,7 @@
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.video {
|
.video {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@ -458,7 +458,7 @@ const dateList = computed(() => {
|
|||||||
.leftMenu_item {
|
.leftMenu_item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 10px;
|
margin-top: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.middleSize {
|
.middleSize {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
|||||||
@ -58,8 +58,8 @@
|
|||||||
</el-row>
|
</el-row>
|
||||||
<el-row :gutter="120">
|
<el-row :gutter="120">
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="所属住建局:" prop="governmentSn">
|
<el-form-item label="所属单位:" prop="governmentSn">
|
||||||
<el-select style="width: 100%" v-model="ruleForm.governmentSn" placeholder="请选择所属住建局">
|
<el-select style="width: 100%" v-model="ruleForm.governmentSn" placeholder="请选择所属单位">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in governNameList"
|
v-for="item in governNameList"
|
||||||
:key="item.governmentSn"
|
:key="item.governmentSn"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user