智能选址前端

web_ui/src/views/industrial-land/AiIndustriaLandDetail.vue

@@ -493,7 +493,7 @@ export default {
       //   address: "位于萧山区义桥镇，东至空地，南至空地，西至空地，北至云临路。",
       //   dkmj: 60.714,
       //   tdyt: "工业用地",
-      //   tax:'100',
+      //   tax: "100",
       //   center_wkt: "POINT(120.912063 29.486802)",
       // };
       // this.showDetail = true;
@@ -1147,6 +1147,9 @@ export default {
         var marker = L.marker([ele.latitude, ele.longitude], {
           icon: myIcon,
         }).addTo(this.map);
+        // marker.bindPopup(ele.letter, {
+        //   closeButton: false,
+        // });
         this.nearMarkerList.push(marker);
       });
     },

web_ui/src/views/industrial-land/ZnxzDetail.vue

@@ -17,7 +17,6 @@
       <div class="img-panel">
         <!-- <div class="btn" @click="add" v-if="currentItem == null">加入对比</div> -->
         <!-- <div class="btn c" @click="remove" v-else>取消对比</div> -->
-
         <img src="~@/assets/image/icon-close.png" @click="goClose" />
       </div>
     </div>
@@ -212,8 +211,8 @@
               <div class="table">
                 <div class="table-con">
                   <div class="t-item">
-                    <div class="th c1">地类名称</div>
-                    <div class="th t2 c6">占用面积（亩）</div>
+                    <div class="th c6">地类名称</div>
+                    <div class="th t2 c1">占用面积（亩）</div>
                   </div>
                   <div
                     class="t-item"
@@ -221,8 +220,8 @@
                     :key="index"
                     :class="{ border: index == xzfxList.length - 1 }"
                   >
-                    <div class="td c1">{{ item.name }}</div>
-                    <div class="td c6 t2">{{ item.value }}</div>
+                    <div class="td c6">{{ item.name }}</div>
+                    <div class="td c1 t2">{{ item.value }}</div>
                   </div>
                 </div>
               </div>
@@ -231,8 +230,8 @@
               <div class="table">
                 <div class="table-con">
                   <div class="t-item">
-                    <div class="th c1">用地性质</div>
-                    <div class="th t2 c6">占用面积（亩）</div>
+                    <div class="th c6">用地性质</div>
+                    <div class="th t2 c1">占用面积（亩）</div>
                   </div>
                   <div
                     class="t-item"
@@ -240,8 +239,8 @@
                     :key="index"
                     :class="{ border: index == ghfxList.length - 1 }"
                   >
-                    <div class="td c1">{{ item.name }}</div>
-                    <div class="td c6 t2">{{ item.value }}</div>
+                    <div class="td c6">{{ item.name }}</div>
+                    <div class="td c1 t2">{{ item.value }}</div>
                   </div>
                 </div>
               </div>
@@ -250,8 +249,8 @@
               <div class="table">
                 <div class="table-con">
                   <div class="t-item">
-                    <div class="th c1">类别</div>
-                    <div class="th t2 c6">占用面积（亩）</div>
+                    <div class="th c6">类别</div>
+                    <div class="th t2 c1">占用面积（亩）</div>
                   </div>
                   <div
                     class="t-item"
@@ -259,8 +258,8 @@
                     :key="index"
                     :class="{ border: index == sqsxList.length - 1 }"
                   >
-                    <div class="td c1">{{ item.name }}</div>
-                    <div class="td c6 t2">{{ item.value }}</div>
+                    <div class="td c6">{{ item.name }}</div>
+                    <div class="td c1 t2">{{ item.value }}</div>
                   </div>
                 </div>
               </div>
@@ -953,6 +952,10 @@ export default {
       yjjbntList: [{}],
       stbhhxList: [{}],
       xzfxList: [
+        {
+          name: "湿地",
+          value: 0,
+        },
         {
           name: "耕地",
           value: 0,
@@ -981,14 +984,6 @@ export default {
           name: "水域及水利设施用地",
           value: 0,
         },
-        {
-          name: "城镇村及建设用地",
-          value: 0,
-        },
-        {
-          name: "交通运输用地",
-          value: 0,
-        },
       ],
       ghfxList: [],
       sqsxList: [
@@ -1500,8 +1495,6 @@ export default {
           });
         });
         that.$emit("cluster", pointList);
-        // that.aroundInfolist = featureResultsList
-        // that.initaroundGeometry(featureResultsList)
       });
     },
 
@@ -1514,22 +1507,28 @@ export default {
       this.xzfxList[5].value = 0;
       this.xzfxList[6].value = 0;
       this.xzfxList[7].value = 0;
-      this.xzfxList[8].value = 0;
 
       axios
         .get(window.ApplicationConfig.xzfxUrl + "?wkt=" + wktStr)
         .then((d) => {
           if (d && d.data && d.data.data) {
             let data = d.data.data;
-            this.xzfxList[0].value = (data.gdIntersectArea * 0.0015).toFixed(2);
-            this.xzfxList[1].value = (data.zzydIntersectArea * 0.0015).toFixed(2);
-            this.xzfxList[2].value = (data.cdIntersectArea * 0.0015).toFixed(2);
-            this.xzfxList[3].value = (data.ldIntersectArea * 0.0015).toFixed(2);
-            this.xzfxList[4].value = (data.ssnydIntersectArea * 0.0015).toFixed(2);
-            this.xzfxList[5].value = (data.jsydIntersectArea * 0.0015).toFixed(2);
-            this.xzfxList[6].value = (data.syjslssydIntersectArea * 0.0015).toFixed(2);
-            this.xzfxList[7].value = (data.czcjjsydIntersectArea * 0.0015).toFixed(2);
-            this.xzfxList[8].value = (data.jtysydIntersectArea * 0.0015).toFixed(2);
+            this.xzfxList[0].value = (data.sdIntersectArea * 0.0015).toFixed(2);
+            this.xzfxList[1].value = (data.gdIntersectArea * 0.0015).toFixed(2);
+            this.xzfxList[2].value = (data.zzydIntersectArea * 0.0015).toFixed(
+              2
+            );
+            this.xzfxList[3].value = (data.cdIntersectArea * 0.0015).toFixed(2);
+            this.xzfxList[4].value = (data.ldIntersectArea * 0.0015).toFixed(2);
+            this.xzfxList[5].value = (data.ssnydIntersectArea * 0.0015).toFixed(
+              2
+            );
+            this.xzfxList[6].value = (data.jsydIntersectArea * 0.0015).toFixed(
+              2
+            );
+            this.xzfxList[7].value = (
+              data.syjslssydIntersectArea * 0.0015
+            ).toFixed(2);
           }
         });
     },
@@ -1556,20 +1555,6 @@ export default {
             }
           }
         });
-      // let map={};
-      // this.ghfxResult.data.forEach((item) => {
-      //   if (item.ydxz in map) {
-      //     map[item.ydxz] += item.intersectArea;
-      //   } else {
-      //     map[item.ydxz] = item.intersectArea;
-      //   }
-      // });
-      // for (let k in map) {
-      //   this.ghfxList.push({
-      //     name: k,
-      //     value: (map[k] * 0.0015).toFixed(2),
-      //   });
-      // }
     },
     initSqsx(wktStr) {
       this.sqsxList[0].value = 0;