Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/components/Query/clickQuery/MultiLevelQuery.vue

@@ -84,7 +84,7 @@
 import { GetTabsData, GetTabsPane } from '@/api/cockpitNew'
 import * as wellknown from "wellknown";
 import * as turf from "@turf/turf";
-import pie from "@/components/echartsTemplate/pie.vue";
+import pie from "@/components/echartsTemplate/pieNew.vue";
 
 let manager_multi_level_query = null;
 let pick_entity = null;
@@ -538,17 +538,16 @@ export default {
         },
         setEchart_qwnership(data, type, index) {
             this.$nextTick(() => {
-                let max = index == 0 ? 3 : 10
-                // let legend_right = index == 0 ? "2%" : "10%"
-                let legend_right = "10%"
+                let max = 7
+                let legend_right = "4%"
 
                 this.$refs.qwnership_pie[index].setOptions({ data, type, max, legend_right });
             });
         },
         setEchart(data, type, index) {
             this.$nextTick(() => {
-                let max = 5
-                let legend_right = "10%"
+                let max = 7
+                let legend_right = "4%"
                 this.$refs.echartRef[index].setOptions({ data, type, max, legend_right });
             });
         },

src/views/siteselection/components/dkDetailsNew.vue

@@ -70,6 +70,7 @@ export default {
   },
   methods: {
     async show(item, title) {
+      console.log('item: ', item);
 
 
       this.title = title;
@@ -99,7 +100,7 @@ export default {
     },
     setEchart(data, type, index) {
       this.$nextTick(() => {
-        let max =7
+        let max = 7
         let legend_right = "4%"
         this.$refs.ghxz_pie[index].setOptions({ data, type, max, legend_right });
       });
@@ -108,7 +109,9 @@ export default {
       this.rawData = [];
       this.tabs_list.forEach(async element => {
         if (element.tableName == tab.name) {
+
           let pane_obj = {
+            // sourceDataId: this.optional.landIds.join(','),
             sourcePolygonWkt: this.optional.geom.split(";")[1],
             // sourcePolygonWkt: 'POLYGON((109.49712143164533 18.309279728765855,109.49711192926624 18.310380990351096,109.49711161665255 18.310417116323478,109.4972007070708 18.31050362418087,109.49850056210042 18.310513852191068,109.49859113294231 18.31042875918721,109.49859144375941 18.31039263236441,109.4986014051776 18.309237180686633,109.4984888696287 18.309127909086385,109.49725521594395 18.30911820207864,109.49712174425906 18.30924360340898,109.49712143164533 18.309279728765855))',