diff --git a/src/routers/index.ts b/src/routers/index.ts index 3c02b83..d4d7c05 100644 --- a/src/routers/index.ts +++ b/src/routers/index.ts @@ -53,6 +53,8 @@ router.beforeEach(async (to, from, next) => { if (to.path === LOGIN_URL) { if (globalStore.token) return next(from.fullPath); resetRouter(); + // globalStore.resetStore(); + // globalStore.$reset(); return next(); } diff --git a/src/views/enterprise/unmannedVideo/equipList/index.vue b/src/views/enterprise/unmannedVideo/equipList/index.vue index 56e373d..ccfa912 100644 --- a/src/views/enterprise/unmannedVideo/equipList/index.vue +++ b/src/views/enterprise/unmannedVideo/equipList/index.vue @@ -375,7 +375,7 @@ onMounted(async () => { .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; .video { display: flex; align-items: center; diff --git a/src/views/enterprise/unmannedVideo/videoData/index.scss b/src/views/enterprise/unmannedVideo/videoData/index.scss index 00f3fcb..b7e7144 100644 --- a/src/views/enterprise/unmannedVideo/videoData/index.scss +++ b/src/views/enterprise/unmannedVideo/videoData/index.scss @@ -30,7 +30,7 @@ .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; .video { display: flex; align-items: center; diff --git a/src/views/goverment/huizhou/assessmentManagement/unitList/components/addCompany.vue b/src/views/goverment/huizhou/assessmentManagement/unitList/components/addCompany.vue index fbd8d62..6eb57f1 100644 --- a/src/views/goverment/huizhou/assessmentManagement/unitList/components/addCompany.vue +++ b/src/views/goverment/huizhou/assessmentManagement/unitList/components/addCompany.vue @@ -68,7 +68,7 @@ - + - + - - + + (undefined); // 表格配置项 const columns: ColumnProps[] = [ { type: "index", label: "序号", width: 80 }, - // 多级 prop - { prop: "projectName", label: "项目名称" }, + // 多级 prop{ prop: "projectName", label: "项目名称" }, + { prop: "name", label: "申报时段名称", search: { el: "input" } }, { prop: "applyTime", label: "申报日期" }, { diff --git a/src/views/goverment/huizhou/progressManagement/projectSchedule/index.scss b/src/views/goverment/huizhou/progressManagement/projectSchedule/index.scss index e747367..9f7ae30 100644 --- a/src/views/goverment/huizhou/progressManagement/projectSchedule/index.scss +++ b/src/views/goverment/huizhou/progressManagement/projectSchedule/index.scss @@ -29,7 +29,7 @@ .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; .video { display: flex; align-items: center; diff --git a/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.scss b/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.scss index 1fe3fc9..83ad0e1 100644 --- a/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.scss +++ b/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.scss @@ -36,7 +36,7 @@ .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; overflow: hidden; .middleSize { font-size: 18px; diff --git a/src/views/goverment/huizhou/projectMonitoring/qualityControl/index.scss b/src/views/goverment/huizhou/projectMonitoring/qualityControl/index.scss index face3b8..ffa6a6e 100644 --- a/src/views/goverment/huizhou/projectMonitoring/qualityControl/index.scss +++ b/src/views/goverment/huizhou/projectMonitoring/qualityControl/index.scss @@ -35,7 +35,7 @@ .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; overflow: hidden; .middleSize { font-size: 18px; diff --git a/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.scss b/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.scss index face3b8..ffa6a6e 100644 --- a/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.scss +++ b/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.scss @@ -35,7 +35,7 @@ .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; overflow: hidden; .middleSize { font-size: 18px; diff --git a/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.scss b/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.scss index 011becd..a1f5dcf 100644 --- a/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.scss +++ b/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.scss @@ -34,7 +34,7 @@ .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; overflow: hidden; .video { display: flex; diff --git a/src/views/goverment/huizhou/siteSupervision/historyDataAnalysis/index.scss b/src/views/goverment/huizhou/siteSupervision/historyDataAnalysis/index.scss index 6b0c56a..fbaba50 100644 --- a/src/views/goverment/huizhou/siteSupervision/historyDataAnalysis/index.scss +++ b/src/views/goverment/huizhou/siteSupervision/historyDataAnalysis/index.scss @@ -34,7 +34,7 @@ .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; overflow: hidden; .video { display: flex; diff --git a/src/views/goverment/huizhou/siteSupervision/monitorManagement/index.vue b/src/views/goverment/huizhou/siteSupervision/monitorManagement/index.vue index ba2d618..7d87428 100644 --- a/src/views/goverment/huizhou/siteSupervision/monitorManagement/index.vue +++ b/src/views/goverment/huizhou/siteSupervision/monitorManagement/index.vue @@ -375,7 +375,7 @@ onMounted(async () => { .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; overflow: hidden; .video { display: flex; diff --git a/src/views/goverment/huizhou/smartConstructionSite/index.scss b/src/views/goverment/huizhou/smartConstructionSite/index.scss index dba26ed..1940bfd 100644 --- a/src/views/goverment/huizhou/smartConstructionSite/index.scss +++ b/src/views/goverment/huizhou/smartConstructionSite/index.scss @@ -280,7 +280,7 @@ .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; overflow: hidden; .middleSize { display: inline-block; diff --git a/src/views/goverment/huizhou/warnManagement/index.scss b/src/views/goverment/huizhou/warnManagement/index.scss index 7b06713..4bf3903 100644 --- a/src/views/goverment/huizhou/warnManagement/index.scss +++ b/src/views/goverment/huizhou/warnManagement/index.scss @@ -31,7 +31,7 @@ .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; overflow: hidden; .middleSize { display: inline-block; diff --git a/src/views/hz-enterprise/localeMonitor/attendanceStatistics/index.vue b/src/views/hz-enterprise/localeMonitor/attendanceStatistics/index.vue index 9bea7cd..67aaa4e 100644 --- a/src/views/hz-enterprise/localeMonitor/attendanceStatistics/index.vue +++ b/src/views/hz-enterprise/localeMonitor/attendanceStatistics/index.vue @@ -538,7 +538,7 @@ onMounted(async () => { .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; overflow: hidden; .video { display: flex; diff --git a/src/views/hz-enterprise/localeMonitor/realTime/index.vue b/src/views/hz-enterprise/localeMonitor/realTime/index.vue index f4555df..0657a1a 100644 --- a/src/views/hz-enterprise/localeMonitor/realTime/index.vue +++ b/src/views/hz-enterprise/localeMonitor/realTime/index.vue @@ -260,7 +260,7 @@ onMounted(async () => { .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; overflow: hidden; .video { display: flex; diff --git a/src/views/hz-enterprise/progressManagement/ganttChart/index.vue b/src/views/hz-enterprise/progressManagement/ganttChart/index.vue index fe19392..be3e3aa 100644 --- a/src/views/hz-enterprise/progressManagement/ganttChart/index.vue +++ b/src/views/hz-enterprise/progressManagement/ganttChart/index.vue @@ -544,7 +544,7 @@ const dateList = computed(() => { .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; overflow: hidden; .middleSize { display: inline-block; diff --git a/src/views/hz-enterprise/progressManagement/globalPlanManagement/index.vue b/src/views/hz-enterprise/progressManagement/globalPlanManagement/index.vue index 64ebb08..3189277 100644 --- a/src/views/hz-enterprise/progressManagement/globalPlanManagement/index.vue +++ b/src/views/hz-enterprise/progressManagement/globalPlanManagement/index.vue @@ -578,7 +578,7 @@ onMounted(async () => { .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; overflow: hidden; .video { display: flex; diff --git a/src/views/hz-enterprise/progressManagement/payManagement/index.vue b/src/views/hz-enterprise/progressManagement/payManagement/index.vue index 58f9158..25ba3bf 100644 --- a/src/views/hz-enterprise/progressManagement/payManagement/index.vue +++ b/src/views/hz-enterprise/progressManagement/payManagement/index.vue @@ -308,7 +308,7 @@ onMounted(async () => { .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; overflow: hidden; .video { display: flex; diff --git a/src/views/hz-enterprise/progressManagement/planFinishSituation/index.vue b/src/views/hz-enterprise/progressManagement/planFinishSituation/index.vue index 41bdafd..b89a578 100644 --- a/src/views/hz-enterprise/progressManagement/planFinishSituation/index.vue +++ b/src/views/hz-enterprise/progressManagement/planFinishSituation/index.vue @@ -334,7 +334,7 @@ onMounted(async () => { .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; overflow: hidden; .video { display: flex; diff --git a/src/views/hz-enterprise/progressManagement/subItemManagement/index.vue b/src/views/hz-enterprise/progressManagement/subItemManagement/index.vue index f9174a9..72fb75f 100644 --- a/src/views/hz-enterprise/progressManagement/subItemManagement/index.vue +++ b/src/views/hz-enterprise/progressManagement/subItemManagement/index.vue @@ -569,7 +569,7 @@ onMounted(async () => { .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; overflow: hidden; .middleSize { display: inline-block; diff --git a/src/views/hz-enterprise/projectMonitor/progressManagement/index.vue b/src/views/hz-enterprise/projectMonitor/progressManagement/index.vue index 8b6e605..334d083 100644 --- a/src/views/hz-enterprise/projectMonitor/progressManagement/index.vue +++ b/src/views/hz-enterprise/projectMonitor/progressManagement/index.vue @@ -310,7 +310,7 @@ onMounted(async () => { .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; overflow: hidden; .video { display: flex; diff --git a/src/views/hz-enterprise/projectMonitor/projectApproval/index.vue b/src/views/hz-enterprise/projectMonitor/projectApproval/index.vue index 5a4deef..e71c08d 100644 --- a/src/views/hz-enterprise/projectMonitor/projectApproval/index.vue +++ b/src/views/hz-enterprise/projectMonitor/projectApproval/index.vue @@ -267,7 +267,7 @@ onMounted(async () => { .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; overflow: hidden; .video { display: flex; diff --git a/src/views/hz-enterprise/projectMonitor/qualityManagement/index.vue b/src/views/hz-enterprise/projectMonitor/qualityManagement/index.vue index 1df82fd..df0177f 100644 --- a/src/views/hz-enterprise/projectMonitor/qualityManagement/index.vue +++ b/src/views/hz-enterprise/projectMonitor/qualityManagement/index.vue @@ -294,7 +294,7 @@ onMounted(async () => { .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; overflow: hidden; .video { display: flex; diff --git a/src/views/hz-enterprise/projectMonitor/safetyManagement/index.vue b/src/views/hz-enterprise/projectMonitor/safetyManagement/index.vue index e6ae5d9..b07fb4f 100644 --- a/src/views/hz-enterprise/projectMonitor/safetyManagement/index.vue +++ b/src/views/hz-enterprise/projectMonitor/safetyManagement/index.vue @@ -291,7 +291,7 @@ onMounted(async () => { .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; overflow: hidden; .video { display: flex; diff --git a/src/views/hz-enterprise/smartSite/alarmLedger/index.vue b/src/views/hz-enterprise/smartSite/alarmLedger/index.vue index ddb89cc..b59390c 100644 --- a/src/views/hz-enterprise/smartSite/alarmLedger/index.vue +++ b/src/views/hz-enterprise/smartSite/alarmLedger/index.vue @@ -405,7 +405,7 @@ onMounted(async () => { .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; overflow: hidden; .video { display: flex; diff --git a/src/views/hz-enterprise/smartSite/dustManagement/index.vue b/src/views/hz-enterprise/smartSite/dustManagement/index.vue index 7b68e7c..b2619c2 100644 --- a/src/views/hz-enterprise/smartSite/dustManagement/index.vue +++ b/src/views/hz-enterprise/smartSite/dustManagement/index.vue @@ -377,7 +377,7 @@ onBeforeMount(async () => { .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; overflow: hidden; .video { display: flex; diff --git a/src/views/hz-enterprise/smartSite/realTime/index.vue b/src/views/hz-enterprise/smartSite/realTime/index.vue index 91e784c..1bdc3a6 100644 --- a/src/views/hz-enterprise/smartSite/realTime/index.vue +++ b/src/views/hz-enterprise/smartSite/realTime/index.vue @@ -255,7 +255,7 @@ onMounted(async () => { .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; overflow: hidden; .video { display: flex; diff --git a/src/views/hz-enterprise/smartSite/unmannedVideo/videoData/index.scss b/src/views/hz-enterprise/smartSite/unmannedVideo/videoData/index.scss index 981cde2..da34f8b 100644 --- a/src/views/hz-enterprise/smartSite/unmannedVideo/videoData/index.scss +++ b/src/views/hz-enterprise/smartSite/unmannedVideo/videoData/index.scss @@ -37,7 +37,7 @@ .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; overflow: hidden; .video { display: flex; diff --git a/src/views/hz-project/progressManagement/ganttChart/index.vue b/src/views/hz-project/progressManagement/ganttChart/index.vue index b8b712e..61b3a1d 100644 --- a/src/views/hz-project/progressManagement/ganttChart/index.vue +++ b/src/views/hz-project/progressManagement/ganttChart/index.vue @@ -458,7 +458,7 @@ const dateList = computed(() => { .leftMenu_item { display: flex; justify-content: space-between; - margin-top: 10px; + margin-top: 5px; overflow: hidden; .middleSize { display: inline-block; diff --git a/src/views/login/CompanyLogon/basic-form.vue b/src/views/login/CompanyLogon/basic-form.vue index 9710612..190c54c 100644 --- a/src/views/login/CompanyLogon/basic-form.vue +++ b/src/views/login/CompanyLogon/basic-form.vue @@ -58,8 +58,8 @@ - - + +