diff --git a/src/assets/img/shuju/grid/IS_KC.png b/src/assets/img/shuju/grid/IS_KC.png
new file mode 100644
index 000000000..48bd3208c
Binary files /dev/null and b/src/assets/img/shuju/grid/IS_KC.png differ
diff --git a/src/assets/img/shuju/grid/sr_gc.png b/src/assets/img/shuju/grid/sr_gc.png
new file mode 100644
index 000000000..c5a00bb7e
Binary files /dev/null and b/src/assets/img/shuju/grid/sr_gc.png differ
diff --git a/src/router/index.js b/src/router/index.js
index fb66b869c..de595a814 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -112,20 +112,20 @@ function cookApiDataItem(item) {
   function n2one(v) {
     let ret = [];
     for (let i = 0; i < v.length; i++) {
-      console.log("xxxxx", v[i]);
+      // console.log("xxxxx", v[i]);
       ret.push(v[i]);
       if (Array.isArray(v[i].children) && v[i].children.length > 0) {
         ret.push(...n2one(v[i].children));
       }
     }
-    console.log("aaaa", ret);
+    // console.log("aaaa", ret);
     return ret;
   }
 
   let allChildrenUrl = n2one(item.children)
     .filter((i) => i.url != "" && i.showFlag == 1)
     .map((i) => i.url);
-  console.log("))))))))))))", allChildrenUrl);
+  // console.log("))))))))))))", allChildrenUrl);
 
   if (item.children.length > 0) {
     if (item.url == "" || !allChildrenUrl.find((i) => i.url == item.url)) {
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
index 2562d8bb7..1912e820b 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
@@ -159,15 +159,16 @@
               :inline="true"
               :model="formDataSearch"
               ref="ref_formSearch"
-              :label-width="'90px'"
+              label-width="90px"
             >
-              <el-form-item label="所属网格" label-width="80px">
+              <el-form-item label="所属网格">
                 <el-select
                   class="item_width_3"
                   v-model.trim="formDataSearch.gridId"
                   placeholder="请选择"
                   size="mini"
                   clearable
+                  @change="handleChangeGrid"
                 >
                   <el-option
                     v-for="item in gridList"
@@ -178,6 +179,115 @@
                   </el-option>
                 </el-select>
               </el-form-item>
+              <el-form-item label="所属小区" prop="neighborId">
+                <el-select
+                  v-model.trim="formDataSearch.neighborId"
+                  placeholder="请选择小区"
+                  size="small"
+                  clearable
+                  class="resi-cell-select"
+                  @clear="handleClearVillage"
+                  @change="handleChangeV"
+                >
+                  <el-option
+                    v-for="item in optionsV"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+                <el-select
+                  v-model.trim="formDataSearch.buildingId"
+                  placeholder="楼号"
+                  size="small"
+                  clearable
+                  style="width: 120px"
+                  class="resi-cell-select"
+                  @clear="handleClearBuild"
+                  @change="handleChangeB"
+                >
+                  <el-option
+                    v-for="item in optionsB"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+                <el-select
+                  v-model.trim="formDataSearch.unitId"
+                  placeholder="单元"
+                  size="small"
+                  clearable
+                  style="width: 120px"
+                  class="resi-cell-select"
+                  @click="handleClearDan"
+                  @change="handleChangeD"
+                >
+                  <el-option
+                    v-for="item in optionsD"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+                <el-select
+                  v-model.trim="formDataSearch.houseId"
+                  placeholder="房号"
+                  size="small"
+                  clearable
+                  style="width: 120px"
+                  class="resi-cell-select"
+                >
+                  <el-option
+                    v-for="item in optionsH"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="姓名" prop="name">
+                <el-input
+                  v-model="formDataSearch.name"
+                  size="small"
+                  class="list_item_width_1"
+                  clearable
+                  placeholder="请输入姓名"
+                >
+                </el-input>
+              </el-form-item>
+              <el-form-item label="手机号" prop="mobile">
+                <el-input
+                  v-model="formDataSearch.mobile"
+                  size="small"
+                  class="list_item_width_1"
+                  clearable
+                  placeholder="请输入手机号"
+                >
+                </el-input>
+              </el-form-item>
+              <el-form-item label="证件号" prop="idCard">
+                <el-input
+                  v-model="formDataSearch.idCard"
+                  size="small"
+                  class="list_item_width_1"
+                  clearable
+                  placeholder="请输入身份证号或护照号"
+                >
+                </el-input>
+              </el-form-item>
+              <el-form-item label="年龄" prop="age">
+                <inputRange
+                  v-model="formDataSearch.age"
+                  type="num"
+                  @change="handleAgeChange"
+                />
+              </el-form-item>
               <el-form-item label="核酸检测次数小于" label-width="150px">
                 <el-input-number
                   class="item_width_3"
@@ -190,7 +300,6 @@
               </el-form-item>
               <el-form-item
                 label="检测时间"
-                label-width="80px"
                 prop="startTime"
               >
                 <el-date-picker
@@ -323,7 +432,7 @@
               :inline="true"
               :model="formData2"
               ref="ref_form2"
-              :label-width="'90px'"
+              label-width="90px"
               :rules="dataRule1"
             >
               <el-form-item
@@ -441,6 +550,7 @@
 import { Loading } from "element-ui"; // 引入Loading服务
 import { requestPost } from "@/js/dai/request";
 import { mapGetters } from "vuex";
+import inputRange from "@/views/components/rangeInput.vue";
 
 let loading; // 加载动画
 export default {
@@ -458,8 +568,23 @@ export default {
         startDate: "",
         endDate: "",
         attentionType: 2,
+        neighborId: "",
+        buildingId: "",
+        unitId: "",
+        houseId: "",
+        name: "",
+        mobile: "",
+        idCard: "",
+        age: {},
+        startBirthDay: "",
+        endBirthDay: "",
       },
       timeRange: [],
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+      optionsG: [],
 
       formData1: {
         attentionType: 2,
@@ -497,7 +622,7 @@ export default {
     };
   },
 
-  components: {},
+  components: { inputRange },
 
   async mounted() {
     const { user } = this.$store.state;
@@ -649,6 +774,79 @@ export default {
 
     handleClick() {},
 
+    handleAgeChange(val) {
+      console.log("val----age---", val);
+      if (val.start) {
+        const e = this.computedBirth(val.start);
+        this.formDataSearch.endBirthDay = e;
+      } else {
+        this.formDataSearch.endBirthDay = "";
+      }
+      if (val.end) {
+        const s = this.computedBirth(val.end);
+        this.formDataSearch.startBirthDay = s;
+      } else {
+        this.formDataSearch.startBirthDay = "";
+      }
+    },
+
+    computedBirth(age) {
+      let now = new Date();
+      let nowYear = now.getFullYear();
+      let nowMonth = now.getMonth() + 1;
+      let nowDay = now.getDate(); // 按照减法原理，先day相减，不够向month借；然后month相减，不够向year借；最后year相减。
+      let subYear = nowYear - age;
+      if (nowMonth < 10) {
+        nowMonth = "0" + nowMonth;
+      }
+      if (nowDay < 10) {
+        nowDay = "0" + nowDay;
+      }
+      console.log(subYear + "-" + nowMonth + "-" + nowDay);
+      return subYear + "-" + nowMonth + "-" + nowDay;
+    },
+
+    handleClearVillage() {
+      this.formDataSearch.buildingId = "";
+      this.formDataSearch.unitId = "";
+      this.formDataSearch.houseId = "";
+    },
+    handleClearBuild() {
+      this.formDataSearch.buildingId = "";
+      this.formDataSearch.unitId = "";
+      this.formDataSearch.houseId = "";
+    },
+    handleClearDan() {
+      this.formDataSearch.unitId = "";
+      this.formDataSearch.houseId = "";
+    },
+    handleChangeGrid(val) {
+      console.log("val", val);
+      this.formDataSearch.neighborId = "";
+      this.formDataSearch.buildingId = "";
+      this.formDataSearch.unitId = "";
+      this.formDataSearch.houseId = "";
+      this.getValiheList();
+    },
+    handleChangeV(val) {
+      console.log("val", val);
+      this.formDataSearch.buildingId = "";
+      this.formDataSearch.unitId = "";
+      this.formDataSearch.houseId = "";
+      this.getBuildList();
+    },
+    handleChangeB(val) {
+      console.log("val", val);
+      this.formDataSearch.unitId = "";
+      this.formDataSearch.houseId = "";
+      this.getUniList();
+    },
+    handleChangeD(val) {
+      console.log("val", val);
+      this.formDataSearch.houseId = "";
+      this.getHouseList();
+    },
+
     async loadGrid() {
       const url = "/gov/org/customergrid/gridoption";
 
@@ -664,6 +862,78 @@ export default {
         this.$message.error(msg);
       }
     },
+    getValiheList() {
+      const { user } = this.$store.state;
+      this.$http
+        .post("/gov/org/icneighborhood/neighborhoodoption", {
+          gridId: this.formDataSearch.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.formDataSearch.neighborId,
+        })
+        .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.formDataSearch.buildingId,
+        })
+        .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.formDataSearch.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("网络错误");
+        });
+    },
+
     handleComfirm() {
       if (this.activeName === "first") {
         this.$refs["ref_form1"].validate((valid, messageObj) => {
diff --git a/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue b/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue
index 8a1c73255..0998cee12 100644
--- a/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue
+++ b/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue
@@ -220,7 +220,8 @@
             </el-option>
           </el-select>
       </el-form-item>
-      <el-form-item v-if="dataForm.isVaccination === '0'" label="原因" label-width="150px">
+      <el-form-item label="原因" label-width="150px">
+          <!--<el-form-item v-if="dataForm.isVaccination === '0'" label="原因" label-width="150px">-->
           <el-select class="item_width_2"
                      v-model.trim="dataForm.reason"
                      placeholder="请选择"
@@ -337,6 +338,14 @@
       return !this.dataForm.unitId
     },
     dataRule () {
+        var checkPhone = (rule, value, callback) => {
+            let moblie = /^1(3|4|5|6|7|8|9)\d{9}$/; let tel = /^(0[0-9]{2,3}\-)([2-9][0-9]{4,7})+(\-[0-9]{1,4})?$/
+            if (!moblie.test(this.dataForm.mobile) && !tel.test(this.dataForm.mobile)) {
+                return callback(new Error('请输入正确的手机号或座机号！'))
+            } else {
+                callback()
+            }
+        }
       return {
         customerId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
@@ -384,7 +393,8 @@
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         mobile: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' },
+            { validator: checkPhone, trigger: 'blur' }
         ],
         idCard: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
@@ -728,16 +738,6 @@
       setTimeout(() => {
         this.btnDisable = false;
       }, 10000);
-      //验证手机号码
-      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/;
-      if (regPhone.test(this.dataForm.mobile) === false) {
-        this.btnDisable = false
-        this.$message({
-          type: 'warning',
-          message: '请输入正确的手机号码'
-        })
-        return false;
-      }
       if(this.dataForm.isVaccination === '1'){
           if(this.dataForm.firstVacTime === ''){
               this.$message({
diff --git a/src/views/modules/visual/command/cpts/map.vue b/src/views/modules/visual/command/cpts/map.vue
index 2653ee140..faaf0a6e4 100644
--- a/src/views/modules/visual/command/cpts/map.vue
+++ b/src/views/modules/visual/command/cpts/map.vue
@@ -516,6 +516,7 @@ export default {
 
     iniMapDot(scene) {
       const { darkStyle, lightStyle, dotIcoList, dotData } = this;
+      console.log('--------------------------图标', dotIcoList)
       Object.keys(dotIcoList).forEach((k) => {
         scene.addImage(k, dotIcoList[k]);
       });
@@ -531,10 +532,9 @@ export default {
           strokeOpacity: 0.1,
           stroke: "#000",
         });
-      scene.addLayer(dotBgLayer);
 
       dotLayer = new PointLayer({
-        zIndex: 21,
+        zIndex: 20,
       })
         .source(dotData)
         .shape("categoryKey", (k) => k)
@@ -543,6 +543,8 @@ export default {
           offsets: [0, 0],
           layerType: "fillImage",
         });
+
+      scene.addLayer(dotBgLayer);
       scene.addLayer(dotLayer);
 
       dotBgLayer.on("click", (e) => {
@@ -567,7 +569,7 @@ export default {
       });
 
       dotLayer2 = new PointLayer({
-        zIndex: 31,
+        zIndex: 30,
       })
         .source(dotData)
         .shape("categoryKey", (k) => k + "2")
diff --git a/src/views/modules/visual/command/index.vue b/src/views/modules/visual/command/index.vue
index d135daabf..4971f977d 100644
--- a/src/views/modules/visual/command/index.vue
+++ b/src/views/modules/visual/command/index.vue
@@ -334,7 +334,7 @@ export default {
 
         yjdw: require("@/assets/img/shuju/command/ico/yjdw.png"),
         sr_gy: require("@/assets/img/shuju/command/ico/sr_gy.png"),
-        sr_gc: require("@/assets/img/shuju/command/ico/sr_gc.png"),
+        sr_gc: require("@/assets/img/shuju/grid/sr_gc.png"),
         whdw: require("@/assets/img/shuju/command/ico/whdw.png"),
         sr_ggld: require("@/assets/img/shuju/command/ico/sr_ggld.png"),
         lwh: require("@/assets/img/shuju/command/ico/lwh.png"),
@@ -424,7 +424,7 @@ export default {
         IS_DB: require("@/assets/img/shuju/command/ico3/IS_DB.png"),
         IS_MB: require("@/assets/img/shuju/command/ico3/IS_MB.png"),
         anzhibangjiao: require("@/assets/img/shuju/command/ico3/anzhibangjiao.png"),
-        IS_KC: require("@/assets/img/shuju/command/ico3/IS_KC.png"),
+        IS_KC: require("@/assets/img/shuju/grid/IS_KC.png"),
         IS_XFRY: require("@/assets/img/shuju/command/ico3/IS_XFRY.png"),
         IS_SD: require("@/assets/img/shuju/command/ico3/IS_SD.png"),
         IS_SN: require("@/assets/img/shuju/command/ico3/IS_SN.png"),