三维分析

src/views/siteselection/components/dkDetails.vue

@@ -41,23 +41,26 @@
               {{ value_field.data }}
             </div>
           </div>
-          <div v-if="title == '三维分析'">
-            <el-form :model="ruleForm" ref="ruleForm" label-width="100px">
-              <el-form-item label="拉膜高度:" prop="height">
-                <el-input
-                  v-model="ruleForm.height"
-                  size="mini"
-                  type="number"
-                  placeholder="请输入地块拉白膜高度"
-                ></el-input>
-                米
-              </el-form-item>
-            </el-form>
-            <el-button type="primary" @click="submit">确 定</el-button>
-          </div>
         </el-collapse-item>
       </el-collapse>
     </div>
+    <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-form-item>
+      </el-form>
+      <el-button class="heiBtn" type="primary" size="mini" @click="submit"
+        >确 定</el-button
+      >
+    </div>
   </div>
 </template>
 
@@ -77,15 +80,15 @@ export default {
       collapseList: [],
       loading: true,
       isDateilsShow: false,
-      ruleForm: {},
+      ruleForm: { height: 50 },
     };
   },
   methods: {
     show(item, title) {
       this.title = title;
-      this.isDateilsShow = true;
       this.itemObj = item;
-      this.getData(item);
+      this.isDateilsShow = true;
+      if (this.title == "现状信息") this.getData(item);
     },
     submit() {
       this.$emit("pullUp", this.itemObj, this.ruleForm.height);
@@ -218,4 +221,11 @@ export default {
   overflow-x: hidden;
   overflow-y: auto;
 }
+.inputwidth {
+  width: calc(100% - 50px);
+}
+.heiBtn {
+  position: absolute;
+  right: 20px;
+}
 </style>

src/views/siteselection/components/dkDetailsNew.vue

@@ -28,6 +28,23 @@
 
       </el-tabs>
     </div>
+    <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-form-item>
+      </el-form>
+      <el-button class="heiBtn" type="primary" size="mini" @click="submit"
+        >确 定</el-button
+      >
+    </div>
   </div>
 </template>
 
@@ -59,9 +76,17 @@ export default {
       this.title = title;
       this.isDateilsShow = true;
       this.optional = item;
-      let data = await GetCascadeList();
-      this.tabs_list = data.data;
-      this.loading = false
+      if (this.title == "规划信息"){
+        this.getCollapseList()
+      }
+    },
+    submit() {
+      this.$emit("pullUp", this.itemObj, this.ruleForm.height);
+    },
+    async getCollapseList(){
+       let data = await GetCascadeList();
+       this.tabs_list = data.data;
+       this.loading = false
     },
     setEchart(data, type, index) {
       this.$nextTick(() => {
@@ -242,4 +267,11 @@ export default {
   margin-right: 0px !important;
   width: auto !important;
 }
+.inputwidth {
+  width: calc(100% - 50px);
+}
+.heiBtn {
+  position: absolute;
+  right: 20px;
+}
 </style>

src/views/siteselection/components/xzjg.vue

@@ -8,12 +8,22 @@
       </div>
       <div class="bxCon" style="height: 90%">
         <el-collapse accordion v-model="activeNames">
-          <el-collapse-item :name="'gb' + index1" v-for="(item1, index1) in bgList" :key="index1">
+          <el-collapse-item
+            :name="'gb' + index1"
+            v-for="(item1, index1) in bgList"
+            :key="index1"
+          >
             <template slot="title">
               地块编号{{ item1.dkbm }} ({{ item1.area || 0 }})亩
               <span class="tools">
-                <i class="header-icon el-icon-place" @click.stop="mapview(item1)"></i>
-                <i class="header-icon el-icon-delete" @click="deleteprogramme($event, item1)"></i>
+                <i
+                  class="header-icon el-icon-place"
+                  @click.stop="mapview(item1)"
+                ></i>
+                <i
+                  class="header-icon el-icon-delete"
+                  @click="deleteprogramme($event, item1)"
+                ></i>
               </span>
             </template>
             <div class="collapseCon">
@@ -23,8 +33,10 @@
               </p>
               <p style="color: #cddeeb">
                 <img src="/static/images/ghzc/iconSun.png" />
-                <span style="margin-left: 20px">基准地价:</span><span style="color: #02a7f0">{{ item1.landPrice || 0
-                }}万元</span>
+                <span style="margin-left: 20px">基准地价:</span
+                ><span style="color: #02a7f0"
+                  >{{ item1.landPrice || 0 }}万元</span
+                >
               </p>
             </div>
           </el-collapse-item>
@@ -33,23 +45,41 @@
     </div>
     <div style="height: 47%; width: 100%" v-if="xzjgObj">
       <div class="title flex-box">
-        <span class="block-title">备选地块 （{{ xzjgObj.dks ? xzjgObj.dks.length : 0 }}）
+        <span class="block-title"
+          >备选地块 （{{ xzjgObj.dks ? xzjgObj.dks.length : 0 }}）
         </span>
       </div>
       <div class="bxCon">
         <el-collapse accordion v-model="activeNames">
-          <el-collapse-item :name="index" v-for="(item, index) in xzjgObj.dks" :key="item.dkbm">
+          <el-collapse-item
+            :name="index"
+            v-for="(item, index) in xzjgObj.dks"
+            :key="item.dkbm"
+          >
             <template slot="title">
               <!-- 地块编号B_P_123 -->
               {{ item.dkbm }} ({{ item.area || 0 }})亩
               <span class="tools">
-                <i class="header-icon el-icon-place" @click.stop="mapview(item)"></i>
-                <i class="header-icon el-icon-s-order" @click="planInfo1($event, item)"></i>
+                <i
+                  class="header-icon el-icon-place"
+                  @click.stop="mapview(item)"
+                ></i>
+                <i
+                  class="header-icon el-icon-s-order"
+                  @click="planInfo1($event, item)"
+                ></i>
                 <!-- <i
                   class="header-icon el-icon-receiving"
                   @click="nowInfo($event, item)"
                 ></i> -->
-                <i class="header-icon el-icon-plus" @click="addprogramme($event, item)"></i>
+                <i
+                  class="header-icon el-icon-receiving"
+                  @click="threeInfo($event, item)"
+                ></i>
+                <i
+                  class="header-icon el-icon-plus"
+                  @click="addprogramme($event, item)"
+                ></i>
               </span>
             </template>
             <div class="collapseCon">
@@ -60,8 +90,10 @@
               <p style="color: #cddeeb">
                 <!-- <i class="iconSun"></i> -->
                 <img src="/static/images/ghzc/iconSun.png" />
-                <span style="margin-left: 20px">基准地价:</span><span style="color: #02a7f0">{{ item.landPrice || 0
-                }}万元</span>
+                <span style="margin-left: 20px">基准地价:</span
+                ><span style="color: #02a7f0"
+                  >{{ item.landPrice || 0 }}万元</span
+                >
               </p>
             </div>
           </el-collapse-item>
@@ -171,8 +203,8 @@ export default {
           (res) => {
             window.open(
               window.axiosURI +
-              "/analyse/fzss/DownloadReport?filePath=" +
-              `${res.data.fxbg}`
+                "/analyse/fzss/DownloadReport?filePath=" +
+                `${res.data.fxbg}`
             );
           }
         );
@@ -304,13 +336,16 @@ export default {
       this.$refs.dkDetails.getCollapseList();
     },
     planInfo1(e, item) {
-      console.log('item: ', item);
+      console.log("item: ", item);
       this.$refs.dkDetails.show(item, "规划信息");
     },
     //现状信息
     nowInfo(e, item) {
       this.$refs.dkDetails.show(item, "现状信息");
     },
+    threeInfo(e, item) {
+      this.$refs.dkDetails.show(item, "三维分析");
+    },
 
     deleteprogramme(e, item) {
       e.stopPropagation();
@@ -340,6 +375,14 @@ export default {
     pullUp(item, height) {
       if (!dataSources[item.id])
         this.loadGeoJSON(parse(item.geom), "#000000", item.id, height);
+      else {
+        let entities = dataSources[item.id].entities.values;
+        entities.forEach((entity) => {
+          if (height && entity.polygon) {
+            entity.polygon.extrudedHeight = height;
+          }
+        });
+      }
     },
 
     submit() {
@@ -350,7 +393,7 @@ export default {
       window.open(this.model.zip, "_blank");
     },
 
-    loadJgMap() { },
+    loadJgMap() {},
 
     loadJg(bsm) {
       console.log(bsm, "bsm");