From e53f69f0c4eb5551c7e31a4ee03cb997cf492aea Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 17 Mar 2022 09:53:11 +0800
Subject: [PATCH 1/3] dd

---
 src/views/modules/base/resi.vue                      | 11 ++++++++---
 src/views/modules/communityParty/elegant/index.vue   |  5 +++--
 src/views/modules/communityService/measure/index.vue |  2 +-
 src/views/modules/communityService/sqzzz/index.vue   |  2 +-
 src/views/modules/workPc/guidance/guidanceList.vue   |  2 +-
 src/views/modules/workSys/demandCate.vue             |  2 +-
 src/views/modules/workSys/resiCate.vue               |  6 +++---
 7 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index b65d924a..cf2cc061 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -64,6 +64,7 @@
                          align="center"
                          :fixed="item.columnName == 'NAME' ? 'left' : false"
                          :show-overflow-tooltip="true"
+                         :width="item.width || computedWidth(item.label, item.itemType)"
                          >
                          <!-- :width="item.itemType === 'radio' ? computedWidth(item.label) : 180" -->
           <template slot-scope="scope">
@@ -96,7 +97,7 @@
               <el-button @click="handleEdit(scope.row)"
                          type="text"
                          size="small"
-                         class="div-table-button--edit">编辑</el-button>
+                         class="div-table-button--edit">修改</el-button>
               <el-popconfirm title="删除之后无法回复，确认删除？"
                              @onConfirm="handleDel(scope.row)">
                 <!-- <el-button slot="reference"
@@ -390,8 +391,12 @@ export default {
       this.tranferShow = false
       this.getTableData()
     },
-    computedWidth (label) {
-      const wd = 20 * label.length
+    computedWidth (label, type) {
+      
+      let wd = ''
+      if (type == 'input' || type == 'select') wd = 40 * label.length
+      else if(type == 'radio') wd = 20 * label.length
+      console.log('type-----wd', wd)
       return wd > 80 ? wd : 80
     },
     filterEdit (id) {
diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue
index 425ff0ad..3ba47ef1 100644
--- a/src/views/modules/communityParty/elegant/index.vue
+++ b/src/views/modules/communityParty/elegant/index.vue
@@ -107,7 +107,7 @@
                 type="text"
                 size="small"
                 class="btn-color-edit"
-                >编辑</el-button
+                >修改</el-button
               >
             <el-popconfirm
                 title="删除之后无法恢复，确认删除？"
@@ -201,7 +201,7 @@
                 <i class="el-icon-delete" @click="handleDelimg(item, index)"></i>
             </div>
             <el-upload class="avatar-uploader"
-              v-if="form.imageList.length < 3"
+              v-if="form.imageList.length < 3 && !disabled"
               :action="uploadUlr"
               :data="{customerId:customerId}"
               :show-file-list="false"
@@ -219,6 +219,7 @@
       <div class="resi-btns">
         <el-button size="small" @click="handlerCancle">取消</el-button>
         <el-button
+          v-if="!disabled"
           type="primary"
           size="small"
           :loading="btnLoading"
diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 90604829..221cf14e 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -221,7 +221,7 @@
                   type="text"
                   size="small"
                   class="btn-color-edit"
-                  >编辑</el-button
+                  >修改</el-button
                 >
                 <el-popconfirm
                   title="取消之后无法恢复，确认取消？"
diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue
index 84fd534f..04228d47 100644
--- a/src/views/modules/communityService/sqzzz/index.vue
+++ b/src/views/modules/communityService/sqzzz/index.vue
@@ -107,7 +107,7 @@
               type="text"
               size="small"
               class="div-table-button--edit"
-              >编辑</el-button
+              >修改</el-button
             >
 
             <el-popconfirm
diff --git a/src/views/modules/workPc/guidance/guidanceList.vue b/src/views/modules/workPc/guidance/guidanceList.vue
index 71d663d6..2937f1b9 100644
--- a/src/views/modules/workPc/guidance/guidanceList.vue
+++ b/src/views/modules/workPc/guidance/guidanceList.vue
@@ -147,7 +147,7 @@ export default {
           }
         },
         {
-          lable: '编辑', // 按钮显示名称
+          lable: '修改', // 按钮显示名称
           size: 'mini',
           style: 'margin: 0 6px;',
           type: 'text',
diff --git a/src/views/modules/workSys/demandCate.vue b/src/views/modules/workSys/demandCate.vue
index b7ea8618..56cd8c45 100644
--- a/src/views/modules/workSys/demandCate.vue
+++ b/src/views/modules/workSys/demandCate.vue
@@ -78,7 +78,7 @@
             <el-button @click="handleEdit(scope.row, 'edit')"
                        type="text"
                        size="small"
-                       class="div-table-button--edit">编辑</el-button>
+                       class="div-table-button--edit">修改</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/modules/workSys/resiCate.vue b/src/views/modules/workSys/resiCate.vue
index a7b25239..a768a5d9 100644
--- a/src/views/modules/workSys/resiCate.vue
+++ b/src/views/modules/workSys/resiCate.vue
@@ -64,7 +64,7 @@
           :prop="item.columnName"
           :label="item.label"
           align="center"
-          width="180"
+          min-width="180"
         >
           <template slot-scope="scope">
             <el-image
@@ -75,7 +75,7 @@
             <span v-else>{{ handleFilterSpan(scope.row, item) }}</span>
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" align="center" width="120">
+        <el-table-column label="操作" align="center" width="120">
           <template slot-scope="scope">
             <el-button
               @click="handleLook(scope.row)"
@@ -89,7 +89,7 @@
                 type="text"
                 size="small"
                 class="div-table-button--edit"
-                >编辑</el-button
+                >修改</el-button
               >
           </template>
         </el-table-column>

From 53961c9ac0b575782e27ebd55632ff43ff6462c6 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 17 Mar 2022 11:20:40 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=985?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequ/index.vue | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/views/modules/shequ/index.vue b/src/views/modules/shequ/index.vue
index 49c92e5f..98947245 100644
--- a/src/views/modules/shequ/index.vue
+++ b/src/views/modules/shequ/index.vue
@@ -325,22 +325,10 @@
           <div class="wrap">
             <div class="header">
               <div class="headline">人员预警</div>
-              <div class="notice" v-if="false">
+
+              <div class="notice" v-if="noticeList.length > 0">
                 <div class="notice-btn" @click="toNoticeInfo">通知</div>
                 <div class="notice-list">
-                  <a
-                    class="notice-item"
-                    v-for="(item, index) in noticeList"
-                    :key="item.configId + item.buildingId + index"
-                    @click="toNoticeInfo(item)"
-                  >
-                    {{ item.noticeContent }}
-                  </a>
-                </div>
-              </div>
-              <div class="notice">
-                <div class="notice-btn" @click="toNoticeInfo">通知</div>
-                <div class="notice-list" v-if="noticeList.length > 0">
                   <scroll-notice :list="noticeList">
                     <a
                       class="notice-item"

From 29e47e50c632ebc2af4e83f695a1f81f542aa422 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 17 Mar 2022 14:13:16 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=BC=B9=E6=A1=86=E9=AB=98=E5=BA=A6?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index d1217999..5d1e546d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -133,11 +133,11 @@ export default {
 .dialog-h {
   .el-dialog__body {
     position: relative;
-    height: 82vh;
+    max-height: 82vh;
     box-sizing: border-box;
     padding: 0 10px 20px !important;
     .dialog-h-content {
-      height: calc(82vh - 80px);
+      max-height: calc(82vh - 80px);
       box-sizing: border-box;
       overflow: auto;
     }