diff --git a/.env.development b/.env.development
index e6ba13a97..7dca7678b 100644
--- a/.env.development
+++ b/.env.development
@@ -8,7 +8,8 @@ VUE_APP_API_SERVER =   https://epmet-cloud.elinkservice.cn/api
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn:41080/api
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn/api
 
-# VUE_APP_NODE_ENV=dev_sdtdt
-VUE_APP_NODE_ENV=dev
+VUE_APP_NODE_ENV=dev_sdtdt
+# VUE_APP_NODE_ENV=dev
 #项目根路径
-VUE_APP_PUBLIC_PATH=epmet-oper
\ No newline at end of file
+VUE_APP_PUBLIC_PATH=epmet-oper
+VUE_APP_CUSTOMER=yantai
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index d97c2234d..92adab092 100644
--- a/public/index.html
+++ b/public/index.html
@@ -48,7 +48,7 @@
       toLoadJs('https://map.qq.com/api/gljs?v=1.exp&key=OB4BZ-D4W3U-B7VVO-4PJWW-6TKDJ-WPB77')
     }
 
-    console.log('============调试版本：1.0.4')
+    console.log('============调试版本：1.0.5')
     console.log('nodeEnv', window.SITE_CONFIG['nodeEnv'])
   </script>
 </head>
diff --git a/src/assets/scss/modules/management/detail-main.scss b/src/assets/scss/modules/management/detail-main.scss
index 31f16237f..0767b7768 100644
--- a/src/assets/scss/modules/management/detail-main.scss
+++ b/src/assets/scss/modules/management/detail-main.scss
@@ -147,6 +147,9 @@
       .info-title-5{
         flex: 0 0 130px;
       }
+      .info-title-6{
+        flex: 0 0 240px;
+      }
 
       > span,
       > div {
diff --git a/src/assets/scss/modules/management/epidemic.scss b/src/assets/scss/modules/management/epidemic.scss
index f8ff057cd..7106aa787 100644
--- a/src/assets/scss/modules/management/epidemic.scss
+++ b/src/assets/scss/modules/management/epidemic.scss
@@ -16,6 +16,12 @@
   .item_width_3 {
     width: 180px;
   }
+  .item_width_4 {
+    width: 350px;
+  }
+  .item_width_5 {
+    width: 450px;
+  }
 
   .btn-selperson {
     margin-left: 20px;
diff --git a/src/main.js b/src/main.js
index 83da7bbc3..ad57961d8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,7 +1,7 @@
 import Vue from "vue";
 import Element from "element-ui";
-// import Mint from "mint-ui";
-// import "mint-ui/lib/style.css";
+import Mint from "mint-ui";
+import "mint-ui/lib/style.css";
 
 import App from "@/App";
 import i18n from "@/i18n";
@@ -60,7 +60,7 @@ Vue.config.productionTip = false;
 // Vue.use(renProcessRunning);
 // Vue.use(renProcessDetail);
 // Vue.use(Element);
-// Vue.use(Mint);
+Vue.use(Mint);
 
 Vue.use(Element, {
   size: "default",
diff --git a/src/utils/index.js b/src/utils/index.js
index ec577e6cb..9567f50d6 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -43,10 +43,8 @@ export function getDictLabel(dictType, dictValue) {
  * 清除登录信息
  */
 export function clearLoginInfo() {
-  console.log('==========clearLoginInfo')
   store.commit("resetStore");
   localStorage.removeItem("token");
-  localStorage.setItem('thePageAtExit', location.href);
   window.SITE_CONFIG["dynamicMenuRoutesHasAdded"] = false;
 }
 
@@ -166,11 +164,7 @@ export function computedCard(idCard) {
   if (sex % 2 === 0)
     sex = "0"; // 性别代码 1代表男，0代表女，暂时不涉及其他类型性别
   else sex = "1";
-  return {
-    age,
-    sex,
-    birth
-  };
+  return { age, sex, birth };
 }
 // 将数组分成小块数组的集合
 export function spliceIntoChunks(arr, chunkSize) {
@@ -209,4 +203,4 @@ export function encryptedData(key, data) {
   encryptor.setPublicKey(key);
   // 加密数据
   return encryptor.encrypt(data);
-}
\ No newline at end of file
+}
diff --git a/src/views/main-shuju/main.vue b/src/views/main-shuju/main.vue
index 869cd5b9c..e1026e6fd 100644
--- a/src/views/main-shuju/main.vue
+++ b/src/views/main-shuju/main.vue
@@ -1,22 +1,27 @@
 <template>
   <fixed1920>
-    <div v-loading.fullscreen.lock="loading"
-         :element-loading-text="$t('loading')"
-         :class="[
+    <div
+      v-loading.fullscreen.lock="loading"
+      :element-loading-text="$t('loading')"
+      :class="[
         'g-bd',
         { 'z-sidebar--fold': $store.state.sidebarFold },
         {
           'z-sidebar--noside': true,
         },
-      ]">
+        { 'z-iframe': $store.state.inIframe },
+      ]"
+    >
       <template v-if="!loading">
-        <main-navbar ref="ref_navbar" />
+        <main-navbar ref="ref_navbar" v-if="!$store.state.inIframe" />
 
         <div class="g-cnt">
-          <main-content v-if="!$store.state.contentIsNeedRefresh"
-                        @changeCustomerName="changeCustomerName" />
+          <main-content
+            v-if="!$store.state.contentIsNeedRefresh"
+            @changeCustomerName="changeCustomerName"
+          />
         </div>
-        <main-theme-tools v-if="!$store.state.inIframe" />
+        <main-theme-tools />
       </template>
     </div>
   </fixed1920>
@@ -33,10 +38,10 @@ import fixed1920 from "@/views/components/fixed1920.vue";
 import MainThemeTools from "./main-theme-tools";
 
 export default {
-  provide () {
+  provide() {
     return {
       // 刷新
-      refresh () {
+      refresh() {
         this.$store.state.contentIsNeedRefresh = true;
         this.$nextTick(() => {
           this.$store.state.contentIsNeedRefresh = false;
@@ -44,7 +49,7 @@ export default {
       },
     };
   },
-  data () {
+  data() {
     return {
       loading: true,
       userType: localStorage.getItem("userType"),
@@ -54,13 +59,13 @@ export default {
     MainNavbar,
     MainContent,
     fixed1920,
-    MainThemeTools
+    MainThemeTools,
   },
 
   watch: {
     $route: "routeHandle",
   },
-  async created () {
+  async created() {
     this.windowResizeHandle();
     this.routeHandle(this.$route);
     Promise.all([this.getWorkUserInfo()]).then(() => {
@@ -69,11 +74,11 @@ export default {
   },
   computed: {},
   methods: {
-    changeCustomerName (customerName) {
+    changeCustomerName(customerName) {
       this.$refs["ref_navbar"].changeCustomerName(customerName);
     },
     // 窗口改变大小
-    windowResizeHandle () {
+    windowResizeHandle() {
       this.$store.state.sidebarFold =
         document.documentElement["clientWidth"] <= 992 || false;
       window.addEventListener(
@@ -85,7 +90,7 @@ export default {
       );
     },
     // 路由, 监听
-    routeHandle (route) {
+    routeHandle(route) {
       if (!route.meta.isTab) {
         this.$store.state.mainShuju.activeName = "";
         this.$store.state.mainShuju.contentTabsActiveName = "";
@@ -111,7 +116,7 @@ export default {
     },
 
     // 获取当前管理员信息
-    async getWorkUserInfo () {
+    async getWorkUserInfo() {
       const url = "/epmetuser/customerstaff/staffbasicinfo";
       let params = {};
       const { data, code, msg } = await requestPost(url, params);
diff --git a/src/views/main.vue b/src/views/main.vue
index eb6f306e1..0d5740997 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -22,7 +22,7 @@
           @changeCustomerName="changeCustomerName"
         />
       </div>
-      <main-theme-tools v-if="!$store.state.inIframe" />
+      <main-theme-tools />
 
       <!-- <secretary-log-notice v-if="!$store.state.inIframe" /> -->
     </template>
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 67be62ad2..7c635a4e7 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -647,6 +647,7 @@ export default {
       }
     },
     async handleDownQr (row, type) {
+      let title = row.label + '二维码.png'
       // const url = window.SITE_CONFIG['apiURL'] + `/gov/org/icneighborhood/createQrCode/${row.neighborHoodId}`
       const url = '/gov/org/agency/create-qrcode'
       const _id = type == 'community' ? row.id : row.neighborHoodId
@@ -661,10 +662,10 @@ export default {
         responseType: 'blob'
       }).then(res => {
         console.log('res----1r', res)
-        if (res.headers["content-disposition"]) {
-          let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
-          console.log('filename', fileName)
-          this.download(res.data, fileName) //释放掉blob对象
+        if (res.data) {
+          // let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+          // console.log('filename', fileName)
+          this.download(res.data, title) //释放掉blob对象
         } else this.$message.error('下载失败')
         // this.download(res.data, '1.png')
       })
diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue
index c87b14164..22eef0ace 100644
--- a/src/views/modules/base/epidemic/antiInfo.vue
+++ b/src/views/modules/base/epidemic/antiInfo.vue
@@ -9,7 +9,14 @@
         <div>
           <el-form-item label="所属网格"
                         prop="gridId">
-            <el-select v-model.trim="searchForm.gridId"
+            <el-cascader class="customer_cascader"
+                         ref="myCascader"
+                         v-model="agencyIdArray"
+                         :options="orgOptions"
+                         :props="orgOptionProps"
+                         :show-all-levels="false"
+                         @change="handleChangeAgency"></el-cascader>
+            <!-- <el-select v-model.trim="searchForm.gridId"
                        placeholder="请选择"
                        size="small"
                        clearable
@@ -20,7 +27,7 @@
                          :label="item.label"
                          :value="item.value">
               </el-option>
-            </el-select>
+            </el-select> -->
 
           </el-form-item>
           <el-form-item label="所属小区"
@@ -471,6 +478,13 @@ import { mapGetters } from 'vuex'
 let loading // 加载动画
 export default {
   data () {
+    let orgOptionProps = {
+      multiple: false,
+      value: 'agencyId',
+      label: 'agencyName',
+      children: 'subAgencyList',
+      checkStrictly: true
+    }
     return {
       loading: false,
       total: 0,
@@ -481,6 +495,10 @@ export default {
       agencyId: '',
       sHeight: 0,
       timeRange: [],
+      agencyIdArray: [],
+      orgOptions: [],
+      orgOptionProps,
+
       searchForm: {
         agencyId: '',
         gridId: '',
@@ -535,10 +553,8 @@ export default {
     //获取场所类型
 
 
-    const { user } = this.$store.state
-    this.agencyId = user.agencyId
-
-    this.getGridList()
+    this.getOrgTreeList()
+    // this.getGridList()
     this.getValiheList()
     await this.loadTable()
     this.sHeight = this.$refs.div_search.offsetHeight + 270
@@ -548,7 +564,6 @@ export default {
   },
 
   methods: {
-
     handleTimeChange (time) {
       if (time) {
         this.searchForm.natStartDate = time[0]
@@ -557,7 +572,31 @@ export default {
       } else {
         this.searchForm.natStartDate = ''
         this.searchForm.natEndDate = ''
+      }
+    },
+    // 更新按钮权限
+    updateBtnAuths () {
+      let rot = this.$route;
+      if (Array.isArray(rot.meta.btns)) {
+        console.log('btns', rot.meta.btns)
+        rot.meta.btns.forEach((item) => {
+          this.btnAuths[item.permissions] = true;
+        });
+      }
+    },
+    async handleTuomin () {
+      const url = "/data/aggregator/epmetuser/detailByType";
 
+      const { data, code, msg } = await requestPost(url, {
+        id: this.selRowId,
+        type: "JMFYXX",
+      });
+
+      if (code === 0) {
+        this.$set(this.formDetail, 'showMobile', data.mobile)
+        this.$set(this.formDetail, 'showIdCard', data.idCard)
+      } else {
+        this.$message.error(msg);
       }
 
     },
@@ -620,6 +659,30 @@ export default {
       this.searchForm.unitId = ''
       this.searchForm.houseId = ''
     },
+
+    handleChangeAgency (val) {
+      let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
+      if (obj) {
+        if (obj.level === 'grid') {
+          this.searchForm.gridId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+          this.searchForm.agencyId = ''
+        } else {
+          this.searchForm.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+          this.searchForm.gridId = ''
+        }
+
+      } else {
+        this.searchForm.agencyId = ''
+        this.searchForm.gridId = ''
+      }
+
+      this.searchForm.neighborId = ''
+      this.searchForm.buildingId = ''
+      this.searchForm.unitId = ''
+      this.searchForm.houseId = ''
+      this.getValiheList()
+    },
+
     handleChangeGrid (val) {
       console.log('val', val)
       this.searchForm.neighborId = ''
@@ -646,6 +709,23 @@ export default {
       this.searchForm.houseId = ''
       this.getHouseList()
     },
+    getOrgTreeList () {
+      const { user } = this.$store.state
+      this.$http
+        .post('/gov/org/customeragency/agencygridtree', {})
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取组织树成功', res.data)
+            this.orgOptions = []
+            this.orgOptions.push(res.data)
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
     getGridList () {
       const { user } = this.$store.state
       this.$http
@@ -665,9 +745,9 @@ export default {
     getValiheList () {
       const { user } = this.$store.state
       this.$http
-        .post('/gov/org/icneighborhood/neighborhoodoption', {
+        .post('/gov/org/icneighborhood/neighborhood-options', {
           gridId: this.searchForm.gridId,
-          agencyId: ''
+          agencyId: this.searchForm.agencyId
           // agencyId: user.agencyId
         })
         .then(({ data: res }) => {
@@ -863,6 +943,7 @@ export default {
     //重置搜索条件
     resetSearch () {
       this.timeRange = []
+      this.agencyIdArray = []
       this.$refs.ref_searchform.resetFields()
       this.searchForm.buildingId = ''
       this.searchForm.unitId = ''
diff --git a/src/views/modules/base/epidemic/epidRisk/risk.vue b/src/views/modules/base/epidemic/epidRisk/risk.vue
new file mode 100644
index 000000000..967a06f93
--- /dev/null
+++ b/src/views/modules/base/epidemic/epidRisk/risk.vue
@@ -0,0 +1,680 @@
+<template>
+  <div class="div_main">
+    <div ref="div_search"
+         class="div_search">
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'110px'">
+
+        <el-form-item label="所属地区"
+                      prop="name">
+          <el-cascader ref="sourceArea"
+                       v-model="sourceAllCode"
+                       class="item_width_2"
+                       :props="areaProps"
+                       @change="handleAreaChange"
+                       clearable></el-cascader>
+
+        </el-form-item>
+
+        <el-form-item label="风险等级"
+                      prop="dangerLevel">
+          <el-select class="item_width_2"
+                     v-model.trim="formData.dangerLevel"
+                     placeholder="请选择"
+                     clearable>
+            <el-option v-for="item in dangerLevelList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+        </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-form>
+    </div>
+    <div class="div_table">
+      <div class="div_btn">
+        <el-button class="diy-button--add"
+                   size="small"
+                   @click="handleAdd">新增</el-button>
+
+        <el-button class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule">下载模板</el-button>
+        <el-upload :headers="$getElUploadHeaders()"
+                   ref="upload"
+                   :multiple='false'
+                   :show-file-list='false'
+                   :before-upload="beforeUpload"
+                   action=""
+                   accept=".xls,.xlsx"
+                   :limit="1"
+                   :on-exceed="handleExceed"
+                   :http-request="uploadHttpRequest">
+          <el-button size="small"
+                     style="margin-left: 10px"
+                     class="diy-button--delete"
+                     :loading="importLoading">{{importBtnTitle}}</el-button>
+        </el-upload>
+
+        <el-button style="margin-left:10px"
+                   class="diy-button--reset"
+                   size="small"
+                   :loading="exportBtn"
+                   @click="handleExport">{{ exportBtnTitle }}</el-button>
+
+      </div>
+
+      <el-table class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%">
+        <!-- <el-table-column type="selection"
+                         width="55"
+                         fixed="left">
+        </el-table-column> -->
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"
+                         fixed="left"></el-table-column>
+
+        <el-table-column prop="allName"
+                         header-align="center"
+                         align="center"
+                         label="风险地区"
+                         min-width="150"
+                         fixed="left">
+        </el-table-column>
+        <el-table-column prop="dangerLevelShow"
+                         header-align="center"
+                         align="center"
+                         label="风险等级"
+                         min-width="100">
+        </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-button type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+            <el-button type="text"
+                       class="div-table-button--delete--noline "
+                       size="small"
+                       @click="handleDelete(scope.row)">删除</el-button>
+
+          </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="formShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="formTitle"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <risk-form v-if="formShow"
+                 ref="ref_form"
+                 @dialogCancle="addFormCancle"
+                 @dialogOk="addFormOk"></risk-form>
+    </el-dialog>
+    <!-- 详情弹出框 -->
+    <el-dialog :visible.sync="detailShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'详情'"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <risk-detail v-if="detailShow"
+                   @dialogCancle="addFormCancle"
+                   ref="ref_detail"></risk-detail>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+
+import riskForm from './riskForm'
+import riskDetail from './riskDetail'
+
+
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+
+      exportBtn: false,
+      exportBtnTitle: '导出',
+      importBtnTitle: '导入',
+      importLoading: false,
+      loading: false,
+      total: 0,
+      pageSize: 20,
+      pageNo: 0,
+      tableLoading: false,
+
+      sHeight: 0,
+
+      dangerLevelList: [],
+      sourceAllCode: [],
+      areaProps: {
+        checkStrictly: true,
+        lazy: true,
+        lazyLoad: this.lzayLoadArea
+      },
+      agencyId: '',
+
+
+      formData: {
+        name: '',//省-市-区	
+        dangerLevel: '',//风险级别
+
+      },
+
+      tableData: [],
+
+      //form相关
+      formShow: false,
+      detailShow: false,
+      formTitle: '新增',
+
+
+    }
+  },
+  components: {
+    riskForm,
+    riskDetail,
+
+  },
+  async created () {
+
+  },
+  async mounted () {
+    //获取场所类型
+
+
+    const { user } = this.$store.state
+    console.log('user-----', user)
+    this.agencyId = user.agencyId
+
+    await this.getDangerLevel()
+    await this.loadTable()
+    this.sHeight = this.$refs.div_search.offsetHeight + 270
+  },
+
+  methods: {
+    lzayLoadArea (node, resolve) {
+      // this.getArea(node, resolve)
+      setTimeout(() => {
+        this.getArea(node, resolve)
+      }, 200)
+    },
+
+    handleSearch () {
+      this.loadTable()
+    },
+
+    async getArea (node, resolve) {
+
+      const url = "/commonservice/areacode/nextarea"
+      let params = {
+        parentLevel: node.data ? node.data.level : '',
+        parentAreaCode: node.data ? node.data.code : ''
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        const nodes = data.map(item => ({
+          value: item.areaCode, //
+          label: item.areaName,
+          code: item.areaCode,
+          level: item.level,
+          leaf: node.level >= 2 // 3层级
+        }))
+        resolve(nodes)
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    async getDangerLevel () {
+
+      const url = "/sys/dict/data/dictlist";
+
+      let params = {
+        dictType: "dangerAreaLevel",
+      };
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.dangerLevelList = data
+
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async loadTable () {
+      this.tableLoading = true
+
+      const url = "/epmetuser/icDangerArea/list"
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icDangerArea/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.tableData.forEach(item => {
+          let selItem = this.dangerLevelList.filter((levelItem) =>
+            item.dangerLevel === levelItem.value);
+
+          if (selItem && selItem.length > 0)
+            item.dangerLevelShow = selItem[0].label
+        });
+
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+    handleAreaChange (val) {
+      console.log(val)
+      if (val.length > 0) {
+        const labels = this.$refs.sourceArea.getCheckedNodes()[0].pathLabels
+
+        this.formData.name = labels.join('-')
+
+      } else {
+
+        this.formData.allName = ''
+
+      }
+    },
+
+    diaClose () {
+      // this.$refs.ref_form.resetData()
+      this.formShow = false
+
+    },
+
+
+    handleDetail (row) {
+      // this.formTitle = '行程详情'
+      this.detailShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_detail.initForm(row)
+      })
+    },
+
+    handleAdd () {
+      this.formTitle = '新增'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('add', '')
+      })
+    },
+
+    handleEdit (row) {
+      this.formTitle = '修改'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('edit', row)
+      })
+    },
+
+    addFormCancle () {
+      this.detailShow = false
+      this.formShow = false
+    },
+    addFormOk () {
+      this.formShow = false
+
+      this.loadTable()
+
+    },
+
+    async handleDelete (row) {
+
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.deleteRick(row)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
+    },
+
+    async deleteRick (row) {
+      const url = "/epmetuser/icDangerArea/delete"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
+
+      let params = [row.id]
+
+      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.sourceAllCode = []
+      this.formData.name = ''
+      this.formData.dangerLevel = ''
+      this.pageSize = 20
+      this.pageNo = 1
+      // this.loadTable()
+    },
+
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+    //导出表格
+    async handleExport () {
+      this.exportBtn = true
+      this.exportBtnTitle = '正在导出...'
+      let params = {
+        ...this.formData
+      }
+
+      await this.$http({
+        method: 'POST',
+        url: '/epmetuser/icDangerArea/export',
+        responseType: 'blob',
+        data: params
+      })
+        .then(res => {
+
+          console.log('resllll', res)
+          let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+          console.log('filename', fileName)
+          let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+          var url = window.URL.createObjectURL(blob)
+          var aLink = document.createElement('a')
+          aLink.style.display = 'none'
+          aLink.href = url
+          aLink.setAttribute('download', fileName)
+          document.body.appendChild(aLink)
+          aLink.click()
+          document.body.removeChild(aLink) //下载完成移除元素
+          window.URL.revokeObjectURL(url) //释放掉blob对象
+        })
+        .catch((err) => {
+          console.log('获取导出情失败', err)
+          this.$message.error('获取导出失败')
+        })
+      this.exportBtnTitle = '导出'
+      this.exportBtn = false
+
+    },
+
+    // 下载文件
+    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);
+      }
+
+    },
+
+    async handleExportModule () {
+
+      const url = "/epmetuser/icDangerArea/downloadTemplate"
+      let params = {}
+      await this.$http({
+        method: 'POST',
+        url,
+        responseType: 'blob',
+        data: params
+      })
+        .then(res => {
+          console.log('res----dddd', res)
+
+          if (res.headers["content-disposition"]) {
+            let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+            console.log('filename', fileName)
+            let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+            var url = window.URL.createObjectURL(blob)
+            var aLink = document.createElement('a')
+            aLink.style.display = 'none'
+            aLink.href = url
+            aLink.setAttribute('download', fileName)
+            document.body.appendChild(aLink)
+            aLink.click()
+            document.body.removeChild(aLink) //下载完成移除元素
+            window.URL.revokeObjectURL(url) //释放掉blob对象
+          } else this.$message.error('下载失败')
+        })
+        .catch(err => {
+          console.log('err', err)
+          return this.$message.error('网络错误')
+        })
+    },
+
+    // 上传文件之前的钩子
+    beforeUpload (file) {
+      this.files = file;
+
+      const isText = file.type === 'application/vnd.ms-excel'
+      const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+
+      if (!isText && !isTextComputer) {
+        this.$message.error('请选择正确格式的文件')
+        return false
+      } else {
+        this.fileName = file.name;
+        return true
+      }
+
+    },
+    // 上传文件个数超过定义的数量
+    handleExceed (files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
+    },
+    async uploadHttpRequest (file) {
+      this.importLoading = true
+      this.importBtnTitle = '正在上传中...'
+      this.$message({
+        showClose: true,
+        message: '导入中，请到系统管理-导入记录中查看进度',
+        duration: 0
+      })
+      const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
+      formData.append('file', file.file) //添加文件对象
+      await this.$http
+        .post('/epmetuser/icDangerArea/import', formData).then(res => {
+          console.log('res-up', res)
+          if (res.data.code == 0 && res.data.msg == 'success') {
+            // this.$message.success('导入成功')
+            this.loadTable()
+          } else this.$message.error(res.data.msg)
+        }).catch(err => {
+          console.log('失败', err)
+          file.onError() //上传失败的文件会从文件列表中删除
+          // this.$message.error('导入失败')
+        })
+      this.importLoading = false
+      this.importBtnTitle = '导入'
+      this.$refs.upload.clearFiles()
+    },
+
+    async uploadFile () {
+      if (this.fileName == "") {
+        this.$message.warning('请选择要上传的文件！')
+        return false
+      }
+
+      this.$message({
+        showClose: true,
+        message: '导入中，请到系统管理-导入记录中查看进度',
+        duration: 0
+      })
+
+      //清空上传列表
+      this.$refs['upload'].clearFiles()
+
+      var url = '/gov/org/house/houseimport'
+
+      let fileFormData = new FormData();
+      fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append('orgId', this.agencyObj.id);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append('orgType', this.agencyObj.level);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+
+      this.importRoomLoading = true
+      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.$emit('refreshTree')
+          this.loadTable()
+          this.importRoomLoading = false
+        },
+        (rspMsg, data) => {
+          this.importRoomLoading = false
+        }, { headers: { 'Content-Type': 'multipart/form-data' } })
+
+
+    }
+  },
+  computed: {
+    tableHeight () {
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h
+
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  watch: {
+    sourceAllCode (val) {
+
+      if (val.length === 0) {
+        this.formData.name = ''
+      }
+
+    }
+  },
+  props: {
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+
+.item_width_2 {
+  width: 300px;
+}
+</style>
+
+
diff --git a/src/views/modules/base/epidemic/epidRisk/riskDetail.vue b/src/views/modules/base/epidemic/epidRisk/riskDetail.vue
new file mode 100644
index 000000000..7ae53ee3d
--- /dev/null
+++ b/src/views/modules/base/epidemic/epidRisk/riskDetail.vue
@@ -0,0 +1,216 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+
+      <div v-if="initLoading"
+           class="m-row">
+        <div class="m-info">
+          <div class="info-prop">
+            <span class="info-title-4">风险地区：</span>
+            <span>{{ formData.name||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-4">风险等级：</span>
+            <span>{{ formData.mobile||'--' }}</span>
+          </div>
+
+        </div>
+      </div>
+
+    </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
+      <!-- <el-button v-if="formType != 'detail'"
+                 size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm('ref_form')">确 定</el-button> -->
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import { dateFormats } from '@/utils/index'
+import { isCard, isMobile } from '@/utils/validate'
+
+let loading // 加载动画
+export default {
+  data () {
+
+    return {
+
+      initLoading: false,
+
+      formData: {},
+
+    }
+  },
+  components: {},
+  async mounted () {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+    //获取网格下拉框数据
+    // await this.loadGrid()
+  },
+  destroyed () {
+    this.nowAllCode = []
+  },
+  methods: {
+
+    async initForm (row) {
+      console.log('row----', row)
+
+      this.formData.agencyId = this.agencyId
+
+      await this.loadFormData(row.id)
+
+      this.initLoading = true
+      console.log('formtype', type)
+
+    },
+
+
+    async loadGrid () {
+      const url = "/gov/org/customergrid/gridoption"
+
+      let params = {
+        agencyId: this.agencyId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.gridList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async handleSelGrid (value) {
+
+      const url = "/epmetuser/icresiuser/demandusers"
+
+      let params = {
+        agencyId: this.agencyId,
+        gridId: value
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.personList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async getArea (node, resolve) {
+
+      const url = "/commonservice/areacode/nextarea"
+      let params = {
+        parentLevel: node.data ? node.data.level : '',
+        parentAreaCode: node.data ? node.data.code : ''
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        const nodes = data.map(item => ({
+          value: item.areaCode, //
+          label: item.areaName,
+          code: item.areaCode,
+          level: item.level,
+          leaf: node.level >= 4 // 5层级
+        }))
+        resolve(nodes)
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async handleSelAddress (value) {
+
+      const url = "/gov/org/house/gethouseinfo/" + value
+
+      const { data, code, msg } = await requestPost(url)
+
+      if (code === 0) {
+        this.formData.presentAddress = data.agencyPathName
+        this.formData.presentAddressCode = data.areaCode
+        this.formData.detailAddress = data.allName
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async handleSelPerson (personItem) {
+      this.formData.userId = personItem.demandUserId
+      this.formData.name = personItem.demandUserName
+      this.formData.mobile = personItem.demandUserMobile
+      this.formData.idCard = personItem.idCard
+      this.handleSelAddress(personItem.houseId)
+    },
+
+    async loadFormData (id) {
+
+      const url = '/epmetuser/tripreport/detail'
+      let params = {
+        id,
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        console.log('deda-------', data)
+        this.formData = { ...data, channel: [], content: '' }
+        this.sourceAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',')
+
+        if (data.userType == 'icresi') this.isFromResi = true
+        else this.nowAllCode = data.presentAddressPathCode && data.presentAddressPathCode.split(',')
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleCancle () {
+      // this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    resetData () {
+
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  }
+}
+</script>
+
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/detail-main.scss";
+</style>
+
+
diff --git a/src/views/modules/base/epidemic/epidRisk/riskForm.vue b/src/views/modules/base/epidemic/epidRisk/riskForm.vue
new file mode 100644
index 000000000..b62e1ee15
--- /dev/null
+++ b/src/views/modules/base/epidemic/epidRisk/riskForm.vue
@@ -0,0 +1,311 @@
+<template>
+  <div class="epidemic-form">
+    <div class="dialog-h-content scroll-h">
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               label-width="150px"
+               class="form">
+
+        <el-form-item label="风险地区"
+                      prop="allName"
+                      style="display: block">
+
+          <el-cascader v-if="formType==='add'"
+                       ref="sourceArea"
+                       v-model="sourceAllCode"
+                       class="item_width_2"
+                       :props="areaProps"
+                       @change="handleSourceArea"
+                       clearable></el-cascader>
+          <span v-else>{{ formData.allName||'--'  }}</span>
+        </el-form-item>
+
+        <el-form-item label="风险等级"
+                      prop="dangerLevel">
+          <el-select class="item_width_2"
+                     v-model.trim="formData.dangerLevel"
+                     placeholder="请选择"
+                     clearable>
+            <el-option v-for="item in dangerLevelList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+
+      </el-form>
+    </div>
+    <div class="form_div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm('ref_form')">确 定</el-button>
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import { dateFormats } from '@/utils/index'
+import { isCard, isMobile } from '@/utils/validate'
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      formType: '',
+      btnDisable: false,
+
+      dangerLevelList: [],
+      sourceAllCode: [],
+      areaProps: {
+        checkStrictly: true,
+        lazy: true,
+        lazyLoad: this.lzayLoadArea
+      },
+
+      formData: {
+
+        dangerLevel: '',
+        allName: '',
+        allNameCode: '',
+
+
+      },
+      dataRule: {
+        allName: [
+          { required: true, message: '风险地区不能为空', trigger: 'change' }
+        ],
+
+        dangerLevel: [
+          { required: true, message: '风险等级不能为空', trigger: 'change' },
+        ],
+
+      },
+      areaProps: {
+        // checkStrictly: true,
+        lazy: true,
+        lazyLoad: this.lzayLoadArea
+      }
+
+    }
+  },
+  components: {},
+  async mounted () {
+
+    await this.getDangerLevel()
+  },
+  destroyed () {
+
+  },
+  methods: {
+
+    lzayLoadArea (node, resolve) {
+      // this.getArea(node, resolve)
+      setTimeout(() => {
+        this.getArea(node, resolve)
+      }, 200)
+    },
+
+    async getDangerLevel () {
+
+      const url = "/sys/dict/data/dictlist";
+
+      let params = {
+        dictType: "dangerAreaLevel",
+      };
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.dangerLevelList = data
+
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    async initForm (type, row) {
+      console.log('row----', row)
+      this.formType = type
+
+      if (type === 'edit') {
+
+        this.formData = JSON.parse(JSON.stringify(row))
+        // this.sourceAllCode = this.formData.allNameCode.split('-')
+
+      } else {
+        const { user } = this.$store.state
+
+        // this.sourceAllCode = user.areaCodePath
+
+      }
+      // this.$nextTick(() => {
+      //   console.log(this.$refs.sourceArea.getCheckedNodes())
+      //   const labels = this.$refs.sourceArea.getCheckedNodes()[0].pathLabels
+
+      //   this.formData.allName = labels.join('-')
+      // })
+
+      console.log('formtype', type)
+
+    },
+
+
+    handleSourceArea (val) {
+      console.log('val-----', val)
+      console.log('label-----', this.$refs.sourceArea.getCheckedNodes()[0].pathLabels)
+      if (val.length > 0) {
+        const labels = this.$refs.sourceArea.getCheckedNodes()[0].pathLabels
+        this.formData.allNameCode = val.join('-')
+        this.formData.allName = labels.join('-')
+
+      } else {
+        this.formData.allNameCode = ''
+        this.formData.allName = ''
+
+      }
+
+    },
+
+    async getArea (node, resolve) {
+
+      const url = "/commonservice/areacode/nextarea"
+      let params = {
+        parentLevel: node.data ? node.data.level : '',
+        parentAreaCode: node.data ? node.data.code : ''
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        const nodes = data.map(item => ({
+          value: item.areaCode, //
+          label: item.areaName,
+          code: item.areaCode,
+          level: item.level,
+          leaf: node.level >= 2 // 3层级
+        }))
+        resolve(nodes)
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    async handleComfirm (formName) {
+      this.$refs[formName].validate(async (valid) => {
+        if (valid) {
+
+
+          this.btnDisable = true
+          setTimeout(() => {
+            this.btnDisable = false
+          }, 5000)
+
+          let url = '/epmetuser/icDangerArea/add'
+          let paramas = {}
+
+          if (this.formType === 'edit') {
+            url = '/epmetuser/icDangerArea/update'
+            paramas.id = this.formData.id
+            paramas.dangerLevel = this.formData.dangerLevel
+
+          } else {
+            url = '/epmetuser/icDangerArea/add'
+            paramas = { ...this.formData }
+            this.formData.id = ''
+          }
+          const { data, code, msg } = await requestPost(url, paramas)
+
+          if (code === 0) {
+            this.$message({
+              type: 'success',
+              message: '操作成功'
+            })
+            this.resetData()
+            this.$emit('dialogOk')
+            this.btnDisable = false
+
+          } else {
+            this.btnDisable = false
+            this.$message.error(msg)
+          }
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+
+
+    },
+
+    handleCancle () {
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    resetData () {
+      this.$refs.ref_form.resetFields()
+      this.formData =
+      {
+        allNameCode: '',
+
+        dangerLevel: '',
+        allName: '',
+
+      }
+
+      this.sourceAllCode = []
+
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  }
+}
+</script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+
+.epidemic-form {
+  .mw180 {
+    min-width: 260px;
+  }
+}
+
+.item_width_2 {
+  width: 400px;
+}
+</style>
+
+
+
+
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
index 1912e820b..9980607b0 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
@@ -1,129 +1,225 @@
 <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="220px"
+                          style="display: block">
+              <el-input class="item_width_4"
+                        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="220px"
+                          style="display: block">
+              <el-input class="item_width_4"
+                        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="220px"
+                          style="display: block">
+              <el-input class="item_width_4"
+                        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="reasonTitle"
+                          prop="reason"
+                          label-width="220px"
+                          style="display: block">
+              <el-input class="item_width_1"
+                        :placeholder="'请输入'+reasonTitle"
+                        clearable
+                        v-model="formData1.reason">
               </el-input>
             </el-form-item>
-            <el-form-item
-              label="隔离状态"
-              prop="isolatedState"
-              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-form-item label="隔离状态"
+                          prop="isolatedState"
+                          label-width="220px"
+                          style="display: block">
+              <el-select v-model="formData1.isolatedState"
+                         class="item_width_4"
+                         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>
+            <div v-if="isPanshi">
+              <el-form-item label="管控时间"
+                            prop="gkStartTime"
+                            label-width="220px"
+                            style="display: block">
+                <el-date-picker v-model="gkTimeRange1"
+                                size="small"
+                                type="daterange"
+                                @change="handleGkTimeChange1"
+                                format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd"
+                                range-separator="至"
+                                start-placeholder="开始时间"
+                                end-placeholder="结束时间">
+
+                </el-date-picker>
+              </el-form-item>
+
+              <el-form-item label="镇（街）干部"
+                            prop="gbName"
+                            label-width="220px"
+                            style="display: block">
+                <el-input class="item_width_4"
+                          placeholder="请输入镇（街）干部"
+                          clearable
+                          v-model="formData1.gbName">
+                </el-input>
+              </el-form-item>
+
+              <el-form-item label="镇（街）干部联系方式"
+                            prop="gbMobile"
+                            label-width="220px"
+                            style="display: block">
+                <el-input class="item_width_4"
+                          placeholder="请输入镇（街）干部联系方式"
+                          clearable
+                          v-model="formData1.gbMobile">
+                </el-input>
+              </el-form-item>
+
+              <el-form-item label="村（社区）网格管理员"
+                            prop="gridManager"
+                            label-width="220px"
+                            style="display: block">
+                <el-input class="item_width_4"
+                          placeholder="请输入村（社区）网格管理员"
+                          clearable
+                          v-model="formData1.gridManager">
+                </el-input>
+              </el-form-item>
+
+              <el-form-item label="村（社区）网格管理员联系方式"
+                            prop="gridManagerMobile"
+                            label-width="220px"
+                            style="display: block">
+                <el-input class="item_width_4"
+                          placeholder="请输入村（社区）网格管理员联系方式"
+                          clearable
+                          v-model="formData1.gridManagerMobile">
+                </el-input>
+              </el-form-item>
+
+              <el-form-item label="基层医务工作者"
+                            prop="healthWorker"
+                            label-width="220px"
+                            style="display: block">
+                <el-input class="item_width_4"
+                          placeholder="请输入基层医务工作者"
+                          clearable
+                          v-model="formData1.healthWorker">
+                </el-input>
+              </el-form-item>
+
+              <el-form-item label="基层医务工作者联系方式"
+                            prop="healthWorkerMobile"
+                            label-width="220px"
+                            style="display: block">
+                <el-input class="item_width_4"
+                          placeholder="请输入基层医务工作者联系方式"
+                          clearable
+                          v-model="formData1.healthWorkerMobile">
+                </el-input>
+              </el-form-item>
+
+              <el-form-item label="民警"
+                            prop="policeName"
+                            label-width="220px"
+                            style="display: block">
+                <el-input class="item_width_4"
+                          placeholder="请输入民警"
+                          clearable
+                          v-model="formData1.policeName">
+                </el-input>
+              </el-form-item>
+
+              <el-form-item label="民警及联系方式"
+                            prop="policeMobile"
+                            label-width="220px"
+                            style="display: block">
+                <el-input class="item_width_4"
+                          placeholder="请输入民警及联系方式"
+                          clearable
+                          v-model="formData1.policeMobile">
+                </el-input>
+              </el-form-item>
+
+              <el-form-item label="志愿者"
+                            prop="volunteerName"
+                            label-width="220px"
+                            style="display: block">
+                <el-input class="item_width_4"
+                          placeholder="请输入志愿者"
+                          clearable
+                          v-model="formData1.volunteerName">
+                </el-input>
+              </el-form-item>
+
+              <el-form-item label="志愿者联系方式"
+                            prop="volunteerMobile"
+                            label-width="220px"
+                            style="display: block">
+                <el-input class="item_width_4"
+                          placeholder="请输入志愿者联系方式"
+                          clearable
+                          v-model="formData1.volunteerMobile">
+                </el-input>
+              </el-form-item>
+            </div>
+
+            <el-form-item label="备注"
+                          prop="remark"
+                          label-width="220px"
+                          style="display: block">
+              <el-input class="item_width_4"
+                        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="220px"
+                          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>
@@ -133,278 +229,224 @@
               </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="220px"
+                          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 :inline="true"
+                     :model="formDataSearch"
+                     ref="ref_formSearch"
+                     label-width="90px">
               <el-form-item label="所属网格">
-                <el-select
-                  class="item_width_3"
-                  v-model.trim="formDataSearch.gridId"
-                  placeholder="请选择"
-                  size="mini"
-                  clearable
-                  @change="handleChangeGrid"
-                >
-                  <el-option
-                    v-for="item in gridList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
+                <el-select class="item_width_3"
+                           v-model.trim="formDataSearch.gridId"
+                           placeholder="请选择"
+                           size="mini"
+                           clearable
+                           @change="handleChangeGrid">
+                  <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="所属小区" prop="neighborId">
-                <el-select
-                  v-model.trim="formDataSearch.neighborId"
-                  placeholder="请选择小区"
-                  size="small"
-                  clearable
-                  class="resi-cell-select"
-                  @clear="handleClearVillage"
-                  @change="handleChangeV"
-                >
-                  <el-option
-                    v-for="item in optionsV"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
+              <el-form-item label="所属小区"
+                            prop="neighborId">
+                <el-select v-model.trim="formDataSearch.neighborId"
+                           placeholder="请选择小区"
+                           size="small"
+                           clearable
+                           class="resi-cell-select"
+                           @clear="handleClearVillage"
+                           @change="handleChangeV">
+                  <el-option v-for="item in optionsV"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value">
                   </el-option>
                 </el-select>
-                <el-select
-                  v-model.trim="formDataSearch.buildingId"
-                  placeholder="楼号"
-                  size="small"
-                  clearable
-                  style="width: 120px"
-                  class="resi-cell-select"
-                  @clear="handleClearBuild"
-                  @change="handleChangeB"
-                >
-                  <el-option
-                    v-for="item in optionsB"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
+                <el-select v-model.trim="formDataSearch.buildingId"
+                           placeholder="楼号"
+                           size="small"
+                           clearable
+                           style="width: 120px"
+                           class="resi-cell-select"
+                           @clear="handleClearBuild"
+                           @change="handleChangeB">
+                  <el-option v-for="item in optionsB"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value">
                   </el-option>
                 </el-select>
-                <el-select
-                  v-model.trim="formDataSearch.unitId"
-                  placeholder="单元"
-                  size="small"
-                  clearable
-                  style="width: 120px"
-                  class="resi-cell-select"
-                  @click="handleClearDan"
-                  @change="handleChangeD"
-                >
-                  <el-option
-                    v-for="item in optionsD"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
+                <el-select v-model.trim="formDataSearch.unitId"
+                           placeholder="单元"
+                           size="small"
+                           clearable
+                           style="width: 120px"
+                           class="resi-cell-select"
+                           @click="handleClearDan"
+                           @change="handleChangeD">
+                  <el-option v-for="item in optionsD"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value">
                   </el-option>
                 </el-select>
-                <el-select
-                  v-model.trim="formDataSearch.houseId"
-                  placeholder="房号"
-                  size="small"
-                  clearable
-                  style="width: 120px"
-                  class="resi-cell-select"
-                >
-                  <el-option
-                    v-for="item in optionsH"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
+                <el-select v-model.trim="formDataSearch.houseId"
+                           placeholder="房号"
+                           size="small"
+                           clearable
+                           style="width: 120px"
+                           class="resi-cell-select">
+                  <el-option v-for="item in optionsH"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value">
                   </el-option>
                 </el-select>
               </el-form-item>
 
-              <el-form-item label="姓名" prop="name">
-                <el-input
-                  v-model="formDataSearch.name"
-                  size="small"
-                  class="list_item_width_1"
-                  clearable
-                  placeholder="请输入姓名"
-                >
+              <el-form-item label="姓名"
+                            prop="name">
+                <el-input v-model="formDataSearch.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="formDataSearch.mobile"
-                  size="small"
-                  class="list_item_width_1"
-                  clearable
-                  placeholder="请输入手机号"
-                >
+              <el-form-item label="手机号"
+                            prop="mobile">
+                <el-input v-model="formDataSearch.mobile"
+                          size="small"
+                          class="list_item_width_1"
+                          clearable
+                          placeholder="请输入手机号">
                 </el-input>
               </el-form-item>
-              <el-form-item label="证件号" prop="idCard">
-                <el-input
-                  v-model="formDataSearch.idCard"
-                  size="small"
-                  class="list_item_width_1"
-                  clearable
-                  placeholder="请输入身份证号或护照号"
-                >
+              <el-form-item label="证件号"
+                            prop="idCard">
+                <el-input v-model="formDataSearch.idCard"
+                          size="small"
+                          class="list_item_width_1"
+                          clearable
+                          placeholder="请输入身份证号或护照号">
                 </el-input>
               </el-form-item>
-              <el-form-item label="年龄" prop="age">
-                <inputRange
-                  v-model="formDataSearch.age"
-                  type="num"
-                  @change="handleAgeChange"
-                />
+              <el-form-item label="年龄"
+                            prop="age">
+                <inputRange v-model="formDataSearch.age"
+                            type="num"
+                            @change="handleAgeChange" />
               </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="220px">
+                <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="检测时间"
-                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="检测时间"
+                            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">
@@ -428,78 +470,187 @@
               <div v-else
                    class="tag_tip">请从列表中选择居民</div>
             </div> -->
-            <el-form
-              :inline="true"
-              :model="formData2"
-              ref="ref_form2"
-              label-width="90px"
-              :rules="dataRule1"
-            >
-              <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"
+                     :rules="dataRule1">
+              <el-form-item :label="reasonTitle"
+                            prop="reason"
+                            label-width="220px"
+                            style="display: block">
+                <el-input class="item_width_1"
+                          :placeholder="'请输入'+reasonTitle"
+                          clearable
+                          v-model="formData2.reason">
                 </el-input>
               </el-form-item>
-              <el-form-item
-                label="隔离状态"
-                prop="isolatedState"
-                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-form-item label="隔离状态"
+                            prop="isolatedState"
+                            label-width="220px"
+                            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>
+
+              <div v-if="isPanshi">
+                <el-form-item label="管控时间"
+                              prop="gkStartTime"
+                              label-width="220px"
+                              style="display: block">
+                  <el-date-picker v-model="gkTimeRange1"
+                                  size="small"
+                                  type="daterange"
+                                  @change="handleGkTimeChange2"
+                                  format="yyyy-MM-dd"
+                                  value-format="yyyy-MM-dd"
+                                  range-separator="至"
+                                  start-placeholder="开始时间"
+                                  end-placeholder="结束时间">
+
+                  </el-date-picker>
+                </el-form-item>
+
+                <el-form-item label="镇（街）干部"
+                              prop="gbName"
+                              label-width="220px"
+                              style="display: block">
+                  <el-input class="item_width_4"
+                            placeholder="请输入镇（街）干部"
+                            clearable
+                            v-model="formData2.gbName">
+                  </el-input>
+                </el-form-item>
+
+                <el-form-item label="镇（街）干部联系方式"
+                              prop="gbMobile"
+                              label-width="220px"
+                              style="display: block">
+                  <el-input class="item_width_4"
+                            placeholder="请输入镇（街）干部联系方式"
+                            clearable
+                            v-model="formData2.gbMobile">
+                  </el-input>
+                </el-form-item>
+
+                <el-form-item label="村（社区）网格管理员"
+                              prop="gridManager"
+                              label-width="220px"
+                              style="display: block">
+                  <el-input class="item_width_4"
+                            placeholder="请输入村（社区）网格管理员"
+                            clearable
+                            v-model="formData2.gridManager">
+                  </el-input>
+                </el-form-item>
+
+                <el-form-item label="村（社区）网格管理员联系方式"
+                              prop="gridManagerMobile"
+                              label-width="220px"
+                              style="display: block">
+                  <el-input class="item_width_4"
+                            placeholder="请输入村（社区）网格管理员联系方式"
+                            clearable
+                            v-model="formData2.gridManagerMobile">
+                  </el-input>
+                </el-form-item>
+
+                <el-form-item label="基层医务工作者"
+                              prop="healthWorker"
+                              label-width="220px"
+                              style="display: block">
+                  <el-input class="item_width_4"
+                            placeholder="请输入基层医务工作者"
+                            clearable
+                            v-model="formData2.healthWorker">
+                  </el-input>
+                </el-form-item>
+
+                <el-form-item label="基层医务工作者联系方式"
+                              prop="healthWorkerMobile"
+                              label-width="220px"
+                              style="display: block">
+                  <el-input class="item_width_4"
+                            placeholder="请输入基层医务工作者联系方式"
+                            clearable
+                            v-model="formData2.healthWorkerMobile">
+                  </el-input>
+                </el-form-item>
+
+                <el-form-item label="民警"
+                              prop="policeName"
+                              label-width="220px"
+                              style="display: block">
+                  <el-input class="item_width_4"
+                            placeholder="请输入民警"
+                            clearable
+                            v-model="formData2.policeName">
+                  </el-input>
+                </el-form-item>
+
+                <el-form-item label="民警及联系方式"
+                              prop="policeMobile"
+                              label-width="220px"
+                              style="display: block">
+                  <el-input class="item_width_4"
+                            placeholder="请输入民警及联系方式"
+                            clearable
+                            v-model="formData2.policeMobile">
+                  </el-input>
+                </el-form-item>
+
+                <el-form-item label="志愿者"
+                              prop="volunteerName"
+                              label-width="220px"
+                              style="display: block">
+                  <el-input class="item_width_4"
+                            placeholder="请输入志愿者"
+                            clearable
+                            v-model="formData2.volunteerName">
+                  </el-input>
+                </el-form-item>
+
+                <el-form-item label="志愿者联系方式"
+                              prop="volunteerMobile"
+                              label-width="220px"
+                              style="display: block">
+                  <el-input class="item_width_4"
+                            placeholder="请输入志愿者联系方式"
+                            clearable
+                            v-model="formData2.volunteerMobile">
+                  </el-input>
+                </el-form-item>
+              </div>
+
+              <el-form-item label="备注"
+                            prop="remark"
+                            label-width="220px"
+                            style="display: block">
+                <el-input class="item_width_4"
+                          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="220px"
+                            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>
@@ -509,23 +660,19 @@
                 </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>
@@ -534,14 +681,12 @@
     </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>
@@ -554,7 +699,7 @@ import inputRange from "@/views/components/rangeInput.vue";
 
 let loading; // 加载动画
 export default {
-  data() {
+  data () {
     return {
       activeName: "first",
 
@@ -597,7 +742,21 @@ export default {
         channel: [],
         content: "",
         isolatedState: "",
+        gkStartTime: '',
+        gkEndTime: '',
+        gbName: '',
+        gbMobile: '',
+        gridManager: '',
+        gridManagerMobile: '',
+        healthWorker: '',
+        healthWorkerMobile: '',
+        policeName: '',
+        policeMobile: '',
+        volunteerName: '',
+        volunteerMobile: '',
       },
+      gkTimeRange1: [],
+      gkTimeRange2: [],
 
       formData2: {
         attentionType: 2,
@@ -607,6 +766,18 @@ export default {
         channel: [],
         content: "",
         isolatedState: "",
+        gkStartTime: '',
+        gkEndTime: '',
+        gbName: '',
+        gbMobile: '',
+        gridManager: '',
+        gridManagerMobile: '',
+        healthWorker: '',
+        healthWorkerMobile: '',
+        policeName: '',
+        policeMobile: '',
+        volunteerName: '',
+        volunteerMobile: '',
       },
       tableData: [],
       total: 0,
@@ -624,7 +795,7 @@ export default {
 
   components: { inputRange },
 
-  async mounted() {
+  async mounted () {
     const { user } = this.$store.state;
     this.agencyId = user.agencyId;
     //获取网格下拉框数据
@@ -636,14 +807,32 @@ export default {
   },
 
   methods: {
-    handleChannelChange1(val) {
+    handleGkTimeChange1 (time) {
+      if (time) {
+        this.formData1.gkStartTime = time[0];
+        this.formData1.gkEndTime = time[1];
+      } else {
+        this.formData1.gkStartTime = "";
+        this.formData1.gkEndTime = "";
+      }
+    },
+    handleGkTimeChange2 (time) {
+      if (time) {
+        this.formData2.gkStartTime = time[0];
+        this.formData2.gkEndTime = time[1];
+      } else {
+        this.formData2.gkStartTime = "";
+        this.formData2.gkEndTime = "";
+      }
+    },
+    handleChannelChange1 (val) {
       this.formData1.content = "";
     },
-    handleChannelChange2(val) {
+    handleChannelChange2 (val) {
       this.formData2.content = "";
     },
 
-    async initForm() {
+    async initForm () {
       this.tableData = [];
       this.$refs["ref_form1"].resetFields();
       this.$refs["ref_form2"].resetFields();
@@ -651,12 +840,12 @@ export default {
       // await this.loadTable()
     },
 
-    handleSearch() {
+    handleSearch () {
       this.selectionAll = [];
       this.loadTable();
     },
 
-    async loadTable() {
+    async loadTable () {
       this.tableLoading = true;
 
       const url = "/epmetuser/epidemicPrevention/user-list";
@@ -683,7 +872,7 @@ export default {
       this.tableLoading = false;
     },
 
-    handleTimeChange(time) {
+    handleTimeChange (time) {
       if (time) {
         this.formData.startDate = time[0];
         this.formData.endDate = time[1];
@@ -693,7 +882,7 @@ export default {
       }
     },
 
-    handleSelectTable(selection, row) {
+    handleSelectTable (selection, row) {
       row.isSel = !row.isSel;
 
       if (row.isSel) {
@@ -709,7 +898,7 @@ export default {
       }
     },
 
-    handleSelAll(selection) {
+    handleSelAll (selection) {
       let selFlag = selection.length > 0; //全选选中 还是 全选不选中
       for (let i = 0; i < this.tableData.length; i++) {
         let tableItem = this.tableData[i];
@@ -733,7 +922,7 @@ export default {
     },
 
     //删除标签
-    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) {
@@ -754,7 +943,7 @@ export default {
     },
 
     //回显列表选中的行
-    analysisTableSelection() {
+    analysisTableSelection () {
       this.$nextTick(() => {
         this.tableData.forEach((tableItem) => {
           for (let j = 0; j < this.selectionAll.length; j++) {
@@ -772,9 +961,9 @@ export default {
       });
     },
 
-    handleClick() {},
+    handleClick () { },
 
-    handleAgeChange(val) {
+    handleAgeChange (val) {
       console.log("val----age---", val);
       if (val.start) {
         const e = this.computedBirth(val.start);
@@ -790,7 +979,7 @@ export default {
       }
     },
 
-    computedBirth(age) {
+    computedBirth (age) {
       let now = new Date();
       let nowYear = now.getFullYear();
       let nowMonth = now.getMonth() + 1;
@@ -806,21 +995,21 @@ export default {
       return subYear + "-" + nowMonth + "-" + nowDay;
     },
 
-    handleClearVillage() {
+    handleClearVillage () {
       this.formDataSearch.buildingId = "";
       this.formDataSearch.unitId = "";
       this.formDataSearch.houseId = "";
     },
-    handleClearBuild() {
+    handleClearBuild () {
       this.formDataSearch.buildingId = "";
       this.formDataSearch.unitId = "";
       this.formDataSearch.houseId = "";
     },
-    handleClearDan() {
+    handleClearDan () {
       this.formDataSearch.unitId = "";
       this.formDataSearch.houseId = "";
     },
-    handleChangeGrid(val) {
+    handleChangeGrid (val) {
       console.log("val", val);
       this.formDataSearch.neighborId = "";
       this.formDataSearch.buildingId = "";
@@ -828,26 +1017,26 @@ export default {
       this.formDataSearch.houseId = "";
       this.getValiheList();
     },
-    handleChangeV(val) {
+    handleChangeV (val) {
       console.log("val", val);
       this.formDataSearch.buildingId = "";
       this.formDataSearch.unitId = "";
       this.formDataSearch.houseId = "";
       this.getBuildList();
     },
-    handleChangeB(val) {
+    handleChangeB (val) {
       console.log("val", val);
       this.formDataSearch.unitId = "";
       this.formDataSearch.houseId = "";
       this.getUniList();
     },
-    handleChangeD(val) {
+    handleChangeD (val) {
       console.log("val", val);
       this.formDataSearch.houseId = "";
       this.getHouseList();
     },
 
-    async loadGrid() {
+    async loadGrid () {
       const url = "/gov/org/customergrid/gridoption";
 
       let params = {
@@ -862,7 +1051,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    getValiheList() {
+    getValiheList () {
       const { user } = this.$store.state;
       this.$http
         .post("/gov/org/icneighborhood/neighborhoodoption", {
@@ -882,7 +1071,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    getBuildList() {
+    getBuildList () {
       this.$http
         .post("/gov/org/icbuilding/buildingoption", {
           neighborHoodId: this.formDataSearch.neighborId,
@@ -899,7 +1088,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    getUniList() {
+    getUniList () {
       this.$http
         .post("/gov/org/icbuildingunit/unitoption", {
           buildingId: this.formDataSearch.buildingId,
@@ -916,7 +1105,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    getHouseList() {
+    getHouseList () {
       this.$http
         .post("/gov/org/ichouse/houseoption", {
           unitId: this.formDataSearch.unitId,
@@ -934,7 +1123,7 @@ export default {
         });
     },
 
-    handleComfirm() {
+    handleComfirm () {
       if (this.activeName === "first") {
         this.$refs["ref_form1"].validate((valid, messageObj) => {
           if (!valid) {
@@ -954,7 +1143,7 @@ export default {
       }
     },
 
-    async handleVero() {
+    async handleVero () {
       let list = [];
       if (this.activeName === "first") {
         list.push(this.formData1);
@@ -1051,7 +1240,7 @@ export default {
       }
     },
 
-    async getFmOptions(field, url, params, cookFn) {
+    async getFmOptions (field, url, params, cookFn) {
       const { data, code, msg } = await requestPost(url, {
         ...params,
       });
@@ -1064,12 +1253,12 @@ export default {
       }
     },
 
-    handleCancle() {
+    handleCancle () {
       this.resetData();
       this.$emit("dialogCancle");
     },
 
-    resetSearch() {
+    resetSearch () {
       this.formDataSearch = {
         gridId: "",
         natCount: undefined,
@@ -1080,7 +1269,7 @@ export default {
       this.timeRange = [];
     },
 
-    resetData() {
+    resetData () {
       this.formData1 = {
         name: "",
         idCard: "",
@@ -1092,7 +1281,20 @@ export default {
         content: "",
         attentionType: 2,
         isolatedState: "",
+        gkStartTime: '',
+        gkEndTime: '',
+        gbName: '',
+        gbMobile: '',
+        gridManager: '',
+        gridManagerMobile: '',
+        healthWorker: '',
+        healthWorkerMobile: '',
+        policeName: '',
+        policeMobile: '',
+        volunteerName: '',
+        volunteerMobile: '',
       };
+      this.gkTimeRange1 = [];
 
       this.formData2 = {
         attentionType: 2,
@@ -1102,7 +1304,20 @@ export default {
         channel: [],
         content: "",
         isolatedState: "",
+        gkStartTime: '',
+        gkEndTime: '',
+        gbName: '',
+        gbMobile: '',
+        gridManager: '',
+        gridManagerMobile: '',
+        healthWorker: '',
+        healthWorkerMobile: '',
+        policeName: '',
+        policeMobile: '',
+        volunteerName: '',
+        volunteerMobile: '',
       };
+      this.gkTimeRange2 = [];
       this.formDataSearch = {
         gridId: "",
         natCount: undefined,
@@ -1111,18 +1326,18 @@ export default {
       this.selectionAll = []; //选中的人员
     },
 
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       this.pageSize = val;
       this.pageNo = 1;
       this.loadTable();
     },
-    handleCurrentChange(val) {
+    handleCurrentChange (val) {
       this.pageNo = val;
       this.loadTable();
     },
 
     // 开启加载动画
-    startLoading() {
+    startLoading () {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: "正在加载……", // 加载中需要显示的文字
@@ -1130,7 +1345,7 @@ export default {
       });
     },
     // 结束加载动画
-    endLoading() {
+    endLoading () {
       // clearTimeout(timer);
       if (loading) {
         loading.close();
@@ -1138,12 +1353,12 @@ export default {
     },
   },
   computed: {
-    tableHeight() {
+    tableHeight () {
       return 300;
     },
     ...mapGetters(["clientHeight", "iframeHeight"]),
 
-    dataRule1() {
+    dataRule1 () {
       return {
         name: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
         idCard: [
@@ -1159,10 +1374,14 @@ export default {
     },
   },
   props: {
-    // serviceList: {
-    //   type: Array,
-    //   default: []
-    // },
+    isPanshi: {
+      type: Boolean,
+      default: false
+    },
+    reasonTitle: {
+      type: String,
+      default: '关注原因'
+    },
   },
 };
 </script>
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue b/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
index c80f883ed..81c0cafbb 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
@@ -7,148 +7,305 @@
                    class="diy-button--search"
                    @click="handleTuomin">显示脱敏信息</el-button>
       </div>
-      <el-form v-if="formType !== 'detail'"
-               ref="ref_form1"
-               :inline="true"
-               :model="formData"
-               :rules="dataRule"
-               class="form">
-        <el-form-item label="姓名"
-                      prop="name"
-                      label-width="150px"
-                      style="display: block">
-          <span>{{ formData.name }}</span>
-          <!-- <el-input class="item_width_2"
+      <div class="epidemic-form">
+        <el-form v-if="formType !== 'detail'"
+                 ref="ref_form1"
+                 :inline="true"
+                 :model="formData"
+                 :rules="dataRule"
+                 class="form">
+          <el-form-item label="姓名"
+                        prop="name"
+                        label-width="220px"
+                        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-input class="item_width_2"
+          </el-form-item>
+
+          <el-form-item label="手机号"
+                        prop="mobile"
+                        label-width="220px"
+                        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-input class="item_width_2"
+          </el-form-item>
+          <el-form-item label="证件号"
+                        prop="idCard"
+                        label-width="220px"
+                        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-input>
-        </el-form-item>
-        <el-form-item label="隔离状态"
-                      prop="isolatedState"
-                      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"
-                    maxlength="500"
-                    show-word-limit
-                    :autosize="{ minRows: 2, maxRows: 5 }"
-                    clearable
-                    placeholder="请输入通知备注"
-                    v-model="formData.remark"></el-input>
-        </el-form-item>
-
-        <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-form-item>
+          <el-form-item :label="reasonTitle"
+                        prop="reason"
+                        label-width="220px"
+                        style="display: block">
+            <el-input class="item_width_4"
+                      :placeholder="'请输入'+reasonTitle"
+                      clearable
+                      v-model="formData.reason">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="隔离状态"
+                        prop="isolatedState"
+                        label-width="220px"
+                        style="display: block">
+            <el-select v-model="formData.isolatedState"
+                       class="item_width_4"
+                       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>
+
+          <div v-if="isPanshi">
+            <el-form-item label="管控时间"
+                          prop="gkStartTime"
+                          label-width="220px"
+                          style="display: block">
+              <el-date-picker v-model="gkTimeRange"
+                              size="small"
+                              type="daterange"
+                              @change="handleGkTimeChange"
+                              format="yyyy-MM-dd"
+                              value-format="yyyy-MM-dd"
+                              range-separator="至"
+                              start-placeholder="开始时间"
+                              end-placeholder="结束时间">
+
+              </el-date-picker>
+            </el-form-item>
+
+            <el-form-item label="镇（街）干部"
+                          prop="gbName"
+                          label-width="220px"
+                          style="display: block">
+              <el-input class="item_width_4"
+                        placeholder="请输入镇（街）干部"
+                        clearable
+                        v-model="formData.gbName">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="镇（街）干部联系方式"
+                          prop="gbMobile"
+                          label-width="220px"
+                          style="display: block">
+              <el-input class="item_width_4"
+                        placeholder="请输入镇（街）干部联系方式"
+                        clearable
+                        v-model="formData.gbMobile">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="村（社区）网格管理员"
+                          prop="gridManager"
+                          label-width="220px"
+                          style="display: block">
+              <el-input class="item_width_4"
+                        placeholder="请输入村（社区）网格管理员"
+                        clearable
+                        v-model="formData.gridManager">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="村（社区）网格管理员联系方式"
+                          prop="gridManagerMobile"
+                          label-width="220px"
+                          style="display: block">
+              <el-input class="item_width_4"
+                        placeholder="请输入村（社区）网格管理员联系方式"
+                        clearable
+                        v-model="formData.gridManagerMobile">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="基层医务工作者"
+                          prop="healthWorker"
+                          label-width="220px"
+                          style="display: block">
+              <el-input class="item_width_4"
+                        placeholder="请输入基层医务工作者"
+                        clearable
+                        v-model="formData.healthWorker">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="基层医务工作者联系方式"
+                          prop="healthWorkerMobile"
+                          label-width="220px"
+                          style="display: block">
+              <el-input class="item_width_4"
+                        placeholder="请输入基层医务工作者联系方式"
+                        clearable
+                        v-model="formData.healthWorkerMobile">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="民警"
+                          prop="policeName"
+                          label-width="220px"
+                          style="display: block">
+              <el-input class="item_width_4"
+                        placeholder="请输入民警"
+                        clearable
+                        v-model="formData.policeName">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="民警及联系方式"
+                          prop="policeMobile"
+                          label-width="220px"
+                          style="display: block">
+              <el-input class="item_width_4"
+                        placeholder="请输入民警及联系方式"
+                        clearable
+                        v-model="formData.policeMobile">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="志愿者"
+                          prop="volunteerName"
+                          label-width="220px"
+                          style="display: block">
+              <el-input class="item_width_4"
+                        placeholder="请输入志愿者"
+                        clearable
+                        v-model="formData.volunteerName">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="志愿者联系方式"
+                          prop="volunteerMobile"
+                          label-width="220px"
+                          style="display: block">
+              <el-input class="item_width_4"
+                        placeholder="请输入志愿者联系方式"
+                        clearable
+                        v-model="formData.volunteerMobile">
+              </el-input>
+            </el-form-item>
+          </div>
+
+          <el-form-item label="备注"
+                        prop="remark"
+                        label-width="220px"
+                        style="display: block">
+            <el-input class="item_width_4"
+                      type="textarea"
+                      maxlength="500"
+                      show-word-limit
+                      :autosize="{ minRows: 2, maxRows: 5 }"
+                      clearable
+                      placeholder="请输入通知备注"
+                      v-model="formData.remark"></el-input>
+          </el-form-item>
+
+          <el-form-item label="通知渠道"
+                        prop="channel"
+                        label-width="220px"
+                        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>
               <el-checkbox key="1"
                            label="1">短信通知</el-checkbox>
 
             </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>
-
-      </el-form>
+          </el-form-item>
+
+          <el-form-item v-if="formData.isSelChannel"
+                        label="通知内容"
+                        prop="content"
+                        label-width="220px"
+                        style="display: block">
+            <el-input class="item_width_4"
+                      type="textarea"
+                      maxlength="500"
+                      show-word-limit
+                      :autosize="{ minRows: 4, maxRows: 10 }"
+                      clearable
+                      placeholder="请输入通知内容"
+                      v-model="formData.content"></el-input>
+          </el-form-item>
+
+        </el-form>
+      </div>
 
       <div v-if="formType === 'detail'"
            class="m-row">
         <div class="m-info">
           <div class="info-prop">
-            <span class="info-title-2">姓名：</span>
+            <span class="info-title-6">姓名：</span>
             <span>{{ formData.name||'--'  }}</span>
           </div>
 
           <div class="info-prop">
-            <span class="info-title-2">手机号：</span>
+            <span class="info-title-6">手机号：</span>
             <span>{{ formData.showMobile||'--' }}</span>
           </div>
 
           <div class="info-prop">
-            <span class="info-title-2">证件号：</span>
+            <span class="info-title-6">证件号：</span>
             <span>{{ formData.showIdCard||'--'  }}</span>
           </div>
 
           <div class="info-prop">
-            <span class="info-title-2">关注原因：</span>
+            <span class="info-title-6">{{reasonTitle}}：</span>
             <span>{{ formData.reason||'--'  }}</span>
           </div>
           <div class="info-prop">
-            <span class="info-title-2">隔离状态：</span>
+            <span class="info-title-6">隔离状态：</span>
             <span>{{ formData.isolatedStateShow||'--'  }}</span>
           </div>
+          <div class="info-prop">
+            <span class="info-title-6">管控时间：</span>
+            <span>{{ formData.gkTime||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-6">镇（街）干部及联系方式：</span>
+            <span>{{ formData.gb||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-6">村（社区）网格管理员及联系方式：</span>
+            <span>{{ formData.gridManagerShow||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-6">基层医务工作者及联系方式：</span>
+            <span>{{ formData.healthWorkerShow||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-6">民警及联系方式：</span>
+            <span>{{ formData.policeShow||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-6">志愿者及联系方式：</span>
+            <span>{{ formData.volunteerShow||'--'  }}</span>
+          </div>
 
           <div class="info-prop">
-            <span class="info-title-2">备注：</span>
+            <span class="info-title-6">备注：</span>
             <span>{{ formData.remark||'--'  }}</span>
           </div>
 
@@ -189,8 +346,19 @@ function iniGetFmData () {
     isSelChannel: false,
     channel: [],
     content: "",
-
     isolatedState: "", //隔离状态
+    gkStartTime: '',
+    gkEndTime: '',
+    gbName: '',
+    gbMobile: '',
+    gridManager: '',
+    gridManagerMobile: '',
+    healthWorker: '',
+    healthWorkerMobile: '',
+    policeName: '',
+    policeMobile: '',
+    volunteerName: '',
+    volunteerMobile: '',
   };
 }
 
@@ -208,6 +376,7 @@ export default {
       options: {
         isolatedState: [],
       },
+      gkTimeRange: [],
     };
   },
 
@@ -238,6 +407,17 @@ export default {
       }
 
     },
+
+    handleGkTimeChange (time) {
+      if (time) {
+        this.formData.gkStartTime = time[0];
+        this.formData.gkEndTime = time[1];
+      } else {
+        this.formData.gkStartTime = "";
+        this.formData.gkEndTime = "";
+      }
+    },
+
     handleChannelChange (val) {
       this.formData.content = "";
     },
@@ -253,6 +433,7 @@ export default {
       row.attentionType = 2;
       row.isSelChannel = false;
       this.formData = JSON.parse(JSON.stringify(row));
+      this.gkTimeRange = row.gkTimeRange
       this.veroId = row.id
       this.options.isolatedState.forEach(element => {
         if (this.formData.isolatedState === element.value) {
@@ -389,6 +570,14 @@ export default {
       type: String,
       default: '',
     },
+    isPanshi: {
+      type: Boolean,
+      default: false
+    },
+    reasonTitle: {
+      type: String,
+      default: '关注原因'
+    },
   },
 };
 </script>
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
index bf4ff1a2e..4c5f3e83d 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
@@ -34,13 +34,13 @@
                       placeholder="请输入身份证号或护照号">
             </el-input>
           </el-form-item>
-          <el-form-item label="关注原因"
+          <el-form-item :label="reasonTitle"
                         prop="mobile">
             <el-input v-model="formData.reason"
                       size="small"
                       class="list_item_width_1"
                       clearable
-                      placeholder="请输入关注原因">
+                      :placeholder="'请输入'+reasonTitle">
             </el-input>
           </el-form-item>
           <el-form-item label="隔离状态"
@@ -245,7 +245,7 @@
         <el-table-column prop="reason"
                          header-align="center"
                          align="center"
-                         label="关注原因"
+                         :label="reasonTitle"
                          width="180">
         </el-table-column>
         <el-table-column prop="isolatedState"
@@ -265,6 +265,50 @@
                          label="最后一次核酸时间"
                          width="170">
         </el-table-column>
+        <template v-if="isPanshi">
+          <el-table-column prop="gkTime"
+                           header-align="center"
+                           align="center"
+                           show-overflow-tooltip
+                           label="管控时间"
+                           min-width="180">
+          </el-table-column>
+          <el-table-column prop="gb"
+                           header-align="center"
+                           align="center"
+                           show-overflow-tooltip
+                           label="镇（街）干部"
+                           min-width="180">
+          </el-table-column>
+          <el-table-column prop="gridManagerShow"
+                           header-align="center"
+                           align="center"
+                           show-overflow-tooltip
+                           label="村（社区）网格管理员"
+                           min-width="180">
+          </el-table-column>
+          <el-table-column prop="healthWorkerShow"
+                           header-align="center"
+                           align="center"
+                           show-overflow-tooltip
+                           label="基层医务工作者"
+                           min-width="180">
+          </el-table-column>
+          <el-table-column prop="policeShow"
+                           header-align="center"
+                           align="center"
+                           show-overflow-tooltip
+                           label="民警"
+                           min-width="180">
+          </el-table-column>
+          <el-table-column prop="volunteerShow"
+                           header-align="center"
+                           align="center"
+                           show-overflow-tooltip
+                           label="志愿者"
+                           min-width="180">
+          </el-table-column>
+        </template>
 
         <el-table-column prop="remark"
                          header-align="center"
@@ -347,6 +391,8 @@
                class="dialog-h"
                @closed="diaClose">
       <nat-focus-add ref="ref_form_add"
+                     :isPanshi="isPanshi"
+                     :reasonTitle="reasonTitle"
                      @dialogCancle="diaClose"
                      @dialogOk="addFormOk"></nat-focus-add>
     </el-dialog>
@@ -362,6 +408,8 @@
       <nat-focus-edit ref="ref_form_edit"
                       :fromSource="'focusGroupSpecialAttentionQuarantine'"
                       :view_real_data="btnAuths.focus_groups_view_real_data"
+                      :isPanshi="isPanshi"
+                      :reasonTitle="reasonTitle"
                       @dialogCancle="diaClose"
                       @dialogOk="addFormOk"></nat-focus-edit>
     </el-dialog>
@@ -432,6 +480,9 @@ export default {
       pageSize: 20,
       pageNo: 1,
       tableLoading: false,
+      customerId: '',
+      isPanshi: false,
+      reasonTitle: '关注原因',
 
       selection: [],
 
@@ -506,6 +557,15 @@ export default {
   },
 
   async mounted () {
+    //磐石街道：1580460084738760705
+    this.customerId = localStorage.getItem("customerId");
+    this.isPanshi = false
+    this.reasonTitle = '关注原因'
+    if (this.customerId === '1580460084738760705') {
+      this.isPanshi = true
+      this.reasonTitle = '隔离原因'
+    }
+    console.log('customerId', this.customerId)
     this.updateBtnAuths();
 
     for (let i = 0; i < 11; i++) {
@@ -811,6 +871,8 @@ export default {
         row.idCard = data.idCard;
         row.showMobile = data.showMobile;
         row.showIdCard = data.showIdCard;
+        if (row.gkStartTime && row.gkEndTime)
+          row.gkTimeRange = [row.gkStartTime, row.gkEndTime]
       }
       return row;
     },
@@ -878,27 +940,27 @@ export default {
         type: "warning",
       }).then(async () => {
 
-            let delUrl = "/epmetuser/icEpidemicSpecialAttention/delete";
-            const { data, code, msg } = await requestPost(delUrl, [row.id]);
-
-            if (code === 0) {
-              this.$message({
-                type: "success",
-                message: "删除成功",
-              });
-              this.loadTable();
-            } else {
-              this.$message.error(msg);
-            }
-          })
-          .catch((err) => {
-            if (err == "cancel") {
-              // this.$message({
-              //   type: "info",
-              //   message: "已取消删除"
-              // });
-            }
+        let delUrl = "/epmetuser/icEpidemicSpecialAttention/delete";
+        const { data, code, msg } = await requestPost(delUrl, [row.id]);
+
+        if (code === 0) {
+          this.$message({
+            type: "success",
+            message: "删除成功",
           });
+          this.loadTable();
+        } else {
+          this.$message.error(msg);
+        }
+      })
+        .catch((err) => {
+          if (err == "cancel") {
+            // this.$message({
+            //   type: "info",
+            //   message: "已取消删除"
+            // });
+          }
+        });
     },
 
     async deleteFocus (row) {
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue b/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
index 6474e636e..ff1f92040 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
@@ -34,13 +34,13 @@
                       placeholder="请输入身份证号或护照号">
             </el-input>
           </el-form-item>
-          <el-form-item label="关注原因"
+          <el-form-item :label="reasonTitle"
                         prop="mobile">
             <el-input v-model="formData.reason"
                       size="small"
                       class="list_item_width_1"
                       clearable
-                      placeholder="请输入关注原因">
+                      :placeholder="'请输入'+reasonTitle">
             </el-input>
           </el-form-item>
           <el-form-item label="隔离状态"
@@ -201,7 +201,7 @@
         <el-table-column prop="reason"
                          header-align="center"
                          align="center"
-                         label="关注原因"
+                         :label="reasonTitle"
                          width="180">
         </el-table-column>
         <el-table-column prop="isolatedState"
@@ -222,6 +222,51 @@
                          width="170">
         </el-table-column>
 
+        <template v-if="isPanshi">
+          <el-table-column prop="gkTime"
+                           header-align="center"
+                           align="center"
+                           show-overflow-tooltip
+                           label="管控时间"
+                           min-width="180">
+          </el-table-column>
+          <el-table-column prop="gb"
+                           header-align="center"
+                           align="center"
+                           show-overflow-tooltip
+                           label="镇（街）干部"
+                           min-width="180">
+          </el-table-column>
+          <el-table-column prop="gridManagerShow"
+                           header-align="center"
+                           align="center"
+                           show-overflow-tooltip
+                           label="村（社区）网格管理员"
+                           min-width="180">
+          </el-table-column>
+          <el-table-column prop="healthWorkerShow"
+                           header-align="center"
+                           align="center"
+                           show-overflow-tooltip
+                           label="基层医务工作者"
+                           min-width="180">
+          </el-table-column>
+          <el-table-column prop="policeShow"
+                           header-align="center"
+                           align="center"
+                           show-overflow-tooltip
+                           label="民警"
+                           min-width="180">
+          </el-table-column>
+          <el-table-column prop="volunteerShow"
+                           header-align="center"
+                           align="center"
+                           show-overflow-tooltip
+                           label="志愿者"
+                           min-width="180">
+          </el-table-column>
+        </template>
+
         <el-table-column prop="remark"
                          header-align="center"
                          align="center"
@@ -308,6 +353,8 @@
       <nat-focus-edit ref="ref_form_edit"
                       :fromSource="'focusGroupSpecialAttentionHistory'"
                       :view_real_data="btnAuths.focus_groups_his_view_real_data"
+                      :isPanshi="isPanshi"
+                      :reasonTitle="reasonTitle"
                       @dialogCancle="diaClose"
                       @dialogOk="addFormOk"></nat-focus-edit>
     </el-dialog>
@@ -378,6 +425,9 @@ export default {
       pageSize: 20,
       pageNo: 1,
       tableLoading: false,
+      customerId: '',
+      isPanshi: false,
+      reasonTitle: '关注原因',
 
       selection: [],
 
@@ -449,6 +499,14 @@ export default {
   },
 
   async mounted () {
+    //磐石街道：1580460084738760705
+    this.customerId = localStorage.getItem("customerId");
+    this.isPanshi = false
+    this.reasonTitle = '关注原因'
+    if (this.customerId === '1580460084738760705') {
+      this.isPanshi = true
+      this.reasonTitle = '隔离原因'
+    }
     this.updateBtnAuths();
 
     for (let i = 0; i < 11; i++) {
diff --git a/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue b/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue
index a0dd6da8e..a95eec6df 100644
--- a/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue
+++ b/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue
@@ -149,10 +149,10 @@ export default {
   methods: {
 
     async initTable (row, origin) {
-
+      console.log('row', row)
       this.formData.idCard = row.realIdCard
       this.formData.name = row.name
-      this.formData.mobile = row.mobile
+      this.formData.mobile = row.realMobile
       this.formData.origin = origin
 
       await this.loadTable()
diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue
index 5bf223997..776c8c993 100644
--- a/src/views/modules/base/epidemic/natInfo/natList.vue
+++ b/src/views/modules/base/epidemic/natInfo/natList.vue
@@ -141,10 +141,11 @@
                    size="small"
                    @click="handleExport">导出</el-button>
 
-        <el-button style="float:left;margin-left:10px"
+        <el-button v-if="isYantai"
+                   style="float:left;margin-left:10px"
                    class="diy-button--export"
                    size="small"
-                   @click="handleTiming()">定时</el-button>
+                   @click="handleTiming()">更新数据</el-button>
       </div>
 
       <el-table class="table"
@@ -318,6 +319,8 @@ export default {
       pageNo: 0,
       tableLoading: false,
       isResiUser: true,
+      customerId: '',
+      isYantai: false,
 
       agencyId: '',
       orgTypeList: [
@@ -382,6 +385,16 @@ export default {
 
   },
   async mounted () {
+    //磐石街道：1580460084738760705
+    //烟台客户id:   1535072605621841922
+    this.customerId = localStorage.getItem("customerId");
+    this.isYantai = false
+
+    if (this.customerId === '1535072605621841922') {
+      this.isYantai = true
+
+    }
+
     this.updateBtnAuths();
 
     const { user } = this.$store.state
@@ -598,7 +611,7 @@ export default {
 
     async handleTiming (row) {
 
-      this.$confirm("确认执行定时任务?", "提示", {
+      this.$confirm("确认执行更新数据?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -615,7 +628,7 @@ export default {
     },
 
     async timingNat (row) {
-      const url = "/epmetuser/dataSyncConfig/natInfoScanTask"
+      const url = "/epmetuser/dataSyncConfig/natInfoSyncButton"
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/synchro"
 
       let params = {
diff --git a/src/views/modules/base/epidemic/natInfo/noNatDetail.vue b/src/views/modules/base/epidemic/natInfo/noNatDetail.vue
index 6f5160611..54c714ea2 100644
--- a/src/views/modules/base/epidemic/natInfo/noNatDetail.vue
+++ b/src/views/modules/base/epidemic/natInfo/noNatDetail.vue
@@ -26,6 +26,10 @@
             <span>{{ formData.idCard||'--'  }}</span>
           </div>
 
+          <div class="info-prop">
+            <span class="info-title-2">采样时间：</span>
+            <span>{{ formData.latestCyTime||'--'  }}</span>
+          </div>
           <div class="info-prop">
             <span class="info-title-2">检测时间：</span>
             <span>{{ formData.latestNatTime||'--'  }}</span>
diff --git a/src/views/modules/base/epidemic/natInfo/noNatList.vue b/src/views/modules/base/epidemic/natInfo/noNatList.vue
index 30e32cd7f..06684267c 100644
--- a/src/views/modules/base/epidemic/natInfo/noNatList.vue
+++ b/src/views/modules/base/epidemic/natInfo/noNatList.vue
@@ -75,6 +75,17 @@
                             placeholder="选择时间">
             </el-date-picker>
           </el-form-item>
+          <el-form-item label="采样日期">
+            <el-date-picker class="list_item_width_1"
+                            v-model="formData.cyDate"
+                            format="yyyy-MM-dd"
+                            value-format="yyyyMMdd"
+                            type="date"
+                            size="small"
+                            clearable
+                            placeholder="选择时间">
+            </el-date-picker>
+          </el-form-item>
 
           <el-form-item label="检测状态">
             <el-select class="list_item_width_1"
@@ -168,6 +179,12 @@
                          label="证件号"
                          min-width="170">
         </el-table-column>
+        <el-table-column prop="latestCyTime"
+                         header-align="center"
+                         align="center"
+                         label="采样时间"
+                         min-width="150">
+        </el-table-column>
         <el-table-column prop="latestNatTime"
                          header-align="center"
                          align="center"
@@ -318,7 +335,8 @@ export default {
         idCard: '',//身份证号码
         isResiUser: '',//是否客户下居民(0:否  1:是)	
         status: '',//1已检测；0未检测
-        natDate: ''
+        natDate: '',
+        cyDate: '',
 
       },
 
@@ -583,7 +601,8 @@ export default {
         idCard: '',//身份证号码
         importDate: '',
         status: '',//1已检测；0未检测
-        natDate: ''
+        natDate: '',
+        cyDate: '',
       }
 
 
diff --git a/src/views/modules/base/epidemic/travel.vue b/src/views/modules/base/epidemic/travel.vue
index f72771098..4cd3b4c15 100644
--- a/src/views/modules/base/epidemic/travel.vue
+++ b/src/views/modules/base/epidemic/travel.vue
@@ -182,6 +182,34 @@
                          show-overflow-tooltip
                          min-width="180">
         </el-table-column>
+        <el-table-column prop="trafficTypeName"
+                         header-align="center"
+                         align="center"
+                         label="返回方式"
+                         show-overflow-tooltip
+                         min-width="180">
+        </el-table-column>
+        <el-table-column prop="sourceDetailAddress"
+                         header-align="center"
+                         align="center"
+                         label="详细地址"
+                         show-overflow-tooltip
+                         min-width="180">
+        </el-table-column>
+        <el-table-column prop="vaccineNumName"
+                         header-align="center"
+                         align="center"
+                         label="疫苗针次"
+                         show-overflow-tooltip
+                         min-width="100">
+        </el-table-column>
+        <el-table-column prop="isNatRecordName"
+                         header-align="center"
+                         align="center"
+                         label="48小时核酸"
+                         show-overflow-tooltip
+                         min-width="110">
+        </el-table-column>
         <el-table-column prop="arriveDate"
                          header-align="center"
                          align="center"
@@ -285,7 +313,7 @@
                              size="small"
                              @click="handleVisiteList(scope.row) ">随访记录</el-button>
                 </el-dropdown-item>
-                <el-dropdown-item>
+                <el-dropdown-item v-if=" agencyId===scope.row.agencyId">
                   <el-button v-if="btnAuths.tripreport_del"
                              type="text"
                              class="div-table-button--delete--noline "
diff --git a/src/views/modules/base/epidemic/travelDetail.vue b/src/views/modules/base/epidemic/travelDetail.vue
index ed1ad8baf..79a0d4a8e 100644
--- a/src/views/modules/base/epidemic/travelDetail.vue
+++ b/src/views/modules/base/epidemic/travelDetail.vue
@@ -34,10 +34,26 @@
             <span class="info-title-4">详细地址：</span>
             <span>{{ formData.detailAddress||'--'  }}</span>
           </div>
+          <div class="info-prop">
+            <span class="info-title-4">返回方式：</span>
+            <span>{{ formData.trafficTypeName||'--'  }}</span>
+          </div>
           <div class="info-prop">
             <span class="info-title-4">来自地区：</span>
             <span>{{ formData.sourceAddress||'--'  }}</span>
           </div>
+          <div class="info-prop">
+            <span class="info-title-4">详细地址：</span>
+            <span>{{ formData.sourceDetailAddress||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">疫苗接种针次：</span>
+            <span>{{ formData.vaccineNumName||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">48小时核酸：</span>
+            <span>{{ formData.isNatRecordName||'--'  }}</span>
+          </div>
           <div class="info-prop">
             <span class="info-title-4">来到本地时间：</span>
             <span>{{ formData.arriveDate||'--'  }}</span>
@@ -83,7 +99,7 @@ export default {
 
       initLoading: false,
 
-      icNatId: '',
+      selId: '',
       formData: {},
 
     }
@@ -109,7 +125,7 @@ export default {
       const url = "/data/aggregator/epmetuser/detailByType";
 
       const { data, code, msg } = await requestPost(url, {
-        id: this.icNatId,
+        id: this.selId,
         type: "routeFollow",
       });
 
@@ -126,11 +142,11 @@ export default {
       console.log('row----', row)
 
       this.formData.agencyId = this.agencyId
-      this.icNatId = row.id
+      this.selId = row.id
       await this.loadFormData(row.id)
 
       this.initLoading = true
-      console.log('formtype', type)
+
 
     },
 
diff --git a/src/views/modules/base/epidemic/travelForm.vue b/src/views/modules/base/epidemic/travelForm.vue
index 30ca0369e..8242f3af6 100644
--- a/src/views/modules/base/epidemic/travelForm.vue
+++ b/src/views/modules/base/epidemic/travelForm.vue
@@ -5,7 +5,6 @@
                :inline="true"
                :model="formData"
                :rules="dataRule"
-               :disabled="formType==='detail'"
                class="form">
 
         <el-form-item v-if="formType==='add'"
@@ -26,7 +25,7 @@
                       label="所属网格"
                       style="display: block"
                       label-width="150px">
-          <el-select class="item_width_2"
+          <el-select class="item_width_4"
                      v-model.trim="formData.gridId"
                      placeholder="请选择"
                      :disabled="!isFromResi"
@@ -44,7 +43,7 @@
                       prop="userId"
                       style="display: block"
                       label-width="150px">
-          <el-select class="item_width_2"
+          <el-select class="item_width_4"
                      v-model.trim="formData.userId"
                      placeholder="请选择"
                      filterable
@@ -63,11 +62,11 @@
                       prop="name"
                       label-width="150px"
                       style="display: block">
-          <el-input class="item_width_2"
+          <el-input class="item_width_4"
                     placeholder="请输入姓名"
                     clearable
-                    :disabled="isFromResi"
-                    v-model="formData.name" style="margin-right:10px;">
+                    v-model="formData.name"
+                    style="margin-right:10px;">
           </el-input>
           <el-checkbox v-model="formData.heSuanCheck">添加到核酸检测关注名单</el-checkbox>
         </el-form-item>
@@ -76,10 +75,9 @@
                       prop="mobile"
                       label-width="150px"
                       style="display: block">
-          <el-input class="item_width_2"
+          <el-input class="item_width_4"
                     placeholder="请输入手机号"
                     clearable
-                    :disabled="isFromResi"
                     v-model="formData.mobile">
           </el-input>
         </el-form-item>
@@ -87,62 +85,129 @@
                       prop="idCard"
                       label-width="150px"
                       style="display: block">
-          <el-input class="item_width_2"
+          <el-input class="item_width_4"
                     placeholder="请输入身份证号或证件号"
                     clearable
-                    :disabled="isFromResi"
                     v-model="formData.idCard">
           </el-input>
         </el-form-item>
-        <el-form-item
-                      label="现居地"
+        <el-form-item label="现居地"
                       prop="presentAddress"
                       style="display: block"
                       label-width="150px">
-          <el-input  v-if="formType == 'detail'" class="item_width_2"
-                    placeholder="请输入现居地"
-                    clearable
-                    :disabled="isFromResi"
-                    :style="'width: ' + computedWd(formData.presentAddress)"
-                    v-model="formData.presentAddress" />
-          <template v-else>
-            <el-input v-if="isFromResi" class="item_width_2 mw180"
-                    placeholder="请输入现居地"
-                    clearable
-                    :disabled="isFromResi"
-                    v-model="formData.presentAddress" />
-            <el-cascader v-else ref="nowArea" class="item_width_2" :props="areaProps"
-            v-model="nowAllCode" clearable @change="handleNowArea"></el-cascader>
+
+          <template>
+            <el-input v-if="isFromResi"
+                      class="item_width_4 mw180"
+                      placeholder="请输入现居地"
+                      clearable
+                      v-model="formData.presentAddress" />
+            <el-cascader v-else
+                         ref="nowArea"
+                         class="item_width_4"
+                         :props="areaProps"
+                         v-model="nowAllCode"
+                         clearable
+                         @change="handleNowArea"></el-cascader>
           </template>
         </el-form-item>
         <el-form-item label="详细地址"
                       prop="detailAddress"
                       label-width="150px"
                       style="display: block">
-          <el-input class="item_width_2"
+          <el-input class="item_width_4"
                     placeholder="请输入详细地址"
                     clearable
-                    :disabled="isFromResi"
                     v-model="formData.detailAddress">
           </el-input>
         </el-form-item>
-        <el-form-item label="来自地区" prop="sourceAddress" style="display: block" label-width="150px">
-          <el-input v-if="formType == 'detail'" class="item_width_2"
-                    placeholder=""
+        <el-form-item label="返回交通方式"
+                      prop="trafficType"
+                      style="display: block"
+                      label-width="150px">
+          <el-select class="item_width_4"
+                     v-model.trim="formData.trafficType"
+                     placeholder="请选择"
+                     clearable>
+            <el-option v-for="item in trafficTypeList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="formData.trafficType==='5'"
+                      label="其他"
+                      prop="trafficTypeExplain"
+                      style="display: block"
+                      label-width="150px">
+          <el-input class="item_width_4"
+                    placeholder="请输入交通方式"
                     clearable
-                    :disabled="isFromResi"
-                    v-model="formData.sourceAddress"
-                    :style="'width: ' + computedWd(formData.sourceAddress)">
+                    v-model="formData.trafficTypeExplain">
           </el-input>
-          <el-cascader v-else ref="sourceArea" v-model="sourceAllCode" class="item_width_2" :props="areaProps"
-            @change="handleSourceArea" clearable></el-cascader>
+        </el-form-item>
+        <el-form-item label="来自地区"
+                      prop="sourceAddress"
+                      style="display: block"
+                      label-width="150px">
+
+          <el-cascader ref="sourceArea"
+                       v-model="sourceAllCode"
+                       class="item_width_4"
+                       :props="areaProps"
+                       @change="handleSourceArea"
+                       clearable></el-cascader>
+        </el-form-item>
+
+        <el-form-item label="详细地址"
+                      prop="sourceDetailAddress"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_4"
+                    placeholder="请输入详细地址"
+                    clearable
+                    v-model="formData.sourceDetailAddress">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="疫苗接种针次"
+                      prop="vaccineNum"
+                      style="display: block"
+                      label-width="150px">
+          <el-select class="item_width_4"
+                     v-model.trim="formData.vaccineNum"
+                     placeholder="请选择"
+                     clearable>
+            <el-option v-for="item in ymList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="48小时核酸记录"
+                      style="display: block"
+                      prop="isNatRecord"
+                      label-width="150px">
+          <el-select class="item_width_4"
+                     v-model.trim="formData.isNatRecord"
+                     placeholder="请选择"
+                     clearable>
+            <el-option v-for="item in hsList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
         </el-form-item>
 
         <el-form-item label="来到本地时间"
                       style="display: block"
                       prop="arriveDate"
                       label-width="150px">
-          <el-date-picker class="item_width_2"
+          <el-date-picker class="item_width_4"
                           v-model="formData.arriveDate"
                           :picker-options="pickerOptions"
                           format="yyyy-MM-dd HH:mm"
@@ -156,7 +221,7 @@
                       style="display: block"
                       prop="leaveDate"
                       label-width="150px">
-          <el-date-picker class="item_width_2"
+          <el-date-picker class="item_width_4"
                           v-model="formData.leaveDate"
                           format="yyyy-MM-dd HH:mm"
                           value-format="yyyy-MM-dd HH:mm"
@@ -179,42 +244,40 @@
                     v-model="formData.remark"></el-input>
         </el-form-item>
 
-        <template v-if="formType != 'detail'">
-          <el-form-item label="通知渠道"
+        <el-form-item label="通知渠道"
                       prop="channel"
                       label-width="150px"
-                        style="display: block">
-            <el-checkbox-group v-model="formData.channel">
-              <el-checkbox key="0"
-                          label="0">小程序通知</el-checkbox>
-              <!-- <el-checkbox key="1"
+                      style="display: block">
+          <el-checkbox-group v-model="formData.channel">
+            <el-checkbox key="0"
+                         label="0">小程序通知</el-checkbox>
+            <!-- <el-checkbox key="1"
                           label="1">短信通知</el-checkbox> -->
 
-            </el-checkbox-group>
-          </el-form-item>
-
-          <el-form-item v-show="formData.channel.length > 0" 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>
-        </template>
+          </el-checkbox-group>
+        </el-form-item>
+
+        <el-form-item v-show="formData.channel.length > 0"
+                      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>
 
       </el-form>
     </div>
     <div class="form_div_btn">
       <el-button size="small"
                  @click="handleCancle">取 消</el-button>
-      <el-button v-if="formType != 'detail'"
-                 size="small"
+      <el-button size="small"
                  type="primary"
                  :disabled="btnDisable"
                  @click="handleComfirm('ref_form')">确 定</el-button>
@@ -263,7 +326,7 @@ export default {
       gridList: [],
       personList: [],
       pickerOptions: {
-        disabledDate(time) {
+        disabledDate (time) {
           return time.getTime() > Date.now();
         }
       },
@@ -287,42 +350,114 @@ export default {
         presentAddressPathCode: '',
         sourceAddress: '',
         sourceAddressPathCode: '',
+        sourceDetailAddress: '',
         arriveDate: '',
         remark: '',
         leaveDate: '',
         userType: 'input',
         content: '',
-        channel: []
+        channel: [],
+
+        trafficType: '',
+        trafficTypeExplain: '',
+        isNatRecord: '',
+        vaccineNum: '',
 
       },
       dataRule: {
         name: [
-          { required: true, message: '姓名不能为空', trigger: 'blur' }
+          { required: true, message: '姓名不能为空', trigger: 'change' }
         ],
         idCard: [
-          { required: true, validator: checkIdCard, trigger: 'blur' }
+          { required: true, validator: checkIdCard, trigger: 'change' }
         ],
         mobile: [
-          { required: true, validator: checkMObile, trigger: 'blur' },
+          { required: true, validator: checkMObile, trigger: 'change' },
         ],
         presentAddress: [
-          { required: true, message: '现居地不能为空', trigger: 'blur' },
+          { required: true, message: '现居地不能为空', trigger: 'change' },
         ],
         detailAddress: [
-          { required: true, message: '详细地址不能为空', trigger: 'blur' },
+          { required: true, message: '详细地址不能为空', trigger: 'change' },
         ],
         sourceAddress: [
-          { required: true, message: '来自地区不能为空', trigger: 'blur' },
+          { required: true, message: '来自地区不能为空', trigger: 'change' },
+        ],
+        sourceDetailAddress: [
+          { required: true, message: '来自地区详细地址不能为空', trigger: 'change' },
         ],
         arriveDate: [
-          { required: true, message: '来到本地时间不能为空', trigger: 'blur' },
+          { required: true, message: '来到本地时间不能为空', trigger: 'change' },
+        ],
+        trafficType: [
+          { required: true, message: '交通方式不能为空', trigger: 'change' },
+        ],
+        trafficTypeExplain: [
+          { required: true, message: '其他交通方式不能为空', trigger: 'change' },
+        ],
+        isNatRecord: [
+          { required: true, message: '48小时核酸记录不能为空', trigger: 'change' },
+        ],
+        vaccineNum: [
+          { required: true, message: '疫苗接种针刺不能为空', trigger: 'change' },
         ]
       },
       areaProps: {
         // checkStrictly: true,
         lazy: true,
         lazyLoad: this.lzayLoadArea
-      }
+      },
+
+      trafficTypeList: [
+        {
+          value: '0',
+          label: '飞机'
+        },
+        {
+          value: '1',
+          label: '动车'
+        },
+        {
+          value: '2',
+          label: '火车'
+        },
+        {
+          value: '3',
+          label: '自驾'
+        },
+        {
+          value: '4',
+          label: '其他'
+        },
+      ],
+      ymList: [
+        {
+          value: '0',
+          label: '0针'
+        },
+        {
+          value: '1',
+          label: '1针'
+        },
+        {
+          value: '2',
+          label: '2针'
+        },
+        {
+          value: '3',
+          label: '3针'
+        }
+      ],
+      hsList: [
+        {
+          value: '1',
+          label: '是'
+        },
+        {
+          value: '2',
+          label: '否'
+        }
+      ]
 
     }
   },
@@ -332,12 +467,13 @@ export default {
     this.agencyId = user.agencyId
     //获取网格下拉框数据
     await this.loadGrid()
+    this.getTrafficType()
   },
-  destroyed() {
+  destroyed () {
     this.nowAllCode = []
   },
   methods: {
-    computedWd(val) {
+    computedWd (val) {
       const len = val.length
       const wd = len * 18
       let w = ''
@@ -345,7 +481,7 @@ export default {
       else w = 220
       return w + 'px'
     },
-    lzayLoadArea(node, resolve) {
+    lzayLoadArea (node, resolve) {
       // this.getArea(node, resolve)
       setTimeout(() => {
         this.getArea(node, resolve)
@@ -362,7 +498,13 @@ export default {
 
       } else {
         const { user } = this.$store.state
-        this.nowAllCode = user.areaCodePath
+
+        if (user.areaCodePath.length > 3) {
+          this.nowAllCode = [user.areaCodePath[0], user.areaCodePath[1], user.areaCodePath[2]]
+        } else {
+          this.nowAllCode = user.areaCodePath
+        }
+
       }
       // this.$refs['ref_form'].resetFields();
 
@@ -389,7 +531,7 @@ export default {
 
 
     },
-    handleSourceArea(val) {
+    handleSourceArea (val) {
       console.log('val-----', val)
       console.log('label-----', this.$refs.sourceArea.getCheckedNodes())
       if (val.length > 0) {
@@ -405,7 +547,7 @@ export default {
       }
 
     },
-    handleNowArea(val) {
+    handleNowArea (val) {
       console.log('val-----', val)
       console.log('label-----', this.$refs.nowArea.getCheckedNodes())
       if (val.length > 0) {
@@ -437,6 +579,23 @@ export default {
         this.$message.error(msg)
       }
 
+    },
+    async getTrafficType () {
+      const url = "/sys/dict/data/dictlist"
+
+      let params = {
+        dictType: "traffic_type",
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.trafficTypeList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
     },
     async handleSelGrid (value) {
 
@@ -482,7 +641,7 @@ export default {
       }
 
     },
-    async handleSelAddress(value) {
+    async handleSelAddress (value) {
 
       const url = "/gov/org/house/gethouseinfo/" + value
 
@@ -613,7 +772,6 @@ export default {
     min-width: 260px;
   }
 }
-
 </style>
 
 <style lang='scss'>
diff --git a/src/views/modules/base/epidemic/travelPanshi/travelPanshi.vue b/src/views/modules/base/epidemic/travelPanshi/travelPanshi.vue
new file mode 100644
index 000000000..b0f12aa69
--- /dev/null
+++ b/src/views/modules/base/epidemic/travelPanshi/travelPanshi.vue
@@ -0,0 +1,1074 @@
+<template>
+  <div class="div_main">
+    <div ref="div_search"
+         class="div_search">
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'120px'">
+        <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="idCard">
+            <el-input v-model="formData.idCard"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入身份证号或证件号">
+            </el-input>
+
+          </el-form-item>
+          <el-form-item label="7天内旅居情况"
+                        prop="idCard">
+            <el-select class="list_item_width_1"
+                       v-model.trim="formData.sojournHistory"
+                       placeholder="请选择"
+                       clearable>
+              <el-option v-for="item in dangerLevelList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+
+          </el-form-item>
+
+        </div>
+        <div>
+
+          <el-form-item label="来源地"
+                        prop="sourceAddress">
+            <el-input v-model="formData.sourceAddress"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入地区">
+            </el-input>
+            <!-- <el-cascader ref="nowArea" size="small" class="list_item_width_1" :props="areaProps"
+              v-model="searchAreacode" clearable @change="handleAreaChange"></el-cascader> -->
+          </el-form-item>
+
+          <el-form-item label="来到本地时间"
+                        prop="startDate">
+            <el-date-picker v-model="timeRange"
+                            size="small"
+                            type="daterange"
+                            value-format="yyyy-MM-dd"
+                            @change="handleScheduledTimeChange"
+                            range-separator="至"
+                            start-placeholder="开始时间"
+                            end-placeholder="结束时间">
+            </el-date-picker>
+
+          </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">
+      <div class="div_btn">
+        <el-button v-if="btnAuths.tripreport_add"
+                   class="diy-button--add"
+                   size="small"
+                   @click="handleAdd">新增</el-button>
+
+        <el-button v-if="btnAuths.tripreport_import"
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule">下载模板</el-button>
+        <el-upload v-if="btnAuths.tripreport_import"
+                   :headers="$getElUploadHeaders()"
+                   ref="upload"
+                   :multiple='false'
+                   :show-file-list='false'
+                   :before-upload="beforeUpload"
+                   action=""
+                   accept=".xls,.xlsx"
+                   :limit="1"
+                   :on-exceed="handleExceed"
+                   :http-request="uploadHttpRequest">
+          <el-button size="small"
+                     style="margin-left: 10px"
+                     class="diy-button--delete"
+                     :loading="importLoading">{{importBtnTitle}}</el-button>
+        </el-upload>
+
+        <el-button v-if="btnAuths.tripreport_export"
+                   style="margin-left:10px"
+                   class="diy-button--reset"
+                   size="small"
+                   :loading="exportBtn"
+                   @click="handleExport">{{ exportBtnTitle }}</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="handleAttention">加入重点人群关注</el-button>
+        <el-button style="margin-left:15px"
+                   class="diy-button--more"
+                   size="small"
+                   @click="handleDeletes">取消重点人群关注</el-button>
+      </div>
+
+      <el-table class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%"
+                @selection-change="handleSelectionChange">
+        <el-table-column type="selection"
+                         width="55"
+                         fixed="left"></el-table-column>
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"
+                         fixed="left"></el-table-column>
+
+        <el-table-column prop="name"
+                         header-align="center"
+                         align="center"
+                         label="姓名"
+                         width="100"
+                         fixed="left">
+        </el-table-column>
+        <el-table-column prop="mobile"
+                         header-align="center"
+                         align="center"
+                         label="手机号"
+                         width="120">
+        </el-table-column>
+        <el-table-column prop="idCard"
+                         header-align="center"
+                         align="center"
+                         label="证件号"
+                         width="180">
+        </el-table-column>
+        <el-table-column prop="registeredResidence"
+                         header-align="center"
+                         align="center"
+                         label="户籍地"
+                         show-overflow-tooltip
+                         min-width="160">
+          <!-- <template slot-scope="scope">
+            {{scope.row.presentAddress + scope.row.detailAddress}}
+          </template> -->
+        </el-table-column>
+        <el-table-column prop="sourceAddress"
+                         header-align="center"
+                         align="center"
+                         label="来源地"
+                         show-overflow-tooltip
+                         min-width="180">
+        </el-table-column>
+        <el-table-column prop="describeContent"
+                         header-align="center"
+                         align="center"
+                         label="来曹事由"
+                         show-overflow-tooltip
+                         min-width="180">
+        </el-table-column>
+        <el-table-column prop="natOutcomeName"
+                         header-align="center"
+                         align="center"
+                         label="48小时核酸"
+                         show-overflow-tooltip
+                         min-width="100">
+        </el-table-column>
+        <el-table-column prop="arriveDate"
+                         header-align="center"
+                         align="center"
+                         label="来到本地时间"
+                         width="160">
+        </el-table-column>
+        <el-table-column prop="detailAddress"
+                         header-align="center"
+                         align="center"
+                         label="在曹居住地点"
+                         width="160">
+        </el-table-column>
+        <el-table-column prop="trafficTypeName"
+                         header-align="center"
+                         align="center"
+                         label="返回方式"
+                         width="100">
+        </el-table-column>
+        <el-table-column prop="sojournHistoryName"
+                         header-align="center"
+                         align="center"
+                         label="7天内旅居情况"
+                         width="100">
+        </el-table-column>
+        <el-table-column prop="isolateTypeName"
+                         header-align="center"
+                         align="center"
+                         label="隔离状态"
+                         width="100">
+        </el-table-column>
+        <el-table-column prop="latestNoticeTime"
+                         header-align="center"
+                         align="center"
+                         label="最近一次通知时间"
+                         width="140">
+        </el-table-column>
+        <el-table-column prop="remark"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="备注"
+                         min-width="120">
+        </el-table-column>
+
+        <el-table-column label="操作"
+                         fixed="right"
+                         width="140"
+                         header-align="center"
+                         align="center"
+                         class="operate">
+          <template slot-scope="scope">
+
+            <el-button v-if="btnAuths.tripreport_view"
+                       type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
+
+            <el-button v-if="btnAuths.tripreport_update"
+                       type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+
+            <el-dropdown trigger="hover">
+              <span class="el-dropdown-link"
+                    style="margin-left:10px;">
+                <el-button type="text"
+                           size="small"
+                           class="div-table-button--more"
+                           slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
+              </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item>
+                  <el-button type="text"
+                             class="div-table-button--detail--noline"
+                             size="small"
+                             @click="handleNoticeList(scope.row)">通知记录</el-button>
+                </el-dropdown-item>
+                <el-dropdown-item>
+                  <el-button type="text"
+                             class="div-table-button--detail--noline"
+                             size="small"
+                             @click="handleVisiteList(scope.row) ">随访记录</el-button>
+                </el-dropdown-item>
+                <el-dropdown-item v-if=" agencyId===scope.row.agencyId">
+                  <el-button v-if="btnAuths.tripreport_del"
+                             type="text"
+                             class="div-table-button--delete--noline "
+                             size="small"
+                             @click="handleDelete(scope.row)">删除</el-button>
+                </el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+
+          </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="formShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="formTitle"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <travel-panshi-form v-if="formShow"
+                          ref="ref_form"
+                          @dialogCancle="addFormCancle"
+                          @dialogOk="addFormOk"></travel-panshi-form>
+    </el-dialog>
+    <!-- 详情弹出框 -->
+    <el-dialog :visible.sync="detailShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'详情'"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <travel-panshi-detail v-if="detailShow"
+                            :view_real_data="btnAuths.tripreport_view_real_data"
+                            @dialogCancle="addFormCancle"
+                            ref="ref_detail"></travel-panshi-detail>
+    </el-dialog>
+    <!-- 发送通知弹出框 -->
+    <el-dialog :visible.sync="sendNoticeFormShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               title="发送通知"
+               width="1050px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <nf-send-notice ref="ref_sendnotice"
+                      @dialogOk="addFormOk"
+                      @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>
+  </div>
+</template>
+
+<script>
+
+import travelPanshiForm from './travelPanshiForm'
+import travelPanshiDetail from './travelPanshiDetail'
+import nfNoticeList from './../natFocus/nfNoticeList'
+import nfSendNotice from './../natFocus/nfSendNotice'
+import nfVisiteList from './../natFocus/nfVisiteList'
+
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      sendNoticeFormShow: false,
+      visiteListFormShow: false,
+      noticeListFormShow: false,
+      exportBtn: false,
+      exportBtnTitle: '导出',
+      importBtnTitle: '导入',
+      importLoading: false,
+      loading: false,
+      total: 0,
+      pageSize: 20,
+      pageNo: 0,
+      tableLoading: false,
+      sHeight: 0,
+      searchAreacode: [],
+      agencyId: '',
+      selectionAll: [],
+      timeRange: [],
+      formData: {
+        name: '',//负责人
+        mobile: '',//联系电话
+        idCard: '',
+        sourceAddress: '',
+        sourceAddressCode: '',
+        startDate: '',
+        endDate: '',
+        sojournHistory: ''
+      },
+
+      dangerLevelList: [],
+
+      tableData: [],
+
+      //form相关
+      formShow: false,
+      detailShow: false,
+      formTitle: '新增',
+      areaProps: {
+        lazy: true,
+        checkStrictly: true,
+        lazyLoad: this.lzayLoadArea
+      },
+
+      btnAuths: {
+        tripreport_add: false, //新增
+        tripreport_import: false, //导入
+        tripreport_export: false, //导出
+        tripreport_del: false, //删除
+        tripreport_view: false, //查看
+        tripreport_update: false, //修改
+        tripreport_view_real_data: false, //显示脱敏信息
+      },
+
+    }
+  },
+  components: {
+    travelPanshiForm,
+    travelPanshiDetail,
+    nfNoticeList,
+    nfSendNotice,
+    nfVisiteList
+  },
+  async created () {
+
+  },
+  async mounted () {
+    this.updateBtnAuths();
+
+    const { user } = this.$store.state
+    console.log('user-----', user)
+    this.agencyId = user.agencyId
+
+    this.getDangerLevel()
+    await this.loadTable()
+    this.sHeight = this.$refs.div_search.offsetHeight + 270
+  },
+
+  methods: {
+    // 更新按钮权限
+    updateBtnAuths () {
+      let rot = this.$route;
+      if (Array.isArray(rot.meta.btns)) {
+        rot.meta.btns.forEach((item) => {
+          this.btnAuths[item.permissions] = true;
+        });
+      }
+    },
+    async getDangerLevel () {
+
+      const url = "/sys/dict/data/dictlist";
+
+      let params = {
+        dictType: "sojourn_history",
+      };
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.dangerLevelList = data
+
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    lzayLoadArea (node, resolve) {
+      this.getArea(node, resolve)
+      // setTimeout(() => {
+
+      // }, 1000)
+    },
+    handleSearch () {
+      this.loadTable()
+    },
+
+    handleSelectionChange (val) {
+      console.log('val----', val)
+      this.selectionAll = val
+    },
+    async getArea (node, resolve) {
+
+      const url = "/commonservice/areacode/nextarea"
+      let params = {
+        parentLevel: node.data ? node.data.level : '',
+        parentAreaCode: node.data ? node.data.code : ''
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        const nodes = data.map(item => ({
+          value: item.areaCode, //
+          label: item.areaName,
+          code: item.areaCode,
+          level: item.level,
+          leaf: node.level >= 4 // 5层级
+        }))
+        resolve(nodes)
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async loadTable () {
+      this.tableLoading = true
+
+      const url = "/epmetuser/tripreport/page"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
+      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.tableData.forEach(item => {
+        //   if (item.time) {
+        //     let timeArray = item.time.split(' ')
+        //     item.time = timeArray[0]
+        //   }
+
+        // });
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+    handleAreaChange (val) {
+
+      if (val.length > 0) {
+        const len = val.length - 1
+        this.formData.sourceAddressCode = val[len]
+      } else this.formData.sourceAddressCode = ''
+    },
+    handleScheduledTimeChange (time) {
+      if (time) {
+        this.formData.startDate = time[0]
+        this.formData.endDate = time[1]
+
+      } else {
+        this.formData.startDate = ''
+        this.formData.endDate = ''
+
+      }
+
+    },
+
+    diaClose () {
+      // this.$refs.ref_form.resetData()
+      this.formShow = false
+      this.sendNoticeFormShow = false
+      this.noticeListFormShow = false
+      this.visiteListFormShow = false
+    },
+    handleNoticeList (row) {
+      this.noticeListFormShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_noticelist.initTable(row.realIdCard, '0')
+      })
+
+    },
+    handleVisiteList (row) {
+
+      this.visiteListFormShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_visitelist.initTable(row, '0')
+
+      })
+
+    },
+    handleSendNotice () {
+      if (this.selectionAll.length === 0) {
+        this.$message.info('请选择要通知的人员')
+        return false
+      }
+      this.sendNoticeFormShow = true
+      this.$nextTick(() => {
+        const arr = this.selectionAll.map(item => {
+
+          return {
+            userId: item.userId,
+            idCard: item.idCard,
+            realIdCard: item.realIdCard,
+            mobile: item.mobile,
+            id: item.id
+          }
+        })
+        this.$refs.ref_sendnotice.initForm(arr, '0')
+      })
+
+    },
+    handleAttention (row) {
+      if (this.selectionAll.length === 0) {
+        this.$message.info('请选择要加入关注的名单')
+        return false
+      }
+      this.$confirm("确认选择的名单加入关注?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.saveFocus(row)
+        })
+        .catch(err => {
+          console.log('err-----', err)
+
+        });
+    },
+
+    async handleDeletes (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 saveFocus (row) {
+      const url = "/epmetuser/icEpidemicSpecialAttention/vaccination-add"
+      // let idCards = []
+
+      // this.selectionAll.forEach(element => {
+      //   idCards.push(element.idCard)
+      // });
+      let params = {
+        list: this.selectionAll.map(item => {
+          return {
+            name: item.name,
+            mobile: item.realMobile,
+            idCard: item.realIdCard,
+            attentionType: 2,
+            isolatedState: item.isolateType
+          }
+        })
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "操作成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    async deleteFocus (row) {
+      const url = "/epmetuser/icEpidemicSpecialAttention/cancel-attention"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
+      let ids = []
+
+      this.selectionAll.forEach(element => {
+        if (element.epidemicId !== '' && element.epidemicId !== null && element.epidemicId !== undefined) {
+          ids.push(element.epidemicId)
+        }
+      });
+      let params = {
+        attentionType: 2,
+        ids: ids
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "操作成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleDetail (row) {
+      // this.formTitle = '行程详情'
+      this.detailShow = true
+      this.$nextTick(() => {
+
+        this.$refs.ref_detail.initForm(row)
+      })
+    },
+
+    handleAdd () {
+      this.formTitle = '新增行程'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('add', '')
+      })
+    },
+
+    handleEdit (row) {
+      this.formTitle = '修改'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('edit', row)
+      })
+    },
+
+    addFormCancle () {
+      this.detailShow = false
+      this.formShow = false
+    },
+    addFormOk () {
+      this.formShow = false
+      this.sendNoticeFormShow = false
+      this.loadTable()
+
+    },
+
+    async handleDelete (row) {
+
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.deleteNat(row)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
+    },
+
+    async deleteNat (row) {
+      const url = "/epmetuser/tripreport/delete"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
+
+      let params = [row.id]
+
+      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 = {
+        name: '',//负责人
+        mobile: '',//联系电话
+        idCard: '',
+        sourceAddress: '',
+        sourceAddressCode: '',
+        startDate: '',
+        endDate: '',
+        sojournHistory: ''
+      }
+
+      this.searchAreacode = []
+      this.timeRange = []
+      // this.pageSize = 20
+      this.pageNo = 1
+      // this.loadTable()
+    },
+
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+    //导出表格
+    async handleExport () {
+      this.exportBtn = true
+      this.exportBtnTitle = '正在导出...'
+      let params = {
+        ...this.formData
+      }
+
+      // .post('epmetuser/icresiuser/exportExcel', params)
+      // await axios({
+      //   url: window.SITE_CONFIG['apiURL'] + '/epmetuser/tripreport/export',
+      //   // url: 'epmetuser/icresiuser/exportExcel',
+      //   method: 'post',
+      //   data: params,
+      //   responseType: 'blob'
+      // })
+      await this.$http({
+        method: 'POST',
+        url: '/epmetuser/tripreport/psexport',
+        responseType: 'blob',
+        data: params
+      })
+        .then(res => {
+
+          console.log('resllll', res)
+          let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+          console.log('filename', fileName)
+          let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+          var url = window.URL.createObjectURL(blob)
+          var aLink = document.createElement('a')
+          aLink.style.display = 'none'
+          aLink.href = url
+          aLink.setAttribute('download', fileName)
+          document.body.appendChild(aLink)
+          aLink.click()
+          document.body.removeChild(aLink) //下载完成移除元素
+          window.URL.revokeObjectURL(url) //释放掉blob对象
+        })
+        .catch((err) => {
+          console.log('获取导出情失败', err)
+          this.$message.error('获取导出失败')
+        })
+      this.exportBtnTitle = '导出'
+      this.exportBtn = false
+
+    },
+
+    // 下载文件
+    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);
+      }
+
+    },
+
+    async handleExportModule () {
+
+
+      const url = "/epmetuser/tripreport/psdownloadtemplate"
+      let params = {}
+      await this.$http({
+        method: 'POST',
+        url,
+        responseType: 'blob',
+        data: params
+      })
+        .then(res => {
+          console.log('res----dddd', res)
+          // this.download(res.data, title + '.xls')
+          if (res.headers["content-disposition"]) {
+            let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+            console.log('filename', fileName)
+            let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+            var url = window.URL.createObjectURL(blob)
+            var aLink = document.createElement('a')
+            aLink.style.display = 'none'
+            aLink.href = url
+            aLink.setAttribute('download', fileName)
+            document.body.appendChild(aLink)
+            aLink.click()
+            document.body.removeChild(aLink) //下载完成移除元素
+            window.URL.revokeObjectURL(url) //释放掉blob对象
+          } else this.$message.error('下载失败')
+        })
+        .catch(err => {
+          console.log('err', err)
+          return this.$message.error('网络错误')
+        })
+    },
+
+    // 上传文件之前的钩子
+    beforeUpload (file) {
+      this.files = file;
+
+      const isText = file.type === 'application/vnd.ms-excel'
+      const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+
+      if (!isText && !isTextComputer) {
+        this.$message.error('请选择正确格式的文件')
+        return false
+      } else {
+        this.fileName = file.name;
+        return true
+      }
+
+    },
+    // 上传文件个数超过定义的数量
+    handleExceed (files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
+    },
+    async uploadHttpRequest (file) {
+      this.importLoading = true
+      this.importBtnTitle = '正在上传中...'
+      this.$message({
+        showClose: true,
+        message: '导入中，请到系统管理-导入记录中查看进度',
+        duration: 0
+      })
+      const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
+      formData.append('file', file.file) //添加文件对象
+      await this.$http
+        .post('/epmetuser/tripreport/psimport', formData).then(res => {
+          console.log('res-up', res)
+          if (res.data.code == 0 && res.data.msg == 'success') {
+            // this.$message.success('导入成功')
+            this.loadTable()
+          } else this.$message.error(res.data.msg)
+        }).catch(err => {
+          console.log('失败', err)
+          file.onError() //上传失败的文件会从文件列表中删除
+          // this.$message.error('导入失败')
+        })
+      this.importLoading = false
+      this.importBtnTitle = '导入'
+      this.$refs.upload.clearFiles()
+    },
+
+    async uploadFile () {
+      if (this.fileName == "") {
+        this.$message.warning('请选择要上传的文件！')
+        return false
+      }
+
+      this.$message({
+        showClose: true,
+        message: '导入中，请到系统管理-导入记录中查看进度',
+        duration: 0
+      })
+
+      //清空上传列表
+      this.$refs['upload'].clearFiles()
+
+      var url = '/gov/org/house/houseimport'
+
+      let fileFormData = new FormData();
+      fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append('orgId', this.agencyObj.id);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append('orgType', this.agencyObj.level);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+
+      this.importRoomLoading = true
+      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.$emit('refreshTree')
+          this.loadTable()
+          this.importRoomLoading = false
+        },
+        (rspMsg, data) => {
+          this.importRoomLoading = false
+        }, { headers: { 'Content-Type': 'multipart/form-data' } })
+
+
+    }
+  },
+  computed: {
+    tableHeight () {
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h
+
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  watch: {
+
+  },
+  props: {
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+</style>
+
+
diff --git a/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue b/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue
new file mode 100644
index 000000000..41866e7f0
--- /dev/null
+++ b/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue
@@ -0,0 +1,327 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <div v-if="view_real_data"
+           class="div_tuomin">
+        <el-button size="mini"
+                   class="diy-button--search"
+                   @click="handleTuomin">显示脱敏信息</el-button>
+      </div>
+      <div v-if="initLoading"
+           class="m-row">
+        <div class="m-info">
+          <div class="info-prop">
+            <span class="info-title-3">姓名：</span>
+            <span>{{ formData.name||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-3">手机号：</span>
+            <span>{{ formData.showMobile||'--' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-3">证件号：</span>
+            <span>{{ formData.showIdCard||'--' }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">户籍地：</span>
+            <span>{{ formData.registeredResidence||'--' }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">来源地：</span>
+            <span>{{ formData.sourceAddress||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">详细地址：</span>
+            <span>{{ formData.sourceDetailAddress||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">来曹事由：</span>
+            <span>{{ formData.describeContent||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">48小时核酸：</span>
+            <span>{{ formData.natOutcomeName||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-3">来到本地时间：</span>
+            <span>{{ formData.arriveDate||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-3">在曹居住地点：</span>
+            <span>{{ formData.presentAddress||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">详细地址：</span>
+            <span>{{ formData.detailAddress||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">返回方式：</span>
+            <span>{{ formData.trafficTypeName||'--'  }}</span>
+          </div>
+          <div v-if="formData.trafficTypeExplain"
+               class="info-prop">
+            <span class="info-title-3">具体方式：</span>
+            <span>{{ formData.trafficTypeExplain||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">7天内旅居史情况：</span>
+            <span>{{ formData.sojournHistoryName||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">隔离状态：</span>
+            <span>{{ formData.isolateTypeName||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">备注：</span>
+            <span>{{ formData.remark||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">是否落实"落地检"：</span>
+            <span>{{ formData.isArriveCheckName||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">是否到达曹县：</span>
+            <span>{{ formData.isArriveName||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-3">上报时间：</span>
+            <span>{{ formData.reportingTime||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">类型：</span>
+            <span>{{ formData.tripDataTypeName||'--'  }}</span>
+          </div>
+
+        </div>
+      </div>
+
+    </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
+      <!-- <el-button v-if="formType != 'detail'"
+                 size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm('ref_form')">确 定</el-button> -->
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import { dateFormats } from '@/utils/index'
+import { isCard, isMobile } from '@/utils/validate'
+
+let loading // 加载动画
+export default {
+  data () {
+
+    return {
+
+      initLoading: false,
+
+      selId: '',
+      formData: {},
+
+    }
+  },
+  components: {},
+  async mounted () {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+    //获取网格下拉框数据
+    // await this.loadGrid()
+  },
+  destroyed () {
+    this.nowAllCode = []
+  },
+  methods: {
+
+    async initForm (row) {
+      console.log('row----', row)
+
+      this.formData.agencyId = this.agencyId
+      this.selId = row.id
+      await this.loadFormData(row.id)
+
+      this.initLoading = true
+
+
+    },
+    async handleTuomin () {
+      const url = "/data/aggregator/epmetuser/detailByType";
+
+      const { data, code, msg } = await requestPost(url, {
+        id: this.selId,
+        type: "routeFollow",
+      });
+
+      if (code === 0) {
+        this.$set(this.formData, 'showMobile', data.mobile)
+        this.$set(this.formData, 'showIdCard', data.idCard)
+      } else {
+        this.$message.error(msg);
+      }
+
+    },
+
+    async loadGrid () {
+      const url = "/gov/org/customergrid/gridoption"
+
+      let params = {
+        agencyId: this.agencyId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.gridList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async handleSelGrid (value) {
+
+      const url = "/epmetuser/icresiuser/demandusers"
+
+      let params = {
+        agencyId: this.agencyId,
+        gridId: value
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.personList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async getArea (node, resolve) {
+
+      const url = "/commonservice/areacode/nextarea"
+      let params = {
+        parentLevel: node.data ? node.data.level : '',
+        parentAreaCode: node.data ? node.data.code : ''
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        const nodes = data.map(item => ({
+          value: item.areaCode, //
+          label: item.areaName,
+          code: item.areaCode,
+          level: item.level,
+          leaf: node.level >= 4 // 5层级
+        }))
+        resolve(nodes)
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async handleSelAddress (value) {
+
+      const url = "/gov/org/house/gethouseinfo/" + value
+
+      const { data, code, msg } = await requestPost(url)
+
+      if (code === 0) {
+        this.formData.presentAddress = data.agencyPathName
+        this.formData.presentAddressCode = data.areaCode
+        this.formData.detailAddress = data.allName
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async handleSelPerson (personItem) {
+      this.formData.userId = personItem.demandUserId
+      this.formData.name = personItem.demandUserName
+      this.formData.mobile = personItem.demandUserMobile
+      this.formData.idCard = personItem.idCard
+      this.handleSelAddress(personItem.houseId)
+    },
+
+    async loadFormData (id) {
+
+      const url = '/epmetuser/tripreport/detail'
+      let params = {
+        id,
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        console.log('deda-------', data)
+        this.formData = { ...data, channel: [], content: '' }
+        this.sourceAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',')
+
+        if (data.userType == 'icresi') this.isFromResi = true
+        else this.nowAllCode = data.presentAddressPathCode && data.presentAddressPathCode.split(',')
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleCancle () {
+      // this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    resetData () {
+
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  props: {
+    view_real_data: {//显示【显示脱敏信息】按钮
+      type: Boolean,
+      default: false,
+    }
+  },
+}
+</script>
+
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/detail-main.scss";
+
+.div_tuomin {
+  position: absolute;
+  top: 0;
+  right: 40px;
+  z-index: 1000;
+}
+</style>
+
+
diff --git a/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue b/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue
new file mode 100644
index 000000000..c136bce6a
--- /dev/null
+++ b/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue
@@ -0,0 +1,882 @@
+<template>
+  <div class="epidemic-form">
+    <div class="dialog-h-content scroll-h">
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               label-width="150px"
+               class="form">
+
+        <el-form-item v-if="formType==='add'"
+                      label="录入方式"
+                      style="display: block">
+          <el-radio-group v-model="enterType"
+                          @change="handleChangeEnterType">
+
+            <el-radio :label="'1'">手动输入</el-radio>
+            <el-radio :label="'2'">选择居民</el-radio>
+
+          </el-radio-group>
+
+        </el-form-item>
+
+        <el-form-item v-if="formType==='add'"
+                      label="所属网格"
+                      style="display: block">
+          <el-select class="item_width_4"
+                     v-model.trim="formData.gridId"
+                     placeholder="请选择"
+                     :disabled="!isFromResi"
+                     clearable>
+            <el-option v-for="item in gridList"
+                       @click.native="handleSelGrid(item.value)"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="formType==='add'"
+                      label="居民"
+                      prop="userId"
+                      style="display: block">
+          <el-select class="item_width_4"
+                     v-model.trim="formData.userId"
+                     placeholder="请选择"
+                     filterable
+                     :disabled="!isFromResi"
+                     clearable>
+            <el-option v-for="item in personList"
+                       @click.native="handleSelPerson(item)"
+                       :key="item.demandUserId"
+                       :label="item.label"
+                       :value="item.demandUserId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="姓名"
+                      prop="name"
+                      style="display: block">
+          <el-input class="item_width_4"
+                    placeholder="请输入姓名"
+                    clearable
+                    v-model="formData.name"
+                    style="margin-right:10px;">
+          </el-input>
+          <el-checkbox v-model="formData.heSuanCheck">添加到核酸检测关注名单</el-checkbox>
+        </el-form-item>
+
+        <el-form-item label="手机号"
+                      prop="mobile"
+                      style="display: block">
+          <el-input class="item_width_4"
+                    placeholder="请输入手机号"
+                    clearable
+                    v-model="formData.mobile">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="证件号"
+                      prop="idCard"
+                      style="display: block">
+          <el-input class="item_width_4"
+                    placeholder="请输入身份证号或证件号"
+                    clearable
+                    v-model="formData.idCard">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="户籍地"
+                      prop="registeredResidence"
+                      style="display: block">
+          <el-input class="item_width_4"
+                    placeholder="请输入户籍地"
+                    clearable
+                    v-model="formData.registeredResidence">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="来源地"
+                      prop="sourceAddress"
+                      style="display: block">
+
+          <el-cascader ref="sourceArea"
+                       v-model="sourceAllCode"
+                       class="item_width_5"
+                       :props="areaProps"
+                       @change="handleSourceArea"
+                       clearable></el-cascader>
+        </el-form-item>
+
+        <el-form-item label="详细地址"
+                      prop="sourceDetailAddress"
+                      style="display: block">
+          <el-input class="item_width_4"
+                    placeholder="请输入详细地址"
+                    clearable
+                    v-model="formData.sourceDetailAddress">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="来曹事由"
+                      prop="describeContent"
+                      style="display: block">
+          <el-input class="item_width_4"
+                    placeholder="请输入来曹事由"
+                    clearable
+                    v-model="formData.describeContent">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="48小时核酸"
+                      prop="natOutcome"
+                      style="display: block">
+          <el-radio v-model="formData.natOutcome"
+                    label="0">阴性</el-radio>
+          <el-radio v-model="formData.natOutcome"
+                    label="1">阳性</el-radio>
+        </el-form-item>
+
+        <el-form-item label="来到本地时间"
+                      style="display: block"
+                      prop="arriveDate">
+          <el-date-picker class="item_width_4"
+                          v-model="formData.arriveDate"
+                          :picker-options="pickerOptions"
+                          format="yyyy-MM-dd HH:mm"
+                          value-format="yyyy-MM-dd HH:mm"
+                          type="datetime"
+                          clearable
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="在曹居住地点"
+                      prop="presentAddress"
+                      style="display: block">
+
+          <template>
+
+            <el-cascader ref="nowArea"
+                         class="item_width_5"
+                         :props="areaProps"
+                         v-model="nowAllCode"
+                         clearable
+                         @change="handleNowArea"></el-cascader>
+          </template>
+        </el-form-item>
+        <el-form-item label="详细地址"
+                      prop="detailAddress"
+                      style="display: block">
+          <el-input class="item_width_4"
+                    placeholder="请输入详细地址"
+                    clearable
+                    v-model="formData.detailAddress">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="返回方式"
+                      style="display: block"
+                      prop="trafficType">
+          <el-select class="item_width_4"
+                     v-model.trim="formData.trafficType"
+                     placeholder="请选择"
+                     clearable>
+            <el-option v-for="item in trafficTypeList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+        <el-form-item v-if="formData.trafficType==='5'"
+                      label="具体方式"
+                      style="display: block"
+                      prop="trafficTypeExplain">
+          <el-input class="item_width_4"
+                    placeholder="请输入具体方式"
+                    clearable
+                    v-model="formData.trafficTypeExplain">
+          </el-input>
+
+        </el-form-item>
+
+        <el-form-item label="7天内旅居史情况"
+                      style="display: block"
+                      prop="sojournHistory">
+          <el-select class="item_width_4"
+                     v-model.trim="formData.sojournHistory"
+                     placeholder="请选择"
+                     clearable>
+            <el-option v-for="item in dangerLevelList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+        <el-form-item label="隔离状态"
+                      prop="isolateType">
+          <el-select class="item_width_4"
+                     v-model.trim="formData.isolateType"
+                     placeholder="请选择"
+                     clearable>
+            <el-option v-for="item in isolateTypeList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+
+        <el-form-item label="备注"
+                      prop="remark"
+                      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.remark"></el-input>
+        </el-form-item>
+
+        <el-form-item label="是否落实“落地检”"
+                      prop="isArriveCheck"
+                      style="display: block">
+          <el-radio v-model="formData.isArriveCheck"
+                    label="1">是</el-radio>
+          <el-radio v-model="formData.isArriveCheck"
+                    label="0">否</el-radio>
+        </el-form-item>
+
+        <el-form-item label="是否到达曹县"
+                      prop="isArrive"
+                      style="display: block">
+          <el-radio v-model="formData.isArrive"
+                    label="1">是</el-radio>
+          <el-radio v-model="formData.isArrive"
+                    label="0">否</el-radio>
+        </el-form-item>
+
+        <el-form-item label="上报时间"
+                      style="display: block"
+                      prop="reportingTime">
+          <el-date-picker class="item_width_4"
+                          v-model="formData.reportingTime"
+                          format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd"
+                          type="date"
+                          clearable
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="类型"
+                      prop="tripDataType">
+          <el-select class="item_width_4"
+                     v-model.trim="formData.tripDataType"
+                     placeholder="请选择"
+                     clearable>
+            <el-option v-for="item in tripDataTypeList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+
+        <template>
+          <el-form-item label="通知渠道"
+                        prop="channel"
+                        style="display: block">
+            <el-checkbox-group v-model="formData.channel">
+              <el-checkbox key="0"
+                           label="0">小程序通知</el-checkbox>
+              <!-- <el-checkbox key="1"
+                          label="1">短信通知</el-checkbox> -->
+
+            </el-checkbox-group>
+          </el-form-item>
+
+          <el-form-item v-show="formData.channel.length > 0"
+                        label="通知内容"
+                        prop="content"
+                        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>
+        </template>
+
+      </el-form>
+    </div>
+    <div class="form_div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm('ref_form')">确 定</el-button>
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import { dateFormats } from '@/utils/index'
+import { isCard, isMobile } from '@/utils/validate'
+
+let loading // 加载动画
+export default {
+  data () {
+    let checkMObile = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('手机号不能为空'))
+      } else {
+        if (!isMobile(value)) {
+          callback(new Error('手机号格式不正确'))
+        }
+        callback()
+      }
+    }
+    let checkIdCard = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('证件号不能为空'))
+      } else {
+        if (!isCard(value)) {
+          callback(new Error('请输入正确的身份证号或护照号'))
+        }
+        callback()
+      }
+    }
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+      hideUploadEdit: false, // 隐藏'上传按钮'
+      limitNum: 1,
+      enterType: '1',//录入方式1 手动输入  2  选择居民
+      isFromResi: false,//是否从已有居民信息中选择
+
+      gridList: [],
+      personList: [],
+      pickerOptions: {
+        disabledDate (time) {
+          return time.getTime() > Date.now();
+        }
+      },
+      btnDisable: false,
+      sourceAllCode: [], // 来源地全 code
+      nowAllCode: [], // 现居地全 code
+      icNatId: '',
+      formData: {
+        gridId: '',
+        agencyId: '',//当前网格所属组织Id
+        userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值
+        userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro
+        name: '',
+        idCard: '',
+        mobile: '',
+        heSuanCheck: false,
+        presentAddress: '',
+        presentAddressCode: '',
+        detailAddress: '',
+        sourceAddressCode: '',
+        presentAddressPathCode: '',
+        sourceAddress: '',
+        sourceAddressPathCode: '',
+        arriveDate: '',
+        remark: '',
+        leaveDate: '',
+        userType: 'input',
+        content: '',
+        channel: [],
+
+        registeredResidence: '',//户籍地（必填）
+        sourceDetailAddress: '',//来源地--详细地址（必填）
+        describeContent: '',//来曹事由（必填）
+        natOutcome: '',//48小时核酸  0 阴性  1 阳性（必填）
+        trafficType: '',//交通方式，来源字典表(traffic_type)	  （必填）
+        sojournHistory: '',//7天内旅居史情况，字典表(sojourn_history)【磐石】 （非必填）
+        isolateType: '',//隔离状态，字典表(isolate_type)【磐石】	 （非必填）
+        isArriveCheck: '',//是否落实"落地检" 0:否 1:是【磐石】		 （非必填）
+        isArrive: '',//是否达到曹县  0:否  1:是 【磐石】	 （非必填）
+        reportingTime: '',//上报时间（非必填）
+        tripDataType: '',//行程记录类型，字典表(trip_data_type)【磐石】	（非必填）
+
+      },
+
+      trafficTypeList: [],
+      dangerLevelList: [],
+      isolateTypeList: [
+        {
+          value: '0',
+          label: '集中隔离'
+        },
+        {
+          value: '1',
+          label: '居家隔离'
+        },
+        {
+          value: '2',
+          label: '居家健康监测'
+        },
+        {
+          value: '4',
+          label: '不需要隔离'
+        },
+      ],
+      tripDataTypeList: [],
+
+      dataRule: {
+        name: [
+          { required: true, message: '姓名不能为空', trigger: 'change' }
+        ],
+
+        mobile: [
+          { required: true, validator: checkMObile, trigger: 'change' },
+        ],
+        idCard: [
+          { required: true, validator: checkIdCard, trigger: 'change' }
+        ],
+
+        registeredResidence: [
+          { required: true, message: '户籍地不能为空', trigger: 'change' },
+        ],
+        sourceAddress: [
+          { required: true, message: '来源地不能为空', trigger: 'change' },
+        ],
+        sourceDetailAddress: [
+          { required: true, message: '来源地详细地址不能为空', trigger: 'change' },
+        ],
+        describeContent: [
+          { required: true, message: '来曹事由不能为空', trigger: 'change' },
+        ],
+        natOutcome: [
+          { required: true, message: '48小时核酸不能为空', trigger: 'change' },
+        ],
+        arriveDate: [
+          { required: true, message: '来到本地时间不能为空', trigger: 'change' },
+        ],
+
+        presentAddress: [
+          { required: true, message: '在曹居住地点不能为空', trigger: 'change' },
+        ],
+        detailAddress: [
+          { required: true, message: '在曹居住详细地址不能为空', trigger: 'change' },
+        ],
+
+        trafficType: [
+          { required: true, message: '返回方式不能为空', trigger: 'change' },
+        ],
+        trafficTypeExplain: [
+          { required: true, message: '具体方式不能为空', trigger: 'change' },
+        ]
+      },
+      areaProps: {
+        // checkStrictly: true,
+        lazy: true,
+        lazyLoad: this.lzayLoadArea
+      }
+
+    }
+  },
+  components: {},
+  async mounted () {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+    //获取网格下拉框数据
+    await this.loadGrid()
+
+    this.getDangerLevel()
+    this.getTrafficType()
+    // this.getIsolateType()
+    this.getTripDataType()
+  },
+  destroyed () {
+    this.nowAllCode = []
+  },
+  methods: {
+    computedWd (val) {
+      const len = val.length
+      const wd = len * 18
+      let w = ''
+      if (wd > 220) w = wd
+      else w = 220
+      return w + 'px'
+    },
+    lzayLoadArea (node, resolve) {
+      // this.getArea(node, resolve)
+      setTimeout(() => {
+        this.getArea(node, resolve)
+      }, 200)
+    },
+    async initForm (type, row) {
+      console.log('row----', row)
+      this.formType = type
+      this.formData.agencyId = this.agencyId
+      if (type != 'add') {
+        // this.formData = { ...row, channel: [], content: '' }
+        await this.loadFormData(row.id)
+
+
+      } else {
+        const { user } = this.$store.state
+        //默认：山东省37-菏泽市3717-曹县371721
+        this.nowAllCode = ['37', '3717', '371721']
+      }
+      // this.$refs['ref_form'].resetFields();
+
+      console.log('formtype', type)
+
+    },
+
+    handleChangeEnterType (value) {
+      this.formData.name = ''
+      this.formData.mobile = ''
+      this.formData.idCard = ''
+      this.formData.gridId = ''
+      this.formData.userId = ''
+      this.resetData()
+      if (value === '2') {
+        this.isFromResi = true
+        this.formData.userType = 'icresi'
+      } else {
+        this.isFromResi = false
+        this.formData.userType = 'input'
+        const { user } = this.$store.state
+        // this.nowAllCode = user.areaCodePath
+      }
+
+
+    },
+    handleSourceArea (val) {
+      console.log('val-----', val)
+      console.log('label-----', this.$refs.sourceArea.getCheckedNodes())
+      if (val.length > 0) {
+        const labels = this.$refs.sourceArea.getCheckedNodes()[0].pathLabels
+        this.formData.sourceAddressCode = val[val.length - 1]
+        this.formData.sourceAddress = labels.join('-')
+        this.formData.sourceAddressPathCode = val.join(',')
+        this.$refs.ref_form.clearValidate('sourceAddress')
+      } else {
+        this.formData.sourceAddressCode = ''
+        this.formData.sourceAddress = ''
+        this.formData.sourceAddressPathCode = ''
+      }
+
+    },
+    handleNowArea (val) {
+      console.log('val-----', val)
+      console.log('label-----', this.$refs.nowArea.getCheckedNodes())
+      if (val.length > 0) {
+        const labels = this.$refs.nowArea.getCheckedNodes()[0].pathLabels
+        this.formData.presentAddressCode = val[val.length - 1]
+        this.formData.presentAddress = labels.join('-')
+        this.formData.presentAddressPathCode = val.join(',')
+        console.log('presentAddress', this.formData.presentAddress)
+        this.$refs.ref_form.clearValidate('presentAddress')
+      } else {
+        this.formData.presentAddressCode = ''
+        this.formData.presentAddress = ''
+        this.formData.presentAddressPathCode = ''
+      }
+    },
+    async loadGrid () {
+      const url = "/gov/org/customergrid/gridoption"
+
+      let params = {
+        agencyId: this.agencyId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.gridList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async handleSelGrid (value) {
+
+      const url = "/epmetuser/icresiuser/demandusers"
+
+      let params = {
+        agencyId: this.agencyId,
+        gridId: value
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.personList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async getArea (node, resolve) {
+
+      const url = "/commonservice/areacode/nextarea"
+      let params = {
+        parentLevel: node.data ? node.data.level : '',
+        parentAreaCode: node.data ? node.data.code : ''
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        const nodes = data.map(item => ({
+          value: item.areaCode, //
+          label: item.areaName,
+          code: item.areaCode,
+          level: item.level,
+          leaf: node.level >= 4 // 5层级
+        }))
+        resolve(nodes)
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async handleSelAddress (value) {
+
+      const url = "/gov/org/house/gethouseinfo/" + value
+
+      const { data, code, msg } = await requestPost(url)
+
+      if (code === 0) {
+        this.formData.presentAddress = data.agencyPathName
+        this.formData.presentAddressCode = data.areaCode
+        // this.formData.detailAddress = data.allName
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async handleSelPerson (personItem) {
+      this.formData.userId = personItem.demandUserId
+      this.formData.name = personItem.demandUserName
+      this.formData.mobile = personItem.demandUserMobile
+      this.formData.idCard = personItem.idCard
+      this.handleSelAddress(personItem.houseId)
+    },
+
+    async loadFormData (id) {
+
+      const url = '/epmetuser/tripreport/detail'
+      let params = {
+        id,
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        console.log('deda-------', data)
+        this.formData = { ...data, channel: [], content: '' }
+        this.sourceAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',')
+        this.nowAllCode = data.presentAddressPathCode && data.presentAddressPathCode.split(',')
+
+        if (data.userType == 'icresi') this.isFromResi = true
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+
+    async handleComfirm (formName) {
+      this.$refs[formName].validate(async (valid) => {
+        if (valid) {
+          if (this.formData.channel.length > 0 && !this.formData.content) {
+            this.$message({
+              type: 'warning',
+              message: '请填写通知内容'
+            })
+            return false;
+          }
+
+          this.btnDisable = true
+          setTimeout(() => {
+            this.btnDisable = false
+          }, 5000)
+
+          let url = ''
+          if (this.formType === 'add') url = '/epmetuser/tripreport/save'
+          else url = '/epmetuser/tripreport/update'
+
+          console.log(' this.formData', this.formData)
+          // return false
+          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
+
+          } else {
+            this.btnDisable = false
+            this.$message.error(msg)
+          }
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+
+
+    },
+
+    handleCancle () {
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    resetData () {
+      this.$refs.ref_form.resetFields()
+      this.formData.sourceAddressCode = ''
+      this.formData.presentAddressCode = ''
+      this.formData.sourceAddressPathCode = ''
+      this.formData.presentAddressPathCode = ''
+      this.sourceAllCode = []
+      this.nowAllCode = []
+    },
+
+    async getDangerLevel () {
+
+      const url = "/sys/dict/data/dictlist";
+
+      let params = {
+        dictType: "sojourn_history",
+      };
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.dangerLevelList = data
+
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async getTrafficType () {
+
+      const url = "/sys/dict/data/dictlist";
+
+      let params = {
+        dictType: "traffic_type",
+      };
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.trafficTypeList = data
+
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async getIsolateType () {
+
+      const url = "/sys/dict/data/dictlist";
+
+      let params = {
+        // dictType: "isolatedState",
+        dictType: "isolate_type",
+      };
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.isolateTypeList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async getTripDataType () {
+
+      const url = "/sys/dict/data/dictlist";
+
+      let params = {
+        dictType: "trip_data_type",
+      };
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.tripDataTypeList = data
+
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  }
+}
+</script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+
+.epidemic-form {
+  .mw180 {
+    min-width: 260px;
+  }
+}
+</style>
+
+<style lang='scss'>
+// 隐藏上传按钮
+.hide .el-upload--picture-card {
+  display: none;
+}
+// 添加/删除文件时去掉动画过渡
+.el-upload-list__item {
+  transition: none !important;
+}
+</style>
+
+
+
diff --git a/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue b/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue
index fdef145e9..882deeffb 100644
--- a/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue
+++ b/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue
@@ -151,10 +151,10 @@ export default {
   methods: {
 
     async initTable (row) {
-
-      this.formData.idCard = row.idCard
+      console.log(row)
+      this.formData.idCard = row.realIdCard
       this.formData.name = row.name
-      this.formData.mobile = row.mobile
+      this.formData.mobile = row.realMobile
 
       await this.loadTable()
 
diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue
index e9785bebb..2559274b9 100644
--- a/src/views/modules/communityParty/regionalParty/activitys.vue
+++ b/src/views/modules/communityParty/regionalParty/activitys.vue
@@ -193,13 +193,14 @@
                        style="color:#1C6AFD;text-decoration: underline;"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
-            <el-button v-if="!scope.row.actId"
+            <el-button v-if="agencyId===scope.row.agencyId&&!scope.row.actId"
                        type="text"
                        style="color:#00A7A9;text-decoration: underline;"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
 
-            <el-button type="text"
+            <el-button v-if="agencyId===scope.row.agencyId"
+                       type="text"
                        style="color:#D51010;text-decoration: underline;"
                        size="small"
                        @click="handleDelete(scope.row)">删除</el-button>
diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue
index fa3cfb952..bc61e38c6 100644
--- a/src/views/modules/communityParty/regionalParty/units.vue
+++ b/src/views/modules/communityParty/regionalParty/units.vue
@@ -128,6 +128,12 @@
                          label="单位名称"
                          min-width="100">
         </el-table-column>
+        <el-table-column prop="agencyName"
+                         header-align="center"
+                         align="center"
+                         label="所属组织"
+                         min-width="100">
+        </el-table-column>
         <el-table-column prop="type"
                          header-align="center"
                          align="center"
@@ -197,12 +203,14 @@
                        class="div-table-button--detail"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
-            <el-button type="text"
+            <el-button v-if="agencyId===scope.row.agencyId"
+                       type="text"
                        class="div-table-button--edit"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
 
-            <el-popover popper-class="btn-popper"
+            <el-popover v-if="agencyId===scope.row.agencyId"
+                        popper-class="btn-popper"
                         placement="bottom"
                         style="margin-left:10px"
                         width="20"
@@ -247,6 +255,12 @@
                          slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
             </el-popover>
 
+            <el-button v-else
+                       type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleScore(scope.row)">积分记录</el-button>
+
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index 4dd705c94..7b5f5450d 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -45,7 +45,7 @@
                           size="small"
                           class="div-table-button--add">新增下级</el-button>
                 <el-button  v-if="(scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)) && scope.row.partyOrgType != '6'"
-                          @click="addOrUpdateHandle(scope.row.id, '', '', scope.row.pid, '', '')"
+                          @click="addOrUpdateHandle(scope.row.id, '', '', scope.row.pid, scope.row.partyOrgType, '')"
                           type="text"
                           size="small"
                           class="div-table-button--edit">修改</el-button>
diff --git a/src/views/modules/plugins/rent/rentcontractreview.vue b/src/views/modules/plugins/rent/rentcontractreview.vue
index 2654fdaec..a1d211e33 100644
--- a/src/views/modules/plugins/rent/rentcontractreview.vue
+++ b/src/views/modules/plugins/rent/rentcontractreview.vue
@@ -196,9 +196,9 @@
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button v-if="scope.row.state === '0'" type="text" size="small" @click="lookOrCheckHandle(scope.row.id,'2')">登记</el-button>
+             <el-button v-if="scope.row.state === '0'" type="text" size="small" @click="addOrUpdateHandle(scope.row.id, 'edit')">修改</el-button>
+            <el-button v-if="scope.row.state === '0'" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
             <el-button v-else type="text" size="small" @click="lookOrCheckHandle(scope.row.id,'1')">{{ $t('lookBtn') }}</el-button>
-            <!-- <el-button v-if="scope.row.isPcInput == '1'" type="text" size="small" @click="addOrUpdateHandle(scope.row.id, 'edit')">修改</el-button> -->
-<!--            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>-->
           </template>
         </el-table-column>
       </el-table>
@@ -229,7 +229,7 @@ export default {
       mixinViewModuleOptions: {
         getDataListURL: '/pli/power/rentContractInfo/page',
         getDataListIsPage: true,
-        deleteURL: '/pli/power/rentContractInfo',
+        deleteURL: '/pli/power/rentContractInfo/delete',
         deleteIsBatch: true
       },
       optionsV: [],
diff --git a/src/views/modules/visual/communityGovern/zhongdianxingcheng/detail.vue b/src/views/modules/visual/communityGovern/zhongdianxingcheng/detail.vue
new file mode 100644
index 000000000..5f33fa448
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/zhongdianxingcheng/detail.vue
@@ -0,0 +1,195 @@
+<template>
+  <div class="m-pop">
+    <div class="wrap">
+      <cpt-card>
+        <div class="title">
+          <img src="@/assets/img/shuju/title-tip.png" />
+          <span>详情</span>
+        </div>
+
+        <!-- <div class="div_tuomin">
+          <el-button size="mini"
+                     class="diy-button--search"
+                     @click="handleTuomin">显示脱敏信息</el-button>
+        </div> -->
+
+        <div class="btn-close"
+             @click="handleClose">
+          <img src="@/assets/img/shuju/people/close.png" />
+        </div>
+        <div class="m-content">
+          <div class="m-info">
+
+            <div class="info-prop">
+              <span class="info-title-2">姓名：</span>
+              <span>{{ info.name||'--' }}</span>
+            </div>
+            <div class="info-prop">
+              <span class="info-title-2">手机：</span>
+              <span>{{ info.mobile||'--'  }}</span>
+            </div>
+
+            <div class="info-prop">
+              <span class="info-title-2">证件号：</span>
+              <span>{{ info.idCard||'--' }}</span>
+            </div>
+            <div class="info-prop">
+              <span class="info-title-2">来源地：</span>
+              <span>{{ info.sourceAddress||'--' }}</span>
+            </div>
+
+            <div class="info-prop">
+              <span class="info-title-2">来曹事由：</span>
+              <span>{{ info.describeContent||'--' }}</span>
+            </div>
+            <div class="info-prop">
+              <span class="info-title-2">48小时核酸：</span>
+              <span>{{ info.natOutComeName||'--' }}</span>
+            </div>
+            <div class="info-prop">
+              <span class="info-title-2">7天旅居史：</span>
+              <span>{{ info.sojournHistoryName||'--' }}</span>
+            </div>
+            <div class="info-prop">
+              <span class="info-title-2">隔离状态：</span>
+              <span>{{ info.isolateTypeName||'--' }}</span>
+            </div>
+            <div class="info-prop">
+              <span class="info-title-2">来曹时间：</span>
+              <span>{{ info.arriveDate||'--' }}</span>
+            </div>
+
+          </div>
+
+        </div>
+      </cpt-card>
+    </div>
+  </div>
+</template>
+
+<script>
+import cptCard from "@/views/modules/visual/cpts/card";
+import screenLoading from "@/views/modules/visual/cpts/loading";
+import { requestPost } from "@/js/dai/request";
+
+import dateFormat from "dai-js/tools/dateFormat";
+
+export default {
+  name: "demandInfo",
+  props: {
+    detailId: {
+      type: String,
+      default: "",
+    },
+
+  },
+
+  components: {
+    cptCard,
+
+    screenLoading,
+  },
+
+  data () {
+    return {
+      info: {
+        name: "",
+        mobile: "",
+        idCard: "",
+        sourceAddress: "",
+        describeContent: "",
+        natOutcome: "",
+        sojournHistory: "",
+        isolateType: "",
+        arriveDate: '',
+
+
+      },
+
+
+    };
+  },
+
+  computed: {},
+
+  watch: {
+    detailId () {
+      this.getApiData();
+    },
+  },
+
+  mounted () {
+    this.getApiData();
+  },
+
+  methods: {
+    async handleTuomin () {
+      const url = "/data/aggregator/epmetuser/detailByType";
+
+      const { data, code, msg } = await requestPost(url, {
+        id: this.detailId,
+        type: "routeFollow",
+      });
+
+      if (code === 0) {
+        this.$set(this.info, 'mobile', data.mobile)
+        this.$set(this.info, 'idCard', data.idCard)
+      } else {
+        this.$message.error(msg);
+      }
+
+    },
+    handleClose () {
+      this.$emit("close");
+    },
+
+    async getApiData () {
+
+      await this.getInfo();
+
+    },
+
+    //加载组织数据
+    async getInfo () {
+      const url = "/epmetuser/tripreport/emphasisTripDetail";
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icTripReportRecord/emphasisTripDetail";
+      let params = {
+        id: this.detailId,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.info = data
+
+        if (this.info.topicInfo && this.info.topicInfo.publishedTime) {
+          this.info.topicInfo.publishedTimeShow = dateFormat(new Date(this.info.topicInfo.publishedTime * 1000), "yyyy-MM-dd")
+
+        }
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+
+
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/issue-info.scss"
+  scoped
+></style>
+
+
+<style lang="scss" scoped>
+.div_tuomin {
+  position: absolute;
+  top: 10px;
+  right: 60px;
+  z-index: 1000;
+}
+</style>
+
diff --git a/src/views/modules/visual/communityGovern/zhongdianxingcheng/pieOption.js b/src/views/modules/visual/communityGovern/zhongdianxingcheng/pieOption.js
new file mode 100644
index 000000000..ca2e35cd2
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/zhongdianxingcheng/pieOption.js
@@ -0,0 +1,175 @@
+
+export function pieOption (_charts) {
+  const center= ['50%', '240px']
+    return {
+      title: {
+        text: '0',
+        top: 215,
+        left: 'center',
+        textStyle: {
+          width: '100%',
+          fontSize: 26,
+          color: '#FFFFFF',
+          fontWeight: 400
+        },
+        itemGap: 5,
+        subtext: '总数',
+        subtextStyle: {
+          fontSize: 18,
+          color: '#fff',
+          fontWeight: 400
+        }
+      },
+      tooltip: {
+        show: false
+      },
+      legend: {
+        bottom: 150,
+        itemWidth: 20,
+        itemHeight: 10,
+        textStyle: {
+          color: '#D2E7FF',
+          fontSize: 14,
+          lineHeight: 20,
+        },
+      
+      },
+      series: [
+        // 外侧圆环
+        {
+          type: 'pie',
+          // 起始刻度的角度，默认为 90 度，即圆心的正上方。0 度为圆心的正右方。
+          startAngle: 0,
+          hoverAnimation: false,
+          // tooltip: {
+          // },
+          center: center,
+          radius: ['48%', '48.3%'],
+          label: {
+            show: false
+          },
+          labelLine: {
+            show: false
+          },
+          data: [{
+            value: 360,
+            itemStyle: {
+              color: 'rgba(40, 101, 250, 0)',
+              width:0,
+              borderColor: 'rgba(40, 101, 250, 0.5)',
+              borderWidth: 1,
+              borderType: 'dotted'
+            }
+          }
+          ]
+        },
+  
+        // 突出的
+        {
+          hoverAnimation: false,
+          // name: 'Access From',
+          type: 'pie',
+          center: center,
+          radius: ['25%', '38%'],
+          avoidLabelOverlap: false,
+          // top: top + '%',
+          // height: '80%',
+          selectedMode: 'single',
+          left: 'center',
+          width: 480,
+          label: {
+            // show: false,
+            position: 'outside',
+            alignTo: 'edge',
+            // formatter: '{a|{c}}\n\n{name|{b}}',
+            formatter: '{a|{c}}\n{r|}\n{name|{b}}',
+            minMargin: 5,
+            edgeDistance: 1,
+            lineHeight: 15,
+            color: '#fff',
+            fontSize: 10,
+            // distanceToLabelLine: -60,
+            rich: {
+              name: {
+                padding: [0, 6, 0, 6]
+              },
+              a: {
+                fontSize: 18,
+                color: '#fff',
+                padding: [0, 6, 6, 6]
+              },
+              r: {
+                backgroundColor: 'auto',
+                borderRadius: 6,
+                width: 6,
+                height: 6,
+                // padding: [3, 3, 0, -12]
+              }
+            }
+          },
+          labelLine: {
+            show: false,
+            smooth: 0.2,
+            length: 20,
+            length2: 0,
+            maxSurfaceAngle: 80
+          },
+          labelLayout: function (params) {
+            
+            const isLeft = params.labelRect.x < _charts.getWidth() / 2;
+            const points = params.labelLinePoints;
+            // Update the end point.
+            if (points) {
+              points[2][0] = isLeft
+              ? params.labelRect.x
+              : params.labelRect.x + params.labelRect.width;
+            }
+            
+            return {
+              labelLinePoints: points
+            };
+          },
+          itemStyle: {
+            color:function(params) {
+              return params.data.color
+            }
+          },
+          data: [],
+  
+        },
+           // 中间圆环
+           {
+            type: 'pie',
+            // 起始刻度的角度，默认为 90 度，即圆心的正上方。0 度为圆心的正右方。
+            startAngle: 0,
+            hoverAnimation: false,
+            center: center,
+            // tooltip: {
+            // },
+            radius: ['0%', '20%'],
+            label: {
+            
+                show: false
+             
+            },
+            labelLine: {
+             
+                show: false
+            
+            },
+            data: [{
+              value: 360,
+              itemStyle: {
+                normal: {
+                  color: 'rgba(8, 37, 134, 1)',
+              
+                }
+              }
+            }
+            ]
+          },
+      ]
+  
+    }
+  }
+  
\ No newline at end of file
diff --git a/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue b/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue
new file mode 100644
index 000000000..c3084c377
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue
@@ -0,0 +1,508 @@
+<template>
+  <cpt-card style="margin-top:40px">
+    <div class="title">
+      <img src="@/assets/img/shuju/title-tip.png" />
+      <span>重点行程名单统计</span>
+      <div class="search">
+        <div class="second-select cascader">
+
+          <!-- <el-cascader class="customer_cascader"
+                       ref="myCascader"
+                       v-model="agencyIdArray"
+                       :key="iscascaderShow"
+                       :options="casOptions"
+                       :props="optionProps"
+                       :show-all-levels="false"
+                       @change="handleChangeAgency"></el-cascader> -->
+
+          <el-cascader ref="sourceArea"
+                       v-model="sourceAllCode"
+                       class="customer_cascader"
+                       :props="areaProps"
+                       @change="handleAreaChange"
+                       clearable></el-cascader>
+
+        </div>
+
+      </div>
+    </div>
+
+    <div class="g-cpt-resi">
+      <div class="g-l">
+        <screen-echarts-frame v-if=" !dataLoading"
+                              class="echart-wr"
+                              @myChartMethod="pieInitOk"
+                              ref="pieChart"></screen-echarts-frame>
+
+        <div class="table-status"
+             v-if="dataLoading">
+          <screen-loading>加载中</screen-loading>
+        </div>
+      </div>
+      <div class="g-r">
+        <div class="m-tb">
+
+          <div class="tb">
+            <cpt-tb :col-list="demand.colList"
+                    :loading="demand.loading"
+                    :header="demand.header"
+                    :list="demand.list"
+                    @operate="toIssueInfo"></cpt-tb>
+
+          </div>
+          <div class="m-pagination">
+            <el-pagination hide-on-single-page
+                           :current-page="demand.pageNo"
+                           :page-size="demand.pageSize"
+                           :total="demand.total"
+                           background
+                           layout="prev, pager, next,total"
+                           @current-change="handlePageNoChange_demand">
+            </el-pagination>
+          </div>
+        </div>
+
+      </div>
+    </div>
+
+    <detail v-if="showDetail"
+            :detailId="detailId"
+            @close="showDetail = false" />
+
+  </cpt-card>
+</template>
+
+<script>
+import { Loading } from "element-ui"; //引入Loading服务
+import { requestPost } from "@/js/dai/request";
+import cptCard from "@/views/modules/visual/cpts/card";
+import cptTb from "@/views/modules/visual/cpts/tb";
+import screenEchartsFrame from "@/views/modules/visual/components/screen-echarts-frame";
+import ScreenLoading from "@/views/modules/visual/components/screen-loading";
+import ScreenNodata from "@/views/modules/visual/components/screen-nodata";
+import { pieOption } from './pieOption.js'
+
+import detail from "./detail";
+
+
+export default {
+  name: "HomeMap",
+  data () {
+    return {
+      dataLoading: true,
+
+      pieChartS: null,
+      pieChart: '',
+      pieOption: {},
+      pieInitState: false,
+      pieTotal: 0,
+      colorArray: [],
+      pieData: [],
+
+      code: '',
+      dangerLevel: '',
+
+      tableList: [],
+      demand: {
+        loading: true,
+        colList: [
+          {
+            align: "center",
+            width: "5%",
+          },
+          {
+            align: "center",
+            width: "8%",
+          },
+          {
+            align: "center",
+            width: "12%",
+          },
+          {
+            align: "center",
+            width: "17%",
+          },
+          {
+            align: "center",
+            width: "18%",
+          },
+          {
+            align: "center",
+            width: "8%",
+          },
+          {
+            align: "center",
+            width: "8%",
+          },
+          {
+            align: "center",
+            width: "10%",
+          },
+          {
+            align: "center",
+            width: "8%",
+          },
+          {
+            align: "center",
+            width: "8%",
+          },
+          {
+            align: "center",
+            width: "8%",
+          },
+        ],
+        header: ["序号", "姓名", "手机号", "证件号", "来源地", "来曹事由", "48小时核酸", "来曹时间", "七天内旅居", "隔离状态", "操作"],
+        list: [],
+        pageSize: 10,
+        pageNo: 1,
+        total: 0,
+      },
+      showDetail: false,
+      detailId: '',
+
+      sourceAllCode: [],
+      areaProps: {
+        checkStrictly: true,
+        lazy: true,
+        lazyLoad: this.lzayLoadArea
+      },
+
+    };
+  },
+  // mixins: [animate]
+  beforeDestroy () {
+
+  },
+
+  async mounted () {
+    this.dataLoading = true
+    await this.getDangerLevel()//获取组织级别
+    await this.getApiData()
+
+    this.dataLoading = false
+
+    this.getPie()
+  },
+
+  methods: {
+
+    async getApiData () {
+      await this.getPieChart()
+      await this.getTable();
+    },
+
+    async handleAreaChange (val) {
+      if (val.length > 0) {
+        // this.code = val.join('-')
+        this.code = val[val.length - 1]
+      } else {
+        this.code = ''
+      }
+      await this.getPieChart()
+
+      this.getPie()
+
+
+    },
+
+    lzayLoadArea (node, resolve) {
+      // this.getArea(node, resolve)
+      setTimeout(() => {
+        this.getArea(node, resolve)
+      }, 200)
+    },
+
+    async getArea (node, resolve) {
+
+      const url = "/commonservice/areacode/nextarea"
+      let params = {
+        parentLevel: node.data ? node.data.level : '',
+        parentAreaCode: node.data ? node.data.code : ''
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        const nodes = data.map(item => ({
+          value: item.areaCode, //
+          label: item.areaName,
+          code: item.areaCode,
+          level: item.level,
+          leaf: node.level >= 1 // 2层级
+        }))
+        resolve(nodes)
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    // 获取当前登录人员信息及组织信息
+    async getDangerLevel () {
+      const url = "/sys/dict/data/dictlist";
+
+      let params = {
+        dictType: "dangerAreaLevel",
+      };
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.dangerLevelList = data
+
+
+      } else {
+        this.$message.error(msg)
+      }
+
+
+    },
+    // 获取饼状图
+    async getPieChart () {
+      if (this.$refs.pieChart) {
+        this.$refs.pieChart.clear()
+        this.$refs.pieChart.showLoading()
+      }
+
+      const url = "/epmetuser/tripreport/emphasisTripPieDetail";
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/tripreport/emphasisTripPieDetail";
+      let params = {
+        code: this.code,
+
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        // let dataTemp = [
+        //   { total: 50, dangerLevelName: '低风险', color: '#fac858', dangerLevel: '0' },
+        //   { total: 20, dangerLevelName: '中风险', color: '#fc8452', dangerLevel: '1' },
+        //   { total: 20, dangerLevelName: '高风险', color: '#ee6666', dangerLevel: '2' },
+        // ]
+
+        this.pieData = []
+        this.pieTotal = 0
+
+        data.forEach(element => {
+          this.pieTotal = this.pieTotal + element.total
+          let color = ''
+          if (element.dangerLevel === '2') {
+            color = '#ee6666'
+          } else if (element.dangerLevel === '1') {
+            color = '#fc8452'
+          } else {
+            color = '#fac858'
+          }
+
+          let obj = {
+            name: element.dangerLevelName,
+            value: element.total,
+            color: color
+          }
+
+          this.pieData.push(obj)
+        });
+
+
+        if (this.$refs.pieChart) {
+          this.$refs.pieChart.hideLoading()
+        }
+
+      } else {
+        this.$message.error(msg);
+      }
+
+    },
+
+    pieInitOk (dom) {
+      console.log('pie准备好了', dom)
+      this.pieChartS = dom
+      this.pieInitState = true
+
+    },
+    getPie () {
+      if (this.pieInitState) {
+        this.assignPieChart()
+      } else {
+        setTimeout(() => {
+          this.getPie()
+        }, 500)
+      }
+    },
+
+    assignPieChart () {
+      const _that = this;
+
+      // 获取pieChart配置
+      this.pieOption = pieOption(this.pieChartS);
+
+      this.pieData[0].selected = false;
+      this.pieData[1].selected = false;
+
+      this.pieOption.title.text = this.pieTotal;
+
+      this.clickPie();
+
+      let fun = function (params) {
+        _that.clickPie(params);
+      };
+      this.$refs.pieChart.handleClick(fun);
+
+    },
+
+    clickPie (params) {
+      console.log('clickPie', params)
+      let dataIndex = params ? params.dataIndex : null;
+      let componentIndex = params ? params.componentIndex : null;
+      let data = params ? params.data : null
+
+      if (componentIndex === 1) {
+        //点击数据
+        if (data.name === '低风险') {
+          this.dangerLevel = "0";
+        } else if (data.name === '中风险') {
+          this.dangerLevel = "1";
+        } else if (data.name === '高风险') {
+          this.dangerLevel = "2";
+        }
+      } else if (componentIndex === 2) {
+        //点击中心
+        this.dangerLevel = "";
+        dataIndex = 3;
+      }
+
+      if (dataIndex === 3) {
+        this.$refs.pieChart.clear();
+      }
+      this.pieData.forEach((element, index) => {
+        if (index === dataIndex) {
+          element.selected = true;
+          element.label = {
+            show: true,
+          };
+          element.labelLine = {
+            show: true,
+            lineStyle: {
+              opacity: 1,
+            },
+          };
+          // element.selected = !element.selected
+        } else {
+          element.selected = false;
+          element.label = {
+            show: false,
+          };
+          element.labelLine = {
+            show: false,
+            lineStyle: {
+              opacity: 0,
+              color: "rgba(255,255,255,0)",
+            },
+          };
+          element.selected = false;
+        }
+      });
+
+      this.pieOption.series[1].data = this.pieData;
+      this.demand.pageNo = 1;
+      this.getTable();
+
+      // this.$refs.pieChart.hideLoading()
+      this.$refs.pieChart.setOption(this.pieOption);
+    },
+
+    //加载组织数据
+    async getTable () {
+
+      const url = "/epmetuser/tripreport/list";
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/tripreport/list";
+      let params = {
+        code: this.code,
+        dangerLevel: this.dangerLevel,
+        pageNo: this.demand.pageNo,
+        pageSize: this.demand.pageSize,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+      this.demand.loading = false;
+
+      if (code === 0) {
+        this.demand.total = data.total;
+        this.tableList = data.list
+        this.demand.list = data.list.map((item, index) => {
+          return [
+            index + 1,
+            item.name ? item.name : '--',
+            item.mobile ? item.mobile : '',
+            item.idCard ? item.idCard : '',
+            item.sourceAddress ? item.sourceAddress : '',
+            item.describeContent ? item.describeContent : '',
+            item.natOutComeName ? item.natOutComeName : '',
+            item.arriveDate ? item.arriveDate : '',
+            item.sojournHistoryName ? item.sojournHistoryName : '',
+            item.isolateTypeName ? item.isolateTypeName : '',
+            { type: "operate", list: ["查看"] },
+          ];
+        });
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    handlePageNoChange_demand (val) {
+      this.demand.pageNo = val;
+      this.getTable();
+    },
+
+    async toIssueInfo (index) {
+
+      const { tableList } = this;
+      this.detailId = tableList[index].id
+      console.log('this.detailId', this.detailId)
+      this.showDetail = true
+
+    },
+  },
+  props: {
+    uid: {
+      type: String,
+      default: "",
+      // default: "8ada68cb6f1e4b9a8333348a39ef3aee",
+    },
+  },
+
+  computed: {},
+
+  components: {
+    cptCard,
+    cptTb,
+    screenEchartsFrame,
+    ScreenLoading,
+    ScreenNodata,
+    detail
+  },
+
+  watch: {
+    uid (id) {
+      this.userId = id;
+    },
+    userId () {
+      this.getApiData();
+      window.scrollTo(0, 0);
+    },
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/resibuzz.scss"
+  scoped
+></style>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/search_1.scss"
+  scoped
+></style>
diff --git a/src/views/modules/visual/shundeju/controlCount.vue b/src/views/modules/visual/shundeju/controlCount.vue
index ae3bb12ba..1c6a5928c 100644
--- a/src/views/modules/visual/shundeju/controlCount.vue
+++ b/src/views/modules/visual/shundeju/controlCount.vue
@@ -225,6 +225,7 @@ export default {
           } else {
             item.type = '未知'
           }
+          item.villageName = '顺德居小区'
           return {
             ...item,
             index: index + 1
diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue
index 3e77cdbde..8e39a89e2 100644
--- a/src/views/pages/login.vue
+++ b/src/views/pages/login.vue
@@ -154,16 +154,6 @@ export default {
   },
 
   methods: {
-    // 登陆后跳转逻辑
-    skipAfterLogin() {
-      let href = localStorage.getItem("thePageAtExit");
-      if (href) {
-        localStorage.removeItem("thePageAtExit");
-        location.href = href;
-      } else {
-        this.$router.replace({ name: "index" });
-      }
-    },
     // 获取公钥
     getPubKey() {
       this.$http
@@ -237,7 +227,7 @@ export default {
           localStorage.setItem("userType", "work");
           localStorage.setItem("showHeader", "0");
           localStorage.setItem("token", res.data.token);
-          this.skipAfterLogin();
+          this.$router.replace({ name: "index" });
         })
         .catch(() => {});
       // epmet-ext9.elinkservice.cn/platform-admin
@@ -267,7 +257,7 @@ export default {
           localStorage.setItem("userType", "work");
 
           localStorage.setItem("token", res.data.token);
-          this.skipAfterLogin();
+          this.$router.replace({ name: "index" });
         })
         .catch(() => {
           this.endLoading();
diff --git a/src/views/pages/staffRegister.vue b/src/views/pages/staffRegister.vue
index 97db79617..70b7dec5d 100644
--- a/src/views/pages/staffRegister.vue
+++ b/src/views/pages/staffRegister.vue
@@ -14,11 +14,12 @@
 
       <div v-if="selectTab==='1'"
            class="content">
+        <div class="content-title">
+          <mt-cell title="*企业名称">
 
-        <mt-cell title="*企业名称">
-
-          <span style="margin-right:20px">{{placeOrgName}}</span>
-        </mt-cell>
+            <span style="margin-right:20px">{{placeOrgName}}</span>
+          </mt-cell>
+        </div>
         <div class="line"></div>
 
         <mt-field class="my-field"
@@ -64,11 +65,12 @@
       </div>
       <div v-if="selectTab==='2'"
            class="content">
+        <div class="content-title">
+          <mt-cell title="*企业名称">
 
-        <mt-cell title="*企业名称">
-
-          <span style="margin-right:20px">{{placeOrgName}}</span>
-        </mt-cell>
+            <span style="margin-right:20px">{{placeOrgName}}</span>
+          </mt-cell>
+        </div>
         <div class="line"></div>
         <div @click="handelSelData()">
           <mt-cell :title="'*核酸检测时间'"
@@ -452,13 +454,19 @@ export default {
 /deep/ .mint-cell-wrapper {
   padding: 0 5px 0 0;
 }
+.content-title {
+  /deep/ .mint-cell-value {
+    flex: 0 0 200px;
+  }
+}
+
 .my-field /deep/ .mint-field-core {
   text-align: right;
   margin-right: 20px;
 }
-.my-field /deep/ .mint-cell-title {
-  width: 110px;
-}
+// .my-field {
+//   /deep/
+// }
 
 /deep/ .mint-popup-bottom {
   height: 300px;