Skip to content

P
pc
Commit a2506b25 authored by chengzhuo's avatar chengzhuo
Browse files
Options

修改导出

parent 27307011
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 43 deletions
package-lock.json
View file @ a2506b25
...@@ -1634,7 +1634,7 @@ ...@@ -1634,7 +1634,7 @@
"dependencies": { "dependencies": {
"qs": { "qs": {
"version": "6.7.0", "version": "6.7.0",
"resolved": "https://registry.npm.taobao.org/qs/download/qs-6.7.0.tgz", "resolved": "https://registry.npm.taobao.org/qs/download/qs-6.7.0.tgz?cache=0&sync_timestamp=1610598111557&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fqs%2Fdownload%2Fqs-6.7.0.tgz",
"integrity": "sha1-QdwaAV49WB8WIXdr4xr7KHapsbw=", "integrity": "sha1-QdwaAV49WB8WIXdr4xr7KHapsbw=",
"dev": true "dev": true
} }
...@@ -3811,6 +3811,14 @@ ...@@ -3811,6 +3811,14 @@
"stream-shift": "^1.0.0" "stream-shift": "^1.0.0"
} }
}, },
"echarts": {
"version": "4.9.0",
"resolved": "https://registry.npm.taobao.org/echarts/download/echarts-4.9.0.tgz?cache=0&sync_timestamp=1612593208259&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fecharts%2Fdownload%2Fecharts-4.9.0.tgz",
"integrity": "sha1-qbm6oD8Doqcx5jQMVb77V6nhNH0=",
"requires": {
"zrender": "4.3.2"
}
},
"ee-first": { "ee-first": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz", "resolved": "https://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz",
...@@ -4419,7 +4427,7 @@ ...@@ -4419,7 +4427,7 @@
"dependencies": { "dependencies": {
"qs": { "qs": {
"version": "6.7.0", "version": "6.7.0",
"resolved": "https://registry.npm.taobao.org/qs/download/qs-6.7.0.tgz", "resolved": "https://registry.npm.taobao.org/qs/download/qs-6.7.0.tgz?cache=0&sync_timestamp=1610598111557&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fqs%2Fdownload%2Fqs-6.7.0.tgz",
"integrity": "sha1-QdwaAV49WB8WIXdr4xr7KHapsbw=", "integrity": "sha1-QdwaAV49WB8WIXdr4xr7KHapsbw=",
"dev": true "dev": true
} }
...@@ -4917,8 +4925,7 @@ ...@@ -4917,8 +4925,7 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -4939,14 +4946,12 @@ ...@@ -4939,14 +4946,12 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -4961,20 +4966,17 @@ ...@@ -4961,20 +4966,17 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -5091,8 +5093,7 @@ ...@@ -5091,8 +5093,7 @@
"inherits": { "inherits": {
"version": "2.0.4", "version": "2.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -5104,7 +5105,6 @@ ...@@ -5104,7 +5105,6 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -5119,7 +5119,6 @@ ...@@ -5119,7 +5119,6 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -5127,14 +5126,12 @@ ...@@ -5127,14 +5126,12 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.9.0", "version": "2.9.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -5153,7 +5150,6 @@ ...@@ -5153,7 +5150,6 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -5243,8 +5239,7 @@ ...@@ -5243,8 +5239,7 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -5256,7 +5251,6 @@ ...@@ -5256,7 +5251,6 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -5342,8 +5336,7 @@ ...@@ -5342,8 +5336,7 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -5379,7 +5372,6 @@ ...@@ -5379,7 +5372,6 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -5399,7 +5391,6 @@ ...@@ -5399,7 +5391,6 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -5443,14 +5434,12 @@ ...@@ -5443,14 +5434,12 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.1.1", "version": "3.1.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
} }
} }
}, },
...@@ -13057,6 +13046,11 @@ ...@@ -13057,6 +13046,11 @@
"dev": true "dev": true
} }
} }
},
"zrender": {
"version": "4.3.2",
"resolved": "https://registry.npm.taobao.org/zrender/download/zrender-4.3.2.tgz?cache=0&sync_timestamp=1612184244085&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fzrender%2Fdownload%2Fzrender-4.3.2.tgz",
"integrity": "sha1-7HQy+UFcgsc1hLa3uMR+GwFiCcY="
} }
} }
} }
package.json
View file @ a2506b25
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
"build:huangpu-prod": "cross-env NODE_ENV='huangpu-prod' node build/build.js", "build:huangpu-prod": "cross-env NODE_ENV='huangpu-prod' node build/build.js",
"build:yangpu-sit": "cross-env NODE_ENV='yangpu-sit' node build/build.js", "build:yangpu-sit": "cross-env NODE_ENV='yangpu-sit' node build/build.js",
"build:yangpu-prod": "cross-env NODE_ENV='yangpu-prod' node build/build.js" "build:yangpu-prod": "cross-env NODE_ENV='yangpu-prod' node build/build.js"
}, },
"dependencies": { "dependencies": {
"ant-design-vue": "^1.4.3", "ant-design-vue": "^1.4.3",
......
src/views/houseData/cmDivision.vue
View file @ a2506b25
...@@ -263,10 +263,13 @@ export default { ...@@ -263,10 +263,13 @@ export default {
this.getList() this.getList()
}, },
exportList(){ //导出功能 exportList(){ //导出功能
const formValue = this.form.getFieldsValue() let formValue = this.form.getFieldsValue()
let newUrl = this.tbl + '?' let newUrl = this.tbl + '?'
let newObj = {} let newObj = {}
formValue = this.searchParams
delete formValue.token
for(const k in formValue){ for(const k in formValue){
if (formValue[k]!= undefined ) { // 判断是否值为 undefined if (formValue[k]!= undefined ) { // 判断是否值为 undefined
if(Object.prototype.toString.call(formValue[k])== '[object Array]'){ if(Object.prototype.toString.call(formValue[k])== '[object Array]'){
......
src/views/houseData/propertyInfo.vue
View file @ a2506b25
...@@ -414,10 +414,13 @@ export default { ...@@ -414,10 +414,13 @@ export default {
this.getBasicList(this.nowId) this.getBasicList(this.nowId)
}, },
exportList(){ //导出功能 exportList(){ //导出功能
const formValue = this.form.getFieldsValue() let formValue = this.form.getFieldsValue()
let newUrl = this.tbl + '?' let newUrl = this.tbl + '?'
let newObj = {} let newObj = {}
// console.log(formValue.managedNum)
// console.log(this.searchParams)
formValue = this.searchParams
delete formValue.token
for(const k in formValue){ for(const k in formValue){
if (formValue[k]!= undefined ) { // 判断是否值为 undefined if (formValue[k]!= undefined ) { // 判断是否值为 undefined
if(Object.prototype.toString.call(formValue[k])== '[object Array]'){ if(Object.prototype.toString.call(formValue[k])== '[object Array]'){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment