Skip to content

M
multiSystem
Commit 1e46c158 authored by Gakki's avatar Gakki
Browse files
Options

Merge branch 'xuhui' into dev

parents c10ba28d cdd2128e
Show whitespace changes
Inline Side-by-side
Showing with 52 additions and 105 deletions
config/index.js
View file @ 1e46c158
...@@ -28,7 +28,7 @@ module.exports = { ...@@ -28,7 +28,7 @@ module.exports = {
}, },
// Various Dev Server settings // Various Dev Server settings
host: 'localhost', // can be overwritten by process.env.HOST host: '0.0.0.0', // can be overwritten by process.env.HOST
port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: false, autoOpenBrowser: false,
errorOverlay: true, errorOverlay: true,
......
src/router/getMicRouters.js
View file @ 1e46c158
...@@ -35,7 +35,7 @@ async function GetRoutes(router) { ...@@ -35,7 +35,7 @@ async function GetRoutes(router) {
break break
default: // 当前仅可使用pudong / xuhui-sit/uat进行打包 default: // 当前仅可使用pudong / xuhui-sit/uat进行打包
MicRouters = huangpu MicRouters = xuhui
break break
} }
......
src/router/micSystemsList.json
View file @ 1e46c158
...@@ -16,12 +16,12 @@ ...@@ -16,12 +16,12 @@
}, },
{ {
"name": "order", "name": "order",
"entry": "http://xuhui.hm.omniview.pro/order", "entry": "http://31.0.161.39/order",
"activeRule": "/order" "activeRule": "/order"
}, },
{ {
"name": "question", "name": "question",
"entry": "http://xuhui.hm.omniview.pro/question", "entry": "http://31.0.161.39/question",
"activeRule": "/question" "activeRule": "/question"
} }
] ]
src/views/components/tableAndMut.vue
View file @ 1e46c158
...@@ -36,9 +36,9 @@ ...@@ -36,9 +36,9 @@
<a-menu-item key="0" v-if="$route.name == 'basicInfo'"> <a-menu-item key="0" v-if="$route.name == 'basicInfo'">
<a @click="$parent.toBul(record)"> 门牌幢 </a> <a @click="$parent.toBul(record)"> 门牌幢 </a>
</a-menu-item> </a-menu-item>
<a-menu-item key="1" v-if="$route.name == 'basicInfo'"> <!-- <a-menu-item key="1" v-if="$route.name == 'basicInfo'">
<a @click="$parent.toShebei(record)"> 设施设备 </a> <a @click="$parent.toShebei(record)"> 设施设备 </a>
</a-menu-item> </a-menu-item> -->
<a-menu-item key="2" v-if="$route.name == 'indCous'"> <a-menu-item key="2" v-if="$route.name == 'indCous'">
<a @click="$parent.toMem(record)"> 成员列表 </a> <a @click="$parent.toMem(record)"> 成员列表 </a>
</a-menu-item> </a-menu-item>
......
src/views/houseData/basicInfo.vue
View file @ 1e46c158
...@@ -21,6 +21,11 @@ ...@@ -21,6 +21,11 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col span="8" >
<a-form-item label="门牌幢地址" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-input placeholder="请输入查询内容" v-decorator="['unitAddr']" />
</a-form-item>
</a-col>
<a-col span="8"> <a-col span="8">
<a-form-item label="物业公司名称" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}"> <a-form-item label="物业公司名称" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-select showSearch allowClear placeholder="请选择查询内容" v-decorator="['c.cspId'] " @change="changeWy"> <a-select showSearch allowClear placeholder="请选择查询内容" v-decorator="['c.cspId'] " @change="changeWy">
...@@ -343,6 +348,7 @@ export default { ...@@ -343,6 +348,7 @@ export default {
'c.hoId': !this.form.getFieldValue('c.hoId')?'':this.form.getFieldValue('c.hoId').split('#')[1], 'c.hoId': !this.form.getFieldValue('c.hoId')?'':this.form.getFieldValue('c.hoId').split('#')[1],
'c.streetId': !this.form.getFieldValue('c.streetId')?'':this.form.getFieldValue('c.streetId').split('#')[1], 'c.streetId': !this.form.getFieldValue('c.streetId')?'':this.form.getFieldValue('c.streetId').split('#')[1],
'stKind_in': !this.form.getFieldValue('stKind_in')?'':this.form.getFieldValue('stKind_in').join(','), 'stKind_in': !this.form.getFieldValue('stKind_in')?'':this.form.getFieldValue('stKind_in').join(','),
'unitAddr': !this.form.getFieldValue('unitAddr')?'' : this.form.getFieldValue('unitAddr'),
'sectType_in': '1', 'sectType_in': '1',
'c.createTime_desc': 'desc' 'c.createTime_desc': 'desc'
}, obj, isHocId)// 融合obj 和isHocId 到入参 }, obj, isHocId)// 融合obj 和isHocId 到入参
...@@ -436,6 +442,9 @@ export default { ...@@ -436,6 +442,9 @@ export default {
getStreet(){ //获取街道下拉 getStreet(){ //获取街道下拉
this.$ajax.get({ this.$ajax.get({
url: this.$api.GET_STREET_LIST, url: this.$api.GET_STREET_LIST,
params: {
pageSize: 10000
}
}).then(res => { }).then(res => {
this.street = this.$com.confirm(res, 'data.content', []) this.street = this.$com.confirm(res, 'data.content', [])
}) })
...@@ -569,7 +578,7 @@ export default { ...@@ -569,7 +578,7 @@ export default {
} }
let token = this.$cookie.get('token') // 获取token 并拼接到 newUrl let token = this.$cookie.get('token') // 获取token 并拼接到 newUrl
newUrl += 'sectType=1&token=' + token newUrl += 'sectType=1&token=' + token
window.open (this.$api.BASE_URL+'/service-search/export/'+ newUrl) window.open (this.$api.BASE_URL+'/service-basicdatasync-ddd/export/'+ newUrl)
}, },
/** /**
* 导出二维码 * 导出二维码
......
src/views/houseData/basicView.vue
View file @ 1e46c158
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<a-col span="8"> <a-col span="8">
<a-row type="flex" justify="start" class="detailsPartLine"> <a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24"> <a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"小区名称"' :text='detail.stNameFrst '></DetailsItem> <DetailsItem :labelSpan='12' :textSpan="12" :label='"小区名称"' :text='detail.stNameFrst'></DetailsItem>
</a-col> </a-col>
</a-row> </a-row>
<a-row type="flex" justify="start" class="detailsPartLine"> <a-row type="flex" justify="start" class="detailsPartLine">
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</a-row> </a-row>
<a-row type="flex" justify="start" class="detailsPartLine"> <a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24"> <a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"小区地址"' :text='detail.addrFrst '></DetailsItem> <DetailsItem :labelSpan='12' :textSpan="12" :label='"小区地址"' :text='detail.addrFrst'></DetailsItem>
</a-col> </a-col>
</a-row> </a-row>
<a-row type="flex" justify="start" class="detailsPartLine"> <a-row type="flex" justify="start" class="detailsPartLine">
...@@ -564,6 +564,29 @@ ...@@ -564,6 +564,29 @@
</a-row> </a-row>
</div> </div>
</div> </div>
<!-- 业委会信息 -->
<div class="layoutMargin detailsPartSection" v-if="!!rcInfo">
<p id="cmtInfo" class="detailsPartTitle">居委会信息</p>
<div style="margin:0 16px;">
<a-row type="flex" justify="start">
<a-col span="8">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"居委会名称"' :text='rcInfo.cmtName '></DetailsItem>
</a-col>
<a-col span="8">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"居委会地址"' :text='rcInfo.cmtAddr '></DetailsItem>
</a-col>
<a-col span="8">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"居委主任姓名"' :text='rcInfo.cmtDirectorName '></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start">
<a-col span="8">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"居委书记姓名"' :text='rcInfo.cmtSecretaryName '></DetailsItem>
</a-col>
</a-row>
</div>
</div>
<!-- 自定义字段 --> <!-- 自定义字段 -->
<div class="layoutMargin detailsPartSection" v-if="customKeyEnable == 'true' && extList.length>0"> <div class="layoutMargin detailsPartSection" v-if="customKeyEnable == 'true' && extList.length>0">
<p id="extList" class="detailsPartTitle">拓展信息</p> <p id="extList" class="detailsPartTitle">拓展信息</p>
...@@ -596,6 +619,7 @@ ...@@ -596,6 +619,7 @@
<a-anchor-link href="#train" title="物业企业信息" /> <a-anchor-link href="#train" title="物业企业信息" />
<a-anchor-link href="#cmInfo" title="小区经理信息" /> <a-anchor-link href="#cmInfo" title="小区经理信息" />
<a-anchor-link href="#ertificate" title="业主大会信息" /> <a-anchor-link href="#ertificate" title="业主大会信息" />
<a-anchor-link href="#cmtInfo" title="居委会信息" />
<a-anchor-link v-if="customKeyEnable == 'true' && extList.length>0" href="#extList" title="拓展信息" /> <a-anchor-link v-if="customKeyEnable == 'true' && extList.length>0" href="#extList" title="拓展信息" />
</a-anchor> </a-anchor>
</div> </div>
...@@ -617,6 +641,7 @@ export default { ...@@ -617,6 +641,7 @@ export default {
caoInfo: {}, caoInfo: {},
cmInfo: {}, cmInfo: {},
icInfo: {}, icInfo: {},
rcInfo: {},
extList: [], // ext所有列表 extList: [], // ext所有列表
customKeyEnable: 'false', customKeyEnable: 'false',
} }
...@@ -685,6 +710,9 @@ export default { ...@@ -685,6 +710,9 @@ export default {
// this.caoInfo = this.$com.confirm(res, 'data.content.caoInfo', []) // this.caoInfo = this.$com.confirm(res, 'data.content.caoInfo', [])
// this.cmInfo = this.$com.confirm(res, 'data.content.cmInfo', []) // this.cmInfo = this.$com.confirm(res, 'data.content.cmInfo', [])
// this.icInfo = this.$com.confirm(res, 'data.content.icInfo', []) // this.icInfo = this.$com.confirm(res, 'data.content.icInfo', [])
if(!!data.rcInfo) {
this.rcInfo = data.rcInfo
}
this.ppInfo = data.ppInfo this.ppInfo = data.ppInfo
this.caoInfo = data.caoInfo this.caoInfo = data.caoInfo
this.cmInfo = data.cmInfo this.cmInfo = data.cmInfo
......
src/views/houseData/cmDivision.vue
View file @ 1e46c158
...@@ -256,7 +256,7 @@ export default { ...@@ -256,7 +256,7 @@ export default {
} }
let token = this.$cookie.get('token') // 获取token 并拼接到 newUrl let token = this.$cookie.get('token') // 获取token 并拼接到 newUrl
newUrl += 'sectType=1&token=' + token newUrl += 'sectType=1&token=' + token
window.open (this.$api.BASE_URL+'/service-search/export/'+ newUrl) window.open (this.$api.BASE_URL+'/service-basicdatasync-ddd/export/'+ newUrl)
}, },
}, },
} }
......
src/views/houseData/indCous.vue
View file @ 1e46c158
...@@ -257,7 +257,7 @@ export default { ...@@ -257,7 +257,7 @@ export default {
} }
let token = this.$cookie.get('token') // 获取token 并拼接到 newUrl let token = this.$cookie.get('token') // 获取token 并拼接到 newUrl
newUrl += 'sectType=1&token=' + token newUrl += 'sectType=1&token=' + token
window.open (this.$api.BASE_URL+'/service-search/export/'+ newUrl) window.open (this.$api.BASE_URL+'/service-basicdatasync-ddd/export/'+ newUrl)
}, },
}, },
......
src/views/houseData/managers.vue
View file @ 1e46c158
...@@ -296,7 +296,7 @@ export default { ...@@ -296,7 +296,7 @@ export default {
} }
let token = this.$cookie.get('token') // 获取token 并拼接到 newUrl let token = this.$cookie.get('token') // 获取token 并拼接到 newUrl
newUrl += 'sectType=1&token=' + token newUrl += 'sectType=1&token=' + token
window.open (this.$api.BASE_URL+'/service-search/export/'+ newUrl) window.open (this.$api.BASE_URL+'/service-basicdatasync-ddd/export/'+ newUrl)
}, },
}, },
......
src/views/houseData/nonResidents.vue
View file @ 1e46c158
...@@ -328,7 +328,7 @@ export default { ...@@ -328,7 +328,7 @@ export default {
} }
const token = this.$cookie.get('token') // 获取token 并拼接到 newUrl const token = this.$cookie.get('token') // 获取token 并拼接到 newUrl
newUrl += '&token=' + token newUrl += '&token=' + token
window.open (this.$api.BASE_URL+'/service-search/export/'+ newUrl) window.open (this.$api.BASE_URL+'/service-basicdatasync-ddd/export/'+ newUrl)
}, },
}, },
} }
......
src/views/houseData/propertyInfo.vue
View file @ 1e46c158
...@@ -422,7 +422,7 @@ export default { ...@@ -422,7 +422,7 @@ export default {
} }
let token = this.$cookie.get('token') // 获取token 并拼接到 newUrl let token = this.$cookie.get('token') // 获取token 并拼接到 newUrl
newUrl += 'sectType=1&token=' + token newUrl += 'sectType=1&token=' + token
window.open (this.$api.BASE_URL+'/service-search/export/'+ newUrl) window.open (this.$api.BASE_URL+'/service-basicdatasync-ddd/export/'+ newUrl)
}, },
}, },
} }
......
src/views/houseData/propertyInfoView.vue
View file @ 1e46c158
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
</a-row> </a-row>
<a-row type="flex" justify="start" class="detailsPartLine"> <a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24"> <a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"物业公司在管小区数"' :text='detail.totSects'/> <DetailsItem :labelSpan='12' :textSpan="12" :label='"物业公司在管小区数"' :text='detail.managedNum'/>
</a-col> </a-col>
</a-row> </a-row>
<a-row type="flex" justify="start" class="detailsPartLine"> <a-row type="flex" justify="start" class="detailsPartLine">
......
src/views/houseData/shebei.vue
View file @ 1e46c158
...@@ -10,96 +10,6 @@ ...@@ -10,96 +10,6 @@
</div> </div>
<div class="portalDetailContentBody" ref='portalDetailContentBody'> <div class="portalDetailContentBody" ref='portalDetailContentBody'>
<template > <template >
<div class="layoutMargin detailsPartSection">
<p id="experience" class="detailsPartTitle">设施设备基础信息</p>
<div style="margin:0 16px;">
<a-row type="flex" justify="start">
<a-col span="8">
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"小区编码"' :text='febInfo.csName'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"地面机动车库数量"' :text='febInfo.upVehicleGarageNum'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"地下机动车库数量"' :text='febInfo.downVehicleGarageNum'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"机械车库数量"' :text='febInfo.mechGarageNum'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"非机动车库数量"' :text='febInfo.nonVehicleGarageNum'></DetailsItem>
</a-col>
</a-row>
</a-col>
<a-col span="8">
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"供水消防总泵数量"' :text='febInfo.firePumpNum'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"供水消防总泵维保单位"' :text='febInfo.firePumpRepairComp'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"供水生活总泵数量"' :text='febInfo.waterPumpNum'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"供水生活总泵维保单位"' :text='febInfo.waterPumpRepairComp'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"监控主控室位置"' :text='febInfo.monitoringRoomPosition'></DetailsItem>
</a-col>
</a-row>
</a-col>
<a-col span="8">
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"非机动车库烟感喷淋数量"' :text='febInfo.nonVehicleSmokeSprayNum'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"生活垃圾库房"' :text='febInfo.domesticGarbageWarehouse'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"建筑垃圾库房"' :text='febInfo.constructionWasteWarehouse'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"非机动车集中充电设施设备改造数量"' :text='febInfo.nonVehicleChargeNum'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" label="" text=""></DetailsItem>
</a-col>
</a-row>
</a-col>
</a-row>
</div>
</div>
<div class="layoutMargin detailsPartSection"> <div class="layoutMargin detailsPartSection">
<a-tabs class="portalTable" :activeKey="activeKey" @change="changeTabs"> <a-tabs class="portalTable" :activeKey="activeKey" @change="changeTabs">
<a-tab-pane v-for="item in tabList" :tab="item.name" :key="item.key" /> <a-tab-pane v-for="item in tabList" :tab="item.name" :key="item.key" />
......
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