diff --git a/src/assets/scss/modules/index.scss b/src/assets/scss/modules/index.scss index 1c8f54e0d..a95a64baa 100644 --- a/src/assets/scss/modules/index.scss +++ b/src/assets/scss/modules/index.scss @@ -394,11 +394,11 @@ 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; + font-weight: 600; } } diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index c564b76a8..d1fc51b76 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -692,7 +692,7 @@ @@ -1978,8 +1978,10 @@ export default { }, // 新增网格人员 - addGridPeo () { + async addGridPeo () { this.dialogVisiblePeo = true; + await this.getAgencyStaffListData() + console.log(this.agencyStaffTableListData); this.peoForm.orgType = "grid"; }, // 修改网格人员 diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue index 540d4a93e..92be11f3a 100644 --- a/src/views/modules/home/index.vue +++ b/src/views/modules/home/index.vue @@ -53,24 +53,24 @@
- 组织简介 + {{agencyLevel!='district'?agencyLevel=='street'?'街道':agencyLevel=='community'?'社区':agencyLevel=='grid'?'网格':'组织':'组织'}}简介

- {{ pandectData.deptName }},划分为{{ + {{ pandectData.deptName }},划分为 {{ pandectData.underCount - }}个{{ + }}{{ pandectData.underName - }}, 现有房屋{{ pandectData.homeCount }}间,自住房屋{{ + }}, 现有房屋 {{ pandectData.homeCount }} 间,自住房屋 {{ pandectData.selfStay - }}间、出租房屋{{ + }} 间、出租房屋 {{ pandectData.rentOut - }}间、闲置房屋{{ + }} 间、闲置房屋 {{ pandectData.vacantHouse - }}间,现有居民{{ pandectData.resiCount }}户、{{ + }} 间,现有居民 {{ pandectData.resiCount }} 户、 {{ pandectData.totalResidents - }}人,其中常住人口{{ pandectData.permanentResiCount }}人,流动人口{{ + }} 人,其中常住人口 {{ pandectData.permanentResiCount }} 人,流动人口 {{ pandectData.floatingResiCount - }}人,各类群体分布如下: + }} 人,各类群体分布如下:

@@ -123,7 +123,7 @@
-
@@ -155,7 +155,7 @@
-
+ --> @@ -274,7 +274,8 @@ export default { activeName: 'resi', - myChart: {} + myChart: {}, + agencyLevel:'', } }, computed: { @@ -305,6 +306,7 @@ export default { this.$nextTick(() => { this.initChart() }) + this.agencyLevel = localStorage.getItem("level", data.level); console.log( "dynamicMenuRoutes----------------------------", this.$store.state.sidebarMenuList diff --git a/src/views/modules/satisfaction/communitySelfInsp/formList.vue b/src/views/modules/satisfaction/communitySelfInsp/formList.vue index 1bf04332e..d33396895 100644 --- a/src/views/modules/satisfaction/communitySelfInsp/formList.vue +++ b/src/views/modules/satisfaction/communitySelfInsp/formList.vue @@ -22,7 +22,7 @@ - + diff --git a/src/views/modules/satisfaction/detail/index.vue b/src/views/modules/satisfaction/detail/index.vue index 4be5f9f4e..c50818d19 100644 --- a/src/views/modules/satisfaction/detail/index.vue +++ b/src/views/modules/satisfaction/detail/index.vue @@ -78,7 +78,7 @@ 批量取消风险 + @selection-change="handleSelectionChange" :height="maxTableHeight" border> diff --git a/src/views/modules/satisfaction/satisfactionProvince/formList.vue b/src/views/modules/satisfaction/satisfactionProvince/formList.vue index 3edf8d915..b1f7f9155 100644 --- a/src/views/modules/satisfaction/satisfactionProvince/formList.vue +++ b/src/views/modules/satisfaction/satisfactionProvince/formList.vue @@ -9,7 +9,7 @@ - + diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue index bd278c966..90aa9c7b3 100644 --- a/src/views/modules/shequzhili/event/eventList.vue +++ b/src/views/modules/shequzhili/event/eventList.vue @@ -123,7 +123,7 @@ + @selection-change="handleSelectionChange" :height="maxTableHeight" border>