diff --git a/src/assets/scss/modules/visual/houseStatic.scss b/src/assets/scss/modules/visual/houseStatic.scss index d02c6e7fa..24665cdbe 100644 --- a/src/assets/scss/modules/visual/houseStatic.scss +++ b/src/assets/scss/modules/visual/houseStatic.scss @@ -197,6 +197,13 @@ background: #e43c26; border-radius: 4px; } + + .hzrbz{ + background: #fac126; + } + .zbqc{ + background: #fc8452; + } >span{ margin-left:10px; font-size: 10px; diff --git a/src/assets/scss/modules/visual/people.scss b/src/assets/scss/modules/visual/people.scss index ba67b1aaf..f774466cf 100644 --- a/src/assets/scss/modules/visual/people.scss +++ b/src/assets/scss/modules/visual/people.scss @@ -372,7 +372,7 @@ z-index: 1; } .rel-bg { - height: 70px; + height: 78px; width: 128px; } @@ -384,7 +384,7 @@ left: 0; width: 100%; padding: 7px 10px; - line-height: 24px; + line-height: 20px; text-align: center; color: #fff; font-size: 18px; @@ -395,6 +395,9 @@ .rel-name { font-size: 14px; } + .rel-call { + font-size: 15px; + } } &.z-zuo-2 { diff --git a/src/views/modules/base/epidemic/natInfo/natDetail.vue b/src/views/modules/base/epidemic/natInfo/natDetail.vue index f96dabf59..d59027890 100644 --- a/src/views/modules/base/epidemic/natInfo/natDetail.vue +++ b/src/views/modules/base/epidemic/natInfo/natDetail.vue @@ -25,7 +25,8 @@ 证件号: {{ formData.showIdCard||'--' }} -
+
采样时间: {{ formData.sampleTime||'--' }}
@@ -57,6 +58,12 @@
+
+ 试管编号: + {{ formData.testTubeCode||'--' }} +
+ @@ -210,7 +217,11 @@ export default { view_real_data: {//显示【显示脱敏信息】按钮 type: Boolean, default: false, - } + }, + isXiaozhaizi: { + type: Boolean, + default: false + }, }, } diff --git a/src/views/modules/base/epidemic/natInfo/natForm.vue b/src/views/modules/base/epidemic/natInfo/natForm.vue index 1bcdf2af5..379d9f803 100644 --- a/src/views/modules/base/epidemic/natInfo/natForm.vue +++ b/src/views/modules/base/epidemic/natInfo/natForm.vue @@ -95,7 +95,8 @@ v-model="formData.idCard"> - @@ -173,6 +174,19 @@ + + + + + +
diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue index 895fe1c46..f81e3ca24 100644 --- a/src/views/modules/base/epidemic/natInfo/natList.vue +++ b/src/views/modules/base/epidemic/natInfo/natList.vue @@ -31,7 +31,8 @@ - - - + + @@ -293,6 +303,7 @@ class="dialog-h" @closed="diaDetailClose"> @@ -321,6 +332,7 @@ export default { isResiUser: true, customerId: '', isYantai: false, + isXiaozhaizi: false, agencyId: '', orgTypeList: [ @@ -387,12 +399,16 @@ export default { async mounted () { //磐石街道:1580460084738760705 //烟台客户id: 1535072605621841922 + //小寨子客户id: 1536638904600752130 this.customerId = localStorage.getItem("customerId"); this.isYantai = false + this.isXiaozhaizi = false if (this.customerId === '1535072605621841922') { this.isYantai = true - + } + if (this.customerId === '1536638904600752130') { + this.isXiaozhaizi = true } this.updateBtnAuths(); diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue index 8cf156b0a..914b33d80 100644 --- a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue +++ b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue @@ -91,11 +91,19 @@
- 常住人口数 + 人户一致
- 流动人口数 + 人在户不在 +
+
+
+ 户在人不在 +
+
+
+ 暂不清楚
@@ -110,14 +118,24 @@
-
{{userData.czUserTotal}}
-
常住人口数
+ @click="handleClickPeople('rhyz')"> +
{{userData.rhyzUserTotal}}
+
人户一致
-
{{userData.ldUserTotal}}
-
流动人口数
+ @click="handleClickPeople('rzhbz')"> +
{{userData.rzhbzUserTotal}}
+
人在户不在
+
+
+
{{userData.hzrbzUserTotal}}
+
户在人不在
+
+
+
{{userData.zbqcUserTotal}}
+
暂不清楚
@@ -186,15 +204,27 @@
{{item.czUserTotal}}
-
{{item.czUserRatio+'%'}}
-
常住人口数
+ @click="handleClickPeople('rhyz',item)">{{item.rhyzUserTotal}}
+
{{item.rhyzUserRatio+'%'}}
+
人户一致
+ +
+
{{item.rzhbzUserRatio}}
+
{{item.rzhbzUserRatio+'%'}}
+
人在户不在
+
+
+
{{item.hzrbzUserTotal}}
+
{{item.hzrbzUserRatio+'%'}}
+
户在人不在
{{item.ldUserTotal}}
-
{{item.ldUserRatio+'%'}}
-
流动人口数
+ @click="handleClickPeople('no',item)">{{item.zbqcUserTotal}}
+
{{item.zbqcUserRatio+'%'}}
+
暂不清楚
@@ -224,7 +254,7 @@ @@ -310,13 +340,17 @@ export default { orgId: '',//组织、网格、小区Id orgType: '',//组织、网格、小区类型 agency grid village userTotal: 198000,//居民总数 - czUserTotal: 2000,//常住居民总数 - czUserRatio: '90%',//常住居民总数占比 - ldUserTotal: 30,//流动居民总数 - ldUserRatio: '5%',//流动居民总数占比 + rhyzUserTotal: 2000,//人户一致 + rhyzUserRatio: '90%',//人户一致 占比 + rzhbzUserTotal: 30,//人在户不在 + rzhbzUserRatio: '5%',//人在户不在 占比 + hzrbzUserTotal: 30,//户在人不在户不在 + hzrbzUserRatio: '5%',//户在人不在 占比 + zbqcUserTotal: 30,//暂不清楚 + zbqcUserRatio: '5%',//暂不清楚 占比 }, - userColorArray: ['#3dda83', '#e43c26'], + userColorArray: ['#3dda83', '#e43c26', '#fac126', '#fc8452'], userPieData: [], subList: [], @@ -330,7 +364,7 @@ export default { parentPolygon: [], rentType: '',//点击房屋数类型 - type: '',//点击人员数类型 + rhType: '',//点击人员数类型 showPeopleList: false, showHouseList: false, selOrgId: '', @@ -375,7 +409,7 @@ export default { this.showHouseList = true }, //点击人员数 - handleClickPeople (type, item) { + handleClickPeople (rhType, item) { if (item) { this.selOrgId = item.orgId this.selOrgType = item.orgType @@ -384,7 +418,7 @@ export default { this.selOrgType = this.houseData.orgType } this.toSubAgency('people') - this.type = type + this.rhType = rhType this.showPeopleList = true }, @@ -495,7 +529,7 @@ export default { this.$refs.userPieChart.showLoading() } // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icresiuser/userchart"; - const url = '/epmetuser/icresiuser/userchart' + const url = '/epmetuser/icresiuser/rhzk' let params = { orgId: this.orgId, orgType: this.orgType @@ -537,17 +571,27 @@ export default { // let maxIndex = 0 let obj1 = { - name: '常住人口数', - value: this.userData.czUserRatio, + name: '人户一致', + value: this.userData.rhyzUserRatio, selected: true } let obj2 = { - name: '流动人口数', - value: this.userData.ldUserRatio + name: '人在户不在', + value: this.userData.rzhbzUserRatio + } + let obj3 = { + name: '户在人不在', + value: this.userData.hzrbzUserRatio + } + let obj4 = { + name: '暂不清楚', + value: this.userData.zbqcUserRatio } this.userPieData.push(obj1) this.userPieData.push(obj2) + this.userPieData.push(obj3) + this.userPieData.push(obj4) this.userPieOption.title.text = this.userData.userTotal this.userPieOption.series[1].itemStyle = { diff --git a/src/views/modules/visual/basicinfo/houseStatic/peopleList.vue b/src/views/modules/visual/basicinfo/houseStatic/peopleList.vue index 4107a6b0e..3c8e2e197 100644 --- a/src/views/modules/visual/basicinfo/houseStatic/peopleList.vue +++ b/src/views/modules/visual/basicinfo/houseStatic/peopleList.vue @@ -124,7 +124,7 @@ export default { let params = { orgId: this.orgId, orgType: this.orgType, - type: this.type, + rhType: this.rhType, pageSize: this.pageSize, pageNo: this.pageNo } @@ -172,6 +172,10 @@ export default { type: String, default: "", }, + rhType: {//人户一致:rhyz;人在户不在:rzhbz;户在人不在:hzrbz;暂不清楚:no; + type: String, + default: "", + }, }, }; diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue index 39604913e..91dfd3100 100644 --- a/src/views/modules/visual/basicinfo/people.vue +++ b/src/views/modules/visual/basicinfo/people.vue @@ -1,12 +1,11 @@ @@ -557,7 +491,7 @@ export default { }, }, - data() { + data () { return { breadList: [], showedMoreInfo: false, @@ -660,12 +594,12 @@ export default { }, computed: { - isShundeju() { + isShundeju () { return this.$store.state.user.customerId == "1550309684576591874"; }, }, - beforeRouteEnter(to, from, next) { + beforeRouteEnter (to, from, next) { console.log("让我看看", to); if (from) { const arr = [{ ...from }, { ...to, meta: { title: "个人详情" } }]; @@ -677,14 +611,14 @@ export default { } }, watch: { - uid(id) { + uid (id) { this.userId = id; }, - userId() { + userId () { this.getApiData(); window.scrollTo(0, 0); }, - $route(route) { + $route (route) { // if you go to the redirect page, do not update the breadcrumbs if (route.path.startsWith("/redirect/")) { return; @@ -693,21 +627,21 @@ export default { }, }, - async mounted() { + async mounted () { this.userId = this.uid; console.log(this.$router); this.getApiData(); }, - deactivated() { + deactivated () { this.breadList = []; console.log("breadList-----", this.breadList); }, - destroyed() { + destroyed () { this.breadList = []; console.log("breadList-----", this.breadList); }, methods: { - getBreadcrumb() { + getBreadcrumb () { // only show routes with meta.title console.log("routest----", this.$route); let matched = this.$route.matched.filter( @@ -723,16 +657,16 @@ export default { (item) => item.meta && item.meta.title && item.meta.breadcrumb !== false ); }, - isDashboard(route) { + isDashboard (route) { const name = route && route.name; if (!name) { return false; } return name.trim().toLocaleLowerCase() === "Home".toLocaleLowerCase(); }, - handleSearch() {}, + handleSearch () { }, - async getApiData() { + async getApiData () { await this.getInfo(); this.getHouseInfo(); this.getDemandData(); @@ -741,12 +675,12 @@ export default { this.getPointData(); }, - toUserInfo(uid) { + toUserInfo (uid) { this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` }); }, //加载组织数据 - async getInfo() { + async getInfo () { const url = "/epmetuser/icresiuser/persondata"; let params = { userId: this.userId, @@ -762,7 +696,7 @@ export default { }, //加载组织数据 - async getHouseInfo() { + async getHouseInfo () { const url = "/epmetuser/icresiuser/ownerrelation"; let params = { userId: this.userId, @@ -777,12 +711,12 @@ export default { } }, - handlePageNoChangeDemand(val) { + handlePageNoChangeDemand (val) { this.demand.pageNo = val; this.getDemandData(); }, - handleOperateDemandList(index, type) { + handleOperateDemandList (index, type) { if (type == "查看") { this.showedDemandInfo = true; this.demand.currentIndex = index; @@ -790,12 +724,12 @@ export default { }, //指派成功后刷新 - handleAssignOk() { + handleAssignOk () { this.getDemandData(); }, //加载组织数据 - async getDemandData() { + async getDemandData () { const url = "/heart/userdemand/mydemand"; let params = { epmetUserIdList: this.info.epmetUserIdList, @@ -825,18 +759,18 @@ export default { } }, - handlePageNoChangeIncident(val) { + handlePageNoChangeIncident (val) { this.incident.pageNo = val; this.getIncidentData(); }, - handleClickIncident(index) { + handleClickIncident (index) { this.incident.showedInfo = true; this.incident.currentIndex = index; }, //加载组织数据 - async getIncidentData() { + async getIncidentData () { let url = "/gov/project/icEvent/icevent-pageuserreported"; // 市北沿用旧接口 @@ -864,18 +798,18 @@ export default { } }, - handlePageNoChangeTopic(val) { + handlePageNoChangeTopic (val) { this.topic.pageNo = val; this.getTopicData(); }, - handleClickTopic(index) { + handleClickTopic (index) { this.topic.showedInfo = true; this.topic.currentIndex = index; }, //加载组织数据 - async getTopicData() { + async getTopicData () { const url = "/data/aggregator/resigroup/pageusertopic"; let params = { epmetUserIdList: this.info.epmetUserIdList, @@ -895,18 +829,18 @@ export default { } }, - handlePageNoChangePoint(val) { + handlePageNoChangePoint (val) { this.point.pageNo = val; this.getPointData(); }, - handleClickPoint(index) { + handleClickPoint (index) { this.point.showedInfo = true; this.point.currentIndex = index; }, //加载组织数据 - async getPointData() { + async getPointData () { const url = "/point/resi/point/pageuserpoint"; let params = { epmetUserIdList: this.info.epmetUserIdList, diff --git a/src/views/modules/workSys/certify/certify.vue b/src/views/modules/workSys/certify/certify.vue new file mode 100644 index 000000000..7e0bddbf1 --- /dev/null +++ b/src/views/modules/workSys/certify/certify.vue @@ -0,0 +1,472 @@ + + + + + + + + diff --git a/src/views/modules/workSys/certify/detailForm.vue b/src/views/modules/workSys/certify/detailForm.vue new file mode 100644 index 000000000..ec2e2051f --- /dev/null +++ b/src/views/modules/workSys/certify/detailForm.vue @@ -0,0 +1,205 @@ + + + + + \ No newline at end of file diff --git a/src/views/modules/workSys/certify/editForm.vue b/src/views/modules/workSys/certify/editForm.vue new file mode 100644 index 000000000..293cccb46 --- /dev/null +++ b/src/views/modules/workSys/certify/editForm.vue @@ -0,0 +1,460 @@ + + + + + \ No newline at end of file