Skip to content

P
pc
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
Hide 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
......@@ -11,61 +11,60 @@ case 'devol': // 本地线上部署环境下
break
case 'pudong-sit':
case 'pudong-sit':
BASE_URL = 'http://pudong.hm.omniview.pro/api/v2',
FANGDI_URL = 'http://962121.fgj.sh.gov.cn/wyweb/shanghaiwuye'
break
case 'pudong-prod':
case 'pudong-prod':
BASE_URL = 'http://211.136.105.193/apiv2',
FANGDI_URL = 'http://962121.fgj.sh.gov.cn/wyweb/shanghaiwuye'
break
case 'xuhui-sit':
case 'xuhui-sit':
BASE_URL = 'http://xuhui.hm.omniview.pro/api/v2',
FANGDI_URL = 'http://962121.fgj.sh.gov.cn/wyweb/shanghaiwuye'
break
case 'xuhui-prod':
BASE_URL = 'http://31.0.161.39/apiv2',
case 'xuhui-prod':
BASE_URL = 'http://31.0.161.39/apiv2',
FANGDI_URL = 'http://962121.fgj.sh.gov.cn/wyweb/shanghaiwuye'
break
case 'yangpu-sit':
case 'yangpu-sit':
BASE_URL = 'http://yangpu-hm.omniview.pro/api/v2',
FANGDI_URL = 'http://962121.fgj.sh.gov.cn/wyweb/shanghaiwuye'
break
case 'yangpu-prod':
case 'yangpu-prod':
BASE_URL = 'http://10.216.118.142/api',
FANGDI_URL = 'http://962121.fgj.sh.gov.cn/wyweb/shanghaiwuye'
break
case 'huangpu-sit':
BASE_URL = 'http://huangpu.hm.omniview.pro/api/v2',
case 'huangpu-sit':
BASE_URL = 'http://huangpu.hm.omniview.pro/api/v2',
FANGDI_URL = 'http://962121.fgj.sh.gov.cn/wyweb/shanghaiwuye'
break
case 'huangpu-prod':
case 'huangpu-prod':
BASE_URL = 'http://172.82.26.1/api',
FANGDI_URL = 'http://962121.fgj.sh.gov.cn/wyweb/shanghaiwuye'
break
default: // 默认环境下（开发环境）
// BASE_URL = 'http://31.0.161.39/apiv2'
// BASE_URL = 'http://31.0.161.39/apiv2'
// BASE_URL = 'http://211.136.105.193/apiv2'
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
}
......@@ -88,8 +87,8 @@ export default {
PUT_PERSONAL_RESET_PWD: '/pwd', // 修改密码
GET_HOME_DISPOSAL: '/service-special-xh-ddd/dashboard/disposal', //处置单统计
GET_HOUSE_MONTH: '/service-documents-ddd/dashboard/house/month', //房办月查统计
GET_ALREADY_OR_EXPIRE: '/service-basicdatasync-ddd/indCou/statistics/alreadyOrWillExpire',
GET_ALREADY_OR_EXPIRE: '/service-basicdatasync-ddd/indCou/statistics/alreadyOrWillExpire',
GET_KEYS: 'service-customkey-ddd/show/{table}/keys', // 某表下所有可显示的字段
POST_KEYS: 'service-customkey-ddd/show/keys', // 保存已选字段
GET_CAN_TBLS: 'service-customkey-ddd/tbls', // 可进行数据拓展的表
......@@ -109,7 +108,7 @@ export default {
POST_EXT: '/service-basicdatasync-ddd/entity/ext', // 保存某数据的自定义信息
GET_SAFE_EXT: '/service-basicdatasync-ddd/{table}/entity/{id}/ext', // 维护自定义信息的借口
POST_EXT_BATCH: '/service-basicdatasync-ddd/entity/ext/batch', // 批量操作
GET_EXPORT: '/service-basicdatasync-ddd/export/{table}', //数据导出
GET_EXPORT_EWM: BASE_URL+'/service-basicdatasync-ddd/public/qrCodeGenerate', //导出二维码
......@@ -182,8 +181,8 @@ export default {
GET_CHWECK_DATA: FANGDI_URL+'/propertyinspector/api/v1/sharingplatform/themeListForOneDay', //专项检查数据
GET_JIANCHADIZHI: '/service-documents-ddd/generateUrl', //获取专项检查页面地址
GET_WYGENERATE: '/service-documents-ddd/wywebgenerateUrl', //获取物业风险发现/处置地址
GET_TOUSUQUESTION_INFO: '/service-documents-ddd/tsDetial', //投诉问题列表
GET_TOUSUDENSITY_LIST: '/service-documents-ddd/tsDensityRank', //投诉密度排行
GET_TOUSUQUESTION_INFO: '/service-documents-ddd/tsDetial', //投诉问题列表
GET_TOUSUDENSITY_LIST: '/service-documents-ddd/tsDensityRank', //投诉密度排行
GET_TOUSUQUESTION_DETAILS: '/service-documents-ddd/tsDetial/{id}', //投诉问题详情
GET_TOUSUQUESTION_LIST: '/service-documents-ddd/tsRank', //投诉问题排行
......
src/views/components/mutSelect.vue
View file @ 5fb737cc
......@@ -58,7 +58,7 @@ export default {
}
},
methods: {
validateMax(rule, value, callback) { // 验证多选个数最大值
validateMax(rule, value, callback) { // 验证多选个数最大值
if (value.length > this.maxLength){
this.formTab.setFieldsValue({
'chooseList': this.selKeysList,
......@@ -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
......@@ -44,7 +44,7 @@
</a-menu-item>
<a-menu-item key="3" v-if="$route.name == 'propertyInfo'">
<a @click="$parent.toList(record.cspId)"> 小区列表 </a>
</a-menu-item>
</a-menu-item>
<a-menu-item key="4" v-if="customKeyEnable == 'true'">
<a @click="showModal(record)"> 拓展信息维护</a>
</a-menu-item>
......@@ -132,7 +132,7 @@ export default {
this.$com.saveColumnsCookie(this.tbl, this.selKeysList, this.allKeys)
},
onSelectChange(selectedRowKeys) { // 被勾选的数据
onSelectChange(selectedRowKeys) { // 被勾选的数据
this.selectedRowKeys = selectedRowKeys
},
......@@ -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,
......@@ -211,7 +212,7 @@ export default {
this.newColumns.forEach(col => {
if(col.key == 'addrFrst'){
col.width = '30%'
}
}
})
}
})
......
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(() => {
......@@ -448,7 +450,7 @@ export default {
changeWy(value){ // 切换物业
let query=JSON.parse(JSON.stringify(this.$route.query))
query={id: '', name: ''}
this.$router.push({path: '/houseData/basicInfo', query: query})
this.$router.push({path: '/houseData/basicInfo', query: query})
this.form.setFieldsValue({
'c.cspId': value
})
......@@ -497,7 +499,7 @@ export default {
this.keyCodeList.forEach(item => {
let value = !this.form.getFieldValue(item)? '':this.form.getFieldValue(item)
if (Object.prototype.toString.call(value)== '[object Array]') { //如果是数组
value = value.join(',')
value = value.join(',')
}else if(Object.prototype.toString.call(value) === '[object Object]'){
value = this.$moment(value).format('YYYY-MM-DD')
}
......@@ -762,11 +764,11 @@ export default {
}
}
let token = this.$cookie.get('token') // 获取token 并拼接到 newUrl
newUrl += 'sectType=1&access_token=' + token.split('bearer ')[1]
newUrl += 'sectType=1&access_token=' + token.split('bearer ')[1]
window.open (this.$api.BASE_URL+'/service-basicdatasync-ddd/export/'+ newUrl)
},
/**
* 导出二维码
* 导出二维码
*/
exportEWM(){
const formValue = this.form.getFieldsValue()
......@@ -816,14 +818,14 @@ export default {
this.tableName = 'tbl_community'
this.formed = '10,' + (this.$moment().format('L').split('/')).join('')
this.type = 'bet'
break
break
case '3':
this.tableName = 'tbl_community'
this.formed = '前期筹备中'
this.type = 'l'
break
break
default:
this.type = ''
this.formed = ''
......@@ -841,7 +843,7 @@ export default {
case '2':
this.isBeforeTwoThousand = '2'
break
default:
this.isBeforeTwoThousand = 'none'
break
......
src/views/houseData/cmDivision.vue
View file @ 5fb737cc
......@@ -263,11 +263,14 @@ export default {
this.getList()
},
exportList(){ //导出功能
const formValue = this.form.getFieldsValue()
// let formValue = this.form.getFieldsValue()
let newUrl = this.tbl + '?'
let newObj = {}
for(const k in formValue){
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]'){
// 数组的话就拼接字符串
......@@ -278,10 +281,10 @@ export default {
}else {
newUrl += k +'=' +formValue[k] +'&' //没有特殊情况 直接拼接到 newUrl
}
}
}
}
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>
......@@ -240,11 +240,11 @@ export default {
this.$router.push({path: `/houseData/neighborhoodCommittees/${params.id}`, query: {id: params.id}})
},
exportList(){ //导出功能
const formValue = this.form.getFieldsValue()
const formValue = this.form.getFieldsValue()
let newUrl = this.tbl + '?'
let newObj = {}
for(const k in formValue){
for(const k in formValue){
if (formValue[k]!= undefined ) { // 判断是否值为 undefined
if(Object.prototype.toString.call(formValue[k])== '[object Array]'){
// 数组的话就拼接字符串
......@@ -255,10 +255,10 @@ export default {
}else {
newUrl += k +'=' +formValue[k] +'&' //没有特殊情况 直接拼接到 newUrl
}
}
}
}
let token = this.$cookie.get('token') // 获取token 并拼接到 newUrl
newUrl += 'sectType=1&access_token=' + token.split('bearer ')[1]
newUrl += 'sectType=1&access_token=' + token.split('bearer ')[1]
window.open (this.$api.BASE_URL+'/service-basicdatasync-ddd/export/'+ newUrl)
},
},
......
src/views/houseData/propertyInfo.vue
View file @ 5fb737cc
......@@ -243,7 +243,7 @@ export default {
this.$set(obj, item, value)
})
const searchParams = Object.assign({}, {
'cspName_l': !this.form.getFieldValue('cspName_l')? '': this.form.getFieldValue('cspName_l'),
'cspName_l': !this.form.getFieldValue('cspName_l')? '': this.form.getFieldValue('cspName_l'),
'sectType_in': '1',
}, obj)
if(this.form.getFieldValue('managedNum')){
......@@ -414,11 +414,15 @@ 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){
for(const k in formValue){
if (formValue[k]!= undefined ) { // 判断是否值为 undefined
if(Object.prototype.toString.call(formValue[k])== '[object Array]'){
// 数组的话就拼接字符串
......@@ -429,10 +433,11 @@ export default {
}else {
newUrl += k +'=' +formValue[k] +'&' //没有特殊情况 直接拼接到 newUrl
}
}
}
}
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