Ver Fonte

今日提出优化问题修改:
1、menucard一定要hover事件。并添加阻止click冒泡事件。
2、同屏对比 -- 默认勾选并显示当前底图,去掉确定按钮,直接打印。
3、Header第一个icon 直接进入我的任务。
4、首页水资源栏改成条和数量(已完成)。

DESKTOP-6LTVLN7\Liumouren há 2 anos atrás
pai
commit
cf1675aa54

+ 1 - 11
src/components/common/BottomForm/CreateTaskForm.vue

@@ -242,12 +242,6 @@ export default {
     this.$bus.$on("sqrw", () => {
       this.changeShowBottomMenusStatus();
     });
-    // 点击底部菜单SVG,且有弹窗打开时触发(弹窗关闭询问)
-    this.$bus.$on("handleClose", () => {
-      if (this.dialogVisible) {
-        this.handleClose();
-      }
-    });
   },
   destroy() {
     // 当容器销毁时,需要停止监听该事件
@@ -257,13 +251,9 @@ export default {
   methods: {
     // 当用户点击svg底座时,切换底部菜单显示隐藏状态。
     changeShowBottomMenusStatus() {
-      if (this.dialogVisible) {
-        this.handleClose();
-      } else {
         // 打开弹窗
-        this.dialogVisible = !this.dialogVisible;
+        this.dialogVisible = true;
         this.$emit("changeShowBottomMenusStatus", false);
-      }
     },
     // 弹窗关闭询问
     handleClose() {

+ 0 - 6
src/components/common/BottomForm/CustomModelDialog.vue

@@ -80,12 +80,6 @@ export default {
     this.$bus.$on("customModelEvent", () => {
       this.customModelEvent();
     });
-    // 点击底部菜单SVG,且有弹窗打开时触发(弹窗关闭询问)
-    // this.$bus.$on("handleClose", () => {
-    //   if (this.dialogVisible) {
-    //     this.handleClose();
-    //   }
-    // });
 
     // 监听模型修改事件
     this.$bus.$on("updateModel", (node) => {

+ 50 - 93
src/components/common/BottomForm/MyMission.vue

@@ -16,47 +16,20 @@
     </template>
     <el-form :inline="true" ref="myTaskForm" :model="formInline">
       <el-form-item label="任务类型">
-        <el-select
-          size="mini"
-          v-model="formInline.taskType"
-          placeholder="任务类型"
-        >
-          <el-option-group
-            v-for="group in taskTypeOptions"
-            :key="group.label"
-            :label="group.label"
-          >
-            <el-option
-              v-for="item in group.options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
+        <el-select size="mini" v-model="formInline.taskType" placeholder="任务类型">
+          <el-option-group v-for="group in taskTypeOptions" :key="group.label" :label="group.label">
+            <el-option v-for="item in group.options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
           </el-option-group>
         </el-select>
       </el-form-item>
       <el-form-item label="关联项目">
-        <el-select
-          size="mini"
-          v-model="formInline.associatedItems"
-          placeholder="关联项目"
-        >
-          <el-option
-            v-for="item in associatedItemsOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
+        <el-select size="mini" v-model="formInline.associatedItems" placeholder="关联项目">
+          <el-option v-for="item in associatedItemsOptions" :key="item.value" :label="item.label" :value="item.value">
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="审计状态">
-        <el-select
-          size="mini"
-          v-model="formInline.auditStatus"
-          placeholder="审计状态"
-        >
+        <el-select size="mini" v-model="formInline.auditStatus" placeholder="审计状态">
           <el-option label="已审核" value="ReviewedAndApproved"></el-option>
           <el-option label="未审核" value="NotReviewed"></el-option>
         </el-select>
@@ -66,24 +39,14 @@
         <el-button @click="resetForm()">重置</el-button>
       </el-form-item>
     </el-form>
-    <el-table
-      :data="tableData"
-      style="width: 100%"
-      height="calc(80vh - 400px)"
-      stripe
-      @click="ToView"
-    >
+    <el-table :data="tableData" style="width: 100%" height="calc(80vh - 400px)" stripe @click="ToView">
       <el-table-column type="index" width="50"> </el-table-column>
       <el-table-column prop="taskId" label="任务编号"> </el-table-column>
       <el-table-column prop="taskName" label="任务名称"> </el-table-column>
       <el-table-column prop="createDate" label="创建时间"> </el-table-column>
       <el-table-column prop="state" label="状态">
         <template slot-scope="scope">
-          <el-tag
-            :type="scope.row.state === '已审核' ? 'success' : 'info'"
-            disable-transitions
-            >{{ scope.row.state }}</el-tag
-          >
+          <el-tag :type="scope.row.state === '已审核' ? 'success' : 'info'" disable-transitions>{{ scope.row.state }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column prop="taskType" label="任务类型"> </el-table-column>
@@ -102,7 +65,7 @@
  */
 import Pagination from "../Pagination.vue";
 export default {
-  name: "CreateTaskForm",
+  name: "MyMission",
   components: { Pagination },
   data() {
     return {
@@ -112,7 +75,7 @@ export default {
       formInline: {
         taskType: "",
         associatedItems: "",
-        auditStatus: "",
+        auditStatus: ""
       },
       // 分页组件(根据后台返回结果赋值)
       paginationData: {
@@ -121,12 +84,12 @@ export default {
         pageSizes: [5, 10, 20, 50],
         total: 200,
         currentPage: 1,
-        currentChange: (val) => {
+        currentChange: val => {
           this.handleCurrentChange(val);
         },
-        handleSizeChange: (val) => {
+        handleSizeChange: val => {
           this.handleSizeChange(val);
-        },
+        }
       },
       // 任务类型options
       taskTypeOptions: [
@@ -135,59 +98,59 @@ export default {
           options: [
             {
               value: "all",
-              label: "全部类型",
-            },
-          ],
+              label: "全部类型"
+            }
+          ]
         },
         {
           label: "基本类型",
           options: [
             {
               value: "landResources",
-              label: "土地资源",
+              label: "土地资源"
             },
             {
               value: "ecologicalResources",
-              label: "生态资源",
+              label: "生态资源"
             },
             {
               value: "forestLandResources",
-              label: "林地资源",
+              label: "林地资源"
             },
             {
               value: "waterResources",
-              label: "水资源",
+              label: "水资源"
             },
             {
               value: "townAreaTopic",
-              label: "镇域专题",
-            },
-          ],
+              label: "镇域专题"
+            }
+          ]
         },
         {
           label: "土地资源",
           options: [
             {
               value: "lr_bfm",
-              label: "基本农田监控",
+              label: "基本农田监控"
             },
             {
               value: "lr_soclr",
-              label: "建设用地减量化监管",
-            },
-          ],
-        },
+              label: "建设用地减量化监管"
+            }
+          ]
+        }
       ],
       // 关联项目options
       associatedItemsOptions: [
         {
           value: "1",
-          label: "项目1",
+          label: "项目1"
         },
         {
           value: "2",
-          label: "项目2",
-        },
+          label: "项目2"
+        }
       ],
       // 我的任务form表单
       tableData: [
@@ -196,37 +159,37 @@ export default {
           taskName: "任务名称",
           taskId: "任务编号",
           state: "已审核",
-          taskType: "土地资源",
+          taskType: "土地资源"
         },
         {
           createDate: "2016-05-03",
           taskName: "任务名称",
           taskId: "任务编号",
           state: "未审核",
-          taskType: "土地资源",
+          taskType: "土地资源"
         },
         {
           createDate: "2016-05-03",
           taskName: "任务名称",
           taskId: "任务编号",
           state: "已审核",
-          taskType: "土地资源",
+          taskType: "土地资源"
         },
         {
           createDate: "2016-05-03",
           taskName: "任务名称",
           taskId: "任务编号",
           state: "已审核",
-          taskType: "土地资源",
+          taskType: "土地资源"
         },
         {
           createDate: "2016-05-03",
           taskName: "任务名称",
           taskId: "任务编号",
           state: "已审核",
-          taskType: "土地资源",
-        },
-      ],
+          taskType: "土地资源"
+        }
+      ]
     };
   },
   mounted() {
@@ -234,12 +197,6 @@ export default {
     this.$bus.$on("wdrw", () => {
       this.changeShowBottomMenusStatus();
     });
-    // 点击底部菜单SVG,且有弹窗打开时触发(弹窗关闭询问)
-    this.$bus.$on("handleClose", () => {
-      if (this.dialogVisible) {
-        this.handleClose();
-      }
-    });
   },
   destroy() {
     // 当容器销毁时,需要停止监听该事件
@@ -267,7 +224,7 @@ export default {
       this.formInline = {
         taskType: "",
         associatedItems: "",
-        auditStatus: "",
+        auditStatus: ""
       };
       this.onSubmit();
     },
@@ -277,22 +234,20 @@ export default {
     },
     // 当用户点击svg底座时,切换底部菜单显示隐藏状态。
     changeShowBottomMenusStatus() {
-      if (this.dialogVisible) {
-        this.handleClose();
-      } else {
         // 打开弹窗
-        this.dialogVisible = !this.dialogVisible;
-        this.$emit("changeShowBottomMenusStatus", false);
-      }
+        this.dialogVisible = true;
+        if (this.$ifMenu("3", "")) {
+          this.$emit("changeShowBottomMenusStatus", false);
+        }
     },
     // 弹窗关闭询问
     handleClose() {
       if (this.dialogVisible) {
         this.$confirm("确认关闭?")
-          .then((_) => {
+          .then(_ => {
             this.clearDialogVisible();
           })
-          .catch((_) => {});
+          .catch(_ => {});
       }
     },
     // 我的任务取消
@@ -300,9 +255,11 @@ export default {
       // 关闭弹窗
       this.dialogVisible = false;
       // 修改父级菜单变量(弹窗显示状态和显示底部菜单)
-      this.$emit("changeShowBottomMenusStatus", true);
-    },
+      if (this.$ifMenu("3", "")) {
+        this.$emit("changeShowBottomMenusStatus", true);
+      }
+    }
   },
-  watch: {},
+  watch: {}
 };
 </script>

+ 121 - 41
src/components/common/BottomForm/SameScreenComparison.vue

@@ -8,7 +8,7 @@
       </div>
     </template>
     <!-- 同屏对比主题 -->
-    <div class="ssc_main" :style="{ height: !subMitStatus ? 'calc(100vh - 190px)' : 'calc(100vh - 310px)' }">
+    <div class="ssc_main">
       <!-- 地图列表 -->
       <div class="ssc_main_mapList" id="doPrint" ref="doPrint">
         <div
@@ -36,11 +36,12 @@
           已选择<span class="checkLength">{{ checkedCities.length }}</span
           >个
         </div>
-        <el-checkbox-group id="mapCheckBox" v-model="checkedCities" @change="handleCheckedCitiesChange">
+        <el-checkbox-group id="mapCheckBox" v-model="checkedCities" @change="handleCheckedCitiesChange" :min="2" :max="6">
           <el-checkbox
             class="mapCheckBox"
             :disabled="checkedCities.length >= 6 && checkedCities.indexOf(index) == -1"
             v-for="(city, index) in mapList"
+            :checked="city.active"
             :label="index"
             :key="index"
             >{{ city.mapName }}</el-checkbox
@@ -49,7 +50,7 @@
       </div>
     </div>
     <!-- 底部文本域 -->
-    <div id="textareaBox" v-if="subMitStatus">
+    <div id="textareaBox">
       <div class="textareaTitle">描述记录:</div>
       <el-input type="textarea" :autosize="{ minRows: 3, maxRows: 4 }" placeholder="请输入内容" v-model="textarea1"> </el-input>
     </div>
@@ -61,8 +62,8 @@
       <div>{{ textarea1 }}</div>
     </div>
     <span slot="footer" class="dialog-footer">
-      <el-button @click="clearDialogVisible()">{{ subMitStatus ? "返回上级" : "取 消" }}</el-button>
-      <el-button type="primary" @click="subMitDialogVisible()">{{ subMitStatus ? "打 印" : "确 定" }}</el-button>
+      <el-button @click="clearDialogVisible()">取 消</el-button>
+      <el-button type="primary" @click="subMitDialogVisible()">打 印</el-button>
     </span>
   </el-dialog>
 </template>
@@ -82,14 +83,13 @@ export default {
     return {
       // 同屏对比弹窗显示状态
       dialogVisible: false,
+      // 默认选中第一个
       checkedCities: [],
       // 定时器暂存
       interval: "",
       // 地图暂存显示变量
       centerZoom: {},
       mouseIndex: -1,
-      // 确认状态
-      subMitStatus: false,
       // 底部文本域
       textarea1: "",
       // 地图底图列表
@@ -97,7 +97,7 @@ export default {
         {
           mapName: "2018年航空影像图(春季)",
           mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
-          active: false
+          active: true
         },
         {
           mapName: "2019年航空影像图(春季)",
@@ -202,12 +202,6 @@ export default {
     this.$bus.$on("tpdb", () => {
       this.changeShowBottomMenusStatus();
     });
-    // 点击底部菜单SVG,且有弹窗打开时触发(弹窗关闭询问)
-    this.$bus.$on("handleClose", () => {
-      if (this.dialogVisible) {
-        this.handleClose();
-      }
-    });
   },
   destroy() {
     // 当容器销毁时,需要停止监听该事件
@@ -217,13 +211,9 @@ export default {
   methods: {
     // 当用户点击svg底座时,切换底部菜单显示隐藏状态。
     changeShowBottomMenusStatus() {
-      if (this.dialogVisible) {
-        this.handleClose();
-      } else {
-        // 打开弹窗
-        this.dialogVisible = !this.dialogVisible;
-        this.$emit("changeShowBottomMenusStatus", false);
-      }
+      // 打开弹窗
+      this.dialogVisible = true;
+      this.$emit("changeShowBottomMenusStatus", false);
     },
     // 弹窗关闭询问
     handleClose() {
@@ -241,15 +231,114 @@ export default {
         this.$message.info("取消打印!");
         this.clearDiyInterval();
       } else {
-        // 返回上级
-        if (this.subMitStatus) {
-          this.subMitStatus = !this.subMitStatus;
-        } else {
-          // 关闭弹窗
-          this.dialogVisible = false;
-          // 修改父级菜单变量(弹窗显示状态和显示底部菜单)
-          this.$emit("changeShowBottomMenusStatus", true);
-        }
+        // 关闭弹窗
+        this.dialogVisible = false;
+        // 恢复默认选中第一个地图底图
+        this.checkedCities = [];
+        this.mapList = [
+          {
+            mapName: "2018年航空影像图(春季)",
+            mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
+            active: true
+          },
+          {
+            mapName: "2019年航空影像图(春季)",
+            mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
+            active: false
+          },
+          {
+            mapName: "2020年航空影像图(春季)",
+            mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
+            active: false
+          },
+          {
+            mapName: "2021年航空影像图(春季)",
+            mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
+            active: false
+          },
+          {
+            mapName: "2022年航空影像图(春季)",
+            mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
+            active: false
+          },
+          {
+            mapName: "2018年卫星影像图(春季)",
+            mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
+            active: false
+          },
+          {
+            mapName: "2019年卫星影像图(春季)",
+            mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
+            active: false
+          },
+          {
+            mapName: "2020年卫星影像图(春季)",
+            mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
+            active: false
+          },
+          {
+            mapName: "2021年卫星影像图(春季)",
+            mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
+            active: false
+          },
+          {
+            mapName: "2022年卫星影像图(春季)",
+            mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
+            active: false
+          },
+          {
+            mapName: "2018年航空影像图(秋季)",
+            mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
+            active: false
+          },
+          {
+            mapName: "2019年航空影像图(秋季)",
+            mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
+            active: false
+          },
+          {
+            mapName: "2020年航空影像图(秋季)",
+            mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
+            active: false
+          },
+          {
+            mapName: "2021年航空影像图(秋季)",
+            mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
+            active: false
+          },
+          {
+            mapName: "2022年航空影像图(秋季)",
+            mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
+            active: false
+          },
+          {
+            mapName: "2018年卫星影像图(秋季)",
+            mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
+            active: false
+          },
+          {
+            mapName: "2019年卫星影像图(秋季)",
+            mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
+            active: false
+          },
+          {
+            mapName: "2020年卫星影像图(秋季)",
+            mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
+            active: false
+          },
+          {
+            mapName: "2021年卫星影像图(秋季)",
+            mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
+            active: false
+          },
+          {
+            mapName: "2022年卫星影像图(秋季)",
+            mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
+            active: false
+          }
+        ];
+        // 修改父级菜单变量(弹窗显示状态和显示底部菜单)
+        this.$emit("changeShowBottomMenusStatus", true);
       }
     },
     // 同屏对比表单提交
@@ -257,16 +346,7 @@ export default {
       if (this.interval) {
         this.$message.info("正在打印,请稍后操作!");
       } else {
-        if (!this.subMitStatus) {
-          if (this.checkedCities.length < 2) {
-            this.$message.info("请至少选择两个地图底图!");
-          } else {
-            this.subMitStatus = !this.subMitStatus;
-          }
-        } else {
-          // 出现新的弹窗并截图当前地图,以及文本域
-          this.cutDiv();
-        }
+        this.cutDiv();
       }
     },
     // div转图片
@@ -338,7 +418,7 @@ export default {
 .ssc_main {
   display: flex;
   width: 100%;
-  height: calc(100vh - 190px);
+  height: calc(100vh - 310px);
   position: relative;
   #textareaBox {
     width: calc(100% - 20px);

+ 1 - 11
src/components/common/BottomForm/UploadingData.vue

@@ -58,12 +58,6 @@ export default {
     this.$bus.$on("scsj", () => {
       this.changeShowBottomMenusStatus();
     });
-    // 点击底部菜单SVG,且有弹窗打开时触发(弹窗关闭询问)
-    this.$bus.$on("handleClose", () => {
-      if (this.dialogVisible) {
-        this.handleClose();
-      }
-    });
   },
   destroy() {
     // 当容器销毁时,需要停止监听该事件
@@ -73,13 +67,9 @@ export default {
   methods: {
     // 当用户点击svg底座时,切换底部菜单显示隐藏状态。
     changeShowBottomMenusStatus() {
-      if (this.dialogVisible) {
-        this.handleClose();
-      } else {
         // 打开弹窗
-        this.dialogVisible = !this.dialogVisible;
+        this.dialogVisible = true;
         this.$emit("changeShowBottomMenusStatus", false);
-      }
     },
     // 弹窗关闭询问
     handleClose() {

+ 0 - 3
src/components/common/BottomMenus.vue

@@ -213,9 +213,6 @@ export default {
         this.showBottomMenusStatus = state;
         // 并切换弹窗显示隐藏状态
         this.dialogVisibleStatus = !state;
-      } else if (!this.showBottomMenusStatus && this.dialogVisibleStatus) {
-        // 如果底部菜单为隐藏状态且弹窗为显示状态,则为弹窗关闭询问。
-        // this.$bus.$emit("handleClose");
       } else {
         // 否则直接切换底部菜单显示隐藏状态
         this.showBottomMenusStatus = !this.showBottomMenusStatus;

+ 18 - 5
src/components/layout/Header.vue

@@ -37,7 +37,8 @@
       </el-col>
       <el-col :span="3">
         <div class="user">
-          <div class="manage-icon"></div>
+          <!-- 我的任务快捷菜单 -->
+          <div class="manage-icon" @click="goToMyMission()"></div>
           <div class="alert-icon">
             <div class="alert-info">12</div>
           </div>
@@ -55,7 +56,7 @@ export default {
   name: "Header",
   data() {
     return {
-      ActiveIndex: "1",
+      ActiveIndex: "0",
       navData: {
         1: "首页",
         2: "疑点筛查",
@@ -73,11 +74,11 @@ export default {
     };
   },
   mounted() {
-    this.getActiveIndex();
+    this.getActiveIndex(true);
   },
   methods: {
     // 菜单选择记忆(由于不使用路由,为了防止用户刷新页面后页面丢失,故保存并重新赋值当前页)
-    getActiveIndex() {
+    getActiveIndex(status) {
       let _ActiveIndex = "";
       if (this.$store.state.navSelect) {
         if (this.$store.state.navSelect.subIndex) {
@@ -90,8 +91,20 @@ export default {
       }
       if (this.ActiveIndex != _ActiveIndex) {
         this.ActiveIndex = _ActiveIndex;
+        if (status) {
+          this.select(this.ActiveIndex);
+        }
       }
     },
+    // 快捷进入我的任务页面
+    goToMyMission() {
+      this.ActiveIndex = "3";
+      this.select(this.ActiveIndex);
+      setTimeout(() => {
+        this.$bus.$emit("wdrw");
+      });
+    },
+    // 切换菜单事件
     select: function (index) {
       var that = this;
       var name = that.navData[index];
@@ -106,7 +119,7 @@ export default {
   watch: {
     "$store.state.navSelect": {
       handler() {
-        this.getActiveIndex();
+        this.getActiveIndex(false);
       },
       deep: true
     }

+ 6 - 6
src/views/HomeView.vue

@@ -290,25 +290,25 @@ export default {
               commonData: [
                 {
                   type: "tb",
-                  title: "水域面积",
+                  title: "水域数量",
                   value: 654,
-                  unit: "公顷",
+                  unit: "",
                   categoryData: ["2019", "2020", "2021"],
                   valueData: [40, 420, 654]
                 },
                 {
                   type: "tb",
-                  title: "区管河道面积",
+                  title: "区管河道数量",
                   value: 654,
-                  unit: "公顷",
+                  unit: "",
                   categoryData: ["2019", "2020", "2021"],
                   valueData: [400, 420, 654]
                 },
                 {
                   type: "tb",
-                  title: "镇管河道面积",
+                  title: "镇管河道数量",
                   value: 654,
-                  unit: "公顷",
+                  unit: "",
                   categoryData: ["2019", "2020", "2021"],
                   valueData: [400, 40, 654]
                 }