diff --git a/src/assets/scss/modules/management/categoryMain.scss b/src/assets/scss/modules/management/categoryMain.scss
index 0335afef..e5135aad 100644
--- a/src/assets/scss/modules/management/categoryMain.scss
+++ b/src/assets/scss/modules/management/categoryMain.scss
@@ -4,90 +4,154 @@
   width: 100%;
   background: #ffffff;
   border-radius: 5px;
-  padding: 35px 0;
-
-  .div_tip {
-    font-size: 24px;
-    font-family: PingFang SC;
-    font-weight: bold;
-    color: #333333;
-    margin-left: 42px;
-  }
-  .div_room_bar {
-    box-sizing: border-box;
-    margin-top: 5px;
-    height: calc(100vh - 230px);
-  }
+  padding: 35px 0 15px;
+}
+.div_tip {
+  font-size: 24px;
+  font-family: PingFang SC;
+  font-weight: bold;
+  color: #333333;
+  margin-left: 42px;
+}
+.div_list {
+  box-sizing: border-box;
+  margin-top: 5px;
+  height: calc(100vh - 210px);
+}
 
-  .div_room {
-    // height: calc(88vh - 40px);
-    // margin-top: 9px;
+.div_all_list {
+  height: calc(100vh - 260px);
+}
+
+.div_room {
+  // height: calc(88vh - 40px);
+  // margin-top: 9px;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  margin-left: 42px;
+  // margin: 0 21px 0 21px;
+
+  .item {
+    width: 340px;
+    height: 120px;
+    background: #ffffff;
+    box-shadow: 0px 0px 17px 3px #eaeaea;
+    border-radius: 6px;
+    margin: 15px 25px 15px 0;
     display: flex;
-    flex-wrap: wrap;
-    justify-content: flex-start;
-    margin-left: 42px;
-    // margin: 0 21px 0 21px;
-
-    .item {
-      width: 340px;
-      height: 120px;
-      background: #ffffff;
-      box-shadow: 0px 0px 17px 3px #eaeaea;
-      border-radius: 6px;
-      margin-top: 30px;
-      display: flex;
+    position: relative;
 
-      .item_category {
+    .item_category {
+      width: 100%;
+      display: flex;
+      align-items: center;
+      padding: 17px 16px;
+      > img {
+        width: 86px;
+        height: 86px;
+      }
+      .item_content {
+        margin-left: 16px;
+        width: 100%;
+        text-align: left;
         display: flex;
-        align-items: center;
-        padding: 17px 16px;
-        > img {
-          width: 86px;
-          height: 86px;
+        flex-direction: column;
+        justify-content: flex-start;
+
+        .item_count {
+          font-size: 28px;
+          font-family: PingFang SC;
+          font-weight: bold;
+          color: #333333;
         }
-        .item_content {
-          margin-left: 16px;
-          text-align: left;
+        .item_row2 {
+          margin-top: 21px;
+          display: flex;
+          justify-content: space-between;
+
+          .row_left {
+            font-size: 20px;
+            font-family: PingFang SC;
+            font-weight: 500;
+            color: #202020;
+          }
 
-          .item_count {
-            margin-top: 29px;
-            font-size: 28px;
+          .row_right {
+            margin: 5px 10px 0 0;
+            font-size: 16px;
             font-family: PingFang SC;
-            font-weight: bold;
-            color: #333333;
+            font-weight: 500;
+            text-decoration: underline;
+            color: #00a7a9;
+            cursor: pointer;
           }
         }
       }
 
-      .item_add {
+      > span {
+        margin-left: 16px;
+        font-size: 24px;
+      }
+    }
+
+    .item_add {
+      cursor: pointer;
+      font-size: 24px;
+      font-family: PingFang SC;
+      font-weight: 500;
+      color: #333333;
+      display: flex;
+      align-items: center;
+      padding: 17px 16px;
+
+      > img {
+        width: 86px;
+        height: 86px;
+      }
+
+      > span {
         font-size: 24px;
         font-family: PingFang SC;
         font-weight: 500;
         color: #333333;
-        line-height: 350px;
-        display: flex;
-        align-items: center;
-        padding: 17px 16px;
-
-        > img {
-          width: 86px;
-          height: 86px;
-        }
 
-        > span {
-          font-size: 24px;
-          font-family: PingFang SC;
-          font-weight: 500;
-          color: #333333;
-          line-height: 350px;
-          margin-left: 16px;
-        }
+        margin-left: 16px;
       }
     }
+
+    .icon_circle {
+      cursor: pointer;
+      position: absolute;
+      top: -10px;
+      right: -10px;
+      height: 23px;
+      width: 23px;
+      background-color: #ffffff;
+      border-radius: 50%;
+      border: 1px solid #a5a5a5;
+    }
+
+    .icon_sel {
+      cursor: pointer;
+      background-color: #6bb9f8;
+      border: 1px solid #6bb9f8;
+    }
   }
+}
+
+.div_room::after {
+  content: '';
+  flex: 1;
+}
+
+.div_btn {
+  margin-top: 15px;
+  display: flex;
+  width: 100%;
+  justify-content: center;
 
-  .div_room::after {
-    content: '';
-    flex: 1;
+  .btn_right {
+    margin-left: 50px;
   }
 }
diff --git a/src/views/modules/base/category/addCategory.vue b/src/views/modules/base/category/addCategory.vue
new file mode 100644
index 00000000..f84c1a51
--- /dev/null
+++ b/src/views/modules/base/category/addCategory.vue
@@ -0,0 +1,202 @@
+<template>
+  <div>
+    <div class="div_tip">
+      全部类别
+    </div>
+
+    <div class="div_list div_all_list">
+      <el-scrollbar style="height:100%">
+        <div class="div_room">
+
+          <div v-for="(item,index) in defaultList"
+               :key="index"
+               class="item"
+               @click="handelSelCategory(index)">
+            <div v-if="item.selected"
+                 class="icon_circle icon_sel">
+              <!-- <icon name="el-icon-check"
+                    scale="20"></icon> -->
+              <i class="el-icon-check"
+                 style="font-size: 17px; color: #5d5d5d ;margin-left:1px;margin-top:2px" />
+            </div>
+            <div v-if="!item.selected"
+                 class="icon_circle"></div>
+
+            <div class="item_category">
+              <img :src="item.managementIcon"
+                   alt />
+              <span>{{item.label}}</span>
+            </div>
+
+          </div>
+
+        </div>
+      </el-scrollbar>
+
+    </div>
+    <div class="div_btn">
+      <el-button type="warning"
+                 @click="handleCancle">取消</el-button>
+      <el-button type="primary"
+                 class="btn_right"
+                 @click="handleConfirm">确定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from "vuex";
+import { Loading } from 'element-ui'; //引入Loading服务
+import { requestPost } from "@/js/dai/request";
+
+
+let loading;//加载动画
+
+export default {
+
+  data () {
+    return {
+      defaultList: [],
+      addList: []
+
+    }
+  },
+  async mounted () {
+
+
+  },
+  methods: {
+    async initData () {
+      await this.getDefaultCategoryList()
+
+      this.addList = [...this.categoryList]
+      this.addList.pop()
+    },
+    //获取默认分类信息
+    async getDefaultCategoryList () {
+      const url = "/oper/customize/icindividualcategorymanage/individualcategoryalllist"
+      // const url = "http://yapi.elinkservice.cn/mock/245/oper/customize/icindividualcategorymanage/individualcategoryalllist"
+
+      let params = {}
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        // this.defaultList = []
+        this.defaultList = [...data]
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handelSelCategory (index) {
+      let obj = JSON.parse(JSON.stringify(this.defaultList[index]))
+
+      if (!obj.selected) {//原状态不是选中状态，在数组最后添加
+        this.addList.push(obj)
+      } else {//原状态是选中状态，从数组里找到并去除
+        for (let itemIndex in this.addList) {
+          // debugger
+          let tempObj = this.addList[itemIndex]
+          if (obj.columnName === tempObj.columnName) {
+            this.addList.splice(itemIndex, 1);
+            break
+
+          }
+        }
+
+        this.addList.forEach(element => {
+          console.log(element.label)
+        });
+
+      }
+
+      obj.selected = !obj.selected
+      this.$set(this.defaultList, index, obj)
+
+    },
+
+    async handleConfirm () {
+      this.addList.forEach((element, index) => {
+        element.sort = index
+        element.columnId = element.id
+      });
+
+      const url = "/oper/customize/icindividualcategorymanage/editindividualcategory"
+
+
+      const { data, code, msg } = await requestPost(url, this.addList)
+
+      if (code === 0) {
+        this.$emit('handleConfirm')
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleCancle () {
+      this.$emit('handleCancle')
+    },
+
+
+
+    //开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, //是否锁定
+        text: '正在加载……', //加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' //背景颜色
+      });
+
+    },
+
+    //结束加载动画
+    endLoading () {
+      //clearTimeout(timer);
+      if (loading) {
+        loading.close();
+      }
+    },
+  },
+  props: {
+    categoryList: {
+      type: Array,
+      default () {
+        return []
+      }
+    }
+  },
+  computed: {
+    // selectWidth () {
+    //   let width = this.selHouseName.length * 200
+    //   console.log(width)
+    //   return width + 'px';
+    // },
+
+    mapHeight () {
+
+      return this.clientHeight - 120;
+
+    },
+
+    ...mapGetters(["clientHeight"])
+
+  },
+  components: {},
+}
+
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/management/categoryMain.scss"
+  scoped
+></style>
+
+<style lang=scss >
+.el-scrollbar__wrap {
+  overflow-x: hidden !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/base/category/main.vue b/src/views/modules/base/category/main.vue
index b647612e..10a35729 100644
--- a/src/views/modules/base/category/main.vue
+++ b/src/views/modules/base/category/main.vue
@@ -1,50 +1,64 @@
 <template>
 
   <div class="div_main">
-    <div class="div_tip">
-      类别信息
-    </div>
-    <div class="div_room_bar">
-      <el-scrollbar style="height:100%">
-        <div class="div_room">
+    <div v-if="!showAddForm">
+      <div class="div_tip">
+        类别信息
+      </div>
+      <div class="div_list">
+        <el-scrollbar style="height:100%">
+          <div class="div_room">
+
+            <div v-for="(item,index) in categoryList"
+                 :key="index"
+                 class="item">
+              <div v-if="index==(categoryList.length-1)"
+                   class="item_add"
+                   @click="handleAddCategory">
+
+                <img :src="item.managementIcon"
+                     alt />
+                <span>{{item.label}}</span>
+
+              </div>
+              <div v-else
+                   class="item_category">
+                <img :src="item.managementIcon"
+                     alt />
 
-          <div v-for="(item,index) in categoryList"
-               :key="index"
-               class="item"
-               @click="handleClickRoom(index)">
-            <div v-if="index==(categoryList.length-1)"
-                 class="item_add">
+                <div class="item_content">
+                  <div class="item_count">{{item.count}}</div>
 
-              <img :src="item.managementIcon"
-                   alt />
-              <span>{{item.label}}</span>
+                  <div class="item_row2">
+                    <div class="row_left">{{item.label}}</div>
+                    <div class="row_right"
+                         @click="toPersonList(item)">管理</div>
+                  </div>
+                </div>
 
-            </div>
-            <div v-else
-                 class="item_category">
-              <img :src="item.managementIcon"
-                   alt />
-
-              <div class="item_content">
-                <div class="item_count">{{item.count}}</div>
-                <div class="item_name">{{item.columnName}}</div>
               </div>
-              <span>{{item.label}}</span>
+
             </div>
 
           </div>
-
-        </div>
-      </el-scrollbar>
+        </el-scrollbar>
+      </div>
     </div>
+    <add-category v-if="showAddForm"
+                  ref="ref_add"
+                  :categoryList="categoryList"
+                  @handleCancle="handleCancle"
+                  @handleConfirm="handleConfirm"></add-category>
   </div>
 
 </template>
 
 <script>
 import { mapGetters } from "vuex";
+import nextTick from 'dai-js/tools/nextTick'
 import { Loading } from 'element-ui'; //引入Loading服务
 import { requestPost } from "@/js/dai/request";
+import addCategory from "./addCategory";
 
 let loading;//加载动画
 
@@ -52,33 +66,8 @@ export default {
 
   data () {
     return {
-      //父组件传过来的小区id
-      neighborHoodId: '',
-      neighborHoodName: '',
-      buildingArray: [],//楼栋下拉框数据
-      selBuildingId: '',
-      selBuildingName: '',
-
-
-      roomArray: [],
-      selHouseId: '',
-      selHouseName: '',
-      selHouseIndex: 0,
-
-      userArray: [],
-      selUserName: '',
-      selUserId: '',
-
-      orgData: {},//当前组织对象
-      orgId: '',
-      orgLevel: '',
-
-      //下钻层级记录
-      runNum: 0,
-      runAgencyArray: [],
-
-      categoryList: []
-
+      categoryList: [],
+      showAddForm: false,
     }
   },
   async mounted () {
@@ -107,134 +96,33 @@ export default {
       }
     },
 
-    //选择房间
-    handleClickRoom (index) {
-      this.selHouseIndex = index
-      this.selHouseId = this.roomArray[index].houseId
-      this.selHouseName = this.roomArray[index].houseName
+    async handleAddCategory () {
+      this.showAddForm = true
+      await nextTick(200)
 
-      // this.$emit('refreshInfoList', this.selHouseId, 'room')
+      this.$refs['ref_add'].initData()
     },
 
+    handleConfirm () {
+      this.showAddForm = false
 
-    //点击用户
-    handleClickUser (userId) {
-      this.$emit('toSubAgency', 'people', userId, "")
+      this.getCategoryList()
     },
-    //获取右侧infolist数据
-    async loadList () {
 
+    handleCancle () {
+      this.showAddForm = false
     },
 
-    //加载楼栋数据
-    async loadBuilding () {
-      const url = "/gov/org/agency/baseinfofamilybuilding"
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/baseinfofamilybuilding"
-      let params = {
-        neighborHoodId: this.neighborHoodId
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.buildingArray = data
-        this.buildingArray.forEach(item => {
-          if (!this.buildingArray[0].buildingName) {
-            item.buildingName = '楼'
-          }
-
-        });
-        if (this.buildingArray.length > 0) {
-          this.selBuildingId = this.buildingArray[0].buildingId
-          this.selBuildingName = this.buildingArray[0].buildingName
-
-        } else {
-          this.selBuildingId = ''
-          this.selBuildingName = ''
+    toPersonList (item) {
+      this.$router.push({
+        path: "/main/base-resi",
+        query: {
+          columnName: item.columnName
         }
-
-      } else {
-        this.$message.error(msg)
-      }
+      })
 
     },
 
-    //加载房间数据
-    async loadRoom () {
-      const url = "/gov/org/ichouse/houselist"
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/ichouse/houselist"
-      let params = {
-        buildingId: this.selBuildingId
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.roomArray = data
-
-        if (this.roomArray.length > 0) {
-
-          this.roomArray.forEach(roomItem => {
-            let iconArrayShow = JSON.parse(JSON.stringify(roomItem.categoryList))
-            let iconArray = []
-
-            if (iconArrayShow.length > 0) {
-              if (iconArrayShow[0].isSpecial === '1') {//第一个图标是党员
-                roomItem.isParty = true
-                roomItem.partyUrl = iconArrayShow[0].iconUrl
-                iconArrayShow.shift();//删除第一个数据
-              } else {
-                roomItem.isParty = false
-              }
-            }
-            if (iconArrayShow.length > 4) {//去前四个
-              for (let i = 0; i < 4; i++) {
-                iconArray.push(iconArrayShow[i])
-              }
-            } else {
-              iconArray = iconArrayShow
-            }
-            this.$nextTick(() => {
-              // ref_tree 元素的ref   value 绑定的node-key
-              roomItem.iconArrayShow = iconArray
-            });
-
-            roomItem.showAllUser = false
-
-          });
-
-        }
-
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-
-    //加载成员数据
-    async loadUser (houseId, index) {
-      const url = "/epmetuser/icresiuser/getpeoplebyroom"
-      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icresiuser/getpeoplebyroom"
-      let params = {
-        homeId: houseId
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.userArray = data
-        if (this.userArray.length === 0) {
-          this.$message.warning('该房间下没有住户')
-        }
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-
-
     //开启加载动画
     startLoading () {
       loading = Loading.service({
@@ -268,22 +156,11 @@ export default {
       return this.clientHeight - 120;
 
     },
-    // zoom: {
-    //   get () {
-    //     //根据不同屏幕分辨率，控制zoom大小
-    //     if (this.clientHeight < 900) {
-    //       return 2.3
-    //     } else {
-    //       return 2.8
-    //     }
-    //   },
-    //   set (value) {
-    //   }
-    // },
+
     ...mapGetters(["clientHeight"])
 
   },
-  components: {},
+  components: { addCategory },
 }
 
 </script>
@@ -294,87 +171,6 @@ export default {
   scoped
 ></style>
 
-<style lang=scss scoped>
-.customer_select {
-  /* 未选中任何选项的时候 placeholder的样式 需要先选中父元素 增加权重 */
-  /deep/ input::-webkit-input-placeholder {
-    color: #fff;
-  }
-  /deep/ input::-moz-input-placeholder {
-    color: #fff;
-  }
-  /deep/ input::-ms-input-placeholder {
-    color: #fff;
-  }
-
-  /* 修改的是el-input的样式 */
-  /* 一种方法是设置最里层el-input__inner的背景色 外层的两级父元素设置为透明色 */
-  /* 另一种方法是从el-select到el-input__inenr的背景色都设置为需要的颜色 */
-  /deep/ .el-select,
-  /deep/ .el-input,
-  /deep/ .el-input__inner {
-    background-color: #08164d00;
-    color: #fff;
-    border: 0px;
-    border-radius: 0px;
-    text-align: left;
-    font-size: 22px;
-    font-family: PingFang SC;
-    font-weight: 800;
-    color: #ffffff;
-    display: flex;
-  }
-
-  /* el-input聚焦的时候 外层的border会有一个样式 */
-  /deep/ .el-select .el-input.is-focus .el-input__inner {
-    border: 0px;
-  }
-
-  /* 修改的是el-input上下的小图标的颜色 */
-  /deep/ .el-select .el-input .el-select__caret::before {
-    color: #fff;
-    content: "";
-    background: url("../../../../assets/img/xiala.png") center center no-repeat;
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-  }
-
-  /* 修改总体选项的样式 最外层 */
-  /deep/ .el-select-dropdown {
-    background-color: #08164d;
-    margin: 0px;
-    border: 0px;
-    border-radius: 0px;
-  }
-
-  /* 修改选项整体的样式 */
-  /deep/ .el-select-dropdown__list {
-    padding: 6px 0 20px 0;
-  }
-  /* 修改单个的选项的样式 */
-  /deep/ .el-select-dropdown__item {
-    background-color: transparent;
-    color: #fff;
-  }
-
-  /* item选项的hover样式 */
-  /deep/ .el-select-dropdown__item.hover,
-  /deep/ .el-select-dropdown__item:hover {
-    color: #409eff;
-  }
-
-  /* 修改的是下拉框选项内容上方的尖角 */
-  /deep/ .el-popper .popper__arrow,
-  .el-popper .popper__arrow::after {
-    display: none;
-  }
-}
-</style> 
-
 <style lang=scss >
 .el-scrollbar__wrap {
   overflow-x: hidden !important;
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 6a4af200..9c1404ef 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -1,203 +1,180 @@
 <template>
-  <div v-if="pageLoading" class="resi-container">
-    <resi-search
-      v-if="searchList.length > 0"
-      ref="resiSearch"
-      :form-list="searchList"
-      @search="handleSearch"
-    />
+  <div v-if="pageLoading"
+       class="resi-container">
+    <resi-search v-if="searchList.length > 0"
+                 ref="resiSearch"
+                 :form-list="searchList"
+                 @search="handleSearch" />
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
-        <el-button type="success" size="small" @click="handleAdd">新增</el-button>
-        <el-button type="warning" size="small" :loading="exportBtn" @click="handleExport">{{exportBtnTitle}}</el-button>
+        <el-button type="success"
+                   size="small"
+                   @click="handleAdd">新增</el-button>
+        <el-button type="warning"
+                   size="small"
+                   :loading="exportBtn"
+                   @click="handleExport">{{exportBtnTitle}}</el-button>
         <!-- <el-button type="primary" size="small">下载人口模板</el-button> -->
-        <el-upload
-          ref="upload"
-          class="upload-demo"
-          action="uploadUlr"
-          :limit="1"
-          :with-credentials="true"
-          :show-file-list="false"
-          :auto-upload="true"
-          :on-progress="handleProgress"
-          :on-success="handleExcelSuccess"
-          :before-upload="beforeExcelUpload"
-          :http-request="uploadHttpRequest"
-          >
-          <el-button type="danger" size="small" :loading="importLoading">{{importBtnTitle}}</el-button>
+        <el-upload ref="upload"
+                   class="upload-demo"
+                   action="uploadUlr"
+                   :limit="1"
+                   :with-credentials="true"
+                   :show-file-list="false"
+                   :auto-upload="true"
+                   :on-progress="handleProgress"
+                   :on-success="handleExcelSuccess"
+                   :before-upload="beforeExcelUpload"
+                   :http-request="uploadHttpRequest">
+          <el-button type="danger"
+                     size="small"
+                     :loading="importLoading">{{importBtnTitle}}</el-button>
         </el-upload>
-        
+
       </div>
-      <el-table
-        :data="tableData"
-        v-loading="tableLoading"
-        border
-        style="width: 100%"
-        class="resi-table"
-      >
-        <el-table-column label="序号" type="index" align="center" width="50">
+      <el-table :data="tableData"
+                v-loading="tableLoading"
+                border
+                style="width: 100%"
+                class="resi-table">
+        <el-table-column label="序号"
+                         type="index"
+                         align="center"
+                         width="50">
         </el-table-column>
-        <el-table-column
-          v-for="item in tableHeader"
-          :key="item.columnName"
-          :prop="item.columnName"
-          :label="item.label"
-          align="center"
-          :show-overflow-tooltip="true"
-          :width="item.itemType === 'radio' ? computedWidth(item.label) : 180"
-        >
+        <el-table-column v-for="item in tableHeader"
+                         :key="item.columnName"
+                         :prop="item.columnName"
+                         :label="item.label"
+                         align="center"
+                         :show-overflow-tooltip="true"
+                         :width="item.itemType === 'radio' ? computedWidth(item.label) : 180">
           <template slot-scope="scope">
             <span>{{ handleFilterSpan(scope.row, item) }}</span>
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" align="center" width="120">
+        <el-table-column fixed="right"
+                         label="操作"
+                         align="center"
+                         width="120">
           <template slot-scope="scope">
-            <el-button
-              @click="handleLook(scope.row)"
-              type="text"
-              size="small"
-              class="btn-color-look"
-              >查看</el-button
-            >
+            <el-button @click="handleLook(scope.row)"
+                       type="text"
+                       size="small"
+                       class="btn-color-look">查看</el-button>
             <template v-if="filterEdit(scope.row.ORG_ID)">
-              <el-button
-                @click="handleEdit(scope.row)"
-                type="text"
-                size="small"
-                class="btn-color-edit"
-                >编辑</el-button
-              >
-              <el-popconfirm
-                title="删除之后无法回复，确认删除？"
-                @onConfirm="handleDel(scope.row)"
-              >
-                <el-button
-                  slot="reference"
-                  type="text"
-                  size="small"
-                  class="btn-color-del"
-                  >删除</el-button
-                >
+              <el-button @click="handleEdit(scope.row)"
+                         type="text"
+                         size="small"
+                         class="btn-color-edit">编辑</el-button>
+              <el-popconfirm title="删除之后无法回复，确认删除？"
+                             @onConfirm="handleDel(scope.row)">
+                <el-button slot="reference"
+                           type="text"
+                           size="small"
+                           class="btn-color-del">删除</el-button>
               </el-popconfirm>
             </template>
           </template>
         </el-table-column>
       </el-table>
       <div>
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page.sync="currentPage"
-          :page-sizes="[20, 50, 100, 200]"
-          :page-size="pageSize"
-          layout="sizes, prev, pager, next"
-          :total="total"
-        >
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="currentPage"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next"
+                       :total="total">
         </el-pagination>
       </div>
     </el-card>
 
-    <el-dialog
-      :title="formName"
-      :visible.sync="dialogVisible"
-      width="80%"
-      append-to-body
-      :close-on-click-modal="false"
-      :before-close="handlerCancle"
-    >
-      <resi-form
-        v-if="dialogVisible"
-        ref="baseForm"
-        :fixed="true"
-        :form-list="formList"
-        @changegroup="handleChangeGroup"
-      />
-      <div v-if="dialogVisible" class="resi-other">
+    <el-dialog :title="formName"
+               :visible.sync="dialogVisible"
+               width="80%"
+               append-to-body
+               :close-on-click-modal="false"
+               :before-close="handlerCancle">
+      <resi-form v-if="dialogVisible"
+                 ref="baseForm"
+                 :fixed="true"
+                 :form-list="formList"
+                 @changegroup="handleChangeGroup" />
+      <div v-if="dialogVisible"
+           class="resi-other">
         <div class="resi-other-title">其他</div>
         <div class="tabs-other-info">
-          <el-tabs v-model="activeName" @tab-click="handleClick">
-            <el-tab-pane
-              v-for="item in tabsList"
-              :key="item.columnName"
-              :label="item.label"
-              :name="'group' + item.groupId"
-            >
-              <resi-form
-                :ref="'group' + item.groupId"
-                :columns="3"
-                :support-add="item.supportAdd"
-                :form-id="item.columnName"
-                :form-list="item.itemList"
-              />
+          <el-tabs v-model="activeName"
+                   @tab-click="handleClick">
+            <el-tab-pane v-for="item in tabsList"
+                         :key="item.columnName"
+                         :label="item.label"
+                         :name="'group' + item.groupId">
+              <resi-form :ref="'group' + item.groupId"
+                         :columns="3"
+                         :support-add="item.supportAdd"
+                         :form-id="item.columnName"
+                         :form-list="item.itemList" />
             </el-tab-pane>
           </el-tabs>
         </div>
       </div>
       <div class="resi-btns">
-        <el-button size="small" @click="handlerCancle">取消</el-button>
-        <el-button
-          type="primary"
-          size="small"
-          :loading="btnLoading"
-          @click="handleSUbmit"
-          >提交</el-button
-        >
+        <el-button size="small"
+                   @click="handlerCancle">取消</el-button>
+        <el-button type="primary"
+                   size="small"
+                   :loading="btnLoading"
+                   @click="handleSUbmit">提交</el-button>
       </div>
     </el-dialog>
 
-    <el-dialog
-      :title="formName"
-      :visible.sync="dialogEditVisible"
-      width="80%"
-      append-to-body
-      :close-on-click-modal="false"
-      :before-close="handlerEditCancle"
-    >
-      <edit-resi
-        v-if="dialogEditVisible"
-        ref="baseForm"
-        :disabled="disabled"
-        :form-info="editForm"
-        :fixed="true"
-        :form-list="formList"
-        :agency-id="editAgencyId"
-        @changegroup="handleChangeGroup"
-      />
-      <div v-if="dialogEditVisible" class="resi-other">
+    <el-dialog :title="formName"
+               :visible.sync="dialogEditVisible"
+               width="80%"
+               append-to-body
+               :close-on-click-modal="false"
+               :before-close="handlerEditCancle">
+      <edit-resi v-if="dialogEditVisible"
+                 ref="baseForm"
+                 :disabled="disabled"
+                 :form-info="editForm"
+                 :fixed="true"
+                 :form-list="formList"
+                 :agency-id="editAgencyId"
+                 @changegroup="handleChangeGroup" />
+      <div v-if="dialogEditVisible"
+           class="resi-other">
         <div class="resi-other-title">其他</div>
         <div class="tabs-other-info">
-          <el-tabs v-model="activeName" @tab-click="handleClick">
-            <el-tab-pane
-              v-for="item in tabsList"
-              :key="item.columnName"
-              :label="item.label"
-              :name="'group' + item.groupId"
-            >
-              <edit-resi
-                :ref="'group' + item.groupId"
-                :columns="3"
-                :support-add="item.supportAdd"
-                :form-id="item.columnName"
-                :muti-list="item.mutiList"
-                :form-list="item.itemList"
-                :disabled="disabled"
-                :label-width="'140px'"
-                :agency-id="editAgencyId"
-              />
+          <el-tabs v-model="activeName"
+                   @tab-click="handleClick">
+            <el-tab-pane v-for="item in tabsList"
+                         :key="item.columnName"
+                         :label="item.label"
+                         :name="'group' + item.groupId">
+              <edit-resi :ref="'group' + item.groupId"
+                         :columns="3"
+                         :support-add="item.supportAdd"
+                         :form-id="item.columnName"
+                         :muti-list="item.mutiList"
+                         :form-list="item.itemList"
+                         :disabled="disabled"
+                         :label-width="'140px'"
+                         :agency-id="editAgencyId" />
             </el-tab-pane>
           </el-tabs>
         </div>
       </div>
       <div class="resi-btns">
-        <el-button size="small" @click="handlerEditCancle">取消</el-button>
-        <el-button
-          v-if="!disabled"
-          type="primary"
-          size="small"
-          :loading="btnLoading"
-          @click="handleEditSUbmit"
-          >提交</el-button
-        >
+        <el-button size="small"
+                   @click="handlerEditCancle">取消</el-button>
+        <el-button v-if="!disabled"
+                   type="primary"
+                   size="small"
+                   :loading="btnLoading"
+                   @click="handleEditSUbmit">提交</el-button>
       </div>
     </el-dialog>
   </div>
@@ -214,7 +191,7 @@ export default {
     resiForm,
     editResi
   },
-  data() {
+  data () {
     return {
       exportBtn: false,
       exportBtnTitle: '导出',
@@ -246,10 +223,28 @@ export default {
       formName: '',
       formList: [],
       tableHeader: [],
-      tabsList: []
+      tabsList: [],
+
+      defaultCategotyKey: ''
+    }
+  },
+  props: {
+
+  },
+  activated () {
+    if (this.$route.query) {
+      let query = this.$route.query
+      this.defaultCategotyKey = query.columnName
     }
+
   },
-  async created() {
+  async created () {
+    if (this.$route.query) {
+      let query = this.$route.query
+      this.defaultCategotyKey = query.columnName
+    }
+
+
     await this.getSearchList()
     // await this.getFormList()
     await this.getTableHeader()
@@ -258,25 +253,25 @@ export default {
     console.log('storeoooo----0000', this.$store)
   },
   methods: {
-    computedWidth(label) {
+    computedWidth (label) {
       const wd = 20 * label.length
       return wd > 80 ? wd : 80
     },
-    filterEdit(id) {
+    filterEdit (id) {
       const { user } = this.$store.state
       return id === user.agencyId
     },
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       console.log(`每页 ${val} 条`)
       this.pageSize = val
       this.getTableData()
     },
-    handleCurrentChange(val) {
+    handleCurrentChange (val) {
       console.log(`当前页: ${val}`)
       this.currentPage = val
       this.getTableData()
     },
-    handleFilterSpan(row, item) {
+    handleFilterSpan (row, item) {
       let _val = ''
       if (item.itemType === 'radio' && item.options.length > 0) {
         item.options.forEach((n) => {
@@ -285,14 +280,14 @@ export default {
       }
       return _val || row[item.columnName]
     },
-    handleSearch(val) {
+    handleSearch (val) {
       console.log('searchhh--', val)
       this.currentPage = 1
       this.conditions = val
       this.getTableData()
     },
     // 下载文件
-    download(data, fileName) {
+    download (data, fileName) {
       console.log('data', data)
       if (!data) {
         return
@@ -316,7 +311,7 @@ export default {
         window.URL.revokeObjectURL(url)
       }
     },
-    async handleExport() {
+    async handleExport () {
       this.exportBtn = true
       this.exportBtnTitle = '正在导出...'
       let params = {
@@ -333,7 +328,7 @@ export default {
         responseType: 'blob'
       })
         .then(res => {
-          
+
           console.log('resllll', res)
           let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
           console.log('filename', fileName)
@@ -352,8 +347,8 @@ export default {
           console.log('获取导出情失败', err)
           this.$message.error('获取导出失败')
         })
-        this.exportBtnTitle = '导出'
-        this.exportBtn = false
+      this.exportBtnTitle = '导出'
+      this.exportBtn = false
     },
     // 上传大图标成功
     handleExcelSuccess (res, file) {
@@ -365,7 +360,7 @@ export default {
         this.$message.error(res.msg)
       }
     },
-    handleProgress(event, file, fileList) {
+    handleProgress (event, file, fileList) {
       console.log('percentage', file.percentage)
     },
 
@@ -375,16 +370,16 @@ export default {
       const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
       const fileType = isType || isTypeComputer
       const isLt1M = (file.size / 1024 / 1024) < 10
-      if(!fileType) {
-          this.$message.error('上传文件只能是xls/xlsx格式！')
+      if (!fileType) {
+        this.$message.error('上传文件只能是xls/xlsx格式！')
       }
-      
+
       if (!isLt1M) {
         this.$message.error('上传文件大小不能超过 10MB!')
       }
       return fileType && isLt1M
     },
-    async uploadHttpRequest(file) {
+    async uploadHttpRequest (file) {
       this.importLoading = true
       this.importBtnTitle = '正在上传中...'
       const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
@@ -395,53 +390,53 @@ export default {
         data: formData,
         responseType: 'blob'
       })
-      .then((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.getTableData()
-      })
-      .catch( err => {
+        .then((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.getTableData()
+        })
+        .catch(err => {
           console.log('失败', err)
           file.onError() //上传失败的文件会从文件列表中删除
           this.$message.error('导入失败')
-      })
+        })
       this.importLoading = false
       this.importBtnTitle = '导入人员数据'
       this.$refs.upload.clearFiles()
     },
-    handleClick(tab, event) {
+    handleClick (tab, event) {
       console.log(tab, event)
     },
-    async handleLook(row) {
+    async handleLook (row) {
       this.disabled = true
       this.editAgencyId = row.ORG_ID
       await this.getFormList('edit')
       this.getrowInfo(row.icResiUserId)
     },
-    async handleEdit(row) {
+    async handleEdit (row) {
       this.disabled = false
       this.editAgencyId = row.ORG_ID
       await this.getFormList('edit')
       await this.getrowInfo(row.icResiUserId)
     },
-    async handleAdd() {
+    async handleAdd () {
       await this.getFormList()
       this.dialogVisible = true
     },
-    async handleChangeGroup(val) {
+    async handleChangeGroup (val) {
       console.log('changeguoprrrrr----', val)
       let { childGroup, value } = val
       let hasT = false
@@ -471,7 +466,7 @@ export default {
         if (hasT) this.tabsList.splice(i, 1)
       }
     },
-    formetForm() {
+    formetForm () {
       const _baseForm = this.$refs.baseForm.handleForm()
       let arr = []
       if (_baseForm.length === 0) return false
@@ -527,15 +522,15 @@ export default {
       console.log('finalArr', finalArr)
       return finalArr
     },
-    async handleEditSUbmit() {
+    async handleEditSUbmit () {
       const arr = await this.formetForm()
       if (arr) this.submitEdit(arr)
     },
-    async handleSUbmit() {
+    async handleSUbmit () {
       const arr = await this.formetForm()
       if (arr) this.submitAdd(arr)
     },
-    handleDel(row) {
+    handleDel (row) {
       let params = {
         formCode: 'resi_base_info',
         icResiUserId: row.icResiUserId
@@ -558,24 +553,24 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    handleFormatUrl(url) {
+    handleFormatUrl (url) {
       return url.includes('?')
     },
-    handlerEditCancle() {
+    handlerEditCancle () {
       this.$refs.baseForm.resetForm()
       this.tabsList.forEach((item) => {
         this.$refs['group' + item.groupId][0].resetForm()
       })
       this.dialogEditVisible = false
     },
-    handlerCancle() {
+    handlerCancle () {
       this.$refs.baseForm.resetForm()
       this.tabsList.forEach((item) => {
         this.$refs['group' + item.groupId][0].resetForm()
       })
       this.dialogVisible = false
     },
-    async submitAdd(arr) {
+    async submitAdd (arr) {
       this.btnLoading = true
       await this.$http
         .post('/epmetuser/icresiuser/add', arr)
@@ -598,13 +593,13 @@ export default {
         })
       this.btnLoading = false
     },
-    async submitEdit(arr) {
+    async submitEdit (arr) {
       this.btnLoading = true
       await this.$http
         .post('/epmetuser/icresiuser/edit', arr)
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            
+
             return this.$message.error(res.msg)
           } else {
             this.$message.success('提交成功')
@@ -622,7 +617,7 @@ export default {
         })
       this.btnLoading = false
     },
-    getTableHeader() {
+    getTableHeader () {
       this.$http
         .post('/oper/customize/icform/tableheaders', {
           formCode: 'resi_base_info'
@@ -638,7 +633,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    async getTableData() {
+    async getTableData () {
       this.tableLoading = true
       let params = {
         formCode: 'resi_base_info',
@@ -661,7 +656,7 @@ export default {
         })
       this.tableLoading = false
     },
-    getrowInfo(id) {
+    getrowInfo (id) {
       let params = {
         formCode: 'resi_base_info',
         icResiUserId: id
@@ -737,7 +732,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    async getOptionsList(url) {
+    async getOptionsList (url) {
       let options = []
       // console.log('getOptionsList----', url)
       await this.$http
@@ -754,7 +749,7 @@ export default {
         })
       return options
     },
-    getSearchList() {
+    getSearchList () {
       this.$http
         .post('/oper/customize/icform/conditionlist', {
           formCode: 'resi_base_info',
@@ -780,13 +775,13 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getTreeData(data){
+    getTreeData (data) {
       if (!Array.isArray(data)) return []
       let arr = data.map(item => {
         let _item = {}
         if (item.children) {
           if (item.children.length === 0) _item = { ...item, children: undefined }
-          else _item = { ...item, children: this.getTreeData(item.children)}
+          else _item = { ...item, children: this.getTreeData(item.children) }
         } else {
           _item = { ...item }
         }
@@ -794,7 +789,7 @@ export default {
       })
       return arr
     },
-    async getFormList(type) {
+    async getFormList (type) {
       await this.$http
         .post('/oper/customize/icform/getcustomerform', {
           formCode: 'resi_base_info',
@@ -867,12 +862,12 @@ export default {
     // height: 12px;
     color: rgba(30, 122, 254, 1);
     line-height: 20px;
-    background: rgba(30, 122, 254, .2);
+    background: rgba(30, 122, 254, 0.2);
     // border-radius: 50%;
   }
   ::v-deep .el-tabs__item.is-active {
     color: #fff;
-    background: linear-gradient(90deg, #1A5AFD, #26C4FF);
+    background: linear-gradient(90deg, #1a5afd, #26c4ff);
   }
 }
 .resi-container .resi-card-table {