diff --git a/src/App.vue b/src/App.vue
index d12179995..5d1e546d4 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;
     }
diff --git a/src/assets/scss/modules/search.scss b/src/assets/scss/modules/search.scss
index 370c50fe9..d6f0a6d1a 100644
--- a/src/assets/scss/modules/search.scss
+++ b/src/assets/scss/modules/search.scss
@@ -228,7 +228,7 @@
                 }
                 .notice-list {
                     // @include toe;
-                    width: 92%;
+                    width: calc(100% - 70px);
                     // height: 24px;
                     // overflow: hidden;
                     a {
diff --git a/src/assets/scss/modules/visual/personCategory.scss b/src/assets/scss/modules/visual/personCategory.scss
index ddf1da356..4c578bcdd 100644
--- a/src/assets/scss/modules/visual/personCategory.scss
+++ b/src/assets/scss/modules/visual/personCategory.scss
@@ -89,7 +89,7 @@
         }
 
         .item_right {
-          width: 160px;
+          width: 110px;
           display: flex;
           flex-direction: column;
           align-items: space-between;
diff --git a/src/assets/scss/people-info.scss b/src/assets/scss/people-info.scss
index fa0354ca2..24428cddc 100644
--- a/src/assets/scss/people-info.scss
+++ b/src/assets/scss/people-info.scss
@@ -8,11 +8,20 @@
 
     .wrap {
         position: relative;
-        margin: 120px auto;
-        padding: 20px;
-        width: 1000px;
+        margin: 5vh auto;
+        height: 90vh;
+        width: 1040px;
         background-color: #fff;
 
+        .wrap2 {
+            box-sizing: border-box;
+            padding: 20px;
+            height: 90vh;
+            width: 1040px;
+            overflow-y: auto;
+            overflow-x: hidden;
+        }
+
         .title {
             padding: 10px;
             font-size: 22px;
@@ -33,6 +42,7 @@
 
         .btn-close {
             position: absolute;
+            z-index: 2;
             top: -30px;
             right: -30px;
             cursor: pointer;
diff --git a/src/views/components/CTable.vue b/src/views/components/CTable.vue
index 86449a949..f5d2a8ee6 100644
--- a/src/views/components/CTable.vue
+++ b/src/views/components/CTable.vue
@@ -93,10 +93,10 @@
           <el-button v-for="item in operations"
                      v-show="item.isShow(scope.row)"
                      :key="item.lable"
-                     :style=item.style
-                     :type=item.type
-                     :size=item.size
-                     :plain=item.plain
+                     :type="item.type"
+                     :style="item.style"
+                     :size="item.size"
+                      :class="item.class"
                      @click.stop="handleMethod(scope.$index, scope.row,item.methodName)">{{item.lable}}</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 72503bad3..1c2cd5494 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -52,6 +52,7 @@
                   placeholder="楼号"
                   size="small"
                   clearable
+                  style="width: 120px;"
                   class="resi-cell-select"
                   :disabled="changeVDisabled"
                   @clear="handleClearBuild"
@@ -65,12 +66,13 @@
                   >
                   </el-option>
                 </el-select>
-                <!-- <el-select
+                <el-select
                   v-model.trim="form.UNIT_ID"
                   :disabled="changeBDisabled"
                   placeholder="单元"
                   size="small"
                   clearable
+                  style="width: 120px;"
                   class="resi-cell-select"
                   @click="handleClearDan"
                   @change="handleChangeD"
@@ -86,9 +88,10 @@
                 <el-select
                   v-model.trim="form.HOME_ID"
                   :disabled="changeDDisabled"
-                  placeholder="楼号"
+                  placeholder="房号"
                   size="small"
                   clearable
+                  style="width: 120px;"
                   class="resi-cell-select"
                 >
                   <el-option
@@ -98,7 +101,7 @@
                     :value="item.value"
                   >
                   </el-option>
-                </el-select> -->
+                </el-select>
               </div>
             </div>
           </el-col>
@@ -190,6 +193,7 @@
         </el-col> -->
         <el-col :span="24">
           <el-button type="primary" size="small" @click="handleSearch">查询</el-button>
+          <el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button>
         </el-col>
       </el-row>
       <div class="resi-down" @click="handleOpenSearch">
@@ -372,6 +376,12 @@ export default {
       this.form.UNIT_ID = ''
       this.form.HOME_ID = ''
     },
+    resetForm(formName) {
+      for(const n in this.form) {
+        this.form[n] = ''
+      }
+      this.handleSearch()
+    },
     handleSearch() {
       // console.log('formmmmm---', this.form)
       const itemTypes = ['daterange', 'timerange']
@@ -435,9 +445,13 @@ export default {
         if (n === val) {
           if (this.fixedList.length > 0) {
             let _item = {}
+            let hasVal = false
             this.fixedList.forEach((item, index) => {
-              if (item.columnName === val) {
+              if (item.columnName == val) {
+                hasVal = true
                 item.columnValue[0] = this.form[val]
+                if (!this.form[val]) this.fixedList.splice(index, 1)
+                console.log('fixedList----val', this.fixedList)
               } else {
                 _item = {
                   queryType: 'equal',
@@ -445,10 +459,11 @@ export default {
                   columnName: val,
                   columnValue: [this.form[val]]
                 }
+                console.log('fixedList----else', _item)
                 // this.$set(this.fixedList, index, _item)
               }
             })
-            if (Object.keys(_item).length > 0) this.fixedList.push(_item)
+            if (Object.keys(_item).length > 0 && !hasVal) this.fixedList.push(_item)
           } else {
             this.$set(this.fixedList, 0, {
               queryType: 'equal',
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 2d9d49cfb..9e35e8d64 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -12,11 +12,12 @@
                    @click="handleAdd">新增</el-button>
         <el-button class="diy-button--export"
                    size="small"
-                   @click="handleExportModule('room')">下载人口模板</el-button>
+                   @click="handleExportModule('room')">下载模板</el-button>
         <el-upload ref="upload"
                    class="upload-demo"
                    action="uploadUlr"
                    :limit="1"
+                   :accept="'.xls,.xlsx'"
                    :with-credentials="true"
                    :show-file-list="false"
                    :auto-upload="true"
@@ -47,6 +48,7 @@
                 @selection-change="selectionChange">
         <el-table-column type="selection"
                          fixed="left"
+                         align="center"
                          :selectable="checkSelect"
                          width="55" />
         <el-table-column label="序号"
@@ -62,7 +64,9 @@
                          align="center"
                          :fixed="item.columnName == 'NAME' ? 'left' : false"
                          :show-overflow-tooltip="true"
-                         :width="item.itemType === 'radio' ? computedWidth(item.label) : 180">
+                         :width="item.width || computedWidth(item.label, item.itemType)"
+                         >
+                         <!-- :width="item.itemType === 'radio' ? computedWidth(item.label) : 180" -->
           <template slot-scope="scope">
             <a v-if="item.columnName == 'NAME'"
                class="name-a"
@@ -93,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"
@@ -277,7 +281,7 @@ export default {
     return {
       exportBtn: false,
       exportBtnTitle: '导出',
-      importBtnTitle: '导入人员数据',
+      importBtnTitle: '导入',
       importLoading: false,
       rowVisible: false,
       tableLoading: false,
@@ -387,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) {
@@ -487,8 +495,12 @@ export default {
 
 
       let params = {}
-      await this.$http
-        .post(url, params)
+      await this.$http({
+        method: 'POST',
+        url,
+        responseType: 'blob',
+        data: params
+      })
         .then(res => {
           console.log('res----dddd', res)
           // this.download(res.data, title + '.xls')
@@ -659,7 +671,7 @@ export default {
       //     this.$message.error('导入失败')
       //   })
       this.importLoading = false
-      this.importBtnTitle = '导入人员数据'
+      this.importBtnTitle = '导入'
       this.$refs.upload.clearFiles()
     },
     handleClick (tab, event) {
diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue
index 521aac20b..1366c6734 100644
--- a/src/views/modules/communityParty/elegant/index.vue
+++ b/src/views/modules/communityParty/elegant/index.vue
@@ -48,11 +48,16 @@
       
       <div class="resi-row-btn">
         <el-button class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
+        <el-button
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule('room')">下载模板</el-button>
         <el-upload
           ref="upload"
           class="upload-demo"
           action="uploadUlr"
           :limit="1"
+          :accept="'.xls,.xlsx'"
           :with-credentials="true"
           :show-file-list="false"
           :auto-upload="true"
@@ -63,10 +68,7 @@
           <el-button size="small" class="diy-button--delete" :loading="importLoading">{{importBtnTitle}}</el-button>
         </el-upload>
         <el-button class="diy-button--reset" size="small" :loading="exportBtn" @click="handleExport">{{ exportBtnTitle }}</el-button>
-        <!-- <el-button
-                   class="diy-button--export"
-                   size="small"
-                   @click="handleExportModule('room')">下载模板</el-button> -->
+        
       </div>
       
       <el-table
@@ -106,7 +108,7 @@
                 type="text"
                 size="small"
                 class="btn-color-edit"
-                >编辑</el-button
+                >修改</el-button
               >
             <el-popconfirm
                 title="删除之后无法恢复，确认删除？"
@@ -200,7 +202,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"
@@ -218,6 +220,7 @@
       <div class="resi-btns">
         <el-button size="small" @click="handlerCancle">取消</el-button>
         <el-button
+          v-if="!disabled"
           type="primary"
           size="small"
           :loading="btnLoading"
@@ -236,7 +239,7 @@ export default {
   data() {
     return {
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
-      importBtnTitle: '导入数据',
+      importBtnTitle: '导入',
       importLoading: false,
       exportBtn: false,
       exportBtnTitle: '导出',
@@ -380,28 +383,68 @@ export default {
       this.uploading = true
       this.unloadPencent = Number(file.percentage.toFixed(0))
     },
+    download (data, fileName) {
+      console.log('data', data)
+      if (!data) {
+        return
+      }
+
+      var csvData = new Blob([data])
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName)
+      }
+      // for Non-IE (chrome, firefox etc.)
+      else {
+        var a = document.createElement('a')
+        document.body.appendChild(a)
+        a.style = 'display: none'
+        var url = window.URL.createObjectURL(csvData)
+        a.href = url
+        a.download = fileName
+        a.click()
+        a.remove()
+        window.URL.revokeObjectURL(url)
+      }
+    },
     async handleExportModule () {
-      let url = "/resi/partymember/import/template-download"
+      let url = "/resi/partymember/icpartymemberstyle/import/template-download"
       
 
       let params = {}
-      await this.$http
-        .post(url, params)
+      // app.ajax.exportFilePost(
+      //   url,
+      //   params,
+      //   (data, rspMsg) => {
+
+      //     this.download(data, 'a.xls')
+      //   },
+      //   (rspMsg, data) => {
+      //     this.$message.error(rspMsg);
+      //   }
+      // );
+      await this.$http({
+        method: 'POST',
+        url,
+        responseType: 'blob',
+        data: params
+      })
         .then(res => {
-          // this.download(res.data, title + '.xls')
+          console.log('res-------dd', res)
           if (res.headers["content-disposition"]) {
             let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
-            console.log('filename', fileName)
-            let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
-            var url = window.URL.createObjectURL(blob)
-            var aLink = document.createElement('a')
-            aLink.style.display = 'none'
-            aLink.href = url
-            aLink.setAttribute('download', fileName)
-            document.body.appendChild(aLink)
-            aLink.click()
-            document.body.removeChild(aLink) //下载完成移除元素
-            window.URL.revokeObjectURL(url) //释放掉blob对象
+            this.download(res.data, fileName)
+            // console.log('filename', fileName)
+            // let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+            // var url = window.URL.createObjectURL(blob)
+            // var aLink = document.createElement('a')
+            // aLink.style.display = 'none'
+            // aLink.href = url
+            // aLink.setAttribute('download', fileName)
+            // document.body.appendChild(aLink)
+            // aLink.click()
+            // document.body.removeChild(aLink) //下载完成移除元素
+            // window.URL.revokeObjectURL(url) //释放掉blob对象
           } else this.$message.error('下载失败')
         })
         .catch(err => {
@@ -477,7 +520,7 @@ export default {
       //     this.$message.error('导入失败')
       // })
       this.importLoading = false
-      this.importBtnTitle = '导入数据'
+      this.importBtnTitle = '导入'
       this.$refs.upload.clearFiles()
     },
     async handleExport() {
diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue
index b0de99cbc..344df3f9c 100644
--- a/src/views/modules/communityService/dqfwzx/index.vue
+++ b/src/views/modules/communityService/dqfwzx/index.vue
@@ -79,6 +79,7 @@
                   @click="handleOrder(scope.$index)"
                   type="text"
                   size="small"
+                  style="color: #1c6afd"
                   >预约</el-button
                 >
 
@@ -86,7 +87,7 @@
                   @click="handleOrderList(scope.$index)"
                   type="text"
                   size="small"
-                  style="margin-right: 10px; color: #00a7a9"
+                  style="margin-right: 10px; color: #1c6afd"
                   >预约记录</el-button
                 >
               </template>
@@ -420,22 +421,22 @@ export default {
             display: inline-block;
             margin-left: 1px;
             font-size: 14px;
-            color: rgb(235, 192, 4);
+            color: #00a7a9;
             width: 40px;
             line-height: 30px;
             text-align: center;
             cursor: pointer;
             &:nth-child(2) {
-              color: #aaa;
+              color: #d51010;
               &:hover {
                 // text-decoration: underline;
-                color: #666;
+                color: #d51010;
               }
             }
 
             &:hover {
               // text-decoration: underline;
-              color: rgb(250, 208, 23);
+              color: #00a7a9;
             }
           }
         }
diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 859982f64..e54a23553 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -131,12 +131,10 @@
               </el-date-picker>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" @click="handleSearch">查询</el-button>
+              <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
             </el-form-item>
             <el-form-item>
-              <el-button type="yellow" @click="resetForm('searchForm')"
-                >重置</el-button
-              >
+              <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
             </el-form-item>
           </div>
         </el-form>
@@ -145,7 +143,7 @@
     <el-card class="resi-card-table">
      
       <div class="resi-row-btn">
-        <el-button type="success" @click="handleAdd('add')">新增需求</el-button>
+        <el-button class="diy-button--add" size="small" @click="handleAdd('add')">新增</el-button>
       </div>
 
       <el-table
@@ -165,14 +163,14 @@
           :prop="item.columnName"
           :label="item.label"
           :align="item.align"
-          :width="item.width"
+          :min-width="item.width"
           :show-overflow-tooltip="true"
         >
           <template slot-scope="scope">
             <span>{{ handleFilterSpan(scope.row, item) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="200">
+        <el-table-column fixed="right" label="操作" align="center" width="200">
           <template slot-scope="scope">
             <template v-if="filterEdit(scope.row.agencyId)">
               <el-button
@@ -223,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 fa82fc660..a12416698 100644
--- a/src/views/modules/communityService/sqzzz/index.vue
+++ b/src/views/modules/communityService/sqzzz/index.vue
@@ -35,11 +35,16 @@
         <el-button class="diy-button--add" size="small" @click="handleAdd"
           >新增</el-button
         >
+        <el-button
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule('room')">下载模板</el-button>
         <el-upload
           ref="upload"
           class="upload-btn"
           action="uploadUlr"
           :limit="1"
+          :accept="'.xls,.xlsx'"
           :with-credentials="true"
           :show-file-list="false"
           :auto-upload="true"
@@ -103,7 +108,7 @@
               type="text"
               size="small"
               class="div-table-button--edit"
-              >编辑</el-button
+              >修改</el-button
             >
 
             <el-popconfirm
@@ -232,6 +237,39 @@ export default {
     this.getTableData();
   },
   methods: {
+    async handleExportModule () {
+      let url = "/heart/iccommunityselforganization/import-template-download"
+      
+
+      let params = {}
+      await this.$http({
+        method: 'POST',
+        url,
+        responseType: 'blob',
+        data: params
+      })
+        .then(res => {
+          // this.download(res.data, title + '.xls')
+          if (res.headers["content-disposition"]) {
+            let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+            console.log('filename', fileName)
+            let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+            var url = window.URL.createObjectURL(blob)
+            var aLink = document.createElement('a')
+            aLink.style.display = 'none'
+            aLink.href = url
+            aLink.setAttribute('download', fileName)
+            document.body.appendChild(aLink)
+            aLink.click()
+            document.body.removeChild(aLink) //下载完成移除元素
+            window.URL.revokeObjectURL(url) //释放掉blob对象
+          } else this.$message.error('下载失败')
+        })
+        .catch(err => {
+          console.log('err', err)
+          return this.$message.error('网络错误')
+        })
+    },
     // 上传大图标成功
     handleExcelSuccess(res, file) {
       if (res.code === 0 && res.msg === "success") {
diff --git a/src/views/modules/importRecord/index.vue b/src/views/modules/importRecord/index.vue
index 191bdc54f..f4fe8a58c 100644
--- a/src/views/modules/importRecord/index.vue
+++ b/src/views/modules/importRecord/index.vue
@@ -1,9 +1,7 @@
 <template>
   <div class="resi-container">
     <el-card class="resi-card-table">
-      <div class="resi-row-btn">
-        <h2 type="success" size="small">导入记录</h2>
-      </div>
+
       <el-table
         :data="tableData"
         border
diff --git a/src/views/modules/shequ/cpts/fangwu-info.vue b/src/views/modules/shequ/cpts/fangwu-info.vue
index ec0bad720..15babd2f4 100644
--- a/src/views/modules/shequ/cpts/fangwu-info.vue
+++ b/src/views/modules/shequ/cpts/fangwu-info.vue
@@ -202,6 +202,8 @@ export default {
 }
 .form {
   margin-top: 30px;
+  height: 60vh;
+  overflow-y: auto;
 }
 </style>
 <style>
diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue
index 4fd6debdf..f7c47e98c 100644
--- a/src/views/modules/shequ/cpts/people-more.vue
+++ b/src/views/modules/shequ/cpts/people-more.vue
@@ -1,109 +1,142 @@
 <template>
   <div class="m-pop">
     <div class="wrap">
-      <div class="title">
-        <span>更多信息</span>
-      </div>
-
       <div class="btn-close" @click="handleClose">
         <img src="@/assets/img/shuju/people/close.png" />
       </div>
-
-      <div
-        :key="'fieldSubList' + index"
-        v-for="(fieldSubList, index) in fieldList"
-      >
-        <div class="list">
-          <div class="item" v-if="index == 0">
-            <span class="item-field">所属网格：</span>
-            <span>{{ gridName }}</span>
-          </div>
-          <div class="item" v-if="index == 0">
-            <span class="item-field">所属小区：</span>
-            <span>{{ xiaoquName }}</span>
-          </div>
-          <div class="item" v-if="index == 0">
-            <span class="item-field">所属楼宇：</span>
-            <span>{{ louName }}-{{ danyuanName }}</span>
-          </div>
-          <div class="item" v-if="index == 0">
-            <span class="item-field">所属家庭：</span>
-            <span>{{ homeName }}</span>
-          </div>
-          <div class="item" :key="field.itemId" v-for="field in fieldSubList">
-            <span class="item-field">{{ field.label }}：</span>
-
-            <span
-              v-if="
-                field.itemType == 'select' ||
-                field.itemType == 'radio' ||
-                field.itemType == 'checkbox' ||
-                field.itemType == 'cascader'
-              "
-              >{{
-                info[field.columnName] == null
-                  ? "--"
-                  : getOptionLabel(
-                      field.options,
-                      info[field.columnName],
-                      field.itemType
-                    )
-              }}</span
-            >
-
-            <span v-else>{{
-              info[field.columnName] == null ? "--" : info[field.columnName]
-            }}</span>
-          </div>
+      <div class="wrap2">
+        <div class="title">
+          <span>更多信息</span>
         </div>
 
-        <div class="line"></div>
-      </div>
-
-      <div class="tabs">
         <div
-          class="tab-btn"
-          @click="subStartGroupIndex"
-          v-if="groupList.length > 9"
+          :key="'fieldSubList' + index"
+          v-for="(fieldSubList, index) in fieldList"
         >
-          <img src="@/assets/img/shuju/people/arrow-double-left.png" />
-        </div>
-        <div
-          v-show="index >= startGroupIndex && index < startGroupIndex + 9"
-          class="tab"
-          :class="groupIndex % groupList.length == index ? 'z-on' : ''"
-          :key="'tab' + index"
-          @click="groupIndex = index"
-          v-for="(item, index) in groupList"
-        >
-          {{ item.label }}
+          <div class="list">
+            <div class="item" v-if="index == 0">
+              <span class="item-field">所属网格：</span>
+              <span>{{ gridName }}</span>
+            </div>
+            <div class="item" v-if="index == 0">
+              <span class="item-field">所属小区：</span>
+              <span>{{ xiaoquName }}</span>
+            </div>
+            <div class="item" v-if="index == 0">
+              <span class="item-field">所属楼宇：</span>
+              <span>{{ louName }}-{{ danyuanName }}</span>
+            </div>
+            <div class="item" v-if="index == 0">
+              <span class="item-field">所属家庭：</span>
+              <span>{{ homeName }}</span>
+            </div>
+            <div class="item" :key="field.itemId" v-for="field in fieldSubList">
+              <span class="item-field">{{ field.label }}：</span>
+
+              <span
+                v-if="
+                  field.itemType == 'select' ||
+                  field.itemType == 'radio' ||
+                  field.itemType == 'checkbox' ||
+                  field.itemType == 'cascader'
+                "
+                >{{
+                  info[field.columnName] == null
+                    ? "--"
+                    : getOptionLabel(
+                        field.options,
+                        info[field.columnName],
+                        field.itemType
+                      )
+                }}</span
+              >
+
+              <span v-else>{{
+                info[field.columnName] == null ? "--" : info[field.columnName]
+              }}</span>
+            </div>
+          </div>
+
+          <div class="line"></div>
         </div>
-        <div
-          class="tab-btn"
-          @click="addStartGroupIndex"
-          v-if="groupList.length > 9"
-        >
-          <img src="@/assets/img/shuju/people/arrow-double-right.png" />
+
+        <div class="tabs">
+          <div
+            class="tab-btn"
+            @click="subStartGroupIndex"
+            v-if="groupList.length > 9"
+          >
+            <img src="@/assets/img/shuju/people/arrow-double-left.png" />
+          </div>
+          <div
+            v-show="index >= startGroupIndex && index < startGroupIndex + 9"
+            class="tab"
+            :class="groupIndex % groupList.length == index ? 'z-on' : ''"
+            :key="'tab' + index"
+            @click="groupIndex = index"
+            v-for="(item, index) in groupList"
+          >
+            {{ item.label }}
+          </div>
+          <div
+            class="tab-btn"
+            @click="addStartGroupIndex"
+            v-if="groupList.length > 9"
+          >
+            <img src="@/assets/img/shuju/people/arrow-double-right.png" />
+          </div>
         </div>
-      </div>
 
-      <div
-        :key="'group' + index"
-        v-show="groupIndex % groupList.length == index"
-        v-for="(group, index) in groupList"
-      >
         <div
-          v-if="
-            group.tableName == 'ic_resi_demand' &&
-            Array.isArray(allInfo.ic_resi_demand) &&
-            allInfo.ic_resi_demand.length > 0
-          "
+          :key="'group' + index"
+          v-show="groupIndex % groupList.length == index"
+          v-for="(group, index) in groupList"
         >
           <div
-            class="list"
-            :key="'ic_resi_demand' + infoIndex"
-            v-for="(infoItem, infoIndex) in allInfo.ic_resi_demand"
+            v-if="
+              group.tableName == 'ic_resi_demand' &&
+              Array.isArray(allInfo.ic_resi_demand) &&
+              allInfo.ic_resi_demand.length > 0
+            "
           >
+            <div
+              class="list"
+              :key="'ic_resi_demand' + infoIndex"
+              v-for="(infoItem, infoIndex) in allInfo.ic_resi_demand"
+            >
+              <div
+                class="item"
+                :key="field.itemId"
+                v-for="field in group.itemList"
+              >
+                <span class="item-field">{{ field.label }}：</span>
+                <span
+                  v-if="
+                    field.itemType == 'select' ||
+                    field.itemType == 'radio' ||
+                    field.itemType == 'checkbox' ||
+                    field.itemType == 'cascader'
+                  "
+                  >{{
+                    infoItem[field.columnName] == null
+                      ? "--"
+                      : getOptionLabel(
+                          field.options,
+                          infoItem[field.columnName],
+                          field.itemType
+                        )
+                  }}</span
+                >
+
+                <span v-else>{{
+                  infoItem[field.columnName] == null
+                    ? "--"
+                    : infoItem[field.columnName]
+                }}</span>
+              </div>
+            </div>
+          </div>
+          <div class="list" v-else>
             <div
               class="item"
               :key="field.itemId"
@@ -118,52 +151,24 @@
                   field.itemType == 'cascader'
                 "
                 >{{
-                  infoItem[field.columnName] == null
+                  !allInfo[group.tableName] ||
+                  allInfo[group.tableName][0][field.columnName] == null
                     ? "--"
                     : getOptionLabel(
                         field.options,
-                        infoItem[field.columnName],
+                        allInfo[group.tableName][0][field.columnName],
                         field.itemType
                       )
                 }}</span
               >
 
               <span v-else>{{
-                infoItem[field.columnName] == null
-                  ? "--"
-                  : infoItem[field.columnName]
-              }}</span>
-            </div>
-          </div>
-        </div>
-        <div class="list" v-else>
-          <div class="item" :key="field.itemId" v-for="field in group.itemList">
-            <span class="item-field">{{ field.label }}：</span>
-            <span
-              v-if="
-                field.itemType == 'select' ||
-                field.itemType == 'radio' ||
-                field.itemType == 'checkbox' ||
-                field.itemType == 'cascader'
-              "
-              >{{
                 !allInfo[group.tableName] ||
                 allInfo[group.tableName][0][field.columnName] == null
                   ? "--"
-                  : getOptionLabel(
-                      field.options,
-                      allInfo[group.tableName][0][field.columnName],
-                      field.itemType
-                    )
-              }}</span
-            >
-
-            <span v-else>{{
-              !allInfo[group.tableName] ||
-              allInfo[group.tableName][0][field.columnName] == null
-                ? "--"
-                : allInfo[group.tableName][0][field.columnName]
-            }}</span>
+                  : allInfo[group.tableName][0][field.columnName]
+              }}</span>
+            </div>
           </div>
         </div>
       </div>
@@ -499,8 +504,4 @@ export default {
 };
 </script>
 
-<style
-  lang="scss"
-  src="@/assets/scss/people-info.scss"
-  scoped
-></style>
+<style lang="scss" src="@/assets/scss/people-info.scss" scoped></style>
diff --git a/src/views/modules/shequ/cpts/scroll-notice.vue b/src/views/modules/shequ/cpts/scroll-notice.vue
index 6945dacc8..ce7495c7d 100644
--- a/src/views/modules/shequ/cpts/scroll-notice.vue
+++ b/src/views/modules/shequ/cpts/scroll-notice.vue
@@ -41,7 +41,7 @@ export default {
       let len = this.list.length;
       let beyond = this.beyond;
       return {
-        paddingLeft: beyond ? this.parentClientWidth + "px" : "",
+        // paddingLeft: beyond ? this.parentClientWidth + "px" : "",
         animation: beyond
           ? `move_left_right ${len * 5}s linear 0s infinite`
           : "",
@@ -118,7 +118,7 @@ export default {
       transform: translateX(0%);
     }
     to {
-      transform: translateX(-80%);
+      transform: translateX(-100%);
     }
   }
 }
diff --git a/src/views/modules/shequ/cpts/xuqiu-info.vue b/src/views/modules/shequ/cpts/xuqiu-info.vue
index 2e75d5ae6..2c378f739 100644
--- a/src/views/modules/shequ/cpts/xuqiu-info.vue
+++ b/src/views/modules/shequ/cpts/xuqiu-info.vue
@@ -219,6 +219,8 @@ export default {
 }
 .form {
   margin-top: 30px;
+  height: 60vh;
+  overflow-y: auto;
 }
 </style>
 <style>
diff --git a/src/views/modules/shequ/index.vue b/src/views/modules/shequ/index.vue
index 49c92e5f5..989472454 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"
diff --git a/src/views/modules/visual/basicinfo/personCategory/index.vue b/src/views/modules/visual/basicinfo/personCategory/index.vue
index 8d6607fa2..0323e79a7 100644
--- a/src/views/modules/visual/basicinfo/personCategory/index.vue
+++ b/src/views/modules/visual/basicinfo/personCategory/index.vue
@@ -49,7 +49,7 @@
               <div class="item_left">较上月</div>
               <div class="item_right">
                 <div class="item_right_row">
-                  <div class="item_right_title">新人员增加</div>
+                  <div class="item_right_title">增加</div>
                   <div>
                     <span v-if=" item.immigration!==0">{{ "+" }}</span>
                     <span>{{  item.immigration }}</span>
@@ -58,7 +58,7 @@
                 </div>
 
                 <div class="item_right_row row2">
-                  <div class="item_right_title">原人员减少</div>
+                  <div class="item_right_title">减少</div>
                   <div>
                     <span v-if=" item.emigration!==0">{{ "-" }}</span>
                     <span>{{  item.emigration }}</span>
diff --git a/src/views/modules/warning/components/screen-table/index.vue b/src/views/modules/warning/components/screen-table/index.vue
index 6f0da3ed4..9bb544539 100644
--- a/src/views/modules/warning/components/screen-table/index.vue
+++ b/src/views/modules/warning/components/screen-table/index.vue
@@ -60,10 +60,7 @@
           </div>
           <screen-loading v-if="visibleLoading">加载中</screen-loading>
           <div class="no-data" v-if="tableData.length == 0 && !visibleLoading">
-            <img
-              src="@/assets/img/modules/visual/noData.png"
-              class="no-data-img"
-            />
+            暂无数据
           </div>
         </div>
       </div>
@@ -377,14 +374,13 @@ export default {
       // 暂无数据
       .no-data {
         width: 100%;
-        height: calc(100% - 50px);
+        height: calc(100vh - 650px);
         display: flex;
         align-items: center;
         justify-content: center;
-        &-img {
-          width: 249px;
-          height: 172px;
-        }
+        font-size: 20px;
+        color: #999999;
+        text-align: center;
       }
     }
   }
diff --git a/src/views/modules/workPc/guidance/guidanceList.vue b/src/views/modules/workPc/guidance/guidanceList.vue
index 71d663d6f..8c5d436d5 100644
--- a/src/views/modules/workPc/guidance/guidanceList.vue
+++ b/src/views/modules/workPc/guidance/guidanceList.vue
@@ -136,23 +136,25 @@ export default {
       operations: [
         {
           lable: '详情', // 按钮显示名称
-          size: 'mini',
+          size: 'small',
           style: 'margin: 0 6px;',
           type: 'text',
           slot: '',
           plain: false,
+          class: 'div-table-button--detail',
           methodName: 'detail', // 回调方法名称
           isShow: (row) => {
             return true
           }
         },
         {
-          lable: '编辑', // 按钮显示名称
-          size: 'mini',
+          lable: '修改', // 按钮显示名称
+          size: 'small',
           style: 'margin: 0 6px;',
           type: 'text',
           slot: '',
           plain: false,
+          class: 'div-table-button--edit',
           methodName: 'edit', // 回调方法名称
           isShow: (row) => {
             // return true
@@ -165,11 +167,12 @@ export default {
         },
         {
           lable: '删除', // 按钮显示名称
-          size: 'mini',
+          size: 'small',
           style: 'margin: 0 6px;',
           type: 'text',
           slot: '',
           plain: false,
+          class: 'div-table-button--delete',
           methodName: 'confirmDel', // 回调方法名称
           isShow: (row) => {
             if (row.createdId === this.userId) {
diff --git a/src/views/modules/workSys/demandCate.vue b/src/views/modules/workSys/demandCate.vue
index 43593e1ad..56cd8c450 100644
--- a/src/views/modules/workSys/demandCate.vue
+++ b/src/views/modules/workSys/demandCate.vue
@@ -5,6 +5,7 @@
              class="search-card">
       <div>
         <el-form :inline="true"
+                  ref="searchForm"
                  :model="form"
                  class="demo-form-inline">
           <el-form-item label="需求分类">
@@ -25,6 +26,9 @@
                        size="small"
                        @click="handleSearch">查询</el-button>
           </el-form-item>
+          <el-form-item>
+            <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
+          </el-form-item>
         </el-form>
       </div>
     </el-card>
@@ -32,7 +36,7 @@
       <div class="resi-row-btn">
         <el-button class="diy-button--add"
                    size="small"
-                   @click="handleAdd('1', 'add')">新增分类</el-button>
+                   @click="handleAdd('1', 'add')">新增</el-button>
       </div>
 
       <el-table :data="tableData"
@@ -74,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>
@@ -220,6 +224,11 @@ export default {
       }
       return _val || row[item.columnName]
     },
+    resetForm(formName) {
+      
+      this.form.firstCategoryCode = ''
+      this.handleSearch();
+    },
     handleSearch (val) {
       console.log('searchhh--', val)
       this.currentPage = 1
diff --git a/src/views/modules/workSys/resiCate.vue b/src/views/modules/workSys/resiCate.vue
index 0d150e89f..d6594778d 100644
--- a/src/views/modules/workSys/resiCate.vue
+++ b/src/views/modules/workSys/resiCate.vue
@@ -2,7 +2,7 @@
   <div v-if="pageLoading" class="resi-container">
     <el-card ref="searchCard" class="search-card">
       <div >
-        <el-form :inline="true" :model="form" class="demo-form-inline">
+        <el-form ref="searchForm" :inline="true" :model="form" class="demo-form-inline">
           <el-form-item label="是否预警">
             <el-select
               v-model="isWarn"
@@ -38,6 +38,10 @@
           <el-form-item>
             <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
           </el-form-item>
+          <el-form-item>
+            <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
+          </el-form-item>
+          
         </el-form>
       </div>
     </el-card>
@@ -60,7 +64,7 @@
           :prop="item.columnName"
           :label="item.label"
           align="center"
-          width="180"
+          min-width="180"
         >
           <template slot-scope="scope">
             <el-image
@@ -85,7 +89,7 @@
                 type="text"
                 size="small"
                 class="div-table-button--edit"
-                >编辑</el-button
+                >修改</el-button
               >
           </template>
         </el-table-column>
@@ -335,6 +339,12 @@ export default {
       }
       return _val || row[item.columnName]
     },
+    resetForm(formName) {
+      
+      this.isWarn = ''
+      this.level = ''
+      this.handleSearch();
+    },
     handleSearch(val) {
       console.log('searchhh--', val)
       this.currentPage = 1