Skip to content

M
mobi
Commit 5fb737cc authored by 程卓's avatar 程卓
Browse files
Options

Merge branch 'dev' of http://git.omniview.pro/fangdi/housemanage/web/majorproject into dev

parents 7266d10d cce809d1
Show whitespace changes
Inline Side-by-side
Showing with 89 additions and 56 deletions
package-lock.json
View file @ 5fb737cc
......@@ -1634,7 +1634,7 @@
"dependencies": {
"qs": {
"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=",
"dev": true
}
......@@ -3811,6 +3811,14 @@
"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": {
"version": "1.1.1",
"resolved": "https://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz",
......@@ -4419,7 +4427,7 @@
"dependencies": {
"qs": {
"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=",
"dev": true
}
......@@ -13057,6 +13065,11 @@
"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 @ 5fb737cc
......@@ -18,7 +18,6 @@
"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-prod": "cross-env NODE_ENV='yangpu-prod' node build/build.js"
},
"dependencies": {
"ant-design-vue": "^1.4.3",
......
src/server/api.js
View file @ 5fb737cc
......@@ -65,7 +65,6 @@ default: // 默认环境下（开发环境）
BASE_URL = 'http://xuhui.hm.omniview.pro/api/v2'
// BASE_URL = 'http://pudong.hm.omniview.pro/api/v2'
// BASE_URL = 'http://211.136.105.193/apiv2'
// MOCK_URL = 'https://yapi.omniview.pro/mock/278'
break
}
......
src/views/components/mutSelect.vue
View file @ 5fb737cc
......@@ -83,11 +83,21 @@ export default {
this.$emit('selKeysNew', value)
this.changeColumnsList(value)
}
},
changeColumnsList(value){ // 表格展示的列
let newArr = []
value.forEach(col => {
if(col.indexOf('&') != -1){ // 如果有& 就取xx.xx
newArr.push(col.split('&')[0] +'.'+ col.split('&')[1] )
}else{
newArr.push( col)
}
})
const arr = []
this.columns.forEach(col => { // 判断在全部字段中 是否有当前字段(有些自定义可能会被删除,就不再显示了)
if (value.indexOf(col.key) !== -1) {
if (newArr.indexOf(col.key) !== -1) {
arr.push(col)
}
})
......@@ -99,6 +109,7 @@ export default {
customRender: 'action'
}
})
this.$emit('changeColumnsList', arr)
},
}
......
src/views/components/tableAndMut.vue
View file @ 5fb737cc
......@@ -191,6 +191,7 @@ export default {
dataIndex: col.key.split('&')[0] +'.'+ col.key.split('&')[1],
key: col.key.split('&')[0] +'.'+ col.key.split('&')[1]
}, )
}else{
this.newColumns.push( {
title: col.keyName,
......
src/views/houseData/basicInfo.vue
View file @ 5fb737cc
......@@ -125,7 +125,7 @@
<!-- 功能按钮区 -->
<a-col span="24" class="algin-right">
<a-button v-if="!$store.state.isXuhui" @click="exportEWM">导出二维码</a-button>
<a-button v-if="!$store.state.isXuhui && $api.BASE_URL.indexOf('211.136.105')!=-1" @click="exportEWM">导出二维码</a-button>
<a-button @click="exportList">导出数据</a-button>
<a-button @click="reset">重置</a-button>
<a-button type="primary" @click="search">搜索</a-button>
......@@ -389,6 +389,8 @@ export default {
this.getStreet()
},
mounted(){
console.log(this.$api.BASE_URL.indexOf('211.136.105')!=-1 )
if(this.$route.name == 'basicInfo'){
this.$nextTick(function () {
// setTimeout(() => {
......
src/views/houseData/cmDivision.vue
View file @ 5fb737cc
......@@ -263,10 +263,13 @@ export default {
this.getList()
},
exportList(){ //导出功能
const formValue = this.form.getFieldsValue()
// let formValue = this.form.getFieldsValue()
let newUrl = this.tbl + '?'
let newObj = {}
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]'){
......@@ -281,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
View file @ 5fb737cc
......@@ -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
View file @ 5fb737cc
......@@ -414,9 +414,13 @@ export default {
this.getBasicList(this.nowId)
},
exportList(){ //导出功能
const formValue = this.form.getFieldsValue()
// let formValue = this.form.getFieldsValue()
let newUrl = this.tbl + '?'
let newObj = {}
// console.log(formValue.managedNum)
// console.log(this.searchParams)
const formValue = this.searchParams
delete formValue.token
for(const k in formValue){
if (formValue[k]!= undefined ) { // 判断是否值为 undefined
......@@ -431,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)
},
},
......
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