From f6f2a97c49e8ce0609cf73c435e9e5c840c6383f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Thu, 18 Apr 2024 11:13:07 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=87=E6=9C=AC=E4=BF=AE=E6=94=B9-?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5-=E5=B1=85=E6=B0=91=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=83=85=E5=86=B5=E6=9B=B4=E5=90=8D=E4=B8=BA?=
 =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E6=9B=B4=E6=96=B0=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E5=92=8C=20=E5=BE=AE=E7=BD=91=E6=A0=BC=E6=B2=BB?=
 =?UTF-8?q?=E7=90=86=E6=9B=B4=E5=90=8D=E4=B8=BA=E2=80=9C=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E6=9E=B6=E6=9E=84=E2=80=9D=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataBoard/organizational/index.vue | 2 +-
 src/views/modules/home/index.vue             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/dataBoard/organizational/index.vue b/src/views/dataBoard/organizational/index.vue
index dca35edff..06bde6571 100644
--- a/src/views/dataBoard/organizational/index.vue
+++ b/src/views/dataBoard/organizational/index.vue
@@ -42,7 +42,7 @@ export default {
           path: "/organizational/jwTree",
         },
         {
-          name: "微网格治理",
+          name: "网格架构",
           key: "3",
           path: "/organizational/gridTree",
         },
diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index 66f42ddb6..b7f71809f 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -151,7 +151,7 @@
         </div>
 
         <div class="m-box m-tx" style="position: relative;">
-          <div class="noe-text"> <span style="margin-top: 10px;">居民分类更新情况</span> <span class="update-settings"
+          <div class="noe-text"> <span style="margin-top: 10px;">居民信息更新情况</span> <span class="update-settings"
               style="margin-top: 10px;" v-show="showAll" @click="jumpToJuMin()"><img referrerpolicy="no-referrer"
                 src="https://lanhu.oss-cn-beijing.aliyuncs.com/pskhmf0717eflwg54wn73s6spnsg6u48r0f69e94b-2bc8-4156-8330-902087b72e0b" />更新设置</span>
           </div>

From 42b0332a78816aa747359395492ccab48d4a2680 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Thu, 18 Apr 2024 16:45:51 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=20=E7=BD=91=E6=A0=BC=E6=9E=B6=E6=9E=84?=
 =?UTF-8?q?=E7=9A=84=E5=BE=AE=E7=BD=91=E6=A0=BC=E5=B1=82=E7=BA=A7=E5=BA=94?=
 =?UTF-8?q?=E8=83=BD=E5=8C=BA=E5=88=86=E6=98=BE=E7=A4=BA=E7=BA=A2=E9=BB=84?=
 =?UTF-8?q?=E7=BB=BF=E7=BD=91=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/GridTree/nodeWrap.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/GridTree/nodeWrap.vue b/src/components/GridTree/nodeWrap.vue
index 731d2592e..0ef7fe6a9 100644
--- a/src/components/GridTree/nodeWrap.vue
+++ b/src/components/GridTree/nodeWrap.vue
@@ -35,7 +35,7 @@
                     </div>
                   </div>
                   <div v-if="item.level === 'unit_chief'">
-                    <div @click="gotoPersonnel(item)" :class="[ item.id === '1704434839867420673'?'dyzxhYellow':'dyzxhGreen']" :title="item.organizationName">
+                    <div @click="gotoPersonnel(item)" :class="[item.categoryWarn === 'red' ? 'dyzxhRed' : item.categoryWarn === 'yellow' ? 'dyzxhYellow' : item.categoryWarn === 'green' ? 'dyzxhGreen' : '', item.children && item.children.length > 0 ? 'dyzxhHover' : 'dyzxh']" :title="item.organizationName">
                       <!-- {{ spliceNameFun(item.organizationName, 3) }} -->
                       {{ item.organizationName }}
                     </div>

From 4c985f82501e5bf98bf7c3414aaf77bb62763aee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Thu, 18 Apr 2024 17:04:33 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=B5=84=E6=BA=90=E8=B0=83=E5=BA=A6?=
 =?UTF-8?q?=E3=80=81=E5=82=AC=E5=8A=9E=E7=9D=A3=E5=8A=9E=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=BD=93=E4=BA=8B=E4=BB=B6=E5=B7=B2=E5=AE=8C=E6=88=90=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=89=8D=E4=B8=8D=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=8F=AA?=
 =?UTF-8?q?=E8=A6=81=E6=98=AFprocessing=E5=B0=B1=E4=B8=80=E7=9B=B4?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataBoard/overview/components/EventDetail.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/dataBoard/overview/components/EventDetail.vue b/src/views/dataBoard/overview/components/EventDetail.vue
index 7a5b64754..aacb35492 100644
--- a/src/views/dataBoard/overview/components/EventDetail.vue
+++ b/src/views/dataBoard/overview/components/EventDetail.vue
@@ -198,8 +198,7 @@
           </el-col>
         </el-row>
 
-        <div class="btn-group" v-if="(item.status === 'processing' && item.operationId) || (item.status === 'closed_case' &&
-                (item.satisfactionName || (!item.satisfactionName && user.id != item.createdUserId)))">
+        <div class="btn-group" v-if="(item.status === 'processing')">
           <el-button class="green" plain round type="success" @click="handleDispatch">资源调度</el-button>
           <el-button class="orange" plain round type="warning" @click="handleSupervision">催办督办</el-button>
         </div>