地图过滤和功能调整

BJYSYBZ_C/public/config.js

@@ -1,6 +1,6 @@
 const arcMapToken = "sy-af242c93-2d14-4232-812b-b9f23172dbb2";
 window.ApplicationConfig = {
-  // baseUrl: "https://zlzd.zrzyt.zj.gov.cn/app215/ybz-api/",
+  // baseUrl: "https://zdzy.zrzyt.zj.gov.cn/ybzBjServer/",
   baseUrl: '/ysgzybz',
   mapLayerConfig: {
     use: "innerNet",

BJYSYBZ_C/src/views/KgView/components/FourContent.vue

@@ -222,6 +222,18 @@ export default {
       });
       return map;
     },
+    flattenList () {
+      let arrs = [];
+      for (let i = 0; i < ydlxDicts.length; i++){
+        if (ydlxDicts[i]['value'] === 'Q') continue;
+        if (ydlxDicts[i]['children']) {
+          ydlxDicts[i]['children'].forEach((item) => {
+            arrs.push(item['value'])
+          })
+        }
+      }
+      return arrs;
+    },
     async searchData () {
       this.ydlx_n = [];
       this.isOther = false;
@@ -267,7 +279,18 @@ export default {
           }
         })
         if (this.isOther) {
-          refreshP += ` and dlbm not in (${pstr})`
+          const arrs = this.flattenList();
+          let pstr_n = '';
+          arrs.forEach((it,index) => {
+            pstr_n += "'"
+            pstr_n += it
+            if (index === arrs.length - 1) {
+              pstr_n += "'";
+            } else {
+              pstr_n += "',"
+            }
+          })
+          refreshP += ` and dlbm not in (${pstr_n})`
         } else {
            refreshP += ` and dlbm in (${pstr})`
         }

BJYSYBZ_C/src/views/WlydxqView/components/FourContent.vue

@@ -304,6 +304,18 @@ export default {
         resolve({data: []})
       })
     },
+    flattenList () {
+      let arrs = [];
+      for (let i = 0; i < ydlxDicts.length; i++){
+        if (ydlxDicts[i]['value'] === 'Q') continue;
+        if (ydlxDicts[i]['children']) {
+          ydlxDicts[i]['children'].forEach((item) => {
+            arrs.push(item['value'])
+          })
+        }
+      }
+      return arrs;
+    },
     getTsxzListData() {
       const urlApi = `/api/ybz-bj/wlydList`;
       let p = {
@@ -423,7 +435,18 @@ export default {
           }
         })
         if (this.isOther) {
-          refreshP += ` and zydxz not in (${pstr})`
+          const arrs = this.flattenList();
+          let pstr_n = '';
+          arrs.forEach((it,index) => {
+            pstr_n += "'"
+            pstr_n += it
+            if (index === arrs.length - 1) {
+              pstr_n += "'";
+            } else {
+              pstr_n += "',"
+            }
+          })
+          refreshP += ` and zydxz not in (${pstr_n})`
         } else {
           refreshP += ` and zydxz in (${pstr})`
         }

BJYSYBZ_C/src/views/WlydxqView/components/Xq.vue

@@ -114,12 +114,6 @@
               {{ obj.sfjdsm }}
             </td>
           </tr>
-          <tr>
-            <th class="th">收储计划</th>
-            <td>
-              {{ obj.crjh }}
-            </td>
-          </tr>
         </table>
       </div>
     </cart-item>

BJYSYBZ_C/src/views/WlydxqView/components/Yt.vue

@@ -3,9 +3,9 @@
     <cart-item title="空间组成">
       <div class="main-box">
         <div class="item">
-          <div class="item-top">工业用地</div>
+          <div class="item-top">住宅用地</div>
           <div class="item-bottom">
-            <span>{{ gyyd }}</span>亩
+            <span>{{ zzyd }}</span>亩
           </div>
         </div>
         <div class="item">
@@ -15,9 +15,9 @@
           </div>
         </div> 
         <div class="item">
-          <div class="item-top">住宅用地</div>
+          <div class="item-top">工业用地</div>
           <div class="item-bottom">
-            <span>{{ zzyd }}</span>亩
+            <span>{{ gyyd }}</span>亩
           </div>
         </div>
         <div class="item">

BJYSYBZ_C/vue.config.js

@@ -32,13 +32,13 @@ module.exports = {
         }
       },
       '/ysgzybz': {
-        // target: 'http://59.202.43.95:8801/kjzz/', // 服务器端接口地址
-        target: 'http://localhost:7089/', // 服务器端接口地址
+        target: 'https://zdzy.zrzyt.zj.gov.cn/ybzBjServer/', // 服务器端接口地址
+        // target: 'http://localhost:7089/', // 服务器端接口地址
         ws: true, // 如果要代理 websockets，配置这个参数
         // 如果是https接口，需要配置这个参数
         changeOrigin: true, // 是否跨域
         pathRewrite: {
-          '^/clzy': '/'
+          '^/ysgzybz': '/'
         }
       },
       '/arcMapServer2': {