From 705036a303a19e1767b2b693a1e4ad4d1e441d77 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Mon, 25 Apr 2022 18:47:25 +0800
Subject: [PATCH 01/17] =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                                    | 2 +-
 src/views/modules/visual/plugin/power/organization.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 51d5f0763..4052ea1b3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -225,7 +225,7 @@ router.beforeEach((to, from, next) => {
   window.SITE_CONFIG["menuShujuList"] = [
     {
       url: "/visual/plugin/power/organization",
-      name: "组织架构",
+      name: "动力主轴",
       id: "5feawfwaefwa577",
     },
     {
diff --git a/src/views/modules/visual/plugin/power/organization.vue b/src/views/modules/visual/plugin/power/organization.vue
index a12788fb9..62fdfc1ff 100644
--- a/src/views/modules/visual/plugin/power/organization.vue
+++ b/src/views/modules/visual/plugin/power/organization.vue
@@ -4,12 +4,12 @@
       <!-- <div class="card-title">
         <img class="title-icon" src="../../../../../assets/img/shuju/title-tip.png" />
         <div class="title-label">
-          组织架构
+          动力主轴
         </div>
       </div> -->
       <div class="title">
         <img src="../../../../../assets/img/shuju/title-tip.png" />
-        <span>组织架构</span>
+        <span>动力主轴</span>
         <div class="second-select cascader">
           <el-cascader  class="customer_cascader"
                         ref="myCascader"

From 4419da407a271f6095457c68a6a4bc4e02655576 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 26 Apr 2022 17:16:39 +0800
Subject: [PATCH 02/17] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/checkBox.vue  |  77 +++++
 src/views/components/dragItem.vue  |  94 ++++++
 src/views/modules/base/diyInfo.vue | 455 +++++++++++++++++++++++++++++
 src/views/modules/base/resi.vue    |  30 +-
 4 files changed, 654 insertions(+), 2 deletions(-)
 create mode 100644 src/views/components/checkBox.vue
 create mode 100644 src/views/components/dragItem.vue
 create mode 100644 src/views/modules/base/diyInfo.vue

diff --git a/src/views/components/checkBox.vue b/src/views/components/checkBox.vue
new file mode 100644
index 000000000..bfd326ca4
--- /dev/null
+++ b/src/views/components/checkBox.vue
@@ -0,0 +1,77 @@
+<template>
+  <div>
+    <el-checkbox 
+      :indeterminate="isIndeterminate" 
+      v-model="checkAll" 
+      @change="handleCheckAllChange">全选</el-checkbox>
+    <div style="margin: 15px 0;"></div>
+    <el-checkbox-group v-model="checkedList" @change="handleChange">
+      <div v-for="n in boxList" :key="n.itemId" class="mb10">
+        <el-checkbox :label="n.itemId">{{n.label}}</el-checkbox>
+      </div>
+    </el-checkbox-group>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'checkBox',
+  model: {
+    prop: 'value',
+    event: 'change'
+  },
+  props: {
+    value: {
+      type: Array,
+      default: () => []
+    },
+    list: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      boxList: [],
+      checkAll: false,
+      checkedList: [],
+      isIndeterminate: true,
+      pid: '',
+    }
+  },
+  created() {
+    this.boxList = this.list.filter(item => item.itemType != 'inputRange')
+    this.pid = this.list[0].itemGroupId
+  },
+  methods: {
+    handleCheckAllChange(val) {
+
+      this.checkedList = val ? this.boxList.map(item => item.itemId) : [];
+      this.isIndeterminate = false;
+      
+      this.$emit('change', { list: this.filterArr(this.checkedList), pid: this.pid })
+    },
+    handleChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.list.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.boxList.length;
+      this.$emit('change', { list: this.filterArr(this.checkedList), pid: this.pid })
+    },
+    filterArr(arr) {
+      let list = []
+      arr.forEach(item => {
+        this.boxList.forEach(n => {
+          if (item === n.itemId) list.push(n)
+        })
+      })
+      return list
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.mb10 {
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/components/dragItem.vue b/src/views/components/dragItem.vue
new file mode 100644
index 000000000..c9268ac94
--- /dev/null
+++ b/src/views/components/dragItem.vue
@@ -0,0 +1,94 @@
+<template>
+  <div class="right-wr scroll-h" :id="'wrItems' + id">
+    <div v-for="(n, i) in list" :key="n.itemId" class="right-item">
+      <div class="item-label">{{ n.label }}</div>
+      <div class="item-btn">
+        <el-tag type="danger" class="mr10" @click="handleDelItem(n, i)">
+          <i class="el-icon-delete"></i>
+        </el-tag>
+        <el-tag type="primary">
+          <i class="el-icon-rank"></i>
+        </el-tag>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Sortable from 'sortablejs'
+export default {
+  name: 'DragItems',
+  props: {
+    list: {
+      type: Array,
+      default: () => []
+    },
+    id: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      dragList: []
+    }
+  },
+  mounted() {
+    
+    // this.dragSort()
+  },
+  watch: {
+    list: {
+      handler(val) {
+        this.dragList = val.filter(item => item.itemType != 'inputRange')
+      },
+      deep: true
+    }
+  },
+  methods: {
+    handleDelItem(item, i) {
+      this.$emit('del', { item, index: i})
+    },
+    dragSort () {
+      const el = document.getElementById(`wrItems${this.id}`)
+      this.sortTable = Sortable.create(el, {
+        group: 'right-item',
+        ghostClass: 'sortable-ghost', // Class name for the drop placeholder,
+        chosenClass: 'sortable-choose',
+        animation: 500,
+        delay: 0,
+        onEnd: evt => {
+          console.log('evt----', evt)
+          const targetRow = this.list.splice(evt.oldIndex, 1)[0]
+          this.list.splice(evt.newIndex, 0, targetRow)
+          this.$emit('drag', this.list)
+        }
+      })
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.right-wr {
+  max-height: calc(80vh - 270px);
+  overflow: auto;
+  .right-item {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    cursor: pointer;
+    padding: 10px 30px;
+    
+  }
+}
+.sortable-choose {
+  background: #eee;
+}
+.mr10 {
+  margin-right: 10px;
+}
+.mb10 {
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue
new file mode 100644
index 000000000..7f3e86bcc
--- /dev/null
+++ b/src/views/modules/base/diyInfo.vue
@@ -0,0 +1,455 @@
+<template>
+  <div class="diy-container">
+    <el-tabs v-model="activeName">
+      <el-tab-pane label="自定义模板" name="first">
+        <div class="diy-wr">
+          <div class="left">
+            <el-tabs tab-position="left" class="left-h">
+              <el-tab-pane v-for="item in list" :key="item.itemGroupId" :label="item.groupName">
+                <div class="pd10 dialog-h-content scroll-h">
+                  <checkBox :ref="'checkbox' + item.itemGroupId" 
+                  :list="item.queryItemList" @change="handleChangeBox" />
+                </div>
+              </el-tab-pane>
+              
+            </el-tabs>
+          </div>
+          <div class="right">
+            <div class="right-header">
+              <div class="title">导出信息</div>
+              <el-button plain @click="handlePreview('')">预览</el-button>
+            </div>
+            <div>
+              <el-collapse v-model="activeCollapse" id="collapsWr">
+                <el-collapse-item v-for="item in rightList" :key="item.itemGroupId" 
+                :title="item.groupName" :name="item.itemGroupId" class="col-h">
+                  <dragItem :ref="'drag' + item.itemGroupId" :list="item.queryItemList" :id="item.itemGroupId"
+                  @del="handleDelItem"
+                  @drag="handleDrag($event, item)"></dragItem>
+                </el-collapse-item>
+              </el-collapse>
+            </div>
+          </div>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="模板列表" name="second">
+        <el-table
+          :data="tableData"
+          height="calc(80vh - 140px)"
+          style="width: 100%">
+          <el-table-column
+            type="index"
+            label="序号"
+            align="center"
+            width="50">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="模板名称"
+            align="center"
+            min-width="180">
+          </el-table-column>
+          <el-table-column
+            prop="createdBy"
+            align="center"
+            label="创建者"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="createdTime"
+            label="创建时间"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="操作"
+            width="160">
+            <template slot-scope="scope">
+              <el-button v-if="scope.row.isSelf" type="text" size="small" class="div-table-button--delete"
+                @click="handleDeltemplate(scope.row.id)">删除</el-button>
+              <el-button type="text" size="small" class="div-table-button--detail" 
+              @click="handlePreview(scope.row.id)">预览</el-button>
+              <el-button 
+                         type="text"
+                         size="small"
+                         class="div-table-button--edit" @click="handleExportTemplate(scope.row.id)">导出</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+    <div v-if="activeName == 'first'" class="diy-footer">
+      <div class="left">
+        <div class="flex-div">
+          <div>模板名称：</div>
+          <el-input v-model="form.name" class="wd200 mr10" />
+          <el-checkbox v-model="form.isSaveTemp">保存为常用模板</el-checkbox>
+        </div>
+      </div>
+      <el-button class="diy-button--delete" @click="handleExport">导出</el-button>
+    </div>
+    <el-dialog :visible.sync="diyDialog"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               width="1150px"
+               append-to-body
+               top="5vh"
+               class="dialog-h"
+               @close="handleClose"
+               >
+       <div style="padding: 20px;">
+         <el-table
+          :data="tableData"
+          height="calc(80vh - 140px)"
+          style="width: 100%">
+          <el-table-column
+            v-for="(item, index) in previewList"
+            :label="item.label"
+            :key="index"
+            align="center"
+            min-width="120">
+            <el-table-column
+              v-for="(n, i) in item.children"
+              :label="n.label"
+              :key="i"
+              align="center"
+              min-width="120">
+              
+            </el-table-column>
+          </el-table-column>
+          
+        </el-table>
+       </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import checkBox from '../../components/checkBox.vue'
+import dragItem from '../../components/dragItem.vue'
+import Sortable from 'sortablejs'
+export default {
+  props: {
+    list: {
+      type: Array,
+      default: () => []
+    },
+    search: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  components: {
+    checkBox,
+    dragItem
+  },
+  data() {
+    return {
+      activeCollapse: ['1'],
+      activeName: 'first',
+      info: {},
+      rightList: [],
+      form: {
+        isSaveTemp: false,
+        name: '',
+        itemList: []
+      },
+      tableData: [],
+      previewList: [],
+      diyDialog: false,
+    }
+  },
+  created() {
+    this.list.forEach(item => {
+      this.$set(this.info, item.itemGroupId, [])
+    })
+    this.getTemplateList()
+  },
+  watch: {
+    rightList: {
+      handler(val) {
+        if (val.length > 0) this.dragSort()
+        
+      },
+      deep: true
+    }
+  },
+  methods: {
+    handleChangeBox({list, pid}) {
+      console.log('ccccc----', list)
+      // if (list.length == 0) return
+      let obj = {}
+      this.list.forEach(item =>{
+        if (item.itemGroupId == pid) obj = { ...item, queryItemList: [...list] }
+      })
+      const groups = this.rightList.map(item => item.itemGroupId)
+      if (groups.includes(pid)) {
+        this.rightList.forEach((item, i) => {
+          if (item.itemGroupId == pid ) {
+            item.queryItemList = [...list]
+            if (list.length == 0) this.rightList.splice(i, 1)
+          }
+        })
+      } else {
+        this.rightList.push(obj)
+        
+        this.$nextTick(() => {
+          console.log('itemttt------', this.$refs[`drag${pid}`])
+          this.$refs[`drag${pid}`][0].dragSort()
+        })
+      }
+      this.activeCollapse = [...this.activeCollapse, pid]
+    },
+    handleDelItem(val) {
+      const { item, index } = val
+      console.log('item------', item, this.$refs[`checkbox${item.itemGroupId}`])
+      const checkList = this.$refs[`checkbox${item.itemGroupId}`][0].checkedList
+      checkList.forEach((n, i) => {
+        if (n == item.itemId) this.$refs[`checkbox${item.itemGroupId}`][0].checkedList.splice(i, 1)
+      })
+      this.rightList.forEach((n, i) => {
+        if (n.itemGroupId === item.itemGroupId) {
+          n.queryItemList.splice(index, 1)
+          if (n.queryItemList.length === 0) this.rightList.splice(i, 1)
+        }
+      })
+
+    },
+    dragSort() {
+      const el = document.getElementById('collapsWr')
+      this.sortTable = Sortable.create(el, {
+        group: 'el-collapse-item',
+        ghostClass: 'sortable-ghost', // Class name for the drop placeholder,
+        animation: 500,
+        delay: 0,
+        onEnd: evt => {
+          console.log('evt----', evt)
+          const targetRow = this.rightList.splice(evt.oldIndex, 1)[0]
+          this.rightList.splice(evt.newIndex, 0, targetRow)
+        }
+      })
+    },
+    handleDrag(val, item) {
+      console.log('drag-----', val)
+      console.log('drag-----', item)
+      this.rightList.forEach((n, i) => {
+        if (item.itemGroupId == n.itemGroupId) n.queryItemList = [...val]
+      })
+    },
+    handleClose() {
+      this.previewList = []
+      this.diyDialog = false
+    },
+    handleDeltemplate(id) {
+      this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.delTemplate(id)
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          });          
+        })
+    },
+    handlePreview(id) {
+      if (id) this.getPreview(id)
+      else this.previewList = this.rightList.map(item => {
+        return {
+          label: item.groupName,
+          children: item.queryItemList
+        }
+      })
+      this.diyDialog = true
+    },
+    handleExport() {
+      if (this.rightList.length === 0) return this.$message.error('请选择导出信息')
+      if (this.form.isSaveTemp && !this.form.name) return this.$message.error('请输入模板名称')
+      this.exportTemplate()
+
+    },
+    handleExportTemplate(id) {
+      this.exportTemplate(id)
+    },
+    async exportTemplate(id) {
+      let url = "/epmetuser/icresiuser/exportExcelCustom"
+
+      let params = {
+        templateId: id || '',
+        searchForm: {...this.search},
+        exportConfig: {
+          ...this.form,
+          formCode: 'resi_base_info',
+          itemList: this.rightList.map(item => {
+            return {
+              itemId: item.itemGroupId,
+              label: item.groupName,
+              tableName: item.queryItemList[0].tableName,
+              children: item.queryItemList,
+              supportAdd: item.itemGroupId == '20220422102809_117' ? true : false
+            }
+          })
+        }
+      }
+      await this.$http({
+        method: 'POST',
+        url,
+        responseType: 'blob',
+        data: params
+      })
+        .then(res => {
+          console.log('res----dddd', res)
+          // this.download(res.data, title + '.xls')
+          this.getTemplateList()
+          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.$message.success('导出成功')
+            this.$emit('close')
+          } else this.$message.error('下载失败')
+        })
+        .catch(err => {
+          console.log('err', err)
+          return this.$message.error('网络错误')
+        })
+    },
+    async getTemplateList () {
+      let params = {
+        formCode: 'resi_base_info'
+      }
+      await this.$http
+        .post('/oper/customize/icExportTemplate/templateList', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.tableData = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    async getPreview (id) {
+      let params = {
+        id: id || ''
+      }
+      await this.$http
+        .post('/oper/customize/icExportTemplate/templateDetail', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.previewList = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    async delTemplate(id) {
+      let params = [id]
+      await this.$http
+        .post('/oper/customize/icExportTemplate/delete', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.$message({
+              type: 'success',
+              message: '删除成功!'
+            });
+            this.getTemplateList()
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.diy-container {
+  padding: 20px 20px 0 20px;
+}
+.diy-wr {
+  display: flex;
+  width: 100%;
+  height: calc(80vh - 120px);
+  .left {
+    width: 49%;
+  }
+  .right {
+    flex-shrink: 0;
+    width: 50%;
+    height: 100%;
+    box-sizing: border-box;
+    margin-left: 20px;
+    padding: 0 20px;
+    border-left: 1px solid #eee;
+    .right-header {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding-bottom: 10px;
+      // border-bottom: 1px solid #eee;
+      .title {
+        font-weight: 500;
+      }
+    }
+  }
+}
+.diy-footer {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-top: 10px;
+}
+.left-h {
+
+  ::v-deep .el-tabs__header.is-left,
+  ::v-deep .el-tabs__nav-wrap.is-left::after {
+    height: calc(80vh - 120px);
+  }
+}
+.flex-div {
+  display: flex;
+  align-items: center;
+}
+// #collapsWr {
+//   .col-h {
+//     ::v-deep .el-collapse-item__wrap {
+//       max-height: calc(80vh - 220px);
+//       // overflow: auto;
+//     }
+    
+//   }
+// }
+.mb10 {
+  margin-bottom: 10px;
+}
+.pd10 {
+  padding: 10px;
+}
+.mr10 {
+  margin-right: 10px;
+}
+.wd200 {
+  width: 200px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 5ffed18ab..2e6f90fec 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -63,6 +63,10 @@
                    class="diy-button--reset"
                    :loading="exportBtn"
                    @click="handleExport">{{exportBtnTitle}}</el-button>
+        <el-button
+                     class="diy-button--add"
+                     size="small"
+                     @click="diyExport">自定义导出</el-button>
         <el-button
                      class="diy-button--add"
                      size="small"
@@ -288,6 +292,20 @@
                @closed="diaClose">
       <resi-change-record ref="ref_changerecord"></resi-change-record>
     </el-dialog>
+    <el-dialog :visible.sync="diyDialog"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               width="1150px"
+               top="5vh"
+               class="dialog-h"
+               >
+      <diy-info v-if="diyDialog" ref="ref_diy" :list="searchList" :search="{
+        formCode: 'resi_base_info',
+        pageNo: currentPage,
+        pageSize: pageSize,
+        conditions: conditions
+      }" @close="handleDiyClose"></diy-info>
+    </el-dialog>
     <people-more v-if="showedPeopleMoreInfo && lookInfo.userId"
                  :userId="lookInfo.userId"
                  :gridName="lookInfo.gridName"
@@ -306,7 +324,7 @@ import { mapGetters } from 'vuex'
 import resiTransfer from '../../components/resiTransfer.vue'
 import resiChangeRecord from '../../components/resiChangeRecord.vue'
 import peopleMore from "@/views/modules/shequ/cpts/people-more";
-import { listen } from 'ol/events'
+import diyInfo from './diyInfo.vue'
 
 export default {
   components: {
@@ -315,11 +333,13 @@ export default {
     editResi,
     resiTransfer,
     resiChangeRecord,
-    peopleMore
+    peopleMore,
+    diyInfo
   },
   data () {
     return {
       activeNames: [],
+      diyDialog: false,
       openSearch: false,
       exportBtn: false,
       exportBtnTitle: '导出',
@@ -452,11 +472,17 @@ export default {
       this.tranferShow = false
       this.getTableData()
     },
+    handleDiyClose() {
+      this.diyDialog = false
+    },
     handleOpenSearch() {
       if (!this.openSearch) this.activeNames = [this.searchList[0].itemGroupId]
       this.openSearch = !this.openSearch
       
     },
+    diyExport() {
+      this.diyDialog = true
+    },
     computedWidth (label, type) {
       
       let wd = ''

From d09bac27fa9592ed3b8c83df5ab1d6872ffbdd11 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 26 Apr 2022 17:20:48 +0800
Subject: [PATCH 03/17] dd

---
 src/views/modules/base/diyInfo.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue
index 7f3e86bcc..2d103fba8 100644
--- a/src/views/modules/base/diyInfo.vue
+++ b/src/views/modules/base/diyInfo.vue
@@ -257,12 +257,15 @@ export default {
     },
     handlePreview(id) {
       if (id) this.getPreview(id)
-      else this.previewList = this.rightList.map(item => {
+      else {
+        if (this.rightList.length == 0) return this.$message.error('请选择导出信息')
+        this.previewList = this.rightList.map(item => {
         return {
           label: item.groupName,
           children: item.queryItemList
         }
       })
+      }
       this.diyDialog = true
     },
     handleExport() {

From fc966fba14564edf84bbd80660804150ddcc1dfa Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 26 Apr 2022 17:29:03 +0800
Subject: [PATCH 04/17] ss

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dbb18e32c..3def21d39 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "@riophae/vue-treeselect": "^0.4.0",
-    "@tinymce/tinymce-vue": "^4.0.4",
+    "@tinymce/tinymce-vue": "^3.2.8",
     "axios": "^0.19.0",
     "babel-eslint": "^8.0.1",
     "babel-plugin-component": "^1.1.1",

From 38c71b81a9d4fc6ed8f3e133dee25687c119011f Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 27 Apr 2022 10:11:40 +0800
Subject: [PATCH 05/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/checkBox.vue  |  1 +
 src/views/modules/base/diyInfo.vue | 39 ++++++++++++------------
 src/views/modules/base/resi.vue    | 49 ++++++++++++++++++++++++++++--
 3 files changed, 67 insertions(+), 22 deletions(-)

diff --git a/src/views/components/checkBox.vue b/src/views/components/checkBox.vue
index bfd326ca4..4bab4aea7 100644
--- a/src/views/components/checkBox.vue
+++ b/src/views/components/checkBox.vue
@@ -41,6 +41,7 @@ export default {
   },
   created() {
     this.boxList = this.list.filter(item => item.itemType != 'inputRange')
+    console.log('cehck-bo----', this.list)
     this.pid = this.list[0].itemGroupId
   },
   methods: {
diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue
index 2d103fba8..b93a49398 100644
--- a/src/views/modules/base/diyInfo.vue
+++ b/src/views/modules/base/diyInfo.vue
@@ -1,13 +1,13 @@
 <template>
-  <div class="diy-container">
+  <div v-if="list.length > 0" class="diy-container">
     <el-tabs v-model="activeName">
       <el-tab-pane label="自定义模板" name="first">
         <div class="diy-wr">
           <div class="left">
             <el-tabs tab-position="left" class="left-h">
-              <el-tab-pane v-for="item in list" :key="item.itemGroupId" :label="item.groupName">
+              <el-tab-pane v-for="item in list" :key="item.id" :label="item.label">
                 <div class="pd10 dialog-h-content scroll-h">
-                  <checkBox :ref="'checkbox' + item.itemGroupId" 
+                  <checkBox v-if="item.queryItemList" :ref="'checkbox' + item.id" 
                   :list="item.queryItemList" @change="handleChangeBox" />
                 </div>
               </el-tab-pane>
@@ -21,9 +21,9 @@
             </div>
             <div>
               <el-collapse v-model="activeCollapse" id="collapsWr">
-                <el-collapse-item v-for="item in rightList" :key="item.itemGroupId" 
-                :title="item.groupName" :name="item.itemGroupId" class="col-h">
-                  <dragItem :ref="'drag' + item.itemGroupId" :list="item.queryItemList" :id="item.itemGroupId"
+                <el-collapse-item v-for="item in rightList" :key="item.id" 
+                :title="item.label" :name="item.id" class="col-h">
+                  <dragItem :ref="'drag' + item.id" :list="item.queryItemList" :id="item.id"
                   @del="handleDelItem"
                   @drag="handleDrag($event, item)"></dragItem>
                 </el-collapse-item>
@@ -162,8 +162,9 @@ export default {
   },
   created() {
     this.list.forEach(item => {
-      this.$set(this.info, item.itemGroupId, [])
+      this.$set(this.info, item.id, [])
     })
+    console.log('infodiy----', this.list)
     this.getTemplateList()
   },
   watch: {
@@ -181,12 +182,12 @@ export default {
       // if (list.length == 0) return
       let obj = {}
       this.list.forEach(item =>{
-        if (item.itemGroupId == pid) obj = { ...item, queryItemList: [...list] }
+        if (item.id == pid) obj = { ...item, queryItemList: [...list] }
       })
-      const groups = this.rightList.map(item => item.itemGroupId)
+      const groups = this.rightList.map(item => item.id)
       if (groups.includes(pid)) {
         this.rightList.forEach((item, i) => {
-          if (item.itemGroupId == pid ) {
+          if (item.id == pid ) {
             item.queryItemList = [...list]
             if (list.length == 0) this.rightList.splice(i, 1)
           }
@@ -203,13 +204,13 @@ export default {
     },
     handleDelItem(val) {
       const { item, index } = val
-      console.log('item------', item, this.$refs[`checkbox${item.itemGroupId}`])
-      const checkList = this.$refs[`checkbox${item.itemGroupId}`][0].checkedList
+      console.log('item------', item, this.$refs[`checkbox${item.id}`])
+      const checkList = this.$refs[`checkbox${item.id}`][0].checkedList
       checkList.forEach((n, i) => {
-        if (n == item.itemId) this.$refs[`checkbox${item.itemGroupId}`][0].checkedList.splice(i, 1)
+        if (n == item.itemId) this.$refs[`checkbox${item.id}`][0].checkedList.splice(i, 1)
       })
       this.rightList.forEach((n, i) => {
-        if (n.itemGroupId === item.itemGroupId) {
+        if (n.id === item.id) {
           n.queryItemList.splice(index, 1)
           if (n.queryItemList.length === 0) this.rightList.splice(i, 1)
         }
@@ -234,7 +235,7 @@ export default {
       console.log('drag-----', val)
       console.log('drag-----', item)
       this.rightList.forEach((n, i) => {
-        if (item.itemGroupId == n.itemGroupId) n.queryItemList = [...val]
+        if (item.id == n.id) n.queryItemList = [...val]
       })
     },
     handleClose() {
@@ -261,7 +262,7 @@ export default {
         if (this.rightList.length == 0) return this.$message.error('请选择导出信息')
         this.previewList = this.rightList.map(item => {
         return {
-          label: item.groupName,
+          label: item.label,
           children: item.queryItemList
         }
       })
@@ -288,11 +289,11 @@ export default {
           formCode: 'resi_base_info',
           itemList: this.rightList.map(item => {
             return {
-              itemId: item.itemGroupId,
-              label: item.groupName,
+              itemId: item.id,
+              label: item.label,
               tableName: item.queryItemList[0].tableName,
               children: item.queryItemList,
-              supportAdd: item.itemGroupId == '20220422102809_117' ? true : false
+              supportAdd: item.supportAdd
             }
           })
         }
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 2e6f90fec..391035b10 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -299,7 +299,7 @@
                top="5vh"
                class="dialog-h"
                >
-      <diy-info v-if="diyDialog" ref="ref_diy" :list="searchList" :search="{
+      <diy-info v-if="diyDialog" ref="ref_diy" :list="exportList" :search="{
         formCode: 'resi_base_info',
         pageNo: currentPage,
         pageSize: pageSize,
@@ -325,6 +325,7 @@ import resiTransfer from '../../components/resiTransfer.vue'
 import resiChangeRecord from '../../components/resiChangeRecord.vue'
 import peopleMore from "@/views/modules/shequ/cpts/people-more";
 import diyInfo from './diyInfo.vue'
+import { requestPost } from "@/js/dai/request";
 
 export default {
   components: {
@@ -366,6 +367,7 @@ export default {
       activeName: '',
       tableData: [],
       searchList: [],
+      exportList: [],
       editAgencyId: '',
       editForm: {
         GRID_ID: '',
@@ -480,8 +482,10 @@ export default {
       this.openSearch = !this.openSearch
       
     },
-    diyExport() {
-      this.diyDialog = true
+    async diyExport() {
+      await this.getExportList()
+      
+      
     },
     computedWidth (label, type) {
       
@@ -1244,6 +1248,45 @@ export default {
           return this.$message.error('网络错误')
         })
     },
+    async getExportList (type) {
+      const url = '/oper/customize//icformitemgroup/list'
+      let params = {
+        formCode: 'resi_base_info'
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+
+        data.forEach(item => {
+          (async (id) => {
+            item.queryItemList = await this.getExportChildList(id)
+          })(item.id)
+        })
+        this.exportList = [...data]
+        this.$nextTick(() => {
+          this.diyDialog = true
+        })
+        console.log('获取详情成功getExportList----', this.exportList)
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    async getExportChildList (groupId) {
+      const url = `/oper/customize/icformitem/getItemList/${groupId}`
+      let params = {}
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+
+        return data
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
     async deleteresiBatch () {
       if (this.selection.length === 0) return this.$message.error('请选择之后进行操作')
       let userIds = this.selection.map(item => item.icResiUserId)

From 39014f356a3019c4434060c2e957ab6a251d50cd Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 27 Apr 2022 11:18:06 +0800
Subject: [PATCH 06/17] =?UTF-8?q?=E4=BA=BA=E6=88=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicinfo/houseStatic/houseStatic.vue     | 117 +++++++++---------
 .../visual/basicinfo/houseStatic/options.js   |   4 +-
 .../basicinfo/houseStatic/userOptions.js      |   6 +-
 3 files changed, 65 insertions(+), 62 deletions(-)

diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
index da717e6b4..ce085141a 100644
--- a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
+++ b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
@@ -17,7 +17,7 @@
         <img class="title-icon"
              src="@/assets/img/shuju/title-tip.png" />
         <div class="title-label">
-          人房概览统计
+          人房概览数据统计
 
         </div>
       </div>
@@ -116,70 +116,73 @@
 
         </div>
       </div>
-
-      <div class="card-left-title">下级人房概览数据统计</div>
-
-      <div v-if="subList.length>0"
-           class="card-table">
-        <div v-for="(item,index) in subList"
-             :key="index"
-             :class="['table_item',index%2 === 0?'item_dark':'']">
-          <div class="item_name"
-               @click="handleToSubAgency(item)">
-            <img src="@/assets/img/shuju/logo1.png" />
-            <span>{{item.orgName}}</span>
-          </div>
-
-          <div class="item_data">
-            <div class="item_left">
-              <div class="pie-table-total">
-                <div class="pie-table-total-count">{{item.houseTotal}}</div>
-                <div class="pie-table-title">房屋总数</div>
-              </div>
-              <div class="pie-table-line"></div>
-              <div class="pie-table-total ">
-                <div class="pie-table-total-count colorwhite">{{item.zzHouseTotal}}</div>
-                <div class="pie-table-title table-table-title">{{item.zzHouseRatio+'%'}}</div>
-                <div class="pie-table-title table-table-title">自住房屋数</div>
-              </div>
-              <div class="pie-table-total ">
-                <div class="pie-table-total-count colorwhite">{{item.czHouseTotal}}</div>
-                <div class="pie-table-title table-table-title">{{item.czHouseRatio+'%'}}</div>
-                <div class="pie-table-title table-table-title">出租房屋数</div>
-              </div>
-              <div class="pie-table-total ">
-                <div class="pie-table-total-count colorwhite">{{item.xzHouseTotal}}</div>
-                <div class="pie-table-title table-table-title">{{item.xzHouseRatio+'%'}}</div>
-                <div class="pie-table-title table-table-title">闲置房屋数</div>
-              </div>
+      <div v-if="orgType!=='village'">
+
+        <div class="card-left-title">下级人房概览数据统计</div>
+
+        <div v-if="subList.length>0"
+             class="card-table">
+          <div v-for="(item,index) in subList"
+               :key="index"
+               :class="['table_item',index%2 === 0?'item_dark':'']">
+            <div class="item_name"
+                 @click="handleToSubAgency(item)">
+              <img src="@/assets/img/shuju/logo1.png" />
+              <span>{{item.orgName}}</span>
             </div>
-            <div class="item_right">
-              <div class="pie-table-total">
-                <div class="pie-table-total-count">{{item.userTotal}}</div>
-                <div class="pie-table-title">居民总数</div>
-              </div>
-              <div class="pie-table-line"></div>
-              <div class="pie-table-total ">
-                <div class="pie-table-total-count colorwhite">{{item.czUserTotal}}</div>
-                <div class="pie-table-title table-table-title">{{item.czUserRatio+'%'}}</div>
-                <div class="pie-table-title table-table-title">常住人口数</div>
-              </div>
-              <div class="pie-table-total ">
-                <div class="pie-table-total-count colorwhite">{{item.ldUserTotal}}</div>
-                <div class="pie-table-title table-table-title">{{item.ldUserRatio+'%'}}</div>
-                <div class="pie-table-title table-table-title">流动人口数</div>
+
+            <div class="item_data">
+              <div class="item_left">
+                <div class="pie-table-total">
+                  <div class="pie-table-total-count">{{item.houseTotal}}</div>
+                  <div class="pie-table-title">房屋总数</div>
+                </div>
+                <div class="pie-table-line"></div>
+                <div class="pie-table-total ">
+                  <div class="pie-table-total-count colorwhite">{{item.zzHouseTotal}}</div>
+                  <div class="pie-table-title table-table-title">{{item.zzHouseRatio+'%'}}</div>
+                  <div class="pie-table-title table-table-title">自住房屋数</div>
+                </div>
+                <div class="pie-table-total ">
+                  <div class="pie-table-total-count colorwhite">{{item.czHouseTotal}}</div>
+                  <div class="pie-table-title table-table-title">{{item.czHouseRatio+'%'}}</div>
+                  <div class="pie-table-title table-table-title">出租房屋数</div>
+                </div>
+                <div class="pie-table-total ">
+                  <div class="pie-table-total-count colorwhite">{{item.xzHouseTotal}}</div>
+                  <div class="pie-table-title table-table-title">{{item.xzHouseRatio+'%'}}</div>
+                  <div class="pie-table-title table-table-title">闲置房屋数</div>
+                </div>
               </div>
+              <div class="item_right">
+                <div class="pie-table-total">
+                  <div class="pie-table-total-count">{{item.userTotal}}</div>
+                  <div class="pie-table-title">居民总数</div>
+                </div>
+                <div class="pie-table-line"></div>
+                <div class="pie-table-total ">
+                  <div class="pie-table-total-count colorwhite">{{item.czUserTotal}}</div>
+                  <div class="pie-table-title table-table-title">{{item.czUserRatio+'%'}}</div>
+                  <div class="pie-table-title table-table-title">常住人口数</div>
+                </div>
+                <div class="pie-table-total ">
+                  <div class="pie-table-total-count colorwhite">{{item.ldUserTotal}}</div>
+                  <div class="pie-table-title table-table-title">{{item.ldUserRatio+'%'}}</div>
+                  <div class="pie-table-title table-table-title">流动人口数</div>
+                </div>
 
+              </div>
             </div>
           </div>
         </div>
-      </div>
 
-      <div v-if="subList.length===0"
-           class="no-data">
+        <div v-if="subList.length===0"
+             class="no-data">
+
+          <img src="@/assets/img/modules/visual/noData.png"
+               class="no-data-img" />
 
-        <img src="@/assets/img/modules/visual/noData.png"
-             class="no-data-img" />
+        </div>
 
       </div>
 
diff --git a/src/views/modules/visual/basicinfo/houseStatic/options.js b/src/views/modules/visual/basicinfo/houseStatic/options.js
index 5b7e5f5e0..fec2c520b 100644
--- a/src/views/modules/visual/basicinfo/houseStatic/options.js
+++ b/src/views/modules/visual/basicinfo/houseStatic/options.js
@@ -1,10 +1,10 @@
 
 export function housePieOption (_charts) {
-  const center= ['50%', '150px']
+  const center= ['50%', '200px']
     return {
       title: {
         text: '0',
-        top: 120,
+        top: 170,
         left: 'center',
         textStyle: {
           width: '100%',
diff --git a/src/views/modules/visual/basicinfo/houseStatic/userOptions.js b/src/views/modules/visual/basicinfo/houseStatic/userOptions.js
index 54129ff2b..bd6bca771 100644
--- a/src/views/modules/visual/basicinfo/houseStatic/userOptions.js
+++ b/src/views/modules/visual/basicinfo/houseStatic/userOptions.js
@@ -1,10 +1,10 @@
 
 export function userPieOption (_charts) {
-  const center= ['50%', '150px']
+  const center= ['50%', '200px']
     return {
       title: {
         text: '0',
-        top: 120,
+        top: 170,
         left: 'center',
         textStyle: {
           width: '100%',
@@ -13,7 +13,7 @@ export function userPieOption (_charts) {
           fontWeight: 400
         },
         itemGap: 5,
-        subtext: '房屋总数',
+        subtext: '居民总数',
         subtextStyle: {
           fontSize: 20,
           color: '#fff',

From 93274d928a6bf3b4f720ad4bd6fbcf55846abeab Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 27 Apr 2022 13:39:45 +0800
Subject: [PATCH 07/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/diyInfo.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue
index b93a49398..c0f6586c9 100644
--- a/src/views/modules/base/diyInfo.vue
+++ b/src/views/modules/base/diyInfo.vue
@@ -204,13 +204,13 @@ export default {
     },
     handleDelItem(val) {
       const { item, index } = val
-      console.log('item------', item, this.$refs[`checkbox${item.id}`])
-      const checkList = this.$refs[`checkbox${item.id}`][0].checkedList
+      console.log('item------', item, this.$refs[`checkbox${item.itemGroupId}`])
+      const checkList = this.$refs[`checkbox${item.itemGroupId}`][0].checkedList
       checkList.forEach((n, i) => {
-        if (n == item.itemId) this.$refs[`checkbox${item.id}`][0].checkedList.splice(i, 1)
+        if (n == item.itemId) this.$refs[`checkbox${item.itemGroupId}`][0].checkedList.splice(i, 1)
       })
       this.rightList.forEach((n, i) => {
-        if (n.id === item.id) {
+        if (n.id === item.itemGroupId) {
           n.queryItemList.splice(index, 1)
           if (n.queryItemList.length === 0) this.rightList.splice(i, 1)
         }

From ec1827be3be767d4b9e214d1e83e0898996d89da Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 27 Apr 2022 13:58:27 +0800
Subject: [PATCH 08/17] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BAloading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/checkBox.vue  | 2 +-
 src/views/modules/base/diyInfo.vue | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/components/checkBox.vue b/src/views/components/checkBox.vue
index 4bab4aea7..1f2d19a2a 100644
--- a/src/views/components/checkBox.vue
+++ b/src/views/components/checkBox.vue
@@ -35,7 +35,7 @@ export default {
       boxList: [],
       checkAll: false,
       checkedList: [],
-      isIndeterminate: true,
+      isIndeterminate: false,
       pid: '',
     }
   },
diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue
index c0f6586c9..af53b5d31 100644
--- a/src/views/modules/base/diyInfo.vue
+++ b/src/views/modules/base/diyInfo.vue
@@ -87,7 +87,7 @@
           <el-checkbox v-model="form.isSaveTemp">保存为常用模板</el-checkbox>
         </div>
       </div>
-      <el-button class="diy-button--delete" @click="handleExport">导出</el-button>
+      <el-button class="diy-button--delete" :loading="exportLoading" @click="handleExport">导出</el-button>
     </div>
     <el-dialog :visible.sync="diyDialog"
                :close-on-click-modal="false"
@@ -146,6 +146,7 @@ export default {
   },
   data() {
     return {
+      exportLoading: false,
       activeCollapse: ['1'],
       activeName: 'first',
       info: {},
@@ -272,6 +273,7 @@ export default {
     handleExport() {
       if (this.rightList.length === 0) return this.$message.error('请选择导出信息')
       if (this.form.isSaveTemp && !this.form.name) return this.$message.error('请输入模板名称')
+      this.exportLoading = true
       this.exportTemplate()
 
     },
@@ -324,6 +326,7 @@ export default {
             this.$message.success('导出成功')
             this.$emit('close')
           } else this.$message.error('下载失败')
+          this.exportLoading = false
         })
         .catch(err => {
           console.log('err', err)

From 8bad3a59383ed22d74b42b7d1853cdf717a8ac78 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 27 Apr 2022 15:03:31 +0800
Subject: [PATCH 09/17] dd

---
 src/views/modules/base/diyInfo.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue
index af53b5d31..ec4a3eb3b 100644
--- a/src/views/modules/base/diyInfo.vue
+++ b/src/views/modules/base/diyInfo.vue
@@ -330,6 +330,7 @@ export default {
         })
         .catch(err => {
           console.log('err', err)
+          this.exportLoading = false
           return this.$message.error('网络错误')
         })
     },

From a9894b3c8d213190563aba1f6771c0cbc69ee160 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 27 Apr 2022 16:21:06 +0800
Subject: [PATCH 10/17] ss3

---
 .../base/epidemic/natFocus/natFocusList.vue   |   39 +-
 .../base/epidemic/veroFocus/veroFocusList.vue | 1265 +++++++++--------
 2 files changed, 705 insertions(+), 599 deletions(-)

diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
index c8215e63a..8d7fbc47f 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
@@ -670,21 +670,36 @@ export default {
       })
     },
 
-    handleEdit (row) {
-      this.editFormTitle = "修改核酸检测关注名单"
-      this.editFormShow = true
+    async handleEdit(row) {
+      this.editFormTitle = "修改核酸检测关注名单";
+      this.editFormShow = true;
 
-      this.$nextTick(() => {
-        this.$refs.ref_form_edit.initForm('edit', row)
-      })
+      let row2 = await this.getInfo(row);
+      this.$refs.ref_form_edit.initForm("edit", row2);
     },
 
-    handleDetail (row) {
-      this.editFormTitle = "查看核酸检测关注名单"
-      this.editFormShow = true
-      this.$nextTick(() => {
-        this.$refs.ref_form_edit.initForm('detail', row)
-      })
+    async handleDetail(row) {
+      this.editFormTitle = "查看核酸检测关注名单";
+      this.editFormShow = true;
+
+      let row2 = await this.getInfo(row);
+      this.$refs.ref_form_edit.initForm("detail", row2);
+    },
+
+    async getInfo(row) {
+      const url = "/epmetuser/icEpidemicSpecialAttention/detail";
+
+      let params = {
+        id: row.id,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        row.mobile = data.mobile;
+        row.idCard = data.idCard;
+      }
+      return row;
     },
 
     handleSendNotice () {
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
index 4c65d7c98..435382800 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
@@ -1,387 +1,491 @@
 <template>
   <div class="div_main">
     <div class="div_search">
-      <el-form :inline="true"
-               :model="formData"
-               ref="ref_searchform"
-               :label-width="'90px'">
+      <el-form
+        :inline="true"
+        :model="formData"
+        ref="ref_searchform"
+        :label-width="'90px'"
+      >
         <div>
-
-          <el-form-item label="姓名"
-                        prop="name">
-            <el-input v-model="formData.name"
-                      size="small"
-                      class="list_item_width_1"
-                      clearable
-                      placeholder="请输入姓名">
+          <el-form-item label="姓名" prop="name">
+            <el-input
+              v-model="formData.name"
+              size="small"
+              class="list_item_width_1"
+              clearable
+              placeholder="请输入姓名"
+            >
             </el-input>
-
           </el-form-item>
-          <el-form-item label="手机号"
-                        prop="mobile">
-            <el-input v-model="formData.mobile"
-                      size="small"
-                      class="list_item_width_1"
-                      clearable
-                      placeholder="请输入手机号">
+          <el-form-item label="手机号" prop="mobile">
+            <el-input
+              v-model="formData.mobile"
+              size="small"
+              class="list_item_width_1"
+              clearable
+              placeholder="请输入手机号"
+            >
             </el-input>
-
           </el-form-item>
 
-          <el-form-item label="身份证"
-                        prop="mobile">
-            <el-input v-model="formData.idCard"
-                      size="small"
-                      class="list_item_width_1"
-                      clearable
-                      placeholder="请输入身份证">
+          <el-form-item label="身份证" prop="mobile">
+            <el-input
+              v-model="formData.idCard"
+              size="small"
+              class="list_item_width_1"
+              clearable
+              placeholder="请输入身份证"
+            >
             </el-input>
-
           </el-form-item>
 
-          <el-form-item label="接种针次"
-                        prop="vaccinationCount">
-            <el-select class="list_item_width_1"
-                       v-model.trim="formData.vaccinationCount"
-                       placeholder="请选择"
-                       clearable>
-              <el-option v-for="item in veroNumList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
+          <el-form-item label="接种针次" prop="vaccinationCount">
+            <el-select
+              class="list_item_width_1"
+              v-model.trim="formData.vaccinationCount"
+              placeholder="请选择"
+              clearable
+            >
+              <el-option
+                v-for="item in veroNumList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
-
           </el-form-item>
-
         </div>
         <div>
           <el-form-item label="所属房屋">
             <div class="resi-cell-value">
               <div class="resi-cell-col">
                 <el-form-item prop="villageId">
-                  <el-select v-model.trim="formData.villageId"
-                             placeholder="小区"
-                             size="small"
-                             clearable
-                             class="resi-cell-select"
-                             @change="handleChangeV">
-                    <el-option v-for="item in optionsV"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value">
+                  <el-select
+                    v-model.trim="formData.villageId"
+                    placeholder="小区"
+                    size="small"
+                    clearable
+                    class="resi-cell-select"
+                    @change="handleChangeV"
+                  >
+                    <el-option
+                      v-for="item in optionsV"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
                     </el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item prop="buildId">
-                  <el-select v-model.trim="formData.buildId"
-                             placeholder="楼号"
-                             :disabled="!this.formData.villageId"
-                             size="small"
-                             clearable
-                             class="resi-cell-select resi-cell-select-middle list_item_width_1"
-                             @change="handleChangeB">
-                    <el-option v-for="item in optionsB"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value">
+                  <el-select
+                    v-model.trim="formData.buildId"
+                    placeholder="楼号"
+                    :disabled="!this.formData.villageId"
+                    size="small"
+                    clearable
+                    class="
+                      resi-cell-select resi-cell-select-middle
+                      list_item_width_1
+                    "
+                    @change="handleChangeB"
+                  >
+                    <el-option
+                      v-for="item in optionsB"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
                     </el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item prop="unitId">
-                  <el-select v-model.trim="formData.unitId"
-                             placeholder="单元"
-                             size="small"
-                             :disabled="!this.formData.buildId"
-                             clearable
-                             class="resi-cell-select resi-cell-select-middle list_item_width_1"
-                             @change="handleChangeD">
-                    <el-option v-for="item in optionsD"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value">
+                  <el-select
+                    v-model.trim="formData.unitId"
+                    placeholder="单元"
+                    size="small"
+                    :disabled="!this.formData.buildId"
+                    clearable
+                    class="
+                      resi-cell-select resi-cell-select-middle
+                      list_item_width_1
+                    "
+                    @change="handleChangeD"
+                  >
+                    <el-option
+                      v-for="item in optionsD"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
                     </el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item prop="homeId">
-                  <el-select v-model.trim="formData.homeId"
-                             placeholder="房号"
-                             :disabled="!this.formData.unitId"
-                             size="small"
-                             clearable
-                             class="resi-cell-select resi-cell-select-middle list_item_width_1">
-                    <el-option v-for="item in optionsH"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value">
+                  <el-select
+                    v-model.trim="formData.homeId"
+                    placeholder="房号"
+                    :disabled="!this.formData.unitId"
+                    size="small"
+                    clearable
+                    class="
+                      resi-cell-select resi-cell-select-middle
+                      list_item_width_1
+                    "
+                  >
+                    <el-option
+                      v-for="item in optionsH"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
                     </el-option>
                   </el-select>
                 </el-form-item>
               </div>
-
             </div>
           </el-form-item>
-          <el-button style="margin-left:30px"
-                     size="small"
-                     class="diy-button--search"
-                     @click="handleSearch">查询</el-button>
-          <el-button style="margin-left:10px"
-                     size="small"
-                     class="diy-button--reset"
-                     @click="resetSearch">重置</el-button>
+          <el-button
+            style="margin-left: 30px"
+            size="small"
+            class="diy-button--search"
+            @click="handleSearch"
+            >查询</el-button
+          >
+          <el-button
+            style="margin-left: 10px"
+            size="small"
+            class="diy-button--reset"
+            @click="resetSearch"
+            >重置</el-button
+          >
         </div>
       </el-form>
     </div>
     <div class="div_table">
       <div class="div_btn">
-        <el-button class="diy-button--add"
-                   size="small"
-                   @click="handleAdd">新增</el-button>
-
-        <el-button style="float:left"
-                   class="diy-button--export"
-                   size="small"
-                   @click="handleExportModule">下载模板</el-button>
-        <el-upload ref="upload"
-                   :multiple='false'
-                   :show-file-list='false'
-                   :before-upload="beforeUpload"
-                   action=""
-                   accept=".xlsx"
-                   :limit="1"
-                   :on-exceed="handleExceed"
-                   :http-request="uploadFile">
-          <el-button style="margin-left:10px"
-                     size="small"
-                     class="diy-button--delete">导入</el-button>
+        <el-button class="diy-button--add" size="small" @click="handleAdd"
+          >新增</el-button
+        >
+
+        <el-button
+          style="float: left"
+          class="diy-button--export"
+          size="small"
+          @click="handleExportModule"
+          >下载模板</el-button
+        >
+        <el-upload
+          ref="upload"
+          :multiple="false"
+          :show-file-list="false"
+          :before-upload="beforeUpload"
+          action=""
+          accept=".xlsx"
+          :limit="1"
+          :on-exceed="handleExceed"
+          :http-request="uploadFile"
+        >
+          <el-button
+            style="margin-left: 10px"
+            size="small"
+            class="diy-button--delete"
+            >导入</el-button
+          >
         </el-upload>
 
-        <el-button style="float:left;margin-left:10px"
-                   class="diy-button--reset"
-                   size="small"
-                   @click="handleExport">导出</el-button>
-
-        <el-button style="margin-left:15px"
-                   class="diy-button--more"
-                   size="small"
-                   @click="handleSendNotice">发送通知</el-button>
-        <el-button style="margin-left:15px"
-                   class="diy-button--more"
-                   size="small"
-                   @click="handleDelete">取消关注</el-button>
+        <el-button
+          style="float: left; margin-left: 10px"
+          class="diy-button--reset"
+          size="small"
+          @click="handleExport"
+          >导出</el-button
+        >
+
+        <el-button
+          style="margin-left: 15px"
+          class="diy-button--more"
+          size="small"
+          @click="handleSendNotice"
+          >发送通知</el-button
+        >
+        <el-button
+          style="margin-left: 15px"
+          class="diy-button--more"
+          size="small"
+          @click="handleDelete"
+          >取消关注</el-button
+        >
       </div>
 
-      <el-table ref="ref_table"
-                class="table"
-                :data="tableData"
-                border
-                :height="tableHeight"
-                v-loading="tableLoading"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-                @select="handleSelectTable"
-                @select-all="handleSelAll"
-                style="width: 100%">
-        <el-table-column type="selection"
-                         width="55"></el-table-column>
-        <el-table-column label="序号"
-                         header-align="center"
-                         align="center"
-                         type="index"
-                         width="50"></el-table-column>
-
-        <el-table-column prop="name"
-                         header-align="center"
-                         align="center"
-                         label="姓名"
-                         width="90">
+      <el-table
+        ref="ref_table"
+        class="table"
+        :data="tableData"
+        border
+        :height="tableHeight"
+        v-loading="tableLoading"
+        :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+        @select="handleSelectTable"
+        @select-all="handleSelAll"
+        style="width: 100%"
+      >
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column
+          label="序号"
+          header-align="center"
+          align="center"
+          type="index"
+          width="50"
+        ></el-table-column>
+
+        <el-table-column
+          prop="name"
+          header-align="center"
+          align="center"
+          label="姓名"
+          width="90"
+        >
         </el-table-column>
-        <el-table-column prop="mobile"
-                         header-align="center"
-                         align="center"
-                         label="手机号"
-                         width="110">
+        <el-table-column
+          prop="mobile"
+          header-align="center"
+          align="center"
+          label="手机号"
+          width="110"
+        >
         </el-table-column>
-        <el-table-column prop="idCard"
-                         header-align="center"
-                         align="center"
-                         label="身份证"
-                         width="170">
+        <el-table-column
+          prop="idCard"
+          header-align="center"
+          align="center"
+          label="身份证"
+          width="170"
+        >
         </el-table-column>
-        <el-table-column prop="allName"
-                         header-align="center"
-                         align="center"
-                         label="所属房屋"
-                         min-width="200">
+        <el-table-column
+          prop="allName"
+          header-align="center"
+          align="center"
+          label="所属房屋"
+          min-width="200"
+        >
         </el-table-column>
-        <el-table-column prop="vaccinationCount"
-                         header-align="center"
-                         align="center"
-                         label="接种针次"
-                         width="90">
+        <el-table-column
+          prop="vaccinationCount"
+          header-align="center"
+          align="center"
+          label="接种针次"
+          width="90"
+        >
         </el-table-column>
-        <el-table-column prop="reason"
-                         header-align="center"
-                         align="center"
-                         show-overflow-tooltip
-                         label="关注原因"
-                         min-width="180">
+        <el-table-column
+          prop="reason"
+          header-align="center"
+          align="center"
+          show-overflow-tooltip
+          label="关注原因"
+          min-width="180"
+        >
         </el-table-column>
-        <el-table-column prop="remark"
-                         header-align="center"
-                         align="center"
-                         show-overflow-tooltip
-                         label="备注"
-                         min-width="180">
+        <el-table-column
+          prop="remark"
+          header-align="center"
+          align="center"
+          show-overflow-tooltip
+          label="备注"
+          min-width="180"
+        >
         </el-table-column>
-        <el-table-column prop="lastInformTime"
-                         header-align="center"
-                         align="center"
-                         show-overflow-tooltip
-                         label="最后一次通知时间"
-                         width="160">
+        <el-table-column
+          prop="lastInformTime"
+          header-align="center"
+          align="center"
+          show-overflow-tooltip
+          label="最后一次通知时间"
+          width="160"
+        >
         </el-table-column>
 
-        <el-table-column label="操作"
-                         fixed="right"
-                         width="140"
-                         header-align="center"
-                         align="center"
-                         class="operate">
+        <el-table-column
+          label="操作"
+          fixed="right"
+          width="140"
+          header-align="center"
+          align="center"
+          class="operate"
+        >
           <template slot-scope="scope">
-
-            <el-button type="text"
-                       class="div-table-button--detail"
-                       size="small"
-                       @click="handleDetail(scope.row)">查看</el-button>
-            <el-button type="text"
-                       class="div-table-button--edit"
-                       size="small"
-                       @click="handleEdit(scope.row)">修改</el-button>
-
-            <el-popover popper-class="btn-popper"
-                        placement="bottom"
-                        style="margin-left:10px"
-                        width="20"
-                        trigger="hover">
+            <el-button
+              type="text"
+              class="div-table-button--detail"
+              size="small"
+              @click="handleDetail(scope.row)"
+              >查看</el-button
+            >
+            <el-button
+              type="text"
+              class="div-table-button--edit"
+              size="small"
+              @click="handleEdit(scope.row)"
+              >修改</el-button
+            >
+
+            <el-popover
+              popper-class="btn-popper"
+              placement="bottom"
+              style="margin-left: 10px"
+              width="20"
+              trigger="hover"
+            >
               <div class="table-more-btn">
-                <el-button type="text"
-                           class="div-table-button--detail--noline"
-                           size="small"
-                           @click="handleNoticeList(scope.row)">通知记录</el-button>
+                <el-button
+                  type="text"
+                  class="div-table-button--detail--noline"
+                  size="small"
+                  @click="handleNoticeList(scope.row)"
+                  >通知记录</el-button
+                >
               </div>
 
               <div class="table-more-btn">
-                <el-button type="text"
-                           class="div-table-button--detail--noline"
-                           size="small"
-                           @click="handleVisiteList(scope.row) ">随访记录</el-button>
+                <el-button
+                  type="text"
+                  class="div-table-button--detail--noline"
+                  size="small"
+                  @click="handleVisiteList(scope.row)"
+                  >随访记录</el-button
+                >
               </div>
 
-              <el-button type="text"
-                         size="small"
-                         class="div-table-button--more"
-                         slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
+              <el-button
+                type="text"
+                size="small"
+                class="div-table-button--more"
+                slot="reference"
+                >更多<i class="el-icon-caret-bottom"></i
+              ></el-button>
             </el-popover>
-
           </template>
         </el-table-column>
       </el-table>
       <div>
-        <el-pagination @size-change="handleSizeChange"
-                       @current-change="handleCurrentChange"
-                       :current-page.sync="pageNo"
-                       :page-sizes="[20, 50, 100, 200]"
-                       :page-size="pageSize"
-                       layout="sizes, prev, pager, next, total"
-                       :total="total">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page.sync="pageNo"
+          :page-sizes="[20, 50, 100, 200]"
+          :page-size="pageSize"
+          layout="sizes, prev, pager, next, total"
+          :total="total"
+        >
         </el-pagination>
       </div>
-
     </div>
 
     <!-- 新增弹出框 -->
-    <el-dialog :visible.sync="addFormShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :destroy-on-close="true"
-               title="新增疫苗接种关注名单"
-               width="1050px"
-               top="5vh"
-               class="dialog-h"
-               @closed="diaClose">
-      <vero-focus-add ref="ref_form_add"
-                      @dialogCancle="diaClose"
-                      @dialogOk="addFormOk"></vero-focus-add>
+    <el-dialog
+      :visible.sync="addFormShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :destroy-on-close="true"
+      title="新增疫苗接种关注名单"
+      width="1050px"
+      top="5vh"
+      class="dialog-h"
+      @closed="diaClose"
+    >
+      <vero-focus-add
+        ref="ref_form_add"
+        @dialogCancle="diaClose"
+        @dialogOk="addFormOk"
+      ></vero-focus-add>
     </el-dialog>
     <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="editFormShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="editFormTitle"
-               width="1050px"
-               top="5vh"
-               class="dialog-h"
-               @closed="diaClose">
-      <vero-focus-edit ref="ref_form_edit"
-                       @dialogCancle="diaClose"
-                       @dialogOk="addFormOk"></vero-focus-edit>
+    <el-dialog
+      :visible.sync="editFormShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="editFormTitle"
+      width="1050px"
+      top="5vh"
+      class="dialog-h"
+      @closed="diaClose"
+    >
+      <vero-focus-edit
+        ref="ref_form_edit"
+        @dialogCancle="diaClose"
+        @dialogOk="addFormOk"
+      ></vero-focus-edit>
     </el-dialog>
     <!-- 发送通知弹出框 -->
-    <el-dialog :visible.sync="sendNoticeFormShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               title="发送通知"
-               width="850px"
-               top="5vh"
-               class="dialog-h"
-               @closed="diaClose">
-      <vf-send-notice ref="ref_sendnotice"
-                      @dialogCancle="diaClose"
-                      @dialogOk="sendNoticeOk"></vf-send-notice>
+    <el-dialog
+      :visible.sync="sendNoticeFormShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="发送通知"
+      width="850px"
+      top="5vh"
+      class="dialog-h"
+      @closed="diaClose"
+    >
+      <vf-send-notice
+        ref="ref_sendnotice"
+        @dialogCancle="diaClose"
+        @dialogOk="sendNoticeOk"
+      ></vf-send-notice>
     </el-dialog>
     <!-- 通知记录弹出框 -->
-    <el-dialog :visible.sync="noticeListFormShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               title="通知记录"
-               width="1050px"
-               top="5vh"
-               class="dialog-h"
-               @closed="diaClose">
-      <vf-notice-list ref="ref_noticelist"
-                      @dialogCancle="diaClose"></vf-notice-list>
+    <el-dialog
+      :visible.sync="noticeListFormShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="通知记录"
+      width="1050px"
+      top="5vh"
+      class="dialog-h"
+      @closed="diaClose"
+    >
+      <vf-notice-list
+        ref="ref_noticelist"
+        @dialogCancle="diaClose"
+      ></vf-notice-list>
     </el-dialog>
     <!-- 随访记录弹出框 -->
-    <el-dialog :visible.sync="visiteListFormShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               title="随访记录"
-               width="1050px"
-               top="5vh"
-               class="dialog-h"
-               @closed="diaClose">
-      <vf-visite-list ref="ref_visitelist"
-                      @dialogCancle="diaClose"></vf-visite-list>
+    <el-dialog
+      :visible.sync="visiteListFormShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="随访记录"
+      width="1050px"
+      top="5vh"
+      class="dialog-h"
+      @closed="diaClose"
+    >
+      <vf-visite-list
+        ref="ref_visitelist"
+        @dialogCancle="diaClose"
+      ></vf-visite-list>
     </el-dialog>
-
   </div>
 </template>
 
 <script>
-
-import veroFocusAdd from './veroFocusAdd'
-import veroFocusEdit from './veroFocusEdit'
-import vfNoticeList from './vfNoticeList'
-import vfSendNotice from './vfSendNotice'
-import vfVisiteList from './vfVisiteList'
+import veroFocusAdd from "./veroFocusAdd";
+import veroFocusEdit from "./veroFocusEdit";
+import vfNoticeList from "./vfNoticeList";
+import vfSendNotice from "./vfSendNotice";
+import vfVisiteList from "./vfVisiteList";
 
 import { requestPost } from "@/js/dai/request";
-import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui' // 引入Loading服务
+import { mapGetters } from "vuex";
+import { Loading } from "element-ui"; // 引入Loading服务
 
-let loading // 加载动画
+let loading; // 加载动画
 export default {
-  data () {
+  data() {
     return {
       loading: false,
       total: 0,
@@ -391,18 +495,18 @@ export default {
 
       selection: [],
 
-      agencyId: '',
+      agencyId: "",
 
       formData: {
-        attentionType: 1,//关注类型，核酸检测：2，疫苗接种：1		
-        name: '',
-        mobile: '',
-        idCard: '',
-        vaccinationCount: '',
-        villageId: '',
-        buildId: '',
-        unitId: '',
-        homeId: ''
+        attentionType: 1, //关注类型，核酸检测：2，疫苗接种：1
+        name: "",
+        mobile: "",
+        idCard: "",
+        vaccinationCount: "",
+        villageId: "",
+        buildId: "",
+        unitId: "",
+        homeId: "",
       },
       optionsV: [],
       optionsB: [],
@@ -420,426 +524,427 @@ export default {
       sendNoticeFormShow: false,
       noticeListFormShow: false,
       visiteListFormShow: false,
-      editFormTitle: '修改疫苗接种关注名单'
-
-
-    }
+      editFormTitle: "修改疫苗接种关注名单",
+    };
   },
   components: {
-    veroFocusAdd, veroFocusEdit, vfNoticeList, vfSendNotice, vfVisiteList
-  },
-  async created () {
-
+    veroFocusAdd,
+    veroFocusEdit,
+    vfNoticeList,
+    vfSendNotice,
+    vfVisiteList,
   },
-  activated () {
-    this.$refs['ref_table'].doLayout()
+  async created() {},
+  activated() {
+    this.$refs["ref_table"].doLayout();
   },
-  async mounted () {
-    const { user } = this.$store.state
-    this.agencyId = user.agencyId
+  async mounted() {
+    const { user } = this.$store.state;
+    this.agencyId = user.agencyId;
     for (let i = 0; i < 11; i++) {
       let obj = {
-        value: i + '',
-        label: i + '次'
-      }
-      this.veroNumList.push(obj)
+        value: i + "",
+        label: i + "次",
+      };
+      this.veroNumList.push(obj);
     }
-    this.getValiheList()
-    await this.loadTable()
+    this.getValiheList();
+    await this.loadTable();
   },
 
   methods: {
-    handleSearch () {
-      this.selectionAll = []
-      this.loadTable()
+    handleSearch() {
+      this.selectionAll = [];
+      this.loadTable();
     },
 
-    async loadTable () {
-      this.tableLoading = true
+    async loadTable() {
+      this.tableLoading = true;
 
-      const url = "/epmetuser/icEpidemicSpecialAttention/list"
+      const url = "/epmetuser/icEpidemicSpecialAttention/list";
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icEpidemicSpecialAttention/list"
       let params = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
-        ...this.formData
-      }
+        ...this.formData,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.total = data.total
-        this.tableData = data.list
+        this.total = data.total;
+        this.tableData = data.list;
 
-        this.analysisTableSelection()
+        this.analysisTableSelection();
 
-        this.tableData.forEach(item => {
+        this.tableData.forEach((item) => {
           if (!item.allName) {
-            item.allName = '--'
+            item.allName = "--";
           }
-          item.roomShow = ''
-          if (!item.villageName && !item.buildName && !item.unitName && !item.homeName) {
-            item.roomShow = '--'
+          item.roomShow = "";
+          if (
+            !item.villageName &&
+            !item.buildName &&
+            !item.unitName &&
+            !item.homeName
+          ) {
+            item.roomShow = "--";
           } else {
             if (item.villageName) {
-              item.roomShow = item.roomShow + item.villageName
+              item.roomShow = item.roomShow + item.villageName;
             }
             if (item.buildName) {
-              item.roomShow = item.roomShow + item.buildName
+              item.roomShow = item.roomShow + item.buildName;
             }
             if (item.unitName) {
-              item.roomShow = item.roomShow + item.unitName
+              item.roomShow = item.roomShow + item.unitName;
             }
             if (item.villageName) {
-              item.roomShow = item.roomShow + item.homeName
+              item.roomShow = item.roomShow + item.homeName;
             }
           }
-
-
         });
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
-      this.tableLoading = false
+      this.tableLoading = false;
     },
 
-    handleChangeV (val) {
-      console.log('val', val)
-      this.formData.buildId = ''
-      this.formData.unitId = ''
-      this.formData.homeId = ''
-      this.getBuildList()
-      this.getUniList()
-      this.getHouseList()
+    handleChangeV(val) {
+      console.log("val", val);
+      this.formData.buildId = "";
+      this.formData.unitId = "";
+      this.formData.homeId = "";
+      this.getBuildList();
+      this.getUniList();
+      this.getHouseList();
     },
-    handleChangeB (val) {
-      console.log('val', val)
-      this.formData.unitId = ''
-      this.formData.homeId = ''
-      this.getUniList()
-      this.getHouseList()
+    handleChangeB(val) {
+      console.log("val", val);
+      this.formData.unitId = "";
+      this.formData.homeId = "";
+      this.getUniList();
+      this.getHouseList();
     },
-    handleChangeD () {
-      this.formData.homeId = ''
-      this.getHouseList()
+    handleChangeD() {
+      this.formData.homeId = "";
+      this.getHouseList();
     },
 
-    getValiheList () {
-      const { user } = this.$store.state
+    getValiheList() {
+      const { user } = this.$store.state;
       this.$http
-        .post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.formData.GRID_ID, agencyId: user.agencyId })
+        .post("/gov/org/icneighborhood/neighborhoodoption", {
+          gridId: this.formData.GRID_ID,
+          agencyId: user.agencyId,
+        })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsV = res.data
+            console.log("获取查询详情成功", res.data);
+            this.optionsV = res.data;
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
     },
 
-    getBuildList () {
+    getBuildList() {
       this.$http
-        .post('/gov/org/icbuilding/buildingoption', { neighborHoodId: this.formData.villageId })
+        .post("/gov/org/icbuilding/buildingoption", {
+          neighborHoodId: this.formData.villageId,
+        })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsB = res.data
+            console.log("获取查询详情成功", res.data);
+            this.optionsB = res.data;
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
     },
-    getUniList () {
+    getUniList() {
       this.$http
-        .post('/gov/org/icbuildingunit/unitoption', { buildingId: this.formData.buildId })
+        .post("/gov/org/icbuildingunit/unitoption", {
+          buildingId: this.formData.buildId,
+        })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsD = res.data
+            console.log("获取查询详情成功", res.data);
+            this.optionsD = res.data;
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
     },
-    getHouseList () {
+    getHouseList() {
       this.$http
-        .post('/gov/org/ichouse/houseoption', { unitId: this.formData.unitId })
+        .post("/gov/org/ichouse/houseoption", { unitId: this.formData.unitId })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsH = res.data
+            console.log("获取查询详情成功", res.data);
+            this.optionsH = res.data;
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
     },
 
-
-    handleSelectTable (selection, row) {
-
-      row.isSel = !row.isSel
+    handleSelectTable(selection, row) {
+      row.isSel = !row.isSel;
 
       if (row.isSel) {
-        this.selectionAll.push(row)
+        this.selectionAll.push(row);
       } else {
         for (let i = 0; i < this.selectionAll.length; i++) {
-          let item = this.selectionAll[i]
+          let item = this.selectionAll[i];
           if (item.idCard === row.idCard) {
-            this.selectionAll.splice(i, 1)
-            break
+            this.selectionAll.splice(i, 1);
+            break;
           }
-
         }
       }
-
     },
 
-    handleSelAll (selection) {
-      let selFlag = selection.length > 0//全选选中 还是 全选不选中
+    handleSelAll(selection) {
+      let selFlag = selection.length > 0; //全选选中 还是 全选不选中
       for (let i = 0; i < this.tableData.length; i++) {
-        let tableItem = this.tableData[i]
-        tableItem.isSel = selFlag
-        let isHasItem = false
+        let tableItem = this.tableData[i];
+        tableItem.isSel = selFlag;
+        let isHasItem = false;
         for (let j = 0; j < this.selectionAll.length; j++) {
-          let selectionItem = this.selectionAll[j]
+          let selectionItem = this.selectionAll[j];
           if (selectionItem.idCard === tableItem.idCard) {
-            isHasItem = true
+            isHasItem = true;
             if (!selFlag) {
-              this.selectionAll.splice(j, 1)
-              break
+              this.selectionAll.splice(j, 1);
+              break;
             }
           }
-
         }
 
         if (!isHasItem && selFlag) {
-          this.selectionAll.push(tableItem)
+          this.selectionAll.push(tableItem);
         }
       }
-
     },
 
-
     //回显列表选中的行
-    analysisTableSelection () {
+    analysisTableSelection() {
       this.$nextTick(() => {
-        this.tableData.forEach(tableItem => {
-
+        this.tableData.forEach((tableItem) => {
           for (let j = 0; j < this.selectionAll.length; j++) {
-            let selectionItem = this.selectionAll[j]
+            let selectionItem = this.selectionAll[j];
 
             if (selectionItem.idCard === tableItem.idCard) {
-              tableItem.isSel = true
-              break
-
+              tableItem.isSel = true;
+              break;
             }
           }
           if (tableItem.isSel) {
             this.$refs.ref_table.toggleRowSelection(tableItem);
           }
         });
-      })
+      });
+    },
 
+    diaClose() {
+      this.addFormShow = false;
+      this.editFormShow = false;
+      this.sendNoticeFormShow = false;
+      this.noticeListFormShow = false;
+      this.visiteListFormShow = false;
+    },
 
+    handleAdd() {
+      this.addFormShow = true;
+      this.$nextTick(() => {
+        this.$refs.ref_form_add.initForm(null, this.agencyId);
+      });
     },
 
-    diaClose () {
-      this.addFormShow = false
-      this.editFormShow = false
-      this.sendNoticeFormShow = false
-      this.noticeListFormShow = false
-      this.visiteListFormShow = false
+    async handleEdit(row) {
+      this.editFormTitle = "修改疫苗接种关注名单";
+      this.editFormShow = true;
 
+      let row2 = await this.getInfo(row);
+      this.$refs.ref_form_edit.initForm("edit", row2);
     },
 
-    handleAdd () {
-      this.addFormShow = true
-      this.$nextTick(() => {
-        this.$refs.ref_form_add.initForm(null, this.agencyId)
-      })
-    },
+    async handleDetail(row) {
+      this.editFormTitle = "查看疫苗接种关注名单";
+      this.editFormShow = true;
 
-    handleEdit (row) {
-      this.editFormTitle = "修改疫苗接种关注名单"
-      this.editFormShow = true
-      this.$nextTick(() => {
-        this.$refs.ref_form_edit.initForm('edit', row)
-      })
+      let row2 = await this.getInfo(row);
+      this.$refs.ref_form_edit.initForm("detail", row2);
     },
 
-    handleDetail (row) {
-      this.editFormTitle = "查看疫苗接种关注名单"
-      this.editFormShow = true
-      this.$nextTick(() => {
-        this.$refs.ref_form_edit.initForm('detail', row)
-      })
+    async getInfo(row) {
+      const url = "/epmetuser/icEpidemicSpecialAttention/detail";
+
+      let params = {
+        id: row.id,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        row.mobile = data.mobile;
+        row.idCard = data.idCard;
+      }
+      return row;
     },
 
-    handleSendNotice () {
+    handleSendNotice() {
       if (this.selectionAll.length === 0) {
-        this.$message.info('请选择要通知的人员')
-        return false
+        this.$message.info("请选择要通知的人员");
+        return false;
       }
-      this.sendNoticeFormShow = true
+      this.sendNoticeFormShow = true;
       this.$nextTick(() => {
-        this.$refs.ref_sendnotice.initForm(this.selectionAll)
-      })
-
+        this.$refs.ref_sendnotice.initForm(this.selectionAll);
+      });
     },
 
-    handleNoticeList (row) {
-      this.noticeListFormShow = true
+    handleNoticeList(row) {
+      this.noticeListFormShow = true;
       this.$nextTick(() => {
-        this.$refs.ref_noticelist.initTable(row.idCard)
-      })
-
+        this.$refs.ref_noticelist.initTable(row.idCard);
+      });
     },
-    handleVisiteList (row) {
-
-      this.visiteListFormShow = true
+    handleVisiteList(row) {
+      this.visiteListFormShow = true;
       this.$nextTick(() => {
-        this.$refs.ref_visitelist.initTable(row)
-
-      })
-
+        this.$refs.ref_visitelist.initTable(row);
+      });
     },
 
-
-    addFormOk () {
-      this.addFormShow = false
-      this.editFormShow = false
-      this.loadTable()
-
+    addFormOk() {
+      this.addFormShow = false;
+      this.editFormShow = false;
+      this.loadTable();
     },
-    sendNoticeOk () {
-      this.sendNoticeFormShow = false
-      this.selectionAll = []
-      this.loadTable()
-
+    sendNoticeOk() {
+      this.sendNoticeFormShow = false;
+      this.selectionAll = [];
+      this.loadTable();
     },
 
-    async handleDelete (row) {
+    async handleDelete(row) {
       if (this.selectionAll.length === 0) {
-        this.$message.info('请选择要取消关注的名单')
-        return false
+        this.$message.info("请选择要取消关注的名单");
+        return false;
       }
       this.$confirm("确认取消关注选择的名单?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
-          this.deleteFocus(row)
+          this.deleteFocus(row);
         })
-        .catch(err => {
+        .catch((err) => {
           if (err == "cancel") {
-
           }
-
         });
     },
 
-    async deleteFocus (row) {
-      const url = "/epmetuser/icEpidemicSpecialAttention/cancel-attention"
+    async deleteFocus(row) {
+      const url = "/epmetuser/icEpidemicSpecialAttention/cancel-attention";
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
-      let idCards = []
+      let idCards = [];
 
-      this.selectionAll.forEach(element => {
-        idCards.push(element.idCard)
+      this.selectionAll.forEach((element) => {
+        idCards.push(element.idCard);
       });
       let params = {
         attentionType: 1,
-        idCards: idCards
-      }
+        idCards: idCards,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
         this.$message({
           type: "success",
-          message: "操作成功"
+          message: "操作成功",
         });
 
-        this.loadTable()
+        this.loadTable();
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
     //重置搜索条件
-    resetSearch () {
+    resetSearch() {
       this.formData = {
-        attentionType: 1,//关注类型，核酸检测：2，疫苗接种：1		
-        name: '',
-        mobile: '',
-        idCard: '',
-        vaccinationCount: '',
-      }
-
-      this.pageNo = 1
+        attentionType: 1, //关注类型，核酸检测：2，疫苗接种：1
+        name: "",
+        mobile: "",
+        idCard: "",
+        vaccinationCount: "",
+      };
+
+      this.pageNo = 1;
       // this.loadTable()
     },
 
-
-    handleSizeChange (val) {
-      this.pageSize = val
-      this.pageNo = 1
-      this.loadTable()
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.pageNo = 1;
+      this.loadTable();
     },
-    handleCurrentChange (val) {
-      this.pageNo = val
-      this.loadTable()
+    handleCurrentChange(val) {
+      this.pageNo = val;
+      this.loadTable();
     },
 
     //导出表格
-    async handleExport () {
-      let title = '疫苗接种关注名单'
+    async handleExport() {
+      let title = "疫苗接种关注名单";
 
-      const url = "/epmetuser/icEpidemicSpecialAttention/vaccination-export"
+      const url = "/epmetuser/icEpidemicSpecialAttention/vaccination-export";
 
       app.ajax.exportFilePost(
         url,
         this.formData,
         (data, rspMsg) => {
-
-          this.download(data, title + '.xlsx')
+          this.download(data, title + ".xlsx");
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg);
         }
       );
-
     },
 
     // 下载文件
-    download (data, fileName) {
+    download(data, fileName) {
       if (!data) {
-        return
+        return;
       }
 
-      var csvData = new Blob([data])
+      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');
+        var a = document.createElement("a");
         document.body.appendChild(a);
-        a.style = 'display: none';
+        a.style = "display: none";
         var url = window.URL.createObjectURL(csvData);
         a.href = url;
         a.download = fileName;
@@ -847,23 +952,21 @@ export default {
         a.remove();
         window.URL.revokeObjectURL(url);
       }
-
     },
 
-    handleExportModule () {
-      let title = '疫苗接种关注名单模板'
+    handleExportModule() {
+      let title = "疫苗接种关注名单模板";
 
-      const url = "/epmetuser/icEpidemicSpecialAttention/export-template"
+      const url = "/epmetuser/icEpidemicSpecialAttention/export-template";
       let params = {
-        attentionType: '1'
-      }
+        attentionType: "1",
+      };
 
       app.ajax.exportFilePost(
         url,
         params,
         (data, rspMsg) => {
-
-          this.download(data, title + '.xlsx')
+          this.download(data, title + ".xlsx");
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg);
@@ -871,53 +974,51 @@ export default {
       );
     },
 
-
     // 上传文件之前的钩子
-    beforeUpload (file) {
-
-      const array = file.name.split('.')
-      const extension = array[array.length - 1]
+    beforeUpload(file) {
+      const array = file.name.split(".");
+      const extension = array[array.length - 1];
       // const isLt1M = (file.size / 1024 / 1024) < 5
-      if (extension !== 'xlsx') {
-        this.$message.error('只能上传xlsx文件！')
-        return false
+      if (extension !== "xlsx") {
+        this.$message.error("只能上传xlsx文件！");
+        return false;
       } else {
         this.files = file;
         this.fileName = file.name;
-        return true
+        return true;
       }
-
     },
     // 上传文件个数超过定义的数量
-    handleExceed (files, fileList) {
-      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
+    handleExceed(files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`);
     },
 
-    async uploadFile () {
+    async uploadFile() {
       if (this.fileName == "") {
-        this.$message.warning('请选择要上传的文件！')
-        return false
+        this.$message.warning("请选择要上传的文件！");
+        return false;
       }
 
       this.$message({
         showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
-        duration: 0
-      })
+        message: "导入中，请到系统管理-导入记录中查看进度",
+        duration: 0,
+      });
 
       //清空上传列表
-      this.$refs['upload'].clearFiles()
+      this.$refs["upload"].clearFiles();
 
-      var url = '/epmetuser/icEpidemicSpecialAttention/vaccination-import'
+      var url = "/epmetuser/icEpidemicSpecialAttention/vaccination-import";
 
       let fileFormData = new FormData();
-      fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-      fileFormData.append('attentionType', '1');//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append("file", this.files); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append("attentionType", "1"); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
 
-      window.app.ajax.post2(url, fileFormData,
+      window.app.ajax.post2(
+        url,
+        fileFormData,
         (data, rspMsg) => {
-
-          if (data.code === 0 && data.msg == 'success') {
+          if (data.code === 0 && data.msg == "success") {
             // this.$message.success('导入成功')
           } else {
             // this.$message({
@@ -930,52 +1031,42 @@ export default {
           }
 
           // this.loadTable()
-
         },
-        (rspMsg, data) => {
-
-        }, { headers: { 'Content-Type': 'multipart/form-data' } })
-
-
+        (rspMsg, data) => {},
+        { headers: { "Content-Type": "multipart/form-data" } }
+      );
     },
 
-
     // 开启加载动画
-    startLoading () {
+    startLoading() {
       loading = Loading.service({
         lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
     },
     // 结束加载动画
-    endLoading () {
+    endLoading() {
       // clearTimeout(timer);
       if (loading) {
-        loading.close()
+        loading.close();
       }
-    }
+    },
   },
   computed: {
-    tableHeight () {
-      return this.$store.state.inIframe ? this.clientHeight - 415 + this.iframeHeight : this.clientHeight - 415
-
+    tableHeight() {
+      return this.$store.state.inIframe
+        ? this.clientHeight - 415 + this.iframeHeight
+        : this.clientHeight - 415;
     },
 
-    ...mapGetters(['clientHeight', 'iframeHeight'])
+    ...mapGetters(["clientHeight", "iframeHeight"]),
   },
-  watch: {
-
-  },
-  props: {
-
-  }
-}
+  watch: {},
+  props: {},
+};
 </script>
 
-<style lang="scss" scoped >
+<style lang="scss" scoped>
 @import "@/assets/scss/modules/management/epidemic.scss";
 </style>
-
-
-

From 510664fc7f57ebba070673f41c3fd6b6cd08147b Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 27 Apr 2022 16:32:20 +0800
Subject: [PATCH 11/17] dd

---
 src/views/components/resiSearch.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index ef2b7fa67..45f56bf30 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -712,7 +712,7 @@ export default {
     width: 200px;
   }
   .resi-cell--daterange {
-    width: 200px;
+    max-width: 260px;
   }
   .resi-cell-select {
     width: 200px;

From de06262cf888e68abc49c2568c455a1d7f48ddc0 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 27 Apr 2022 16:43:27 +0800
Subject: [PATCH 12/17] 11

---
 .../scss/modules/visual/basicInfoMain.scss    |  4 ++--
 .../visual/basicinfo/basicInfoCommunity.vue   | 19 ++++++++++---------
 .../visual/basicinfo/cpts/roomInfo.vue        | 13 ++++++++++---
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss
index ecc3d6387..d3817619d 100644
--- a/src/assets/scss/modules/visual/basicInfoMain.scss
+++ b/src/assets/scss/modules/visual/basicInfoMain.scss
@@ -296,8 +296,8 @@
 
       .icon_party {
         position: absolute;
-        top: 13px;
-        left: 18px;
+        top: 10px;
+        left: 12px;
       }
       .icon_roomstate {
         position: absolute;
diff --git a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
index 4cc2f4021..3f8e1b792 100644
--- a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
@@ -216,21 +216,22 @@ export default {
 
       this.userArray = []
       this.roomArray.forEach((element, index) => {
-
-        let obj = JSON.parse(JSON.stringify(element))
-
-        obj.showAllUser = false
-        this.$set(this.roomArray, index, obj)
-        // element.showAllUser = false
+        if (index !== selIndex) {
+          let obj = JSON.parse(JSON.stringify(element))
+          obj.showAllUser = false
+          this.$set(this.roomArray, index, obj)
+        }
 
       });
 
-      await nextTick(50);
-
       if ((selIndex === 0 || selIndex) && !this.roomArray[selIndex].showAllUser) {
-
+        await nextTick(100);
         await this.loadUser(this.roomArray[selIndex].houseId, selIndex)
 
+      } else {
+        let obj = JSON.parse(JSON.stringify(this.roomArray[selIndex]))
+        obj.showAllUser = false
+        this.$set(this.roomArray, selIndex, obj)
       }
 
 
diff --git a/src/views/modules/visual/basicinfo/cpts/roomInfo.vue b/src/views/modules/visual/basicinfo/cpts/roomInfo.vue
index 8e06df7f2..a3b93557b 100644
--- a/src/views/modules/visual/basicinfo/cpts/roomInfo.vue
+++ b/src/views/modules/visual/basicinfo/cpts/roomInfo.vue
@@ -20,18 +20,25 @@
           </div>
         </div> -->
         <div class="list">
+          <div class="item">
+            <span class="item-field">所属房屋：</span>
+            <span>{{  formData.neighborHoodName }}-{{ formData. buildingName }}-{{ formData. unitName }}-{{ formData. doorName }}</span>
+          </div>
+
+        </div>
+        <!-- <div class="list">
           <div class="item">
             <span class="item-field">所属楼栋：</span>
             <span>{{  formData.buildingName }}</span>
           </div>
 
-        </div>
-        <div class="list">
+        </div> -->
+        <!-- <div class="list">
           <div class="item">
             <span class="item-field">房屋名称：</span>
             <span>{{ formData. houseName }}</span>
           </div>
-        </div>
+        </div> -->
         <div class="list">
           <div class="item">
             <span class="item-field">房屋类型：</span>

From fe075c4ed8283ef05fea2a7c6d67d69ca0aa120a Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 28 Apr 2022 11:10:10 +0800
Subject: [PATCH 13/17] =?UTF-8?q?=E6=8C=89=E9=9C=80=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/checkBox.vue  | 17 ++++++--
 src/views/modules/base/diyInfo.vue | 65 +++++++++++++++++++++++++-----
 src/views/modules/base/resi.vue    |  3 +-
 3 files changed, 70 insertions(+), 15 deletions(-)

diff --git a/src/views/components/checkBox.vue b/src/views/components/checkBox.vue
index 1f2d19a2a..41bc5cfae 100644
--- a/src/views/components/checkBox.vue
+++ b/src/views/components/checkBox.vue
@@ -1,15 +1,16 @@
 <template>
-  <div>
-    <el-checkbox 
+  <div v-loading="loading">
+    <el-checkbox
       :indeterminate="isIndeterminate" 
       v-model="checkAll" 
       @change="handleCheckAllChange">全选</el-checkbox>
     <div style="margin: 15px 0;"></div>
-    <el-checkbox-group v-model="checkedList" @change="handleChange">
+    <el-checkbox-group v-if="boxList.length > 0" v-model="checkedList" @change="handleChange">
       <div v-for="n in boxList" :key="n.itemId" class="mb10">
         <el-checkbox :label="n.itemId">{{n.label}}</el-checkbox>
       </div>
     </el-checkbox-group>
+    <div v-else class="no-data">暂无数据</div>
   </div>
 </template>
 
@@ -37,6 +38,7 @@ export default {
       checkedList: [],
       isIndeterminate: false,
       pid: '',
+      loading: false
     }
   },
   created() {
@@ -53,8 +55,9 @@ export default {
       this.$emit('change', { list: this.filterArr(this.checkedList), pid: this.pid })
     },
     handleChange(value) {
+      console.log('value----', value)
       let checkedCount = value.length;
-      this.checkAll = checkedCount === this.list.length;
+      this.checkAll = checkedCount === this.boxList.length;
       this.isIndeterminate = checkedCount > 0 && checkedCount < this.boxList.length;
       this.$emit('change', { list: this.filterArr(this.checkedList), pid: this.pid })
     },
@@ -75,4 +78,10 @@ export default {
 .mb10 {
   margin-bottom: 10px;
 }
+.no-data {
+  padding-top: 30px;
+  font-size: 14px;
+  text-align: center;
+  color: #999;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue
index ec4a3eb3b..a202036ab 100644
--- a/src/views/modules/base/diyInfo.vue
+++ b/src/views/modules/base/diyInfo.vue
@@ -4,10 +4,10 @@
       <el-tab-pane label="自定义模板" name="first">
         <div class="diy-wr">
           <div class="left">
-            <el-tabs tab-position="left" class="left-h">
-              <el-tab-pane v-for="item in list" :key="item.id" :label="item.label">
+            <el-tabs v-model="leftActive" tab-position="left" class="left-h" @tab-click="handleTabsClick">
+              <el-tab-pane v-for="item in leftList" :key="item.id" :label="item.label" :name="item.id">
                 <div class="pd10 dialog-h-content scroll-h">
-                  <checkBox v-if="item.queryItemList" :ref="'checkbox' + item.id" 
+                  <checkBox v-if="item.queryItemList.length > 0" :ref="'checkbox' + item.id" 
                   :list="item.queryItemList" @change="handleChangeBox" />
                 </div>
               </el-tab-pane>
@@ -19,7 +19,7 @@
               <div class="title">导出信息</div>
               <el-button plain @click="handlePreview('')">预览</el-button>
             </div>
-            <div>
+            <div class="h80 scroll-h">
               <el-collapse v-model="activeCollapse" id="collapsWr">
                 <el-collapse-item v-for="item in rightList" :key="item.id" 
                 :title="item.label" :name="item.id" class="col-h">
@@ -129,6 +129,7 @@
 import checkBox from '../../components/checkBox.vue'
 import dragItem from '../../components/dragItem.vue'
 import Sortable from 'sortablejs'
+import { requestPost } from "@/js/dai/request"
 export default {
   props: {
     list: {
@@ -149,8 +150,10 @@ export default {
       exportLoading: false,
       activeCollapse: ['1'],
       activeName: 'first',
+      leftActive: '',
       info: {},
       rightList: [],
+      leftList: [],
       form: {
         isSaveTemp: false,
         name: '',
@@ -161,11 +164,14 @@ export default {
       diyDialog: false,
     }
   },
-  created() {
+  async created() {
     this.list.forEach(item => {
       this.$set(this.info, item.id, [])
     })
-    console.log('infodiy----', this.list)
+    this.leftActive = this.list[0].id
+    this.leftList = [...this.list]
+    this.leftList[0].queryItemList = await this.getExportChildList(this.leftList[0].id)
+    console.log('infodiy----', this.leftList)
     this.getTemplateList()
   },
   watch: {
@@ -175,14 +181,24 @@ export default {
         
       },
       deep: true
-    }
+    },
+    // list: {
+    //   handler(val) {
+    //     if (val.length > 0) {
+    //       this.leftList = [...val]
+    //       this.leftList[0].queryItemList = this.getExportChildList(this.leftList[0].id)
+    //     }
+    //   },
+    //   deep: true,
+    //   // immediate: true
+    // },
   },
   methods: {
     handleChangeBox({list, pid}) {
       console.log('ccccc----', list)
       // if (list.length == 0) return
       let obj = {}
-      this.list.forEach(item =>{
+      this.leftList.forEach(item =>{
         if (item.id == pid) obj = { ...item, queryItemList: [...list] }
       })
       const groups = this.rightList.map(item => item.id)
@@ -203,12 +219,23 @@ export default {
       }
       this.activeCollapse = [...this.activeCollapse, pid]
     },
+    handleTabsClick(val) {
+      console.log('tabs-----', val)
+      this.leftList.forEach(async item => {
+        if (item.id == val.name) {
+          if (item.queryItemList.length == 0) item.queryItemList = await this.getExportChildList(item.id)
+        }
+      })
+    },
     handleDelItem(val) {
       const { item, index } = val
       console.log('item------', item, this.$refs[`checkbox${item.itemGroupId}`])
-      const checkList = this.$refs[`checkbox${item.itemGroupId}`][0].checkedList
+      let checkList = this.$refs[`checkbox${item.itemGroupId}`][0].checkedList
       checkList.forEach((n, i) => {
-        if (n == item.itemId) this.$refs[`checkbox${item.itemGroupId}`][0].checkedList.splice(i, 1)
+        if (n == item.itemId) {
+          checkList.splice(i, 1)
+          this.$refs[`checkbox${item.itemGroupId}`][0].handleChange(checkList)
+        } 
       })
       this.rightList.forEach((n, i) => {
         if (n.id === item.itemGroupId) {
@@ -387,6 +414,20 @@ export default {
           return this.$message.error('网络错误')
         })
     },
+    async getExportChildList (groupId) {
+      const url = `/oper/customize/icformitem/getItemList/${groupId}`
+      let params = {}
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+
+        return data
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
   }
 }
 </script>
@@ -422,6 +463,10 @@ export default {
     }
   }
 }
+.h80 {
+  height: calc(80vh - 160px);
+  overflow: auto;
+}
 .diy-footer {
   display: flex;
   align-items: center;
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 391035b10..01335d6c1 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -1260,7 +1260,8 @@ export default {
 
         data.forEach(item => {
           (async (id) => {
-            item.queryItemList = await this.getExportChildList(id)
+            // item.queryItemList = await this.getExportChildList(id)
+            item.queryItemList = []
           })(item.id)
         })
         this.exportList = [...data]

From e802c7b421f4901e86040911fa72b937bf50d0cb Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 28 Apr 2022 14:59:32 +0800
Subject: [PATCH 14/17] =?UTF-8?q?=E9=99=90=E5=88=B6=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/diyInfo.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue
index a202036ab..0fd29a40f 100644
--- a/src/views/modules/base/diyInfo.vue
+++ b/src/views/modules/base/diyInfo.vue
@@ -83,7 +83,7 @@
       <div class="left">
         <div class="flex-div">
           <div>模板名称：</div>
-          <el-input v-model="form.name" class="wd200 mr10" />
+          <el-input v-model="form.name" maxlength="20" class="wd200 mr10" />
           <el-checkbox v-model="form.isSaveTemp">保存为常用模板</el-checkbox>
         </div>
       </div>
@@ -330,13 +330,17 @@ export default {
       await this.$http({
         method: 'POST',
         url,
-        responseType: 'blob',
+        // responseType: 'blob',
         data: params
       })
         .then(res => {
           console.log('res----dddd', res)
           // this.download(res.data, title + '.xls')
-          this.getTemplateList()
+          // this.getTemplateList()
+          this.exportLoading = false
+          if (res.data.code && res.data.code == 9999) {
+            return this.$message.error(res.data.msg)
+          }
           if (res.headers["content-disposition"]) {
             let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
             console.log('filename', fileName)
@@ -353,7 +357,6 @@ export default {
             this.$message.success('导出成功')
             this.$emit('close')
           } else this.$message.error('下载失败')
-          this.exportLoading = false
         })
         .catch(err => {
           console.log('err', err)

From 74e15f913ead57356c9391bb072ffbcc5354bf2f Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 28 Apr 2022 15:09:30 +0800
Subject: [PATCH 15/17] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/basicinfo/basicInfoMain.vue | 4 +++-
 src/views/modules/visual/basicinfo/peopleList.vue    | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue
index 3358597db..77950ef52 100644
--- a/src/views/modules/visual/basicinfo/basicInfoMain.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue
@@ -316,7 +316,9 @@ const vueGis = {
         path: `/main-shuju/visual-basicinfo-people-list`,
         query: {
           columnName: item.columnName,
-          label: item.label
+          label: item.label,
+          id: this.orgId,
+          level: this.orgLevel
         }
       });
     },
diff --git a/src/views/modules/visual/basicinfo/peopleList.vue b/src/views/modules/visual/basicinfo/peopleList.vue
index b6757fb45..1438a50d6 100644
--- a/src/views/modules/visual/basicinfo/peopleList.vue
+++ b/src/views/modules/visual/basicinfo/peopleList.vue
@@ -127,10 +127,10 @@ export default {
 
     this.searchName = ''
     this.tableData = []
-    const { columnName, label } = this.$route.query
+    const { columnName, label, id, level } = this.$route.query
     this.searchName = columnName
     this.tableTitle = label
-    this.loadList()
+    this.loadList(id, level)
 
   },
   beforeRouteEnter(to, from, next) {
@@ -146,11 +146,13 @@ export default {
 
 
 
-    async loadList () {
+    async loadList (id, level) {
       this.loading = true
       const url = "/epmetuser/icresiuser/searchbycategory"
       let params = {
         columnName: this.searchName,
+        id,
+        level,
         pageSize: this.pageSize,
         pageNo: this.pageNo
       }

From dc3e3182dbd232d42b6083f0ca4dd59b6cdbbde6 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 28 Apr 2022 17:12:38 +0800
Subject: [PATCH 16/17] 111

---
 src/assets/scss/modules/visual/houseStatic.scss                | 2 +-
 src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/assets/scss/modules/visual/houseStatic.scss b/src/assets/scss/modules/visual/houseStatic.scss
index b46923af8..665448d51 100644
--- a/src/assets/scss/modules/visual/houseStatic.scss
+++ b/src/assets/scss/modules/visual/houseStatic.scss
@@ -114,7 +114,7 @@
       width: 100%;
       .echart-wr{
         flex-shrink: 0;
-        height: 380px;
+        height: 420px;
         width: 70%;
       }
       .div-tip{
diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
index ce085141a..f6437d36f 100644
--- a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
+++ b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
@@ -448,7 +448,7 @@ export default {
           selected: true
         }
         let obj2 = {
-          name: '流动人口树',
+          name: '流动人口数',
           value: this.userData.ldUserRatio
         }
 

From 3109e4023c969b2f57d9405746180bde2dced0ad Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 29 Apr 2022 09:37:13 +0800
Subject: [PATCH 17/17] fsdfsa

---
 src/assets/scss/common.scss          | 8 ++++++++
 src/assets/scss/modules/warning.scss | 8 +++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss
index 794afa6f7..b64e02d22 100644
--- a/src/assets/scss/common.scss
+++ b/src/assets/scss/common.scss
@@ -821,3 +821,11 @@ div.el-table div.cell {
   text-overflow: ellipsis;
   word-wrap: normal;
 }
+
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+}
+input[type="number"] {
+  -moz-appearance: textfield;
+}
diff --git a/src/assets/scss/modules/warning.scss b/src/assets/scss/modules/warning.scss
index 2c6b9fa2c..2353a9435 100644
--- a/src/assets/scss/modules/warning.scss
+++ b/src/assets/scss/modules/warning.scss
@@ -85,7 +85,7 @@
                         content: "";
                         width: 8px;
                         height: 8px;
-                        background: #2194fe;
+                        background: #f5f502;
                         border-radius: 50%;
                         position: absolute;
                         left: 12px;
@@ -93,6 +93,12 @@
                         transform: translate(0, -50%);
                     }
 
+                    &:nth-of-type(2) {
+                        &::after {
+                            background: #fb500d;
+                        }
+                    }
+
                     div:nth-child(1) {
                         font-size: 16px;
                         font-family: PingFang SC;