diff --git a/src/views/dataBoard/cpts/resi-details.vue b/src/views/dataBoard/cpts/resi-details.vue index 6a377ec5b..1c0671469 100644 --- a/src/views/dataBoard/cpts/resi-details.vue +++ b/src/views/dataBoard/cpts/resi-details.vue @@ -155,6 +155,520 @@ + +
+
+
+
兴趣：
+
{{ info.hobby }}
+
+
+
备注：
+
{{ info.hobby_remark }}
+
+
+
+ +
+
+
+
宗教：
+
{{ info.belief }}
+
+
+
备注：
+
{{ info.belief_remark }}
+
+
+
+ +
+
+
+
残疾类别：
+
{{ info.disable_type }}
+
+
+
残疾等级：
+
{{ info.disable_degree }}
+
+
+
残疾证号：
+
{{ info.disable_idcard }}
+
+
+
残疾说明：
+
{{ info.disable_remark }}
+
+
+
监护人：
+
{{ info.guardian }}
+
+
+
劳动能力：
+
{{ info.skill }}
+
+
+
非义务教育阶段助学：
+
+ {{ info.voluntaryEducationFlag }} +
+
+
+
所患大病：
+
+ {{ info.voluntaryEducationFlag }} +
+
+
+
大病患病时间：
+
{{ info.illnessCode }}
+
+
+
所患慢性病：
+
+ {{ info.chronicDiseaseCode }} +
+
+
+
慢病患病时间：
+
+ {{ info.chronicDiseaseTime }} +
+
+
+
是否参保：
+
+ {{ info.chronicDiseaseTime }} +
+
+
+
自付金额：
+
{{ info.selfPayAmount }}
+
+
+
救助金额：
+
{{ info.selfPayAmount }}
+
+
+
救助时间：
+
+ {{ info.deliveranceAmount }} +
+
+
+
享受救助明细序号：
+
{{ info.deliveranceTime }}
+
+
+
备注：
+
{{ info.deliveranceNum }}
+
+
+
+ +
+
+
+
工作单位：
+
{{ info.workunit }}
+
+
+
职业：
+
{{ info.career }}
+
+
+
离退休时间：
+
{{ info.retire_date }}
+
+
+
备注：
+
{{ info.retire_remark }}
+
+
+
+ +
+
+
+
退休金额：
+
{{ info.retire_income }}
+
+
+
月收入：
+
{{ info.income }}
+
+
+
+ +
+
+
+
籍贯：
+
{{ info.native }}
+
+
+
户籍所在地：
+
{{ info.native_place }}
+
+
+
现居住地：
+
+ {{ info.residence_current }} +
+
+
+
人户状况：
+
{{ info.household }}
+
+
+
备注：
+
{{ info.household_remark }}
+
+
+
+ +
+
+
+
与户主关系：
+
{{ info.holdingrel }}
+
+
+
居住情况：
+
{{ info.residence }}
+
+
+
婚姻状况：
+
{{ info.marital }}
+
+
+
配偶状况：
+
{{ info.spouse }}
+
+
+
有无赡养人：
+
{{ info.supporters }}
+
+
+
与赡养人关系：
+
+ {{ info.supporters_relation }} +
+
+
+
赡养人联系电话：
+
+ {{ info.dependantMobile }} +
+
+
+
备注：
+
{{ info.familyInfoRemark }}
+
+
+
+ +
+
+
+
入党时间：
+
{{ info.joinTime }}
+
+
+
转正时间：
+
{{ info.positiveTime }}
+
+
+
所属支部：
+
{{ info.branchId }}
+
+
+
是否流动党员：
+
{{ info.flowFlag }}
+
+
+
流动党员活动证号：
+
{{ info.flowActNum }}
+
+
+
职务：
+
{{ info.partyJob }}
+
+
+
是否退休：
+
{{ info.retiredFlag }}
+
+
+
是否党员中心户：
+
{{ info.centerFlag }}
+
+
+
入党时所在党支部：
+
{{ info.joinBranchName }}
+
+
+
组织关系转入社区时间：
+
+ {{ info.joinCommunityTime }} +
+
+
+
是否请长假：
+
{{ info.longHolidayFlag }}
+
+
+
+ +
+
+
+
住房性质：
+
{{ info.housingNature }}
+
+
+
保障类型：
+
{{ info.securityType }}
+
+
+
发证日期：
+
{{ info.certificateDate }}
+
+
+
补贴编号：
+
{{ info.subsidyNum }}
+
+
+
补贴金额：
+
{{ info.subsidyAmount }}
+
+
+
+ +
+
+
+
原工作单位：
+
{{ info.originWorkUnit }}
+
+
+
失业时间：
+
{{ info.unemploymentTime }}
+
+
+
失业证号：
+
{{ info.unemploymentTime }}
+
+
+
再就业优惠证号：
+
{{ info.employmentNum }}
+
+
+
技术特长：
+
{{ info.specialSkill }}
+
+
+
失业原因：
+
+ {{ info.unemploymentReason }} +
+
+
+
是否就业困难对象：
+
+ {{ info.employmentHardFlag }} +
+
+
+
劳动能力就业愿望：
+
{{ info.employmentWish }}
+
+
+
+ +
+
+
+
入伍时间：
+
{{ info.joinArmyTime }}
+
+
+
退伍时间：
+
{{ info.leaveArmyTime }}
+
+
+
服役单位：
+
{{ info.serviceUnit }}
+
+
+
接收单位：
+
{{ info.receiveUnit }}
+
+
+
待安置补助金：
+
{{ info.settlementAmount }}
+
+
+
培训状况：
+
{{ info.trainDesc }}
+
+
+
参战时间开始日期：
+
{{ info.joinWarStartTime }}
+
+
+
参战时间截止日期：
+
{{ info.joinWarEndTime }}
+
+
+
现就业状况：
+
+ {{ info.employmentSituation }} +
+
+
+
是否办理公益性岗位：
+
+ {{ info.pubWelfareJobFlag }} +
+
+
+
+ +
+
+
+
职务：
+
{{ info.duty }}
+
+
+
探亲情况：
+
{{ info.visitation }}
+
+
+
+ +
+
+
+
志愿者类别：
+
+ {{ info.volunteerCategory }} +
+
+
+
备注：
+
{{ info.volunteerRemark }}
+
+
+
+ +
+
+
+
高龄补助：
+
{{ info.volunteerRemark }}
+
+
+
+ +
+
+
+
特殊人群类别：
+
+ {{ info.specialCategoryCode }} +
+
+
+
+ +
+
+
+
出生地：
+
{{ info.birthplace }}
+
+
+
父亲姓名：
+
{{ info.father }}
+
+
+
母亲姓名：
+
{{ info.mother }}
+
+
+
胎次：
+
{{ info.count }}
+
+
+
申报日期：
+
{{ info.reportDate }}
+
+
+
+ +
+
+
+
死亡时间：
+
{{ info.deathDate }}
+
+
+
加入原因：
+
{{ info.deathReason }}
+
+
+
移除时间：
+
{{ info.removeDate }}
+
+
+
移除原因：
+
{{ info.removeReason }}
+
+
+
+ +
+
+
+
迁出信息：
+
{{ info.outOfTime }}
+
+
+
迁出类别：
+
{{ info.type }}
+
+
+
迁出原因：
+
{{ info.reason }}
+
+
+
迁出至组织：
+
{{ info.deptId }}
+
+
+
小区：
+
{{ info.villageName }}
+
+
+
楼号：
+
{{ info.buildName }}
+
+
+
单元：
+
{{ info.unitName }}
+
+
+
房屋：
+
{{ info.homeName }}
+
+
+
外迁地址：
+
{{ info.address }}
+
+
+
@@ -245,20 +759,95 @@ export default { name: "--", grid: "--", retire_date: "--", + + joinTime: "--", + positiveTime: "--", + branchId: "--", + flowFlag: "--", + flowActNum: "--", + partyJob: "--", + retiredFlag: "--", + centerFlag: "--", + joinBranchName: "--", + joinCommunityTime: "--", + longHolidayFlag: "--", + ensure_house_id: "--", + housingNature: "--", + securityType: "--", + certificateDate: "--", + subsidyNum: "--", + subsidyAmount: "--", + unemployed_id: "--", + originWorkUnit: "--", + unemploymentTime: "--", + unemploymentNum: "--", + employmentNum: "--", + specialSkill: "--", + unemploymentReason: "--", + employmentHardFlag: "--", + employmentWish: "--", + veteran_id: "--", + joinArmyTime: "--", + leaveArmyTime: "--", + serviceUnit: "--", + receiveUnit: "--", + settlementAmount: "--", + trainDesc: "--", + joinWarStartTime: "--", + joinWarEndTime: "--", + employmentSituation: "--", + pubWelfareJobFlag: "--", + united_front_id: "--", + duty: "--", + visitation: "--", + volunteer_id: "--", + volunteerCategory: "--", + volunteerRemark: "--", + old_people_id: "--", + oldSubsidy: "--", + special_id: "--", + specialCategoryCode: "--", + birth_record_id: "--", + birthplace: "--", + father: "--", + mother: "--", + count: "--", + reportDate: "--", + death_record_id: "--", + deathDate: "--", + deathReason: "--", + removeDate: "--", + removeReason: "--", + move_out_record_id: "--", + outOfTime: "--", + type: "--", + reason: "--", + deptId: "--", + villageId: "--", + villageName: "--", + buildId: "--", + buildName: "--", + unitId: "--", + unitName: "--", + homeId: "--", + homeName: "--", + address: "--", + residence_current: "--", }, currentTabIndex: 0, startTabIndex: 0, - tabList: [ + BaseTabList: [ "教育信息", "兴趣爱好", - "宗教信仰", - "健康信息", - "工作信息", + "宗教", + "健康", + "工作", "经济状况", - "居住信息", - "家庭信息", + "居住", + "家庭", ], + tabList: [], }; }, @@ -310,12 +899,27 @@ export default { }, }, { - mockId: 60069644, + mockId: 61172054, } ); if (code === 0) { this.info = { ...this.info, ...data[0] }; + + const { info } = this; + let tabList = this.BaseTabList; + info.crowd && tabList.push("党员"); + info.srs && tabList.push("保障房"); + info.unemployed && tabList.push("失业"); + info.exs && tabList.push("退役军人"); + info.ufs && tabList.push("统战人员"); + info.volunteer && tabList.push("志愿者"); + info.aged && tabList.push("老年人"); + info.special_popu && tabList.push("特殊人群"); + tabList.push("出生信息"); + tabList.push("死亡信息"); + tabList.push("迁出"); + this.tabList = tabList; } else { this.$message.error(msg); } diff --git a/src/views/dataBoard/renfang/cpts/rkyj.vue b/src/views/dataBoard/renfang/cpts/rkyj.vue index 0a8ee33e1..58398a776 100644 --- a/src/views/dataBoard/renfang/cpts/rkyj.vue +++ b/src/views/dataBoard/renfang/cpts/rkyj.vue @@ -3,23 +3,48 @@
预警居民类别
- 黄色预警 + 黄色预警 +
+ +
+
+ {{ dataitem.type_name }}： + {{ dataitem.yellow_threshold }}人 +
+
+
- 红色预警 + 红色预警 +
+ +
+
+ {{ dataitem.type_name }}： + {{ dataitem.red_threshold }}人 +
+
+
{{ dataitem.type_name }}
+
+@import "@/assets/scss/c/config.scss"; +@import "@/assets/scss/c/function.scss"; .m-list { padding-bottom: 20px; @@ -124,16 +152,63 @@ export default { margin: 24px 0 24px 24px; display: flex; justify-content: space-between; - font-size: 16px; font-family: PingFangSC-Medium, PingFang SC; font-weight: 500; color: #ffffff; - .img { - margin-left: 4px; - width: 15px; - height: 15px; + > div { + width: 33%; + display: flex; + align-items: center; + justify-content: center; + &:first-child { + text-align: left; + justify-content: flex-start; + } + + .explain { + position: relative; + margin-left: 4px; + .btn-explain { + width: 15px; + height: 15px; + } + &:hover { + .explain-box { + display: block; + } + } + .explain-box { + position: absolute; + display: none; + top: 30px; + left: -140px; + padding: 15px 5px; + box-sizing: border-box; + width: 180px; + background: #00023a; + border-radius: 2px; + border: 1px solid #1a95ff; + + .explain-item { + @include toe; + font-size: 14px; + font-family: PingFang SC; + font-weight: 400; + color: rgba(#ffffff, 0.85); + line-height: 28px; + + span { + display: inline-block; + margin-right: 5px; + min-width: 90px; + text-align: right; + color: rgba(#ffffff, 0.65); + } + } + } + } } } diff --git a/src/views/dataBoard/renfang/house/list.vue b/src/views/dataBoard/renfang/house/list.vue index 2be9203c4..c24681e2c 100644 --- a/src/views/dataBoard/renfang/house/list.vue +++ b/src/views/dataBoard/renfang/house/list.vue @@ -193,7 +193,7 @@ export default { { queryParam: { org_id, - houseType, + type: houseType, pageNo, pageSize, }, diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue index 3c2e89b27..a3064a605 100644 --- a/src/views/dataBoard/renfang/index.vue +++ b/src/views/dataBoard/renfang/index.vue @@ -436,7 +436,7 @@ export default { teenagers_ratio: "--", }, - displayedResiId: "1", + displayedResiId: "", displayedHouseId: "", }; }, diff --git a/src/views/dataBoard/renfang/resi/class.vue b/src/views/dataBoard/renfang/resi/class.vue index 4f0a38ec8..079fa9560 100644 --- a/src/views/dataBoard/renfang/resi/class.vue +++ b/src/views/dataBoard/renfang/resi/class.vue @@ -16,7 +16,7 @@
{{ tableTitle }}
-
+
{ return { - label: item.label, - value: item.value, + label: item.type_name, + value: item.type_id, }; }); } else { @@ -229,7 +236,7 @@ export default { }, async getList() { - const { org_id, type_id, pageNo, pageSize } = this; + const { org_id, type_id, subclassId, pageNo, pageSize } = this; this.loading = true; const url = "resident_class_list"; @@ -240,6 +247,7 @@ export default { queryParam: { org_id, type_id, + subclassId, pageNo, pageSize, }, diff --git a/src/views/dataBoard/renfang/resi/list.vue b/src/views/dataBoard/renfang/resi/list.vue index 7a8ff4ecb..ade2ad80f 100644 --- a/src/views/dataBoard/renfang/resi/list.vue +++ b/src/views/dataBoard/renfang/resi/list.vue @@ -180,7 +180,7 @@ export default { { queryParam: { org_id, - resiType, + type: resiType, pageNo, pageSize, }, diff --git a/src/views/dataBoard/renfang/warn/building.vue b/src/views/dataBoard/renfang/warn/building.vue index d11e25670..1667dcb98 100644 --- a/src/views/dataBoard/renfang/warn/building.vue +++ b/src/views/dataBoard/renfang/warn/building.vue @@ -123,12 +123,14 @@ export default { }; }, - mounted() { + activated() { this.org_id = getQueryPara("org_id"); this.level = getQueryPara("level"); this.type_id = getQueryPara("type_id"); const type_name = getQueryPara("type_name"); - this.breadList[1].meta.title = type_name + "预警楼栋"; + this.tableTitle = + type_name + (this.level == "red" ? "红色" : "黄色") + "预警楼栋"; + this.breadList[1].meta.title = this.tableTitle; this.getList(); }, @@ -148,7 +150,7 @@ export default { showInfo(index) { let item = this.srcTableData[index]; - this.displayedId = building_id; + this.displayedId = item.building_id; this.breadList.push({ meta: { @@ -171,17 +173,15 @@ export default { const { org_id, type_id, level, pageNo, pageSize } = this; this.loading = true; - const url = - level == "yellow" - ? "resident_warn_building_y" - : "resident_warn_building_r"; + const url = "resident_warn_building"; const { data, code, msg } = await requestPostBi( url, { queryParam: { org_id, - type_id, + warn_type: level, + resi_type: type_id, pageNo, pageSize, },