Merge branch 'dev-activity0829bug'

src/views/modules/shequzhili/csgltc/csglDetail.vue

@@ -143,7 +143,7 @@ export default {
         this.handleMoveCenter()
       })
       this.handleMoveCenter()
-      this.convert()
+      // this.convert()
     },
 
     setMarker (lat, lng) {

src/views/modules/shequzhili/csgltc/csglForm.vue

@@ -322,8 +322,8 @@ export default {
       map.on('panend', () => {
         this.handleMoveCenter()
       })
-      // this.handleMoveCenter()
-      this.convert()
+      this.handleMoveCenter()
+      // this.convert()
     },
 
     setMarker (lat, lng) {

src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue

@@ -490,12 +490,18 @@ export default {
         this.jmlbOptions = []
         this.jmlbOptions = data
         if (this.jmlbOptions.length > 0) {
-          this.fmData.category = this.jmlbOptions[0].value
+          this.fmData.category = 'anzhibangjiao'
+          // let temp = {
+          //   queryType: this.jmlbOptions[0].queryType,
+          //   tableName: this.jmlbOptions[0].tableName,
+          //   columnName: this.jmlbOptions[0].columnName,
+          //   columnValue: [this.jmlbOptions[0].columnValue],
+          // }
           let temp = {
-            queryType: this.jmlbOptions[0].queryType,
-            tableName: this.jmlbOptions[0].tableName,
-            columnName: this.jmlbOptions[0].columnName,
-            columnValue: [this.jmlbOptions[0].columnValue],
+            queryType: 'list_equal',
+            tableName: 'ic_special',
+            columnName: 'SPECIAL_RQLB',
+            columnValue: ["anzhibangjiao"],
           }
 
           this.elseParams.push(temp)