Merge remote-tracking branch 'origin/master'

screen-demo/src/views/templateInstance.vue

@@ -386,6 +386,7 @@ export default {
     //     minViewShed: 12
     //   })
     // },
+
     loadOptions(node, resolve) {
       if (node.level > 2) return resolve([]); // Adjust the maximum level allowed for selection
       if (!this.isLoading && node.data && node.data.id) {
@@ -574,7 +575,7 @@ export default {
       ).then(res=>{
         result=res.data
         this.CameraZ=result;
-        console.log("wcnm123456789", this.CameraZ)
+
       });
     },
     //投影转坐标
@@ -846,7 +847,7 @@ export default {
     },
     btnMethod(num){
       this.selectedButton = num
-      let param = {};
+      let param = {"areaBoxNum":this.areaBoxNum};
       if (num == 0 || !num) {
         this.$requestSDK(
             "/jilin-devloper/jilin/getEvenAreaCompletion",
@@ -878,28 +879,34 @@ export default {
       this.areaBoxNum = num;
       this.clickedButton = num;
       let param = {"areaBoxNum":this.areaBoxNum};
-      console.log("000010011",param)
       this.currentPage1 = 1;
 
-      this.$requestSDK(
-          "/jilin-devloper/jilin/getEvenAreaCompletion",
-          param,
-          {},
-          "post"
-      ).then(response => {
-        const result = response.rows;
-        console.log("001",response.rows)
-
-        // 提取数据
-        let a = result.map(o => o.regionName);
-        let b = result.map(o => o.allNum);
-        // const values1 = result.rows.map(o => o.completionRates);
-
-        // 调用echarts2q函数，并传递处理后的数据
-        this.echarts2q(a,b);
-      }).catch(error => {
-        console.error('Error fetching data:', error);
-      });
+      if (this.selectedButton == 0 || !this.selectedButton) {
+        this.$requestSDK(
+            "/jilin-devloper/jilin/getEvenAreaCompletion",
+            param,
+            {},
+            "post"
+        ).then(res => {
+          let result = res.rows;
+          let keys1 = result.map(item => item.regionName) ;
+          // let keys2 = result.map(item => item.realNum );
+          let keys2 = result.map(item => item.allNum);
+          this.echarts2q(keys1,keys2);
+        });
+      } else if (this.selectedButton == 1) {
+        this.$requestSDK(
+            "/jilin-devloper/jilin/getEvenAreaCompletion",
+            param,
+            {},
+            "post"
+        ).then(res => {
+          let result = res.rows;
+          let keys1 = result.map(item => item.regionName) ;
+          let keys2 = result.map(item => item.completionRate);
+          this.echarts2q(keys1,keys2);
+        });
+      }
     },
     echarts2q(a,b){
       // bb =result.sourceList.map(o=>o.warningSourceName)
@@ -907,7 +914,7 @@ export default {
       let getName = a
 
       let getValue = b
-      console.log("2324", a)
+
       var max = Math.max(...getValue)
       var getMax = [];
       for (let i = 0; i < getName.length; i++) {
@@ -976,7 +983,7 @@ export default {
         ],
 
         series: [{
-          name: "受理数", // bar图的外边框
+
           type: "bar",
           barWidth: "10%",
           yAxisIndex: 0,
@@ -994,7 +1001,7 @@ export default {
           }),
         },
           {
-            name: "受理数", //这个是Bar图
+            name: a, //这个是Bar图
             type: 'bar',
             yAxisIndex: 1,
             barWidth: "10%",
@@ -1123,9 +1130,7 @@ export default {
         result = res.data;
         let handle = result.processNum
         this.sxt=result
-        console.log("56565",this.sxt)
-        console.log("77777",name)
-        console.log("11111111111111",res.data)
+
 
         let _doc = echarts.init(document.getElementById('chart'));
         var getName = [