From 999e1cb1138c777a4cc6ee66debe816ec279933f Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Mon, 17 Jun 2024 13:40:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=9B=BF=E6=8D=A2=E7=BD=91?= =?UTF-8?q?=E6=A0=BC=E9=95=BF=E4=B8=BA=E7=BD=91=E6=A0=BC=E5=91=98,?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=88=86=E7=B1=BB=E5=A6=82=E6=9E=9C=E4=B8=BA?= =?UTF-8?q?null=E5=B1=95=E7=A4=BA=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiSearch.vue | 2 +- src/views/components/selectStaff.vue | 4 ++-- .../dataBoard/organizational/jwTree/index.vue | 2 +- .../modules/base/classification/index.vue | 20 +++++++++---------- src/views/modules/base/resi.vue | 11 +++++++++- src/views/modules/home/index.vue | 8 ++++---- .../autoTest/autoTestList copy.vue | 2 +- .../productConfig/autoTest/autoTestList.vue | 6 +++--- .../topicConfig/TopicConfig copy.vue | 2 +- .../productConfig/topicConfig/TopicConfig.vue | 2 +- 10 files changed, 34 insertions(+), 25 deletions(-) diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index 384bd702a..c5508e8c0 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -601,7 +601,7 @@ export default { form: { name: '', mobile: '', - // careerStatus:'', + updateCategory:'', satisfactionNum:null, idNum: '', birthdayStart: '', diff --git a/src/views/components/selectStaff.vue b/src/views/components/selectStaff.vue index 09747b596..95b6dd06e 100644 --- a/src/views/components/selectStaff.vue +++ b/src/views/components/selectStaff.vue @@ -655,7 +655,7 @@ export default { } else { let succ = false; dItem.gridStaffList.forEach((item) => { - if (item.roleName == "网格长") { + if (item.roleName == "网格员") { item.selected = true; succ = true; } else { @@ -663,7 +663,7 @@ export default { } }); if (!succ) { - return this.$message.error(dItem.gridName + "下无【网格长】"); + return this.$message.error(dItem.gridName + "下无【网格员】"); } else { dItem.selected = true; } diff --git a/src/views/dataBoard/organizational/jwTree/index.vue b/src/views/dataBoard/organizational/jwTree/index.vue index 9d89ecbf6..2dcec8ce8 100644 --- a/src/views/dataBoard/organizational/jwTree/index.vue +++ b/src/views/dataBoard/organizational/jwTree/index.vue @@ -138,7 +138,7 @@ export default { ["district", "区委"], ["street", "乡(镇、街道)"], ["community", "社区"], - ["grid_manager", "网格长"], + ["grid_manager", "网格员"], ["building_chief", "楼组长"], ["unit_chief", "单元长"], ["public_welfare_post", "志愿者"], diff --git a/src/views/modules/base/classification/index.vue b/src/views/modules/base/classification/index.vue index 7f869d03e..f55b29908 100644 --- a/src/views/modules/base/classification/index.vue +++ b/src/views/modules/base/classification/index.vue @@ -314,7 +314,7 @@
留守儿童
-
{{ categoryList.lbcFlagCount || '--' }}
+
{{ categoryList.lbcFlagCount || 0 }}
@@ -322,7 +322,7 @@
留守儿童(虚拟网格)
-
{{ categoryList.lbcFlagVirtualCount || '--' }}
+
{{ categoryList.lbcFlagVirtualCount || 0 }}
@@ -337,7 +337,7 @@
艾滋病人员
-
{{ categoryList.aidsFlagCount || '--' }}
+
{{ categoryList.aidsFlagCount || 0 }}
@@ -345,7 +345,7 @@
艾滋病人员(虚拟网格)
-
{{ categoryList.aidsFlagVirtualCount || '--' }}
+
{{ categoryList.aidsFlagVirtualCount || 0 }}
@@ -405,7 +405,7 @@
新就业群体
-
{{ categoryList.negFlagCount || '--' }}
+
{{ categoryList.negFlagCount || 0 }}
@@ -413,7 +413,7 @@
新就业群体(虚拟网格)
-
{{ categoryList.negFlagVirtualCount || '--' }}
+
{{ categoryList.negFlagVirtualCount || 0 }}
@@ -632,17 +632,17 @@
-
网格长
+
网格员
-
{{ categoryList.gridManagerFlagCount || '--' }}
+
{{ categoryList.gridManagerFlagCount || 0 }}
-
网格长(虚拟网格)
+
网格员(虚拟网格)
-
{{ categoryList.gridManagerFlagVirtualCount || '--' }}
+
{{ categoryList.gridManagerFlagVirtualCount || 0 }}
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index bbbcd3254..a4e97e3c2 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -1227,7 +1227,16 @@ export default { watch: { $route: { handler: function (newVal, oldVal) { - if (newVal.name == "base-resi" && (!oldVal ||oldVal.name === 'home'||oldVal.name === 'base-classification'||oldVal.name === 'home-notice')) { + if((newVal.name == "base-resi" || oldVal.name === 'home') && newVal.query.type){ + this.$nextTick(()=>{ + this.$refs.myResiSearch.form.updateCategory = newVal.query.category; + this.handleSearchFrom(); + }) + return + }else{ + this.$refs.myResiSearch.form.updateCategory =''; + } + if (newVal.name == "base-resi" && (oldVal.name === 'home'||oldVal.name === 'base-classification'||oldVal.name === 'home-notice')) { this.$nextTick(() => { this.$refs.myResiSearch.form.attentionCrowds = []; this.$refs.myResiSearch.form.healthStatus = []; diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue index 7d633ea8f..34142f844 100644 --- a/src/views/modules/home/index.vue +++ b/src/views/modules/home/index.vue @@ -179,7 +179,7 @@ @@ -628,10 +628,10 @@ export default { }, handelCLickJump(e,type){ this.$router.push({ - path: "/main/base-nonIntResi", + path: "base-resi", query: { - resiCategory: e.residentCategory, - type:type + category: e.residentCategory, + type:'updateResi' } }); }, diff --git a/src/views/modules/productConfig/autoTest/autoTestList copy.vue b/src/views/modules/productConfig/autoTest/autoTestList copy.vue index afabe834b..b8b563bc8 100644 --- a/src/views/modules/productConfig/autoTest/autoTestList copy.vue +++ b/src/views/modules/productConfig/autoTest/autoTestList copy.vue @@ -29,7 +29,7 @@ header-align="center" min-width="130"> diff --git a/src/views/modules/productConfig/autoTest/autoTestList.vue b/src/views/modules/productConfig/autoTest/autoTestList.vue index f7d0fd7ff..bf7c01fef 100644 --- a/src/views/modules/productConfig/autoTest/autoTestList.vue +++ b/src/views/modules/productConfig/autoTest/autoTestList.vue @@ -20,7 +20,7 @@ header-align="center" min-width="140"> @@ -326,7 +326,7 @@ export default { "type": "grid", "staffList": [ { - "name": "W1网格长", + "name": "W1网格员", "mobile": "13000000005" } ], @@ -360,7 +360,7 @@ export default { "type": "grid", "staffList": [ { - "name": "W2网格长", + "name": "W2网格员", "mobile": "13000000005" } ], diff --git a/src/views/modules/productConfig/topicConfig/TopicConfig copy.vue b/src/views/modules/productConfig/topicConfig/TopicConfig copy.vue index 03b47f542..2821c750d 100644 --- a/src/views/modules/productConfig/topicConfig/TopicConfig copy.vue +++ b/src/views/modules/productConfig/topicConfig/TopicConfig copy.vue @@ -191,7 +191,7 @@ export default { "projectList": [ { "personId": "J1-S1-W1", - "personName": "J1-S1-W1网格长", + "personName": "J1-S1-W1网格员", "answer": "此问题的确存在，会尽快解决", "reply": "希望工作人员可以帮助解决" }, diff --git a/src/views/modules/productConfig/topicConfig/TopicConfig.vue b/src/views/modules/productConfig/topicConfig/TopicConfig.vue index b840a7d6c..ea72f1045 100644 --- a/src/views/modules/productConfig/topicConfig/TopicConfig.vue +++ b/src/views/modules/productConfig/topicConfig/TopicConfig.vue @@ -338,7 +338,7 @@ export default { "isToProject": "1", "localLevel": { "staffId": "J1-S1-W1", - "staffName": "J1-S1-W1网格长", + "staffName": "J1-S1-W1网格员", "answer": "此问题的确存在，会尽快解决", "reply": "希望工作人员可以帮助解决" },