diff --git a/jwtech-admin-page/src/assets/image/SMap.png b/jwtech-admin-page/src/assets/image/SMap.png new file mode 100644 index 00000000..eb8accee Binary files /dev/null and b/jwtech-admin-page/src/assets/image/SMap.png differ diff --git a/jwtech-admin-page/src/assets/image/shengMap.png b/jwtech-admin-page/src/assets/image/shengMap.png new file mode 100644 index 00000000..8307c878 Binary files /dev/null and b/jwtech-admin-page/src/assets/image/shengMap.png differ diff --git a/jwtech-admin-page/src/layout/components/Sidebar/index.vue b/jwtech-admin-page/src/layout/components/Sidebar/index.vue index 9c92c4f0..29d94db8 100644 --- a/jwtech-admin-page/src/layout/components/Sidebar/index.vue +++ b/jwtech-admin-page/src/layout/components/Sidebar/index.vue @@ -46,12 +46,52 @@ export default { ...mapGetters(["permission_routes", "sidebar"]), activeMenu() { const route = this.$route; - const { meta, path } = route; + const { meta, path, query } = route; // if set path, the sidebar will highlight the path you set + // console.log(66666, meta, path, route); + let newPath = path; + if (path.includes("/project/special/")) { + newPath = "/project/special"; + } else if (path.includes("/project/plan/")) { + newPath = "/project/plan"; + } else if (path.includes("/project/bid/")) { + newPath = "/project/bid"; + } else if (path.includes("/building/projectInfo/")) { + newPath = "/building/projectInfo"; + } else if ( + path.includes("/evaluationEarlyWarning/earlyWarningManage/warning/") + ) { + newPath = "/evaluationEarlyWarning/earlyWarningManage/warning"; + } else if (path.includes("/evaluationEarlyWarning/projectBrief/")) { + newPath = "/evaluationEarlyWarning/projectBrief"; + } else if (path.includes("/marketSupervision/enterpriseInformation/")) { + newPath = "/marketSupervision/enterpriseInformation"; + } else if ( + path.includes("/projectStatistics/projectProcess") && + !query.activeName + ) { + newPath = "/projectStatistics/projectStatisticsSort"; + } else if ( + path.includes("/projectStatistics/projectProcess") && + query.activeName == "investment" + ) { + newPath = "/projectStatistics/projectStatisticsInvest"; + } else if ( + path.includes("/projectStatistics/projectProcess") && + query.activeName == "scheduleManagement" + ) { + newPath = "/projectStatistics/projectStatisticsProgress"; + } else if ( + path.includes("/projectStatistics/projectProcess") && + query.activeName == "projectAcceptance" + ) { + newPath = "/projectStatistics/projectStatisticsMsg"; + } + if (meta.activeMenu) { return meta.activeMenu; } - return path; + return newPath; }, showLogo() { return this.$store.state.settings.sidebarLogo; diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectAcceptance.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectAcceptance.vue index 9be8ee1f..2d6fe716 100644 --- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectAcceptance.vue +++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectAcceptance.vue @@ -1373,7 +1373,6 @@ export default { this.form.acceptancePersonnel = this.dynamicTags2.length ? JSON.stringify(this.dynamicTags2) : null; - this.form.acceptanceDecisionLetter = this.fileList1.length ? JSON.stringify(this.fileList1) : null; diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/engineeringQualityInspection.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/engineeringQualityInspection.vue index 37869132..475a9797 100644 --- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/engineeringQualityInspection.vue +++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/engineeringQualityInspection.vue @@ -237,7 +237,7 @@ - +