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..93172b43e 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.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/package.json b/package.json index 03f705960..9ecdd713d 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ "proj4": "^2.8.0", "qs": "^6.7.0", "quill": "^1.3.6", + "relation-graph": "^2.1.31", "screenfull": "^4.2.1", "sortablejs": "^1.12.0", "svg-sprite-loader": "^4.1.6", diff --git a/src/assets/images/index/father.png b/src/assets/images/index/father.png new file mode 100644 index 000000000..41192bd0b Binary files /dev/null and b/src/assets/images/index/father.png differ diff --git a/src/assets/images/index/girl.png b/src/assets/images/index/girl.png new file mode 100644 index 000000000..77ed518a3 Binary files /dev/null and b/src/assets/images/index/girl.png differ diff --git a/src/assets/images/index/grandma.png b/src/assets/images/index/grandma.png new file mode 100644 index 000000000..5185c29a9 Binary files /dev/null and b/src/assets/images/index/grandma.png differ diff --git a/src/assets/images/index/grandpa.png b/src/assets/images/index/grandpa.png new file mode 100644 index 000000000..d65fc72a6 Binary files /dev/null and b/src/assets/images/index/grandpa.png differ diff --git a/src/assets/images/index/home.png b/src/assets/images/index/home.png new file mode 100644 index 000000000..89aff3f75 Binary files /dev/null and b/src/assets/images/index/home.png differ diff --git a/src/assets/images/index/mother.png b/src/assets/images/index/mother.png new file mode 100644 index 000000000..0d934878a Binary files /dev/null and b/src/assets/images/index/mother.png differ diff --git a/src/assets/images/index/son.png b/src/assets/images/index/son.png new file mode 100644 index 000000000..e52abf76c Binary files /dev/null and b/src/assets/images/index/son.png differ diff --git a/src/assets/images/index/头像/叔叔.png b/src/assets/images/index/头像/叔叔.png new file mode 100644 index 000000000..52d1baf25 Binary files /dev/null and b/src/assets/images/index/头像/叔叔.png differ diff --git a/src/assets/images/index/头像/阿姨.png b/src/assets/images/index/头像/阿姨.png new file mode 100644 index 000000000..6e3c6d441 Binary files /dev/null and b/src/assets/images/index/头像/阿姨.png differ diff --git a/src/assets/scss/modules/management/form-main.scss b/src/assets/scss/modules/management/form-main.scss index 392e9eb62..3417848c7 100644 --- a/src/assets/scss/modules/management/form-main.scss +++ b/src/assets/scss/modules/management/form-main.scss @@ -29,8 +29,15 @@ .list_item_width_3 { width: 185px; } - - + .u-item-width-communitycascader{ + width: 141px; + } + .u-item-width-buildcascader{ + width: 96px; + } + .u-item-width-agency { + width: 200px; + } .item_width_5{ width: 320px; } diff --git a/src/assets/scss/pages/resiAdd.scss b/src/assets/scss/pages/resiAdd.scss new file mode 100644 index 000000000..8858ececd --- /dev/null +++ b/src/assets/scss/pages/resiAdd.scss @@ -0,0 +1,55 @@ +.div_form { + height: 100%; + padding:16px; + .item_width_1{ + width: 514px; + } + .form{ + background-color: #fff; + padding:16px; + } +} +h5 { + position: relative; + font-size: 16px; + margin: 22px 0; + &::after { + content: ""; + position: absolute; + display: inline-block; + left: -15px; + top: -0px; + width: 5px; + height: 16px; + background-color: #0056d6; + } +} +.basicInfo, .house, .expand { + ::v-deep .el-form-item{ + margin-bottom: 24px; + } +} +.font-color-orange{ + ::v-deep .el-form-item__label{ + color:#ff5107 ; + } +} +.font-color-blue{ + ::v-deep .el-form-item__label{ + color:#3876f2; + position: relative; + &::before{ + content: '*'; + position: absolute; + top: 0px; + left: 16px; + } + } +} +.font-color-blue2{ + ::v-deep .el-form-item__label{ + &::before{ + left: 2px; + } + } +} \ No newline at end of file diff --git a/src/assets/scss/pages/resiInfo.scss b/src/assets/scss/pages/resiInfo.scss new file mode 100644 index 000000000..e1fcf212e --- /dev/null +++ b/src/assets/scss/pages/resiInfo.scss @@ -0,0 +1,143 @@ +.g-main{ + display: flex; + box-sizing: border-box; + height:auto; + padding: 24px 16px 0; + .left{ + min-width: 184px; + margin-right: 16px; + background: #ffffff; + .user{ + display: flex; + flex-direction: column; + height: 120px; + justify-content: center; + align-items: center; + position: relative; + font-weight: bold; + color: #000000; + &::after{ + content: ''; + position: absolute; + bottom: 0; + left: 16px; + width: 152px; + height: 1px; + background: #EBEDF0; + } + img{ + width: 50px; + height: 56px; + margin-bottom: 10px; + } + + } + .menu{ + .progress{ + padding: 0 16px; + box-sizing: border-box; + .text{ + display: flex; + justify-content: space-between; + align-items: center; + margin:9px 0px 11px 0px; + font-size: 12px; + >:nth-child(2){ + color: #0056D6; + font-size: 14px; + font-weight: bold; + } + } + } + .list{ + margin-top:14px ; + .item{ + margin-bottom: 8px; + height: 38px; + color: #333333; + padding-left: 16px; + cursor: pointer; + line-height: 38px; + .full{ + color: #0056d6; + } + .incomplete{ + color: #ff5107; + } + } + + .active{ + background: #F7FAFF; + color: #0056D6 !important; + position: relative; + &::after{ + content: ''; + position: absolute; + right: 0; + width: 4px; + height: 37px; + background: #0056D6; + } + } + } + } + } + .right{ + flex: 1; + height: 100%; + background: #ffffff; + position: relative; + padding-bottom: 16px; + .editBtn{ + z-index: 10; + position: absolute; + right: 16px; + top: 16px; + } + .title-small{ + font-size: 16px; + font-family: PingFang SC; + font-weight: bold; + color: #333333; + position: relative; + padding-left: 11px; + margin-left: 0px; + margin-top: 22px; + } + .f-label { + width: 100px; + text-align: right; + color: rgba(51, 51, 51, .85) ; + >b{ + font-weight: 400; + position: relative; + color: rgba(51, 51, 51, .85) ; + + &::after{ + content: '*'; + position: absolute; + top: 0px; + color: #ff5107; + left: -7px; + } + } + } + .f-labels{ + width: 155px; + text-align: right; + } + .f-flex{ + align-items: center; + } + .f-m-top23{ + margin-top: 23px; + } + } +} + +::v-deep .el-button--text{ + padding: 0; +} +::v-deep .el-row{ + padding-left: 37px; +} diff --git a/src/js/columns/constants/index.js b/src/js/columns/constants/index.js index 9ba80e489..693d71b64 100644 --- a/src/js/columns/constants/index.js +++ b/src/js/columns/constants/index.js @@ -2,7 +2,7 @@ * @Author: mk 2403457699@qq.com * @Date: 2023-08-01 10:13:40 * @LastEditors: mk 2403457699@qq.com - * @LastEditTime: 2023-08-04 18:02:54 + * @LastEditTime: 2024-02-27 19:04:44 * @Description: 此文件针对于本地字典,常用的男女或者是否一类需要在前端写的可以在此文件中添加 * * @@ -49,6 +49,16 @@ export const disabilityFlagList = [ value: 0 } ] +export const hasOptions = [ + { + label: '有', + value: 1 + }, + { + label: '无', + value: 0 + } +] export const dormitoryTypeList = [ { label: '楼长', diff --git a/src/main.js b/src/main.js index 06a255397..7a6b88143 100644 --- a/src/main.js +++ b/src/main.js @@ -44,6 +44,8 @@ import NodeWrapGrid from "@/components/GridTree/nodeWrap.vue"; import PopTips from "@/components/PopTips/index.vue"; import PopHomeTip from "@/components/PopHomeTip/index.vue"; import NameSplit from "@/components/NameSplit/index.vue"; +import RelationGraph from "relation-graph"; + // import AddNodeJw from "@/components/JwTree/addNode.vue"; //按钮 Vue.component("nodeWrap", NodeWrap); @@ -76,6 +78,7 @@ Vue.use(Element, { size: "default", i18n: (key, value) => i18n.t(key, value), }); +Vue.use(RelationGraph); Vue.prototype.$message = message; Vue.prototype.$moment = Moment; diff --git a/src/router/index.js b/src/router/index.js index 96f637e42..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, @@ -137,7 +147,27 @@ export const moduleRoutes = { isTab: true, title: "", }, - } + }, + { + path: "add-resi", + props: true, + name: "add-resi", + component: () => import("@/views/components/addResi"), + meta: { + isTab: true, + title: "新增居民", + }, + }, + { + path: "edit-resi", + props: true, + name: "edit-resi", + component: () => import("@/views/components/editResi"), + meta: { + isTab: true, + title: "编辑居民", + }, + } ], }; // pc端菜单的 如果没有配置 默认的 或者配置了默认的 但没有权限 默认选中第一 @@ -912,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 new file mode 100644 index 000000000..a2cc77401 --- /dev/null +++ b/src/views/components/addResi.vue @@ -0,0 +1,1930 @@ + + + + + diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue index 791665279..15e07213d 100644 --- a/src/views/components/editResi.vue +++ b/src/views/components/editResi.vue @@ -1,950 +1,2238 @@ + return this.$message.error("网络错误"); + }); + }, + handelClickAddHouse() { + this.form.resideInfoDtos.push({ + agencyName: this.$store.state.user.agencyName, + agencyId: this.$store.state.user.agencyId, + gridId: null, //所属网格id + villageId: null, //小区id + buildId: null, //楼栋id + unitId: null, //单元id + moveOutFlag: null, + outOfTime: null, //迁出时间 + homeId: null, //房屋id + placeOfDomicile: null, //户籍所在地 + currentResidence: null, //现居住地 + householdSituation: null, //人户状况 + houseHolderRel: null, //与户主关系 + resiHouseRel: null, //人房关系 + optionsV: [], + optionsB: [], + optionsH: [], + optionsD: [], + orgOptions:this.orgOption + }); + }, + handelClickDelHouse(i) { + this.form.resideInfoDtos = this.form.resideInfoDtos.filter( + (item, index) => index != i + ); + }, + handleValidBlur() { + if (this.form.baseInfoDto.idType != 1) return; + if ( + !isCard(this.form.baseInfoDto.idNum) && + !isPassport(this.form.baseInfoDto.idNum) + ) + return; + const { user } = this.$store.state; + let huji = "", + i = 0; + if (user.areaCodePath && user.areaCodePath.length > 0) { + i = user.areaCodePath.length - 1; + huji = + user.areaCodePath[i].length > 6 + ? user.areaCodePath[i].substr(0, 6) + : user.areaCodePath[i]; + } - - diff --git a/src/views/components/editResiCopy.vue b/src/views/components/editResiCopy.vue new file mode 100644 index 000000000..791665279 --- /dev/null +++ b/src/views/components/editResiCopy.vue @@ -0,0 +1,950 @@ + + + + + + diff --git a/src/views/components/resiExpand/editExpand.vue b/src/views/components/resiExpand/editExpand.vue new file mode 100644 index 000000000..5db8656ec --- /dev/null +++ b/src/views/components/resiExpand/editExpand.vue @@ -0,0 +1,360 @@ + + + + + diff --git a/src/views/components/resiExpand/index.vue b/src/views/components/resiExpand/index.vue new file mode 100644 index 000000000..52003689c --- /dev/null +++ b/src/views/components/resiExpand/index.vue @@ -0,0 +1,311 @@ + + + + + diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index 186d7767b..2e9b89933 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -177,7 +177,7 @@ - + { @@ -2299,7 +2298,7 @@ export default { this.form.remark = data.remark ? data.remark : '' if (data.categoryInfo) { this.form.categoryId = data.categoryInfo.id,// 临时写死 - this.form.partyFlag = data.categoryInfo.partyFlag.toString() + this.form.partyFlag = data.categoryInfo.partyFlag.toString() this.form.subsistenceAllowanceFlag = data.categoryInfo.subsistenceAllowanceFlag.toString() this.form.ensureHouseFlag = data.categoryInfo.ensureHouseFlag.toString() this.form.unemployedFlag = data.categoryInfo.unemployedFlag.toString() @@ -2446,9 +2445,10 @@ export default { if (res.code !== 0) { return this.$message.error(res.msg); } else { - if (res.data && res.data.chronicDiseaseCode) { res.data.chronicDiseaseCode = res.data.chronicDiseaseCode.split(',') + }else{ + res.data.chronicDiseaseCode = [] } this.form.healthDto = res.data ? res.data : { // 健康 @@ -2478,7 +2478,7 @@ export default { }, // 工作信息详情 residentWorkInfo (id) { - if (this.newForm.healthDto) return + if (this.newForm.workInfoDto) return this.$http.get(`/actual/base/residentWorkInfo/detail/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2932,7 +2932,6 @@ export default { } if (this.newForm.volunteerDto) { - this.newForm.volunteerDto = this.form.volunteerDto } @@ -2946,12 +2945,9 @@ export default { this.newForm.postDto = this.form.postDto } if (this.newForm.tenantDto) { - this.newForm.tenantDto = this.form.tenantDto } - if (this.newForm.specialSupportDto) { - this.newForm.specialSupportDto = this.form.specialSupportDto } }, diff --git a/src/views/components/resiInfo/ensureHouseDto/index.vue b/src/views/components/resiInfo/ensureHouseDto/index.vue new file mode 100644 index 000000000..75eac2b4d --- /dev/null +++ b/src/views/components/resiInfo/ensureHouseDto/index.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/src/views/components/resiInfo/oldPeopleDto/index.vue b/src/views/components/resiInfo/oldPeopleDto/index.vue new file mode 100644 index 000000000..0bbaac646 --- /dev/null +++ b/src/views/components/resiInfo/oldPeopleDto/index.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/src/views/components/resiInfo/parymemberInfoDto/index.vue b/src/views/components/resiInfo/parymemberInfoDto/index.vue new file mode 100644 index 000000000..dc161139a --- /dev/null +++ b/src/views/components/resiInfo/parymemberInfoDto/index.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/src/views/components/resiInfo/postDto/index.vue b/src/views/components/resiInfo/postDto/index.vue new file mode 100644 index 000000000..e4e102da2 --- /dev/null +++ b/src/views/components/resiInfo/postDto/index.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/src/views/components/resiInfo/specialSupportDto/index.vue b/src/views/components/resiInfo/specialSupportDto/index.vue new file mode 100644 index 000000000..c0a1c1b95 --- /dev/null +++ b/src/views/components/resiInfo/specialSupportDto/index.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/src/views/components/resiInfo/unitedFrontDto/index.vue b/src/views/components/resiInfo/unitedFrontDto/index.vue new file mode 100644 index 000000000..2e6074e40 --- /dev/null +++ b/src/views/components/resiInfo/unitedFrontDto/index.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/src/views/components/resiInfo/veteranDto/index.vue b/src/views/components/resiInfo/veteranDto/index.vue new file mode 100644 index 000000000..ecd2498d5 --- /dev/null +++ b/src/views/components/resiInfo/veteranDto/index.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/src/views/components/resiInfo/volunteerDto/index.vue b/src/views/components/resiInfo/volunteerDto/index.vue new file mode 100644 index 000000000..2fa007f94 --- /dev/null +++ b/src/views/components/resiInfo/volunteerDto/index.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index ff828fe1a..80c340365 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -2,45 +2,152 @@
- + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 至 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 至 + + + + + + + + + + + + + + + + + + + + + + + + - +
- + - {{ btnItem.name }} + {{ btnItem.name }} - + -
@@ -282,7 +307,7 @@ export default { default: false } }, - data () { + data() { let initForm = (arr, columnName) => { let _form = {} arr.forEach((item) => { @@ -343,23 +368,143 @@ export default { boxHeight: true, pageLoading: false, openSearch: false, + basicType: "name", + basicInfoList: [ + { + label: '姓名', + value: 'name' + }, + { + label: '联系电话', + value: 'mobile' + }, + { + label: '证件号', + value: 'idNum' + }, + { + label: '籍贯', + value: 'nativePlace' + }, + { + label: '备注', + value: 'remark' + } + ], optionsV: [], optionsB: [], optionsH: [], optionsD: [], - optionsG: [], orgOptions: [], orgOptionProps, agencyIdArray: [], - value: '', - // 1 Education: [], nation: [], + nationalityList: [], household: [], resiClass: [], itemList, fixedList: [], constForm, + partyList: [ + { + label: '群众', + value: 0 + }, + { + label: '党员', + value: 1 + }, + { + label: '共青团员', + value: 2 + } + ], + resiHouseRelList: [ + { + label: '自住', + value: 0 + }, + { + label: '租住', + value: 1 + } + ], + healthStatusList: [ + { + label: '残疾', + value: 'DISABILITY_FLAG' + }, + { + label: '大病', + value: 'SERIOUS_ILLNESS_FLAG' + }, + { + label: '慢病', + value: 'CHRONIC_DISEASE_FLAG' + } + ], + projectStaffList: [ + { + label: '志愿者', + value: 'volunteerFlag' + }, + { + label: '楼长', + value: 'buildingChiefFlag' + }, + { + label: '单元长', + value: 'unitChiefFlag' + }, + { + label: '公益岗', + value: 'publicWelfareFlag' + } + ], + specialCategoryList: [ + { + label: "安置帮教", + value: "anzhibangjiao", + children: null + }, + { + label: "吸毒人员", + value: "xidurenyuan", + children: null + }, + { + label: "社区矫正", + value: "shequjiaozheng", + children: null + }, + { + label: "不良青少年", + value: "buliangqingshaonian", + children: null + }, + { + label: "肇事肇祸精神病", + value: "zhaoshizhaohuojingshenbing", + children: null + }, + { + label: "邪教人员", + value: "xiejiaorenyuan", + children: null + }, + { + label: "信访人员", + value: "petitionOfficerFlag", + children: null + }, + { + label: "统战人员", + value: "unitedFrontFlag", + children: null + } + ], + careerStatusList: [], form: { name: '', mobile: '', @@ -379,12 +524,15 @@ export default { unitId: '', gridId: '', villageId: '', - categoryKey: [], + attentionCrowds: [], + healthStatus: [], + nationality: '', + resiHouseRel: '', + partyFlag: '', + updateTimeStart: '', + updateTimeEnd: '', + specialCategoryCodes: [], remark: '', - villageId: '', - buildId: '', - unitId: '', - homeId: '', level: '', orgType: '' }, @@ -394,7 +542,7 @@ export default { shortcuts: [ { text: '最近一周', - onClick (picker) { + onClick(picker) { const end = new Date() const start = new Date() start.setTime(start.getTime() - 3600 * 1000 * 24 * 7) @@ -403,7 +551,7 @@ export default { }, { text: '最近一个月', - onClick (picker) { + onClick(picker) { const end = new Date() const start = new Date() start.setTime(start.getTime() - 3600 * 1000 * 24 * 30) @@ -412,7 +560,7 @@ export default { }, { text: '最近三个月', - onClick (picker) { + onClick(picker) { const end = new Date() const start = new Date() start.setTime(start.getTime() - 3600 * 1000 * 24 * 90) @@ -518,11 +666,11 @@ export default { } } }, - optionsVPageNo:1 + optionsVPageNo: 1 } }, computed: { - sliceList () { + sliceList() { return function (data, count) { // 接收 if (data !== undefined) { @@ -540,19 +688,19 @@ export default { } } }, - changeVDisabled () { + changeVDisabled() { return !this.form.villageId }, - changeBDisabled () { + changeBDisabled() { return !this.form.buildId }, - changeDDisabled () { + changeDDisabled() { return !this.form.unitId }, }, watch: { form: { - handler (val, val2) { + handler(val, val2) { // console.log('valpppp----', val, val2) for (let n in val) { if (this.constForm[n] !== val[n]) { @@ -565,7 +713,7 @@ export default { deep: true }, timer: { - handler (newVal) { + handler(newVal) { this.handelWatchStartDate(newVal) }, deep: true, @@ -573,7 +721,6 @@ export default { } }, directives: { - //这个是写到data外面 与mounted同级 "el-select-loadmore": { bind(el, binding) { const SELECTWRAP_DOM = el.querySelector( @@ -589,55 +736,56 @@ export default { }, }, }, - created () { + created() { // this.initForm() // console.log('formcccc---', this.form) this.getOrgTreeList() - this.getGridList() this.getEducation() this.getValiheList() this.getDictList() this.getHousehold() this.getResident() + this.getNationality() + this.getCareerStatus() if (this.columnName) this.handleChangeForm(this.columnName) }, methods: { - handleSmartSearch () { + handleSmartSearch() { this.showSmartSearchForm = !this.showSmartSearchForm }, - handelSelSmartBtn (index) { + handelSelSmartBtn(index) { this.selBtnIndex = index }, - handelWatchStartDate (val) { + handelWatchStartDate(val) { return val }, - initForm () { + initForm() { this.formList.forEach((item) => { this.$set(this.form, item.columnName, '') }) console.log('formcccc---', this.form) }, - computdSpan (len) { + computdSpan(len) { return len == 1 ? 24 : 6 }, - handleClearVillage () { + handleClearVillage() { this.form.buildId = '' this.form.homeId = '' }, - handleClearBuild () { + handleClearBuild() { this.form.buildId = '' this.form.unitId = '' this.form.homeId = '' }, - handleClearDan () { + handleClearDan() { this.form.unitId = '' this.form.homeId = '' }, - handleSearchFrom () { + handleSearchFrom() { this.$emit('handleSearchFrom', '') }, - resetForm (formName) { + resetForm(formName) { for (const n in this.form) { if (n == 'age') { this.form.age = { @@ -709,16 +857,14 @@ export default { // } // }, - handleAgeChange () { - console.log(11 > 5); - console.log(11 > 10); + handleAgeChange() { if (this.form.ageStart) { if (this.form.ageStart > this.form.ageEnd) { this.$message.warning('结束年龄不能小于开始年龄') } } }, - handleChangeAgency (val) { + handleChangeAgency(val) { this.sarr = [] const map = new Map(); @@ -732,7 +878,7 @@ export default { this.getValiheList() }, - getLastItem (list, vals, key) { + getLastItem(list, vals, key) { let LIST = list || []; for (let item of LIST) { // console.log(item[key]); @@ -745,7 +891,8 @@ export default { } } }, - handleChangeGrid (val) { + + handleChangeGrid(val) { console.log('val', val) this.form.villageId = '' this.form.buildId = '' @@ -753,26 +900,26 @@ export default { this.form.homeId = '' this.getValiheList() }, - handleChangeV (val) { + handleChangeV(val) { console.log('小区val', val) this.form.buildId = '' this.form.unitId = '' this.form.homeId = '' this.getBuildList() }, - handleChangeB (val) { + handleChangeB(val) { console.log('楼号val', val) this.form.unitId = '' this.form.homeId = '' this.getUniList() }, - handleChangeD (val) { + handleChangeD(val) { console.log('单元val', val) this.form.homeId = '' this.getHouseList() }, // 监听基础form - handleChangeForm (val) { + handleChangeForm(val) { for (let n in this.fixedForm) { if (n === val) { if (this.fixedList.length > 0) { @@ -811,7 +958,7 @@ export default { if (item.columnName === val) item.isChange = true }) }, - getOrgTreeList () { + getOrgTreeList() { this.$http .post('/gov/org/customeragency/agencygridtree', {}) .then(({ data: res }) => { @@ -827,27 +974,12 @@ export default { return this.$message.error('网络错误') }) }, - getGridList () { - const { user } = this.$store.state - this.$http - .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'addorupdate' }) - .then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg) - } else { - console.log('获取查询详情成功', res.data) - this.optionsG = res.data - } - }) - .catch(() => { - return this.$message.error('网络错误') - }) - }, + loadmore() { this.optionsVPageNo++; this.getValiheList(); }, - getValiheList () { + getValiheList() { const { user } = this.$store.state var agencyIdTemp = '' if (this.form.agencyId.length == 0) { @@ -858,16 +990,16 @@ export default { var gridIdQuery = ''; var agencyIdQuery = this.form.agencyId[0]; if (this.form.agencyId.length >= 2) { - agencyIdQuery= this.form.agencyId[this.form.agencyId.length - 2]; - gridIdQuery = this.form.agencyId[this.form.agencyId.length - 1]; + agencyIdQuery = this.form.agencyId[this.form.agencyId.length - 2]; + gridIdQuery = this.form.agencyId[this.form.agencyId.length - 1]; } - + this.$http .post('/actual/base/communityQuarters/listQuartersOptions', { gridId: gridIdQuery, agencyId: agencyIdQuery, pageNo: this.optionsVPageNo, - pageSize:20 + pageSize: 20 // agencyId: user.agencyId }) .then(({ data: res }) => { @@ -882,7 +1014,7 @@ export default { return this.$message.error('网络错误') }) }, - getBuildList () { + getBuildList() { this.$http .post('/actual/base/communityBuilding/buildingoption', { quartersId: this.form.villageId @@ -899,7 +1031,7 @@ export default { return this.$message.error('网络错误') }) }, - getUniList () { + getUniList() { this.$http .post('/actual/base/communityBuildingUnit/unitoption', { buildingId: this.form.buildId @@ -916,9 +1048,9 @@ export default { return this.$message.error('网络错误') }) }, - getHouseList () { + getHouseList() { this.$http - .post('/actual/base/communityHouse/houseoption', { buildingId: this.form.buildId,unitId: this.form.unitId }) + .post('/actual/base/communityHouse/houseoption', { buildingId: this.form.buildId, unitId: this.form.unitId }) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) @@ -931,7 +1063,7 @@ export default { return this.$message.error('网络错误') }) }, - getTreeData (data) { + getTreeData(data) { if (!Array.isArray(data)) return []; let arr = data.map((item) => { let _item = {}; @@ -946,7 +1078,7 @@ export default { }); return arr; }, - async getEducation () { + async getEducation() { try { let { data } = await this.$http.post('sys/dict/data/education', { formCode: "resi_base_info" }) data.data = this.getTreeData(data.data) @@ -957,7 +1089,7 @@ export default { } }, - async getDictList () { + async getDictList() { try { const { data } = await this.$http.post('sys/dict/data/nation', { formCode: "resi_base_info" }) this.nation = data.data @@ -967,7 +1099,24 @@ export default { } }, - async getHousehold () { + async getNationality() { + try { + const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'nationality' }) + this.nationalityList = data.data + } catch (error) { + console.log(error, '获取国籍字典'); + } + }, + async getCareerStatus() { + try { + const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'career_status' }) + this.careerStatusList = data.data + } catch (error) { + console.log(error, '获取国籍字典'); + } + }, + + async getHousehold() { try { const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'household_situation' }) this.household = data.data @@ -975,15 +1124,15 @@ export default { console.log(error, '获取人户状况字典'); } }, - async getResident () { + async getResident() { try { - const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'resident_category' }) + const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'attention_crowd' }) this.resiClass = data.data } catch (error) { console.log(error, '获取居民类别字典'); } }, - computedBirth (age) { + computedBirth(age) { let now = new Date(); let nowYear = now.getFullYear(); let nowMonth = now.getMonth() + 1; @@ -997,7 +1146,7 @@ export default { } return subYear + '-' + nowMonth + '-' + nowDay }, - computedBirth1 (age) { + computedBirth1(age) { let now = new Date(); let nowYear = now.getFullYear(); let nowMonth = now.getMonth() + 1; @@ -1010,6 +1159,13 @@ export default { nowDay = '0' + nowDay } return subYear - 1 + '-' + nowMonth + '-' + nowDay + }, + handelClickBasicType(){ + this.form.name = ''; + this.form.mobile = ''; + this.form.idNum = ''; + this.form.nativePlace = ''; + this.form.remark = ''; } } } @@ -1022,8 +1178,10 @@ export default { display: flex; flex-wrap: wrap; } + .resi-search { padding-bottom: 14px; + .el-col { text-align: right; } @@ -1041,25 +1199,31 @@ export default { text-align: right; // line-height: 32; } + .resi-cell-label1 { width: max-content; } + .resi-cell-value-radio { display: flex; align-items: center; min-height: 32px; } + .resi-cell-input { max-width: 200px; } + .resi-cell--daterange { max-width: 240px; } + .el-form--inline { ::v-deep .el-form-item { margin-right: 0px !important; } } + .resi-cell-select { max-width: 200px; box-sizing: border-box; @@ -1067,10 +1231,12 @@ export default { &-middle { width: 130px; } + &-small { width: 88px; } } + .resi-cell-select:last-child { margin-right: 0; } 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/base/resi.vue b/src/views/modules/base/resi.vue index e91e29272..2c7b31816 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -1,39 +1,122 @@ diff --git a/src/views/modules/communityParty/elegant/detail.vue b/src/views/modules/communityParty/elegant/detail.vue index 084305fd4..bd75108a6 100644 --- a/src/views/modules/communityParty/elegant/detail.vue +++ b/src/views/modules/communityParty/elegant/detail.vue @@ -72,7 +72,6 @@ export default { watch: {}, async mounted () { - console.log('mounted-----我执行了') }, diff --git a/src/views/modules/plugins/change/resichange.vue b/src/views/modules/plugins/change/resichange.vue index 43764bfdc..ef295a470 100644 --- a/src/views/modules/plugins/change/resichange.vue +++ b/src/views/modules/plugins/change/resichange.vue @@ -283,7 +283,7 @@ import nextTick from 'dai-js/tools/nextTick' import deathSearch from '../../../components/deathSearch.vue' import resiForm from '../../../components/resiForm.vue' -import editResi from '../../../components/editResi.vue' +import editResi from '../../../components/editResiCopy.vue' import axios from 'axios' import { mapGetters } from 'vuex' import resiChangeTransfer from '../../../components/resiChangeTransfer.vue' diff --git a/src/views/modules/plugins/change/resideath.vue b/src/views/modules/plugins/change/resideath.vue index 35611ff0b..171580983 100644 --- a/src/views/modules/plugins/change/resideath.vue +++ b/src/views/modules/plugins/change/resideath.vue @@ -325,7 +325,7 @@ import nextTick from 'dai-js/tools/nextTick' import deathSearch from '../../../components/deathSearch.vue' import resiForm from '../../../components/resiForm.vue' -import editResi from '../../../components/editResi.vue' +import editResi from '../../../components/editResiCopy.vue' import axios from 'axios' import { mapGetters } from 'vuex' import resiTransfer from '../../../components/resiTransfer.vue' diff --git a/src/views/modules/plugins/change/resiwelfare.vue b/src/views/modules/plugins/change/resiwelfare.vue index f4ca9a53c..ef2ed3ef9 100644 --- a/src/views/modules/plugins/change/resiwelfare.vue +++ b/src/views/modules/plugins/change/resiwelfare.vue @@ -278,7 +278,7 @@ import nextTick from 'dai-js/tools/nextTick' import deathSearch from '../../../components/deathSearch.vue' import resiForm from '../../../components/resiForm.vue' -import editResi from '../../../components/editResi.vue' +import editResi from '../../../components/editResiCopy.vue' import axios from 'axios' import { mapGetters } from 'vuex' import resiTransfer from '../../../components/resiTransfer.vue' diff --git a/src/views/modules/plugins/rent/resi.vue b/src/views/modules/plugins/rent/resi.vue index af035a396..de09574dc 100644 --- a/src/views/modules/plugins/rent/resi.vue +++ b/src/views/modules/plugins/rent/resi.vue @@ -278,7 +278,7 @@ import nextTick from 'dai-js/tools/nextTick' import resiSearch from '../../../components/blackSearch.vue' import resiForm from '../../../components/resiForm.vue' -import editResi from '../../../components/editResi.vue' +import editResi from '../../../components/editResiCopy.vue' import axios from 'axios' import { mapGetters } from 'vuex' import resiTransfer from '../../../components/resiTransfer.vue' diff --git a/src/views/modules/portrayal/fangwu/index.vue b/src/views/modules/portrayal/fangwu/index.vue index 917df3664..3274a35fd 100644 --- a/src/views/modules/portrayal/fangwu/index.vue +++ b/src/views/modules/portrayal/fangwu/index.vue @@ -19,8 +19,8 @@
各项业务记录
- + @@ -52,7 +52,7 @@ import { requestPost, requestGet } from '@/js/dai/request' import leftTop from "./cpts/leftTop"; import leftBto from "../jumin/cpts/leftBto"; -import rightTop from "../jumin/cpts/rightTop"; +import businessRecord from "../jumin/cpts/businessRecord"; import rightBto from "./cpts/rightBto"; import nextTick from "dai-js/tools/nextTick"; @@ -104,8 +104,8 @@ export default { }, }, //子组件注册 - // leftTop, leftBto, resiInfo, rightTop, pointsRecord, rightBto, xiangshoufuwu - components: { leftTop, leftBto, rightTop, rightBto }, + // leftTop, leftBto, resiInfo, businessRecord, pointsRecord, rightBto, xiangshoufuwu + components: { leftTop, leftBto, businessRecord, rightBto }, //计算 computed: {}, //监听 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..2f1b308d5 --- /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/src/views/modules/portrayal/jumin/cpts/rightTop.vue b/src/views/modules/portrayal/jumin/cpts/businessRecord.vue similarity index 66% rename from src/views/modules/portrayal/jumin/cpts/rightTop.vue rename to src/views/modules/portrayal/jumin/cpts/businessRecord.vue index e068ac986..6cf0fc058 100644 --- a/src/views/modules/portrayal/jumin/cpts/rightTop.vue +++ b/src/views/modules/portrayal/jumin/cpts/businessRecord.vue @@ -1,100 +1,20 @@ diff --git a/src/views/modules/portrayal/jumin/cpts/table/fuwu.vue b/src/views/modules/portrayal/jumin/cpts/table/fuwu.vue index f4ee84889..f076a2c91 100644 --- a/src/views/modules/portrayal/jumin/cpts/table/fuwu.vue +++ b/src/views/modules/portrayal/jumin/cpts/table/fuwu.vue @@ -1,6 +1,6 @@ -
- -
暂无数据
-
diff --git a/src/views/modules/portrayal/jumin/cpts/table/sheng.vue b/src/views/modules/portrayal/jumin/cpts/table/sheng.vue index edf0ce747..d4d1013cb 100644 --- a/src/views/modules/portrayal/jumin/cpts/table/sheng.vue +++ b/src/views/modules/portrayal/jumin/cpts/table/sheng.vue @@ -1,6 +1,6 @@ -
- -
暂无数据
-
diff --git a/src/views/modules/portrayal/jumin/cpts/table/shequ.vue b/src/views/modules/portrayal/jumin/cpts/table/shequ.vue index 2d2eba7cb..4aac5e61d 100644 --- a/src/views/modules/portrayal/jumin/cpts/table/shequ.vue +++ b/src/views/modules/portrayal/jumin/cpts/table/shequ.vue @@ -1,6 +1,6 @@ -
- -
暂无数据
-
diff --git a/src/views/modules/portrayal/jumin/cpts/table/shijian.vue b/src/views/modules/portrayal/jumin/cpts/table/shijian.vue index c0947b032..c23163e17 100644 --- a/src/views/modules/portrayal/jumin/cpts/table/shijian.vue +++ b/src/views/modules/portrayal/jumin/cpts/table/shijian.vue @@ -1,6 +1,6 @@ -
- -
暂无数据
-
diff --git a/src/views/modules/portrayal/jumin/cpts/table/xuqiu.vue b/src/views/modules/portrayal/jumin/cpts/table/xuqiu.vue index 6581851d2..9b524c715 100644 --- a/src/views/modules/portrayal/jumin/cpts/table/xuqiu.vue +++ b/src/views/modules/portrayal/jumin/cpts/table/xuqiu.vue @@ -1,6 +1,6 @@ -
- -
暂无数据
-
diff --git a/src/views/modules/portrayal/jumin/cpts/xiangshoufuwu.vue b/src/views/modules/portrayal/jumin/cpts/xiangshoufuwu.vue deleted file mode 100644 index 2f7329fb6..000000000 --- a/src/views/modules/portrayal/jumin/cpts/xiangshoufuwu.vue +++ /dev/null @@ -1,137 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue index a31674cac..d62488fa8 100644 --- a/src/views/modules/portrayal/jumin/index.vue +++ b/src/views/modules/portrayal/jumin/index.vue @@ -1,112 +1,1509 @@ - diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue index 943a55ec9..676b33818 100644 --- a/src/views/modules/shequzhili/event/eventList.vue +++ b/src/views/modules/shequzhili/event/eventList.vue @@ -726,9 +726,6 @@ export default { this.formData.secondIdList = this.eventTypeCheck } - console.log("formData.agencyId1:"); - console.log(this.formData.agencyId); - const { pageSize, pageNo, formData } = this; // 创建新的 formData 对象，保留原始值 const newFormData = { ...formData }; @@ -758,8 +755,6 @@ export default { } else { this.$message.error(msg); } - console.log("formData.agencyId2:"); - console.log(this.formData.agencyId); }, async getCateOptions() { const url = "/governance/icEvent/getCategoryTree"; 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: {