From edccda732f31687289b9115c6b1f00579e0a8a17 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Thu, 16 Feb 2023 11:08:27 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AE=8C=E5=96=84=20?= =?UTF-8?q?=E5=87=86=E5=A4=87=E5=AF=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataBoard/cpts/resi-details.vue | 618 +++++++++++++++++- src/views/dataBoard/renfang/cpts/rkyj.vue | 105 ++- src/views/dataBoard/renfang/house/list.vue | 2 +- src/views/dataBoard/renfang/index.vue | 2 +- src/views/dataBoard/renfang/resi/class.vue | 20 +- src/views/dataBoard/renfang/resi/list.vue | 2 +- src/views/dataBoard/renfang/warn/building.vue | 16 +- 7 files changed, 726 insertions(+), 39 deletions(-) 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, }, From b4f0f1030dbea36208a0d84d85674f992ce58998 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Thu, 16 Feb 2023 16:59:31 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8F=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/dataBoard/renfang/index.scss | 1 + src/views/dataBoard/cpts/map/index.vue | 3 + src/views/dataBoard/renfang/cpts/fwgl.vue | 9 +- src/views/dataBoard/renfang/cpts/jmgl.vue | 10 +- src/views/dataBoard/renfang/cpts/rkyj.vue | 6 +- src/views/dataBoard/renfang/house/list.vue | 5 +- src/views/dataBoard/renfang/index.vue | 91 +++++- src/views/dataBoard/renfang/resi/class.vue | 7 +- src/views/dataBoardMain/main.vue | 276 ++++++++++--------- 9 files changed, 254 insertions(+), 154 deletions(-) diff --git a/src/assets/scss/dataBoard/renfang/index.scss b/src/assets/scss/dataBoard/renfang/index.scss index ca35bb0d7..cbd376a5e 100644 --- a/src/assets/scss/dataBoard/renfang/index.scss +++ b/src/assets/scss/dataBoard/renfang/index.scss @@ -249,6 +249,7 @@ font-family: PingFangSC-Medium, PingFang SC; font-weight: 500; color: #6fdeff; + cursor: pointer; img { width: 16px; height: 16px; diff --git a/src/views/dataBoard/cpts/map/index.vue b/src/views/dataBoard/cpts/map/index.vue index bc72a0552..953738dba 100644 --- a/src/views/dataBoard/cpts/map/index.vue +++ b/src/views/dataBoard/cpts/map/index.vue @@ -910,6 +910,9 @@ export default { } } + /deep/ .l7-popup { + z-index: 100; + } /deep/ .l7-popup-content { background: rgba(#020340, 0.58); box-shadow: 0 0 20px 3px inset rgba(#22f, 0.1); diff --git a/src/views/dataBoard/renfang/cpts/fwgl.vue b/src/views/dataBoard/renfang/cpts/fwgl.vue index 685d7a715..723667e01 100644 --- a/src/views/dataBoard/renfang/cpts/fwgl.vue +++ b/src/views/dataBoard/renfang/cpts/fwgl.vue @@ -42,7 +42,7 @@
@@ -81,7 +81,7 @@
-
+
{{ dataitem.yellow_warn }}栋 （{{ - dataitem.yellow_threshold - }}） + />{{ dataitem.yellow_warn }}栋
{{ dataitem.red_warn }}栋 （{{ dataitem.red_threshold }}） + />{{ dataitem.red_warn }}栋
diff --git a/src/views/dataBoard/renfang/house/list.vue b/src/views/dataBoard/renfang/house/list.vue index c24681e2c..591f40966 100644 --- a/src/views/dataBoard/renfang/house/list.vue +++ b/src/views/dataBoard/renfang/house/list.vue @@ -152,9 +152,12 @@ export default { }; }, - mounted() { + activated() { this.org_id = getQueryPara("org_id"); this.houseType = getQueryPara("type"); + const type_name = getQueryPara("type_name"); + this.breadList[1].meta.title = type_name + "房屋列表"; + this.tableTitle = type_name + "房屋列表"; this.getList(); }, diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue index a3064a605..8a7d90acb 100644 --- a/src/views/dataBoard/renfang/index.vue +++ b/src/views/dataBoard/renfang/index.vue @@ -245,9 +245,14 @@ src="~@/assets/images/shuju/main/card-title-bg-800.png" class="box-title-bg" /> -
居民分类分析
+
居民分类分析
+
居民分类分析-智能预测
-
+
@@ -256,9 +261,20 @@ src="~@/assets/images/shuju/renfang/index/i-hint.png" />
+ +
+ + 返回 +
-
+
+ +
+
+
{{ ("0" + (index + 1)).substr(-2) }}.
+
{{ item.name }}
+
+ {{ item.count }} 人 +
+
+ +
+ +
+ 较上一年 + + + {{ item.growthAbs }} + 人 +
+
+
@@ -413,7 +460,9 @@ export default { }, ], - resiCategoryData: [], + resiCategoryData: [], // 居民分类分析 + resiCategoryForecastData: [], // 居民分类预测 + displayedForecast: false, //显示居民分类分析 还是居民分类预测 searchModule: { displayedCard: false, @@ -465,6 +514,7 @@ export default { // await this.getMapData(); // await this.getSubMapData(); this.getResiCategoryData(); + this.getResiCategoryForecastData(); this.getPerInfo(); this.loading = true; @@ -639,6 +689,39 @@ export default { } }, + //居民分类预测数据 + async getResiCategoryForecastData() { + console.log("=========================getResiCategoryForecastData"); + const url = "resident_class_predict"; + + const { data, code, msg } = await requestPostBi( + url, + { + queryParam: { + org_id: this.orgData.id, + }, + }, + { + mockId: 60064667, + } + ); + + if (code === 0) { + this.resiCategoryForecastData = data.map((item) => { + return { + code: item.resident_type, + name: item.resident_type_name, + count: item.resident_count, + ratio: item.resident_ratio, + growth: item.change_count, + growthAbs: Math.abs(item.change_count), + }; + }); + } else { + this.$message.error(msg); + } + }, + //获取地图上显示的组织数据 async getMapData() { console.log("=========================getMapData"); diff --git a/src/views/dataBoard/renfang/resi/class.vue b/src/views/dataBoard/renfang/resi/class.vue index 079fa9560..4c79b68fd 100644 --- a/src/views/dataBoard/renfang/resi/class.vue +++ b/src/views/dataBoard/renfang/resi/class.vue @@ -159,13 +159,14 @@ export default { }; }, - mounted() { + activated() { this.org_id = getQueryPara("org_id"); this.type_id = getQueryPara("type_id"); const type_name = getQueryPara("type_name"); - this.getList(); - this.breadList[1].meta.title = type_name; + this.breadList[1].meta.title = type_name + "居民列表"; + this.tableTitle = type_name + "居民列表"; + this.getList(); if (this.type_id == "6") { this.getSubclass(); } diff --git a/src/views/dataBoardMain/main.vue b/src/views/dataBoardMain/main.vue index d334a310b..1d166dfbd 100644 --- a/src/views/dataBoardMain/main.vue +++ b/src/views/dataBoardMain/main.vue @@ -1,46 +1,51 @@ From 144da0bf574f127618b967f4e9f3f7c0a11c0658 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 16 Feb 2023 18:03:41 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E5=B1=85=E6=B0=91=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=B8=AD=E4=B8=8D=E7=AC=A6=E5=90=88=E6=9D=A1=E4=BB=B6=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E4=B8=8B=E6=96=B9=E9=80=89=E9=A1=B9/=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96/=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E7=B1=BB=E5=88=AB=E6=90=9C=E7=B4=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/buttonstyle.scss | 13 +++++-- src/views/components/resiForm.vue | 18 ++++++--- src/views/components/resiInfo.vue | 59 ++++++++++++++--------------- src/views/components/resiSearch.vue | 4 +- src/views/modules/base/resi.vue | 36 ++++++++++-------- 5 files changed, 74 insertions(+), 56 deletions(-) diff --git a/src/assets/scss/buttonstyle.scss b/src/assets/scss/buttonstyle.scss index dbf80ad00..51b592f90 100644 --- a/src/assets/scss/buttonstyle.scss +++ b/src/assets/scss/buttonstyle.scss @@ -39,7 +39,9 @@ border: none !important; } - +.diy-button--blue:hover{ + background: #0042a3 !important; +} //黄色 .diy-button--yellow { background: linear-gradient(0deg, #FAA700 0%, #FFBF28 100%) !important; @@ -95,15 +97,18 @@ font-size: 14px !important; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; - color: #0056D6 !important; + color: #0056d6 !important; // line-height: 22px !important; min-width: 60px !important; height: 32px !important; - // padding:0 8px !important; background: #FFFFFF !important; border-radius: 2px !important; - border: 1px solid #0056D6 !important; + border: 1px solid #0056d6 !important; +} +.diy-button--white:hover{ + border: 1px solid #0042a3 !important; + color: #0042a3 !important; } // 普通按钮 .diy-button--common { diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index 9f40b73b9..2a2cb1eee 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -195,6 +195,7 @@ :multiple="itemk.formName=='specialCategoryCode'" :collapse-tags="itemk.formName=='specialCategoryCode'" clearable + :style="{'width':itemk.formName=='specialCategoryCode'?'183px':''}" class="u-item-width-normal"> { + this.$http.post(`/actual/base/residentHealthInfo/getHealthInfoDetailById/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); } else { @@ -2039,6 +2045,7 @@ export default { this.newForm.healthDto = this.form.healthDto } }) + }, // 工作信息详情 residentWorkInfo(id) { @@ -2457,4 +2464,5 @@ export default { .f-bto0{ margin-bottom: 0px !important; } + diff --git a/src/views/components/resiInfo.vue b/src/views/components/resiInfo.vue index 30d13cac2..6a2dd0280 100644 --- a/src/views/components/resiInfo.vue +++ b/src/views/components/resiInfo.vue @@ -444,36 +444,6 @@ - - - -
-
死亡时间 :
- {{residentDeathRecordObj?residentDeathRecordObj.deathDate?residentDeathRecordObj.deathDate.substr(0,10):'--':'--'}} -
- - -
-
加入原因 :
- {{residentDeathRecordObj?residentDeathRecordObj.deathReason ?residentDeathRecordObj.deathReason :'--':'--'}} -
- - -
-
移除时间 :
- {{residentDeathRecordObj?residentDeathRecordObj.removeDate ?residentDeathRecordObj.removeDate.substr(0,10) :'--':'--'}} -
- - - - -
-
移除原因 :
- {{residentDeathRecordObj?residentDeathRecordObj.removeReason?residentDeathRecordObj.removeReason:'--':'--'}} -
- - - @@ -856,6 +826,35 @@ -- + + + +
+
死亡时间 :
+ {{residentDeathRecordObj?residentDeathRecordObj.deathDate?residentDeathRecordObj.deathDate.substr(0,10):'--':'--'}} +
+ + +
+
加入原因 :
+ {{residentDeathRecordObj?residentDeathRecordObj.deathReason ?residentDeathRecordObj.deathReason :'--':'--'}} +
+ + +
+
移除时间 :
+ {{residentDeathRecordObj?residentDeathRecordObj.removeDate ?residentDeathRecordObj.removeDate.substr(0,10) :'--':'--'}} +
+ + + + +
+
移除原因 :
+ {{residentDeathRecordObj?residentDeathRecordObj.removeReason?residentDeathRecordObj.removeReason:'--':'--'}} +
+ + diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index a47077356..9c8c1bbcd 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -39,10 +39,10 @@ - + 至 - + diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index c6d73f8c9..28bf62b13 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -16,7 +16,7 @@ style="margin-left: 10px" size="small" plain - class=" f-right5" + class=" f-right5 diy-button--white" @click="resetSearchForm" >重置 导出核对批量删除 { - // if (res.code !== 0) { - // return this.$message.error(res.msg); - // } else { - // this.$refs.baseForm.old_from(res.data); - // } - // }).catch((err) => { - // return this.$message.error("网络错误"); - // }); - // }, + residentBaseInfo () { + this.$http.post(`/actual/base/residentBaseInfo/detail/${this.editUserId}`).then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + this.$refs.baseForm.old_from(res.data); + } + }).catch((err) => { + return this.$message.error("网络错误"); + }); + }, handlerReset() { this.$refs.baseForm.resetForm(); }, From 920daf95292c83e6e1c2f315defa6bffe5a74544 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 17 Feb 2023 11:09:13 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/community/communityExportInfo.vue | 2 +- src/views/modules/base/diyInfo.vue | 6 +++--- src/views/modules/base/resi.vue | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/views/modules/base/community/communityExportInfo.vue b/src/views/modules/base/community/communityExportInfo.vue index bc75c4cc1..0123805c7 100644 --- a/src/views/modules/base/community/communityExportInfo.vue +++ b/src/views/modules/base/community/communityExportInfo.vue @@ -328,7 +328,7 @@ export default { this.exportTemplate(id) }, async exportTemplate (id) { - let url = "/epmetuser/icresiuser/exportExcelCustom" + let url = "/actual/base/communityHouse/exportExcelCustom" let params = { templateId: id || '', diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue index 62cbe0574..ae5a035a7 100644 --- a/src/views/modules/base/diyInfo.vue +++ b/src/views/modules/base/diyInfo.vue @@ -310,14 +310,14 @@ export default { this.exportTemplate(id) }, async exportTemplate(id) { - let url = "/epmetuser/icresiuser/exportExcelCustom" + let url = "/actual/base/residentBaseInfo/exportExcelCustom" let params = { templateId: id || '', searchForm: {...this.search}, exportConfig: { ...this.form, - formCode: 'resi_base_info', + formCode: 'resident_base_info', itemList: this.rightList.map(item => { return { itemId: item.id, @@ -355,7 +355,7 @@ export default { }, async getTemplateList () { let params = { - formCode: 'resi_base_info' + formCode: 'resident_base_info' } await this.$http .post('/oper/customize/icExportTemplate/templateList', params) diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 28bf62b13..85d31f9ef 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -309,7 +309,7 @@ :resi-id="editUserId" @changegroup="handleChangeGroup" /> - +
@@ -401,7 +401,7 @@ ref="ref_diy" :list="exportList" :search="{ - formCode: 'resi_base_info', + formCode: 'resident_base_info', pageNo: currentPage, pageSize: pageSize, conditions: conditions, @@ -642,7 +642,7 @@ export default { categoryKey: "resi_info", paramMap: { searchForm: { - formCode: "resi_base_info", + formCode: "resident_base_info", pageNo: this.currentPage, pageSize: this.pageSize, conditions: this.conditions, @@ -898,7 +898,7 @@ export default { this.exportBtn = true; this.exportBtnTitle = "正在导出..."; let params = { - formCode: "resi_base_info", + formCode: "resident_base_info", conditions: this.conditions, }; @@ -1330,7 +1330,7 @@ export default { getrowInfo(id) { let params = { - formCode: "resi_base_info", + formCode: "resident_base_info", icResiUserId: id, }; this.$http @@ -1408,7 +1408,7 @@ export default { let options = []; // console.log('getOptionsList----', url) await this.$http - .post(url, { formCode: "resi_base_info" }) + .post(url, { formCode: "resident_base_info" }) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -1441,7 +1441,7 @@ export default { async getFormList(type) { await this.$http .post("/oper/customize/icform/getcustomerform", { - formCode: "resi_base_info", + formCode: "resident_base_info", dynamic: true, }) .then(({ data: res }) => { @@ -1485,7 +1485,7 @@ export default { async getExportList(type) { const url = "/oper/customize/icformitemgroup/list"; let params = { - formCode: "resi_base_info", + formCode: "resident_base_info", }; const { data, code, msg } = await requestPost(url, params); @@ -1552,7 +1552,7 @@ export default { immediate: true } }, - + }; From 6217d1f333894a919ebc09380431d1d672fafa19 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 17 Feb 2023 12:46:45 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E5=85=B1=E6=80=A7=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/commonDemand/commonDemand.vue | 289 ++++++++++++++++++ .../modules/commonDemand/commonDemandForm.vue | 176 +++++++++++ 2 files changed, 465 insertions(+) create mode 100644 src/views/modules/commonDemand/commonDemand.vue create mode 100644 src/views/modules/commonDemand/commonDemandForm.vue diff --git a/src/views/modules/commonDemand/commonDemand.vue b/src/views/modules/commonDemand/commonDemand.vue new file mode 100644 index 000000000..9972662e9 --- /dev/null +++ b/src/views/modules/commonDemand/commonDemand.vue @@ -0,0 +1,289 @@ + + + + + + + + \ No newline at end of file diff --git a/src/views/modules/commonDemand/commonDemandForm.vue b/src/views/modules/commonDemand/commonDemandForm.vue new file mode 100644 index 000000000..fbf39ac40 --- /dev/null +++ b/src/views/modules/commonDemand/commonDemandForm.vue @@ -0,0 +1,176 @@ + + + + + + + + \ No newline at end of file From 2b9dda7e97792e8aaabd959129e6b1313a0769c6 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 17 Feb 2023 13:16:23 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=B1=95=E5=BC=80=E7=AC=AC=E4=B8=80=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/community/community.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index 17c6603fd..571533aa2 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -19,6 +19,7 @@ :filter-node-method="filterNode" @node-click="handleNodeClick" lazy + :default-expanded-keys="autoOpenArr" :load="lazyLoadTree"> nowData } return { + autoOpenArr:[], boxHeight: true, searchHeight: 190, filterText: '', @@ -538,15 +539,17 @@ export default { this.startLoading() this.$refs.ref_tree.$data.store.lazy = !this.filterText if(this.filterText.length > 0 && this.filterText!=''){ - const url = `/actual/base/communityBuilding/tree/search?keyword=${this.filterText}` + const url = `/actual/base/communityBuilding/tree/search?keyword=${this.filterText}` const {data,code,msg} = await requestGet(url) if(data[0].children.length>0){ this.treeData = data + this.autoOpenArr.push(this.treeData[0].id); }else{ this.treeData = [] setTimeout(() => { this.loadTree() }, 5) + this.$message.error('暂未找到!') } }else { From 6fd5477a5ed5c98deb2e67fe833a96d458f18e88 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 17 Feb 2023 14:26:07 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E6=94=B9bug=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataBoard/renfang/cpts/rkfx.vue | 188 ++++++-- src/views/dataBoard/renfang/resi/list.vue | 6 +- src/views/dataBoard/renfang/warn/resi.vue | 2 +- src/views/main-navbar.vue | 532 ++++++++++++---------- src/views/modules/shequ/chaxun.vue | 2 +- 5 files changed, 456 insertions(+), 274 deletions(-) diff --git a/src/views/dataBoard/renfang/cpts/rkfx.vue b/src/views/dataBoard/renfang/cpts/rkfx.vue index 179aa2453..b6110fc79 100644 --- a/src/views/dataBoard/renfang/cpts/rkfx.vue +++ b/src/views/dataBoard/renfang/cpts/rkfx.vue @@ -17,6 +17,7 @@ class="legend-row" :key="'pie' + item.name" v-for="item in pieData" + @click="handleClickItem(item)" >
{{ item.name }}
@@ -122,6 +123,19 @@ export default { this.getPie(); }, + handleClickItem(item) { + const { type, name } = item; + this.$router.push({ + path: "/dataBoard/renfang/resi-list", + query: { + org_id: this.orgId, + type, + type_category: this.currentTab, + type_name: name, + }, + }); + }, + // 获取房屋总数等 async getInfo() { const url = "resident_analyze"; @@ -176,50 +190,166 @@ export default { const { currentTab, info } = this; if (currentTab == "性别") { this.pieData = [ - { value: info.male_count, name: "男" }, - { value: info.female_count, name: "女" }, + { + value: info.male_count, + type: "male_count", + name: "男性", + }, + { + value: info.female_count, + type: "female_count", + name: "女性", + }, ]; } else if (currentTab == "户籍") { this.pieData = [ - { value: info.local_count, name: "本地户籍" }, - { value: info.field_count, name: "外地户籍" }, + { + value: info.local_count, + type: "local_count", + name: "本地户籍", + }, + { + value: info.field_count, + type: "field_count", + name: "外地户籍", + }, ]; } else if (currentTab == "人户状况") { this.pieData = [ - { value: info.resi_y_house_y_count, name: "人户一致" }, - { value: info.resi_y_house_n_count, name: "人在户不在" }, - { value: info.resi_n_house_y_count, name: "户在人不在" }, + { + value: info.resi_y_house_y_count, + type: "resi_y_house_y_count", + name: "人户一致", + }, + { + value: info.resi_y_house_n_count, + type: "resi_y_house_n_count", + name: "人在户不在", + }, + { + value: info.resi_n_house_y_count, + type: "resi_n_house_y_count", + name: "户在人不在", + }, ]; } else if (currentTab == "年龄") { this.pieData = [ - { value: info.age50_count, name: "50岁以下" }, - { value: info.age5059_count, name: "50-59岁" }, - { value: info.age6069_count, name: "60-69岁" }, - { value: info.age7079_count, name: "70-79岁" }, - { value: info.age80_count, name: "80岁以上" }, + { + value: info.age50_count, + type: "age50_count", + name: "50岁以下", + }, + { + value: info.age5059_count, + type: "age5059_count", + name: "50-59岁", + }, + { + value: info.age6069_count, + type: "age6069_count", + name: "60-69岁", + }, + { + value: info.age7079_count, + type: "age7079_count", + name: "70-79岁", + }, + { + value: info.age80_count, + type: "age80_count", + name: "80岁以上", + }, ]; } else if (currentTab == "志愿者类别") { this.pieData = [ - { value: info.culture_count, name: "文化队伍" }, - { value: info.committee_count, name: "楼委会" }, - { value: info.capable_count, name: "能人达人" }, - { value: info.friend_count, name: "老友俱乐部" }, - { value: info.agent_count, name: "代办员" }, - { value: info.mediator_count, name: "调解员" }, - { value: info.collector_count, name: "采集员" }, - { value: info.security_count, name: "治安巡逻员" }, - { value: info.party_mem_count, name: "党员中心户" }, + { + value: info.culture_count, + type: "culture_count", + name: "文化队伍", + }, + { + value: info.committee_count, + type: "committee_count", + name: "楼委会", + }, + { + value: info.capable_count, + type: "capable_count", + name: "能人达人", + }, + { + value: info.friend_count, + type: "friend_count", + name: "老友俱乐部", + }, + { + value: info.agent_count, + type: "agent_count", + name: "代办员", + }, + { + value: info.mediator_count, + type: "mediator_count", + name: "调解员", + }, + { + value: info.collector_count, + type: "collector_count", + name: "采集员", + }, + { + value: info.security_count, + type: "security_count", + name: "治安巡逻员", + }, + { + value: info.party_mem_count, + type: "party_mem_count", + name: "党员中心户", + }, ]; } else if (currentTab == "党员文化程度") { this.pieData = [ - { value: info.primary_count, name: "小学及文盲" }, - { value: info.junior_high_count, name: "初中" }, - { value: info.second_speci_count, name: "中专" }, - { value: info.high_school_count, name: "高中" }, - { value: info.junior_college_count, name: "大专" }, - { value: info.undergrad_count, name: "本科" }, - { value: info.master_count, name: "硕士" }, - { value: info.doctor_count, name: "博士" }, + { + value: info.primary_count, + type: "primary_count", + name: "小学及文盲", + }, + { + value: info.junior_high_count, + type: "junior_high_count", + name: "初中", + }, + { + value: info.second_speci_count, + type: "second_speci_count", + name: "中专", + }, + { + value: info.high_school_count, + type: "high_school_count", + name: "高中", + }, + { + value: info.junior_college_count, + type: "junior_college_count", + name: "大专", + }, + { + value: info.undergrad_count, + type: "undergrad_count", + name: "本科", + }, + { + value: info.master_count, + type: "master_count", + name: "硕士", + }, + { + value: info.doctor_count, + type: "doctor_count", + name: "博士", + }, ]; } else if (currentTab == "下级人口分布") { this.pieData = []; diff --git a/src/views/dataBoard/renfang/resi/list.vue b/src/views/dataBoard/renfang/resi/list.vue index ade2ad80f..099d3048b 100644 --- a/src/views/dataBoard/renfang/resi/list.vue +++ b/src/views/dataBoard/renfang/resi/list.vue @@ -139,9 +139,13 @@ export default { }; }, - mounted() { + activated() { this.org_id = getQueryPara("org_id"); this.resiType = getQueryPara("type"); + const type_name = getQueryPara("type_name"); + this.breadList[1].meta.title = type_name + "居民列表"; + this.tableTitle = type_name + "居民列表"; + this.getList(); }, diff --git a/src/views/dataBoard/renfang/warn/resi.vue b/src/views/dataBoard/renfang/warn/resi.vue index 560d0fab4..6105bb33d 100644 --- a/src/views/dataBoard/renfang/warn/resi.vue +++ b/src/views/dataBoard/renfang/warn/resi.vue @@ -123,7 +123,7 @@ export default { }; }, - mounted() { + activated() { this.getList(); }, diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index 1fc73f903..9ce10aa93 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -1,118 +1,142 @@ diff --git a/src/views/modules/shequ/chaxun.vue b/src/views/modules/shequ/chaxun.vue index 62c9784ec..52fe8ae3d 100644 --- a/src/views/modules/shequ/chaxun.vue +++ b/src/views/modules/shequ/chaxun.vue @@ -587,7 +587,7 @@ export default { } }, }, - mounted() { + activated() { this.getApiData(); this.firstSearch(); From 4768227216a14ec612c2121e496796e63584e56c Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 17 Feb 2023 14:47:12 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E5=B1=95=E5=BC=80=E5=A4=9A=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/community/community.vue | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index 571533aa2..f4c1f3b44 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -470,6 +470,7 @@ export default { this.getHouseList(); }, async lazyLoadTree(node, resolve) { + console.log(node); const url = `/actual/base/communityBuilding/tree/nextTreeNode?id=${node.data.id}&level=${node.data.level}`; const { data, code, msg } = await requestGet(url); if (code === 0) { @@ -536,24 +537,23 @@ export default { }, //回车搜索组织 async handleChangeSerch (){ - this.startLoading() - this.$refs.ref_tree.$data.store.lazy = !this.filterText + this.startLoading() + this.$refs.ref_tree.$data.store.lazy = !this.filterText if(this.filterText.length > 0 && this.filterText!=''){ const url = `/actual/base/communityBuilding/tree/search?keyword=${this.filterText}` const {data,code,msg} = await requestGet(url) if(data[0].children.length>0){ this.treeData = data - this.autoOpenArr.push(this.treeData[0].id); + for(let i in this.treeData[0].children){ + this.autoOpenArr.push(this.treeData[0].id,this.treeData[0].children[i].id,this.treeData[0].children[0].children[0].id); + } }else{ this.treeData = [] - setTimeout(() => { - this.loadTree() - }, 5) - this.$message.error('暂未找到!') } }else { this.treeData = [] + this.autoOpenArr = [] this.loadTree() } this.endLoading() @@ -665,9 +665,6 @@ export default { const url = "/actual/base/communityBuilding/tree/initTree" const { data, code, msg } = await requestGet(url) if (code === 0) { - this.openNodes = [] - this.openNodes.push(data.id) - this.treeData = [] this.treeData.push(data) if (!isRefresh && data) { @@ -736,7 +733,6 @@ export default { this.updateStartDate = '' this.updateEndDate = '' this.showRoomTable = false - this.selObj = JSON.parse(JSON.stringify(obj)) this.getTreeObj(obj) await nextTick(1000) From b34fdc9c2d13167652ca1b33aca4e76c3fb7bb5f Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 17 Feb 2023 16:41:12 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E6=99=BA=E8=83=BD=E6=8F=90=E9=86=92?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/main/clear.png | Bin 0 -> 1020 bytes src/assets/images/main/close.png | Bin 0 -> 560 bytes src/assets/scss/common.scss | 6 +- src/views/main-navbar.vue | 140 +++++++++++++++++++++++++++--- src/views/modules/home/notice.vue | 134 ++++++++++++++++++++-------- 5 files changed, 231 insertions(+), 49 deletions(-) create mode 100644 src/assets/images/main/clear.png create mode 100644 src/assets/images/main/close.png diff --git a/src/assets/images/main/clear.png b/src/assets/images/main/clear.png new file mode 100644 index 0000000000000000000000000000000000000000..c78f41b377e50a629fecee90a1eba2f8771869c9 GIT binary patch literal 1020 zcmVPx&wn;=mR9HvFmrZCKWf;eQ&s29~toVTkd(gIsIx~vWmTC_oC@mh;gO}Y@DlOQ= z5A;wdMg?&NMXaK|C~dS*X*4_QO;bErS`Qwg#rB|`*;+A*Vxb^fZKcL!9+`RfV|KH< zGubGaQ^>yW^Zz~1^MBrXM_A%VmRO(p0II^~>ULBgLAe=No)K~e;RMK0gjXm#KV;e0 z3b4gr!HkT9-jii>*EPauEguwT=MBTOq<@$>~@eKvFysSY|!UggxE@Al7cs0A&~G<(Lt@rG8HI1}N!8oceB% z_iy-PUQ61=g*hgjS2><=5k+r_b7rD8wR z0@=w^#o!}UA3!*c=dLwFQh(YvJasD1nc1IFy&9NBtcPNVEaFKMCQV%kUIu**n4#k4 zdjrHls&_*;2@KXCc0#x#Hk{erTJ~fKI#pmOC=u!l@v@2=C!cP@R)~Z|hqC`K0P`ym z9TxL@-tN->tO5;>e0vu%7adTOc+MNC2UQ;ce*-xziQeUrQTl&Mn!^vGcu}>Ur((Yp z|Jl<6MgJJe8jyojocsG%2cntRxi5{rwVkrPF9SfZ7u6AvIYjTobEo=-CV|4&c&Z> qBKw%I-)+AcX9virw$Nou4)8C6_0up-Fk!C%0000Px$>PbXFR9Hvt)<>??KoE!V-@5=g!;YMD5E2sc1}s@{BJRKmSRyhTR*#$!If^LY z0)R>?OC!UKyZt0)Gv3;+@9Te6w>@Rd*VLH#CIXWLMkR0x8*u_(dJgL>oW@U_{8x=p z0vB-v_iz|rDwfmWXzI8&Ysi!gu2Z4q+%fYLp1Hlem*fv?T(50lN|&vA^w_n^J+Ovn1QG z4sD6Kx$=NN&)DB}!D|v|Y7I)nWXCS~oh#poXBm4DypKSW#8s@#?ez;g@HFA?OIF@I zQ`3UMx=XViArV)=qvs!L;C&N__vRxGs%;6pmF@WcKLi4P30v_bchVZ%#8Fg9)V5$j zt~}t6^N5Zbabot8s1XQwtb9wtlE1D|0@tt~0go?W?O)NLM4TBhm{kI2Fb~Ijzz35!o5OgZR-kKu yOYb)+$49Fwfl|PXp6l8LGb@
- +
+ +
- +
{{ unreadMsgNum }} - +
+ +
@@ -136,6 +140,23 @@ > + +
+
新提醒
+
+ +
+
+ {{ noticeList[0].createdTime }} + NEW +
+
+ {{ noticeList[0].content }} +
+
@@ -157,6 +178,10 @@ export default { customerName: "", unreadMsgNum: 0, + + noticeList: [], + + displayedNoticeList: true, }; }, components: { @@ -182,7 +207,8 @@ export default { }, }, methods: { - toRemindPage() { + toNoticePage() { + this.displayedNoticeList = false; this.$router.replace("/main/home-notice"); }, @@ -284,15 +310,39 @@ export default { const { data, code, msg } = await requestGet(url, {}); if (code === 0) { console.log("列表请求成功！！！！！！！！！！！！！！"); + if (data.unreadNum > 0 && this.unreadMsgNum < data.unreadNum) { + this.getNoticeList(); + this.displayedNoticeList = true; + } this.unreadMsgNum = data.unreadNum; } else { } }, + + //加载组织数据 + async getNoticeList() { + const url = "/message/intelligentMessage/page"; + let params = { + page: this.pageNo, + limit: this.pageSize, + readFlag: 0, + }; + + const { data, code, msg } = await requestGet(url, params); + + if (code === 0) { + this.noticeList = data.list; + } else { + this.$message.error(msg); + } + }, }, }; diff --git a/src/views/modules/home/notice.vue b/src/views/modules/home/notice.vue index 0cc1a9f72..83288500b 100644 --- a/src/views/modules/home/notice.vue +++ b/src/views/modules/home/notice.vue @@ -2,14 +2,13 @@
-
- - - - - +
+
全部提醒
+
+ + 全部标记已读 +
-
- + 已读 + 未读
{{ item.content }}
+
+ + 标记已读 +
{{ item.createdTime }}
@@ -75,7 +80,7 @@ export default { }, computed: {}, watch: {}, - mounted() { + activated() { this.getList(); }, methods: { @@ -89,21 +94,21 @@ export default { this.read(item, index); }, - async read(item) { - if (item.readFlag == 1) return; + async read(item, index) { + if (item && item.readFlag == 1) return; const url = "/message/intelligentMessage/msg/clear"; - let params = { - id: item.id, - }; + let params = {}; + + if (item.id) { + params.id = item.id; + } const { data, code, msg } = await requestPost(url, params); if (code === 0) { - const { noticeData } = this; - noticeData[index].readFlag = 1; - this.noticeData = noticeData; console.log("消息已读"); + this.getList(); } else { this.$message.error(msg); } @@ -183,6 +188,7 @@ export default { } .item { + position: relative; display: flex; align-items: center; padding: 16px 0 12px; @@ -191,12 +197,31 @@ export default { border-bottom: none; } - .item-tag { + &:hover { + .item-title { + color: #0056d6; + } + .item-btn-clear { + display: block; + } + } + + .i-tag { display: block; margin-right: 15px; - width: 24px; - height: 24px; + width: 40px; + height: 22px; + border-radius: 4px; + border: 1px solid rgba(0, 0, 0, 0.15); + font-size: 12px; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: rgba(0, 0, 0, 0.88); + line-height: 20px; + font-style: normal; + text-align: center; } + .item-title { // @include toe; width: 60%; @@ -207,7 +232,29 @@ export default { color: rgba(0, 0, 0, 0.85); line-height: 22px; } + + .item-btn-clear { + position: absolute; + display: none; + top: 50%; + left: 65%; + width: 80px; + font-size: 14px; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #0042a3; + line-height: 16px; + cursor: pointer; + transform: translateY(-50%); + + img { + width: 16px; + margin-right: 3px; + } + } + .item-date { + margin-left: 100px; font-size: 12px; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; @@ -216,21 +263,32 @@ export default { } } } - .btn-clear { - position: absolute; - top: 14px; - right: 15px; - width: 32px; - height: 12px; - width: 75px; - height: 25px; - background: linear-gradient(0deg, #db3b3b 1%, #ff8080 100%); - border-radius: 3px; - font-size: 14px; - font-weight: 500; - color: #ffffff; - line-height: 25px; - text-align: center; + .header { + display: flex; + justify-content: space-between; + padding: 12px 0; + margin-bottom: 10px; + border-bottom: 1px solid #f0f5fa; + .title { + height: 22px; + font-size: 16px; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: rgba(0, 0, 0, 0.85); + line-height: 22px; + } + .btn-clear { + font-size: 14px; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #0042a3; + line-height: 16px; + cursor: pointer; + img { + width: 16px; + margin-right: 3px; + } + } } } From 46040a3ef9de2a5f583a5e1dbed03a3f4e5c7f64 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 17 Feb 2023 17:37:04 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E8=8F=9C=E5=8D=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/community/community.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index f4c1f3b44..c6428be60 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -664,6 +664,7 @@ export default { async loadTree (isRefresh) { const url = "/actual/base/communityBuilding/tree/initTree" const { data, code, msg } = await requestGet(url) + this.handleNodeClick(data) if (code === 0) { this.treeData = [] this.treeData.push(data) @@ -739,7 +740,9 @@ export default { this.vDisabled = false this.bDisabled = false if (obj.level === 'building') {//点击楼栋 - this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj) + setTimeout(()=>{ + this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj) + },100) this.selAgencyId = '' this.selGridId = '' await this.getValiheList() From a317001b787dd1895f8e52a39aacda724392ce3a Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Sun, 19 Feb 2023 19:38:50 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=97=AE=E9=A2=98,=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8F=B3=E4=BE=A7=E5=88=97=E8=A1=A8=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E8=BF=9B=E5=85=A5=E4=B8=8B=E4=B8=80=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiForm.vue | 20 +++++++++++++ .../modules/base/community/community.vue | 30 +++++++++++++------ 2 files changed, 41 insertions(+), 9 deletions(-) diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index 2a2cb1eee..94899b10b 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -1627,6 +1627,9 @@ export default { // console.log(tab); // console.log(event); // console.log(tab._props.label ); + + + if (tab._props.label == '教育') { if (!this.form.resiId) { this.newForm.eduInfoDto = this.form.eduInfoDto @@ -1971,6 +1974,7 @@ export default { }, // 教育信息详情 residentEduInfo(id) { + if(this.newForm.eduInfoDto) return this.$http.get(`/actual/base/residentEduInfo/detail/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -1985,6 +1989,7 @@ export default { }, // 兴趣爱好详情 residentHobbyInfo(id) { + if(this.newForm.hobbyInfoDto) return this.$http.get(`/actual/base/residentHobbyInfo/detail/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2003,6 +2008,7 @@ export default { }, // 宗教信仰详情 residentReligion(id) { + if(this.newForm.religionDto) return this.$http.get(`/actual/base/residentReligion/detail/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2018,6 +2024,7 @@ export default { }, // 健康信息详情 getHealthInfoDetailById(id) { + if(this.newForm.healthDto) return this.$http.post(`/actual/base/residentHealthInfo/getHealthInfoDetailById/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2049,6 +2056,7 @@ export default { }, // 工作信息详情 residentWorkInfo(id) { + if(this.newForm.healthDto) return this.$http.get(`/actual/base/residentWorkInfo/detail/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2066,6 +2074,7 @@ export default { }, // 经济状况详情 getEconomyDetailById(id) { + if(this.newForm.economyDto) return this.$http.post(`/actual/base/residentEconomy/getEconomyDetailById/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2080,6 +2089,7 @@ export default { }, // 居住信息详情 getResideInfoDetailById(id) { + if(this.newForm.resideInfoDto) return this.$http.post(`/actual/base/residentResideInfo/getResideInfoDetailById/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2097,6 +2107,7 @@ export default { }, // 家庭信息详情 getFamilyInfoDetailById(id) { + if(this.newForm.familyInfoDto) return this.$http.post(`/actual/base/residentFamilyInfo/getFamilyInfoDetailById/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2117,6 +2128,7 @@ export default { }, // 出生人员 residentBirthRecord(id) { + if(this.newForm.birthRecordDTO) return this.$http.post(`/actual/base/residentBirthRecord/detail/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2134,6 +2146,7 @@ export default { }, // 党员信息详情 residentPartyMemberInfo(id) { + if(this.newForm.parymemberInfoDto) return this.$http.get(`/actual/base/residentPartyMemberInfo/detail/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2157,6 +2170,7 @@ export default { }, // 保障房信息详情 residentEnsureHouse(id) { + if(this.newForm.ensureHouseDto) return this.$http.get(`/actual/base/residentEnsureHouse/detail/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2174,6 +2188,7 @@ export default { }, // 失业信息详情 residentUnemployed(id) { + if(this.newForm.unemployedDto) return this.$http.get(`/actual/base/residentUnemployed/detail/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2194,6 +2209,7 @@ export default { }, // 退役军人信息详情 getVeteranDetailById(id) { + if(this.newForm.veteranDto) return this.$http.post(`/actual/base/residentVeteran/getVeteranDetailById/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2216,6 +2232,7 @@ export default { }, // 统战人员详情 residentUnitedFront(id) { + if(this.newForm.unitedFrontDto) return this.$http.get(`/actual/base/residentUnitedFront/detail/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2230,6 +2247,7 @@ export default { }, // 志愿者信息详情 getVolunteerDetailById(id) { + if(this.newForm.volunteerDto) return this.$http.post(`/actual/base/residentVolunteer/getVolunteerDetailById/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2248,6 +2266,7 @@ export default { }, // 老年人信息详情 getOldPeopleDetailById(id) { + if(this.newForm.oldPeopleDto) return this.$http.post(`/actual/base/residentOldPeople/getOldPeopleDetailById/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2262,6 +2281,7 @@ export default { }, // 特殊人群信息 residentSpecial(id) { + if(this.newForm.specialDto) return this.$http.get(`/actual/base/residentSpecial/detail/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index c6428be60..adba323f9 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -19,7 +19,9 @@ :filter-node-method="filterNode" @node-click="handleNodeClick" lazy + auto-expand-parent :default-expanded-keys="autoOpenArr" + :load="lazyLoadTree"> { + // nextTick(1000) + // this.selTreeObj = this.$refs.ref_tree.getNode(row.neighborHoodId).data || {} + // },50) + // this.autoOpenArr.push(this.selTreeObj.id) + // } else { + // this.selTreeObj = this.$refs.ref_tree.getNode(row.buildingId).data + // } + console.log(this.selTreeObj,'123123123'); this.handleNodeClick(this.selTreeObj) this.$nextTick(() => { // ref_tree 元素的ref value 绑定的node-key From dba82baaa5dd21d0497d7e773de2bf584218f16e Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Mon, 20 Feb 2023 09:27:23 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E5=85=B4=E8=B6=A3=E7=88=B1=E5=A5=BD?= =?UTF-8?q?=E5=AD=97=E5=85=B8,=E5=BF=97=E6=84=BF=E8=80=85=E7=B1=BB?= =?UTF-8?q?=E5=88=AB=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiForm.vue | 54 ++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index 94899b10b..2015ecae9 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -415,15 +415,7 @@ export default { itemType:"checkbox", formName:"hobbyCode", opction:[ - {label:'治安巡逻',formName:'hobbyCode1'}, - {label:'人民调解',formName:'hobbyCode2'}, - {label:'民情采集',formName:'hobbyCode3'}, - {label:'问题辅导',formName:'hobbyCode4'}, - {label:'结对帮扶',formName:'hobbyCode5'}, - {label:'应急处理',formName:'hobbyCode6'}, - {label:'义务理发',formName:'hobbyCode7'}, - {label:'家电维修',formName:'hobbyCode8'}, - {label:'其他',formName:'9'}, + ]}, { label:'兴趣', @@ -968,14 +960,6 @@ export default { itemType:"checkbox", formName:"volunteerCategory", opction:[ - {label:'文化队伍',formName:'hobbyCode1'}, - {label:'楼委会',formName:'hobbyCode2'}, - {label:'能人达人',formName:'hobbyCode3'}, - {label:'老友俱乐部',formName:'hobbyCode4'}, - {label:'代办员',formName:'hobbyCode5'}, - {label:'调解员',formName:'hobbyCode6'}, - {label:'采集员',formName:'hobbyCode7'}, - {label:'治安巡逻员',formName:'9'}, ]}, { label:'备注', @@ -1282,6 +1266,8 @@ export default { this.getPartyNation() this.getResidentNation() this.getHousing() + this.getVolunteerNation() + this.gethobbyNation() }, getGridList () { const { user } = this.$store.state @@ -1325,6 +1311,38 @@ export default { console.log(error,'获取残疾字典'); } + }, + async getVolunteerNation(){ + try { + const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'VOLUNTEER_CATEGORY'}) + this.footerInputList.forEach(c => { + for(let i of c.children){ + if(i.formName == 'volunteerCategory'){ + i.opction = data.data + } + } + }) + + } catch (error) { + console.log(error,'获取志愿者字典'); + } + + }, + async gethobbyNation(){ + try { + const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'SPECIAL_SKILL'}) + this.footerInputList.forEach(c => { + for(let i of c.children){ + if(i.formName == 'hobbyCode'){ + i.opction = data.data + } + } + }) + + } catch (error) { + console.log(error,'获取兴趣爱好字典'); + } + }, async getdisabilityNationClass(){ try { @@ -1436,6 +1454,7 @@ export default { async getResidentNation(){ try { const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'special_resident_category'}) + console.log(data.data,'see'); this.footerInputList.forEach(c => { for(let i of c.children){ if(i.formName == 'specialCategoryCode'){ @@ -2342,7 +2361,6 @@ export default { } this.newForm.eduInfoDto = this.form.eduInfoDto - this.newForm.specialDto = this.form.specialDto console.log(this.newForm.specialDto); }, setJSON() { From 5cd6dd20ffd874cfc09bd2f80f8e13b3193781d1 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Mon, 20 Feb 2023 09:54:21 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E5=85=88=E6=8F=90=E4=BA=A4=E4=B8=80?= =?UTF-8?q?=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 10 + src/views/dataBoard/renfang/house/list.vue | 28 ++ src/views/dataBoard/renfang/resi/analyze.vue | 257 ++++++++++++++++++ src/views/dataBoard/renfang/resi/class.vue | 30 ++ src/views/dataBoard/renfang/resi/list.vue | 28 ++ src/views/dataBoard/renfang/warn/building.vue | 29 ++ src/views/dataBoard/renfang/warn/resi.vue | 30 +- 7 files changed, 411 insertions(+), 1 deletion(-) create mode 100644 src/views/dataBoard/renfang/resi/analyze.vue diff --git a/src/router/index.js b/src/router/index.js index 257509d9b..cda7f3a77 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -218,6 +218,16 @@ export const dataBoardRoutes = { isTab: false, }, }, + { + path: "renfang/resi-analyze", + props: true, + component: () => import("@/views/dataBoard/renfang/resi/analyze"), + name: "dataBoard-renfang-resi-analyze", + meta: { + title: "居民分析列表", + isTab: false, + }, + }, { path: "renfang/house-list", props: true, diff --git a/src/views/dataBoard/renfang/house/list.vue b/src/views/dataBoard/renfang/house/list.vue index 591f40966..9be4bfbf9 100644 --- a/src/views/dataBoard/renfang/house/list.vue +++ b/src/views/dataBoard/renfang/house/list.vue @@ -159,6 +159,7 @@ export default { this.breadList[1].meta.title = type_name + "房屋列表"; this.tableTitle = type_name + "房屋列表"; this.getList(); + this.getCount(); }, methods: { @@ -233,6 +234,33 @@ export default { this.$message.error(msg); } }, + + async getList() { + const { org_id, houseType, pageNo, pageSize } = this; + + const url = "house_list_total"; + + const { data, code, msg } = await requestPostBi( + url, + { + queryParam: { + org_id, + type: houseType, + pageNo, + pageSize, + }, + }, + { + mockId: 63070189, + } + ); + + if (code === 0) { + this.total = data[0].count; + } else { + this.$message.error(msg); + } + }, }, destroyed() { diff --git a/src/views/dataBoard/renfang/resi/analyze.vue b/src/views/dataBoard/renfang/resi/analyze.vue new file mode 100644 index 000000000..a528129cf --- /dev/null +++ b/src/views/dataBoard/renfang/resi/analyze.vue @@ -0,0 +1,257 @@ + + + + + diff --git a/src/views/dataBoard/renfang/resi/class.vue b/src/views/dataBoard/renfang/resi/class.vue index 4c79b68fd..1b920a505 100644 --- a/src/views/dataBoard/renfang/resi/class.vue +++ b/src/views/dataBoard/renfang/resi/class.vue @@ -167,6 +167,7 @@ export default { this.tableTitle = type_name + "居民列表"; this.getList(); + this.getCount(); if (this.type_id == "6") { this.getSubclass(); } @@ -175,6 +176,7 @@ export default { watch: { subclassId() { this.getList(); + this.getCount(); }, }, @@ -282,6 +284,34 @@ export default { this.$message.error(msg); } }, + + async getCount() { + const { org_id, type_id, subclassId, pageNo, pageSize } = this; + + const url = "resident_class_list_total"; + + const { data, code, msg } = await requestPostBi( + url, + { + queryParam: { + org_id, + type_id, + subclassId, + pageNo, + pageSize, + }, + }, + { + mockId: 63070913, + } + ); + + if (code === 0) { + this.total = data[0].count; + } else { + this.$message.error(msg); + } + }, }, destroyed() { diff --git a/src/views/dataBoard/renfang/resi/list.vue b/src/views/dataBoard/renfang/resi/list.vue index 099d3048b..9a65ce06f 100644 --- a/src/views/dataBoard/renfang/resi/list.vue +++ b/src/views/dataBoard/renfang/resi/list.vue @@ -147,6 +147,7 @@ export default { this.tableTitle = type_name + "居民列表"; this.getList(); + this.getCount(); }, methods: { @@ -218,6 +219,33 @@ export default { this.$message.error(msg); } }, + + async getCount() { + const { org_id, resiType, pageNo, pageSize } = this; + + const url = "resident_list_total"; + + const { data, code, msg } = await requestPostBi( + url, + { + queryParam: { + org_id, + type: resiType, + pageNo, + pageSize, + }, + }, + { + mockId: 63070408, + } + ); + + if (code === 0) { + this.total = data[0].count; + } else { + this.$message.error(msg); + } + }, }, destroyed() { diff --git a/src/views/dataBoard/renfang/warn/building.vue b/src/views/dataBoard/renfang/warn/building.vue index 1667dcb98..fab8ab7e9 100644 --- a/src/views/dataBoard/renfang/warn/building.vue +++ b/src/views/dataBoard/renfang/warn/building.vue @@ -132,6 +132,7 @@ export default { type_name + (this.level == "red" ? "红色" : "黄色") + "预警楼栋"; this.breadList[1].meta.title = this.tableTitle; this.getList(); + this.getCount(); }, methods: { @@ -212,6 +213,34 @@ export default { this.$message.error(msg); } }, + + async getCount() { + const { org_id, type_id, level, pageNo, pageSize } = this; + + const url = "resident_warn_building_total"; + + const { data, code, msg } = await requestPostBi( + url, + { + queryParam: { + org_id, + warn_type: level, + resi_type: type_id, + pageNo, + pageSize, + }, + }, + { + mockId: 63071730, + } + ); + + if (code === 0) { + this.total = data[0].count; + } else { + this.$message.error(msg); + } + }, }, destroyed() { diff --git a/src/views/dataBoard/renfang/warn/resi.vue b/src/views/dataBoard/renfang/warn/resi.vue index 6105bb33d..28429f6a6 100644 --- a/src/views/dataBoard/renfang/warn/resi.vue +++ b/src/views/dataBoard/renfang/warn/resi.vue @@ -123,8 +123,9 @@ export default { }; }, - activated() { + mounted() { this.getList(); + this.getCount(); }, methods: { @@ -188,6 +189,33 @@ export default { this.$message.error(msg); } }, + + async getCount() { + const { org_id, type_id, pageNo, pageSize } = this; + + const url = "resident_class_list_total"; + + const { data, code, msg } = await requestPostBi( + url, + { + queryParam: { + org_id, + type_id, + pageNo, + pageSize, + }, + }, + { + mockId: 63071800, + } + ); + + if (code === 0 && Array.isArray(data) && data.length > 0) { + this.total = data[0].count; + } else { + this.$message.error(msg); + } + }, }, destroyed() { From 276aad86a317a9397451c6f9b53a79478c33efbc Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 20 Feb 2023 15:35:15 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E5=B1=85=E6=B0=91=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=20/heart?= =?UTF-8?q?/icresidemanddict=20=3D>=20/governance/icresidemanddict?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityService/measure/index.vue | 2 +- src/views/modules/communityService/measure/info.vue | 2 +- .../modules/communityService/policy/addPolicy.vue | 2 +- .../shequzhili/event/cpts/process-form-demand.vue | 2 +- src/views/modules/workSys/demandCate.vue | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue index 349dd7bf8..df5062b29 100644 --- a/src/views/modules/communityService/measure/index.vue +++ b/src/views/modules/communityService/measure/index.vue @@ -1207,7 +1207,7 @@ export default { async getDemandOptions () { this.$http - .post("/heart/icresidemanddict/demandoption") + .post("/governance/icresidemanddict/demandoption") .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); diff --git a/src/views/modules/communityService/measure/info.vue b/src/views/modules/communityService/measure/info.vue index 7c4b3dd85..ea841984f 100644 --- a/src/views/modules/communityService/measure/info.vue +++ b/src/views/modules/communityService/measure/info.vue @@ -918,7 +918,7 @@ export default { async getDemandOptions() { this.$http - .post("/heart/icresidemanddict/demandoption") + .post("/governance/icresidemanddict/demandoption") .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); diff --git a/src/views/modules/communityService/policy/addPolicy.vue b/src/views/modules/communityService/policy/addPolicy.vue index 2a9317b30..6a72359a2 100644 --- a/src/views/modules/communityService/policy/addPolicy.vue +++ b/src/views/modules/communityService/policy/addPolicy.vue @@ -344,7 +344,7 @@ export default { // 获取服务范围树 loadDemandoption () { - const url = '/heart/icresidemanddict/demandoption' + const url = '/governance/icresidemanddict/demandoption' // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree' let params = {} window.app.ajax.post( diff --git a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue index d2140cc4e..35fc6c645 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue @@ -431,7 +431,7 @@ export default { }, async getDemandOptions () { - const url = "/heart/icresidemanddict/demandoption" + const url = "/governance/icresidemanddict/demandoption" let params = {} const { data, code, msg } = await requestPost(url, params) diff --git a/src/views/modules/workSys/demandCate.vue b/src/views/modules/workSys/demandCate.vue index 976e1da71..c8f0dd7f2 100644 --- a/src/views/modules/workSys/demandCate.vue +++ b/src/views/modules/workSys/demandCate.vue @@ -259,7 +259,7 @@ export default { usableFlag: !row.usableFlag } this.$http - .post('/heart/icresidemanddict/updatestatus', params) + .post('/governance/icresidemanddict/updatestatus', params) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) @@ -284,7 +284,7 @@ export default { categoryName: this.form.categoryName } await this.$http - .post('/heart/icresidemanddict/addfirst', _form) + .post('/governance/icresidemanddict/addfirst', _form) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) @@ -306,7 +306,7 @@ export default { awardPoint: this.form.awardPoint } await this.$http - .post('/heart/icresidemanddict/addchild', _form) + .post('/governance/icresidemanddict/addchild', _form) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) @@ -329,7 +329,7 @@ export default { awardPoint: this.form.awardPoint } await this.$http - .post('/heart/icresidemanddict/update', _form) + .post('/governance/icresidemanddict/update', _form) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) @@ -408,7 +408,7 @@ export default { parentCategoryCode: 0 } this.$http - .post('/heart/icresidemanddict/subcodelist', params) + .post('/governance/icresidemanddict/subcodelist', params) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) @@ -430,7 +430,7 @@ export default { firstCategoryCode: this.form.firstCategoryCode } await this.$http - .post('/heart/icresidemanddict/pagelist', params) + .post('/governance/icresidemanddict/pagelist', params) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg)