Merge remote-tracking branch 'origin/master'

src/components/linkNameSelect/linkDike.vue

@@ -30,12 +30,14 @@
       style="width: 100%"
       v-scroll="selectSearch"
       filterable
+      :filter-method="aaaa"
       clearable
       remote
       reserve-keyword
       :remote-method="remoteMethod"
       :loading="loading"
       @change="handleChange"
+      @blur="handleChange"
     >
       <el-option
         v-for="dict in dikeNameOptions"
@@ -79,11 +81,15 @@ export default {
       this.dikeNameQueryParams.data.dikeName = this.form.dikeName;
     }
     listJbxx(this.dikeNameQueryParams).then((res) => {
-      // console.log(111, res);
+      console.log(111, res);
       this.dikeNameOptions = res.records;
     });
   },
   methods: {
+    aaaa(value) {
+      console.log(999);
+      return true;
+    },
     reset() {
       this.dikeNameQueryParams = {
         pageNum: 1,
@@ -103,24 +109,28 @@ export default {
       };
     },
     handleChange(keyWork) {
-      console.log(1111, this.form);
-      if (!keyWork) {
-        this.reset();
-        listJbxx(this.dikeNameQueryParams).then((res) => {
-          this.dikeNameOptions = res.records;
-        });
-      }
+      // console.log(1111, this.form);
+      // if (!keyWork) {
+      this.reset();
+      listJbxx(this.dikeNameQueryParams).then((res) => {
+        this.dikeNameOptions = res.records;
+      });
+      // }else{
+
+      // }
     },
     remoteMethod(query) {
+      this.selectLoading = true;
       if (query !== "") {
-        this.selectLoading = true;
         // console.log(444, query);
         this.dikeNameQueryParams.data.dikeName = query;
-        listJbxx(this.dikeNameQueryParams).then((res) => {
-          this.dikeNameOptions = res.records;
-          this.selectLoading = false;
-        });
+      } else {
+        this.reset();
       }
+      listJbxx(this.dikeNameQueryParams).then((res) => {
+        this.dikeNameOptions = res.records;
+        this.selectLoading = false;
+      });
     },
     selectSearch() {
       this.dikeNameQueryParams.pageNum += 1;

src/components/linkNameSelect/linkSluice.vue

@@ -119,23 +119,25 @@ export default {
       };
     },
     handleChange(keyWork) {
-      if (!keyWork) {
-        this.reset();
-        listJbxx(this.wagaNameQueryParams).then((res) => {
-          this.wagaNameOptions = res.records;
-        });
-      }
+      // if (!keyWork) {
+      this.reset();
+      listJbxx(this.wagaNameQueryParams).then((res) => {
+        this.wagaNameOptions = res.records;
+      });
+      // }/
     },
     remoteMethod(query) {
+      this.selectLoading = true;
       if (query !== "") {
-        this.selectLoading = true;
         // console.log(444, query);
         this.wagaNameQueryParams.data.wagaName = query;
-        listJbxx(this.wagaNameQueryParams).then((res) => {
-          this.wagaNameOptions = res.records;
-          this.selectLoading = false;
-        });
+      } else {
+        this.reset();
       }
+      listJbxx(this.wagaNameQueryParams).then((res) => {
+        this.wagaNameOptions = res.records;
+        this.selectLoading = false;
+      });
     },
     selectSearch() {
       this.wagaNameQueryParams.pageNum += 1;

src/layout/components/Sidebar/index.vue

@@ -47,11 +47,25 @@ export default {
     activeMenu() {
       const route = this.$route;
       const { meta, path } = route;
+      let newPath = path;
+      if (path.includes("/sluice/engineeringCondition/sluiceBaseInfo/")) {
+        newPath = "/sluice/engineeringCondition/sluiceBaseInfo";
+      } else if (path.includes("/sluice/safetyManage/declare/")) {
+        newPath = "/sluice/safetyManage/declare";
+      } else if (path.includes("/sluice/safetyManage/examine/")) {
+        newPath = "/sluice/safetyManage/examine";
+      } else if (path.includes("/dike/engineeringCondition/dikeBaseInfo/")) {
+        newPath = "/dike/engineeringCondition/dikeBaseInfo";
+      } else if (path.includes("/dike/safetyManage/declare/")) {
+        newPath = "/dike/safetyManage/declare";
+      } else if (path.includes("/dike/safetyManage/examine/")) {
+        newPath = "/dike/safetyManage/examine";
+      }
       // if set path, the sidebar will highlight the path you set
       if (meta.activeMenu) {
         return meta.activeMenu;
       }
-      return path;
+      return newPath;
     },
     showLogo() {
       return this.$store.state.settings.sidebarLogo;

src/views/dike/safetyManage/declarationManage/declare/components/dataCharts.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="content">
+  <div class="content" v-loading="loading">
     <div ref="pieEle" style="width: 30%; height: 100%"></div>
     <div ref="barEle" style="width: 70%; height: 100%"></div>
   </div>
@@ -11,7 +11,9 @@ export default {
   data() {
     return {
       pieChartData: [],
+      selected: {},
       barChartData: [],
+      loading: true,
     };
   },
   created() {
@@ -19,18 +21,29 @@ export default {
   },
   methods: {
     async getData() {
+      this.loading = true;
       const res1 = await getPie();
       const res2 = await getHistogram();
       this.pieChartData = [];
       for (let key in res1[0]) {
-        this.pieChartData.push({ value: res1[0][key], name: key });
+        this.pieChartData.push({
+          value: res1[0][key],
+          name: key?.substring(0, 10),
+        });
       }
+      // 处理数据
+      for (let i = 0; i < this.pieChartData.length; i++) {
+        let name = this.pieChartData[i].name;
+        this.selected[name] = i < 7; //限制图表中起始显示10个，这里必须保证 name 不为空
+      }
+
       // for (let key in res1[0]) {
       //   this.barChartData.push({ value: res1[0][key], name: key });
       // }
       this.barChartData = res2;
       this.pieInit();
       this.barInit();
+      this.loading = false;
       console.log("pieChartData", this.pieChartData);
       console.log("barChartData", this.barChartData);
     },
@@ -51,6 +64,8 @@ export default {
           orient: "horizontal",
           bottom: "2%",
           icon: "circle",
+          type: "scroll",
+          selected: this.selected,
         },
         series: [
           {
@@ -106,6 +121,18 @@ export default {
           bottom: "12%",
           containLabel: true,
         },
+        dataZoom: [
+          {
+            type: "inside",
+            show: false,
+            xAxisIndex: [0],
+            start: 0,
+            end: 50,
+            // textStyle: {
+            //   color: "#ccd7d7",
+            // },
+          },
+        ],
         xAxis: {
           type: "category",
           axisLine: {

src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/basePage.vue

@@ -18,6 +18,7 @@
               v-model="form.securityCategory"
               placeholder="请选择安全类别"
               style="width: 100%"
+              disabled
             >
               <el-option
                 v-for="dict in securityCategoryOptions"

src/views/dike/safetyManage/declarationManage/examine/components/dataCharts.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="content">
+  <div class="content" v-loading="loading">
     <div ref="pieEle" style="width: 30%; height: 100%"></div>
     <div ref="barEle" style="width: 70%; height: 100%"></div>
   </div>
@@ -11,7 +11,9 @@ export default {
   data() {
     return {
       pieChartData: [],
+      selected: {},
       barChartData: [],
+      loading: true,
     };
   },
   created() {
@@ -19,11 +21,19 @@ export default {
   },
   methods: {
     async getData() {
+      this.loading = true;
       const res1 = await getPie();
       const res2 = await getHistogram();
       this.pieChartData = [];
       for (let key in res1[0]) {
-        this.pieChartData.push({ value: res1[0][key], name: key });
+        this.pieChartData.push({
+          value: res1[0][key],
+          name: key?.substring(0, 10),
+        });
+      }
+      for (let i = 0; i < this.pieChartData.length; i++) {
+        let name = this.pieChartData[i].name;
+        this.selected[name] = i < 7; //限制图表中起始显示10个，这里必须保证 name 不为空
       }
       // for (let key in res1[0]) {
       //   this.barChartData.push({ value: res1[0][key], name: key });
@@ -31,6 +41,7 @@ export default {
       this.barChartData = res2;
       this.pieInit();
       this.barInit();
+      this.loading = false;
       console.log("pieChartData", this.pieChartData);
       console.log("barChartData", this.barChartData);
     },
@@ -51,6 +62,8 @@ export default {
           orient: "horizontal",
           bottom: "2%",
           icon: "circle",
+          type: "scroll",
+          selected: this.selected,
         },
         series: [
           {
@@ -106,6 +119,18 @@ export default {
           bottom: "12%",
           containLabel: true,
         },
+        dataZoom: [
+          {
+            type: "inside",
+            show: false,
+            xAxisIndex: [0],
+            start: 0,
+            end: 50,
+            // textStyle: {
+            //   color: "#ccd7d7",
+            // },
+          },
+        ],
         xAxis: {
           type: "category",
           axisLine: {

src/views/dike/safetyManage/safetyAppraisal/task.vue

@@ -238,7 +238,7 @@
           <el-input v-model="form.taskName" placeholder="请输入任务名称" />
         </el-form-item>
         <el-form-item label="任务堤防" prop="dikeCodes">
-          <linkDike :form="form" :isMultiple="true" />
+          <linkDike :form="form" :isMultiple="true" v-if="open" />
           <!-- <el-select
             v-model="form.dikeCodes"
             placeholder="请选择堤防名称"

src/views/sluice/safetyManage/declarationManage/declare/components/dataCharts.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="content">
+  <div class="content" v-loading="loading">
     <div ref="pieEle" style="width: 30%; height: 100%"></div>
     <div ref="barEle" style="width: 70%; height: 100%"></div>
   </div>
@@ -11,7 +11,9 @@ export default {
   data() {
     return {
       pieChartData: [],
+      selected: {},
       barChartData: [],
+      loading: true,
     };
   },
   created() {
@@ -19,11 +21,19 @@ export default {
   },
   methods: {
     async getData() {
+      this.loading = true;
       const res1 = await getPie();
       const res2 = await getHistogram();
       this.pieChartData = [];
       for (let key in res1[0]) {
-        this.pieChartData.push({ value: res1[0][key], name: key });
+        this.pieChartData.push({
+          value: res1[0][key],
+          name: key?.substring(0, 10),
+        });
+      }
+      for (let i = 0; i < this.pieChartData.length; i++) {
+        let name = this.pieChartData[i].name;
+        this.selected[name] = i < 7; //限制图表中起始显示10个，这里必须保证 name 不为空
       }
       // for (let key in res1[0]) {
       //   this.barChartData.push({ value: res1[0][key], name: key });
@@ -31,6 +41,7 @@ export default {
       this.barChartData = res2;
       this.pieInit();
       this.barInit();
+      this.loading = false;
       console.log("pieChartData", this.pieChartData);
       console.log("barChartData", this.barChartData);
     },
@@ -51,6 +62,8 @@ export default {
           orient: "horizontal",
           bottom: "2%",
           icon: "circle",
+          type: "scroll",
+          selected: this.selected,
         },
         series: [
           {
@@ -106,6 +119,18 @@ export default {
           bottom: "12%",
           containLabel: true,
         },
+        dataZoom: [
+          {
+            type: "inside",
+            show: false,
+            xAxisIndex: [0],
+            start: 0,
+            end: 50,
+            // textStyle: {
+            //   color: "#ccd7d7",
+            // },
+          },
+        ],
         xAxis: {
           type: "category",
           axisLine: {

src/views/sluice/safetyManage/declarationManage/examine/components/dataCharts.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="content">
+  <div class="content" v-loading="loading">
     <div ref="pieEle" style="width: 30%; height: 100%"></div>
     <div ref="barEle" style="width: 70%; height: 100%"></div>
   </div>
@@ -11,7 +11,9 @@ export default {
   data() {
     return {
       pieChartData: [],
+      selected: {},
       barChartData: [],
+      loading: true,
     };
   },
   created() {
@@ -19,11 +21,19 @@ export default {
   },
   methods: {
     async getData() {
+      this.loading = true;
       const res1 = await getPie();
       const res2 = await getHistogram();
       this.pieChartData = [];
       for (let key in res1[0]) {
-        this.pieChartData.push({ value: res1[0][key], name: key });
+        this.pieChartData.push({
+          value: res1[0][key],
+          name: key?.substring(0, 10),
+        });
+      }
+      for (let i = 0; i < this.pieChartData.length; i++) {
+        let name = this.pieChartData[i].name;
+        this.selected[name] = i < 7; //限制图表中起始显示10个，这里必须保证 name 不为空
       }
       // for (let key in res1[0]) {
       //   this.barChartData.push({ value: res1[0][key], name: key });
@@ -31,6 +41,7 @@ export default {
       this.barChartData = res2;
       this.pieInit();
       this.barInit();
+      this.loading = false;
       console.log("pieChartData", this.pieChartData);
       console.log("barChartData", this.barChartData);
     },
@@ -51,6 +62,8 @@ export default {
           orient: "horizontal",
           bottom: "2%",
           icon: "circle",
+          type: "scroll",
+          selected: this.selected,
         },
         series: [
           {
@@ -106,6 +119,18 @@ export default {
           bottom: "12%",
           containLabel: true,
         },
+        dataZoom: [
+          {
+            type: "inside",
+            show: false,
+            xAxisIndex: [0],
+            start: 0,
+            end: 50,
+            // textStyle: {
+            //   color: "#ccd7d7",
+            // },
+          },
+        ],
         xAxis: {
           type: "category",
           axisLine: {

src/views/sluice/safetyManage/safetyAppraisal/task.vue

@@ -238,7 +238,7 @@
           <el-input v-model="form.taskName" placeholder="请输入任务名称" />
         </el-form-item>
         <el-form-item label="任务水闸" prop="wagaCodes">
-          <linkSluice :form="form" :isMultiple="true" />
+          <linkSluice :form="form" :isMultiple="true" v-if="open" />
           <!-- <el-select
             v-model="form.wagaCodes"
             placeholder="请选择水闸名称"