diff --git a/.env.development b/.env.development index 30e67c27b..0fde813fa 100644 --- a/.env.development +++ b/.env.development @@ -1,9 +1,9 @@ NODE_ENV=development # VUE_APP_API_SERVER = https://epmet-preview.elinkservice.cn/api -# VUE_APP_API_SERVER = http://localhost:8080/api +# VUE_APP_API_SERVER = http://192.168.1.60:8080/api VUE_APP_API_SERVER = http://219.146.91.110:30801/api -# VUE_APP_API_SERVER = http://219.146.91.110:30801/api +# VUE_APP_API_SERVER = http://219.146.91.110:30801/api219.146.91.110:30801 # VUE_APP_API_SERVER = https://epmet-yantai.elinkservice.cn/api # VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api # VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api diff --git a/.env.production.sit b/.env.production.sit index 2191f2dde..5c4611a9a 100644 --- a/.env.production.sit +++ b/.env.production.sit @@ -1,7 +1,7 @@ NODE_ENV=production # VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api -# VUE_APP_API_SERVER = http://192.168.1.140/api -VUE_APP_API_SERVER = http://219.146.91.110:30801/api +VUE_APP_API_SERVER = http://192.168.1.140/api +# VUE_APP_API_SERVER = http://192.168.1.60:8080/api VUE_APP_BIPASS_API_SERVER = http://dcommunity-dev.elinkservice.cn:30801/linkdata/linkdata-gateway/route VUE_APP_NODE_ENV=prod:sit VUE_APP_PUBLIC_PATH=epmet-oper diff --git a/README.md b/README.md index 9c118b8ac..cf2224fa6 100644 --- a/README.md +++ b/README.md @@ -19,3 +19,5 @@ npm run build ``` npm run lint ``` + +export NODE_OPTIONS=--max-old-space-size=4096 \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 4de359e98..a4c73427a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -118,6 +118,16 @@ export const moduleRoutes = { title: "", }, }, + { + path: "house-huaxiang", + props: true, + name: "house-huaxiang", + component: () => import("@/views/modules/portrayal/house/index"), + meta: { + isTab: true, + title: "", + }, + }, { path: "fangwu-huaxiang", props: true, @@ -932,6 +942,10 @@ router.beforeEach((to, from, next) => { to.meta.title = store.state.huaXiang.userInfo.name return next(); } + if (to.name === 'house-huaxiang') { + to.meta.title = store.state.huaXiang.houseInfo.houseName + return next(); + } if (to.name === 'fangwu-huaxiang') { to.meta.title = store.state.huaXiang.houseInfo.doorName return next(); diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue index 8ef63d166..9e9e819a9 100644 --- a/src/views/components/addResi.vue +++ b/src/views/components/addResi.vue @@ -497,13 +497,13 @@ export default { { agencyName: this.$store.state.user.agencyName, agencyId: this.$store.state.user.agencyId, - gridId: null,//所属网格id - villageId: null,//小区id - buildId: null,//楼栋id - unitId: null,//单元id + gridId: this.$route.params.gridId,//所属网格id + villageId: this.$route.params.villageId,//小区id + buildId: this.$route.params.buildId,//楼栋id + unitId: this.$route.params.unitId,//单元id moveOutFlag: null, outOfTime: null,//迁出时间 - homeId: null, //房屋id + homeId: this.$route.params.homeId, //房屋id placeOfDomicile: null,//户籍所在地 currentResidence: null,//现居住地 householdSituation: null,//人户状况 @@ -985,8 +985,22 @@ export default { created() { this.getDicts() this.getOrgTreeList() + + this.initHouseBind(); + }, methods: { + // 从房屋画像进行添加居民时绑定房屋信息 + initHouseBind(){ + for (let i in this.form.resideInfoDtos) { + this.getValiheList(i); + this.getBuildList(i); + this.getHouseList(i); + this.getUniList(i); + this.form.resideInfoDtos[i].orgOptions = [] + this.getOrgTreeList(this.form.resideInfoDtos[i].agencyId,i); + } + }, async getDicts() { try { const requests = [ @@ -1185,8 +1199,6 @@ export default { }, handleValidBlur() { if (this.form.baseInfoDto.idType != 1) return - this.getResidentInfoByIdNum() - if (!isCard(this.form.baseInfoDto.idNum) && !isPassport(this.form.baseInfoDto.idNum)) return const { user } = this.$store.state let huji = '', i = 0 @@ -1208,36 +1220,6 @@ export default { } }, - async getResidentInfoByIdNum(){ - try { - let url = '/actual/base/residentBaseInfo/getResidentInfoByIdNum' - let parm = { - idType: this.form.baseInfoDto.idType, - idNum: this.form.baseInfoDto.idNum - } - let { code, data, msg } = await requestGet(url,parm) - if (code == 0 && data != null) { - this.$confirm(`该居民已存在于“${data.name}”是否继续填写`, { - confirmButtonText: '前往修改', - cancelButtonText: '继续填写', - type: 'warning' - }).then(() => { - this.$router.push({ name: 'edit-resi', query: { id: data.id }, params: { idNum: data.idNum, mobile: data.mobile } }); - - }).catch(() => { - - }); - - } else if (code >= 8000) { - this.$message.error(msg); - this.btnLoading = false; - } - } - catch (error) { - // this.$message.error(msg); - console.log(msg); - } - }, handleLocalRadio(e) { if (e.target.type === 'radio') return this.form.baseInfoDto.localResidenceFlag = this.form.baseInfoDto.localResidenceFlag === 0 ? 1 : 0; @@ -1302,7 +1284,6 @@ export default { }) }, async submitForm(house) { - this.btnLoading = true; try { let url = '/actual/base/residentBaseInfo/save' let parm = { @@ -1320,16 +1301,14 @@ export default { this.$refs['addForm'].resetFields(); this.form.resideInfoDtos = homeArr } - this.btnLoading = false; - } else if (code >= 8000) { this.$message.error(msg); - this.btnLoading = false; } } catch (error) { this.$message.error(msg); } + }, showDialog({ index, value }, event) { if (value == 1) { diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index 26cb23de9..f1e376faf 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -602,12 +602,16 @@ export default { }, handleDetail (row) { - this.detailShow = true; - - // const _data = await this.detail(row) - this.$nextTick(() => { - this.$refs.ref_form_detail.initForm(row, this.agencyObj); - }); + this.lookResiId = row.resiId; + let { agencyId, gridId, gridName, houseId, houseName} = row + this.$store.dispatch('saveDataH', { agencyId, gridId, gridName, houseId, houseName}); + this.$router.push({ name: 'house-huaxiang' }); + this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => { + if (item.name === "house-huaxiang") { + return { ...item, title: name }; + } + return item; + }); }, detailFormCancle () { diff --git a/src/views/modules/portrayal/house/cpts/businessRecord.vue b/src/views/modules/portrayal/house/cpts/businessRecord.vue new file mode 100644 index 000000000..2371a5980 --- /dev/null +++ b/src/views/modules/portrayal/house/cpts/businessRecord.vue @@ -0,0 +1,298 @@ + + + + + \ No newline at end of file diff --git a/src/views/modules/portrayal/house/cpts/details/fwdetail.vue b/src/views/modules/portrayal/house/cpts/details/fwdetail.vue new file mode 100644 index 000000000..7a7a7caf1 --- /dev/null +++ b/src/views/modules/portrayal/house/cpts/details/fwdetail.vue @@ -0,0 +1,206 @@ + + + + + + + \ No newline at end of file diff --git a/src/views/modules/portrayal/house/cpts/details/shengdetail.vue b/src/views/modules/portrayal/house/cpts/details/shengdetail.vue new file mode 100644 index 000000000..e8835661e --- /dev/null +++ b/src/views/modules/portrayal/house/cpts/details/shengdetail.vue @@ -0,0 +1,189 @@ + + + + + + + \ No newline at end of file diff --git a/src/views/modules/portrayal/house/cpts/details/sjdetail.vue b/src/views/modules/portrayal/house/cpts/details/sjdetail.vue new file mode 100644 index 000000000..84c3084b7 --- /dev/null +++ b/src/views/modules/portrayal/house/cpts/details/sjdetail.vue @@ -0,0 +1,306 @@ + + + + + + \ No newline at end of file diff --git a/src/views/modules/portrayal/house/cpts/details/sqdetail.vue b/src/views/modules/portrayal/house/cpts/details/sqdetail.vue new file mode 100644 index 000000000..b718abe25 --- /dev/null +++ b/src/views/modules/portrayal/house/cpts/details/sqdetail.vue @@ -0,0 +1,283 @@ + + + + + \ No newline at end of file diff --git a/src/views/modules/portrayal/house/cpts/details/xqdetail.vue b/src/views/modules/portrayal/house/cpts/details/xqdetail.vue new file mode 100644 index 000000000..047666a2d --- /dev/null +++ b/src/views/modules/portrayal/house/cpts/details/xqdetail.vue @@ -0,0 +1,188 @@ + + + + + \ No newline at end of file diff --git a/src/views/modules/portrayal/house/cpts/graph.vue b/src/views/modules/portrayal/house/cpts/graph.vue new file mode 100644 index 000000000..18b3de69b --- /dev/null +++ b/src/views/modules/portrayal/house/cpts/graph.vue @@ -0,0 +1,187 @@ + + + + + + + \ No newline at end of file diff --git a/src/views/modules/portrayal/house/cpts/table/changeRecord.vue b/src/views/modules/portrayal/house/cpts/table/changeRecord.vue new file mode 100644 index 000000000..ff015281c --- /dev/null +++ b/src/views/modules/portrayal/house/cpts/table/changeRecord.vue @@ -0,0 +1,56 @@ + + + + + + \ No newline at end of file diff --git a/src/views/modules/portrayal/house/cpts/table/complain.vue b/src/views/modules/portrayal/house/cpts/table/complain.vue new file mode 100644 index 000000000..cc4b0a755 --- /dev/null +++ b/src/views/modules/portrayal/house/cpts/table/complain.vue @@ -0,0 +1,104 @@ + + + + + + \ No newline at end of file diff --git a/src/views/modules/portrayal/house/cpts/table/fuwu.vue b/src/views/modules/portrayal/house/cpts/table/fuwu.vue new file mode 100644 index 000000000..f076a2c91 --- /dev/null +++ b/src/views/modules/portrayal/house/cpts/table/fuwu.vue @@ -0,0 +1,63 @@ + + + + + + \ No newline at end of file diff --git a/src/views/modules/portrayal/house/cpts/table/sheng.vue b/src/views/modules/portrayal/house/cpts/table/sheng.vue new file mode 100644 index 000000000..d4d1013cb --- /dev/null +++ b/src/views/modules/portrayal/house/cpts/table/sheng.vue @@ -0,0 +1,60 @@ + + + + + + \ No newline at end of file diff --git a/src/views/modules/portrayal/house/cpts/table/shequ.vue b/src/views/modules/portrayal/house/cpts/table/shequ.vue new file mode 100644 index 000000000..4aac5e61d --- /dev/null +++ b/src/views/modules/portrayal/house/cpts/table/shequ.vue @@ -0,0 +1,59 @@ + + + + + + \ No newline at end of file diff --git a/src/views/modules/portrayal/house/cpts/table/shijian.vue b/src/views/modules/portrayal/house/cpts/table/shijian.vue new file mode 100644 index 000000000..92294cd37 --- /dev/null +++ b/src/views/modules/portrayal/house/cpts/table/shijian.vue @@ -0,0 +1,105 @@ + + + + + + \ No newline at end of file diff --git a/src/views/modules/portrayal/house/cpts/table/xuqiu.vue b/src/views/modules/portrayal/house/cpts/table/xuqiu.vue new file mode 100644 index 000000000..9b524c715 --- /dev/null +++ b/src/views/modules/portrayal/house/cpts/table/xuqiu.vue @@ -0,0 +1,103 @@ + + + + + + \ No newline at end of file diff --git a/src/views/modules/portrayal/house/index.vue b/src/views/modules/portrayal/house/index.vue new file mode 100644 index 000000000..98435f874 --- /dev/null +++ b/src/views/modules/portrayal/house/index.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/vue.config.js b/vue.config.js index fa6a9a897..d8dc2c0d7 100644 --- a/vue.config.js +++ b/vue.config.js @@ -35,8 +35,8 @@ module.exports = { target: "http://bipaas.elinkservice.cn", // 我们要代理的真实接口地址 }, "/api": { - // target: "http://219.146.91.110:30801", // 测试地址 - target: "http://localhost:8080", // 本地地址 + target: "http://219.146.91.110:30801", // 测试地址 + // target: "http://192.168.1.60:8080", // 本地地址 // target: "https://epmet-preview.elinkservice.cn", // 演示地址 changeOrigin: true, pathRewrite: {