diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js
index dcfabd2ed..079ac1386 100644
--- a/src/mixins/view-module.js
+++ b/src/mixins/view-module.js
@@ -102,14 +102,6 @@ export default {
       this.page = 1
       this.query()
     },
-    // 新增 / 修改
-    addOrUpdateHandle (id) {
-      this.addOrUpdateVisible = true
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.dataForm.id = id
-        this.$refs.addOrUpdate.init()
-      })
-    },
     // 删除
     deleteHandle (id) {
       if (this.mixinViewModuleOptions.deleteIsBatch && !id && this.dataListSelections.length <= 0) {
diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index d3cd78337..8860180f7 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -2188,7 +2188,12 @@ export default {
             document.getElementById("con").innerHTML = '当前点击坐标为：<span id="pos"></span>'
             var position = document.getElementById("pos");
 
-            var center = new window.TMap.LatLng(this.latitude, this.longitude);//设置中心点坐标
+            if(this.latitude === null || this.latitude === "" || this.longitude === null || this.longitude === ""){
+                var center = new window.TMap.LatLng(36.116796, 120.339959);
+            }else {
+                var center = new window.TMap.LatLng(this.latitude, this.longitude);//设置中心点坐标
+            }
+
             //初始化地图
             var map = new window.TMap.Map("con", {
                 center: center
diff --git a/src/views/modules/plugins/change/resideath.vue b/src/views/modules/plugins/change/resideath.vue
index cf791d50b..df96eb706 100644
--- a/src/views/modules/plugins/change/resideath.vue
+++ b/src/views/modules/plugins/change/resideath.vue
@@ -442,7 +442,14 @@ export default {
         userId: this.rowData.icResiUserId,
         joinReason: this.blacklistReason,
         welfareFlag: this.welfareFlag,
-          deathDate: this.deathDate
+        deathDate: this.deathDate
+      }
+      if (this.deathDate === '') {
+        this.$message({
+          message: '请选择死亡日期',
+          type:'warning'
+        })
+        return false
       }
       this.$http.post('/epmetuser/rentDeath/save', params).then(({ data: res }) => {
         if (res.code !== 0) {
diff --git a/src/views/modules/plugins/point/icpointNoice.vue b/src/views/modules/plugins/point/icpointNoice.vue
new file mode 100644
index 000000000..03f8b24e9
--- /dev/null
+++ b/src/views/modules/plugins/point/icpointNoice.vue
@@ -0,0 +1,174 @@
+<template>
+  <div class="epidemic-form">
+    <div class="dialog-h-content scroll-h">
+      <el-form
+        ref="ref_form1"
+        :inline="true"
+        :model="formData"
+        :rules="dataRule"
+        class="form"
+      >
+        <el-form-item
+          label="通知渠道"
+          prop="isSelChannel"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>小程序通知</span>
+          <!-- <el-checkbox v-model="formData.isSelChannel"
+                       key="0"
+                       label="0">小程序通知</el-checkbox> -->
+          <!-- <el-checkbox-group v-model="formData.channel">
+            <el-checkbox key="1"
+                         label="1">小程序通知</el-checkbox>
+            <el-checkbox key="2"
+                         label="2">短信通知</el-checkbox>
+
+          </el-checkbox-group> -->
+        </el-form-item>
+
+        <el-form-item
+          label="通知内容"
+          prop="content"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            type="textarea"
+            maxlength="500"
+            show-word-limit
+            :autosize="{ minRows: 10, maxRows: 15 }"
+            clearable
+            placeholder="请输入通知内容"
+            v-model="formData.content"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <div class="form_div_btn">
+      <el-button size="small" @click="handleCancle">取 消</el-button>
+      <el-button
+        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'
+
+let loading; // 加载动画
+export default {
+  data() {
+    return {
+      btnDisable: false,
+      formData: {
+        origin: null,
+        isSelChannel: false,
+        channel: [],
+        content: "",
+      },
+    };
+  },
+  props:{
+    noticeOrigin:{
+      type:String,
+      default:null
+    }
+  },
+  components: {},
+  mounted() {
+    this.formData.origin = this.noticeOrigin
+  },
+  methods: {
+    handleCancle() {
+      this.$emit("diaClose");
+    },
+    async handleComfirm() {
+      this.formData.channel = ["0"];
+
+      if (!this.formData.content) {
+        this.$message({
+          type: "warning",
+          message: "请填写通知内容",
+        });
+        return false;
+      }
+
+      this.btnDisable = true;
+      setTimeout(() => {
+        this.btnDisable = false;
+      }, 5000);
+
+      let url = "";
+
+      url = "/epmetuser/icNotice/sendPointNotice";
+
+      const { data, code, msg } = await requestPost(url, this.formData);
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "操作成功",
+        });
+        this.resetData();
+        this.btnDisable = false;
+        this.handleCancle();
+      } else {
+        this.btnDisable = false;
+        this.$message.error(msg);
+      }
+    },
+    resetData() {
+      this.formData = {
+        origin: null,
+        isSelChannel: false,
+        channel: [],
+        content: "",
+      };
+    },
+
+    // 开启加载动画
+    startLoading() {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
+    },
+    // 结束加载动画
+    endLoading() {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close();
+      }
+    },
+  },
+  computed: {
+    dataRule() {
+      return {
+        channel: [
+          { required: true, message: "通知渠道不能为空", trigger: "blur" },
+        ],
+        content: [
+          { required: true, message: "通知内容不能为空", trigger: "blur" },
+        ],
+      };
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+</style>
+
+
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
new file mode 100644
index 000000000..6b3a98ca8
--- /dev/null
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
@@ -0,0 +1,464 @@
+<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"
+          >
+          </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>
+      <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>
+      <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"
+      >
+        <div>
+          <!-- <el-input
+            class="item_width_4"
+            maxlength="50"
+            placeholder="例:青岛市时代国际广场"
+            v-model="keyWords"
+            style="width: 200px"
+            :disabled='dialogTitle == "查看"'
+          >
+          </el-input>
+          <el-button
+            style="margin-left: 10px"
+            type="primary"
+            size="small"
+            @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">
+            <span>经度</span>
+            <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>
+          </div>
+        </div>
+      </el-form-item>
+    </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
+      >
+    </div>
+  </div>
+</template>
+
+<script>
+import debounce from "lodash/debounce";
+var map;
+var search;
+var markers;
+var geocoder;
+var infoWindowList;
+export default {
+  data() {
+    return {
+      dataForm: {
+        id: "",
+        customerId: "",
+        orgId: "",
+        orgName: "",
+        pid: "",
+        pids: "",
+        name: "",
+        serveTime: "",
+        mobile: "",
+        address: "",
+        longitude: '',
+        latitude: '',
+      },
+      keyWords: null,
+      organizationList: [],
+    };
+  },
+  computed: {
+    dataRule() {
+      return {
+        customerId: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        orgId: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        orgName: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        name: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        serveTime: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        mobile: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        address: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        longitude: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        latitude: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+      };
+    },
+  },
+  created() {
+    this.getFormInfo();
+  },
+  props: {
+    dialogTitle: {
+      type: String,
+      default: "",
+    },
+  },
+  methods: {
+    closeSubmit() {
+      this.$emit("closeDialog");
+    },
+    orgChangeHandle(val) {
+      for (var i = 0; i < this.organizationList.length; i++) {
+        if (this.organizationList[i].orgId === val) {
+          this.dataForm.orgName = this.organizationList[i].orgName;
+          return false;
+        }
+      }
+    },
+    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+    initMap() {
+      let { latitude, longitude } = this.$store.state.user;
+      // 定义地图中心点坐标
+      if (!latitude || latitude == "" || latitude == "0") {
+        latitude = 39.9088810666821;
+        longitude = 116.39743841556731;
+      }
+      console.log(latitude,longitude);
+      var center = new window.TMap.LatLng(latitude, longitude);
+      // 定义map变量，调用 TMap.Map() 构造函数创建地图
+      map = new window.TMap.Map(document.getElementById("map_add"), {
+        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",
+          },
+        },
+      ]);
+    },
+    // 获取所属组织列表
+    getFormInfo() {
+      this.$http
+        .post(`/gov/org/agency/communityListByCustomerId`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.organizationList = res.data;
+        })
+        .catch(() => {});
+    },
+    init() {
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        if (this.dataForm.id) {
+          this.getInfo();
+        } else {
+
+          this.initMap();
+        }
+      });
+    },
+
+    // 获取信息
+    getInfo() {
+      this.$http
+        .get(`/epmetuser/icPointNucleicMonitoring/${this.dataForm.id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.dataForm = {
+            ...this.dataForm,
+            ...res.data,
+          };
+          this.initMap();
+        })
+        .catch(() => {});
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(
+      function () {
+        this.$refs["dataForm"].validate((valid) => {
+          if (!valid) {
+            return false;
+          }
+          this.$http[!this.dataForm.id ? "post" : "put"](
+            "/epmetuser/icPointNucleicMonitoring/",
+            this.dataForm
+          )
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                return this.$message.error(res.internalMsg ? res.internalMsg : res.msg);
+              }
+              this.$message({
+                message: this.$t("prompt.success"),
+                type: "success",
+                duration: 500,
+                onClose: () => {
+                  this.$emit("refreshDataList");
+                  this.closeSubmit();
+                },
+              });
+            })
+            .catch(() => {});
+        });
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+    //限制
+    check_num: function () {
+      this.dataForm.mobile = this.dataForm.mobile.replace(
+        /[^\a-\z\A-\Z0-9]/g,
+        ""
+      );
+    },
+  },
+};
+</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>
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
new file mode 100644
index 000000000..a4bbccfcf
--- /dev/null
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -0,0 +1,544 @@
+<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-cascader>
+        </el-form-item>
+        <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>
+        <el-form-item>
+          <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-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-upload
+          style=""
+          ref="upload"
+          :multiple="false"
+          :show-file-list="false"
+          :before-upload="
+            (file) => {
+              beforeUpload(file);
+            }
+          "
+          action=""
+          accept=".xls,.xlsx"
+          :http-request="
+            () => {
+              uploadFile();
+            }
+          "
+        >
+          <el-button
+            style="margin-left: 10px"
+            size="small"
+            class="diy-button--delete"
+            >导入</el-button
+          >
+        </el-upload>
+        <el-button
+          style="float: left; margin-left: 10px"
+          class="diy-button--reset"
+          size="small"
+          @click="handleExport"
+          >导出</el-button
+        >
+        <!--<el-button 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
+        >
+      </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
+          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
+            >
+          </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>
+    </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>
+    <!-- 发送通知弹出框 -->
+    <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>
+
+<script>
+import mixinViewModule from "@/mixins/view-module";
+import AddOrUpdate from "./icpointnucleicmonitoring-add-or-update";
+import icpointNoice from "./icpointNoice";
+import { requestPost , requestGet} from "@/js/dai/request";
+export default {
+  mixins: [mixinViewModule],
+  data() {
+    return {
+      dataForm: {
+        name: "",
+        mobile: "",
+        orgId: "",
+      },
+      organizationList: [],
+      orgIds: [],
+      dialogTitle: "",
+      sendNoticeFormShow: false,
+      noticeVisible: false,
+      noticeOrigin: "3",
+      pageSize: 20,
+      pageNo: 0,
+      total: 0,
+      dataListLoading:false
+    };
+  },
+  components: {
+    AddOrUpdate,
+    icpointNoice,
+  },
+  created() {
+    this.loadTable()
+    this.noticeFun();
+    this.getFormInfo();
+  },
+  methods: {
+    async loadTable() {
+      this.dataListLoading = true;
+      const url = "/epmetuser/icPointNucleicMonitoring/page";
+      let params = {
+        limit: this.pageSize,
+        page: this.pageNo,
+        ...this.dataForm
+      };
+      const { data, code, msg } = await requestGet(url, params);
+
+      if (code === 0) {
+        console.log(data.list);
+        this.dataList = data.list;
+        this.total = data.total;
+      } else {
+        this.$message.error(msg);
+      }
+      this.dataListLoading = false;
+    },
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.pageNo = 1;
+      this.loadTable();
+    },
+    handleCurrentChange(val) {
+      this.pageNo = val;
+      this.loadTable();
+    },
+    async handleDelete(id) {
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.deleteNat(id);
+        })
+        .catch((err) => {
+          if (err == "cancel") {
+          }
+        });
+    },
+    async deleteNat(id) {
+      const url = "/epmetuser/icPointNucleicMonitoring/delete";
+      let params = [id];
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "删除成功",
+        });
+        this.loadTable();
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    //导出表格
+    async handleExport() {
+      let title = "核酸检测点";
+
+      const url = "/epmetuser/icPointNucleicMonitoring/point-export";
+
+      app.ajax.exportFilePost(
+        url,
+        this.dataForm,
+        (data, rspMsg) => {
+          this.download(data, title + ".xlsx");
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+    },
+    //重置搜索条件
+    resetSearch() {
+      this.dataForm = {
+        name: "",
+        mobile: "",
+        orgId: "",
+      };
+      this.pageNo = 1;
+      this.orgIds = [];
+    },
+    // 发送通知
+    handleSendNotice() {
+      this.sendNoticeFormShow = true;
+    },
+    // 关闭通知
+    diaClose() {
+      this.sendNoticeFormShow = false;
+    },
+    // 新增 / 修改
+    addOrUpdateHandle(id, title) {
+      this.dialogTitle = title;
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.dataForm.id = id;
+        this.$refs.addOrUpdate.init();
+      });
+      this.addOrUpdateVisible = true;
+    },
+    // 关闭弹窗
+    closeDialog() {
+      this.addOrUpdateVisible = false;
+      this.dialogTitle = "";
+    },
+    // 获取所属组织列表
+    getFormInfo() {
+      this.$http
+        .post(`/gov/org/agency/getOrgTreeListByCustomerId`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.organizationList = res.data;
+          this.deleteChildren(this.organizationList);
+        })
+        .catch(() => {});
+    },
+    // 获取发送通知按钮显示与隐藏
+    noticeFun() {
+      this.$http
+        .post(`/epmetuser/icPointNucleicMonitoring/getShowType`)
+        .then(({ data: res }) => {
+          if (res.code === 0 && res.data) {
+            this.noticeVisible = true;
+          }
+        })
+        .catch(() => {});
+    },
+    deleteChildren(arr) {
+      let childs = arr;
+      for (let i = childs.length; i--; i > 0) {
+        if (childs[i].children) {
+          if (childs[i].children.length) {
+            this.deleteChildren(childs[i].children);
+          } else {
+            delete childs[i].children;
+          }
+        }
+      }
+      return arr;
+    },
+    orgChangeHandle() {
+      this.dataForm.orgId = this.orgIds[this.orgIds.length - 1];
+      console.log(this.dataForm);
+    },
+    handleExportModule() {
+      let title = "核酸检测点模板";
+      let url = "/epmetuser/icPointNucleicMonitoring/exporttemplate";
+
+      let params = {};
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+          this.download(data, title + ".xls");
+        },
+        (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);
+      }
+    },
+    // 上传文件之前的钩子
+    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;
+      }
+
+      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/icPointNucleicMonitoring/pointImport";
+
+      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" } }
+      );
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/visual/communityManage.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
+.exportBtn {
+  display: flex;
+  align-items: center;
+  margin-bottom: 20px;
+  margin-top: 10px;
+  margin-left: 10px;
+}
+.div_left_table {
+  margin-top: 10px;
+  margin-left: 15px;
+  background-color: #ffffff;
+  border-radius: 5px;
+  padding: 10px;
+}
+.dialog-h >>> .el-dialog__body {
+  overflow: scroll;
+}
+</style>
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
new file mode 100644
index 000000000..d33f449a2
--- /dev/null
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -0,0 +1,601 @@
+<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"
+    >
+      <!--<el-form-item label="所属组织名称" prop="orgName">-->
+      <!--<el-select v-model="dataForm.orgName" placeholder="所属组织名称">-->
+      <!--<el-option-->
+      <!--v-for="item in organizationList"-->
+      <!--:key="item.value"-->
+      <!--:label="item.label"-->
+      <!--:value="item.value"-->
+      <!--&gt;-->
+      <!--</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>
+      <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>
+          </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>
+            </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>
+            </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>
+      <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>
+      <el-form-item
+        label="位置坐标"
+        class="position_label"
+        prop="longitude"
+        style="display: block"
+      >
+        <div>
+          <!-- <el-input
+            class="item_width_4"
+            maxlength="50"
+            placeholder="例:青岛市时代国际广场"
+            v-model="keyWords"
+            style="width: 200px"
+            :disabled='dialogTitle == "查看"'
+          >
+          </el-input>
+          <el-button
+            style="margin-left: 10px"
+            type="primary"
+            size="small"
+            @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">
+            <span>经度</span>
+            <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>
+          </div>
+        </div>
+      </el-form-item>
+    </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
+      >
+    </div>
+  </div>
+</template>
+
+<script>
+import debounce from "lodash/debounce";
+var map;
+var search;
+var markers;
+var geocoder;
+var infoWindowList;
+export default {
+  data() {
+    return {
+      visible: false,
+      dataForm: {
+        id: "",
+        customerId: "",
+        orgId: "",
+        orgName: "",
+        pid: "",
+        pids: "",
+        name: "",
+        inoculationDate: "",
+        moStartTime: "",
+        moEndTime: "",
+        afStartTime: "",
+        afEndTime: "",
+        noAvailableVaccines: "1",
+        mobile: "",
+        address: "",
+        longitude: "",
+        latitude: "",
+      },
+      keyWords: null,
+      // organizationList: [],
+      morningTime: null,
+      afterTime: null,
+    };
+  },
+  computed: {
+    dataRule() {
+      return {
+        customerId: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        name: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        noAvailableVaccines: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        mobile: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        address: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        longitude: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        latitude: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+      };
+    },
+  },
+  props: {
+    dialogTitle: {
+      type: String,
+      default: "",
+    },
+  },
+  methods: {
+    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));
+        let minute_0 = Number(this.morningTime[0].substring(3, 5));
+        let minute_1 = Number(this.morningTime[1].substring(3, 5));
+        let second_0 = Number(this.morningTime[0].substring(6, 8));
+        let second_1 = Number(this.morningTime[1].substring(6, 8));
+        if (hour_0 > 12 || hour_1 > 12) {
+          this.$message.error("请选择00:00-12:00时间段的时间");
+          this.morningTime = null;
+          return false;
+        }
+        if (hour_0 == 12) {
+          if (minute_0 > 0 || second_0 > 0) {
+            this.$message.error("请选择00:00-12:00时间段的时间");
+            this.morningTime = null;
+            return false;
+          }
+        }
+        if (hour_1 == 12) {
+          if (minute_1 > 0 || second_1 > 0) {
+            this.$message.error("请选择00:00-12:00时间段的时间");
+            this.morningTime = null;
+            return false;
+          }
+        }
+        this.dataForm.moStartTime = this.morningTime[0];
+        this.dataForm.moEndTime = this.morningTime[1];
+      }
+    },
+    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));
+        let minute_0 = Number(this.afterTime[0].substring(3, 5));
+        let minute_1 = Number(this.afterTime[1].substring(3, 5));
+        let second_0 = Number(this.afterTime[0].substring(6, 8));
+        let second_1 = Number(this.afterTime[1].substring(6, 8));
+        if (hour_0 < 12 || hour_1 < 12) {
+          this.$message.error("请选择12:01-23:59时间段的时间");
+          this.afterTime = null;
+          return false;
+        }
+        if (hour_0 == 12) {
+          if (minute_0 == 0 && second_0 == 0) {
+            this.$message.error("请选择12:01-23:59时间段的时间");
+            this.afterTime = null;
+            return false;
+          }
+        }
+        if (hour_1 == 12) {
+          if (minute_1 == 0 && second_1 == 0) {
+            this.$message.error("请选择12:01-23:59时间段的时间");
+            this.afterTime = null;
+            return false;
+          }
+        }
+        this.dataForm.afStartTime = this.afterTime[0];
+        this.dataForm.afEndTime = this.afterTime[1];
+      }
+    },
+    closeSubmit() {
+      this.$emit("closeDialog");
+    },
+    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+    initMap() {
+      let { latitude, longitude } = this.$store.state.user;
+      // 定义地图中心点坐标
+      if (!latitude || latitude == "" || latitude == "0") {
+        latitude = 39.9088810666821;
+        longitude = 116.39743841556731;
+      }
+      console.log(latitude, longitude);
+      var center = new window.TMap.LatLng(latitude, longitude);
+      // 定义map变量，调用 TMap.Map() 构造函数创建地图
+      map = new window.TMap.Map(document.getElementById("map_add"), {
+        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",
+          },
+        },
+      ]);
+    },
+    // 获取所属组织列表
+    // getFormInfo() {
+    //   this.$http
+    //     .post(`/gov/org/agency/community-list`)
+    //     .then(({ data: res }) => {
+    //       if (res.code !== 0) {
+    //         return this.$message.error(res.msg);
+    //       }
+    //       this.organizationList = res.data;
+    //     })
+    //     .catch(() => {});
+    // },
+    init() {
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        if (this.dataForm.id) {
+          this.getInfo();
+        } else {
+          this.initMap();
+        }
+      });
+    },
+    // 获取信息
+    getInfo() {
+      this.$http
+        .get(`/epmetuser/icPointVaccinesInoculation/${this.dataForm.id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.dataForm = {
+            ...this.dataForm,
+            ...res.data,
+          };
+          if (res.data.moStartTime !== "") {
+            this.morningTime = [res.data.moStartTime, res.data.moEndTime];
+          }
+          if (res.data.afStartTime !== "") {
+            this.afterTime = [res.data.afStartTime, res.data.afEndTime];
+          }
+          this.initMap();
+        })
+        .catch(() => {});
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(
+      function () {
+        this.$refs["dataForm"].validate((valid) => {
+          if (!valid) {
+            return false;
+          }
+          if (
+            !this.dataForm.inoculationDate &&
+            this.dataForm.noAvailableVaccines === "2"
+          ) {
+            this.$message.error("请选择接种日期");
+            return false;
+          }
+          if (
+            this.morningTime === null &&
+            this.dataForm.noAvailableVaccines === "2"
+          ) {
+            this.$message.error("请填写上午接种时间");
+            return false;
+          }
+          if (
+            this.afterTime === null &&
+            this.dataForm.noAvailableVaccines === "2"
+          ) {
+            this.$message.error("请填写下午接种时间");
+            return false;
+          }
+          this.$http[!this.dataForm.id ? "post" : "put"](
+            "/epmetuser/icPointVaccinesInoculation/",
+            this.dataForm
+          )
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                return this.$message.error(
+                  res.internalMsg ? res.internalMsg : res.msg
+                );
+              }
+              this.$message({
+                message: this.$t("prompt.success"),
+                type: "success",
+                duration: 500,
+                onClose: () => {
+                  this.visible = false;
+                  this.$emit("refreshDataList");
+                  this.closeSubmit();
+                },
+              });
+            })
+            .catch(() => {});
+        });
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+  },
+};
+</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>
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
new file mode 100644
index 000000000..a21032490
--- /dev/null
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -0,0 +1,521 @@
+<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-item>
+        <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-form-item>
+        <el-form-item>
+          <el-button size="small" class="diy-button--reset" @click="resetSearch"
+            >重置</el-button
+          >
+        </el-form-item>
+        <!--<el-form-item>-->
+        <!--<el-button type="danger" @click="deleteHandle()">{{-->
+        <!--$t("deleteBatch")-->
+        <!--}}</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-upload
+          style=""
+          ref="upload"
+          :multiple="false"
+          :show-file-list="false"
+          :before-upload="
+            (file) => {
+              beforeUpload(file);
+            }
+          "
+          action=""
+          accept=".xls,.xlsx"
+          :http-request="
+            () => {
+              uploadFile();
+            }
+          "
+        >
+          <el-button
+            style="margin-left: 10px"
+            size="small"
+            class="diy-button--delete"
+            >导入</el-button
+          >
+        </el-upload>
+        <el-button
+          style="float: left; margin-left: 10px"
+          class="diy-button--reset"
+          size="small"
+          @click="handleExport"
+          >导出</el-button
+        >
+        <el-button
+          style="margin-left: 15px"
+          class="diy-button--more"
+          size="small"
+          @click="handleSendNotice"
+          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"
+        >
+          <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"
+        >
+          <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"
+        >
+          <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
+            >
+          </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>
+    </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>
+    <!-- 发送通知弹出框 -->
+    <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>
+
+<script>
+import mixinViewModule from "@/mixins/view-module";
+import AddOrUpdate from "./icpointvaccinesinoculation-add-or-update";
+import icpointNoice from "./icpointNoice";
+import { requestPost , requestGet} from "@/js/dai/request";
+export default {
+  mixins: [mixinViewModule],
+  data() {
+    return {
+      dataForm: {
+        name: "",
+        mobile: "",
+      },
+      updateId: null,
+      sendNoticeFormShow: false,
+      noticeVisible: false,
+      noticeOrigin: "4",
+      dialogTitle: "",
+      pageSize: 20,
+      pageNo: 0,
+      total: 0,
+      dataListLoading:false,
+    };
+  },
+  components: {
+    AddOrUpdate,
+    icpointNoice,
+  },
+  mounted() {
+    this.loadTable();
+    this.noticeFun();
+  },
+  methods: {
+    async loadTable() {
+      this.dataListLoading = true;
+      const url = "/epmetuser/icPointVaccinesInoculation/page";
+      let params = {
+        limit: this.pageSize,
+        page: this.pageNo,
+        ...this.dataForm
+      };
+      const { data, code, msg } = await requestGet(url, params);
+      
+      if (code === 0) {
+        console.log(data.list);
+        this.dataList = data.list;
+        this.total = data.total;
+      } else {
+        this.$message.error(msg);
+      }
+      this.dataListLoading = false;
+    },
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.pageNo = 1;
+      this.loadTable();
+    },
+    handleCurrentChange(val) {
+      this.pageNo = val;
+      this.loadTable();
+    },
+    async handleDelete(id) {
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.deleteNat(id);
+        })
+        .catch((err) => {
+          if (err == "cancel") {
+          }
+        });
+    },
+    async deleteNat(id) {
+      const url = "/epmetuser/icPointVaccinesInoculation/delete";
+      let params = [id];
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "删除成功",
+        });
+        this.loadTable();
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    //导出表格
+    async handleExport() {
+      let title = "疫苗接种点";
+
+      const url = "/epmetuser/icPointVaccinesInoculation/point-export";
+
+      app.ajax.exportFilePost(
+        url,
+        this.dataForm,
+        (data, rspMsg) => {
+          this.download(data, title + ".xlsx");
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+    },
+    //重置搜索条件
+    resetSearch() {
+      this.dataForm = {
+        name: "",
+        mobile: "",
+      };
+      this.pageNo = 1;
+    },
+    // 发送通知
+    handleSendNotice() {
+      this.sendNoticeFormShow = true;
+    },
+    // 关闭通知
+    diaClose() {
+      this.sendNoticeFormShow = false;
+    },
+    // 获取发送通知按钮显示与隐藏
+    noticeFun() {
+      this.$http
+        .post(`/epmetuser/icPointNucleicMonitoring/getShowType`)
+        .then(({ data: res }) => {
+          if (res.code === 0 && res.data) {
+            this.noticeVisible = true;
+          }
+        })
+        .catch(() => {});
+    },
+    // 新增 / 修改
+    addOrUpdateHandle(id, title) {
+      this.dialogTitle = title;
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.dataForm.id = id;
+        this.$refs.addOrUpdate.init();
+      });
+      this.addOrUpdateVisible = true;
+    },
+    // 关闭弹窗
+    closeDialog() {
+      this.addOrUpdateVisible = false;
+      this.dialogTitle = "";
+    },
+    handleExportModule() {
+      let title = "疫苗接种点模板";
+      let url = "/epmetuser/icPointVaccinesInoculation/exporttemplate";
+
+      let params = {};
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+          this.download(data, title + ".xls");
+        },
+        (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);
+      }
+    },
+    // 上传文件之前的钩子
+    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;
+      }
+
+      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/icPointVaccinesInoculation/pointImport";
+
+      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" } }
+      );
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/visual/communityManage.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
+.exportBtn {
+  display: flex;
+  align-items: center;
+  margin-bottom: 20px;
+  margin-top: 10px;
+  margin-left: 10px;
+}
+.div_left_table {
+  margin-top: 10px;
+  margin-left: 15px;
+  background-color: #ffffff;
+  border-radius: 5px;
+  padding: 10px;
+}
+.dialog-h {
+  overflow: scroll;
+}
+</style>
diff --git a/src/views/modules/plugins/rent/hikerrorinfo-add-or-update.vue b/src/views/modules/plugins/rent/hikerrorinfo-add-or-update.vue
new file mode 100644
index 000000000..5ecc620f3
--- /dev/null
+++ b/src/views/modules/plugins/rent/hikerrorinfo-add-or-update.vue
@@ -0,0 +1,145 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="删除标记 0：未删除，1：已删除" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item>
+          <el-form-item label="客户ID" prop="customerId">
+          <el-input v-model="dataForm.customerId" placeholder="客户ID"></el-input>
+      </el-form-item>
+          <el-form-item label="身份证号" prop="idCard">
+          <el-input v-model="dataForm.idCard" placeholder="身份证号"></el-input>
+      </el-form-item>
+          <el-form-item label="错误类型 0：token，1：人员，2权限" prop="errorType">
+          <el-input v-model="dataForm.errorType" placeholder="错误类型 0：token，1：人员，2权限"></el-input>
+      </el-form-item>
+          <el-form-item label="错误详情" prop="errorInfo">
+          <el-input v-model="dataForm.errorInfo" placeholder="错误详情"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: '',
+        customerId: '',
+        idCard: '',
+        errorType: '',
+        errorInfo: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        customerId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        idCard: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        errorType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        errorInfo: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/hik/hikErrorInfo/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/hik/hikErrorInfo/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/plugins/rent/hikerrorinfo.vue b/src/views/modules/plugins/rent/hikerrorinfo.vue
new file mode 100644
index 000000000..f6356981a
--- /dev/null
+++ b/src/views/modules/plugins/rent/hikerrorinfo.vue
@@ -0,0 +1,60 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-hik__hikErrorInfo}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="idCard" label="身份证号" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="errorInfo" label="错误详情" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+<!--            <el-button v-if="$hasPermission('hik:hikErrorInfo:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>-->
+<!--            <el-button v-if="$hasPermission('hik:hikErrorInfo:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</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>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './hikerrorinfo-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/pli/power/hikErrorInfo/page',
+        getDataListIsPage: true,
+        deleteURL: '/pli/power/hikErrorInfo',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/visual/basicinfo/cpts/incident-info.vue b/src/views/modules/visual/basicinfo/cpts/incident-info.vue
index f3a860895..9dda7949d 100644
--- a/src/views/modules/visual/basicinfo/cpts/incident-info.vue
+++ b/src/views/modules/visual/basicinfo/cpts/incident-info.vue
@@ -399,7 +399,13 @@ export default {
 
     //加载组织数据
     async getInfo() {
-      const url = "/gov/project/resievent/eventdetail-icdata";
+      let url = "/gov/project/icEvent/icevent-eventdetail-icdata";
+      // 市北沿用旧接口
+      if (
+        this.$store.state.user.customerId == "b09527201c4409e19d1dbc5e3c3429a1"
+      ) {
+        url = "/gov/project/resievent/eventdetail-icdata";
+      }
 
       const { data, code, msg } = await requestPost(url, {
         resiEventId: this.resiEventId,
@@ -414,7 +420,12 @@ export default {
 
     //加载组织数据
     async getComment() {
-      const url = "/gov/project/resieventreply/list";
+      let url = "/gov/project/icEvent/icevent-list";
+      if (
+        this.$store.state.user.customerId == "b09527201c4409e19d1dbc5e3c3429a1"
+      ) {
+        url = "/gov/project/resieventreply/list";
+      }
 
       const { data, code, msg } = await requestPost(url, {
         resiEventId: this.resiEventId,
diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue
index c754ff017..e0a9cea6f 100644
--- a/src/views/modules/visual/basicinfo/people.vue
+++ b/src/views/modules/visual/basicinfo/people.vue
@@ -493,13 +493,24 @@
         @close="showedDemandInfo = false"
       />
 
-      <incident-info
-        v-if="incident.list.length > 0 && incident.showedInfo"
-        :resiEventId="incident.list[incident.currentIndex].resiEventId"
-        :epmetUserIdList="info.epmetUserIdList"
-        :icResiUserId="userId"
-        @close="incident.showedInfo = false"
-      />
+      <template v-if="incident.list.length > 0 && incident.showedInfo">
+        <incident-info
+          v-if="
+            $store.state.user.customerId == 'b09527201c4409e19d1dbc5e3c3429a1'
+          "
+          :resiEventId="incident.list[incident.currentIndex].resiEventId"
+          :epmetUserIdList="info.epmetUserIdList"
+          :icResiUserId="userId"
+          @close="incident.showedInfo = false"
+        />
+        <event-info
+          v-else
+          :eventId="incident.list[incident.currentIndex].resiEventId"
+          :orgId="$store.state.user.agencyId"
+          orgType="agency"
+          @close="incident.showedInfo = false"
+        />
+      </template>
 
       <topic-info
         v-if="topic.list.length > 0 && topic.showedInfo"
@@ -519,11 +530,31 @@ import cptCard from "@/views/modules/visual/cpts/card";
 import peopleMore from "@/views/modules/visual/basicinfo/cpts/people-more";
 import demandInfo from "@/views/modules/visual/measure/dialogInfo";
 import incidentInfo from "@/views/modules/visual/basicinfo/cpts/incident-info";
+import eventInfo from "@/views/modules/visual/communityGovern/shijianchuli/event-info.vue";
 import topicInfo from "@/views/modules/visual/basicinfo/cpts/topic-info";
 import cptTb from "@/views/modules/visual/cpts/tb";
 
 export default {
   name: "HomeMap",
+
+  components: {
+    cptCard,
+    peopleMore,
+    cptTb,
+    demandInfo,
+    incidentInfo,
+    topicInfo,
+    eventInfo,
+  },
+
+  props: {
+    uid: {
+      type: String,
+      default: "",
+      // default: "8ada68cb6f1e4b9a8333348a39ef3aee",
+    },
+  },
+
   data() {
     return {
       breadList: [],
@@ -626,24 +657,8 @@ export default {
     };
   },
 
-  props: {
-    uid: {
-      type: String,
-      default: "",
-      // default: "8ada68cb6f1e4b9a8333348a39ef3aee",
-    },
-  },
-
   computed: {},
 
-  components: {
-    cptCard,
-    peopleMore,
-    cptTb,
-    demandInfo,
-    incidentInfo,
-    topicInfo,
-  },
   beforeRouteEnter(to, from, next) {
     console.log("让我看看", to);
     if (from) {
@@ -811,7 +826,15 @@ export default {
 
     //加载组织数据
     async getIncidentData() {
-      const url = "/gov/project/resievent/pageuserreported";
+      let url = "/gov/project/icEvent/icevent-pageuserreported";
+
+      // 市北沿用旧接口
+      if (
+        this.$store.state.user.customerId == "b09527201c4409e19d1dbc5e3c3429a1"
+      ) {
+        url = "/gov/project/resievent/pageuserreported";
+      }
+
       let params = {
         epmetUserIdList: this.info.epmetUserIdList,
         userId: this.userId,
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/lineOption.js b/src/views/modules/visual/communityGovern/shijianchuli/lineOption.js
index 20eb6457e..e9790c278 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/lineOption.js
+++ b/src/views/modules/visual/communityGovern/shijianchuli/lineOption.js
@@ -25,13 +25,6 @@ export function lineOption () {
         }
 
     },
-    // grid: {
-    //   left: '5%',
-    //   right: '5%',
-    //   bottom: '5%',
-    //   top: '10%',
-    //   containLabel: true
-    // },
     xAxis: {
       type: 'category',
       // boundaryGap: false,
@@ -109,7 +102,7 @@ export function lineOption () {
       type: 'bar',
       zlevel: 1,
       itemStyle: {
-       
+
         normal: {
           barBorderRadius: 0,
           color: function (params) {
@@ -119,9 +112,9 @@ export function lineOption () {
               ['rgba(36, 253, 231, .2)', 'rgba(36, 253, 231, 1)'],
             ];
             var colorItem
-           
+
               colorItem = colorList[1];
-        
+
             // 设置线条渐变色
             return new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
               offset: 0,
@@ -139,13 +132,13 @@ export function lineOption () {
       barWidth: 7,
       // data: serviceCount
     },
-   
+
     {
       name: 'XXX',
       type: 'pictorialBar',
       symbol: function (params, value) {
         // 设置图片
-      
+
         return circleList[1]
       },
       symbolPosition: 'end',
diff --git a/src/views/modules/visual/cpts/tb.vue b/src/views/modules/visual/cpts/tb.vue
index 8b77155dd..2920ee649 100644
--- a/src/views/modules/visual/cpts/tb.vue
+++ b/src/views/modules/visual/cpts/tb.vue
@@ -21,13 +21,22 @@
       <tbody class="table-body">
         <tr class="table-body-tr"
             v-for="(value, index) in list"
-            :key="index">
+            :key="index"
+            @click="handleClickRow(index)">
           <td class="td"
               v-for="(item, indexs) in value"
               :key="indexs">
             <div v-if="typeof item === 'string' || typeof item === 'number'">
               {{ item }}
             </div>
+
+            <div v-if="typeof item === 'object'&& item.type === 'img'">
+              <!-- <span>{{  item.type+  item.src}}</span> -->
+              <img style="width:18px;height:18px"
+                   :src="item.src"
+                   alt="" />
+
+            </div>
             <div v-if="typeof item === 'object' && item && item.type == 'index'">
               <img v-if="highlightTop3 && index == 0"
                    src="@/assets/img/shuju/top/1.png"
@@ -139,6 +148,10 @@ export default {
   created () { },
 
   methods: {
+    //点击某一行
+    handleClickRow (index) {
+      this.$emit("handleClickRow", index);
+    },
     handleClickBtn (index, type) {
       this.$emit("operate", index, type);
     },
@@ -191,7 +204,7 @@ export default {
           box-sizing: border-box;
           text-align: center;
           border: none;
-          padding: 20px 5px;
+          padding: 10px 5px;
 
           > div {
             overflow: hidden;