diff --git a/src/views/sponeScreen/evaluationKH/index.vue b/src/views/sponeScreen/evaluationKH/index.vue index 46b8884..ff0c08f 100644 --- a/src/views/sponeScreen/evaluationKH/index.vue +++ b/src/views/sponeScreen/evaluationKH/index.vue @@ -26,6 +26,7 @@ 2022 2023 2024 + 考核结果 @@ -37,6 +38,11 @@ + + + + + @@ -50,6 +56,7 @@ import heiChouShuiTi from './heiChouShuiTi'; //黑臭水体 import xiangMuJianShe from './xiangMuJianShe'; //项目建设完成情况 import ziJinJiXiao from './ziJinJiXiao'; //资金绩效评价 +import ExamineKH from '@/views/spongePerformance/mainIndex/index.vue'; import bus from '@/bus'; import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js'; @@ -58,6 +65,7 @@ const currentYear = ref(2023); const dialogVisible = ref(false); const pageParams = ref({}); +const dialogResult = ref(false); // 年份切换 function changeYear(year) { @@ -146,7 +154,7 @@ } .yearBox { position: fixed; - left: 480px; + left: 490px; bottom: 40px; z-index: 99; width: 80px; diff --git a/src/views/sponeScreen/evaluationKH/index.vue b/src/views/sponeScreen/evaluationKH/index.vue index 46b8884..ff0c08f 100644 --- a/src/views/sponeScreen/evaluationKH/index.vue +++ b/src/views/sponeScreen/evaluationKH/index.vue @@ -26,6 +26,7 @@ 2022 2023 2024 + 考核结果 @@ -37,6 +38,11 @@ + + + + + @@ -50,6 +56,7 @@ import heiChouShuiTi from './heiChouShuiTi'; //黑臭水体 import xiangMuJianShe from './xiangMuJianShe'; //项目建设完成情况 import ziJinJiXiao from './ziJinJiXiao'; //资金绩效评价 +import ExamineKH from '@/views/spongePerformance/mainIndex/index.vue'; import bus from '@/bus'; import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js'; @@ -58,6 +65,7 @@ const currentYear = ref(2023); const dialogVisible = ref(false); const pageParams = ref({}); +const dialogResult = ref(false); // 年份切换 function changeYear(year) { @@ -146,7 +154,7 @@ } .yearBox { position: fixed; - left: 480px; + left: 490px; bottom: 40px; z-index: 99; width: 80px; diff --git a/src/views/spongePerformance/longTerm/examinemanage/index.vue b/src/views/spongePerformance/longTerm/examinemanage/index.vue index dfecdc7..567327d 100644 --- a/src/views/spongePerformance/longTerm/examinemanage/index.vue +++ b/src/views/spongePerformance/longTerm/examinemanage/index.vue @@ -71,7 +71,6 @@