Merge branch 'dev-220309' into test

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;
     }

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) {

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"

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="取消之后无法恢复，确认取消？"

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

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"

src/views/modules/workPc/guidance/guidanceList.vue

@@ -147,7 +147,7 @@ export default {
           }
         },
         {
-          lable: '编辑', // 按钮显示名称
+          lable: '修改', // 按钮显示名称
           size: 'mini',
           style: 'margin: 0 6px;',
           type: 'text',

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>

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>