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

src/views/siteselection/components/dkDetails.vue

@@ -0,0 +1,42 @@
+<template>
+  <div class="dkxq_Container">
+      <pie
+        v-if="litem.scxstyle == 0"
+        :class="`echart${litem.dataList.length <= 6 ? '' : '_vertical'}`"
+        unit="亩"
+        @echartClick="(name, iseyes) => echartClick(name, iseyes)"
+        :ref="`echartRef`"
+      ></pie>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    litem: {
+      type: Object,
+    },
+    piseyes: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {};
+  },
+  methods: {},
+  mounted() {},
+  computed: {},
+};
+</script>
+
+<style lang="scss">
+.dkxq_Container {
+  width: 430px;
+  height: 600px;
+  background-color: pink;
+  position: fixed;
+  bottom: 16%;
+  right: 10px;
+}
+</style>

src/views/siteselection/components/xzjg.vue

@@ -114,16 +114,18 @@
         >
       </div>
     </div> -->
+<dkDetails></dkDetails>
   </div>
 </template>
 
 <script>
 import { GetXzjg, DownloadLandReport } from "../../../api/ghss/ghxz.js";
+import dkDetails from './dkDetails.vue'
 // 使用
 import parse from "wellknown";
 let dataSources = {};
 export default {
-  components: {},
+  components: {dkDetails},
   props: {
     activeTabs: {
       type: String,
@@ -165,6 +167,7 @@ export default {
       arrww: [],
       tempdataSourcesId: null,
       xzjgBSM: "",
+      echarts:[],
     };
   },
   mounted() {
@@ -306,6 +309,32 @@ export default {
     //现状信息
     nowInfo(e, item) {
       console.log(e, item, "现状信息");
+      // GetFxjg({ bsm: item.bsm }).then((res) => {
+      //   if (res.success) {
+      //     res.data.forEach((e) => {
+      //       let c = e.dataList || [];
+      //       c.map((ci) => {
+      //         ci.name = ci.yslx_name || ci.scxname;
+      //         // ci.value = this.compute(ci.mj);
+      //         ci.value = ci.mj;
+      //         ci.geom = ci.geom || "";
+      //         // ci.label = ci.mc_name;
+      //       });
+      //       this.echarts.push({
+      //         id: e.scxbsm,
+      //         label: e.scxname,
+      //         dataList: e.dataList,
+      //         lchildren: e.children || [],
+      //         iseyes: false,
+      //         isshow: false,
+      //         scxstyle: e.scxstyle,
+      //       });
+      //       if (e.scxstyle == 0) this.setEchart(c, e.scxbsm);
+      //       if (e.children) this.lForEach(e.children, "echart");
+      //     });
+      //     this.$emit("updateParent", "loading", false);
+      //   }
+      // });
     },
 
     deleteprogramme(e, item) {