diff --git a/src/assets/scss/modules/management/detail-main.scss b/src/assets/scss/modules/management/detail-main.scss
index e89af1e6e..31f16237f 100644
--- a/src/assets/scss/modules/management/detail-main.scss
+++ b/src/assets/scss/modules/management/detail-main.scss
@@ -17,7 +17,7 @@
 }
 
 .div-btn{
-  margin-top:50px;
+  margin-top:30px;
   // margin-bottom:20px;
   display: flex;
   justify-content: center;
@@ -144,6 +144,9 @@
       .info-title-4{
         flex: 0 0 110px;
       }
+      .info-title-5{
+        flex: 0 0 130px;
+      }
 
       > span,
       > div {
diff --git a/src/views/modules/base/community/buildDetail.vue b/src/views/modules/base/community/buildDetail.vue
index 31039d156..270e0ae72 100644
--- a/src/views/modules/base/community/buildDetail.vue
+++ b/src/views/modules/base/community/buildDetail.vue
@@ -68,7 +68,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -120,6 +124,11 @@ export default {
   },
 
   methods: {
+    handleCancle () {
+      this.diaDestroy()
+      this.$emit('diaDetailClose')
+
+    },
     diaDestroy () {
       if (map) {
         map.destroy()
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 97fd4eb2f..b8d5ecafc 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -14,7 +14,8 @@
                    size="small"
                    @click="handleExportModule('building')">下载楼栋模板</el-button>
 
-        <el-upload :headers="$getElUploadHeaders()"  style=""
+        <el-upload :headers="$getElUploadHeaders()"
+                   style=""
                    ref="upload_building"
                    :multiple='false'
                    :show-file-list='false'
@@ -31,7 +32,8 @@
                    size="small"
                    @click="handleExportModule('room')">下载房屋模板</el-button>
 
-        <el-upload :headers="$getElUploadHeaders()"  style=""
+        <el-upload :headers="$getElUploadHeaders()"
+                   style=""
                    ref="upload_room"
                    :multiple='false'
                    :show-file-list='false'
@@ -206,7 +208,8 @@
                width="900px"
                class="dialog-h"
                @closed="detailFormCancle">
-      <build-detail ref="ref_form_detail"></build-detail>
+      <build-detail ref="ref_form_detail"
+                    @diaDetailClose="detailFormCancle"></build-detail>
     </el-dialog>
 
     <baobiao ref="baobiao" />
diff --git a/src/views/modules/base/community/communityDetail.vue b/src/views/modules/base/community/communityDetail.vue
index b04e4f30f..26367608e 100644
--- a/src/views/modules/base/community/communityDetail.vue
+++ b/src/views/modules/base/community/communityDetail.vue
@@ -61,7 +61,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -106,6 +110,11 @@ export default {
   },
 
   methods: {
+    handleCancle () {
+      this.diaDestroy()
+      this.$emit('diaDetailClose')
+
+    },
     diaDestroy () {
       if (map) {
         map.destroy()
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index ede5b04ce..519ffa792 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -26,7 +26,8 @@
                    size="small"
                    @click="handleExportModule('community')">下载小区模板</el-button>
 
-        <el-upload :headers="$getElUploadHeaders()"  ref="upload_community"
+        <el-upload :headers="$getElUploadHeaders()"
+                   ref="upload_community"
                    style=""
                    :multiple='false'
                    :show-file-list='false'
@@ -44,7 +45,8 @@
                    size="small"
                    @click="handleExportModule('building')">下载楼栋模板</el-button>
 
-        <el-upload :headers="$getElUploadHeaders()"  style=""
+        <el-upload :headers="$getElUploadHeaders()"
+                   style=""
                    ref="upload_building"
                    :multiple='false'
                    :show-file-list='false'
@@ -61,7 +63,8 @@
                    size="small"
                    @click="handleExportModule('room')">下载房屋模板</el-button>
 
-        <el-upload :headers="$getElUploadHeaders()"  style=""
+        <el-upload :headers="$getElUploadHeaders()"
+                   style=""
                    ref="upload_room"
                    :multiple='false'
                    :show-file-list='false'
@@ -193,7 +196,8 @@
                top="5vh"
                class="dialog-h"
                @closed="detailFormCancle">
-      <community-detail ref="ref_form_detail"></community-detail>
+      <community-detail ref="ref_form_detail"
+                        @diaDetailClose="detailFormCancle"></community-detail>
     </el-dialog>
 
     <!-- 修改弹出框 -->
diff --git a/src/views/modules/base/community/roomDetail.vue b/src/views/modules/base/community/roomDetail.vue
index fe7d74547..45bc21fc3 100644
--- a/src/views/modules/base/community/roomDetail.vue
+++ b/src/views/modules/base/community/roomDetail.vue
@@ -66,7 +66,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -117,7 +121,11 @@ export default {
   },
 
   methods: {
+    handleCancle () {
+      // this.diaDestroy()
+      this.$emit('diaDetailClose')
 
+    },
     diaDestroy () {
       if (map) {
         map.destroy()
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index a0b92e4ce..354b3684d 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -8,7 +8,8 @@
                  @click="handleAdd">新增房屋</el-button>
       <div class="btn_upload"
            v-if="showImportBtn">
-        <el-button :headers="$getElUploadHeaders()" style="float: left"
+        <el-button :headers="$getElUploadHeaders()"
+                   style="float: left"
                    class="diy-button--export"
                    size="small"
                    @click="handleExportModule">下载房屋模板</el-button>
@@ -196,7 +197,8 @@
                top="5vh"
                class="dialog-h"
                @closed="detailFormCancle">
-      <room-detail ref="ref_form_detail"></room-detail>
+      <room-detail ref="ref_form_detail"
+                   @diaDetailClose="detailFormCancle"></room-detail>
     </el-dialog>
 
     <baobiao ref="baobiao" />
diff --git a/src/views/modules/base/epidemic/natInfo/noNatDetail.vue b/src/views/modules/base/epidemic/natInfo/noNatDetail.vue
new file mode 100644
index 000000000..8cf1bcb1b
--- /dev/null
+++ b/src/views/modules/base/epidemic/natInfo/noNatDetail.vue
@@ -0,0 +1,165 @@
+<template>
+  <div class="epidemic-form">
+    <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-2">姓名：</span>
+            <span>{{ formData.name||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">手机号：</span>
+            <span>{{ formData.realMobile||'--' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">证件号：</span>
+            <span>{{ formData.realIdCard||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">检检测地点：</span>
+            <span>{{ formData.natAddress||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">检测结果：</span>
+            <span>{{ formData.natResult==='0'?'阴性':'阳性' }}</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">确 定</el-button> -->
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import { dateFormats } from '@/utils/index'
+
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      initLoading: false,
+
+      icNatId: '',
+      formData: {},
+
+
+
+    }
+  },
+  components: {},
+  async mounted () {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+
+  },
+
+  methods: {
+
+
+    async initForm (row) {
+      this.startLoading()
+      // this.formData.agencyId = this.agencyId
+      this.formData = JSON.parse(JSON.stringify(row))
+      // this.icNatId = icNatId
+      // this.formData.icNatId = icNatId
+
+      // await this.loadFormData()
+      this.initLoading = true
+      this.endLoading()
+
+
+    },
+
+    async loadFormData () {
+
+      // const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/detail'
+      const url = '/epmetuser/icNat/detail'
+      let params = {
+        icNatId: this.icNatId,
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.formData = data
+
+        console.log(this.formData.isSelChannel)
+
+        this.formData.icNatId = this.icNatId
+
+
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    handleCancle () {
+      // this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    watchImg (src) {
+      window.open(src);
+    },
+
+    resetData () {
+
+      this.formData = {}
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+
+
+  },
+  props: {
+    // serviceList: {
+    //   type: Array,
+    //   default: []
+    // },
+  }
+}
+</script>
+
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/detail-main.scss";
+</style>
+
+
+
+
+
diff --git a/src/views/modules/base/epidemic/natInfo/noNatList.vue b/src/views/modules/base/epidemic/natInfo/noNatList.vue
new file mode 100644
index 000000000..69640c259
--- /dev/null
+++ b/src/views/modules/base/epidemic/natInfo/noNatList.vue
@@ -0,0 +1,715 @@
+<template>
+  <div class="div_main">
+    <div ref="ref_search"
+         class="div_search">
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'110px'">
+        <div>
+          <el-form-item label="导入时间">
+            <el-date-picker class="list_item_width_1"
+                            v-model="formData.importDate"
+                            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"
+                       size="small"
+                       clearable
+                       v-model.trim="formData.isResiUser"
+                       placeholder="请选择">
+              <el-option v-for="item in isResiUserList"
+                         :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="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-button style="margin-left:30px"
+                     size="small"
+                     class="diy-button--search"
+                     @click="handleSearch">查询</el-button>
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--reset"
+                     @click="resetSearch">重置</el-button>
+        </div>
+
+      </el-form>
+    </div>
+    <div class="div_table">
+      <div class="div_btn">
+        <!-- <el-button class="diy-button--add"
+                   size="small"
+                   @click="handleAdd">新增</el-button> -->
+
+        <el-button style="float:left"
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule">下载模板</el-button>
+        <el-upload :headers="$getElUploadHeaders()"
+                   ref="upload"
+                   :multiple='false'
+                   :show-file-list='false'
+                   :before-upload="beforeUpload"
+                   action=""
+                   accept=".xlsx"
+                   :limit="1"
+                   :on-exceed="handleExceed"
+                   :http-request="uploadFile">
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--delete">导入</el-button>
+        </el-upload>
+
+        <el-button style="float:left;margin-left:10px"
+                   class="diy-button--reset"
+                   size="small"
+                   @click="handleExport">导出</el-button>
+      </div>
+
+      <el-table class="table"
+                ref="ref_table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%">
+        <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="姓名"
+                         min-width="100">
+        </el-table-column>
+        <el-table-column prop="mobile"
+                         header-align="center"
+                         align="center"
+                         label="手机号"
+                         min-width="110">
+        </el-table-column>
+        <el-table-column prop="idCard"
+                         header-align="center"
+                         align="center"
+                         label="证件号"
+                         min-width="170">
+        </el-table-column>
+        <el-table-column prop="latestNatTime"
+                         header-align="center"
+                         align="center"
+                         label="检测时间"
+                         min-width="150">
+        </el-table-column>
+        <el-table-column prop="natAddress"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="检测地点"
+                         min-width="230">
+        </el-table-column>
+        <el-table-column prop="natResultShow"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="检测结果"
+                         width="100">
+        </el-table-column>
+        <el-table-column prop="isAgencyUserDesc"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="本辖区居民"
+                         width="120">
+        </el-table-column>
+        <el-table-column prop="importTime"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="导入时间"
+                         width="160">
+        </el-table-column>
+        <el-table-column prop="agencyName"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="导入组织"
+                         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 type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleDetail(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">
+      <nat-form ref="ref_form"
+                @dialogCancle="diaClose"
+                @dialogOk="addFormOk"></nat-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="diaDetailClose">
+      <no-nat-detail ref="ref_detail"
+                     @dialogCancle="diaDetailClose"></no-nat-detail>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+
+import natForm from './natForm'
+import noNatDetail from './noNatDetail'
+
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      loading: false,
+      total: 0,
+      pageSize: 20,
+      pageNo: 0,
+      tableLoading: false,
+
+      agencyId: '',
+
+      isResiUserList: [
+        {
+          value: '0',
+          label: '否'
+        },
+        {
+          value: '1',
+          label: '是'
+        },
+      ],
+
+      formData: {
+        importDate: '',//导入时间
+        name: '',//姓名
+        mobile: '',//手机号
+        idCard: '',//身份证号码
+        isResiUser: ''//是否客户下居民(0:否  1:是)	
+
+      },
+
+      tableData: [],
+
+      //form相关
+      formShow: false,
+      detailShow: false,
+      formTitle: '新增',
+
+      sHeight: 0
+
+    }
+  },
+  components: {
+    natForm, noNatDetail
+  },
+  async created () {
+
+  },
+  async mounted () {
+    //获取场所类型
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+
+    await this.loadTable()
+    this.sHeight = this.$refs.ref_search.offsetHeight + 270
+  },
+
+  activated () {
+    this.$refs['ref_table'].doLayout()
+  },
+
+  methods: {
+
+    async handleSearch () {
+
+      await this.loadTable()
+
+      this.$nextTick(() => {
+        this.$refs.ref_table.doLayout() // 解决表格错位
+      })
+
+    },
+
+    async loadTable () {
+      this.tableLoading = true
+
+      const url = "/epmetuser/icNatCompareRecord/page"
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNatCompareRecord/page"
+      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.natResult === '1') {
+            item.natResultShow = '阳性'
+          } else if (item.natResult === '0') {
+            item.natResultShow = '阴性'
+          } else {
+            item.natResultShow = ''
+          }
+
+        });
+
+
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+
+    diaClose () {
+      this.$refs.ref_form.resetData()
+      this.formShow = false
+
+    },
+    diaDetailClose () {
+
+      this.detailShow = 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', null)
+      })
+    },
+
+    handleEdit (row) {
+      this.formTitle = '修改'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('edit', row.icNatId)
+      })
+    },
+
+    addFormOk () {
+      this.formShow = false
+      this.loadTable()
+
+    },
+
+    async handleDelete (row) {
+      let message = '确认删除?'
+
+      this.$confirm(message, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.deleteNat(row)
+        })
+        .catch(err => {
+
+        });
+    },
+
+    async deleteNat (row) {
+      const url = "/epmetuser/icNat/del"
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/del"
+
+      let params = {
+        icNatId: row.icNatId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "操作成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleCancelAttention (row) {
+      let message = '取消同步后将不能在本辖区居民检测记录中查看，确认取消同步？'
+
+      this.$confirm(message, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.cancelAttention(row)
+        })
+        .catch(err => {
+
+        });
+    },
+
+    async cancelAttention (row) {
+      const url = "/epmetuser/icNat/cancelsynchro"
+
+      let params = {
+        icNatId: row.icNatId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "操作成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleAttention (row) {
+
+      this.$confirm("确认将信息同步到本辖区核酸检测信息中心?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.attentionNat(row)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
+    },
+
+    async attentionNat (row) {
+      const url = "/epmetuser/icNat/synchro"
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/synchro"
+
+      let params = {
+        icNatId: row.icNatId
+      }
+
+      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 = {
+        isResiUser: '',//是否客户下居民(0:否  1:是)	
+        name: '',//姓名
+        mobile: '',//手机号
+        idCard: '',//身份证号码
+        importDate: ''
+
+      }
+
+
+      this.pageNo = 0
+      // this.loadTable()
+    },
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+    //导出表格
+    async handleExport () {
+      let title = '人员名单核酸信息'
+
+      const url = "/epmetuser/icNatCompareRecord/export"
+
+      app.ajax.exportFilePost(
+        url,
+        this.formData,
+        (data, rspMsg) => {
+          this.download(data, title + '.xlsx')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+
+    },
+
+    // 下载文件
+    download (data, fileName) {
+      if (!data) {
+        return
+      }
+
+      var csvData = new Blob([data])
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName);
+      }
+      // for Non-IE (chrome, firefox etc.)
+      else {
+        var a = document.createElement('a');
+        document.body.appendChild(a);
+        a.style = 'display: none';
+        var url = window.URL.createObjectURL(csvData);
+        a.href = url;
+        a.download = fileName;
+        a.click();
+        a.remove();
+        window.URL.revokeObjectURL(url);
+      }
+
+    },
+
+    handleExportModule () {
+      let title = '核酸人员名单导入模板'
+
+      const url = "/epmetuser/icNatCompareRecord/template-download"
+      let params = {}
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xlsx')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+    },
+
+    // 上传文件之前的钩子
+    beforeUpload (file) {
+
+      const array = file.name.split('.')
+      const extension = array[array.length - 1]
+      // const isLt1M = (file.size / 1024 / 1024) < 5
+      if (extension !== 'xlsx') {
+        this.$message.error('只能上传xlsx文件！')
+        return false
+      } else {
+        this.files = file;
+        this.fileName = file.name;
+        return true
+      }
+
+    },
+    // 上传文件个数超过定义的数量
+    handleExceed (files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
+    },
+
+    async uploadFile () {
+      if (this.fileName == "") {
+        this.$message.warning('请选择要上传的文件！')
+        return false
+      }
+
+      this.$message({
+        showClose: true,
+        message: '导入中，请到系统管理-导入记录中查看进度',
+        duration: 0
+      })
+
+      //清空上传列表
+      this.$refs['upload'].clearFiles()
+
+      var url = '/epmetuser/icNatCompareRecord/import'
+
+      let fileFormData = new FormData();
+      fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+
+      window.app.ajax.post2(url, fileFormData,
+        (data, rspMsg) => {
+
+          if (data.code === 0 && data.msg == 'success') {
+            // this.$message.success('导入成功')
+          } else {
+            // this.$message({
+            //   showClose: true,
+            //   message: rspMsg,
+            //   duration: 0,
+            //   type: "error"
+            // })
+            // this.$message.error(rspMsg)
+          }
+
+          // this.loadTable()
+
+        },
+        (rspMsg, data) => {
+
+        }, { headers: { 'Content-Type': 'multipart/form-data' } })
+
+
+    },
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+      console.log(this.sHeight)
+      // return this.$store.state.inIframe ? this.clientHeight - this.sHeight + this.iframeHeight : this.clientHeight - this.sHeight
+      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/huji/chusheng/cpts/detail.vue b/src/views/modules/base/huji/chusheng/cpts/detail.vue
index 95a0f4058..b68fae161 100644
--- a/src/views/modules/base/huji/chusheng/cpts/detail.vue
+++ b/src/views/modules/base/huji/chusheng/cpts/detail.vue
@@ -71,7 +71,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -132,7 +136,11 @@ export default {
 
   methods: {
 
+    handleCancle () {
+
+      this.$emit('diaDetailClose')
 
+    },
     async initForm (row) {
 
       await this.getInfo(row.id);
diff --git a/src/views/modules/base/huji/chusheng/index.vue b/src/views/modules/base/huji/chusheng/index.vue
index 659071823..a4112360a 100644
--- a/src/views/modules/base/huji/chusheng/index.vue
+++ b/src/views/modules/base/huji/chusheng/index.vue
@@ -168,7 +168,8 @@
                    class="diy-button--export"
                    size="small"
                    @click="handleExportModule('room')">下载模板</el-button>
-        <el-upload :headers="$getElUploadHeaders()" v-if="false"
+        <el-upload :headers="$getElUploadHeaders()"
+                   v-if="false"
                    ref="upload"
                    class="upload-btn"
                    action="uploadUlr"
@@ -350,7 +351,9 @@
                top="5vh"
                class="dialog-h"
                @closed="detailFormCancle">
-      <detail-form ref="ref_form_detail"></detail-form>
+      <detail-form ref="ref_form_detail"
+                   @diaDetailClose="detailFormCancle"></detail-form>
+
     </el-dialog>
   </div>
 </template>
diff --git a/src/views/modules/base/huji/immigration/detail.vue b/src/views/modules/base/huji/immigration/detail.vue
index 84e595d76..fcdafa994 100644
--- a/src/views/modules/base/huji/immigration/detail.vue
+++ b/src/views/modules/base/huji/immigration/detail.vue
@@ -71,7 +71,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -99,7 +103,11 @@ export default {
   },
 
   methods: {
+    handleCancle () {
+
+      this.$emit('diaDetailClose')
 
+    },
     async initForm (id) {
 
       await this.getDatail(id)
diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
index be5ccf66f..a15e65ba0 100644
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -357,7 +357,8 @@
                class="dialog-h"
                @closed="detailFormCancle">
       <detail-form v-if="detailShow"
-                   ref="ref_form_detail"></detail-form>
+                   ref="ref_form_detail"
+                   @diaDetailClose="detailFormCancle"></detail-form>
     </el-dialog>
   </div>
 </template>
diff --git a/src/views/modules/communityParty/elegant/detail.vue b/src/views/modules/communityParty/elegant/detail.vue
index bcddf5b3d..9586d16c1 100644
--- a/src/views/modules/communityParty/elegant/detail.vue
+++ b/src/views/modules/communityParty/elegant/detail.vue
@@ -43,7 +43,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -73,6 +77,11 @@ export default {
   },
 
   methods: {
+    handleCancle () {
+
+      this.$emit('diaDetailClose')
+
+    },
 
     async initForm (row) {
 
diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue
index 292ca37ac..0a26f120f 100644
--- a/src/views/modules/communityParty/elegant/index.vue
+++ b/src/views/modules/communityParty/elegant/index.vue
@@ -290,7 +290,8 @@
                top="5vh"
                class="dialog-h"
                @closed="detailFormCancle">
-      <detail-form ref="ref_form_detail"></detail-form>
+      <detail-form ref="ref_form_detail"
+                   @diaDetailClose="detailFormCancle"></detail-form>
     </el-dialog>
 
   </div>
diff --git a/src/views/modules/communityParty/heart/heartDetail.vue b/src/views/modules/communityParty/heart/heartDetail.vue
index 6832a618c..b9b2869bf 100644
--- a/src/views/modules/communityParty/heart/heartDetail.vue
+++ b/src/views/modules/communityParty/heart/heartDetail.vue
@@ -171,7 +171,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -435,8 +439,8 @@ export default {
 
     handleCancle () {
 
-      this.resetData()
-      this.$emit('dialogCancle')
+
+      this.$emit('diaDetailClose')
 
     },
 
diff --git a/src/views/modules/communityParty/heart/heartList.vue b/src/views/modules/communityParty/heart/heartList.vue
index e1c0432d7..7b5dff515 100644
--- a/src/views/modules/communityParty/heart/heartList.vue
+++ b/src/views/modules/communityParty/heart/heartList.vue
@@ -243,7 +243,8 @@
                top="5vh"
                class="dialog-h"
                @closed="detailFormCancle">
-      <heart-detail ref="ref_form_detail"></heart-detail>
+      <heart-detail ref="ref_form_detail"
+                    @diaDetailClose="detailFormCancle"></heart-detail>
     </el-dialog>
 
     <!-- 活动取消原因 -->
diff --git a/src/views/modules/communityParty/members/detailForm.vue b/src/views/modules/communityParty/members/detailForm.vue
index bcf6a3fc3..e0648dbb1 100644
--- a/src/views/modules/communityParty/members/detailForm.vue
+++ b/src/views/modules/communityParty/members/detailForm.vue
@@ -1,109 +1,116 @@
 <template>
-  <div class="dialog-h-content scroll-h pd0">
-    <div class="div-tip">本模块主要为添加非本社区居住党员，本社区居住党员建议到居民信息页面添加</div>
-
-    <div v-if="initLoading"
-         class="m-row">
-      <div class="m-row-2">
-        <div class="info-prop">
-          <span class="info-title-2">所属党组织：</span>
-          <span>{{ info.orgName }}</span>
+  <div>
+    <div class="dialog-h-content scroll-h pd0">
+      <div class="div-tip">本模块主要为添加非本社区居住党员，本社区居住党员建议到居民信息页面添加</div>
+
+      <div v-if="initLoading"
+           class="m-row">
+        <div class="m-row-2">
+          <div class="info-prop">
+            <span class="info-title-2">所属党组织：</span>
+            <span>{{ info.orgName }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">党员中心户：</span>
+            <span>{{ info.isDyzxh==='1'?'是':'否' }}</span>
+          </div>
         </div>
 
-        <div class="info-prop">
-          <span class="info-title-2">党员中心户：</span>
-          <span>{{ info.isDyzxh==='1'?'是':'否' }}</span>
-        </div>
-      </div>
-
-      <div class="m-row-2">
+        <div class="m-row-2">
 
-        <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.name}}</span>
+          </div>
 
-        <div class="info-prop">
-          <span class="info-title-2">免学习：</span>
-          <span>{{info.isMxx==='1'?'是':'否'}}</span>
+          <div class="info-prop">
+            <span class="info-title-2">免学习：</span>
+            <span>{{info.isMxx==='1'?'是':'否'}}</span>
+          </div>
         </div>
-      </div>
 
-      <div class="m-row-2">
+        <div class="m-row-2">
 
-        <div class="info-prop">
-          <span class="info-title-2">手机号：</span>
-          <span>{{ info.mobile?info.mobile:'--'}}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-2">职务：</span>
-          <span>{{info.partyZwShow?info.partyZwShow:'--' }}</span>
+          <div class="info-prop">
+            <span class="info-title-2">手机号：</span>
+            <span>{{ info.mobile?info.mobile:'--'}}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">职务：</span>
+            <span>{{info.partyZwShow?info.partyZwShow:'--' }}</span>
+          </div>
         </div>
-      </div>
 
-      <div class="m-row-2">
+        <div class="m-row-2">
 
-        <div class="info-prop">
-          <span class="info-title-2">身份证：</span>
-          <span>{{ info.idCard?info.idCard:'--' }}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-2">文化程度：</span>
-          <span>{{ info.cultureName?info.cultureName:'--' }}</span>
+          <div class="info-prop">
+            <span class="info-title-2">身份证：</span>
+            <span>{{ info.idCard?info.idCard:'--' }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">文化程度：</span>
+            <span>{{ info.cultureName?info.cultureName:'--' }}</span>
+          </div>
         </div>
-      </div>
 
-      <div class="m-row-2">
+        <div class="m-row-2">
 
-        <div class="info-prop">
-          <span class="info-title-2">地址：</span>
-          <span>{{ info.address?info.address:'--' }}</span>
+          <div class="info-prop">
+            <span class="info-title-2">地址：</span>
+            <span>{{ info.address?info.address:'--' }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">入党时间：</span>
+            <span>{{ info.rdsj?info.rdsj:'--' }}</span>
+          </div>
         </div>
-        <div class="info-prop">
-          <span class="info-title-2">入党时间：</span>
-          <span>{{ info.rdsj?info.rdsj:'--' }}</span>
-        </div>
-      </div>
 
-      <div class="m-row-2">
+        <div class="m-row-2">
 
-        <div class="info-prop">
-          <span class="info-title-2">流动党员：</span>
-          <span>{{ info.isLd==='1'?'是':'否'}}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-2">流动党员号：</span>
-          <span>{{ info.ldzh?info.ldzh:'--' }}</span>
+          <div class="info-prop">
+            <span class="info-title-2">流动党员：</span>
+            <span>{{ info.isLd==='1'?'是':'否'}}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">流动党员号：</span>
+            <span>{{ info.ldzh?info.ldzh:'--' }}</span>
+
+          </div>
 
         </div>
 
-      </div>
+        <div class="m-row-2">
 
-      <div class="m-row-2">
+          <div class="info-prop">
+            <span class="info-title-2">备注：</span>
+            <span>{{ info.remark? info.remark:'--'  }}</span>
+          </div>
 
-        <div class="info-prop">
-          <span class="info-title-2">备注：</span>
-          <span>{{ info.remark? info.remark:'--'  }}</span>
         </div>
-
       </div>
-    </div>
 
-    <div class="pdl40">
-      <el-tabs v-model="activesName">
-        <el-tab-pane label="量化积分"
-                     name="first">
-          <pointsDetail :partyId="partymenberid" />
-        </el-tab-pane>
-        <el-tab-pane label="缴费记录"
-                     name="second">
-          <record :partyId="partymenberid"
-                  :disabled="disabled" />
-        </el-tab-pane>
-      </el-tabs>
+      <div class="pdl40">
+        <el-tabs v-model="activesName">
+          <el-tab-pane label="量化积分"
+                       name="first">
+            <pointsDetail :partyId="partymenberid" />
+          </el-tab-pane>
+          <el-tab-pane label="缴费记录"
+                       name="second">
+            <record :partyId="partymenberid"
+                    :disabled="disabled" />
+          </el-tab-pane>
+        </el-tabs>
+
+      </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -187,7 +194,11 @@ export default {
     // this.$refs['ruleForm'].resetFields()
   },
   methods: {
+    handleCancle () {
 
+      this.$emit('diaDetailClose')
+
+    },
     async saveRecord (form) {
       const params = {
         ...form,
diff --git a/src/views/modules/communityParty/members/index.vue b/src/views/modules/communityParty/members/index.vue
index ea47281fc..f5a710ed3 100644
--- a/src/views/modules/communityParty/members/index.vue
+++ b/src/views/modules/communityParty/members/index.vue
@@ -335,7 +335,8 @@
       <detail-form v-if="detailShow"
                    :info="detailInfo"
                    :partyList="optionsG"
-                   :disabled="disabled" />
+                   :disabled="disabled"
+                   @diaDetailClose="handlerCancle" />
     </el-dialog>
 
   </div>
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue b/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
index fa88d16a6..fb2782f0b 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
@@ -265,7 +265,8 @@
                @closed="detailShow = false">
       <detail-activity ref="ref_add_form"
                        :formType="formType"
-                       :icPartyActId="icPartyActId"></detail-activity>
+                       :icPartyActId="icPartyActId"
+                       @diaDetailClose="detailShow = false"></detail-activity>
     </el-dialog>
     <el-dialog v-if="showSchedule"
                :visible.sync="showSchedule"
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/detailActivity.vue b/src/views/modules/communityParty/orgActivity/activivityList/detailActivity.vue
index 00130bd1d..5b422701c 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/detailActivity.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/detailActivity.vue
@@ -50,7 +50,7 @@
           </div>
           <div class="info-prop">
             <span class="info-title-3">附件：</span>
-            <file-list v-if="formData.attachmentList.length>0"
+            <file-list v-if="formData.attachmentList&&formData.attachmentList.length>0"
                        :fileList="formData.attachmentList"></file-list>
             <span v-else>--</span>
 
@@ -60,7 +60,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -275,8 +279,8 @@ export default {
 
     },
     handleCancle () {
-      this.resetData()
-      this.$emit('handleClose')
+
+      this.$emit('diaDetailClose')
 
     },
 
diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue
index 9a12e535c..e9785bebb 100644
--- a/src/views/modules/communityParty/regionalParty/activitys.vue
+++ b/src/views/modules/communityParty/regionalParty/activitys.vue
@@ -245,7 +245,7 @@
       <activitys-detail ref="ref_detail"
                         :serviceList="serviceList"
                         :gridList="gridList"
-                        @diaClose="diaClose"></activitys-detail>
+                        @diaDetailClose="detailClosed"></activitys-detail>
     </el-dialog>
 
   </div>
diff --git a/src/views/modules/communityParty/regionalParty/activitysDetail.vue b/src/views/modules/communityParty/regionalParty/activitysDetail.vue
index af98c885f..744bb1be6 100644
--- a/src/views/modules/communityParty/regionalParty/activitysDetail.vue
+++ b/src/views/modules/communityParty/regionalParty/activitysDetail.vue
@@ -58,11 +58,11 @@
 
     </div>
 
-    <!-- <div class="div-btn">
+    <div class="div-btn">
       <el-button size="small"
                  @click="handleCancle">关 闭</el-button>
 
-    </div> -->
+    </div>
 
   </div>
 </template>
@@ -94,7 +94,7 @@ export default {
 
     handleCancle () {
       this.diaDestroy()
-      this.$emit('diaClose')
+      this.$emit('diaDetailClose')
 
     },
 
diff --git a/src/views/modules/communityParty/regionalParty/unitsDetail.vue b/src/views/modules/communityParty/regionalParty/unitsDetail.vue
index b03421c85..d686c787c 100644
--- a/src/views/modules/communityParty/regionalParty/unitsDetail.vue
+++ b/src/views/modules/communityParty/regionalParty/unitsDetail.vue
@@ -54,11 +54,11 @@
       </div>
 
     </div>
-    <!-- <div class="div-btn">
+    <div class="div-btn">
       <el-button size="small"
                  @click="handleCancle">关 闭</el-button>
 
-    </div> -->
+    </div>
   </div>
 </template>
 
@@ -102,7 +102,7 @@ export default {
     async initForm (row) {
 
       this.startLoading()
-      this.formData = { ...row }
+      this.formData = JSON.parse(JSON.stringify(row))
       this.initLoading = true
       console.log(this.formData)
       // await nextTick(200)
@@ -118,9 +118,10 @@ export default {
     initMap () {
       // 定义地图中心点坐标
       let { latitude, longitude } = this.$store.state.user;
-      console.log('lat' + latitude + ',lon' + longitude)
+
 
       if (this.formData.latitude && this.formData.longitude) {
+
         latitude = this.formData.latitude
         longitude = this.formData.longitude
       }
@@ -128,7 +129,9 @@ export default {
         latitude = 39.9088810666821;
         longitude = 116.39743841556731;
       }
-      var center = new window.TMap.LatLng(latitude, latitude)
+      // debugger
+      console.log('lat' + latitude + ',lon' + longitude)
+      var center = new window.TMap.LatLng(latitude, longitude)
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
       map = new window.TMap.Map(document.getElementById('app_detail'), {
         center: center, // 设置地图中心点坐标
diff --git a/src/views/modules/communityParty/stas/index.vue b/src/views/modules/communityParty/stas/index.vue
index 04efa189a..afc0660cc 100644
--- a/src/views/modules/communityParty/stas/index.vue
+++ b/src/views/modules/communityParty/stas/index.vue
@@ -4,23 +4,24 @@
       <el-form :inline="true"
                :model="form"
                ref="ref_searchform"
-               :label-width="'100px'">
+               :label-width="'110px'">
         <div>
-          <el-form-item prop="mySelectOrg" label-width="130px" label="参加活动党组织">
-            <el-cascader
-                    class="list_item_width_1"
-                    v-model="joinOrgIds"
-                    size="small"
-                    :options="orgList"
-                    placeholder="请选择党组织"
-                    :props="{
+          <el-form-item prop="mySelectOrg"
+                        label-width="130px"
+                        label="参加活动党组织">
+            <el-cascader class="list_item_width_1"
+                         v-model="joinOrgIds"
+                         size="small"
+                         :options="orgList"
+                         placeholder="请选择党组织"
+                         :props="{
                       checkStrictly: true,
                       label: 'partyOrgName',
                       value: 'id',
                       children: 'children'
                     }"
-                    @change="handleChangeOrg"
-                    clearable/>
+                         @change="handleChangeOrg"
+                         clearable />
           </el-form-item>
           <el-form-item label="活动开始时间"
                         prop="serviceTimeArea">
@@ -47,10 +48,10 @@
     </div>
     <div class="div_table">
       <div class="div_btn">
-      <el-button style="margin-left:10px"
-                 class="diy-button--reset"
-                 size="small"
-                 @click="handleExport">导出</el-button>
+        <el-button style="margin-left:10px"
+                   class="diy-button--reset"
+                   size="small"
+                   @click="handleExport">导出</el-button>
       </div>
       <el-table class="table"
                 :data="tableData"
@@ -74,43 +75,37 @@
         <el-table-column prop="dydhNum"
                          header-align="center"
                          align="center"
-                         label="支部党员大会(次)"
-                         >
+                         label="支部党员大会(次)">
         </el-table-column>
         <el-table-column prop="wyhNum"
                          header-align="center"
                          align="center"
                          label="支部委员会(次)"
-                         show-overflow-tooltip
-                         >
+                         show-overflow-tooltip>
         </el-table-column>
         <el-table-column prop="dxzhNum"
                          header-align="center"
                          show-overflow-tooltip
                          align="center"
-                         label="党小组会(次)"
-                         >
+                         label="党小组会(次)">
         </el-table-column>
         <el-table-column prop="dkNum"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
-                         label="党课(次)"
-                         >
+                         label="党课(次)">
         </el-table-column>
         <el-table-column prop="ztdrNum"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
-                         label="主题党日(次)"
-                         >
+                         label="主题党日(次)">
         </el-table-column>
         <el-table-column prop="wmfwNum"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
-                         label="为民服务活动(次)"
-                         >
+                         label="为民服务活动(次)">
         </el-table-column>
       </el-table>
     </div>
@@ -168,25 +163,25 @@ export default {
         this.form.joinOrgId = ''
       }
     },
-    getOrgList() {
+    getOrgList () {
       return this.$http
-          .get('/resi/partymember/icPartyOrg/getSearchTreelist', {
-            params: { agencyId: localStorage.getItem('agencyId') }
-          })
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              return this.$message.error(res.msg)
-            }else {
-              this.orgList = this.deepArrTOnull(res.data)
-            }
-          }).catch(() => {return this.$message.error("网络错误");})
+        .get('/resi/partymember/icPartyOrg/getSearchTreelist', {
+          params: { agencyId: localStorage.getItem('agencyId') }
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.orgList = this.deepArrTOnull(res.data)
+          }
+        }).catch(() => { return this.$message.error("网络错误"); })
     },
-    deepArrTOnull(arr) {
+    deepArrTOnull (arr) {
       let a = []
       a = arr.map(item => {
         return {
           ...item,
-          children: (item.children.length > 0 && this.deepArrTOnull(item.children) )|| null
+          children: (item.children.length > 0 && this.deepArrTOnull(item.children)) || null
         }
       })
       return a
@@ -196,17 +191,17 @@ export default {
       if (Array.isArray(this.serviceTimeArea) && this.serviceTimeArea.length > 0) {
         this.form.startTime = this.serviceTimeArea[0];
         this.form.endTime = this.serviceTimeArea[1];
-      }else {
+      } else {
         this.form.startTime = '';
         this.form.endTime = '';
       }
 
-      if (this.form.joinOrgId === '' || this.form.joinOrgId === null || this.form.joinOrgId === undefined){
+      if (this.form.joinOrgId === '' || this.form.joinOrgId === null || this.form.joinOrgId === undefined) {
         let a = this.orgList[0]
         this.form.joinOrgId = a.id;
         this.joinOrgIds = this.form.joinOrgId
-      }else {
-        if (Array.isArray(this.joinOrgIds)){
+      } else {
+        if (Array.isArray(this.joinOrgIds)) {
           this.form.joinOrgId = this.joinOrgIds[this.joinOrgIds.length - 1];
         }
       }
diff --git a/src/views/modules/communityService/fuwujilu/detailForm.vue b/src/views/modules/communityService/fuwujilu/detailForm.vue
index 40665e62b..be802b46c 100644
--- a/src/views/modules/communityService/fuwujilu/detailForm.vue
+++ b/src/views/modules/communityService/fuwujilu/detailForm.vue
@@ -100,15 +100,11 @@
 
     </div>
 
-    <!-- <div class="div_btn">
+    <div class="div-btn">
       <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button size="small"
-                 v-if="formType != 'detail'"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
-    </div> -->
+                 @click="handleCancle">关 闭</el-button>
+
+    </div>
 
     <el-dialog v-if="showPersonList"
                :visible.sync="showPersonList"
@@ -318,7 +314,7 @@ export default {
 
     handleCancle () {
       this.resetData()
-      this.$emit('handleClose')
+      this.$emit('diaDetailClose')
 
     },
 
diff --git a/src/views/modules/communityService/fuwujilu/fuwuList.vue b/src/views/modules/communityService/fuwujilu/fuwuList.vue
index 490acfb20..7ff0282b0 100644
--- a/src/views/modules/communityService/fuwujilu/fuwuList.vue
+++ b/src/views/modules/communityService/fuwujilu/fuwuList.vue
@@ -278,7 +278,8 @@
                    :serviceRecordId="serviceRecordId"
                    :serviceOrgName="serviceOrgName"
                    :satisfyArray="satisfyArray"
-                   :statusArray="statusArray">
+                   :statusArray="statusArray"
+                   @diaDetailClose="diaDetailClose">
       </detail-form>
     </el-dialog>
     <el-dialog v-if="showPersonList"
diff --git a/src/views/modules/communityService/fuwuxiangmu/cpts/detail.vue b/src/views/modules/communityService/fuwuxiangmu/cpts/detail.vue
index 861ea418e..5686967ac 100644
--- a/src/views/modules/communityService/fuwuxiangmu/cpts/detail.vue
+++ b/src/views/modules/communityService/fuwuxiangmu/cpts/detail.vue
@@ -42,7 +42,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -145,7 +149,7 @@ export default {
 
 
     handleCancle () {
-      this.$emit("close");
+      this.$emit("diaDetailClose");
     },
   },
 };
diff --git a/src/views/modules/communityService/fuwuxiangmu/index.vue b/src/views/modules/communityService/fuwuxiangmu/index.vue
index 2f5820a8f..a55231b0e 100644
--- a/src/views/modules/communityService/fuwuxiangmu/index.vue
+++ b/src/views/modules/communityService/fuwuxiangmu/index.vue
@@ -187,7 +187,8 @@
                class="dialog-h"
                @closed="handleClose">
       <detail-form ref="ref_form_detail"
-                   :formId="formId"></detail-form>
+                   :formId="formId"
+                   @diaDetailClose="handleClose"></detail-form>
     </el-dialog>
   </div>
 </template>
diff --git a/src/views/modules/communityService/fuwuzuzhi/cpts/detail.vue b/src/views/modules/communityService/fuwuzuzhi/cpts/detail.vue
index 8b00db98a..2b9322af5 100644
--- a/src/views/modules/communityService/fuwuzuzhi/cpts/detail.vue
+++ b/src/views/modules/communityService/fuwuzuzhi/cpts/detail.vue
@@ -53,17 +53,11 @@
 
     </div>
 
-    <!-- <div class="div_btn resi-btns">
-      <el-button size="small" @click="handleCancle">取 消</el-button>
-      <el-button
-        v-if="formType != 'watch'"
-        type="primary"
-        size="small"
-        :disabled="btnDisable"
-        @click="handleComfirm"
-        >确 定</el-button
-      >
-    </div> -->
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
+
+    </div>
   </div>
 </template>
 
@@ -112,6 +106,17 @@ export default {
   },
 
   methods: {
+    handleCancle () {
+      this.diaDestroy()
+      this.$emit('diaDetailClose')
+
+    },
+
+    diaDestroy () {
+      if (map) {
+        map.destroy()
+      }
+    },
     async initForm () {
 
       this.startLoading()
@@ -258,9 +263,7 @@ export default {
     },
 
 
-    handleCancle () {
-      this.$emit("close");
-    },
+
     // 开启加载动画
     startLoading () {
       loading = Loading.service({
diff --git a/src/views/modules/communityService/fuwuzuzhi/index.vue b/src/views/modules/communityService/fuwuzuzhi/index.vue
index 6294dd3e4..93e340ddc 100644
--- a/src/views/modules/communityService/fuwuzuzhi/index.vue
+++ b/src/views/modules/communityService/fuwuzuzhi/index.vue
@@ -193,7 +193,8 @@
                class="dialog-h"
                @closed="diaDetailClose">
       <detail-form ref="ref_detail"
-                   :formId="formId"></detail-form>
+                   :formId="formId"
+                   @diaDetailClose="diaDetailClose"></detail-form>
     </el-dialog>
   </div>
 </template>
diff --git a/src/views/modules/communityService/measure/detail.vue b/src/views/modules/communityService/measure/detail.vue
index 62200acdc..cc51d946f 100644
--- a/src/views/modules/communityService/measure/detail.vue
+++ b/src/views/modules/communityService/measure/detail.vue
@@ -86,7 +86,11 @@
 
       </div>
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -123,6 +127,11 @@ export default {
   },
 
   methods: {
+    handleCancle () {
+
+      this.$emit('diaDetailClose')
+
+    },
     initForm (row) {
       this.dataForm = JSON.parse(JSON.stringify(row))
       console.log(' this.dataForm', this.dataForm)
diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 9487c8665..349dd7bf8 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -507,7 +507,8 @@
                class="dialog-h"
                :close-on-click-modal="false"
                :before-close="detailFormCancle">
-      <detail ref="ref_form_detail"></detail>
+      <detail ref="ref_form_detail"
+              @diaDetailClose="detailFormCancle"></detail>
     </el-dialog>
   </div>
 </template>
@@ -959,7 +960,7 @@ export default {
     },
     async handleLook (row, type) {
       this.detailShow = true
-      console.log('row',row)
+      console.log('row', row)
       this.$nextTick(() => {
         this.$refs.ref_form_detail.initForm(row)
       })
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
index 6b2d90f6d..936672819 100644
--- a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
@@ -253,7 +253,7 @@
                       :gridList="gridList"
                       :resultList="resultList"
                       :placeTypeList="placeTypeList"
-                      @dialogCancle="addFormCancle"></inspect-detail>
+                      @diaDetailClose="diaDetailClose"></inspect-detail>
     </el-dialog>
 
     <!-- 复查记录弹出框 -->
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspectDetail.vue b/src/views/modules/communityService/ninePlaces/inspect/inspectDetail.vue
index a6fa53fff..ff7e19445 100644
--- a/src/views/modules/communityService/ninePlaces/inspect/inspectDetail.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspectDetail.vue
@@ -1,61 +1,59 @@
 <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.gridName||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-4">场所类型：</span>
+            <span>{{ formData.placeOrgName||'--' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-4">场所名称：</span>
+            <span>{{ formData.ninePlaceName||'--'}}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-4">分队名称：</span>
+            <span>{{ formData.placePatrolTeamName||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">检查人员：</span>
+            <span>{{ formData.inspectorsNames||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">首次巡查时间：</span>
+            <span>{{ formData.firstTime||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">隐患明细：</span>
+            <span>{{ formData.detailed||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">首次检查结论：</span>
+            <span>{{ formData.firstResult==='0'?'合格':'不合格'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">拟复查时间：</span>
+            <span>{{ formData.reviewTime||'--'  }}</span>
+          </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.gridName||'--'  }}</span>
-        </div>
-
-        <div class="info-prop">
-          <span class="info-title-4">场所类型：</span>
-          <span>{{ formData.placeOrgName||'--' }}</span>
-        </div>
-
-        <div class="info-prop">
-          <span class="info-title-4">场所名称：</span>
-          <span>{{ formData.ninePlaceName||'--'}}</span>
-        </div>
-
-        <div class="info-prop">
-          <span class="info-title-4">分队名称：</span>
-          <span>{{ formData.placePatrolTeamName||'--'  }}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-4">检查人员：</span>
-          <span>{{ formData.inspectorsNames||'--'  }}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-4">首次巡查时间：</span>
-          <span>{{ formData.firstTime||'--'  }}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-4">隐患明细：</span>
-          <span>{{ formData.detailed||'--'  }}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-4">首次检查结论：</span>
-          <span>{{ formData.firstResult==='0'?'合格':'不合格'  }}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-4">拟复查时间：</span>
-          <span>{{ formData.reviewTime||'--'  }}</span>
         </div>
 
       </div>
 
     </div>
-    <!-- <div class="div_btn">
+    <div class="div-btn">
       <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button size="small"
-                 v-if="formType != 'detail'"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
-    </div> -->
+                 @click="handleCancle">关 闭</el-button>
+
+    </div>
   </div>
 </template>
 
@@ -138,7 +136,7 @@ export default {
     handleCancle () {
 
       this.resetData()
-      this.$emit('dialogCancle')
+      this.$emit('diaDetailClose')
 
     },
 
diff --git a/src/views/modules/communityService/ninePlaces/places/places.vue b/src/views/modules/communityService/ninePlaces/places/places.vue
index 36c6af69f..f97837131 100644
--- a/src/views/modules/communityService/ninePlaces/places/places.vue
+++ b/src/views/modules/communityService/ninePlaces/places/places.vue
@@ -208,7 +208,7 @@
                      :agencyId="agencyId"
                      :scaleList="scaleList"
                      :placeTypeList="placeTypeList"
-                     @dialogCancle="addFormCancle"></places-detail>
+                     @diaDetailClose="diaDetailClose"></places-detail>
     </el-dialog>
 
   </div>
diff --git a/src/views/modules/communityService/ninePlaces/places/placesDetail.vue b/src/views/modules/communityService/ninePlaces/places/placesDetail.vue
index dbac5af92..2c0a3e1e8 100644
--- a/src/views/modules/communityService/ninePlaces/places/placesDetail.vue
+++ b/src/views/modules/communityService/ninePlaces/places/placesDetail.vue
@@ -40,15 +40,11 @@
       </div>
 
     </div>
-    <!-- <div class="div_btn">
+    <div class="div-btn">
       <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button size="small"
-                 v-if="formType != 'detail'"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
-    </div> -->
+                 @click="handleCancle">关 闭</el-button>
+
+    </div>
   </div>
 </template>
 
@@ -142,8 +138,8 @@ export default {
 
     handleCancle () {
 
-      this.resetData()
-      this.$emit('dialogCancle')
+
+      this.$emit('diaDetailClose')
 
     },
 
diff --git a/src/views/modules/communityService/ninePlaces/team/team.vue b/src/views/modules/communityService/ninePlaces/team/team.vue
index 37791495d..ce4691412 100644
--- a/src/views/modules/communityService/ninePlaces/team/team.vue
+++ b/src/views/modules/communityService/ninePlaces/team/team.vue
@@ -196,7 +196,7 @@
       <team-detail ref="ref_detail"
                    :gridList="gridList"
                    :placeTypeList="placeTypeList"
-                   @dialogCancle="addFormCancle"></team-detail>
+                   @diaDetailClose="diaDetailClose"></team-detail>
     </el-dialog>
 
   </div>
@@ -344,7 +344,7 @@ export default {
       // this.formTitle = '详情'
       this.detailShow = true
       this.$nextTick(() => {
-        this.$refs.ref_detail.initForm( row.teamId, this.agencyId)
+        this.$refs.ref_detail.initForm(row.teamId, this.agencyId)
       })
     },
 
diff --git a/src/views/modules/communityService/ninePlaces/team/teamDetail.vue b/src/views/modules/communityService/ninePlaces/team/teamDetail.vue
index 3ddad9351..3082c700e 100644
--- a/src/views/modules/communityService/ninePlaces/team/teamDetail.vue
+++ b/src/views/modules/communityService/ninePlaces/team/teamDetail.vue
@@ -51,15 +51,11 @@
       </div>
 
     </div>
-    <!-- <div class="div_btn">
+    <div class="div-btn">
       <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button size="small"
-                 v-if="formType != 'detail'"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
-    </div> -->
+                 @click="handleCancle">关 闭</el-button>
+
+    </div>
   </div>
 </template>
 
@@ -256,8 +252,7 @@ export default {
 
     handleCancle () {
 
-      this.resetData()
-      this.$emit('dialogCancle')
+      this.$emit('diaDetailClose')
 
     },
 
diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
index 51b59c910..9584d9954 100644
--- a/src/views/modules/communityService/worklog/workLog.vue
+++ b/src/views/modules/communityService/worklog/workLog.vue
@@ -258,7 +258,7 @@
                class="dialog-h"
                @closed="diaClose">
       <work-log-detail ref="ref_detail"
-                       @diaClose="diaClose"></work-log-detail>
+                       @diaDetailClose="diaClose"></work-log-detail>
     </el-dialog>
 
   </div>
diff --git a/src/views/modules/communityService/worklog/workLogDetail.vue b/src/views/modules/communityService/worklog/workLogDetail.vue
index 568510f7c..28e63cdc2 100644
--- a/src/views/modules/communityService/worklog/workLogDetail.vue
+++ b/src/views/modules/communityService/worklog/workLogDetail.vue
@@ -50,7 +50,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -74,7 +78,7 @@ export default {
   methods: {
     handleCancle () {
 
-      this.$emit('diaClose')
+      this.$emit('diaDetailClose')
 
     },
 
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
index 6b3a98ca8..141762661 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
@@ -1,73 +1,60 @@
 <template>
-  <div style="overflow: auto; padding: 20px;max-height: 82vh;" class="form-class">
-    <el-form
-      :model="dataForm"
-      :rules="dataRule"
-      ref="dataForm"
-      @keyup.enter.native="dataFormSubmitHandle()"
-      label-width="120px"
-    >
-      <el-form-item label="所属组织名称" prop="orgId">
-        <el-select
-          v-model="dataForm.orgId"
-          placeholder="所属组织名称"
-          @change="orgChangeHandle"
-          :disabled="dialogTitle == '查看'"
-        >
-          <el-option
-            ref="org"
-            v-for="item in organizationList"
-            :key="item.orgId"
-            :label="item.orgName"
-            :value="item.orgId"
-          >
+  <div style="overflow: auto; padding: 20px;max-height: 82vh;"
+       class="form-class">
+    <el-form :model="dataForm"
+             :rules="dataRule"
+             ref="dataForm"
+             @keyup.enter.native="dataFormSubmitHandle()"
+             label-width="120px">
+      <el-form-item label="所属组织名称"
+                    prop="orgId">
+        <el-select v-model="dataForm.orgId"
+                   placeholder="所属组织名称"
+                   @change="orgChangeHandle"
+                   :disabled="dialogTitle == '查看'">
+          <el-option ref="org"
+                     v-for="item in organizationList"
+                     :key="item.orgId"
+                     :label="item.orgName"
+                     :value="item.orgId">
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="核酸检测点名称" prop="name">
-        <el-input
-          v-model="dataForm.name"
-          placeholder="核酸检测点名称"
-          :disabled="dialogTitle == '查看'"
-        ></el-input>
+      <el-form-item label="核酸检测点名称"
+                    prop="name">
+        <el-input v-model="dataForm.name"
+                  placeholder="核酸检测点名称"
+                  :disabled="dialogTitle == '查看'"></el-input>
       </el-form-item>
-      <el-form-item label="服务时间" prop="serveTime">
-        <el-input
-          v-model="dataForm.serveTime"
-          type="textarea"
-          :rows="2"
-          placeholder="请输入服务时间，如：每日开放 上午：8:00-11:30 ；下午：13:00-17:00"
-          :disabled="dialogTitle == '查看'"
-        ></el-input>
+      <el-form-item label="服务时间"
+                    prop="serveTime">
+        <el-input v-model="dataForm.serveTime"
+                  type="textarea"
+                  :rows="2"
+                  placeholder="请输入服务时间，如：每日开放 上午：8:00-11:30 ；下午：13:00-17:00"
+                  :disabled="dialogTitle == '查看'"></el-input>
       </el-form-item>
-      <el-form-item label="咨询电话" prop="mobile">
-        <el-input
-          v-model="dataForm.mobile"
-          placeholder="咨询电话"
-          :change="check_num()"
-          :disabled="dialogTitle == '查看'"
-        ></el-input>
+      <el-form-item label="咨询电话"
+                    prop="mobile">
+        <el-input v-model="dataForm.mobile"
+                  placeholder="咨询电话"
+                  :change="check_num()"
+                  :disabled="dialogTitle == '查看'"></el-input>
       </el-form-item>
-      <el-form-item label="检测点地址" prop="address">
-        <el-input
-          v-model="dataForm.address"
-          placeholder="例:青岛市时代国际广场"
-          style="width:65%;"
-        ></el-input>
-        <el-button
-          style="margin-left: 10px"
-          type="primary"
-          size="small"
-          @click="handleSearchMap"
-          >查询</el-button
-        >
+      <el-form-item label="检测点地址"
+                    prop="address">
+        <el-input v-model="dataForm.address"
+                  placeholder="例:青岛市时代国际广场"
+                  style="width:65%;"></el-input>
+        <el-button style="margin-left: 10px"
+                   type="primary"
+                   size="small"
+                   @click="handleSearchMap">查询</el-button>
       </el-form-item>
-      <el-form-item
-        label="位置坐标"
-        prop="longitude"
-        style="display: block"
-        class="position_label"
-      >
+      <el-form-item label="位置坐标"
+                    prop="longitude"
+                    style="display: block"
+                    class="position_label">
         <div>
           <!-- <el-input
             class="item_width_4"
@@ -85,31 +72,26 @@
             @click="handleSearchMap"
             >查询</el-button
           > -->
-          <div
-            id="map_add"
-            class="div_map"
-            style="width: 500px; height: 300px; margin-top: 20px"
-          ></div>
-          <div style="margin-top: 10px" v-show="false">
+          <div id="map_add"
+               class="div_map"
+               style="width: 500px; height: 300px; margin-top: 20px"></div>
+          <div style="margin-top: 10px"
+               v-show="false">
             <span>经度</span>
-            <el-input
-              class="item_width_3"
-              maxlength="50"
-              placeholder="请输入经度"
-              v-model="dataForm.longitude"
-              disabled
-              style="width: 200px; margin-left: 20px"
-            >
+            <el-input class="item_width_3"
+                      maxlength="50"
+                      placeholder="请输入经度"
+                      v-model="dataForm.longitude"
+                      disabled
+                      style="width: 200px; margin-left: 20px">
             </el-input>
             <span style="margin-left: 20px">纬度</span>
-            <el-input
-              class="item_width_3"
-              maxlength="50"
-              placeholder="请输入纬度"
-              v-model="dataForm.latitude"
-              disabled
-              style="width: 200px; margin-left: 20px"
-            >
+            <el-input class="item_width_3"
+                      maxlength="50"
+                      placeholder="请输入纬度"
+                      v-model="dataForm.latitude"
+                      disabled
+                      style="width: 200px; margin-left: 20px">
             </el-input>
           </div>
         </div>
@@ -117,12 +99,9 @@
     </el-form>
     <div class="submit">
       <el-button @click="closeSubmit">{{ $t("cancel") }}</el-button>
-      <el-button
-        v-if="dialogTitle != '查看'"
-        type="primary"
-        @click="dataFormSubmitHandle()"
-        >{{ $t("confirm") }}</el-button
-      >
+      <el-button v-if="dialogTitle != '查看'"
+                 type="primary"
+                 @click="dataFormSubmitHandle()">{{ $t("confirm") }}</el-button>
     </div>
   </div>
 </template>
@@ -135,7 +114,7 @@ var markers;
 var geocoder;
 var infoWindowList;
 export default {
-  data() {
+  data () {
     return {
       dataForm: {
         id: "",
@@ -156,7 +135,7 @@ export default {
     };
   },
   computed: {
-    dataRule() {
+    dataRule () {
       return {
         customerId: [
           {
@@ -224,7 +203,7 @@ export default {
       };
     },
   },
-  created() {
+  created () {
     this.getFormInfo();
   },
   props: {
@@ -234,10 +213,10 @@ export default {
     },
   },
   methods: {
-    closeSubmit() {
+    closeSubmit () {
       this.$emit("closeDialog");
     },
-    orgChangeHandle(val) {
+    orgChangeHandle (val) {
       for (var i = 0; i < this.organizationList.length; i++) {
         if (this.organizationList[i].orgId === val) {
           this.dataForm.orgName = this.organizationList[i].orgName;
@@ -246,15 +225,20 @@ export default {
       }
     },
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap() {
-      let { latitude, longitude } = this.$store.state.user;
+    initMap () {
       // 定义地图中心点坐标
+      let { latitude, longitude } = this.$store.state.user;
+      console.log('lat' + latitude + ',lon' + longitude)
+
+      if (this.dataForm.latitude && this.dataForm.longitude) {
+        latitude = this.dataForm.latitude
+        longitude = this.dataForm.longitude
+      }
       if (!latitude || latitude == "" || latitude == "0") {
         latitude = 39.9088810666821;
         longitude = 116.39743841556731;
       }
-      console.log(latitude,longitude);
-      var center = new window.TMap.LatLng(latitude, longitude);
+      var center = new window.TMap.LatLng(latitude, longitude)
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
       map = new window.TMap.Map(document.getElementById("map_add"), {
         center: center, // 设置地图中心点坐标
@@ -279,7 +263,7 @@ export default {
       // this.handleMoveCenter()
       this.convert();
     },
-    handleMoveCenter() {
+    handleMoveCenter () {
       //修改地图中心点
       const center = map.getCenter();
       const lat = center.getLat();
@@ -290,7 +274,7 @@ export default {
       this.convert(lat, lng);
     },
     // 地图查询
-    handleSearchMap() {
+    handleSearchMap () {
       infoWindowList.forEach((infoWindow) => {
         infoWindow.close();
       });
@@ -319,7 +303,7 @@ export default {
           }
         });
     },
-    convert(lat, lng) {
+    convert (lat, lng) {
       markers.setGeometries([]);
       // var input = document.getElementById('location').value.split(',');
       let location;
@@ -344,8 +328,8 @@ export default {
         .then((result) => {
           this.dataForm.address =
             this.dataForm.address !== "" &&
-            this.dataForm.address !== null &&
-            (this.dataForm.longitude === "" || this.dataForm.longitude === null)
+              this.dataForm.address !== null &&
+              (this.dataForm.longitude === "" || this.dataForm.longitude === null)
               ? this.dataForm.address
               : result.result.address;
           // 显示搜索到的地址
@@ -353,7 +337,7 @@ export default {
         });
     },
 
-    setMarker(lat, lng) {
+    setMarker (lat, lng) {
       markers.setGeometries([]);
       markers.add([
         {
@@ -367,7 +351,7 @@ export default {
       ]);
     },
     // 获取所属组织列表
-    getFormInfo() {
+    getFormInfo () {
       this.$http
         .post(`/gov/org/agency/communityListByCustomerId`)
         .then(({ data: res }) => {
@@ -376,9 +360,9 @@ export default {
           }
           this.organizationList = res.data;
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    init() {
+    init () {
       this.$nextTick(() => {
         this.$refs["dataForm"].resetFields();
         if (this.dataForm.id) {
@@ -391,7 +375,7 @@ export default {
     },
 
     // 获取信息
-    getInfo() {
+    getInfo () {
       this.$http
         .get(`/epmetuser/icPointNucleicMonitoring/${this.dataForm.id}`)
         .then(({ data: res }) => {
@@ -404,7 +388,7 @@ export default {
           };
           this.initMap();
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     // 表单提交
     dataFormSubmitHandle: debounce(
@@ -431,7 +415,7 @@ export default {
                 },
               });
             })
-            .catch(() => {});
+            .catch(() => { });
         });
       },
       1000,
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring-detail.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring-detail.vue
new file mode 100644
index 000000000..2bf902c27
--- /dev/null
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-detail.vue
@@ -0,0 +1,289 @@
+<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-2">所属组织：</span>
+            <span>{{ dataForm.orgName||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">检测点名称：</span>
+            <span>{{ dataForm.name||'--' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">服务时间：</span>
+            <span>{{ dataForm.serveTime||'--' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">咨询电话：</span>
+            <span>{{ dataForm.mobile||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">检测点地址：</span>
+            <span>{{ dataForm.address||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">地图位置：</span>
+            <div class="div_map">
+
+              <div id="app_detail"></div>
+
+            </div>
+          </div>
+
+        </div>
+      </div>
+
+    </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="closeSubmit">关 闭</el-button>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost, requestGet } from '@/js/dai/request'
+
+var map;
+var search;
+var markers;
+var geocoder;
+var infoWindowList;
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      initLoading: false,
+      dataForm: {
+        id: ''
+      },
+
+    };
+  },
+  computed: {
+
+  },
+  created () {
+
+  },
+  props: {
+
+  },
+  methods: {
+    diaDestroy () {
+      if (map) {
+        map.destroy()
+      }
+    },
+    closeSubmit () {
+      this.diaDestroy()
+      this.$emit("closeDialog");
+    },
+
+    async init (id) {
+
+      this.startLoading()
+
+      this.dataForm.id = id
+      await this.getInfo();
+      this.initLoading = true
+
+      this.$nextTick(() => {
+        this.initMap()
+      })
+
+      this.endLoading()
+
+    },
+
+    // 获取信息
+    async getInfo () {
+      let url = `/epmetuser/icPointNucleicMonitoring/${this.dataForm.id}`
+      const { data, code, msg } = await requestGet(url)
+
+      if (code === 0) {
+        this.dataForm = data;
+      } else {
+
+        this.$message.error(msg)
+      }
+    },
+
+    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+    initMap () {
+      // 定义地图中心点坐标
+      let { latitude, longitude } = this.$store.state.user;
+      console.log('lat' + latitude + ',lon' + longitude)
+
+      if (this.dataForm.latitude && this.dataForm.longitude) {
+        latitude = this.dataForm.latitude
+        longitude = this.dataForm.longitude
+      }
+      if (!latitude || latitude == "" || latitude == "0") {
+        latitude = 39.9088810666821;
+        longitude = 116.39743841556731;
+      }
+      var center = new window.TMap.LatLng(latitude, longitude)
+      // 定义map变量，调用 TMap.Map() 构造函数创建地图
+      map = new window.TMap.Map(document.getElementById("app_detail"), {
+        center: center, // 设置地图中心点坐标
+        zoom: 17.2, // 设置地图缩放级别
+        pitch: 43.5, // 设置俯仰角
+        rotation: 45, // 设置地图旋转角度
+      });
+      search = new window.TMap.service.Search({ pageSize: 10 });
+      // 新建一个地点搜索类
+      markers = new TMap.MultiMarker({
+        map: map,
+        geometries: [],
+      });
+      infoWindowList = Array(10);
+
+      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+
+      // 监听地图平移结束
+      map.on("panend", () => {
+        this.handleMoveCenter();
+      });
+      this.handleMoveCenter()
+      this.convert();
+    },
+    handleMoveCenter () {
+      //修改地图中心点
+      const center = map.getCenter();
+      const lat = center.getLat();
+      const lng = center.getLng();
+      this.dataForm.latitude = lat;
+      this.dataForm.longitude = lng;
+      this.setMarker(lat, lng);
+      this.convert(lat, lng);
+    },
+    // 地图查询
+    handleSearchMap () {
+      infoWindowList.forEach((infoWindow) => {
+        infoWindow.close();
+      });
+      infoWindowList.length = 0;
+      markers.setGeometries([]);
+      // 在地图显示范围内以给定的关键字搜索地点
+      search
+        .searchRectangle({
+          keyword: this.dataForm.address,
+          bounds: map.getBounds(),
+        })
+        .then((result) => {
+          let { data } = result;
+          if (Array.isArray(data) && data.length > 0) {
+            const {
+              location: { lat, lng },
+            } = data[0];
+
+            map.setCenter(new TMap.LatLng(lat, lng));
+            this.setMarker(lat, lng);
+            this.dataForm.latitude = lat;
+            this.dataForm.longitude = lng;
+            this.convert();
+          } else {
+            this.$message.error("未检索到相关位置坐标");
+          }
+        });
+    },
+    convert (lat, lng) {
+      markers.setGeometries([]);
+      // var input = document.getElementById('location').value.split(',');
+      let location;
+      if (lat && lng) {
+        location = new TMap.LatLng(lat, lng);
+      } else {
+        location = new TMap.LatLng(
+          this.dataForm.latitude,
+          this.dataForm.longitude
+        );
+      }
+
+      // map.setCenter(location);
+      markers.updateGeometries([
+        {
+          id: "main", // 点标注数据数组
+          position: location,
+        },
+      ]);
+      geocoder
+        .getAddress({ location: location }) // 将给定的坐标位置转换为地址
+        .then((result) => {
+          this.dataForm.address =
+            this.dataForm.address !== "" &&
+              this.dataForm.address !== null &&
+              (this.dataForm.longitude === "" || this.dataForm.longitude === null)
+              ? this.dataForm.address
+              : result.result.address;
+          // 显示搜索到的地址
+          console.log(this.dataForm.address);
+        });
+    },
+
+    setMarker (lat, lng) {
+      markers.setGeometries([]);
+      markers.add([
+        {
+          id: "4",
+          styleId: "marker",
+          position: new TMap.LatLng(lat, lng),
+          properties: {
+            title: "marker4",
+          },
+        },
+      ]);
+    },
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+
+  },
+};
+</script>
+<style scoped>
+.position_label >>> .el-form-item__label::before {
+  color: #fff !important;
+}
+.submit {
+  text-align: center;
+  margin: auto;
+}
+.form-class .el-input {
+  width: 75%;
+}
+.form-class .el-textarea {
+  width: 75% !important;
+}
+</style>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/detail-main.scss";
+</style>
+
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index 2cb7772c4..8211c3db6 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -1,254 +1,207 @@
 <template>
   <div class="div_main">
     <div class="div_search">
-      <el-form
-        :inline="true"
-        :model="dataForm"
-        @keyup.enter.native="loadTable()"
-      >
-        <el-form-item label="所属组织名称" prop="orgName">
-          <el-cascader
-            ref="org"
-            v-model="orgIds"
-            :options="organizationList"
-            :props="{ checkStrictly: true, multiple: false, emitPath: true }"
-            style="width: 200px"
-            clearable
-            @change="orgChangeHandle"
-          >
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="loadTable()">
+        <el-form-item label="所属组织名称"
+                      prop="orgName">
+          <el-cascader ref="org"
+                       v-model="orgIds"
+                       :options="organizationList"
+                       :props="{ checkStrictly: true, multiple: false, emitPath: true }"
+                       style="width: 200px"
+                       clearable
+                       @change="orgChangeHandle">
           </el-cascader>
         </el-form-item>
-        <el-form-item label="核酸检测点名称" prop="name">
-          <el-input
-            v-model="dataForm.name"
-            placeholder="核酸检测点名称"
-            clearable
-          ></el-input>
+        <el-form-item label="核酸检测点名称"
+                      prop="name">
+          <el-input v-model="dataForm.name"
+                    placeholder="核酸检测点名称"
+                    clearable></el-input>
         </el-form-item>
-        <el-form-item label="咨询电话" prop="mobile">
-          <el-input
-            v-model="dataForm.mobile"
-            placeholder="咨询电话"
-            clearable
-          ></el-input>
+        <el-form-item label="咨询电话"
+                      prop="mobile">
+          <el-input v-model="dataForm.mobile"
+                    placeholder="咨询电话"
+                    clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button
-            class="diy-button--search"
-            size="small"
-            @click="loadTable()"
-            >{{ $t("query") }}</el-button
-          >
+          <el-button class="diy-button--search"
+                     size="small"
+                     @click="loadTable()">{{ $t("query") }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button size="small" class="diy-button--reset" @click="resetSearch"
-            >重置</el-button
-          >
+          <el-button size="small"
+                     class="diy-button--reset"
+                     @click="resetSearch">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
 
     <div class="div_table">
       <div class="exportBtn">
-        <el-button
-          class="diy-button--add"
-          type="primary"
-          size="small"
-          @click="addOrUpdateHandle('', '新增检测点')"
-          >{{ $t("add") }}</el-button
-        >
-        <el-button
-          style="margin-left: 10px"
-          class="diy-button--export"
-          size="small"
-          @click="handleExportModule()"
-          >下载模板</el-button
-        >
+        <el-button class="diy-button--add"
+                   type="primary"
+                   size="small"
+                   @click="addOrUpdateHandle('', '新增检测点')">{{ $t("add") }}</el-button>
+        <el-button style="margin-left: 10px"
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule()">下载模板</el-button>
 
-        <el-upload :headers="$getElUploadHeaders()" 
-          style=""
-          ref="upload"
-          :multiple="false"
-          :show-file-list="false"
-          :before-upload="
+        <el-upload :headers="$getElUploadHeaders()"
+                   style=""
+                   ref="upload"
+                   :multiple="false"
+                   :show-file-list="false"
+                   :before-upload="
             (file) => {
               beforeUpload(file);
             }
           "
-          action=""
-          accept=".xls,.xlsx"
-          :http-request="
+                   action=""
+                   accept=".xls,.xlsx"
+                   :http-request="
             () => {
               uploadFile();
             }
-          "
-        >
-          <el-button
-            style="margin-left: 10px"
-            size="small"
-            class="diy-button--delete"
-            >导入</el-button
-          >
+          ">
+          <el-button style="margin-left: 10px"
+                     size="small"
+                     class="diy-button--delete">导入</el-button>
         </el-upload>
-        <el-button
-          style="float: left; margin-left: 10px"
-          class="diy-button--reset"
-          size="small"
-          @click="handleExport"
-          >导出</el-button
-        >
+        <el-button style="float: left; margin-left: 10px"
+                   class="diy-button--reset"
+                   size="small"
+                   @click="handleExport">导出</el-button>
         <!--<el-button class="diy-button&#45;&#45;reset" style="float:left;margin-left:10px"-->
         <!--size="small" @click="exportHandle()">{{ $t('export') }}</el-button>-->
-        <el-button
-          style="margin-left: 15px"
-          class="diy-button--more"
-          size="small"
-          @click="handleSendNotice"
-          v-if="noticeVisible"
-          >发送通知</el-button
-        >
+        <el-button style="margin-left: 15px"
+                   class="diy-button--more"
+                   size="small"
+                   @click="handleSendNotice"
+                   v-if="noticeVisible">发送通知</el-button>
       </div>
-      <el-table
-        v-loading="dataListLoading"
-        :data="dataList"
-        border
-        :row-key="row => { return row.id.toString() }"
-        :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
-        style="width: 100%; height: 564px;overflow: auto;"
-        ><el-table-column
-          label="序号"
-          header-align="center"
-          align="center"
-          type="index"
-          width="50"
-        ></el-table-column>
-        <el-table-column
-          prop="orgName"
-          label="所属组织名称"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="name"
-          label="核酸检测点名称"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="serveTime"
-          label="服务时间"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="mobile"
-          label="咨询电话"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="address"
-          label="检测点地址"
-          header-align="center"
-          align="center"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-                prop="enableFlag"
-                label="禁用/启用"
-                header-align="center"
-                align="center"
-                show-overflow-tooltip>
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                :row-key="row => { return row.id.toString() }"
+                :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+                style="width: 100%; height: 564px;overflow: auto;">
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"></el-table-column>
+        <el-table-column prop="orgName"
+                         label="所属组织名称"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="name"
+                         label="核酸检测点名称"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="serveTime"
+                         label="服务时间"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="mobile"
+                         label="咨询电话"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="address"
+                         label="检测点地址"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="enableFlag"
+                         label="禁用/启用"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip>
           <template slot-scope="scope">
-          <span v-for="(item, index) in enableFlagList"
-                :key="item.value"
-                :value="item.label"
-                v-if="scope.row.enableFlag == item.value">
+            <span v-for="(item, index) in enableFlagList"
+                  :key="item.value"
+                  :value="item.label"
+                  v-if="scope.row.enableFlag == item.value">
               {{ item.label }}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          label="操作"
-          header-align="center"
-          align="center"
-          width="180"
-        >
+        <el-table-column label="操作"
+                         header-align="center"
+                         align="center"
+                         width="180">
           <template slot-scope="scope">
-            <el-button
-                    type="text"
-                    size="small"
-                    class="div-table-button--detail"
-                    @click="enableOrDisabled(scope.row.id)">{{ (scope.row.enableFlag === 'enable' && '禁用') || '启用' }}</el-button>
-            <el-button
-              type="text"
-              size="small"
-              class="div-table-button--detail"
-              @click="addOrUpdateHandle(scope.row.id, '查看')"
-              >{{ "查看" }}</el-button
-            >
-            <el-button
-              type="text"
-              size="small"
-              class="div-table-button--edit"
-              @click="addOrUpdateHandle(scope.row.id, '修改')"
-              >{{ scope.row.longitude === null ? "待完善" : "修改" }}</el-button
-            >
-            <el-button
-              type="text"
-              size="small"
-              class="div-table-button--delete--noline"
-              @click="handleDelete(scope.row.id)"
-              >{{ $t("delete") }}</el-button
-            >
+            <el-button type="text"
+                       size="small"
+                       class="div-table-button--detail"
+                       @click="enableOrDisabled(scope.row.id)">{{ (scope.row.enableFlag === 'enable' && '禁用') || '启用' }}</el-button>
+            <el-button type="text"
+                       size="small"
+                       class="div-table-button--detail"
+                       @click="detailHandle(scope.row.id, '查看')">{{ "查看" }}</el-button>
+            <el-button type="text"
+                       size="small"
+                       class="div-table-button--edit"
+                       @click="addOrUpdateHandle(scope.row.id, '修改')">{{ scope.row.longitude === null ? "待完善" : "修改" }}</el-button>
+            <el-button type="text"
+                       size="small"
+                       class="div-table-button--delete--noline"
+                       @click="handleDelete(scope.row.id)">{{ $t("delete") }}</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <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>
     <!-- 弹窗, 新增 / 修改 -->
-    <el-dialog
-      :visible.sync="addOrUpdateVisible"
-      :title="dialogTitle"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :destroy-on-close="true"
-      width="850px"
-      top="5vh"
-      custom-class="dialog-h"
-    >
-      <add-or-update
-        ref="addOrUpdate"
-        @refreshDataList="loadTable"
-        @closeDialog="closeDialog"
-        :dialogTitle="dialogTitle"
-      ></add-or-update>
+    <el-dialog :visible.sync="addOrUpdateVisible"
+               :title="dialogTitle"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :destroy-on-close="true"
+               width="850px"
+               top="5vh"
+               custom-class="dialog-h">
+      <add-or-update ref="addOrUpdate"
+                     @refreshDataList="loadTable"
+                     @closeDialog="closeDialog"
+                     :dialogTitle="dialogTitle"></add-or-update>
+    </el-dialog>
+    <!-- 弹窗, 详情 -->
+    <el-dialog :visible.sync="detailShow"
+               :title="'详情'"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :destroy-on-close="true"
+               width="850px"
+               top="5vh"
+               @closed="diaDetailClose"
+               custom-class="dialog-h">
+      <detail ref="ref_detail"
+              @closeDialog="diaDetailClose"></detail>
     </el-dialog>
     <!-- 发送通知弹出框 -->
-    <el-dialog
-      :visible.sync="sendNoticeFormShow"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      title="发送通知"
-      width="850px"
-      top="5vh"
-      class="dialog-h"
-      @closed="diaClose"
-      :destroy-on-close="true"
-    >
-      <icpoint-noice
-        ref="ref_sendnotice"
-        @diaClose="diaClose"
-        :noticeOrigin="noticeOrigin"
-      ></icpoint-noice>
+    <el-dialog :visible.sync="sendNoticeFormShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               title="发送通知"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose"
+               :destroy-on-close="true">
+      <icpoint-noice ref="ref_sendnotice"
+                     @diaClose="diaClose"
+                     :noticeOrigin="noticeOrigin"></icpoint-noice>
     </el-dialog>
   </div>
 </template>
@@ -256,11 +209,12 @@
 <script>
 import mixinViewModule from "@/mixins/view-module";
 import AddOrUpdate from "./icpointnucleicmonitoring-add-or-update";
+import detail from "./icpointnucleicmonitoring-detail";
 import icpointNoice from "./icpointNoice";
-import { requestPost , requestGet} from "@/js/dai/request";
+import { requestPost, requestGet } from "@/js/dai/request";
 export default {
   mixins: [mixinViewModule],
-  data() {
+  data () {
     return {
       enableFlagList: [
         {
@@ -286,20 +240,23 @@ export default {
       pageSize: 20,
       pageNo: 0,
       total: 0,
-      dataListLoading:false
+      dataListLoading: false,
+
+      detailShow: false
     };
   },
   components: {
     AddOrUpdate,
     icpointNoice,
+    detail
   },
-  created() {
+  created () {
     this.loadTable()
     this.noticeFun();
     this.getFormInfo();
   },
   methods: {
-    async loadTable() {
+    async loadTable () {
       this.dataListLoading = true;
       const url = "/epmetuser/icPointNucleicMonitoring/page";
       let params = {
@@ -318,16 +275,16 @@ export default {
       }
       this.dataListLoading = false;
     },
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       this.pageSize = val;
       this.pageNo = 1;
       this.loadTable();
     },
-    handleCurrentChange(val) {
+    handleCurrentChange (val) {
       this.pageNo = val;
       this.loadTable();
     },
-    async handleDelete(id) {
+    async handleDelete (id) {
       this.$confirm("确认删除?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -341,7 +298,7 @@ export default {
           }
         });
     },
-    async deleteNat(id) {
+    async deleteNat (id) {
       const url = "/epmetuser/icPointNucleicMonitoring/delete";
       let params = [id];
       const { data, code, msg } = await requestPost(url, params);
@@ -356,7 +313,7 @@ export default {
       }
     },
     //导出表格
-    async handleExport() {
+    async handleExport () {
       let title = "核酸检测点";
 
       const url = "/epmetuser/icPointNucleicMonitoring/point-export";
@@ -373,7 +330,7 @@ export default {
       );
     },
     //重置搜索条件
-    resetSearch() {
+    resetSearch () {
       this.dataForm = {
         name: "",
         mobile: "",
@@ -383,24 +340,24 @@ export default {
       this.orgIds = [];
     },
     // 发送通知
-    handleSendNotice() {
+    handleSendNotice () {
       this.sendNoticeFormShow = true;
     },
     // 关闭通知
-    diaClose() {
+    diaClose () {
       this.sendNoticeFormShow = false;
     },
     // 启用/禁用
-    enableOrDisabled(id) {
+    enableOrDisabled (id) {
       this.$http
-              .post(`/epmetuser/appPoint/enableOrDisabled/` + id)
-              .then(({ data: res }) => {
-                this.loadTable();
-              })
-              .catch(() => {});
+        .post(`/epmetuser/appPoint/enableOrDisabled/` + id)
+        .then(({ data: res }) => {
+          this.loadTable();
+        })
+        .catch(() => { });
     },
     // 新增 / 修改
-    addOrUpdateHandle(id, title) {
+    addOrUpdateHandle (id, title) {
       this.dialogTitle = title;
       this.$nextTick(() => {
         this.$refs.addOrUpdate.dataForm.id = id;
@@ -408,13 +365,26 @@ export default {
       });
       this.addOrUpdateVisible = true;
     },
+    // 详情
+    detailHandle (id) {
+      this.detailShow = true;
+      this.$nextTick(() => {
+
+        this.$refs.ref_detail.init(id);
+      });
+    },
+    diaDetailClose () {
+      console.log(this.$refs.ref_detail)
+      this.$refs.ref_detail.diaDestroy()
+      this.detailShow = false
+    },
     // 关闭弹窗
-    closeDialog() {
+    closeDialog () {
       this.addOrUpdateVisible = false;
       this.dialogTitle = "";
     },
     // 获取所属组织列表
-    getFormInfo() {
+    getFormInfo () {
       this.$http
         .post(`/gov/org/agency/getOrgTreeListByCustomerId`)
         .then(({ data: res }) => {
@@ -424,10 +394,10 @@ export default {
           this.organizationList = res.data;
           this.deleteChildren(this.organizationList);
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     // 获取发送通知按钮显示与隐藏
-    noticeFun() {
+    noticeFun () {
       this.$http
         .post(`/epmetuser/icPointNucleicMonitoring/getShowType`)
         .then(({ data: res }) => {
@@ -435,9 +405,9 @@ export default {
             this.noticeVisible = true;
           }
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    deleteChildren(arr) {
+    deleteChildren (arr) {
       let childs = arr;
       for (let i = childs.length; i--; i > 0) {
         if (childs[i].children) {
@@ -450,11 +420,11 @@ export default {
       }
       return arr;
     },
-    orgChangeHandle() {
+    orgChangeHandle () {
       this.dataForm.orgId = this.orgIds[this.orgIds.length - 1];
       console.log(this.dataForm);
     },
-    handleExportModule() {
+    handleExportModule () {
       let title = "核酸检测点模板";
       let url = "/epmetuser/icPointNucleicMonitoring/exporttemplate";
 
@@ -472,7 +442,7 @@ export default {
       );
     },
     // 下载文件
-    download(data, fileName) {
+    download (data, fileName) {
       if (!data) {
         return;
       }
@@ -496,7 +466,7 @@ export default {
       }
     },
     // 上传文件之前的钩子
-    beforeUpload(file) {
+    beforeUpload (file) {
       this.files = file;
 
       const isText = file.type === "application/vnd.ms-excel";
@@ -514,7 +484,7 @@ export default {
         return true;
       }
     },
-    async uploadFile() {
+    async uploadFile () {
       if (this.fileName == "") {
         this.$message.warning("请选择要上传的文件！");
         return false;
@@ -552,7 +522,7 @@ export default {
           }
           this.loadTable();
         },
-        (rspMsg, data) => {},
+        (rspMsg, data) => { },
         { headers: { "Content-Type": "multipart/form-data" } }
       );
     },
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
index ed8684a6f..1fffd7400 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -1,12 +1,11 @@
 <template>
-  <div style="max-height: 82vh; overflow: auto; padding: 20px" class="form-class">
-    <el-form
-      :model="dataForm"
-      :rules="dataRule"
-      ref="dataForm"
-      @keyup.enter.native="dataFormSubmitHandle()"
-      label-width="120px"
-    >
+  <div style="max-height: 82vh; overflow: auto; padding: 20px"
+       class="form-class">
+    <el-form :model="dataForm"
+             :rules="dataRule"
+             ref="dataForm"
+             @keyup.enter.native="dataFormSubmitHandle()"
+             label-width="130px">
       <!--<el-form-item label="所属组织名称" prop="orgName">-->
       <!--<el-select v-model="dataForm.orgName" placeholder="所属组织名称">-->
       <!--<el-option-->
@@ -18,107 +17,89 @@
       <!--</el-option>-->
       <!--</el-select>-->
       <!--</el-form-item>-->
-      <el-form-item label="疫苗接种点名称" prop="name">
-        <el-input
-          v-model="dataForm.name"
-          placeholder="疫苗接种点名称"
-          :disabled="dialogTitle == '查看'"
-        ></el-input>
+      <el-form-item label="疫苗接种点名称"
+                    prop="name">
+        <el-input v-model="dataForm.name"
+                  placeholder="疫苗接种点名称"
+                  :disabled="dialogTitle == '查看'"></el-input>
       </el-form-item>
-      <el-form-item
-        label="接种时间"
-        :class="dataForm.noAvailableVaccines != '2' ? '' : 'time-class'"
-      >
+      <el-form-item label="接种时间"
+                    :class="dataForm.noAvailableVaccines != '2' ? '' : 'time-class'">
         <div class="data-block">
           <div style="width: 30%">
-            <el-date-picker
-              v-model="dataForm.inoculationDate"
-              value-format="yyyy-MM-dd"
-              type="date"
-              :clearable="false"
-              placeholder="选择日期"
-              :disabled="dialogTitle == '查看'"
-            >
+            <el-date-picker v-model="dataForm.inoculationDate"
+                            value-format="yyyy-MM-dd"
+                            type="date"
+                            :clearable="false"
+                            placeholder="选择日期"
+                            :disabled="dialogTitle == '查看'">
             </el-date-picker>
           </div>
           <div class="time-block">
             <div>
               <span>上午</span>
-              <el-time-picker
-                is-range
-                v-model="morningTime"
-                format="HH:mm"
-                value-format="HH:mm"
-                range-separator="至"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-                placeholder="选择时间范围"
-                @change="startTimeChange"
-                :disabled="dialogTitle == '查看'"
-                :clearable="false"
-                :editable="false"
-                style="width: 56%"
-              >
+              <el-time-picker is-range
+                              v-model="morningTime"
+                              format="HH:mm"
+                              value-format="HH:mm"
+                              range-separator="至"
+                              start-placeholder="开始时间"
+                              end-placeholder="结束时间"
+                              placeholder="选择时间范围"
+                              @change="startTimeChange"
+                              :disabled="dialogTitle == '查看'"
+                              :clearable="false"
+                              :editable="false"
+                              style="width: 56%">
               </el-time-picker>
             </div>
             <div>
               <span>下午</span>
-              <el-time-picker
-                is-range
-                v-model="afterTime"
-                format="HH:mm"
-                value-format="HH:mm"
-                range-separator="至"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-                placeholder="选择时间范围"
-                @change="endTimeChange"
-                :disabled="dialogTitle == '查看'"
-                :clearable="false"
-                :editable="false"
-                style="width: 56%"
-              >
+              <el-time-picker is-range
+                              v-model="afterTime"
+                              format="HH:mm"
+                              value-format="HH:mm"
+                              range-separator="至"
+                              start-placeholder="开始时间"
+                              end-placeholder="结束时间"
+                              placeholder="选择时间范围"
+                              @change="endTimeChange"
+                              :disabled="dialogTitle == '查看'"
+                              :clearable="false"
+                              :editable="false"
+                              style="width: 56%">
               </el-time-picker>
             </div>
           </div>
         </div>
       </el-form-item>
-      <el-form-item label="" prop="noAvailableVaccines">
-        <el-checkbox
-          v-model="dataForm.noAvailableVaccines"
-          true-label="1"
-          false-label="2"
-          :disabled="dialogTitle == '查看'"
-          >暂无疫苗</el-checkbox
-        >
+      <el-form-item label=""
+                    prop="noAvailableVaccines">
+        <el-checkbox v-model="dataForm.noAvailableVaccines"
+                     true-label="1"
+                     false-label="2"
+                     :disabled="dialogTitle == '查看'">暂无疫苗</el-checkbox>
       </el-form-item>
-      <el-form-item label="咨询电话" prop="mobile">
-        <el-input
-          v-model="dataForm.mobile"
-          :disabled="dialogTitle == '查看'"
-          placeholder="咨询电话"
-        ></el-input>
+      <el-form-item label="咨询电话"
+                    prop="mobile">
+        <el-input v-model="dataForm.mobile"
+                  :disabled="dialogTitle == '查看'"
+                  placeholder="咨询电话"></el-input>
       </el-form-item>
-      <el-form-item label="接种点地址" prop="address">
-        <el-input
-          v-model="dataForm.address"
-          placeholder="例:青岛市时代国际广场"
-          style="width: 65%"
-        ></el-input>
-        <el-button
-          style="margin-left: 10px"
-          type="primary"
-          size="small"
-          @click="handleSearchMap"
-          >查询</el-button
-        >
+      <el-form-item label="接种点地址"
+                    prop="address">
+        <el-input v-model="dataForm.address"
+                  placeholder="例:青岛市时代国际广场"
+                  style="width: 65%"></el-input>
+        <el-button style="margin-left: 10px"
+                   type="primary"
+                   size="small"
+                   @click="handleSearchMap">查询</el-button>
       </el-form-item>
-      <el-form-item
-        label="位置坐标"
-        class="position_label"
-        prop="longitude"
-        style="display: block"
-      >
+      <el-form-item label="位置坐标"
+                    class="position_label"
+                    prop="longitude"
+                    style="display: block">
         <div>
           <!-- <el-input
             class="item_width_4"
@@ -136,31 +117,26 @@
             @click="handleSearchMap"
             >查询</el-button
           > -->
-          <div
-            id="map_add"
-            class="div_map"
-            style="width: 500px; height: 300px; margin-top: 20px"
-          ></div>
-          <div style="margin-top: 10px" v-show="false">
+          <div id="map_add"
+               class="div_map"
+               style="width: 500px; height: 300px; margin-top: 20px"></div>
+          <div style="margin-top: 10px"
+               v-show="false">
             <span>经度</span>
-            <el-input
-              class="item_width_3"
-              maxlength="50"
-              placeholder="请输入经度"
-              v-model="dataForm.longitude"
-              disabled
-              style="width: 200px; margin-left: 20px"
-            >
+            <el-input class="item_width_3"
+                      maxlength="50"
+                      placeholder="请输入经度"
+                      v-model="dataForm.longitude"
+                      disabled
+                      style="width: 200px; margin-left: 20px">
             </el-input>
             <span style="margin-left: 20px">纬度</span>
-            <el-input
-              class="item_width_3"
-              maxlength="50"
-              placeholder="请输入纬度"
-              v-model="dataForm.latitude"
-              disabled
-              style="width: 200px; margin-left: 20px"
-            >
+            <el-input class="item_width_3"
+                      maxlength="50"
+                      placeholder="请输入纬度"
+                      v-model="dataForm.latitude"
+                      disabled
+                      style="width: 200px; margin-left: 20px">
             </el-input>
           </div>
         </div>
@@ -168,12 +144,9 @@
     </el-form>
     <div class="submit">
       <el-button @click="closeSubmit">{{ $t("cancel") }}</el-button>
-      <el-button
-        v-if="dialogTitle != '查看'"
-        type="primary"
-        @click="dataFormSubmitHandle()"
-        >{{ $t("confirm") }}</el-button
-      >
+      <el-button v-if="dialogTitle != '查看'"
+                 type="primary"
+                 @click="dataFormSubmitHandle()">{{ $t("confirm") }}</el-button>
     </div>
   </div>
 </template>
@@ -186,7 +159,7 @@ var markers;
 var geocoder;
 var infoWindowList;
 export default {
-  data() {
+  data () {
     return {
       visible: false,
       dataForm: {
@@ -215,7 +188,7 @@ export default {
     };
   },
   computed: {
-    dataRule() {
+    dataRule () {
       return {
         customerId: [
           {
@@ -276,7 +249,7 @@ export default {
     },
   },
   methods: {
-    startTimeChange() {
+    startTimeChange () {
       if (Array.isArray(this.morningTime) && this.morningTime.length > 0) {
         let hour_0 = Number(this.morningTime[0].substring(0, 2));
         let hour_1 = Number(this.morningTime[1].substring(0, 2));
@@ -307,7 +280,7 @@ export default {
         this.dataForm.moEndTime = this.morningTime[1];
       }
     },
-    endTimeChange() {
+    endTimeChange () {
       if (Array.isArray(this.afterTime) && this.afterTime.length > 0) {
         let hour_0 = Number(this.afterTime[0].substring(0, 2));
         let hour_1 = Number(this.afterTime[1].substring(0, 2));
@@ -338,11 +311,11 @@ export default {
         this.dataForm.afEndTime = this.afterTime[1];
       }
     },
-    closeSubmit() {
+    closeSubmit () {
       this.$emit("closeDialog");
     },
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap() {
+    initMap () {
       let { latitude, longitude } = this.$store.state.user;
       // 定义地图中心点坐标
       if (!latitude || latitude == "" || latitude == "0") {
@@ -375,7 +348,7 @@ export default {
       // this.handleMoveCenter()
       this.convert();
     },
-    handleMoveCenter() {
+    handleMoveCenter () {
       //修改地图中心点
       const center = map.getCenter();
       const lat = center.getLat();
@@ -386,7 +359,7 @@ export default {
       this.convert(lat, lng);
     },
     // 地图查询
-    handleSearchMap() {
+    handleSearchMap () {
       infoWindowList.forEach((infoWindow) => {
         infoWindow.close();
       });
@@ -415,7 +388,7 @@ export default {
           }
         });
     },
-    convert(lat, lng) {
+    convert (lat, lng) {
       markers.setGeometries([]);
       // var input = document.getElementById('location').value.split(',');
       let location;
@@ -440,8 +413,8 @@ export default {
         .then((result) => {
           this.dataForm.address =
             this.dataForm.address !== "" &&
-            this.dataForm.address !== null &&
-            (this.dataForm.longitude === "" || this.dataForm.longitude === null)
+              this.dataForm.address !== null &&
+              (this.dataForm.longitude === "" || this.dataForm.longitude === null)
               ? this.dataForm.address
               : result.result.address;
           // 显示搜索到的地址
@@ -449,7 +422,7 @@ export default {
         });
     },
 
-    setMarker(lat, lng) {
+    setMarker (lat, lng) {
       markers.setGeometries([]);
       markers.add([
         {
@@ -474,7 +447,7 @@ export default {
     //     })
     //     .catch(() => {});
     // },
-    init() {
+    init () {
       this.visible = true;
       this.$nextTick(() => {
         this.$refs["dataForm"].resetFields();
@@ -486,7 +459,7 @@ export default {
       });
     },
     // 获取信息
-    getInfo() {
+    getInfo () {
       this.$http
         .get(`/epmetuser/icPointVaccinesInoculation/${this.dataForm.id}`)
         .then(({ data: res }) => {
@@ -505,7 +478,7 @@ export default {
           }
           this.initMap();
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     // 表单提交
     dataFormSubmitHandle: debounce(
@@ -556,7 +529,7 @@ export default {
                 },
               });
             })
-            .catch(() => {});
+            .catch(() => { });
         });
       },
       1000,
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation-detail.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation-detail.vue
new file mode 100644
index 000000000..72901d0ad
--- /dev/null
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-detail.vue
@@ -0,0 +1,338 @@
+<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-2">所属组织名称：</span>
+            <span>{{ dataForm.orgName||'--'  }}</span>
+          </div> -->
+
+          <div class="info-prop">
+            <span class="info-title-2">接种点名称：</span>
+            <span>{{ dataForm.name||'--' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">接种时间：</span>
+
+            <span>{{ dataForm.inoculationDate||'--' }}</span>
+
+          </div>
+          <div v-if="this.dataForm.moStartTime"
+               class="info-prop">
+
+            <span class="info-title-2">上午：</span>
+            <span>{{this.dataForm.moStartTime }}</span>至
+            <span>{{this.dataForm.moEndTime }}</span>
+
+          </div>
+
+          <div v-if="this.dataForm.afStartTime"
+               class="info-prop">
+
+            <span class="info-title-2">下午：</span>
+            <span>{{this.dataForm.afStartTime }}</span>至
+            <span>{{this.dataForm.afEndTime }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">咨询电话：</span>
+            <span>{{ dataForm.mobile||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">接种点地址：</span>
+            <span>{{ dataForm.address||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">地图位置：</span>
+            <div class="div_map">
+
+              <div id="app_detail"></div>
+
+            </div>
+          </div>
+
+        </div>
+      </div>
+
+    </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="closeSubmit">关 闭</el-button>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost, requestGet } from '@/js/dai/request'
+
+var map;
+var search;
+var markers;
+var geocoder;
+var infoWindowList;
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      visible: false,
+      initLoading: false,
+      dataForm: {
+        id: "",
+
+      },
+      keyWords: null,
+      // organizationList: [],
+      morningTime: null,
+      afterTime: null,
+    };
+  },
+  computed: {
+
+  },
+  props: {
+
+  },
+  methods: {
+
+    diaDestroy () {
+      if (map) {
+        map.destroy()
+      }
+    },
+    closeSubmit () {
+      this.diaDestroy()
+      this.$emit("closeDialog");
+    },
+
+    async init (id) {
+      this.startLoading()
+
+      this.dataForm.id = id
+      await this.getInfo();
+      this.initLoading = true
+
+      this.$nextTick(() => {
+        this.initMap()
+      })
+
+      this.endLoading()
+
+    },
+
+
+    // 获取信息
+    async getInfo () {
+      let url = `/epmetuser/icPointVaccinesInoculation/${this.dataForm.id}`
+      const { data, code, msg } = await requestGet(url)
+
+      if (code === 0) {
+        this.dataForm = data;
+        // if (data.moStartTime !== "") {
+        //   this.morningTime = [data.moStartTime, data.moEndTime];
+        // }
+        // if (data.afStartTime !== "") {
+        //   this.afterTime = [data.afStartTime, data.afEndTime];
+        // }
+      } else {
+
+        this.$message.error(msg)
+      }
+    },
+
+
+    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+    initMap () {
+      // 定义地图中心点坐标
+      let { latitude, longitude } = this.$store.state.user;
+      console.log('lat' + latitude + ',lon' + longitude)
+
+      if (this.dataForm.latitude && this.dataForm.longitude) {
+        latitude = this.dataForm.latitude
+        longitude = this.dataForm.longitude
+      }
+      if (!latitude || latitude == "" || latitude == "0") {
+        latitude = 39.9088810666821;
+        longitude = 116.39743841556731;
+      }
+      var center = new window.TMap.LatLng(latitude, longitude)
+      // 定义map变量，调用 TMap.Map() 构造函数创建地图
+      map = new window.TMap.Map(document.getElementById("app_detail"), {
+        center: center, // 设置地图中心点坐标
+        zoom: 17.2, // 设置地图缩放级别
+        pitch: 43.5, // 设置俯仰角
+        rotation: 45, // 设置地图旋转角度
+      });
+      search = new window.TMap.service.Search({ pageSize: 10 });
+      // 新建一个地点搜索类
+      markers = new TMap.MultiMarker({
+        map: map,
+        geometries: [],
+      });
+      infoWindowList = Array(10);
+
+      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+
+      // 监听地图平移结束
+      map.on("panend", () => {
+        this.handleMoveCenter();
+      });
+      // this.handleMoveCenter()
+      this.convert();
+    },
+    handleMoveCenter () {
+      //修改地图中心点
+      const center = map.getCenter();
+      const lat = center.getLat();
+      const lng = center.getLng();
+      this.dataForm.latitude = lat;
+      this.dataForm.longitude = lng;
+      this.setMarker(lat, lng);
+      this.convert(lat, lng);
+    },
+    // 地图查询
+    handleSearchMap () {
+      infoWindowList.forEach((infoWindow) => {
+        infoWindow.close();
+      });
+      infoWindowList.length = 0;
+      markers.setGeometries([]);
+      // 在地图显示范围内以给定的关键字搜索地点
+      search
+        .searchRectangle({
+          keyword: this.dataForm.address,
+          bounds: map.getBounds(),
+        })
+        .then((result) => {
+          let { data } = result;
+          if (Array.isArray(data) && data.length > 0) {
+            const {
+              location: { lat, lng },
+            } = data[0];
+
+            map.setCenter(new TMap.LatLng(lat, lng));
+            this.setMarker(lat, lng);
+            this.dataForm.latitude = lat;
+            this.dataForm.longitude = lng;
+            this.convert();
+          } else {
+            this.$message.error("未检索到相关位置坐标");
+          }
+        });
+    },
+    convert (lat, lng) {
+      markers.setGeometries([]);
+      // var input = document.getElementById('location').value.split(',');
+      let location;
+      if (lat && lng) {
+        location = new TMap.LatLng(lat, lng);
+      } else {
+        location = new TMap.LatLng(
+          this.dataForm.latitude,
+          this.dataForm.longitude
+        );
+      }
+
+      // map.setCenter(location);
+      markers.updateGeometries([
+        {
+          id: "main", // 点标注数据数组
+          position: location,
+        },
+      ]);
+      geocoder
+        .getAddress({ location: location }) // 将给定的坐标位置转换为地址
+        .then((result) => {
+          this.dataForm.address =
+            this.dataForm.address !== "" &&
+              this.dataForm.address !== null &&
+              (this.dataForm.longitude === "" || this.dataForm.longitude === null)
+              ? this.dataForm.address
+              : result.result.address;
+          // 显示搜索到的地址
+          console.log(this.dataForm.address);
+        });
+    },
+
+    setMarker (lat, lng) {
+      markers.setGeometries([]);
+      markers.add([
+        {
+          id: "4",
+          styleId: "marker",
+          position: new TMap.LatLng(lat, lng),
+          properties: {
+            title: "marker4",
+          },
+        },
+      ]);
+    },
+
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+
+  },
+};
+</script>
+<style scoped>
+.data-block {
+  display: flex;
+}
+.time-block > div {
+  margin-bottom: 10px;
+}
+.time-block span {
+  padding: 10px;
+}
+.position_label >>> .el-form-item__label::before {
+  color: #fff !important;
+}
+.submit {
+  text-align: center;
+  margin: auto;
+}
+.form-class .el-input {
+  width: 75%;
+}
+.form-class .el-textarea {
+  width: 75% !important;
+}
+.time-class {
+  position: relative;
+}
+.time-class::before {
+  content: "*";
+  color: #f56c6c;
+  position: absolute;
+  left: 42px;
+  top: 10px;
+}
+</style>
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/detail-main.scss";
+</style>
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index 5c6faed83..fd7901f0b 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -1,37 +1,31 @@
 <template>
   <div class="div_main">
     <div class="div_search">
-      <el-form
-        :inline="true"
-        :model="dataForm"
-        @keyup.enter.native="loadTable()"
-      >
-        <el-form-item label="疫苗接种点名称" prop="name">
-          <el-input
-            v-model="dataForm.name"
-            placeholder="核酸检测点名称"
-            clearable
-          ></el-input>
+      <el-form :inline="true"
+               :model="dataForm"
+               label-width="110px"
+               @keyup.enter.native="loadTable()">
+        <el-form-item label="疫苗接种点名称"
+                      prop="name">
+          <el-input v-model="dataForm.name"
+                    placeholder="核酸检测点名称"
+                    clearable></el-input>
         </el-form-item>
-        <el-form-item label="咨询电话" prop="mobile">
-          <el-input
-            v-model="dataForm.mobile"
-            placeholder="咨询电话"
-            clearable
-          ></el-input>
+        <el-form-item label="咨询电话"
+                      prop="mobile">
+          <el-input v-model="dataForm.mobile"
+                    placeholder="咨询电话"
+                    clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button
-            class="diy-button--search"
-            size="small"
-            @click="loadTable()"
-            >{{ $t("query") }}</el-button
-          >
+          <el-button class="diy-button--search"
+                     size="small"
+                     @click="loadTable()">{{ $t("query") }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button size="small" class="diy-button--reset" @click="resetSearch"
-            >重置</el-button
-          >
+          <el-button size="small"
+                     class="diy-button--reset"
+                     @click="resetSearch">重置</el-button>
         </el-form-item>
         <!--<el-form-item>-->
         <!--<el-button type="danger" @click="deleteHandle()">{{-->
@@ -42,206 +36,164 @@
     </div>
     <div class="div_table">
       <div class="exportBtn">
-        <el-button
-          class="diy-button--add"
-          type="primary"
-          size="small"
-          @click="addOrUpdateHandle('', '新增接种点')"
-          >{{ $t("add") }}</el-button
-        >
-        <el-button
-          style="margin-left: 10px"
-          class="diy-button--export"
-          size="small"
-          @click="handleExportModule()"
-          >下载模板</el-button
-        >
+        <el-button class="diy-button--add"
+                   type="primary"
+                   size="small"
+                   @click="addOrUpdateHandle('', '新增接种点')">{{ $t("add") }}</el-button>
+        <el-button style="margin-left: 10px"
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule()">下载模板</el-button>
 
-        <el-upload :headers="$getElUploadHeaders()" 
-          style=""
-          ref="upload"
-          :multiple="false"
-          :show-file-list="false"
-          :before-upload="
+        <el-upload :headers="$getElUploadHeaders()"
+                   style=""
+                   ref="upload"
+                   :multiple="false"
+                   :show-file-list="false"
+                   :before-upload="
             (file) => {
               beforeUpload(file);
             }
           "
-          action=""
-          accept=".xls,.xlsx"
-          :http-request="
+                   action=""
+                   accept=".xls,.xlsx"
+                   :http-request="
             () => {
               uploadFile();
             }
-          "
-        >
-          <el-button
-            style="margin-left: 10px"
-            size="small"
-            class="diy-button--delete"
-            >导入</el-button
-          >
+          ">
+          <el-button style="margin-left: 10px"
+                     size="small"
+                     class="diy-button--delete">导入</el-button>
         </el-upload>
-        <el-button
-          style="float: left; margin-left: 10px"
-          class="diy-button--reset"
-          size="small"
-          @click="handleExport"
-          >导出</el-button
-        >
-        <el-button
-          style="margin-left: 15px"
-          class="diy-button--more"
-          size="small"
-          @click="handleSendNotice"
-          v-if="noticeVisible"
-          >发送通知</el-button
-        >
+        <el-button style="float: left; margin-left: 10px"
+                   class="diy-button--reset"
+                   size="small"
+                   @click="handleExport">导出</el-button>
+        <el-button style="margin-left: 15px"
+                   class="diy-button--more"
+                   size="small"
+                   @click="handleSendNotice"
+                   v-if="noticeVisible">发送通知</el-button>
       </div>
-      <el-table
-        v-loading="dataListLoading"
-        :data="dataList"
-        border
-        :row-key="row => { return row.id.toString() }"
-        :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
-        style="width: 100%; height: 564px;overflow: auto;"
-      >
-        <el-table-column
-          label="序号"
-          header-align="center"
-          align="center"
-          type="index"
-          width="50"
-        ></el-table-column>
-        <el-table-column
-          prop="name"
-          label="疫苗接种点名称"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="inoculationDate"
-          label="接种日期"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          label="上午接种时间"
-          header-align="center"
-          align="center"
-        >
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                :row-key="row => { return row.id.toString() }"
+                :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+                style="width: 100%; height: 564px;overflow: auto;">
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"></el-table-column>
+        <el-table-column prop="name"
+                         label="疫苗接种点名称"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="inoculationDate"
+                         label="接种日期"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column label="上午接种时间"
+                         header-align="center"
+                         align="center">
           <template slot-scope="scope">
             <div>{{ scope.row.moStartTime }} - {{ scope.row.moEndTime }}</div>
           </template>
         </el-table-column>
-        <el-table-column
-          label="下午接种时间"
-          header-align="center"
-          align="center"
-        >
+        <el-table-column label="下午接种时间"
+                         header-align="center"
+                         align="center">
           <template slot-scope="scope">
             <div>{{ scope.row.afStartTime }} - {{ scope.row.afEndTime }}</div>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="noAvailableVaccines"
-          label="暂无疫苗"
-          header-align="center"
-          width="100"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="mobile"
-          label="咨询电话"
-          header-align="center"
-          width="150"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="address"
-          label="接种点地址"
-          header-align="center"
-          align="center"
-          width="230"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          label="操作"
-          header-align="center"
-          align="center"
-          width="150"
-        >
+        <el-table-column prop="noAvailableVaccines"
+                         label="暂无疫苗"
+                         header-align="center"
+                         width="100"
+                         align="center"></el-table-column>
+        <el-table-column prop="mobile"
+                         label="咨询电话"
+                         header-align="center"
+                         width="150"
+                         align="center"></el-table-column>
+        <el-table-column prop="address"
+                         label="接种点地址"
+                         header-align="center"
+                         align="center"
+                         width="230"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column label="操作"
+                         header-align="center"
+                         align="center"
+                         width="150">
           <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              class="div-table-button--detail"
-              @click="addOrUpdateHandle(scope.row.id, '查看')"
-              >{{ "查看" }}</el-button
-            >
-            <el-button
-              type="text"
-              size="small"
-              class="div-table-button--edit"
-              @click="addOrUpdateHandle(scope.row.id, '修改')"
-              >{{ scope.row.longitude === null ? "待完善" : "修改" }}</el-button
-            >
-            <el-button
-              type="text"
-              size="small"
-              class="div-table-button--delete--noline"
-              @click="handleDelete(scope.row.id)"
-              >{{ $t("delete") }}</el-button
-            >
+            <el-button type="text"
+                       size="small"
+                       class="div-table-button--detail"
+                       @click="detailHandle(scope.row.id, '查看')">{{ "查看" }}</el-button>
+            <el-button type="text"
+                       size="small"
+                       class="div-table-button--edit"
+                       @click="addOrUpdateHandle(scope.row.id, '修改')">{{ scope.row.longitude === null ? "待完善" : "修改" }}</el-button>
+            <el-button type="text"
+                       size="small"
+                       class="div-table-button--delete--noline"
+                       @click="handleDelete(scope.row.id)">{{ $t("delete") }}</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <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>
     <!-- 弹窗, 新增 / 修改 -->
-    <el-dialog
-      :visible.sync="addOrUpdateVisible"
-      :title="dialogTitle"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :destroy-on-close="true"
-      width="850px"
-      top="5vh"
-      custom-class="dialog-h"
-    >
-      <add-or-update
-        ref="addOrUpdate"
-        @refreshDataList="loadTable"
-        @closeDialog="closeDialog"
-        :dialogTitle="dialogTitle"
-      ></add-or-update>
+    <el-dialog :visible.sync="addOrUpdateVisible"
+               :title="dialogTitle"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :destroy-on-close="true"
+               width="850px"
+               top="5vh"
+               custom-class="dialog-h">
+      <add-or-update ref="addOrUpdate"
+                     @refreshDataList="loadTable"
+                     @closeDialog="closeDialog"
+                     :dialogTitle="dialogTitle"></add-or-update>
+    </el-dialog>
+    <!-- 弹窗, 详情 -->
+    <el-dialog :visible.sync="detailShow"
+               :title="'详情'"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :destroy-on-close="true"
+               width="850px"
+               top="5vh"
+               @closed="diaDetailClose"
+               custom-class="dialog-h">
+      <detail ref="ref_detail"
+              @closeDialog="diaDetailClose"></detail>
     </el-dialog>
     <!-- 发送通知弹出框 -->
-    <el-dialog
-      :visible.sync="sendNoticeFormShow"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      title="发送通知"
-      width="850px"
-      top="5vh"
-      class="dialog-h"
-      @closed="diaClose"
-      :destroy-on-close="true"
-    >
-      <icpoint-noice
-        ref="ref_sendnotice"
-        @diaClose="diaClose"
-        :noticeOrigin="noticeOrigin"
-      ></icpoint-noice>
+    <el-dialog :visible.sync="sendNoticeFormShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               title="发送通知"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose"
+               :destroy-on-close="true">
+      <icpoint-noice ref="ref_sendnotice"
+                     @diaClose="diaClose"
+                     :noticeOrigin="noticeOrigin"></icpoint-noice>
     </el-dialog>
   </div>
 </template>
@@ -249,11 +201,12 @@
 <script>
 import mixinViewModule from "@/mixins/view-module";
 import AddOrUpdate from "./icpointvaccinesinoculation-add-or-update";
+import detail from "./icpointvaccinesinoculation-detail";
 import icpointNoice from "./icpointNoice";
-import { requestPost , requestGet} from "@/js/dai/request";
+import { requestPost, requestGet } from "@/js/dai/request";
 export default {
   mixins: [mixinViewModule],
-  data() {
+  data () {
     return {
       dataForm: {
         name: "",
@@ -267,19 +220,22 @@ export default {
       pageSize: 20,
       pageNo: 0,
       total: 0,
-      dataListLoading:false,
+      dataListLoading: false,
+
+      detailShow: false
     };
   },
   components: {
     AddOrUpdate,
     icpointNoice,
+    detail
   },
-  mounted() {
+  mounted () {
     this.loadTable();
     this.noticeFun();
   },
   methods: {
-    async loadTable() {
+    async loadTable () {
       this.dataListLoading = true;
       const url = "/epmetuser/icPointVaccinesInoculation/page";
       let params = {
@@ -288,7 +244,7 @@ export default {
         ...this.dataForm
       };
       const { data, code, msg } = await requestGet(url, params);
-      
+
       if (code === 0) {
         console.log(data.list);
         this.dataList = data.list;
@@ -298,16 +254,16 @@ export default {
       }
       this.dataListLoading = false;
     },
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       this.pageSize = val;
       this.pageNo = 1;
       this.loadTable();
     },
-    handleCurrentChange(val) {
+    handleCurrentChange (val) {
       this.pageNo = val;
       this.loadTable();
     },
-    async handleDelete(id) {
+    async handleDelete (id) {
       this.$confirm("确认删除?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -321,7 +277,7 @@ export default {
           }
         });
     },
-    async deleteNat(id) {
+    async deleteNat (id) {
       const url = "/epmetuser/icPointVaccinesInoculation/delete";
       let params = [id];
       const { data, code, msg } = await requestPost(url, params);
@@ -336,7 +292,7 @@ export default {
       }
     },
     //导出表格
-    async handleExport() {
+    async handleExport () {
       let title = "疫苗接种点";
 
       const url = "/epmetuser/icPointVaccinesInoculation/point-export";
@@ -353,7 +309,7 @@ export default {
       );
     },
     //重置搜索条件
-    resetSearch() {
+    resetSearch () {
       this.dataForm = {
         name: "",
         mobile: "",
@@ -361,15 +317,15 @@ export default {
       this.pageNo = 1;
     },
     // 发送通知
-    handleSendNotice() {
+    handleSendNotice () {
       this.sendNoticeFormShow = true;
     },
     // 关闭通知
-    diaClose() {
+    diaClose () {
       this.sendNoticeFormShow = false;
     },
     // 获取发送通知按钮显示与隐藏
-    noticeFun() {
+    noticeFun () {
       this.$http
         .post(`/epmetuser/icPointNucleicMonitoring/getShowType`)
         .then(({ data: res }) => {
@@ -377,10 +333,23 @@ export default {
             this.noticeVisible = true;
           }
         })
-        .catch(() => {});
+        .catch(() => { });
+    },
+    // 详情
+    detailHandle (id,) {
+      this.detailShow = true;
+      this.$nextTick(() => {
+
+        this.$refs.ref_detail.init(id);
+      });
+    },
+    diaDetailClose () {
+      console.log(this.$refs.ref_detail)
+      this.$refs.ref_detail.diaDestroy()
+      this.detailShow = false
     },
     // 新增 / 修改
-    addOrUpdateHandle(id, title) {
+    addOrUpdateHandle (id, title) {
       this.dialogTitle = title;
       this.$nextTick(() => {
         this.$refs.addOrUpdate.dataForm.id = id;
@@ -389,11 +358,11 @@ export default {
       this.addOrUpdateVisible = true;
     },
     // 关闭弹窗
-    closeDialog() {
+    closeDialog () {
       this.addOrUpdateVisible = false;
       this.dialogTitle = "";
     },
-    handleExportModule() {
+    handleExportModule () {
       let title = "疫苗接种点模板";
       let url = "/epmetuser/icPointVaccinesInoculation/exporttemplate";
 
@@ -411,7 +380,7 @@ export default {
       );
     },
     // 下载文件
-    download(data, fileName) {
+    download (data, fileName) {
       if (!data) {
         return;
       }
@@ -435,7 +404,7 @@ export default {
       }
     },
     // 上传文件之前的钩子
-    beforeUpload(file) {
+    beforeUpload (file) {
       this.files = file;
 
       const isText = file.type === "application/vnd.ms-excel";
@@ -453,7 +422,7 @@ export default {
         return true;
       }
     },
-    async uploadFile() {
+    async uploadFile () {
       if (this.fileName == "") {
         this.$message.warning("请选择要上传的文件！");
         return false;
@@ -491,7 +460,7 @@ export default {
           }
           this.loadTable();
         },
-        (rspMsg, data) => {},
+        (rspMsg, data) => { },
         { headers: { "Content-Type": "multipart/form-data" } }
       );
     },
diff --git a/src/views/modules/shequzhili/csgltc/csglDetail.vue b/src/views/modules/shequzhili/csgltc/csglDetail.vue
index 6220087e6..acc1443a2 100644
--- a/src/views/modules/shequzhili/csgltc/csglDetail.vue
+++ b/src/views/modules/shequzhili/csgltc/csglDetail.vue
@@ -48,11 +48,11 @@
 
         </div>
       </div>
-      <!-- <div class="div-btn">
+      <div class="div-btn">
         <el-button size="small"
                    @click="handleCancle">关 闭</el-button>
 
-      </div> -->
+      </div>
     </div>
 
   </div>
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue b/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue
index d486aa828..e1a66f803 100644
--- a/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue
@@ -51,11 +51,11 @@
       </div>
 
     </div>
-    <!-- <div class="div_btn">
+    <div class="div-btn">
       <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
+                 @click="handleCancle">关 闭</el-button>
 
-    </div> -->
+    </div>
   </div>
 </template>
 
diff --git a/src/views/modules/sys/icvaccineprarmeter-detail.vue b/src/views/modules/sys/icvaccineprarmeter-detail.vue
new file mode 100644
index 000000000..ee8190d6b
--- /dev/null
+++ b/src/views/modules/sys/icvaccineprarmeter-detail.vue
@@ -0,0 +1,244 @@
+<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-5">所属网格：</span>
+            <span>{{ dataForm.gridName||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-5">所属房屋：</span>
+            <span>{{ dataForm.villageName+dataForm.buildName+dataForm.unitName+dataForm.homeName||'--' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-5">户口性质：</span>
+            <span>{{ dataForm.householdTypeName||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-5">姓名：</span>
+            <span>{{ dataForm.name||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-5">联系电话：</span>
+            <span>{{ dataForm.mobile||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-5">证件号：</span>
+            <span>{{ dataForm.idCard||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-5">是否接种：</span>
+            <span>{{ dataForm.isVaccinationName||'--'  }}</span>
+          </div>
+          <div v-if="dataForm.isVaccination === '0'"
+               class="info-prop">
+            <span class="info-title-5">原因：</span>
+            <span>{{ dataForm.reason||'--'  }}</span>
+          </div>
+          <div v-if="dataForm.isVaccination === '1'"
+               class="info-prop">
+            <span class="info-title-5">第一次接种时间：</span>
+            <span>{{ dataForm.firstVacTime||'--'  }}</span>
+          </div>
+          <div v-if="dataForm.isVaccination === '1'"
+               class="info-prop">
+            <span class="info-title-5">第一次接种地点：</span>
+            <span>{{ dataForm.firstVacSite||'--'  }}</span>
+          </div>
+          <div v-if="dataForm.isVaccination === '1'"
+               class="info-prop">
+            <span class="info-title-5">第二次接种时间：</span>
+            <span>{{ dataForm.secondVacTime||'--'  }}</span>
+          </div>
+          <div v-if="dataForm.isVaccination === '1'"
+               class="info-prop">
+            <span class="info-title-5">第二次接种地点：</span>
+            <span>{{ dataForm.secondVacSite||'--'  }}</span>
+          </div>
+          <div v-if="dataForm.isVaccination === '1'"
+               class="info-prop">
+            <span class="info-title-5">第三次接种时间：</span>
+            <span>{{ dataForm.thirdVacTime||'--'  }}</span>
+          </div>
+          <div v-if="dataForm.isVaccination === '1'"
+               class="info-prop">
+            <span class="info-title-5">第三次接种地点：</span>
+            <span>{{ dataForm.thirdVacSite||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-5">备注：</span>
+            <span>{{ dataForm.note||'--'  }}</span>
+          </div>
+
+        </div>
+      </div>
+      <div class="div-btn">
+        <el-button size="small"
+                   @click="handleCancle">关 闭</el-button>
+
+      </div>
+
+    </div>
+  </div>
+  <!--  </el-dialog>-->
+</template>
+
+<script>
+
+import { requestGet } from '@/js/dai/request'
+
+import { Loading } from "element-ui";
+
+let loading; // 加载动画
+export default {
+  data () {
+    return {
+
+      initLoading: false,
+
+
+      household: [
+        { value: '0', label: '户籍' },
+        { value: '1', label: '外来' },
+      ],
+      isVaccinationOption: [
+        { value: '0', label: '否' },
+        { value: '1', label: '是' },
+      ],
+      vacSiteOption: [
+        { value: '本街道内接种', label: '本街道内接种' },
+        { value: '区内其他街道接种', label: '区内其他街道接种' },
+        { value: '区外其他地区接种', label: '区外其他地区接种' },
+      ],
+      reasonOption: [
+        { value: '禁忌症', label: '禁忌症' },
+        { value: '拒绝接种', label: '拒绝接种' },
+        { value: '其他原因', label: '其他原因' },
+      ],
+      dataForm: {
+        id: '',
+
+      },
+
+    }
+  },
+  computed: {
+
+
+  },
+  async mounted () {
+
+  },
+  methods: {
+    async init (row, isLook) {
+      this.startLoading()
+      const { user } = this.$store.state
+      this.agencyId = user.agencyId
+      if (row) {
+        this.dataForm.id = row.id
+      }
+      await this.getInfo()
+
+      this.initLoading = true
+
+      this.endLoading()
+    },
+
+    // 获取信息
+    async getInfo () {
+      const url = `/epmetuser/icVaccinePrarmeter/${this.dataForm.id}`
+
+      const { data, code, msg } = await requestGet(url)
+
+      if (code === 0) {
+        // debugger
+        this.dataForm = { ...data }
+
+        this.household.forEach(element => {
+          if (this.dataForm.householdType === element.value) {
+            this.dataForm.householdTypeName = element.label
+          }
+        });
+
+        this.isVaccinationOption.forEach(element => {
+          if (this.dataForm.isVaccination === element.value) {
+            this.dataForm.isVaccinationName = element.label
+          }
+        });
+
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    resetData () {
+      this.dataForm = {
+        id: '',
+        customerId: '',
+        gridId: '',
+        gridName: '',
+        agencyId: '',
+        pids: '',
+        villageId: '',
+        villageName: '',
+        buildId: '',
+        buildName: '',
+        unitId: '',
+        unitName: '',
+        homeId: '',
+        homeName: '',
+        householdType: '',
+        name: '',
+        mobile: '',
+        idCard: '',
+        isVaccination: '1',
+        firstVacTime: '',
+        firstVacSite: '',
+        secondVacTime: '',
+        secondVacSite: '',
+        thirdVacTime: '',
+        thirdVacSite: '',
+        reason: '',
+        note: '',
+        checkState: '0',
+        checkReason: ''
+      }
+    },
+
+    handleCancle () {
+      // this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    // 开启加载动画
+    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>
\ No newline at end of file
diff --git a/src/views/modules/sys/icvaccineprarmeter.vue b/src/views/modules/sys/icvaccineprarmeter.vue
index 6146e30f2..a64c8d934 100644
--- a/src/views/modules/sys/icvaccineprarmeter.vue
+++ b/src/views/modules/sys/icvaccineprarmeter.vue
@@ -1,24 +1,25 @@
 <template>
   <div class="resi-container">
-    <el-card ref="searchCard" class="search-card">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+    <el-card ref="searchCard"
+             class="search-card">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
         <div>
-          <el-form-item prop="gridId" label="所属网格" label-width="70px">
+          <el-form-item prop="gridId"
+                        label="所属网格"
+                        label-width="80px">
             <div class="resi-cell-value">
-              <el-select
-                      v-model.trim="dataForm.gridId"
-                      placeholder="请选择网格"
-                      size="small"
-                      clearable
-                      class="resi-cell-select"
-                      @change="handleChangeGrid"
-              >
-                <el-option
-                        v-for="item in optionsG"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                >
+              <el-select v-model.trim="dataForm.gridId"
+                         placeholder="请选择网格"
+                         size="small"
+                         clearable
+                         class="resi-cell-select"
+                         @change="handleChangeGrid">
+                <el-option v-for="item in optionsG"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
                 </el-option>
               </el-select>
             </div>
@@ -27,76 +28,60 @@
             <div class="resi-cell-value">
               <div class="resi-cell-col">
                 <el-form-item prop="villageId">
-                  <el-select
-                          v-model.trim="dataForm.villageId"
-                          placeholder="请选择小区"
-                          size="small"
-                          clearable
-                          class="resi-cell-select"
-                          @change="handleChangeV"
-                  >
-                    <el-option
-                            v-for="item in optionsV"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                    >
+                  <el-select v-model.trim="dataForm.villageId"
+                             placeholder="请选择小区"
+                             size="small"
+                             clearable
+                             class="resi-cell-select"
+                             @change="handleChangeV">
+                    <el-option v-for="item in optionsV"
+                               :key="item.value"
+                               :label="item.label"
+                               :value="item.value">
                     </el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item prop="buildId">
-                  <el-select
-                          v-model.trim="dataForm.buildId"
-                          placeholder="楼号"
-                          size="small"
-                          clearable
-                          :disabled="changeVDisabled"
-                          class="resi-cell-select resi-cell-select-middle"
-                          @change="handleChangeB"
-                  >
-                    <el-option
-                            v-for="item in optionsB"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                    >
+                  <el-select v-model.trim="dataForm.buildId"
+                             placeholder="楼号"
+                             size="small"
+                             clearable
+                             :disabled="changeVDisabled"
+                             class="resi-cell-select resi-cell-select-middle"
+                             @change="handleChangeB">
+                    <el-option v-for="item in optionsB"
+                               :key="item.value"
+                               :label="item.label"
+                               :value="item.value">
                     </el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item prop="unitId">
-                  <el-select
-                          v-model.trim="dataForm.unitId"
-                          placeholder="单元"
-                          size="small"
-                          clearable
-                          :disabled="changeBDisabled"
-                          class="resi-cell-select resi-cell-select-middle"
-                          @change="handleChangeD"
-                  >
-                    <el-option
-                            v-for="item in optionsD"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                    >
+                  <el-select v-model.trim="dataForm.unitId"
+                             placeholder="单元"
+                             size="small"
+                             clearable
+                             :disabled="changeBDisabled"
+                             class="resi-cell-select resi-cell-select-middle"
+                             @change="handleChangeD">
+                    <el-option v-for="item in optionsD"
+                               :key="item.value"
+                               :label="item.label"
+                               :value="item.value">
                     </el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item prop="homeId">
-                  <el-select
-                          v-model.trim="dataForm.homeId"
-                          placeholder="房号"
-                          size="small"
-                          clearable
-                          :disabled="changeDDisabled"
-                          class="resi-cell-select resi-cell-select-middle"
-                  >
-                    <el-option
-                            v-for="item in optionsH"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                    >
+                  <el-select v-model.trim="dataForm.homeId"
+                             placeholder="房号"
+                             size="small"
+                             clearable
+                             :disabled="changeDDisabled"
+                             class="resi-cell-select resi-cell-select-middle">
+                    <el-option v-for="item in optionsH"
+                               :key="item.value"
+                               :label="item.label"
+                               :value="item.value">
                     </el-option>
                   </el-select>
                 </el-form-item>
@@ -105,70 +90,82 @@
           </el-form-item>
         </div>
         <div>
-        <el-form-item label="姓名" prop="name" label-width="70px">
-          <el-input
-                  v-model="dataForm.name"
-                  placeholder="姓名"
-                  clearable
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="证件号" prop="idCard">
-          <el-input
-                  v-model="dataForm.idCard"
-                  placeholder="证件号"
-                  clearable
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="联系电话" prop="mobile">
-          <el-input
-                  v-model="dataForm.mobile"
-                  placeholder="联系电话"
-                  clearable
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="是否接种" prop="isVaccination">
-          <el-select v-model="dataForm.isVaccination" placeholder="是否接种" clearable>
-            <el-option v-for="item in isVaccinationArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button class="diy-button--search" size="small" @click="getDataList()">{{ $t('query') }}</el-button>
-          <el-button class="diy-button--reset" size="small" @click="resetForm()">重置</el-button
-          >
-        </el-form-item>
+          <el-form-item label="姓名"
+                        prop="name"
+                        label-width="80px">
+            <el-input v-model="dataForm.name"
+                      placeholder="姓名"
+                      clearable></el-input>
+          </el-form-item>
+          <el-form-item label="证件号"
+                        prop="idCard">
+            <el-input v-model="dataForm.idCard"
+                      placeholder="证件号"
+                      clearable></el-input>
+          </el-form-item>
+          <el-form-item label="联系电话"
+                        prop="mobile">
+            <el-input v-model="dataForm.mobile"
+                      placeholder="联系电话"
+                      clearable></el-input>
+          </el-form-item>
+          <el-form-item label="是否接种"
+                        prop="isVaccination">
+            <el-select v-model="dataForm.isVaccination"
+                       placeholder="是否接种"
+                       clearable>
+              <el-option v-for="item in isVaccinationArr"
+                         :key="item.dictValue"
+                         :label="item.dictName"
+                         :value="item.dictValue">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button class="diy-button--search"
+                       size="small"
+                       @click="getDataList()">{{ $t('query') }}</el-button>
+            <el-button class="diy-button--reset"
+                       size="small"
+                       @click="resetForm()">重置</el-button>
+          </el-form-item>
         </div>
       </el-form>
-      </el-card>
-      <el-card class="resi-card-table">
-        <div class="resi-row-btn">
-
-          <el-button class="diy-button--add" type="primary" size="small" @click="handleAdd">{{ $t('add') }}</el-button>
-          <el-button class="diy-button--export" size="small" @click="handleExportModule()">下载模板</el-button>
-          <el-upload :headers="$getElUploadHeaders()" 
-                  ref="upload"
-                  class="upload-btn"
-                  :multiple="false"
-                  :show-file-list="false"
-                  :before-upload="
+    </el-card>
+    <el-card class="resi-card-table">
+      <div class="resi-row-btn">
+
+        <el-button class="diy-button--add"
+                   type="primary"
+                   size="small"
+                   @click="handleAdd">{{ $t('add') }}</el-button>
+        <el-button class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule()">下载模板</el-button>
+        <el-upload :headers="$getElUploadHeaders()"
+                   ref="upload"
+                   class="upload-btn"
+                   :multiple="false"
+                   :show-file-list="false"
+                   :before-upload="
             (file) => {
               beforeUpload(file);
             }
           "
-                  action=""
-                  accept=".xls,.xlsx"
-                  :http-request="
+                   action=""
+                   accept=".xls,.xlsx"
+                   :http-request="
             () => {
               uploadFile();
             }
-          "
-          >
-            <el-button
-                    size="small"
-                    class="diy-button--delete">导入</el-button>
-          </el-upload>
-          <el-button class="diy-button--reset" size="small" @click="handleExport">导出</el-button>
-        </div>
+          ">
+          <el-button size="small"
+                     class="diy-button--delete">导入</el-button>
+        </el-upload>
+        <el-button class="diy-button--reset"
+                   size="small"
+                   @click="handleExport">导出</el-button>
+      </div>
       <el-table v-loading="dataListLoading"
                 :data="dataList"
                 border
@@ -176,94 +173,224 @@
                 @selection-change="dataListSelectionChangeHandle"
                 style="width: 100%;"
                 :height="maxTableHeight">
-        <el-table-column label="序号" header-align="center" align="center" width="50px">
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         width="50px">
           <template slot-scope="scope">
             {{scope.$index+1}}
           </template>
         </el-table-column>
-        <el-table-column prop="gridName" label="网格名称" header-align="center" align="center" width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="villageName" label="所属小区" header-align="center" align="center" width="130" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="buildName" label="所属楼宇" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="unitName" label="单元" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="homeName" label="房间名" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="householdTypeName" label="户口性质" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="name" label="姓名" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="mobile" label="联系电话" header-align="center" align="center" width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="idCard" label="证件号" header-align="center" align="center" width="170" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="isVaccinationName" label="是否接种" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="firstVacTime" label="第一次接种时间" header-align="center" align="center" width="110" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="firstVacSite" label="第一次接种地点" header-align="center" align="center" width="110" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="secondVacTime" label="第二次接种时间" header-align="center" align="center" width="110" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="secondVacSite" label="第二次接种地点" header-align="center" align="center" width="110" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="thirdVacTime" label="第三次接种时间" header-align="center" align="center" width="110" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="thirdVacSite" label="第三次接种地点" header-align="center" align="center" width="110" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="reason" label="原因" header-align="center" align="center" width="110" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="note" label="备注" header-align="center" align="center" width="110" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="checkStateName" label="审核状态" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="checkReason" label="审核理由" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="170">
+        <el-table-column prop="gridName"
+                         label="网格名称"
+                         header-align="center"
+                         align="center"
+                         width="120"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="villageName"
+                         label="所属小区"
+                         header-align="center"
+                         align="center"
+                         width="130"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="buildName"
+                         label="所属楼宇"
+                         header-align="center"
+                         align="center"
+                         width="80"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="unitName"
+                         label="单元"
+                         header-align="center"
+                         align="center"
+                         width="80"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="homeName"
+                         label="房间名"
+                         header-align="center"
+                         align="center"
+                         width="80"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="householdTypeName"
+                         label="户口性质"
+                         header-align="center"
+                         align="center"
+                         width="80"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="name"
+                         label="姓名"
+                         header-align="center"
+                         align="center"
+                         width="80"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="mobile"
+                         label="联系电话"
+                         header-align="center"
+                         align="center"
+                         width="120"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="idCard"
+                         label="证件号"
+                         header-align="center"
+                         align="center"
+                         width="170"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="isVaccinationName"
+                         label="是否接种"
+                         header-align="center"
+                         align="center"
+                         width="80"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="firstVacTime"
+                         label="第一次接种时间"
+                         header-align="center"
+                         align="center"
+                         width="110"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="firstVacSite"
+                         label="第一次接种地点"
+                         header-align="center"
+                         align="center"
+                         width="110"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="secondVacTime"
+                         label="第二次接种时间"
+                         header-align="center"
+                         align="center"
+                         width="110"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="secondVacSite"
+                         label="第二次接种地点"
+                         header-align="center"
+                         align="center"
+                         width="110"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="thirdVacTime"
+                         label="第三次接种时间"
+                         header-align="center"
+                         align="center"
+                         width="110"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="thirdVacSite"
+                         label="第三次接种地点"
+                         header-align="center"
+                         align="center"
+                         width="110"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="reason"
+                         label="原因"
+                         header-align="center"
+                         align="center"
+                         width="110"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="note"
+                         label="备注"
+                         header-align="center"
+                         align="center"
+                         width="110"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="checkStateName"
+                         label="审核状态"
+                         header-align="center"
+                         align="center"
+                         width="80"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="checkReason"
+                         label="审核理由"
+                         header-align="center"
+                         align="center"
+                         width="80"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column :label="$t('handle')"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         width="170">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.checkState === '0'" type="text" size="small" class="div-table-button--edit" @click="handleEdit(scope.$index)">{{ $t('update') }}</el-button>
-            <el-button v-if="scope.row.checkState !== '2'"type="text" size="small" class="div-table-button--delete--noline" @click="handleDelete(scope.row.id)">{{ $t('delete') }}</el-button>
-            <el-button v-if="scope.row.checkState === '0'" type="text" class="div-table-button--detail" size="small" @click="handleWatch(scope.row)">审核</el-button>
-            <el-button type="text" class="div-table-button--detail" size="small" @click="handleLook(scope.$index)">查看</el-button>
+            <el-button v-if="scope.row.checkState === '0'"
+                       type="text"
+                       size="small"
+                       class="div-table-button--edit"
+                       @click="handleEdit(scope.$index)">{{ $t('update') }}</el-button>
+            <el-button v-if="scope.row.checkState !== '2'"
+                       type="text"
+                       size="small"
+                       class="div-table-button--delete--noline"
+                       @click="handleDelete(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button v-if="scope.row.checkState === '0'"
+                       type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleWatch(scope.row)">审核</el-button>
+            <el-button type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleLook(scope.$index)">查看</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
+      <el-pagination :current-page="page"
+                     :page-sizes="[10, 20, 50, 100]"
+                     :page-size="limit"
+                     :total="total"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     @size-change="pageSizeChangeHandle"
+                     @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
-<!--      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>-->
-<!--      <icvaccineprarmeter-check v-if="checkVisible" ref="checkPage" @refreshDataList="getDataList"></icvaccineprarmeter-check>-->
-  </el-card>
-
-  <el-dialog :visible.sync="checkVisible"
-             :close-on-click-modal="false"
-             :close-on-press-escape="false"
-             :title="formTitle"
-             width="850px"
-             top="5vh"
-             class="dialog-h"
-             @closed="addDiaClose">
-    <add-or-update ref="add_parameter"
-               @dialogCancle="addDiaClose"
-               @dialogOk="addFormOk">
-    </add-or-update>
-  </el-dialog>
-      <!-- 审核 -->
-      <el-dialog
-        :visible.sync="formShow"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        :title="formTitle_shenhe"
-        width="900px"
-        top="5vh"
-        class="dialog-h"
-        @closed="diaClose"
-      >
-        <icvaccineprarmeter-check
-          ref="icvaccineprarmeter_check"
-          @dialogCancle="addFormCancle"
-          @dialogOk="addFormOk_shenhe"
-        ></icvaccineprarmeter-check>
-      </el-dialog>
+      <!--      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>-->
+      <!--      <icvaccineprarmeter-check v-if="checkVisible" ref="checkPage" @refreshDataList="getDataList"></icvaccineprarmeter-check>-->
+    </el-card>
+
+    <el-dialog :visible.sync="checkVisible"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="formTitle"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="addDiaClose">
+      <add-or-update ref="add_parameter"
+                     @dialogCancle="addDiaClose"
+                     @dialogOk="addFormOk">
+      </add-or-update>
+    </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="diaDetailClose">
+      <detail ref="ref_detail"
+              @dialogCancle="diaDetailClose">
+      </detail>
+    </el-dialog>
+    <!-- 审核 -->
+    <el-dialog :visible.sync="formShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="formTitle_shenhe"
+               width="900px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <icvaccineprarmeter-check ref="icvaccineprarmeter_check"
+                                @dialogCancle="addFormCancle"
+                                @dialogOk="addFormOk_shenhe"></icvaccineprarmeter-check>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './icvaccineprarmeter-add-or-update'
+import detail from './icvaccineprarmeter-detail'
 import nextTick from "dai-js/tools/nextTick";
-import { requestPost , requestGet} from "@/js/dai/request";
+import { requestPost, requestGet } from "@/js/dai/request";
 import IcvaccineprarmeterCheck from './icvaccineprarmeter-check'
-import {mapGetters} from "vuex";
+import { mapGetters } from "vuex";
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -275,530 +402,537 @@ export default {
         deleteIsBatch: true
       },
       dataForm: {
-          id: '',
-          gridId: '',
-          villageId: '',
-          buildId: '',
-          unitId: '',
-          homeId: '',
-          name: '',
-          idCard: '',
-          mobile: '',
-          isVaccination: ''
-      },
-        isVaccinationArr: [
-            { dictValue: '0', dictName: '否' },
-            { dictValue: '1', dictName: '是' }
-        ],
-        optionsV: [],
-        optionsB: [],
-        optionsH: [],
-        optionsD: [],
-        optionsG: [],
-        checkVisible: false,
-        formTitle:"新增",
-        // 审核
-        formShow: false,
-        formTitle_shenhe: "审核",
-        // 审核 end
+        id: '',
+        gridId: '',
+        villageId: '',
+        buildId: '',
+        unitId: '',
+        homeId: '',
+        name: '',
+        idCard: '',
+        mobile: '',
+        isVaccination: ''
+      },
+      isVaccinationArr: [
+        { dictValue: '0', dictName: '否' },
+        { dictValue: '1', dictName: '是' }
+      ],
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+      optionsG: [],
+      checkVisible: false,
+      formTitle: "新增",
+      // 审核
+      formShow: false,
+      formTitle_shenhe: "审核",
+      // 审核 end
+      detailShow: false
     }
   },
   components: {
     AddOrUpdate,
-    IcvaccineprarmeterCheck
+    IcvaccineprarmeterCheck,
+    detail
   },
-  computed:{
-      maxTableHeight() {
-        return this.$store.state.inIframe
-            ? this.clientHeight - 360 + this.iframeHeigh
-            : this.clientHeight - 360;
-      },
-     ...mapGetters(["clientHeight", "iframeHeight"]),
-      changeVDisabled() {
-          return !this.dataForm.villageId
-      },
-      changeBDisabled() {
-          return !this.dataForm.buildId
-      },
-      changeDDisabled() {
-          return !this.dataForm.unitId
-      }
+  computed: {
+    maxTableHeight () {
+      return this.$store.state.inIframe
+        ? this.clientHeight - 360 + this.iframeHeigh
+        : this.clientHeight - 360;
+    },
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+    changeVDisabled () {
+      return !this.dataForm.villageId
+    },
+    changeBDisabled () {
+      return !this.dataForm.buildId
+    },
+    changeDDisabled () {
+      return !this.dataForm.unitId
+    }
   },
-  mounted() {
-      this.getGridList()
-      this.getValiheList()
+  mounted () {
+    this.getGridList()
+    this.getValiheList()
   },
-  methods:{
-      // 审核 s
-      diaClose() {
-        // this.$refs.icvaccineprarmeter_check.resetData();
-        this.formShow = false;
-      },
-      addFormCancle() {
-        this.formShow = false;
-      },
-      addFormOk_shenhe() {
-        this.formShow = false;
-        this.getDataList();
-      },
-      // 审核 end
-      //新增
-      handleAdd() {
-        this.formTitle = "新增";
-        this.checkVisible = true;
-        this.$nextTick(() => {
-          this.$refs.add_parameter.init();
+  methods: {
+    // 审核 s
+    diaClose () {
+      // this.$refs.icvaccineprarmeter_check.resetData();
+      this.formShow = false;
+    },
+    addFormCancle () {
+      this.formShow = false;
+    },
+    addFormOk_shenhe () {
+      this.formShow = false;
+      this.getDataList();
+    },
+    // 审核 end
+    //新增
+    handleAdd () {
+      this.formTitle = "新增";
+      this.checkVisible = true;
+      this.$nextTick(() => {
+        this.$refs.add_parameter.init();
+      });
+      // await this.$refs.ref_form_add.init();
+    },
+    async handleEdit (rowIndex) {
+      this.formTitle = "修改";
+      this.checkVisible = true;
+      await nextTick();
+      this.$refs.add_parameter.init(this.dataList[rowIndex]);
+    },
+    async handleDelete (id) {
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.deleteNat(id);
+        })
+        .catch((err) => {
+          if (err == "cancel") {
+          }
         });
-        // await this.$refs.ref_form_add.init();
-      },
-      async handleEdit(rowIndex) {
-        this.formTitle = "修改";
-        this.checkVisible = true;
-        await nextTick();
-        this.$refs.add_parameter.init(this.dataList[rowIndex]);
-      },
-      async handleDelete(id) {
-          this.$confirm("确认删除?", "提示", {
-              confirmButtonText: "确定",
-              cancelButtonText: "取消",
-              type: "warning",
+    },
+    async deleteNat (id) {
+      const url = "/epmetuser/icVaccinePrarmeter/delete";
+      let params = [id];
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "删除成功",
+        });
+        this.getDataList();
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    // 审核
+    async handleWatch (row) {
+      await nextTick();
+      const url = "/gov/org/ichouse/checkHomeInfo";
+
+      const { data, code, msg } = await requestPost(url, {
+        gridId: row.gridId,
+        gridName: row.gridName,
+        villageName: row.villageName,
+        buildName: row.buildName,
+        unitName: row.unitName,
+        homeName: row.homeName,
+      });
+
+      if (code === 0) {
+        console.log("data----de", data);
+        if (data.code === '1') {
+          this.$message.success(data.msg);
+        } else {
+          // 打开审核页面
+          // this.checkVisible = true
+          // this.$nextTick(() => {
+          //     this.$refs.checkPage.dataForm.id = row.id
+          //     // 是否新增房屋：0：否；1：是
+          //     this.$refs.checkPage.isAdd = data.isAdd
+          //     // 单元ID
+          //     this.$refs.checkPage.unitId = data.unitId
+          //     this.$refs.checkPage.init()
+          // })
+          // 打开审核页面
+          this.formShow = true;
+          this.$nextTick(() => {
+            this.$refs.icvaccineprarmeter_check.initForm("add", row.id, data.isAdd, data.unitId, data);
+            // this.$refs.checkPage.dataForm.id = row.id
+            // // 是否新增房屋：0：否；1：是
+            // this.$refs.checkPage.isAdd = data.isAdd
+            // // 单元ID
+            // this.$refs.checkPage.unitId = data.unitId
+            // this.$refs.checkPage.init()
           })
-              .then(() => {
-                  this.deleteNat(id);
-              })
-              .catch((err) => {
-                  if (err == "cancel") {
-                  }
-              });
-      },
-      async deleteNat(id) {
-          const url = "/epmetuser/icVaccinePrarmeter/delete";
-          let params = [id];
-          const { data, code, msg } = await requestPost(url, params);
-          if (code === 0) {
-              this.$message({
-                  type: "success",
-                  message: "删除成功",
-              });
-              this.getDataList();
-          } else {
-              this.$message.error(msg);
-          }
-      },
-      // 审核
-      async handleWatch(row) {
-          await nextTick();
-          const url = "/gov/org/ichouse/checkHomeInfo";
-
-          const { data, code, msg } = await requestPost(url, {
-              gridId: row.gridId,
-              gridName: row.gridName,
-              villageName: row.villageName,
-              buildName: row.buildName,
-              unitName: row.unitName,
-              homeName: row.homeName,
-          });
-
-          if (code === 0) {
-              console.log("data----de", data);
-              if(data.code === '1'){
-                  this.$message.success(data.msg);
-              }else{
-                  // 打开审核页面
-                  // this.checkVisible = true
-                  // this.$nextTick(() => {
-                  //     this.$refs.checkPage.dataForm.id = row.id
-                  //     // 是否新增房屋：0：否；1：是
-                  //     this.$refs.checkPage.isAdd = data.isAdd
-                  //     // 单元ID
-                  //     this.$refs.checkPage.unitId = data.unitId
-                  //     this.$refs.checkPage.init()
-                  // })
-                  // 打开审核页面
-                  this.formShow = true;
-                  this.$nextTick(() => {
-                      this.$refs.icvaccineprarmeter_check.initForm("add", row.id, data.isAdd, data.unitId, data);
-                      // this.$refs.checkPage.dataForm.id = row.id
-                      // // 是否新增房屋：0：否；1：是
-                      // this.$refs.checkPage.isAdd = data.isAdd
-                      // // 单元ID
-                      // this.$refs.checkPage.unitId = data.unitId
-                      // this.$refs.checkPage.init()
-                  })
-              }
+        }
 
 
 
 
 
 
+      } else {
+        this.$message.success("操作失败！");
+      }
+    },
+
+    async handleLook (rowIndex) {
+      // this.formTitle = "查看";
+      this.detailShow = true;
+      this.$nextTick(() => {
+        this.$refs.ref_detail.init(this.dataList[rowIndex], true);
+      })
+
+    },
+    diaDetailClose () {
+      this.detailShow = false
+    },
+    handleClearVillage () {
+      this.dataForm.buildId = ''
+      this.dataForm.homeId = ''
+    },
+    handleClearBuild () {
+      this.dataForm.buildId = ''
+      this.dataForm.unitId = ''
+      this.dataForm.homeId = ''
+    },
+    handleClearDan () {
+      this.dataForm.unitId = ''
+      this.dataForm.homeId = ''
+    },
+    handleChangeGrid (val) {
+      console.log('val', val)
+      this.dataForm.villageId = ''
+      this.dataForm.buildId = ''
+      this.dataForm.unitId = ''
+      this.dataForm.homeId = ''
+      this.getValiheList()
+    },
+    handleChangeV (val) {
+      console.log('val', val)
+      this.dataForm.buildId = ''
+      this.dataForm.unitId = ''
+      this.dataForm.homeId = ''
+      this.getBuildList()
+    },
+    handleChangeB (val) {
+      console.log('val', val)
+      this.dataForm.unitId = ''
+      this.dataForm.homeId = ''
+      this.getUniList()
+    },
+    handleChangeD (val) {
+      console.log('val', val)
+      this.dataForm.homeId = ''
+      this.getHouseList()
+    },
+    addFormOk () {
+      this.checkVisible = false;
+      this.getDataList();
+    },
+    addDiaClose () {
+      this.checkVisible = false;
+      this.$refs.add_parameter.resetData()
+    },
+    getGridList () {
+      const { user } = this.$store.state
+      this.$http
+        .post('/gov/org/customergrid/gridoption', {
+          agencyId: user.agencyId,
+          purpose: 'addorupdate'
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
           } else {
-              this.$message.success("操作失败！");
+            console.log('获取查询详情成功', res.data)
+            this.optionsG = res.data
           }
-      },
-
-      async handleLook(rowIndex) {
-          this.formTitle = "查看";
-          this.checkVisible = true;
-          await nextTick();
-          this.$refs.add_parameter.init(this.dataList[rowIndex],true);
-      },
-      handleClearVillage() {
-          this.dataForm.buildId = ''
-          this.dataForm.homeId = ''
-      },
-      handleClearBuild() {
-          this.dataForm.buildId = ''
-          this.dataForm.unitId = ''
-          this.dataForm.homeId = ''
-      },
-      handleClearDan() {
-          this.dataForm.unitId = ''
-          this.dataForm.homeId = ''
-      },
-      handleChangeGrid(val) {
-          console.log('val', val)
-          this.dataForm.villageId = ''
-          this.dataForm.buildId = ''
-          this.dataForm.unitId = ''
-          this.dataForm.homeId = ''
-          this.getValiheList()
-      },
-      handleChangeV(val) {
-          console.log('val', val)
-          this.dataForm.buildId = ''
-          this.dataForm.unitId = ''
-          this.dataForm.homeId = ''
-          this.getBuildList()
-      },
-      handleChangeB(val) {
-          console.log('val', val)
-          this.dataForm.unitId = ''
-          this.dataForm.homeId = ''
-          this.getUniList()
-      },
-      handleChangeD(val) {
-          console.log('val', val)
-          this.dataForm.homeId = ''
-          this.getHouseList()
-      },
-      addFormOk () {
-        this.checkVisible = false;
-        this.getDataList();
-      },
-      addDiaClose () {
-        this.checkVisible = false;
-        this.$refs.add_parameter.resetData()
-      },
-      getGridList() {
-          const { user } = this.$store.state
-          this.$http
-              .post('/gov/org/customergrid/gridoption', {
-                  agencyId: user.agencyId,
-                  purpose: 'addorupdate'
-              })
-              .then(({ data: res }) => {
-                  if (res.code !== 0) {
-                      return this.$message.error(res.msg)
-                  } else {
-                      console.log('获取查询详情成功', res.data)
-                      this.optionsG = res.data
-                  }
-              })
-              .catch(() => {
-                  return this.$message.error('网络错误')
-              })
-      },
-      getValiheList() {
-          const { user } = this.$store.state
-          this.$http
-              .post('/gov/org/icneighborhood/neighborhoodoption', {
-                  gridId: this.dataForm.gridId,
-                  agencyId: ''
-                  // agencyId: user.agencyId
-              })
-              .then(({ data: res }) => {
-                  if (res.code !== 0) {
-                      return this.$message.error(res.msg)
-                  } else {
-                      console.log('获取查询详情成功', res.data)
-                      this.optionsV = res.data
-                  }
-              })
-              .catch(() => {
-                  return this.$message.error('网络错误')
-              })
-      },
-      getBuildList() {
-          this.$http
-              .post('/gov/org/icbuilding/buildingoption', {
-                  neighborHoodId: this.dataForm.villageId
-              })
-              .then(({ data: res }) => {
-                  if (res.code !== 0) {
-                      return this.$message.error(res.msg)
-                  } else {
-                      console.log('获取查询详情成功', res.data)
-                      this.optionsB = res.data
-                  }
-              })
-              .catch(() => {
-                  return this.$message.error('网络错误')
-              })
-      },
-      getUniList() {
-          this.$http
-              .post('/gov/org/icbuildingunit/unitoption', {
-                  buildingId: this.dataForm.buildId
-              })
-              .then(({ data: res }) => {
-                  if (res.code !== 0) {
-                      return this.$message.error(res.msg)
-                  } else {
-                      console.log('获取查询详情成功', res.data)
-                      this.optionsD = res.data
-                  }
-              })
-              .catch(() => {
-                  return this.$message.error('网络错误')
-              })
-      },
-      getHouseList() {
-          this.$http
-              .post('/gov/org/ichouse/houseoption', { unitId: this.dataForm.unitId })
-              .then(({ data: res }) => {
-                  if (res.code !== 0) {
-                      return this.$message.error(res.msg)
-                  } else {
-                      console.log('获取查询详情成功', res.data)
-                      this.optionsH = res.data
-                  }
-              })
-              .catch(() => {
-                  return this.$message.error('网络错误')
-              })
-      },
-      //重置搜索条件
-      resetForm() {
-          this.dataForm = {
-              gridId: '',
-              villageId: '',
-              buildId: '',
-              unitId: '',
-              homeId: '',
-              name: '',
-              idCard: '',
-              mobile: '',
-              isVaccination: ''
-          };
-          this.pageNo = 1
-          this.getDataList()
-      },
-      // 上传文件之前的钩子
-      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("请选择正确格式的文件");
-              this.files = null;
-              this.fileName = "";
-              return false;
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getValiheList () {
+      const { user } = this.$store.state
+      this.$http
+        .post('/gov/org/icneighborhood/neighborhoodoption', {
+          gridId: this.dataForm.gridId,
+          agencyId: ''
+          // agencyId: user.agencyId
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
           } else {
-              this.fileName = file.name;
-              return true;
+            console.log('获取查询详情成功', res.data)
+            this.optionsV = res.data
           }
-      },
-      async uploadFile() {
-          if (this.fileName == "") {
-              this.$message.warning("请选择要上传的文件！");
-              return false;
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getBuildList () {
+      this.$http
+        .post('/gov/org/icbuilding/buildingoption', {
+          neighborHoodId: this.dataForm.villageId
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsB = res.data
           }
-
-          this.$message({
-              showClose: true,
-              message: "导入中，请到系统管理-导入记录中查看进度",
-              duration: 0,
-          });
-
-          //清空上传列表
-          this.$refs["upload"].clearFiles();
-          let url = "";
-
-          let fileFormData = new FormData();
-          fileFormData.append("file", this.files); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-
-          url = "/epmetuser/icVaccinePrarmeter/importFile";
-
-          window.app.ajax.post2(
-              url,
-              fileFormData,
-              (data, rspMsg) => {
-                  if (data.code === 0 && data.msg == "success") {
-                      // this.$message.success('导入成功')
-                  } else {
-                      // this.$message({
-                      //   showClose: true,
-                      //   message: rspMsg,
-                      //   duration: 0,
-                      //   type: "error"
-                      // })
-                      // this.$message.error(rspMsg)
-                  }
-                  this.loadTable();
-              },
-              (rspMsg, data) => {},
-              { headers: { "Content-Type": "multipart/form-data" } }
-          );
-      },
-      //导出表格
-      async handleExport() {
-          let title = "新冠病毒疫苗接种人员信息台账";
-
-          const url = "/epmetuser/icVaccinePrarmeter/vaccine-export";
-
-          app.ajax.exportFilePost(
-              url,
-              this.dataForm,
-              (data, rspMsg) => {
-                  console.log(data)
-                  this.download(data, title + ".xlsx");
-              },
-              (rspMsg, data) => {
-                  this.$message.error(rspMsg);
-              }
-          );
-      },
-      // 下载文件
-      download(data, fileName) {
-          if (!data) {
-              return;
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getUniList () {
+      this.$http
+        .post('/gov/org/icbuildingunit/unitoption', {
+          buildingId: this.dataForm.buildId
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsD = res.data
           }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getHouseList () {
+      this.$http
+        .post('/gov/org/ichouse/houseoption', { unitId: this.dataForm.unitId })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsH = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    //重置搜索条件
+    resetForm () {
+      this.dataForm = {
+        gridId: '',
+        villageId: '',
+        buildId: '',
+        unitId: '',
+        homeId: '',
+        name: '',
+        idCard: '',
+        mobile: '',
+        isVaccination: ''
+      };
+      this.pageNo = 1
+      this.getDataList()
+    },
+    // 上传文件之前的钩子
+    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("请选择正确格式的文件");
+        this.files = null;
+        this.fileName = "";
+        return false;
+      } else {
+        this.fileName = file.name;
+        return true;
+      }
+    },
+    async uploadFile () {
+      if (this.fileName == "") {
+        this.$message.warning("请选择要上传的文件！");
+        return false;
+      }
 
-          var csvData = new Blob([data]);
+      this.$message({
+        showClose: true,
+        message: "导入中，请到系统管理-导入记录中查看进度",
+        duration: 0,
+      });
 
-          if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-              window.navigator.msSaveOrOpenBlob(csvData, fileName);
-          }
-          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);
+      //清空上传列表
+      this.$refs["upload"].clearFiles();
+      let url = "";
+
+      let fileFormData = new FormData();
+      fileFormData.append("file", this.files); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+
+      url = "/epmetuser/icVaccinePrarmeter/importFile";
+
+      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)
           }
-      },
-      handleExportModule() {
-          let title = "新冠病毒疫苗接种人员信息台账模板";
-          let url = "/epmetuser/icVaccinePrarmeter/exporttemplate";
-
-          let params = {};
-
-          app.ajax.exportFilePost(
-              url,
-              params,
-              (data, rspMsg) => {
-                  this.download(data, title + ".xls");
-              },
-              (rspMsg, data) => {
-                  this.$message.error(rspMsg);
-              }
-          );
-      },
+          this.loadTable();
+        },
+        (rspMsg, data) => { },
+        { headers: { "Content-Type": "multipart/form-data" } }
+      );
+    },
+    //导出表格
+    async handleExport () {
+      let title = "新冠病毒疫苗接种人员信息台账";
+
+      const url = "/epmetuser/icVaccinePrarmeter/vaccine-export";
+
+      app.ajax.exportFilePost(
+        url,
+        this.dataForm,
+        (data, rspMsg) => {
+          console.log(data)
+          this.download(data, title + ".xlsx");
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+    },
+    // 下载文件
+    download (data, fileName) {
+      if (!data) {
+        return;
+      }
+
+      var csvData = new Blob([data]);
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName);
+      }
+      else {
+        var a = document.createElement("a");
+        document.body.appendChild(a);
+        a.style = "display: none";
+        var url = window.URL.createObjectURL(csvData);
+        a.href = url;
+        a.download = fileName;
+        a.click();
+        a.remove();
+        window.URL.revokeObjectURL(url);
+      }
+    },
+    handleExportModule () {
+      let title = "新冠病毒疫苗接种人员信息台账模板";
+      let url = "/epmetuser/icVaccinePrarmeter/exporttemplate";
+
+      let params = {};
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+          this.download(data, title + ".xls");
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+    },
 
   }
 }
 </script>
 <style lang="scss" scoped>
-  @import '@/assets/scss/buttonstyle.scss';
-  @import "@/assets/scss/modules/visual/communityManage.scss";
-  @import "@/assets/scss/modules/management/list-main.scss";
-
-  .resi-container .resi-card-table {
-    ::v-deep .el-table th {
-      color: #fff;
-      background-color: rgba(33, 149, 254, 1);
-      // border-right: 1px solid rgba(33, 149, 254, 1);
-    }
-  }
-  .resi-table {
-    ::v-deep .el-button--text {
-      text-decoration: underline;
-    }
+@import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/visual/communityManage.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
+
+.resi-container .resi-card-table {
+  ::v-deep .el-table th {
+    color: #fff;
+    background-color: rgba(33, 149, 254, 1);
+    // border-right: 1px solid rgba(33, 149, 254, 1);
   }
-  .resi-card-table {
-    margin-top: 20px;
+}
+.resi-table {
+  ::v-deep .el-button--text {
+    text-decoration: underline;
   }
-  .resi-row-btn {
-    margin-bottom: 13px;
-    .upload-btn {
-      display: inline-block;
-      margin: 0 10px;
-    }
+}
+.resi-card-table {
+  margin-top: 20px;
+}
+.resi-row-btn {
+  margin-bottom: 13px;
+  .upload-btn {
+    display: inline-block;
+    margin: 0 10px;
   }
+}
 
-  .resi-btns {
-    margin-top: 20px;
-    text-align: center;
-  }
+.resi-btns {
+  margin-top: 20px;
+  text-align: center;
+}
 
-  .resi-container .resi-card {
-    position: relative;
-    overflow: visible;
-  }
+.resi-container .resi-card {
+  position: relative;
+  overflow: visible;
+}
 
-  .demo-form-inline {
-    // display: flex;
-    // align-items: center;
-    // margin-bottom: 20px;
-
-    .resi-cell-label {
-      flex-shrink: 0;
-      min-width: 0;
-      box-sizing: border-box;
-      margin-right: 15px;
-      // text-align: right;
-      // line-height: 32;
-    }
-    .resi-cell-label1 {
-      width: max-content;
-    }
-    .resi-cell-value-radio {
-      display: flex;
-      align-items: center;
-      min-height: 32px;
-    }
-    .resi-cell-input {
-      width: 200px;
-    }
-    .resi-cell--daterange {
-      max-width: 260px;
-    }
-    .resi-cell-select {
-      width: 200px;
-      box-sizing: border-box;
-      margin-right: 10px;
-      &-middle {
-        width: 120px;
-      }
-      &-small {
-        width: 88px;
-      }
+.demo-form-inline {
+  // display: flex;
+  // align-items: center;
+  // margin-bottom: 20px;
+
+  .resi-cell-label {
+    flex-shrink: 0;
+    min-width: 0;
+    box-sizing: border-box;
+    margin-right: 15px;
+    // text-align: right;
+    // line-height: 32;
+  }
+  .resi-cell-label1 {
+    width: max-content;
+  }
+  .resi-cell-value-radio {
+    display: flex;
+    align-items: center;
+    min-height: 32px;
+  }
+  .resi-cell-input {
+    width: 200px;
+  }
+  .resi-cell--daterange {
+    max-width: 260px;
+  }
+  .resi-cell-select {
+    width: 200px;
+    box-sizing: border-box;
+    margin-right: 10px;
+    &-middle {
+      width: 120px;
     }
-    .resi-cell-select:last-child {
-      margin-right: 0;
+    &-small {
+      width: 88px;
     }
   }
-
-  .mt10 {
-    margin-top: 10px;
+  .resi-cell-select:last-child {
+    margin-right: 0;
   }
+}
+
+.mt10 {
+  margin-top: 10px;
+}
 </style>
diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseList.vue b/src/views/modules/visual/basicinfo/houseStatic/houseList.vue
index 17fbd6709..3a09220fe 100644
--- a/src/views/modules/visual/basicinfo/houseStatic/houseList.vue
+++ b/src/views/modules/visual/basicinfo/houseStatic/houseList.vue
@@ -37,7 +37,7 @@
               <div class="td td1">{{item.doorName}} </div>
               <div class="td td1">{{item.houseType==='1'?'楼房':item.houseType==='2'?'平方':'别墅'}} </div>
               <div class="td td1">{{item.purpose}} </div>
-              <div class="td td1">{{item.rentFlag==='1'?'出租':item.rentFlag==='0'?'自住':item.rentFlag==='2'?'闲置':'未出售'}} </div>
+              <div class="td td1">{{item.rentFlag}} </div>
               <div class="td td1">{{item.ownerName}} </div>
               <div class="td td2">{{item.ownerPhone}} </div>
               <div class="td td2">{{item.ownerIdCard}} </div>
diff --git a/src/views/modules/workSys/dataOpenConfig.vue b/src/views/modules/workSys/dataOpenConfig.vue
new file mode 100644
index 000000000..e8bdad7a5
--- /dev/null
+++ b/src/views/modules/workSys/dataOpenConfig.vue
@@ -0,0 +1,389 @@
+<template>
+  <div class="resi-container">
+    <el-card class="resi-card-table">
+      <div class="mod-sys__menu">
+        <el-table class="table"
+                  ref="ref_table"
+                  :data="dataList"
+                  border
+                  :height="tableHeight"
+                  v-loading="dataListLoading"
+                  :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                  style="width: 100%">
+          <el-table-column label="序号"
+                           header-align="center"
+                           align="center"
+                           type="index"
+                           width="50"></el-table-column>
+
+          <el-table-column prop="deptName"
+                           header-align="center"
+                           align="center"
+                           label="部门"
+                           min-width="100">
+          </el-table-column>
+          <el-table-column prop="dataName"
+                           header-align="center"
+                           align="center"
+                           label="数据名称"
+                           min-width="110">
+          </el-table-column>
+
+          <el-table-column label="操作"
+                           fixed="right"
+                           header-align="center"
+                           align="center"
+                           width="350">
+            <template slot-scope="scope">
+              <el-switch v-model="scope.row.stateShow"
+                         @change="disableCategory(scope.row,scope.$index)">
+              </el-switch>
+
+              <el-button type="text"
+                         size="small"
+                         class="div-table-button--edit"
+                         style="margin-left:20px"
+                         @click="editShow(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-card>
+
+    <!-- 修改弹出框 -->
+    <el-dialog :visible.sync="formShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'数据更新配置'"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <div class="div_form">
+        <el-form ref="ref_form"
+                 :inline="true"
+                 :model="formData">
+
+          <el-form-item label="部门"
+                        label-width="150px"
+                        style="display: block">
+           <span>{{selRow.deptName}}</span>
+          </el-form-item>
+          <el-form-item label="数据名称"
+                        label-width="150px"
+                        style="display: block">
+           <span>{{selRow.dataName}}</span>
+          </el-form-item>
+          <el-form-item label="适用范围"
+                        label-width="150px"
+                        style="display: block">
+            <el-cascader class="item_width_1"
+                         ref="myCascader"
+                         v-model="orgIdArray"
+                         :key="iscascaderShow"
+                         :options="casOptions"
+                         :props="optionProps"
+                         :show-all-levels="false"
+                         @change="handleChangeScope"></el-cascader>
+
+          </el-form-item>
+
+        </el-form>
+      </div>
+
+      <div class="div-btn">
+        <el-button size="small"
+                   @click="diaClose">取 消</el-button>
+        <el-button size="small"
+                   type="primary"
+                   @click="editDiaOK">确 定</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+
+import { requestPost } from '@/js/dai/request'
+
+import { mapGetters } from 'vuex'
+export default {
+
+  data () {
+    return {
+      customerId: '', // 客户id，父组件传
+      customerName: '', // 客户名称，父组件传
+
+      tableParams: {
+        customerId: ''
+      },
+      // tableHeight: 500,
+      search: '',
+      dataList: [],
+
+      dataListLoading: false,
+      total: 0,
+      pageSize: 20,
+      pageNo: 0,
+
+      casOptions: [],
+      iscascaderShow: 0,
+      orgIdArray: [],
+      selCateObj: {},
+      optionProps: {
+        multiple: true,
+        value: 'agencyId',
+        label: 'agencyName',
+        orgType: 'orgType',
+        children: 'subAgencyList',
+        checkStrictly: true
+      },
+
+      formShow: false,
+      formData: {},
+
+      scopeList: [],
+      dataSyncConfigId: '',
+      selRow:{}
+    }
+  },
+
+  computed: {
+
+    tableHeight () {
+      const h = this.clientHeight - 220 + this.iframeHeigh
+      const _h = this.clientHeight - 220
+      return this.$store.state.inIframe ? h : _h
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  components: {
+
+  },
+  created () {
+
+  },
+  async mounted () {
+    await this.loadData()
+    await this.getOrgList()
+  },
+  methods: {
+    cellStyle ({ row, column, rowIndex, columnIndex }) {
+      // 状态列字体颜色
+      if (row.state === 'enable' && columnIndex === 1) {
+        return 'color: #EA1B29'
+      } else if (row.state === 'disable' && columnIndex === 1) {
+        return 'color: #0CB618'
+      } else {
+        return 'color: #1a1a1b'
+      }
+    },
+
+    diaClose () {
+      this.formShow = false
+    },
+
+    async getOrgList () {
+
+      // const url = '/gov/org/customeragency/my-subagency-list'
+      const url = '/gov/org/customeragency/agencylist'
+
+      let params = {};
+
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+
+        //组织级联数据
+        ++this.iscascaderShow
+        this.casOptions = []
+        this.orgIdArray.length = []
+
+        if (data) {
+          this.casOptions.push(data)
+
+        }
+
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    // 加载列表数据
+    async loadData () {
+      this.dataListLoading = true
+      // const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/dataSyncConfig/list'
+      const url = '/epmetuser/dataSyncConfig/list'
+
+      this.tableParams = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo
+      }
+
+      const { data, code, msg } = await requestPost(url, this.tableParams)
+      this.dataListLoading = false
+      if (code === 0) {
+        this.total = data.total
+        this.dataList = data.list
+        this.dataList.forEach(element => {
+
+          element.stateShow = element.switchStatus === 'open' ? true : false
+
+        })
+      } else {
+        // this.$message.error(msg )
+      }
+    },
+
+    handleChangeScope (value) {
+      // console.log('value', value)
+
+      this.orgIdArray = value
+      this.scopeList = []
+      let selArray = this.$refs["myCascader"].getCheckedNodes()
+
+      // console.log('selArray', selArray)
+
+      selArray.forEach((element, index) => {
+
+        let obj = {
+          orgId: element.data.agencyId,
+          orgType: element.data.level,
+          orgIdPath: element.path.join(':'),
+
+        }
+        this.scopeList.push(obj)
+      });
+
+      console.log('this.scopeList', this.scopeList)
+
+    },
+
+    // 开启/启用
+    disableCategory (row, index) {
+      row.switchStatusShow = row.switchStatus === 'open' ? '关闭' : '开启'
+      this.$confirm('确认' + row.switchStatusShow, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const url = '/epmetuser/dataSyncConfig/configSwitch'
+        // const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/dataSyncConfig/configSwitch'
+        const param = {
+          deptCode: row.deptCode,
+          dataSyncConfigId: row.id,
+
+        }
+        window.app.ajax.post(url, param,
+          (data, rspMsg) => {
+            // row.switchStatus = 'open'
+            // row.switchStatus = true
+            // this.$set(this.dataList, index, row)
+
+            this.$message.success('操作成功')
+            this.loadData()
+          },
+          (rspMsg, data) => {
+            this.$message.error(rspMsg)
+          })
+      }).catch(() => {
+
+      })
+    },
+
+
+    // 编辑 customerId,parentCategoryId,dateform
+    editShow (row) {
+      this.selRow=row
+      this.dataSyncConfigId = row.id
+
+      this.orgIdArray = []
+      row.scopeList.forEach(element => {
+        if (element.orgIdPath) {
+          this.orgIdArray.push(element.orgIdPath.split(':'))
+        }
+
+      });
+
+      this.formShow = true
+
+    },
+
+    async editDiaOK () {
+      // const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/dataSyncConfig/scopeSave'
+      const url = '/epmetuser/dataSyncConfig/scopeSave'
+
+      let params = {
+        dataSyncConfigId: this.dataSyncConfigId,
+        scopeList: this.scopeList
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.formShow = false
+        this.loadData()
+      } else {
+        // this.$message.error(msg )
+      }
+    },
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadData()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadData()
+    },
+
+    // 取消
+    diaCancel () {
+      this.$emit('cancleBack')
+    },
+
+
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.div_form {
+  height: 300px;
+  padding-top: 50px;
+}
+.item_width_1 {
+  width: 500px;
+}
+.div-btn {
+  margin-top: 50px;
+  // margin-bottom:20px;
+  display: flex;
+  justify-content: center;
+
+  .item_btn {
+    font-size: 14px;
+    padding: 8px 16px;
+    cursor: pointer;
+    color: #fff;
+
+    border: 1px dashed #0c81fe;
+    border-radius: 6px;
+    background-color: #0c81fe;
+  }
+}
+</style>