From 521cf1e65cb721fb68651cbc16aa0bef19578824 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 19 Sep 2022 15:29:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=8A=E6=97=A5=E9=9C=80=E6=B1=82=20?=
 =?UTF-8?q?=E4=BB=8A=E6=99=9A=E4=B8=8A=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/epidemic/natFocus/natFocusAdd.vue    | 1056 +++++++-------
 .../base/epidemic/natFocus/natFocusEdit.vue   |  420 +++---
 .../base/epidemic/natFocus/natFocusList.vue   | 1297 +++++++++--------
 .../epidemic/natFocus/natFocusListHistory.vue | 1081 ++++++++++++++
 4 files changed, 2590 insertions(+), 1264 deletions(-)
 create mode 100644 src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue

diff --git a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
index 6f79c2989..256a78224 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
@@ -1,84 +1,129 @@
 <template>
   <div class="epidemic-form">
     <div class="dialog-h-content scroll-h">
-
-      <el-tabs v-model="activeName"
-               type="card"
-               class="main_tab"
-               @tab-click="handleClick">
-        <el-tab-pane label="逐个添加"
-                     name="first">
-          <el-form ref="ref_form1"
-                   :inline="true"
-                   :model="formData1"
-                   :rules="dataRule1"
-                   class="form">
-
-            <el-form-item label="姓名"
-                          prop="name"
-                          label-width="150px"
-                          style="display: block">
-              <el-input class="item_width_2"
-                        placeholder="请输入姓名"
-                        clearable
-                        v-model="formData1.name">
+      <el-tabs
+        v-model="activeName"
+        type="card"
+        class="main_tab"
+        @tab-click="handleClick"
+      >
+        <el-tab-pane label="逐个添加" name="first">
+          <el-form
+            ref="ref_form1"
+            :inline="true"
+            :model="formData1"
+            :rules="dataRule1"
+            class="form"
+          >
+            <el-form-item
+              label="姓名"
+              prop="name"
+              label-width="150px"
+              style="display: block"
+            >
+              <el-input
+                class="item_width_2"
+                placeholder="请输入姓名"
+                clearable
+                v-model="formData1.name"
+              >
               </el-input>
-
             </el-form-item>
 
-            <el-form-item label="手机号"
-                          prop="mobile"
-                          label-width="150px"
-                          style="display: block">
-              <el-input class="item_width_2"
-                        placeholder="请输入手机号"
-                        clearable
-                        v-model="formData1.mobile">
+            <el-form-item
+              label="手机号"
+              prop="mobile"
+              label-width="150px"
+              style="display: block"
+            >
+              <el-input
+                class="item_width_2"
+                placeholder="请输入手机号"
+                clearable
+                v-model="formData1.mobile"
+              >
               </el-input>
             </el-form-item>
-            <el-form-item label="证件号"
-                          prop="idCard"
-                          label-width="150px"
-                          style="display: block">
-              <el-input class="item_width_2"
-                        placeholder="请输入身份证号或证件号"
-                        clearable
-                        v-model="formData1.idCard">
+            <el-form-item
+              label="证件号"
+              prop="idCard"
+              label-width="150px"
+              style="display: block"
+            >
+              <el-input
+                class="item_width_2"
+                placeholder="请输入身份证号或证件号"
+                clearable
+                v-model="formData1.idCard"
+              >
               </el-input>
             </el-form-item>
-            <el-form-item label="关注原因"
-                          prop="reason"
-                          label-width="150px"
-                          style="display: block">
-
-              <el-input class="item_width_1"
-                        placeholder="请输入关注原因"
-                        clearable
-                        v-model="formData1.reason">
+            <el-form-item
+              label="关注原因"
+              prop="reason"
+              label-width="150px"
+              style="display: block"
+            >
+              <el-input
+                class="item_width_1"
+                placeholder="请输入关注原因"
+                clearable
+                v-model="formData1.reason"
+              >
               </el-input>
             </el-form-item>
-            <el-form-item label="备注"
-                          prop="remark"
-                          label-width="150px"
-                          style="display: block">
-              <el-input class="item_width_1"
-                        type="textarea"
-                        maxlength="500"
-                        show-word-limit
-                        :autosize="{ minRows: 2, maxRows: 5 }"
-                        clearable
-                        placeholder="请输入通知备注"
-                        v-model="formData1.remark"></el-input>
+            <el-form-item
+              label="隔离状态"
+              prop="reason"
+              label-width="150px"
+              style="display: block"
+            >
+              <el-select
+                v-model="formData1.isolatedState"
+                placeholder="请选择"
+                clearable
+              >
+                <el-option
+                  v-for="item in options.isolatedState"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item
+              label="备注"
+              prop="remark"
+              label-width="150px"
+              style="display: block"
+            >
+              <el-input
+                class="item_width_1"
+                type="textarea"
+                maxlength="500"
+                show-word-limit
+                :autosize="{ minRows: 2, maxRows: 5 }"
+                clearable
+                placeholder="请输入通知备注"
+                v-model="formData1.remark"
+              ></el-input>
             </el-form-item>
 
-            <el-form-item label="通知渠道"
-                          prop="channel"
-                          label-width="150px"
-                          style="display: block">
-              <el-checkbox v-model="formData1.isSelChannel"
-                           @change="handleChannelChange2"
-                           key="0"
-                           label="0">小程序通知</el-checkbox>
+            <el-form-item
+              label="通知渠道"
+              prop="channel"
+              label-width="150px"
+              style="display: block"
+            >
+              <el-checkbox
+                v-model="formData1.isSelChannel"
+                @change="handleChannelChange2"
+                key="0"
+                label="0"
+                >小程序通知</el-checkbox
+              >
               <!-- <el-checkbox-group v-model="formData1.channel">
                 <el-checkbox key="1"
                              label="1">小程序通知</el-checkbox>
@@ -88,149 +133,177 @@
               </el-checkbox-group> -->
             </el-form-item>
 
-            <el-form-item v-if="formData1.isSelChannel"
-                          label="通知内容"
-                          prop="content"
-                          label-width="150px"
-                          style="display: block">
-              <el-input class="item_width_1"
-                        type="textarea"
-                        maxlength="500"
-                        show-word-limit
-                        :autosize="{ minRows: 4, maxRows: 10 }"
-                        clearable
-                        placeholder="请输入通知内容"
-                        v-model="formData1.content"></el-input>
+            <el-form-item
+              v-if="formData1.isSelChannel"
+              label="通知内容"
+              prop="content"
+              label-width="150px"
+              style="display: block"
+            >
+              <el-input
+                class="item_width_1"
+                type="textarea"
+                maxlength="500"
+                show-word-limit
+                :autosize="{ minRows: 4, maxRows: 10 }"
+                clearable
+                placeholder="请输入通知内容"
+                v-model="formData1.content"
+              ></el-input>
             </el-form-item>
-
           </el-form>
         </el-tab-pane>
-        <el-tab-pane label="批量添加"
-                     name="second">
-
+        <el-tab-pane label="批量添加" name="second">
           <div class="div-mult-table">
-            <el-form :inline="true"
-                     :model="formDataSearch"
-                     ref="ref_formSearch"
-                     :label-width="'90px'">
-              <el-form-item label="所属网格"
-                            label-width="80px">
-                <el-select class="item_width_3"
-                           v-model.trim="formDataSearch.gridId"
-                           placeholder="请选择"
-                           size="mini"
-                           clearable>
-                  <el-option v-for="item in gridList"
-                             :key="item.value"
-                             :label="item.label"
-                             :value="item.value">
+            <el-form
+              :inline="true"
+              :model="formDataSearch"
+              ref="ref_formSearch"
+              :label-width="'90px'"
+            >
+              <el-form-item label="所属网格" label-width="80px">
+                <el-select
+                  class="item_width_3"
+                  v-model.trim="formDataSearch.gridId"
+                  placeholder="请选择"
+                  size="mini"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in gridList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
                   </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="核酸检测次数小于"
-                            label-width="150px">
-                <el-input-number class="item_width_3"
-                                 v-model="formDataSearch.natCount"
-                                 size="mini"
-                                 :min="0"
-                                 :max="20"
-                                 label="核酸检测次数小于"></el-input-number>
+              <el-form-item label="核酸检测次数小于" label-width="150px">
+                <el-input-number
+                  class="item_width_3"
+                  v-model="formDataSearch.natCount"
+                  size="mini"
+                  :min="0"
+                  :max="20"
+                  label="核酸检测次数小于"
+                ></el-input-number>
               </el-form-item>
-              <el-form-item label="检测时间"
-                            label-width="80px"
-                            prop="startTime">
-                <el-date-picker v-model="timeRange"
-                                size="mini"
-                                type="daterange"
-                                @change="handleTimeChange"
-                                format="yyyy-MM-dd"
-                                value-format="yyyyMMdd"
-                                range-separator="至"
-                                start-placeholder="开始时间"
-                                end-placeholder="结束时间">
+              <el-form-item
+                label="检测时间"
+                label-width="80px"
+                prop="startTime"
+              >
+                <el-date-picker
+                  v-model="timeRange"
+                  size="mini"
+                  type="daterange"
+                  @change="handleTimeChange"
+                  format="yyyy-MM-dd"
+                  value-format="yyyyMMdd"
+                  range-separator="至"
+                  start-placeholder="开始时间"
+                  end-placeholder="结束时间"
+                >
                 </el-date-picker>
-
               </el-form-item>
 
-              <el-button style="margin-left:30px"
-                         size="mini"
-                         class="diy-button--search"
-                         @click="handleSearch">查询</el-button>
-              <el-button style="margin-left:10px"
-                         size="mini"
-                         class="diy-button--reset"
-                         @click="resetSearch">重置</el-button>
+              <el-button
+                style="margin-left: 30px"
+                size="mini"
+                class="diy-button--search"
+                @click="handleSearch"
+                >查询</el-button
+              >
+              <el-button
+                style="margin-left: 10px"
+                size="mini"
+                class="diy-button--reset"
+                @click="resetSearch"
+                >重置</el-button
+              >
             </el-form>
-            <el-table ref="ref_table"
-                      class="table"
-                      size="mini"
-                      :data="tableData"
-                      border
-                      :height="tableHeight"
-                      v-loading="tableLoading"
-                      :reserve-selection="true"
-                      :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"
+              size="mini"
+              :data="tableData"
+              border
+              :height="tableHeight"
+              v-loading="tableLoading"
+              :reserve-selection="true"
+              :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="证件号"
-                               min-width="170">
+              <el-table-column
+                prop="idCard"
+                header-align="center"
+                align="center"
+                label="证件号"
+                min-width="170"
+              >
               </el-table-column>
-              <el-table-column prop="houseName"
-                               header-align="center"
-                               align="center"
-                               label="所属房屋"
-                               min-width="170">
+              <el-table-column
+                prop="houseName"
+                header-align="center"
+                align="center"
+                label="所属房屋"
+                min-width="170"
+              >
               </el-table-column>
-              <el-table-column prop="natCount"
-                               header-align="center"
-                               align="center"
-                               label="核酸检测次数"
-                               min-width="100">
+              <el-table-column
+                prop="natCount"
+                header-align="center"
+                align="center"
+                label="核酸检测次数"
+                min-width="100"
+              >
               </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 class="div_selcount">
               <span> 已选择人数：</span>
-              <span style="color:red"> {{selectionAll.length}}</span>
-
+              <span style="color: red"> {{ selectionAll.length }}</span>
             </div>
           </div>
           <div class="div-mult-form">
-
             <!-- <div class="div_person">
               <div class="person_title">已选居民</div>
               <div v-if="selectionAll.length>0">
@@ -246,44 +319,77 @@
               <div v-else
                    class="tag_tip">请从列表中选择居民</div>
             </div> -->
-            <el-form :inline="true"
-                     :model="formData2"
-                     ref="ref_form2"
-                     :label-width="'90px'">
-
-              <el-form-item label="关注原因"
-                            prop="reason"
-                            label-width="100px"
-                            style="display: block">
-
-                <el-input class="item_width_1"
-                          placeholder="请输入关注原因"
-                          clearable
-                          v-model="formData2.reason">
+            <el-form
+              :inline="true"
+              :model="formData2"
+              ref="ref_form2"
+              :label-width="'90px'"
+            >
+              <el-form-item
+                label="关注原因"
+                prop="reason"
+                label-width="100px"
+                style="display: block"
+              >
+                <el-input
+                  class="item_width_1"
+                  placeholder="请输入关注原因"
+                  clearable
+                  v-model="formData2.reason"
+                >
                 </el-input>
               </el-form-item>
-              <el-form-item label="备注"
-                            prop="remark"
-                            label-width="100px"
-                            style="display: block">
-                <el-input class="item_width_1"
-                          type="textarea"
-                          maxlength="500"
-                          show-word-limit
-                          :autosize="{ minRows: 2, maxRows: 5 }"
-                          clearable
-                          placeholder="请输入通知备注"
-                          v-model="formData2.remark"></el-input>
+              <el-form-item
+                label="隔离状态"
+                prop="reason"
+                label-width="100px"
+                style="display: block"
+              >
+                <el-select
+                  v-model="formData2.isolatedState"
+                  placeholder="请选择"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in options.isolatedState"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item
+                label="备注"
+                prop="remark"
+                label-width="100px"
+                style="display: block"
+              >
+                <el-input
+                  class="item_width_1"
+                  type="textarea"
+                  maxlength="500"
+                  show-word-limit
+                  :autosize="{ minRows: 2, maxRows: 5 }"
+                  clearable
+                  placeholder="请输入通知备注"
+                  v-model="formData2.remark"
+                ></el-input>
               </el-form-item>
 
-              <el-form-item label="通知渠道"
-                            prop="channel"
-                            label-width="100px"
-                            style="display: block">
-                <el-checkbox v-model="formData2.isSelChannel"
-                             @change="handleChannelChange2"
-                             key="0"
-                             label="0">小程序通知</el-checkbox>
+              <el-form-item
+                label="通知渠道"
+                prop="channel"
+                label-width="100px"
+                style="display: block"
+              >
+                <el-checkbox
+                  v-model="formData2.isSelChannel"
+                  @change="handleChannelChange2"
+                  key="0"
+                  label="0"
+                  >小程序通知</el-checkbox
+                >
                 <!-- <el-checkbox-group v-model="formData2.channel">
                   <el-checkbox key="0"
                                label="0">小程序通知</el-checkbox>
@@ -293,51 +399,52 @@
                 </el-checkbox-group> -->
               </el-form-item>
 
-              <el-form-item v-if="formData2.isSelChannel"
-                            label="通知内容"
-                            prop="content"
-                            label-width="100px"
-                            style="display: block">
-                <el-input class="item_width_1"
-                          type="textarea"
-                          maxlength="500"
-                          show-word-limit
-                          :autosize="{ minRows: 4, maxRows: 10 }"
-                          clearable
-                          placeholder="请输入通知内容"
-                          v-model="formData2.content"></el-input>
+              <el-form-item
+                v-if="formData2.isSelChannel"
+                label="通知内容"
+                prop="content"
+                label-width="100px"
+                style="display: block"
+              >
+                <el-input
+                  class="item_width_1"
+                  type="textarea"
+                  maxlength="500"
+                  show-word-limit
+                  :autosize="{ minRows: 4, maxRows: 10 }"
+                  clearable
+                  placeholder="请输入通知内容"
+                  v-model="formData2.content"
+                ></el-input>
               </el-form-item>
             </el-form>
           </div>
         </el-tab-pane>
       </el-tabs>
-
     </div>
 
     <div class="form_div_btn">
-      <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button size="small"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
+      <el-button size="small" @click="handleCancle">取 消</el-button>
+      <el-button
+        size="small"
+        type="primary"
+        :disabled="btnDisable"
+        @click="handleComfirm"
+        >确 定</el-button
+      >
     </div>
-
   </div>
 </template>
 
 <script>
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from "vuex";
 
-import { Loading } from 'element-ui' // 引入Loading服务
-import { requestPost } from '@/js/dai/request'
-import { mapGetters } from 'vuex'
-
-
-let loading // 加载动画
+let loading; // 加载动画
 export default {
-  data () {
+  data() {
     return {
-
       activeName: "first",
 
       gridList: [],
@@ -345,34 +452,35 @@ export default {
       btnDisable: false,
 
       formDataSearch: {
-        gridId: '',
+        gridId: "",
         natCount: undefined,
-        startDate: '',
-        endDate: '',
-        attentionType: 2
+        startDate: "",
+        endDate: "",
+        attentionType: 2,
       },
       timeRange: [],
 
       formData1: {
         attentionType: 2,
-        name: '',
-        idCard: '',
-        mobile: '',
-        reason: '',
-        remark: '',
+        name: "",
+        idCard: "",
+        mobile: "",
+        reason: "",
+        remark: "",
         isSelChannel: false,
         channel: [],
-        content: '',
-
+        content: "",
+        isolatedState: "",
       },
 
       formData2: {
         attentionType: 2,
-        reason: '',
-        remark: '',
+        reason: "",
+        remark: "",
         isSelChannel: false,
         channel: [],
-        content: '',
+        content: "",
+        isolatedState: "",
       },
       tableData: [],
       total: 0,
@@ -380,437 +488,405 @@ export default {
       pageNo: 1,
       tableLoading: false,
 
-      selectionAll: [],//选中的人员
+      selectionAll: [], //选中的人员
 
-    }
+      options: {
+        isolatedState: [],
+      },
+    };
   },
+
   components: {},
-  async mounted () {
-    const { user } = this.$store.state
-    this.agencyId = user.agencyId
+
+  async mounted() {
+    const { user } = this.$store.state;
+    this.agencyId = user.agencyId;
     //获取网格下拉框数据
-    await this.loadGrid()
+    await this.loadGrid();
+
+    this.getFmOptions("isolatedState", "/sys/dict/data/dictlist", {
+      dictType: "isolatedState",
+    });
   },
 
   methods: {
-    handleChannelChange1 (val) {
-      this.formData1.content = ''
+    handleChannelChange1(val) {
+      this.formData1.content = "";
     },
-    handleChannelChange2 (val) {
-      this.formData2.content = ''
+    handleChannelChange2(val) {
+      this.formData2.content = "";
     },
 
-    async initForm () {
-      this.tableData = []
-      this.$refs['ref_form1'].resetFields();
-      this.$refs['ref_form2'].resetFields();
+    async initForm() {
+      this.tableData = [];
+      this.$refs["ref_form1"].resetFields();
+      this.$refs["ref_form2"].resetFields();
 
       // await this.loadTable()
-
     },
 
-    handleSearch () {
-      this.selectionAll = []
-      this.loadTable()
+    handleSearch() {
+      this.selectionAll = [];
+      this.loadTable();
     },
 
-    async loadTable () {
-      this.tableLoading = true
+    async loadTable() {
+      this.tableLoading = true;
 
-      const url = "/epmetuser/epidemicPrevention/user-list"
+      const url = "/epmetuser/epidemicPrevention/user-list";
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
       let params = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
-        ...this.formDataSearch
-      }
+        ...this.formDataSearch,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.total = data.total
-        data.list.forEach(element => {
-          element.isSel = false
+        this.total = data.total;
+        data.list.forEach((element) => {
+          element.isSel = false;
         });
-        this.tableData = data.list
-
-        this.analysisTableSelection()
-
+        this.tableData = data.list;
 
+        this.analysisTableSelection();
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
-      this.tableLoading = false
+      this.tableLoading = false;
     },
 
-    handleTimeChange (time) {
+    handleTimeChange(time) {
       if (time) {
-        this.formData.startDate = time[0]
-        this.formData.endDate = time[1]
-
+        this.formData.startDate = time[0];
+        this.formData.endDate = time[1];
       } else {
-        this.formData.startDate = ''
-        this.formData.endDate = ''
-
+        this.formData.startDate = "";
+        this.formData.endDate = "";
       }
-
     },
 
-    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);
         }
-
       }
-
     },
 
     //删除标签
-    handleCloseTag (tag, index) {
+    handleCloseTag(tag, index) {
       for (let i = 0; i < this.tableData.length; i++) {
-
-        let tableItem = this.tableData[i]
-        if (tag.idCard === tableItem.idCard) {//如果表中存在这个数据
-          tableItem.isSel = false
+        let tableItem = this.tableData[i];
+        if (tag.idCard === tableItem.idCard) {
+          //如果表中存在这个数据
+          tableItem.isSel = false;
           this.$refs.ref_table.toggleRowSelection(tableItem);
-          break
+          break;
         }
-
       }
 
       for (let i = 0; i < this.selectionAll.length; i++) {
-        let item = this.selectionAll[i]
+        let item = this.selectionAll[i];
         if (item.idCard === tag.idCard) {
-          this.selectionAll.splice(i, 1)
-          break
+          this.selectionAll.splice(i, 1);
+          break;
         }
-
       }
     },
 
     //回显列表选中的行
-    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);
           }
         });
-      })
-
-
+      });
     },
 
-    handleClick () {
-
-    },
+    handleClick() {},
 
-    async loadGrid () {
-      const url = "/gov/org/customergrid/gridoption"
+    async loadGrid() {
+      const url = "/gov/org/customergrid/gridoption";
 
       let params = {
-        agencyId: this.agencyId
-      }
+        agencyId: this.agencyId,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.gridList = data
-
+        this.gridList = data;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
-
     },
-    handleComfirm () {
-
-      if (this.activeName === 'first') {
-        this.$refs['ref_form1'].validate((valid, messageObj) => {
+    handleComfirm() {
+      if (this.activeName === "first") {
+        this.$refs["ref_form1"].validate((valid, messageObj) => {
           if (!valid) {
-            app.util.validateRule(messageObj)
-
+            app.util.validateRule(messageObj);
           } else {
-            this.handleVero()
+            this.handleVero();
           }
-
-        })
-
+        });
       } else {
-        this.handleVero()
+        this.handleVero();
       }
-
     },
 
-    async handleVero () {
-      let list = []
-      if (this.activeName === 'first') {
-        list.push(this.formData1)
+    async handleVero() {
+      let list = [];
+      if (this.activeName === "first") {
+        list.push(this.formData1);
 
         const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
         if (regPhone.test(this.formData1.mobile) === false) {
-          this.btnDisable = false
+          this.btnDisable = false;
           this.$message({
-            type: 'warning',
-            message: '请输入正确的手机号码'
-          })
+            type: "warning",
+            message: "请输入正确的手机号码",
+          });
           return false;
         }
         const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)|(^[a-zA-Z0-9]{8,9}$)/; //证件号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
         if (regCard.test(this.formData1.idCard) === false) {
-          this.btnDisable = false
+          this.btnDisable = false;
           this.$message({
-            type: 'warning',
-            message: '请输入正确的证件号码'
-          })
+            type: "warning",
+            message: "请输入正确的证件号码",
+          });
           return false;
         }
 
         if (this.formData1.isSelChannel) {
           if (!this.formData1.content) {
             this.$message({
-              type: 'warning',
-              message: '请填写通知内容'
-            })
+              type: "warning",
+              message: "请填写通知内容",
+            });
             return false;
           } else {
-            this.formData1.channel = ['0']
+            this.formData1.channel = ["0"];
           }
-
         } else {
-          this.formData1.channel = []
+          this.formData1.channel = [];
         }
-
       } else {
-
         if (this.selectionAll.length === 0) {
-          this.$message.info('请选择批量添加的人员')
-          return false
+          this.$message.info("请选择批量添加的人员");
+          return false;
         }
 
         if (this.formData2.isSelChannel) {
           if (!this.formData2.content) {
             this.$message({
-              type: 'warning',
-              message: '请填写通知内容'
-            })
+              type: "warning",
+              message: "请填写通知内容",
+            });
             return false;
           } else {
-            this.formData2.channel = ['0']
+            this.formData2.channel = ["0"];
           }
-
         } else {
-          this.formData2.channel = []
+          this.formData2.channel = [];
         }
 
-        this.selectionAll.forEach(element => {
+        this.selectionAll.forEach((element) => {
           let obj = {
             name: element.name,
             idCard: element.idCard,
             mobile: element.mobile,
 
-            ...this.formData2
-          }
+            ...this.formData2,
+          };
 
-          list.push(obj)
+          list.push(obj);
         });
-
       }
-      console.log(list)
+      console.log(list);
 
-      this.btnDisable = true
+      this.btnDisable = true;
       setTimeout(() => {
-        this.btnDisable = false
-      }, 5000)
-      let url = '/epmetuser/icEpidemicSpecialAttention/vaccination-add'
+        this.btnDisable = false;
+      }, 5000);
+      let url = "/epmetuser/icEpidemicSpecialAttention/vaccination-add";
       // url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern/save"
 
       let params = {
-        list: list
-      }
-      const { data, code, msg } = await requestPost(url, params)
+        list: list,
+      };
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
         this.$message({
-          type: 'success',
-          message: '操作成功'
-        })
-        this.resetData()
-        this.$emit('dialogOk')
-        this.btnDisable = false
-
+          type: "success",
+          message: "操作成功",
+        });
+        this.resetData();
+        this.$emit("dialogOk");
+        this.btnDisable = false;
       } else {
-        this.btnDisable = false
-        this.$message.error(msg)
+        this.btnDisable = false;
+        this.$message.error(msg);
       }
-
     },
 
-    handleCancle () {
+    async getFmOptions(field, url, params, cookFn) {
+      const { data, code, msg } = await requestPost(url, {
+        ...params,
+      });
 
-      this.resetData()
-      this.$emit('dialogCancle')
+      if (code === 0) {
+        this.options[field] =
+          typeof cookFn == "function" ? cookFn(data) : data || [];
+      } else {
+        this.$message.error("请求基础数据失败！");
+      }
+    },
 
+    handleCancle() {
+      this.resetData();
+      this.$emit("dialogCancle");
     },
 
-    resetSearch () {
+    resetSearch() {
       this.formDataSearch = {
-        gridId: '',
+        gridId: "",
         natCount: undefined,
-        startDate: '',
-        endDate: '',
-        attentionType: 2
-
-      }
-      this.timeRange = []
+        startDate: "",
+        endDate: "",
+        attentionType: 2,
+      };
+      this.timeRange = [];
     },
 
-    resetData () {
-
+    resetData() {
       this.formData1 = {
-        name: '',
-        idCard: '',
-        mobile: '',
-        reason: '',
-        remark: '',
+        name: "",
+        idCard: "",
+        mobile: "",
+        reason: "",
+        remark: "",
         isSelChannel: false,
         channel: [],
-        content: '',
+        content: "",
         attentionType: 2,
-      }
+        isolatedState: "",
+      };
 
       this.formData2 = {
         attentionType: 2,
-        reason: '',
-        remark: '',
+        reason: "",
+        remark: "",
         isSelChannel: false,
         channel: [],
-        content: '',
-      }
+        content: "",
+        isolatedState: "",
+      };
       this.formDataSearch = {
-        gridId: '',
+        gridId: "",
         natCount: undefined,
-      }
-
-      this.selectionAll = []//选中的人员
+      };
 
+      this.selectionAll = []; //选中的人员
     },
 
-    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();
     },
 
-
     // 开启加载动画
-    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 300
-
+    tableHeight() {
+      return 300;
     },
-    ...mapGetters(['clientHeight', 'iframeHeight']),
-
-    dataRule1 () {
+    ...mapGetters(["clientHeight", "iframeHeight"]),
 
+    dataRule1() {
       return {
-        name: [
-          { required: true, message: '姓名不能为空', trigger: 'blur' }
-        ],
+        name: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
         idCard: [
-          { required: true, message: '证件号不能为空', trigger: 'blur' }
+          { required: true, message: "证件号不能为空", trigger: "blur" },
         ],
         mobile: [
-          { required: true, message: '手机号不能为空', trigger: 'blur' },
+          { required: true, message: "手机号不能为空", trigger: "blur" },
         ],
-
-
-
-
-      }
+      };
     },
-
   },
   props: {
-
-
-
     // serviceList: {
     //   type: Array,
     //   default: []
     // },
-  }
-}
+  },
+};
 </script>
 
-
-<style lang="scss" scoped >
+<style lang="scss" scoped>
 @import "@/assets/scss/modules/management/epidemic.scss";
 </style>
-
-
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue b/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
index 643e0f07f..a19b62c10 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
@@ -1,83 +1,120 @@
 <template>
   <div class="epidemic-form">
     <div class="dialog-h-content scroll-h">
-
-      <el-form ref="ref_form1"
-               :inline="true"
-               :model="formData"
-               :disabled="formType==='detail'"
-               class="form">
-
-        <el-form-item label="姓名"
-                      prop="name"
-                      label-width="150px"
-                      style="display: block">
-          <span>{{formData.name}}</span>
+      <el-form
+        ref="ref_form1"
+        :inline="true"
+        :model="formData"
+        :disabled="formType === 'detail'"
+        class="form"
+      >
+        <el-form-item
+          label="姓名"
+          prop="name"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ formData.name }}</span>
           <!-- <el-input class="item_width_2"
                     placeholder="请输入姓名"
                     clearable
 
                     v-model="formData.name">
           </el-input> -->
-
         </el-form-item>
 
-        <el-form-item label="手机号"
-                      prop="mobile"
-                      label-width="150px"
-                      style="display: block">
-          <span>{{formData.mobile}}</span>
+        <el-form-item
+          label="手机号"
+          prop="mobile"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ formData.mobile }}</span>
           <!-- <el-input class="item_width_2"
                     placeholder="请输入手机号"
                     clearable
                     v-model="formData.mobile">
           </el-input> -->
         </el-form-item>
-        <el-form-item label="证件号"
-                      prop="idCard"
-                      label-width="150px"
-                      style="display: block">
-          <span>{{formData.idCard}}</span>
+        <el-form-item
+          label="证件号"
+          prop="idCard"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ formData.idCard }}</span>
           <!-- <el-input class="item_width_2"
                     placeholder="请输入身份证号"
                     clearable
                     v-model="formData.idCard">
           </el-input> -->
         </el-form-item>
-        <el-form-item label="关注原因"
-                      prop="reason"
-                      label-width="150px"
-                      style="display: block">
-
-          <el-input class="item_width_1"
-                    placeholder="请输入关注原因"
-                    clearable
-                    v-model="formData.reason">
+        <el-form-item
+          label="关注原因"
+          prop="reason"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            placeholder="请输入关注原因"
+            clearable
+            v-model="formData.reason"
+          >
           </el-input>
         </el-form-item>
-        <el-form-item label="备注"
-                      prop="remark"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    type="textarea"
-                    :disabled="formType==='detail'"
-                    maxlength="500"
-                    show-word-limit
-                    :autosize="{ minRows: 2, maxRows: 5 }"
-                    clearable
-                    placeholder="请输入通知备注"
-                    v-model="formData.remark"></el-input>
+        <el-form-item
+          label="隔离状态"
+          prop="reason"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-select
+            v-model="formData.isolatedState"
+            placeholder="请选择"
+            clearable
+          >
+            <el-option
+              v-for="item in options.isolatedState"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          label="备注"
+          prop="remark"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            type="textarea"
+            :disabled="formType === 'detail'"
+            maxlength="500"
+            show-word-limit
+            :autosize="{ minRows: 2, maxRows: 5 }"
+            clearable
+            placeholder="请输入通知备注"
+            v-model="formData.remark"
+          ></el-input>
         </el-form-item>
-        <div v-if=" formType!=='detail'">
-          <el-form-item label="通知渠道"
-                        prop="channel"
-                        label-width="150px"
-                        style="display: block">
-            <el-checkbox v-model="formData.isSelChannel"
-                         @change="handleChannelChange"
-                         key="0"
-                         label="0">小程序通知</el-checkbox>
+        <div v-if="formType !== 'detail'">
+          <el-form-item
+            label="通知渠道"
+            prop="channel"
+            label-width="150px"
+            style="display: block"
+          >
+            <el-checkbox
+              v-model="formData.isSelChannel"
+              @change="handleChannelChange"
+              key="0"
+              label="0"
+              >小程序通知</el-checkbox
+            >
             <!-- <el-checkbox-group v-model="formData.channel">
               <el-checkbox key="0"
                            label="0">小程序通知</el-checkbox>
@@ -87,238 +124,225 @@
             </el-checkbox-group> -->
           </el-form-item>
 
-          <el-form-item v-if="formData.isSelChannel"
-                        label="通知内容"
-                        prop="content"
-                        label-width="150px"
-                        style="display: block">
-            <el-input class="item_width_1"
-                      type="textarea"
-                      maxlength="500"
-                      show-word-limit
-                      :autosize="{ minRows: 4, maxRows: 10 }"
-                      clearable
-                      placeholder="请输入通知内容"
-                      v-model="formData.content"></el-input>
+          <el-form-item
+            v-if="formData.isSelChannel"
+            label="通知内容"
+            prop="content"
+            label-width="150px"
+            style="display: block"
+          >
+            <el-input
+              class="item_width_1"
+              type="textarea"
+              maxlength="500"
+              show-word-limit
+              :autosize="{ minRows: 4, maxRows: 10 }"
+              clearable
+              placeholder="请输入通知内容"
+              v-model="formData.content"
+            ></el-input>
           </el-form-item>
         </div>
       </el-form>
-
     </div>
 
     <div class="form_div_btn">
-      <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button v-if="formType!=='detail'"
-                 size="small"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
+      <el-button size="small" @click="handleCancle">取 消</el-button>
+      <el-button
+        v-if="formType !== 'detail'"
+        size="small"
+        type="primary"
+        :disabled="btnDisable"
+        @click="handleComfirm"
+        >确 定</el-button
+      >
     </div>
-
   </div>
 </template>
 
 <script>
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from "vuex";
+
+let loading; // 加载动画
+function iniGetFmData() {
+  return {
+    attentionType: 2,
+    name: "",
+    idCard: "",
+    mobile: "",
+    reason: "",
+    remark: "",
+    isSelChannel: false,
+    channel: [],
+    content: "",
+
+    isolatedState: "", //隔离状态
+  };
+}
 
-import { Loading } from 'element-ui' // 引入Loading服务
-import { requestPost } from '@/js/dai/request'
-import { mapGetters } from 'vuex'
-
-
-let loading // 加载动画
 export default {
-  data () {
+  data() {
     return {
-
       formType: "edit",
 
       gridList: [],
 
       btnDisable: false,
 
-      formData: {
-        attentionType: 2,
-        name: '',
-        idCard: '',
-        mobile: '',
-        reason: '',
-        remark: '',
-        isSelChannel: false,
-        channel: [],
-        content: '',
-      },
+      formData: iniGetFmData(),
 
-    }
+      options: {
+        isolatedState: [],
+      },
+    };
   },
+
   components: {},
-  async mounted () {
 
+  async mounted() {
+    this.getFmOptions("isolatedState", "/sys/dict/data/dictlist", {
+      dictType: "isolatedState",
+    });
   },
 
-  destroyed () {
-
-  },
+  destroyed() {},
 
   methods: {
-    handleChannelChange (val) {
-      this.formData.content = ''
+    handleChannelChange(val) {
+      this.formData.content = "";
     },
 
-    async initForm (formType, row) {
-      this.formType = formType
-      this.$refs['ref_form1'].resetFields();
-      row.channel = []
-      row.content = ''
-      row.attentionType = 2
-      row.isSelChannel = false
-      this.formData = JSON.parse(JSON.stringify(row))
-
+    async initForm(formType, row) {
+      this.formType = formType;
+      this.$refs["ref_form1"].resetFields();
+      row.channel = [];
+      row.content = "";
+      row.attentionType = 2;
+      row.isSelChannel = false;
+      this.formData = JSON.parse(JSON.stringify(row));
     },
 
-
-    async handleComfirm () {
+    async handleComfirm() {
       if (this.formData.isSelChannel) {
         if (!this.formData.content) {
           this.$message({
-            type: 'warning',
-            message: '请填写通知内容'
-          })
+            type: "warning",
+            message: "请填写通知内容",
+          });
           return false;
         } else {
-          this.formData.channel = ['0']
+          this.formData.channel = ["0"];
         }
-
       } else {
-        this.formData.channel = []
+        this.formData.channel = [];
       }
 
-      this.btnDisable = true
+      this.btnDisable = true;
       setTimeout(() => {
-        this.btnDisable = false
-      }, 5000)
-      let url = '/epmetuser/icEpidemicSpecialAttention/vaccination-update'
+        this.btnDisable = false;
+      }, 5000);
+      let url = "/epmetuser/icEpidemicSpecialAttention/vaccination-update";
 
       // url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icEpidemicSpecialAttention/vaccination-update"
 
-      const { data, code, msg } = await requestPost(url, this.formData)
+      const { data, code, msg } = await requestPost(url, this.formData);
 
       if (code === 0) {
         this.$message({
-          type: 'success',
-          message: '操作成功'
-        })
-        this.resetData()
-        this.$emit('dialogOk')
-        this.btnDisable = false
-
+          type: "success",
+          message: "操作成功",
+        });
+        this.resetData();
+        this.$emit("dialogOk");
+        this.btnDisable = false;
       } else {
-        this.btnDisable = false
-        this.$message.error(msg)
+        this.btnDisable = false;
+        this.$message.error(msg);
       }
-
     },
 
-    handleCancle () {
-
-      this.resetData()
-      this.$emit('dialogCancle')
-
+    handleCancle() {
+      this.resetData();
+      this.$emit("dialogCancle");
     },
 
+    async getFmOptions(field, url, params, cookFn) {
+      const { data, code, msg } = await requestPost(url, {
+        ...params,
+      });
 
+      if (code === 0) {
+        this.options[field] =
+          typeof cookFn == "function" ? cookFn(data) : data || [];
+      } else {
+        this.$message.error("请求基础数据失败！");
+      }
+    },
 
-    resetData () {
-      this.veroId = ''
-
-      this.formData = {
-        attentionType: 2,
-        name: '',
-        idCard: '',
-        mobile: '',
-        reason: '',
-        remark: '',
-        isSelChannel: false,
-        channel: [],
-        content: '',
+    resetData() {
+      this.veroId = "";
 
-      }
+      this.formData = iniGetFmData();
     },
 
-    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();
     },
 
-
     // 开启加载动画
-    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 200
-
+    tableHeight() {
+      return 200;
     },
 
-    ...mapGetters(['clientHeight', 'iframeHeight']),
-    dataRule () {
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+    dataRule() {
       return {
-        name: [
-          { required: true, message: '姓名不能为空', trigger: 'blur' }
-        ],
+        name: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
         idCard: [
-          { required: true, message: '证件号不能为空', trigger: 'blur' }
+          { required: true, message: "证件号不能为空", trigger: "blur" },
         ],
         mobile: [
-          { required: true, message: '手机号不能为空', trigger: 'blur' },
-        ],
-
-
-
-        channel: [
-          { required: false },
-        ],
-        content: [
-          { required: false },
+          { required: true, message: "手机号不能为空", trigger: "blur" },
         ],
 
-      }
+        channel: [{ required: false }],
+        content: [{ required: false }],
+      };
     },
-
   },
   props: {
-
-
-
     // serviceList: {
     //   type: Array,
     //   default: []
     // },
-  }
-}
+  },
+};
 </script>
 
-
-<style lang="scss" scoped >
+<style lang="scss" scoped>
 @import "@/assets/scss/modules/management/epidemic.scss";
 </style>
-
-
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
index 47f0ce8df..7605aab0b 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
@@ -1,64 +1,81 @@
 <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="mobile">
-            <el-input v-model="formData.reason"
-                      size="small"
-                      class="list_item_width_1"
-                      clearable
-                      placeholder="请输入关注原因">
+          <el-form-item label="关注原因" prop="mobile">
+            <el-input
+              v-model="formData.reason"
+              size="small"
+              class="list_item_width_1"
+              clearable
+              placeholder="请输入关注原因"
+            >
             </el-input>
-
           </el-form-item>
-          <el-form-item label="备注"
-                        prop="remark">
-            <el-input v-model="formData.remark"
-                      size="small"
-                      class="list_item_width_1"
-                      clearable
-                      placeholder="请输入备注">
+          <el-form-item label="隔离状态" prop="isolatedState">
+            <el-select
+              v-model="formData.isolatedState"
+              size="small"
+              class="list_item_width_1"
+              placeholder="请选择"
+              clearable
+            >
+              <el-option
+                v-for="item in options.isolatedState"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              v-model="formData.remark"
+              size="small"
+              class="list_item_width_1"
+              clearable
+              placeholder="请输入备注"
+            >
             </el-input>
-
           </el-form-item>
-
         </div>
 
         <div>
@@ -66,321 +83,441 @@
             <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"
+        >
+          <template slot-scope="scope">
+            <a
+              v-if="scope.row.userId"
+              @click="handleWatchPeopleInfo(scope.$index)"
+              >{{ scope.row.name }}</a
+            >
+            <span v-else>{{ scope.row.name }}</span>
+          </template>
         </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>
-        <el-table-column prop="allName"
-                         header-align="center"
-                         align="center"
-                         label="所属房屋"
-                         min-width="200">
+        <el-table-column
+          prop="reason"
+          header-align="center"
+          align="center"
+          label="关注原因"
+          width="180"
+        >
         </el-table-column>
-        <el-table-column prop="reason"
-                         header-align="center"
-                         align="center"
-                         label="关注原因"
-                         width="180">
+        <el-table-column
+          prop="isolatedState"
+          header-align="center"
+          align="center"
+          label="隔离状态"
+          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="lastNatTime"
+          header-align="center"
+          align="center"
+          show-overflow-tooltip
+          label="最后一次核酸时间"
+          width="170"
+        >
         </el-table-column>
-        <el-table-column prop="lastInformTime"
-                         header-align="center"
-                         align="center"
-                         show-overflow-tooltip
-                         label="最后一次通知时间"
-                         width="170">
+
+        <el-table-column
+          prop="remark"
+          header-align="center"
+          align="center"
+          show-overflow-tooltip
+          label="备注"
+          min-width="180"
+        >
         </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">
-      <nat-focus-add ref="ref_form_add"
-                     @dialogCancle="diaClose"
-                     @dialogOk="addFormOk"></nat-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"
+    >
+      <nat-focus-add
+        ref="ref_form_add"
+        @dialogCancle="diaClose"
+        @dialogOk="addFormOk"
+      ></nat-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">
-      <nat-focus-edit ref="ref_form_edit"
-                      @dialogCancle="diaClose"
-                      @dialogOk="addFormOk"></nat-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"
+    >
+      <nat-focus-edit
+        ref="ref_form_edit"
+        @dialogCancle="diaClose"
+        @dialogOk="addFormOk"
+      ></nat-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">
-      <nf-send-notice ref="ref_sendnotice"
-                      @dialogOk="sendNoticeOk"
-                      @dialogCancle="diaClose"></nf-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"
+    >
+      <nf-send-notice
+        ref="ref_sendnotice"
+        @dialogOk="sendNoticeOk"
+        @dialogCancle="diaClose"
+      ></nf-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">
-      <nf-notice-list ref="ref_noticelist"
-                      @dialogCancle="diaClose"></nf-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"
+    >
+      <nf-notice-list
+        ref="ref_noticelist"
+        @dialogCancle="diaClose"
+      ></nf-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">
-      <nf-visite-list ref="ref_visitelist"
-                      @dialogCancle="diaClose"></nf-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"
+    >
+      <nf-visite-list
+        ref="ref_visitelist"
+        @dialogCancle="diaClose"
+      ></nf-visite-list>
     </el-dialog>
 
+    <people-more
+      v-if="showedPeopleMoreInfo && currentPepeleId"
+      :userId="currentPepeleId"
+      :gridName="currentPepeleGridName"
+      @close="showedPeopleMoreInfo = false"
+    />
   </div>
 </template>
 
 <script>
-
-import natFocusAdd from './natFocusAdd'
-import natFocusEdit from './natFocusEdit'
-import nfNoticeList from './nfNoticeList'
-import nfSendNotice from './nfSendNotice'
-import nfVisiteList from './nfVisiteList'
-
+import natFocusAdd from "./natFocusAdd";
+import natFocusEdit from "./natFocusEdit";
+import nfNoticeList from "./nfNoticeList";
+import nfSendNotice from "./nfSendNotice";
+import nfVisiteList from "./nfVisiteList";
+import nextTick from "dai-js/tools/nextTick";
 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服务
+import peopleMore from "@/views/modules/shequ/cpts/people-more";
+
+let loading; // 加载动画
 
-let loading // 加载动画
 export default {
-  data () {
+  data() {
     return {
       loading: false,
       total: 0,
@@ -390,20 +527,26 @@ export default {
 
       selection: [],
 
-      agencyId: '',
+      agencyId: "",
 
       formData: {
-        attentionType: 2,//关注类型，核酸检测：2，疫苗接种：1
-        name: '',
-        mobile: '',
-        idCard: '',
-        remark: '',
-        reason: '',
-        villageId: '',
-        buildId: '',
-        unitId: '',
-        homeId: ''
+        attentionType: 2, //关注类型，核酸检测：2，疫苗接种：1
+        name: "",
+        mobile: "",
+        idCard: "",
+        remark: "",
+        reason: "",
+        villageId: "",
+        buildId: "",
+        unitId: "",
+        homeId: "",
+        isolatedState: "",
+      },
+
+      options: {
+        isolatedState: [],
       },
+
       optionsV: [],
       optionsB: [],
       optionsH: [],
@@ -421,272 +564,302 @@ export default {
       noticeListFormShow: false,
       visiteListFormShow: false,
 
-      editFormTitle: '修改核酸检测关注名单'
+      editFormTitle: "修改重点人群关注名单",
 
-
-    }
+      // 显示人员详情
+      showedPeopleMoreInfo: false,
+      currentPepeleId: "",
+      currentPepeleGridName: "",
+    };
   },
   components: {
-    natFocusAdd, natFocusEdit, nfNoticeList, nfSendNotice, nfVisiteList
+    natFocusAdd,
+    natFocusEdit,
+    nfNoticeList,
+    nfSendNotice,
+    nfVisiteList,
+    peopleMore,
   },
-  async created () {
 
+  activated() {
+    this.$refs["ref_table"].doLayout();
   },
-  activated () {
-    this.$refs['ref_table'].doLayout()
-  },
-  async mounted () {
+
+  async mounted() {
     for (let i = 0; i < 11; i++) {
       let obj = {
-        value: i + '',
-        label: i + '次'
-      }
-      this.natNumList.push(obj)
+        value: i + "",
+        label: i + "次",
+      };
+      this.natNumList.push(obj);
     }
 
-    await this.loadTable()
+    await this.loadTable();
+
+    this.getFmOptions("isolatedState", "/sys/dict/data/dictlist", {
+      dictType: "isolatedState",
+    });
   },
 
   methods: {
-    handleSearch () {
-      this.selectionAll = []
-      this.loadTable()
+    async handleWatchPeopleInfo(rowIndex) {
+      let item = this.tableData[rowIndex];
+      this.currentPepeleId = item.userId;
+      this.currentPepeleGridName = item.gridName;
+      await nextTick();
+      this.showedPeopleMoreInfo = true;
     },
 
-    async loadTable () {
-      this.tableLoading = true
+    async getFmOptions(field, url, params, cookFn) {
+      const { data, code, msg } = await requestPost(url, {
+        ...params,
+      });
 
-      const url = "/epmetuser/icEpidemicSpecialAttention/list"
+      if (code === 0) {
+        this.options[field] =
+          typeof cookFn == "function" ? cookFn(data) : data || [];
+      } else {
+        this.$message.error("请求基础数据失败！");
+      }
+    },
+
+    handleSearch() {
+      this.selectionAll = [];
+      this.loadTable();
+    },
+
+    async loadTable() {
+      this.tableLoading = true;
+
+      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.tableData.forEach(item => {
+        this.analysisTableSelection();
+        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
-
+    diaClose() {
+      this.addFormShow = false;
+      this.editFormShow = false;
+      this.sendNoticeFormShow = false;
+      this.noticeListFormShow = false;
+      this.visiteListFormShow = false;
     },
 
-    handleAdd () {
-      this.addFormShow = true
+    handleAdd() {
+      this.addFormShow = true;
       this.$nextTick(() => {
-        this.$refs.ref_form_add.initForm(null, this.agencyId)
-      })
+        this.$refs.ref_form_add.initForm(null, this.agencyId);
+      });
     },
 
-    async handleEdit (row) {
+    async handleEdit(row) {
       this.editFormTitle = "修改核酸检测关注名单";
       this.editFormShow = true;
-      const row1 = { ...row }
+      const row1 = { ...row };
       let row2 = await this.getInfo(row1);
       this.$refs.ref_form_edit.initForm("edit", row2);
     },
 
-    async handleDetail (row) {
+    async handleDetail(row) {
       this.editFormTitle = "查看核酸检测关注名单";
       this.editFormShow = true;
-      const row1 = { ...row }
+      const row1 = { ...row };
       let row2 = await this.getInfo(row1);
       this.$refs.ref_form_edit.initForm("detail", row2);
     },
 
-    async getInfo (row) {
+    async getInfo(row) {
       const url = "/epmetuser/icEpidemicSpecialAttention/detail";
 
       let params = {
@@ -702,160 +875,146 @@ export default {
       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, '2')
-      })
-
+        this.$refs.ref_sendnotice.initForm(this.selectionAll, "2");
+      });
     },
 
-    handleNoticeList (row) {
-      this.noticeListFormShow = true
+    handleNoticeList(row) {
+      this.noticeListFormShow = true;
       this.$nextTick(() => {
-        this.$refs.ref_noticelist.initTable(row.idCard, '2')
-      })
-
+        this.$refs.ref_noticelist.initTable(row.idCard, "2");
+      });
     },
-    handleVisiteList (row) {
-
-      this.visiteListFormShow = true
+    handleVisiteList(row) {
+      this.visiteListFormShow = true;
       this.$nextTick(() => {
-        this.$refs.ref_visitelist.initTable(row, '2')
-
-      })
-
+        this.$refs.ref_visitelist.initTable(row, "2");
+      });
     },
 
+    addFormOk() {
+      this.addFormShow = false;
+      this.editFormShow = false;
 
-    addFormOk () {
-      this.addFormShow = false
-      this.editFormShow = false
-
-      this.loadTable()
-
+      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: 2,
-        idCards: idCards
-      }
+        ids: 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: 2,//关注类型，核酸检测：2，疫苗接种：1
-        name: '',
-        mobile: '',
-        idCard: '',
-        vaccinationCount: '',
-      }
+        attentionType: 2, //关注类型，核酸检测：2，疫苗接种：1
+        name: "",
+        mobile: "",
+        idCard: "",
+        vaccinationCount: "",
+      };
 
-      this.pageNo = 1
+      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;
@@ -863,23 +1022,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: '2'
-      }
+        attentionType: "2",
+      };
 
       app.ajax.exportFilePost(
         url,
         params,
         (data, rspMsg) => {
-
-          this.download(data, title + '.xlsx')
+          this.download(data, title + ".xlsx");
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg);
@@ -887,53 +1044,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', '2');//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append("file", this.files); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append("attentionType", "2"); //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({
@@ -946,52 +1101,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'])
-  },
-  watch: {
-
+    ...mapGetters(["clientHeight", "iframeHeight"]),
   },
-  props: {
-
-  }
-}
+  watch: {},
+  props: {},
+};
 </script>
 
-<style lang="scss" scoped >
+<style lang="scss" scoped>
 @import "@/assets/scss/modules/management/epidemic.scss";
 </style>
-
-
-
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue b/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
new file mode 100644
index 000000000..8698af92f
--- /dev/null
+++ b/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
@@ -0,0 +1,1081 @@
+<template>
+  <div class="div_main">
+    <div class="div_search">
+      <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-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-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-input>
+          </el-form-item>
+          <el-form-item label="关注原因" prop="mobile">
+            <el-input
+              v-model="formData.reason"
+              size="small"
+              class="list_item_width_1"
+              clearable
+              placeholder="请输入关注原因"
+            >
+            </el-input>
+          </el-form-item>
+          <el-form-item label="隔离状态" prop="isolatedState">
+            <el-select
+              v-model="formData.isolatedState"
+              size="small"
+              class="list_item_width_1"
+              placeholder="请选择"
+              clearable
+            >
+              <el-option
+                v-for="item in options.isolatedState"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              v-model="formData.remark"
+              size="small"
+              class="list_item_width_1"
+              clearable
+              placeholder="请输入备注"
+            >
+            </el-input>
+          </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-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-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-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-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
+          >
+        </div>
+      </el-form>
+    </div>
+
+    <div class="div_table">
+      <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"
+        >
+          <template slot-scope="scope">
+            <a
+              v-if="scope.row.userId"
+              @click="handleWatchPeopleInfo(scope.$index)"
+              >{{ scope.row.name }}</a
+            >
+            <span v-else>{{ scope.row.name }}</span>
+          </template>
+        </el-table-column>
+
+        <!-- <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> -->
+
+        <el-table-column
+          prop="allName"
+          header-align="center"
+          align="center"
+          label="所属房屋"
+          min-width="200"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="reason"
+          header-align="center"
+          align="center"
+          label="关注原因"
+          width="180"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="isolatedState"
+          header-align="center"
+          align="center"
+          label="隔离状态"
+          width="180"
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop="lastNatTime"
+          header-align="center"
+          align="center"
+          show-overflow-tooltip
+          label="最后一次核酸时间"
+          width="170"
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop="remark"
+          header-align="center"
+          align="center"
+          show-overflow-tooltip
+          label="备注"
+          min-width="180"
+        >
+        </el-table-column>
+
+        <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-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
+                >
+              </div>
+
+              <div class="table-more-btn">
+                <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-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>
+      </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"
+    >
+      <nat-focus-add
+        ref="ref_form_add"
+        @dialogCancle="diaClose"
+        @dialogOk="addFormOk"
+      ></nat-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"
+    >
+      <nat-focus-edit
+        ref="ref_form_edit"
+        @dialogCancle="diaClose"
+        @dialogOk="addFormOk"
+      ></nat-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"
+    >
+      <nf-send-notice
+        ref="ref_sendnotice"
+        @dialogOk="sendNoticeOk"
+        @dialogCancle="diaClose"
+      ></nf-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"
+    >
+      <nf-notice-list
+        ref="ref_noticelist"
+        @dialogCancle="diaClose"
+      ></nf-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"
+    >
+      <nf-visite-list
+        ref="ref_visitelist"
+        @dialogCancle="diaClose"
+      ></nf-visite-list>
+    </el-dialog>
+
+    <people-more
+      v-if="showedPeopleMoreInfo && currentPepeleId"
+      :userId="currentPepeleId"
+      :gridName="currentPepeleGridName"
+      @close="showedPeopleMoreInfo = false"
+    />
+  </div>
+</template>
+
+<script>
+import natFocusAdd from "./natFocusAdd";
+import natFocusEdit from "./natFocusEdit";
+import nfNoticeList from "./nfNoticeList";
+import nfSendNotice from "./nfSendNotice";
+import nfVisiteList from "./nfVisiteList";
+import nextTick from "dai-js/tools/nextTick";
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from "vuex";
+import { Loading } from "element-ui"; // 引入Loading服务
+import peopleMore from "@/views/modules/shequ/cpts/people-more";
+
+let loading; // 加载动画
+
+export default {
+  data() {
+    return {
+      loading: false,
+      total: 0,
+      pageSize: 20,
+      pageNo: 1,
+      tableLoading: false,
+
+      selection: [],
+
+      agencyId: "",
+
+      formData: {
+        attentionType: 2, //关注类型，核酸检测：2，疫苗接种：1
+        name: "",
+        mobile: "",
+        idCard: "",
+        remark: "",
+        reason: "",
+        villageId: "",
+        buildId: "",
+        unitId: "",
+        homeId: "",
+        isolatedState: "",
+      },
+
+      options: {
+        isolatedState: [],
+      },
+
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+
+      natNumList: [],
+
+      tableData: [],
+      selectionAll: [],
+
+      //form相关
+      addFormShow: false,
+      editFormShow: false,
+      sendNoticeFormShow: false,
+      noticeListFormShow: false,
+      visiteListFormShow: false,
+
+      editFormTitle: "修改重点人群关注名单",
+
+      // 显示人员详情
+      showedPeopleMoreInfo: false,
+      currentPepeleId: "",
+      currentPepeleGridName: "",
+    };
+  },
+  components: {
+    natFocusAdd,
+    natFocusEdit,
+    nfNoticeList,
+    nfSendNotice,
+    nfVisiteList,
+    peopleMore,
+  },
+
+  activated() {
+    this.$refs["ref_table"].doLayout();
+  },
+
+  async mounted() {
+    for (let i = 0; i < 11; i++) {
+      let obj = {
+        value: i + "",
+        label: i + "次",
+      };
+      this.natNumList.push(obj);
+    }
+
+    await this.loadTable();
+
+    this.getFmOptions("isolatedState", "/sys/dict/data/dictlist", {
+      dictType: "isolatedState",
+    });
+  },
+
+  methods: {
+    async handleWatchPeopleInfo(rowIndex) {
+      let item = this.tableData[rowIndex];
+      this.currentPepeleId = item.userId;
+      this.currentPepeleGridName = item.gridName;
+      await nextTick();
+      this.showedPeopleMoreInfo = true;
+    },
+
+    async getFmOptions(field, url, params, cookFn) {
+      const { data, code, msg } = await requestPost(url, {
+        ...params,
+      });
+
+      if (code === 0) {
+        this.options[field] =
+          typeof cookFn == "function" ? cookFn(data) : data || [];
+      } else {
+        this.$message.error("请求基础数据失败！");
+      }
+    },
+
+    handleSearch() {
+      this.selectionAll = [];
+      this.loadTable();
+    },
+
+    async loadTable() {
+      this.tableLoading = true;
+
+      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,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.total = data.total;
+        this.tableData = data.list;
+
+        this.analysisTableSelection();
+        this.tableData.forEach((item) => {
+          if (!item.allName) {
+            item.allName = "--";
+          }
+          item.roomShow = "";
+          if (
+            !item.villageName &&
+            !item.buildName &&
+            !item.unitName &&
+            !item.homeName
+          ) {
+            item.roomShow = "--";
+          } else {
+            if (item.villageName) {
+              item.roomShow = item.roomShow + item.villageName;
+            }
+            if (item.buildName) {
+              item.roomShow = item.roomShow + item.buildName;
+            }
+            if (item.unitName) {
+              item.roomShow = item.roomShow + item.unitName;
+            }
+            if (item.villageName) {
+              item.roomShow = item.roomShow + item.homeName;
+            }
+          }
+        });
+      } else {
+        this.$message.error(msg);
+      }
+      this.tableLoading = false;
+    },
+
+    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();
+    },
+    handleChangeD() {
+      this.formData.homeId = "";
+      this.getHouseList();
+    },
+
+    getValiheList() {
+      const { user } = this.$store.state;
+      this.$http
+        .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);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsV = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+
+    getBuildList() {
+      this.$http
+        .post("/gov/org/icbuilding/buildingoption", {
+          neighborHoodId: this.formData.villageId,
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsB = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    getUniList() {
+      this.$http
+        .post("/gov/org/icbuildingunit/unitoption", {
+          buildingId: this.formData.buildId,
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsD = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    getHouseList() {
+      this.$http
+        .post("/gov/org/ichouse/houseoption", { unitId: this.formData.unitId })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsH = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+
+    handleSelectTable(selection, row) {
+      row.isSel = !row.isSel;
+
+      if (row.isSel) {
+        this.selectionAll.push(row);
+      } else {
+        for (let i = 0; i < this.selectionAll.length; i++) {
+          let item = this.selectionAll[i];
+          if (item.idCard === row.idCard) {
+            this.selectionAll.splice(i, 1);
+            break;
+          }
+        }
+      }
+    },
+
+    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;
+        for (let j = 0; j < this.selectionAll.length; j++) {
+          let selectionItem = this.selectionAll[j];
+          if (selectionItem.idCard === tableItem.idCard) {
+            isHasItem = true;
+            if (!selFlag) {
+              this.selectionAll.splice(j, 1);
+              break;
+            }
+          }
+        }
+
+        if (!isHasItem && selFlag) {
+          this.selectionAll.push(tableItem);
+        }
+      }
+    },
+
+    //回显列表选中的行
+    analysisTableSelection() {
+      this.$nextTick(() => {
+        this.tableData.forEach((tableItem) => {
+          for (let j = 0; j < this.selectionAll.length; j++) {
+            let selectionItem = this.selectionAll[j];
+
+            if (selectionItem.idCard === tableItem.idCard) {
+              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);
+      });
+    },
+
+    async handleEdit(row) {
+      this.editFormTitle = "修改核酸检测关注名单";
+      this.editFormShow = true;
+      const row1 = { ...row };
+      let row2 = await this.getInfo(row1);
+      this.$refs.ref_form_edit.initForm("edit", row2);
+    },
+
+    async handleDetail(row) {
+      this.editFormTitle = "查看核酸检测关注名单";
+      this.editFormShow = true;
+      const row1 = { ...row };
+      let row2 = await this.getInfo(row1);
+      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() {
+      if (this.selectionAll.length === 0) {
+        this.$message.info("请选择要通知的人员");
+        return false;
+      }
+      this.sendNoticeFormShow = true;
+      this.$nextTick(() => {
+        this.$refs.ref_sendnotice.initForm(this.selectionAll, "2");
+      });
+    },
+
+    handleNoticeList(row) {
+      this.noticeListFormShow = true;
+      this.$nextTick(() => {
+        this.$refs.ref_noticelist.initTable(row.idCard, "2");
+      });
+    },
+    handleVisiteList(row) {
+      this.visiteListFormShow = true;
+      this.$nextTick(() => {
+        this.$refs.ref_visitelist.initTable(row, "2");
+      });
+    },
+
+    addFormOk() {
+      this.addFormShow = false;
+      this.editFormShow = false;
+
+      this.loadTable();
+    },
+    sendNoticeOk() {
+      this.sendNoticeFormShow = false;
+      this.selectionAll = [];
+      this.loadTable();
+    },
+
+    async handleDelete(row) {
+      if (this.selectionAll.length === 0) {
+        this.$message.info("请选择要取消关注的名单");
+        return false;
+      }
+      this.$confirm("确认取消关注选择的名单?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.deleteFocus(row);
+        })
+        .catch((err) => {
+          if (err == "cancel") {
+          }
+        });
+    },
+
+    async deleteFocus(row) {
+      const url = "/epmetuser/icEpidemicSpecialAttention/cancel-attention";
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
+      let idCards = [];
+
+      this.selectionAll.forEach((element) => {
+        idCards.push(element.idCard);
+      });
+      let params = {
+        attentionType: 2,
+        ids: idCards,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "操作成功",
+        });
+
+        this.loadTable();
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //重置搜索条件
+    resetSearch() {
+      this.formData = {
+        attentionType: 2, //关注类型，核酸检测：2，疫苗接种：1
+        name: "",
+        mobile: "",
+        idCard: "",
+        vaccinationCount: "",
+      };
+
+      this.pageNo = 1;
+      // this.loadTable()
+    },
+
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.pageNo = 1;
+      this.loadTable();
+    },
+    handleCurrentChange(val) {
+      this.pageNo = val;
+      this.loadTable();
+    },
+
+    //导出表格
+    async handleExport() {
+      let title = "核酸检测关注名单";
+
+      const url = "/epmetuser/icEpidemicSpecialAttention/vaccination-export";
+
+      app.ajax.exportFilePost(
+        url,
+        this.formData,
+        (data, rspMsg) => {
+          this.download(data, title + ".xlsx");
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+    },
+
+    // 下载文件
+    download(data, fileName) {
+      if (!data) {
+        return;
+      }
+
+      var csvData = new Blob([data]);
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName);
+      }
+      // for Non-IE (chrome, firefox etc.)
+      else {
+        var a = document.createElement("a");
+        document.body.appendChild(a);
+        a.style = "display: none";
+        var url = window.URL.createObjectURL(csvData);
+        a.href = url;
+        a.download = fileName;
+        a.click();
+        a.remove();
+        window.URL.revokeObjectURL(url);
+      }
+    },
+
+    handleExportModule() {
+      let title = "核酸检测关注名单模板";
+
+      const url = "/epmetuser/icEpidemicSpecialAttention/export-template";
+      let params = {
+        attentionType: "2",
+      };
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+          this.download(data, title + ".xlsx");
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+    },
+
+    // 上传文件之前的钩子
+    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;
+      } else {
+        this.files = file;
+        this.fileName = file.name;
+        return true;
+      }
+    },
+    // 上传文件个数超过定义的数量
+    handleExceed(files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`);
+    },
+
+    async uploadFile() {
+      if (this.fileName == "") {
+        this.$message.warning("请选择要上传的文件！");
+        return false;
+      }
+
+      this.$message({
+        showClose: true,
+        message: "导入中，请到系统管理-导入记录中查看进度",
+        duration: 0,
+      });
+
+      //清空上传列表
+      this.$refs["upload"].clearFiles();
+
+      var url = "/epmetuser/icEpidemicSpecialAttention/vaccination-import";
+
+      let fileFormData = new FormData();
+      fileFormData.append("file", this.files); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append("attentionType", "2"); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+
+      window.app.ajax.post2(
+        url,
+        fileFormData,
+        (data, rspMsg) => {
+          if (data.code === 0 && data.msg == "success") {
+            // this.$message.success('导入成功')
+          } else {
+            // this.$message({
+            //   showClose: true,
+            //   message: rspMsg,
+            //   duration: 0,
+            //   type: "error"
+            // })
+            // this.$message.error(rspMsg)
+          }
+
+          // this.loadTable()
+        },
+        (rspMsg, data) => {},
+        { headers: { "Content-Type": "multipart/form-data" } }
+      );
+    },
+
+    // 开启加载动画
+    startLoading() {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
+    },
+    // 结束加载动画
+    endLoading() {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close();
+      }
+    },
+  },
+  computed: {
+    tableHeight() {
+      return this.$store.state.inIframe
+        ? this.clientHeight - 415 + this.iframeHeight
+        : this.clientHeight - 415;
+    },
+
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+  },
+  watch: {},
+  props: {},
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/epidemic.scss";
+</style>