zpf 9 месяцев назад
Родитель
Сommit
3ae873caec

+ 3 - 1
src/components/echartsTemplate/pie.vue

@@ -169,7 +169,6 @@ export default {
   },
   methods: {
     setOptions(cartData) {
-      console.log('cartData: ', cartData);
       let _this = this;
       if (!this.myChart) {
         // var dom = document.getElementById("pie_echart");
@@ -231,6 +230,9 @@ export default {
 
       if (cartData.data.length <= 0) {
         option.title.show = true;
+      }else{
+        option.title.show = false;
+
       }
       this.myChart.setOption(option);
       // if (cartData.isclick) {

+ 21 - 17
src/views/siteselection/components/dkDetailsNew.vue

@@ -31,19 +31,12 @@
     <div v-if="title == '三维分析'">
       <el-form :model="ruleForm" ref="ruleForm" label-width="100px">
         <el-form-item label="拉膜高度:" prop="height">
-          <el-input
-            class="inputwidth"
-            v-model="ruleForm.height"
-            size="mini"
-            type="number"
-            placeholder="请输入地块拉白膜高度"
-          ></el-input>
+          <el-input class="inputwidth" v-model="ruleForm.height" size="mini" type="number"
+            placeholder="请输入地块拉白膜高度"></el-input>
         </el-form-item>
       </el-form>
-      <el-button class="heiBtn" type="primary" size="mini" @click="submit"
-        >确 定</el-button
-      >
+      <el-button class="heiBtn" type="primary" size="mini" @click="submit">确 定</el-button>
     </div>
   </div>
 </template>
@@ -74,19 +67,29 @@ export default {
   },
   methods: {
     async show(item, title) {
+
+
       this.title = title;
       this.isDateilsShow = true;
       this.optional = item;
-      if (this.title == "规划信息") this.getCollapseList();
+      if (this.title == "规划信息") {
+        let data = await GetCascadeList();
+        this.tabs_list = data.data;
+        this.getCollapseList();
+        this.handleClick({
+          name: "规划地块",
+          index: 0
+        }, {})
+      }
       else if (this.title == "三维分析") this.ruleForm.height = 50;
     },
     submit() {
       this.$emit("pullUp", this.optional, this.ruleForm.height);
     },
-    async getCollapseList(){
-       let data = await GetCascadeList();
-       this.tabs_list = data.data;
-       this.loading = false
+    async getCollapseList() {
+      let data = await GetCascadeList();
+      this.tabs_list = data.data;
+      this.loading = false
     },
     setEchart(data, type, index) {
       this.$nextTick(() => {
@@ -99,9 +102,8 @@ export default {
       this.rawData = [];
       this.tabs_list.forEach(async element => {
         if (element.tableName == tab.name) {
-
           let pane_obj = {
-            sourcePolygonWkt: this.optional.geom,
+            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))',
 
             sourceLayerId: this.tabs_list[0].tableId,
@@ -267,9 +269,11 @@ export default {
   margin-right: 0px !important;
   width: auto !important;
 }
+
 .inputwidth {
   width: calc(100% - 50px);
 }
+
 .heiBtn {
   position: absolute;
   right: 20px;

+ 0 - 1
src/views/siteselection/components/xzjg.vue

@@ -336,7 +336,6 @@ export default {
       this.$refs.dkDetails.getCollapseList();
     },
     planInfo1(e, item) {
-      console.log("item: ", item);
       this.$refs.dkDetails.show(item, "规划信息");
     },
     //现状信息