Merge branch 'preview_xiaowang' into preview

src/views/dataBoard/organizational/index.vue

@@ -42,7 +42,7 @@ export default {
           path: "/organizational/jwTree",
         },
         {
-          name: "微网格治理",
+          name: "网格架构",
           key: "3",
           path: "/organizational/gridTree",
         },

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' &&
+        <div class="btn-group" v-if="(item.status === 'processing')">
-                (item.satisfactionName || (!item.satisfactionName && user.id != item.createdUserId)))">
           <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>

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>