导出调整

package-lock.json

@@ -4925,7 +4925,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4946,12 +4947,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4966,17 +4969,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5093,7 +5099,8 @@
         "inherits": {
           "version": "2.0.4",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5105,6 +5112,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5119,6 +5127,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5126,12 +5135,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.9.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5150,6 +5161,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5239,7 +5251,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5251,6 +5264,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5336,7 +5350,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5372,6 +5387,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5391,6 +5407,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5434,12 +5451,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },

src/views/houseData/cmDivision.vue

@@ -263,11 +263,11 @@ export default {
       this.getList()
     },
     exportList(){ //导出功能
-      let formValue = this.form.getFieldsValue()
+      // let formValue = this.form.getFieldsValue()
       let newUrl = this.tbl + '?'
       let newObj = {}
 
-      formValue = this.searchParams
+      const formValue = this.searchParams
       delete formValue.token
 
       for(const k in formValue){
@@ -284,7 +284,7 @@ export default {
         }
       }
       let token = this.$cookie.get('token') // 获取token 并拼接到 newUrl
-      newUrl += 'sectType=1&access_token=' + token.split('bearer ')[1]
+      newUrl += '&access_token=' + token.split('bearer ')[1]
       window.open (this.$api.BASE_URL+'/service-basicdatasync-ddd/export/'+ newUrl)
     },
   },

src/views/houseData/neighborhoodCommittees.vue

@@ -27,7 +27,7 @@
           </template>
           <!-- 功能按钮区 -->
           <a-col span="24" class="algin-right">
-            <a-button  @click="exportList">导出数据</a-button>
+            <!-- <a-button  @click="exportList">导出数据</a-button> -->
             <a-button @click="reset">重置</a-button>
             <a-button type="primary" @click="search">搜索</a-button>
           </a-col>

src/views/houseData/propertyInfo.vue

@@ -414,13 +414,14 @@ export default {
       this.getBasicList(this.nowId)
     },
     exportList(){ //导出功能
-      let formValue = this.form.getFieldsValue()
+      // let formValue = this.form.getFieldsValue()
       let newUrl = this.tbl + '?'
       let newObj = {}
       // console.log(formValue.managedNum)
       // console.log(this.searchParams)
-      formValue = this.searchParams
+      const formValue = this.searchParams
       delete formValue.token
+
       for(const k in formValue){
         if (formValue[k]!= undefined ) { // 判断是否值为 undefined
           if(Object.prototype.toString.call(formValue[k])== '[object Array]'){
@@ -434,8 +435,9 @@ export default {
           }
         }
       }
+
       let token = this.$cookie.get('token') // 获取token 并拼接到 newUrl
-      newUrl += 'sectType=1&access_token=' + token.split('bearer ')[1]
+      newUrl += '&access_token=' + token.split('bearer ')[1]
       window.open (this.$api.BASE_URL+'/service-basicdatasync-ddd/export/'+ newUrl)
     },
   },