From dae8fb08b9ff7327da86ed249c9c97a87c90e6f2 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期二, 16 五月 2023 18:05:34 +0800
Subject: [PATCH] 发布管理,图层管理修改

---
 src/components/MapView/mapSpacePop.vue |   82 ++++++++---------------------------------
 1 files changed, 16 insertions(+), 66 deletions(-)

diff --git a/src/components/MapView/mapSpacePop.vue b/src/components/MapView/mapSpacePop.vue
index 9997922..d20a926 100644
--- a/src/components/MapView/mapSpacePop.vue
+++ b/src/components/MapView/mapSpacePop.vue
@@ -218,7 +218,7 @@
           </el-select>
         </el-form-item>
         <el-form-item v-show="!fromSqlflag">
-          <el-input v-model="formSql.value" :placeholder="$t('shuJuGuanLi.shuJuJianSuo.queryContent')"></el-input>
+          <el-input v-model="formSql.value"></el-input>
         </el-form-item>
         <el-form-item v-show="fromSqlflag">
           <el-date-picker
@@ -500,54 +500,23 @@
       if (data.code != 200) {
         this.$message.error("鍒楄〃璋冪敤澶辫触")
       }
-      const data1 = await inquiry_selectDomains({ name: this.spaceLayer })
-      if (data1.code != 200) {
-        this.$message.error("鍒楄〃璋冪敤澶辫触")
-      }
-
-
-
+      this.filedsOption = [];
       this.optionx = []
-      this.attributeData = []
       var valadata = data.result
-      var laydomain = data1.result
-      this.optionx = data1.result
       for (var i in valadata) {
         if (valadata[i].showtype == 1) {
           if (
             valadata[i].domainNa != null &&
             valadata[i].domainNa != undefined
           ) {
-            for (var j in laydomain) {
-              if (laydomain[j].domName == valadata[i].domainNa) {
-                // valadata[i].domainNa = laydomain[j].codeDesc
-              }
-            }
+            valadata[i].domainNa = this.getMatchDomainNa(valadata[i].domainNa)
           }
-
+          this.optionx.push(valadata[i])
           this.filedsOption.push(valadata[i])
-          // this.attributeData.push(valadata[i])
-          // this.optionx.push(valadata[i])
           this.attributeData.push(valadata[i])
-
         }
       }
-
-      // this.filedsOption = [];
-      // this.optionx = []
-      // var valadata = data.result
-      // for (var i in valadata) {
-      //   if (valadata[i].showtype == 1) {
-      //     if (
-      //       valadata[i].domainNa != null &&
-      //       valadata[i].domainNa != undefined
-      //     ) {
-      //       valadata[i].domainNa = this.getMatchDomainNa(valadata[i].domainNa)
-      //     }
-
-      //   }
-      // }
-      // this.startFiledAndcondition();
+      this.startFiledAndcondition();
       this.showSpacePopLayer()
     },
     appendQueryFilter() {
@@ -676,40 +645,21 @@
       })
 
 
-
+      var val_Data = data.result
       this.count = data.count
-      for (var i in val) {
-        var meson = this.optionx.filter(res => {
-          if (res.domCode == val[i].medium) {
-            return res
-          }
-        })
-        if (meson.length > 0) {
-          val[i].medium = meson[0].codeDesc
-        } else {
-          val[i].medium = ''
-        }
 
+      for (var i in val_Data) {
+        var valste = val_Data[i]
+        for (var j in this.optionx) {
+          if (
+            this.optionx[j].domainNa != null &&
+            this.optionx[j].domainNa != undefined
+          ) {
+            valste[this.optionx[j].field] = this.optionx[j].domainNa
+          }
+        }
       }
 
-      // // // for (var i in val_Data) {
-      // // //   var valste = val_Data[i]
-      // // //   for (var j in this.optionx) {
-      // // //     if (
-      // // //       this.optionx[j].domainNa != null &&
-      // // //       this.optionx[j].domainNa != undefined
-      // // //     ) {
-      // // //       console.log(this.optionx[j])
-      // // //       // valste[this.optionx[j].field] = this.optionx[j].domainNa
-      // // //     }
-      // // //   }
-      // // // }
-      // // for (var j in this.optionx) {
-      // //   console.log(this.optionx[j].domainNa)
-      // //   // if (this.optionx[j].alias == '杈撻�佷粙璐�') {
-      // //   //   console.log(this.optionx[j].domainNa)
-      // //   // }
-      // // }
 
       this.tableData = val
       this.$refs.filterTable.doLayout()

--
Gitblit v1.9.3