diff --git a/src/router/index.js b/src/router/index.js
index 0d88ec393..bd3fbe5a6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -223,11 +223,11 @@ router.beforeEach((to, from, next) => {
   //     });
   //   });
   window.SITE_CONFIG["menuShujuList"] = [
-    {
-      url: "/visual/plugin/power/organization",
-      name: "动力主轴",
-      id: "5feawfwaefwa577",
-    },
+    // {
+    //   url: "/visual/plugin/power/organization",
+    //   name: "动力主轴",
+    //   id: "5feawfwaefwa577",
+    // },
     {
       id: "22213213",
       name: "基础信息",
diff --git a/src/views/modules/base/huji/chusheng/cpts/edit.vue b/src/views/modules/base/huji/chusheng/cpts/edit.vue
new file mode 100644
index 000000000..96c2ecdc6
--- /dev/null
+++ b/src/views/modules/base/huji/chusheng/cpts/edit.vue
@@ -0,0 +1,840 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <el-form
+        ref="ref_form"
+        :inline="true"
+        :model="fmData"
+        :rules="dataRule"
+        :disabled="formType === 'detail'"
+        class="form"
+      >
+        <el-form-item
+          label="所属网格	"
+          prop="gridId"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-select
+            v-model.trim="fmData.gridId"
+            placeholder="请选择"
+            size="small"
+            clearable
+            class="resi-cell-select"
+            @change="handleChangeGrid"
+            style="width: 250px"
+          >
+            <el-option
+              v-for="item in optionsG"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item
+          label="所属房屋	"
+          prop="homeId"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-select
+            v-model.trim="fmData.villageId"
+            placeholder="请选择小区"
+            size="small"
+            clearable
+            class="resi-cell-select"
+            @clear="handleClearVillage"
+            @change="handleChangeV"
+            style="margin-right: 8px; width: 120px"
+          >
+            <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="fmData.buildId"
+            placeholder="楼号"
+            size="small"
+            clearable
+            style="margin-right: 8px; width: 120px"
+            class="resi-cell-select"
+            :disabled="changeVDisabled"
+            @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="fmData.unitId"
+            :disabled="changeBDisabled"
+            placeholder="单元"
+            size="small"
+            clearable
+            style="margin-right: 8px; 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="fmData.homeId"
+            :disabled="changeDDisabled"
+            placeholder="房号"
+            size="small"
+            clearable
+            @change="handleChangeH"
+            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"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            maxlength="50"
+            show-word-limit
+            style="width: 200px; margin-right: 20px"
+            placeholder="请输入姓名	"
+            v-model="fmData.name"
+          >
+          </el-input>
+
+          <el-checkbox v-model="fmData.isWelfare" true-label="1" false-label="0"
+            >享受福利</el-checkbox
+          >
+          <el-checkbox
+            v-model="fmData.isCheck"
+            true-label="1"
+            false-label="0"
+            @change="checkResiAvailable"
+            >补充居民信息</el-checkbox
+          >
+        </el-form-item>
+
+        <el-form-item
+          label="手机号"
+          prop="mobile"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            type="number"
+            maxlength="50"
+            show-word-limit
+            placeholder="请输入手机号	"
+            v-model="fmData.mobile"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="身份证号"
+          prop="idCard"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            placeholder="请输入身份证号"
+            v-model="fmData.idCard"
+            @blur="handleBlurId"
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="性别"
+          prop="principalName"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-select
+            v-model.trim="fmData.gender"
+            placeholder="性别"
+            size="small"
+            clearable
+            style="width: 120px"
+            class="resi-cell-select"
+          >
+            <el-option
+              v-for="item in optionsGender"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item
+          label="出生日期"
+          prop="birthday"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-date-picker
+            v-model="fmData.birthday"
+            type="date"
+            placeholder="出生日期"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item
+          label="出生地"
+          prop="birthplace"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            maxlength="50"
+            show-word-limit
+            placeholder="请输入出生地"
+            v-model="fmData.birthplace"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="出生人父亲姓名"
+          prop="father"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            maxlength="50"
+            show-word-limit
+            placeholder="请输入出生人父亲姓名"
+            v-model="fmData.father"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="出生人母亲姓名"
+          prop="mother"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            maxlength="50"
+            show-word-limit
+            placeholder="请输入出生人母亲姓名"
+            v-model="fmData.mother"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="胎次"
+          prop="count"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input-number
+            v-model="fmData.count"
+            :min="1"
+            :max="50"
+            label="请输入胎次"
+          ></el-input-number>
+        </el-form-item>
+
+        <el-form-item
+          label="申报户口日期"
+          prop="reportDate"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-date-picker
+            v-model="fmData.reportDate"
+            placeholder="申报户口日期"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item
+          label="户主姓名"
+          prop="householderName"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            maxlength="50"
+            show-word-limit
+            placeholder="请输入户主姓名"
+            :disabled="fmData.alreadyHaveMaster"
+            v-model="fmData.householderName"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="与户主关系"
+          prop="householderRelation"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-select
+            v-model.trim="fmData.householderRelation"
+            placeholder="与户主关系"
+            size="small"
+            clearable
+            style="width: 120px"
+            class="resi-cell-select"
+          >
+            <el-option
+              v-for="item in optionsRelation"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item
+          v-if="false"
+          label="备注"
+          prop="remark"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            type="textarea"
+            maxlength="500"
+            show-word-limit
+            :rows="3"
+            placeholder="请输入备注，不超过500字"
+            v-model="fmData.remark"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="div_btn resi-btns">
+      <el-button size="small" @click="handleCancle">取 消</el-button>
+      <el-button
+        v-if="formType != 'detail'"
+        type="primary"
+        size="small"
+        :disabled="btnDisable"
+        @click="handleComfirm"
+        >确 定</el-button
+      >
+    </div>
+  </div>
+</template>
+
+<script>
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost } from "@/js/dai/request";
+import formVltHelper from "dai-js/tools/formVltHelper";
+import { computedCard } from "@/utils/index";
+import { isCard } from "@/utils/validate";
+
+let loading; // 加载动画
+
+function iniFmData() {
+  return {
+    id: "",
+    gridId: "",
+    villageId: "",
+    buildId: "",
+    unitId: "",
+    homeId: "",
+    name: "",
+    mobile: "",
+    idCard: "",
+    isWelfare: "0", //福利0否，1是
+    isCheck: "0",
+    gender: "",
+    birthplace: "",
+    father: "",
+    mother: "",
+    count: "",
+    reportDate: "",
+    householderName: "",
+    householderRelation: "",
+    alreadyHaveMaster: false,
+  };
+}
+
+export default {
+  data() {
+    return {
+      formType: "add", //表单操作类型 add新增，edit编辑，detail详情
+
+      btnDisable: false,
+
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+      optionsG: [],
+      optionsGender: [
+        {
+          value: "1",
+          label: "男",
+        },
+        {
+          value: "2",
+          label: "女",
+        },
+      ],
+      optionsRelation: [],
+
+      fmData: iniFmData(),
+    };
+  },
+  components: {},
+  computed: {
+    dataRule() {
+      let checkIdCard = (rule, value, callback) => {
+        if (value === "") {
+          callback(new Error("请输入身份证"));
+        } else {
+          if (!isCard(value)) {
+            callback(new Error("身份证号格式不正确"));
+          }
+          callback();
+        }
+      };
+
+      return {
+        gridId: [
+          { required: true, message: "所属网格不能为空", trigger: "blur" },
+        ],
+        homeId: [
+          { required: true, message: "所属房屋不能为空", trigger: "blur" },
+        ],
+        name: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
+        idCard: [
+          { required: true, message: "身份证号不能为空", trigger: "blur" },
+          { required: true, validator: checkIdCard, trigger: "blur" },
+        ],
+        birthplace: [
+          { required: true, message: "出生地不能为空", trigger: "blur" },
+        ],
+      };
+    },
+
+    changeVDisabled() {
+      return !this.fmData.villageId;
+    },
+    changeBDisabled() {
+      return !this.fmData.buildId;
+    },
+    changeDDisabled() {
+      return !this.fmData.unitId;
+    },
+  },
+  props: {},
+  watch: {},
+
+  async mounted() {
+    this.getGridList();
+    this.getValiheList();
+    this.getRelationList();
+  },
+
+  methods: {
+    async checkResiAvailable() {
+      const {
+        fmData: { idCard, isCheck },
+      } = this;
+      if (isCheck == "1" && isCard(idCard)) {
+        const { data, code, msg } = await requestPost(
+          "/epmetuser/icresiuser/checkuser",
+          {
+            idCard,
+            agencyId: this.$store.state.user.agencyId,
+          }
+        );
+        if (code === 0) {
+          if (!data.moveInstatus) {
+            this.$message({
+              type: "error",
+              message: `请联系${data.resiAgencyName}迁出该居民后操作`,
+            });
+          }
+        } else {
+          this.$message.error(msg);
+        }
+      }
+    },
+
+    handleBlurId() {
+      const { sex, birth, age } = computedCard(this.fmData.idCard);
+      if (birth) {
+        this.fmData.birthday = birth;
+        this.fmData.gender = sex == 1 ? "1" : "2";
+        this.checkResiAvailable();
+      }
+    },
+
+    handleClearVillage() {
+      this.fmData.buildId = "";
+      this.fmData.homeId = "";
+    },
+    handleClearBuild() {
+      this.fmData.buildId = "";
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
+    },
+    handleClearDan() {
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
+    },
+    handleChangeGrid(val) {
+      console.log("val", val);
+      this.fmData.villageId = "";
+      this.fmData.buildId = "";
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
+      this.getValiheList();
+    },
+    handleChangeV(val) {
+      console.log("val", val);
+      this.fmData.buildId = "";
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
+      this.getBuildList();
+    },
+    handleChangeB(val) {
+      console.log("val", val);
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
+      this.getUniList();
+    },
+    handleChangeD(val) {
+      console.log("val", val);
+      this.fmData.homeId = "";
+      this.getHouseList();
+    },
+    handleChangeH(val) {
+      console.log("val", val);
+      this.getHouseMaster();
+    },
+
+    getRelationList() {
+      const { user } = this.$store.state;
+      this.$http
+        .post("/sys/dict/data/relationship", {
+          formCode: "resi_base_info",
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsRelation = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+
+    getGridList() {
+      const { user } = this.$store.state;
+      this.$http
+        .post("/gov/org/customergrid/gridoption", {
+          agencyId: user.agencyId,
+          purpose: "query",
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsG = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    getValiheList() {
+      const { user } = this.$store.state;
+      this.$http
+        .post("/gov/org/icneighborhood/neighborhoodoption", {
+          gridId: this.fmData.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.fmData.villageId,
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsB = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    getUniList() {
+      this.$http
+        .post("/gov/org/icbuildingunit/unitoption", {
+          buildingId: this.fmData.buildId,
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsD = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    getHouseList() {
+      this.$http
+        .post("/gov/org/ichouse/houseoption", { unitId: this.fmData.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("网络错误");
+        });
+    },
+
+    getHouseMaster() {
+      const { homeId } = this.fmData;
+      if (!homeId) return (this.alreadyHaveMaster = false);
+
+      this.$http
+        .post("/epmetuser/icresiuser/queryhousehold/" + homeId, {})
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取户主信息成功", res.data);
+            const { name } = res.data;
+            if (name) {
+              this.fmData.householderName = name;
+              this.alreadyHaveMaster = true;
+            } else {
+              this.alreadyHaveMaster = false;
+            }
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+
+    async initForm(type, row) {
+      this.$refs.ref_form.resetFields();
+
+      this.formType = type;
+      console.log(row);
+      if (row) {
+        // this.fmData = { ...this.fmData, ...row };
+        this.getInfo(row.id);
+      }
+    },
+
+    async getInfo(id) {
+      const { data, code, msg } = await requestPost(
+        "/epmetuser/icBirthRecord",
+        {
+          id,
+        }
+      );
+      if (code === 0) {
+        this.fmData = { ...this.fmData, ...data };
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    async handleComfirm() {
+      this.btnDisable = true;
+      setTimeout(() => {
+        this.btnDisable = false;
+      }, 10000);
+      this.$refs["ref_form"].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj);
+          this.btnDisable = false;
+        } else {
+          if (!formVltHelper.userOrMobile(this.fmData.mobile)) {
+            return this.$message({
+              type: "error",
+              message: "手机号格式有误",
+            });
+          }
+          this.submit();
+        }
+      });
+    },
+
+    async submit() {
+      let url = "";
+      if (this.formType === "add") {
+        url = "/epmetuser/icBirthRecord/save";
+      } else {
+        url = "/epmetuser/icBirthRecord/update";
+
+        this.fmData.orgId = this.orgId;
+      }
+
+      const { data, code, msg } = await requestPost(url, this.fmData);
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "操作成功",
+        });
+        this.resetData();
+        this.$emit("dialogOk");
+        this.btnDisable = false;
+      } else {
+        this.btnDisable = false;
+        this.$message.error(msg);
+      }
+    },
+
+    handleCancle() {
+      this.resetData();
+      this.$emit("dialogCancle");
+    },
+    resetData() {
+      this.orgId = "";
+      this.fmData = iniFmData();
+    },
+    // 开启加载动画
+    startLoading() {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
+    },
+    // 结束加载动画
+    endLoading() {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close();
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.item_width_1 {
+  width: 500px;
+}
+.item_width_2 {
+  width: 400px;
+}
+.item_width_3 {
+  margin-left: 10px;
+  width: 200px;
+}
+.item_width_4 {
+  width: 200px;
+}
+
+.div_map {
+  margin-top: 10px;
+}
+
+.div_btn {
+  // display: flex;
+  // justify-content: flex-end;
+}
+.el-tabs {
+  margin: 0 20px;
+}
+.el-upload__tip {
+  color: rgb(155, 155, 155);
+  margin: 0;
+}
+.form {
+  margin-top: 30px;
+}
+
+.m-staffs {
+  width: 468px;
+  .item {
+    display: flex;
+    justify-content: space-around;
+    margin-bottom: 7px;
+  }
+  .item-add {
+  }
+}
+</style>
+
+<style>
+.el-dialog__body {
+  padding: 0 10px 20px !important;
+}
+</style>
diff --git a/src/views/modules/base/huji/chusheng/index.vue b/src/views/modules/base/huji/chusheng/index.vue
new file mode 100644
index 000000000..bdf9db962
--- /dev/null
+++ b/src/views/modules/base/huji/chusheng/index.vue
@@ -0,0 +1,936 @@
+<template>
+  <div class="resi-container">
+    <el-card ref="searchCard" class="search-card">
+      <el-form
+        ref="searchForm"
+        :inline="true"
+        :model="fmData"
+        class="demo-form-inline"
+      >
+        <el-row class="resi-row">
+          <el-col :span="6">
+            <div class="resi-cell2">
+              <div class="resi-cell2-label">所属网格</div>
+              <div class="resi-cell2-value">
+                <el-select
+                  v-model.trim="fmData.gridId"
+                  placeholder="请选择"
+                  size="small"
+                  clearable
+                  class="resi-cell2-select"
+                  @change="handleChangeGrid"
+                >
+                  <el-option
+                    v-for="item in optionsG"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="18">
+            <div class="resi-cell2">
+              <div class="resi-cell2-label">所属房屋</div>
+              <div class="resi-cell2-value">
+                <el-select
+                  v-model.trim="fmData.villageId"
+                  placeholder="请选择小区"
+                  size="small"
+                  clearable
+                  class="resi-cell2-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="fmData.buildId"
+                  placeholder="楼号"
+                  size="small"
+                  clearable
+                  style="width: 120px"
+                  class="resi-cell2-select"
+                  :disabled="changeVDisabled"
+                  @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="fmData.unitId"
+                  :disabled="changeBDisabled"
+                  placeholder="单元"
+                  size="small"
+                  clearable
+                  style="width: 120px"
+                  class="resi-cell2-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="fmData.homeId"
+                  :disabled="changeDDisabled"
+                  placeholder="房号"
+                  size="small"
+                  clearable
+                  style="width: 120px"
+                  class="resi-cell2-select"
+                >
+                  <el-option
+                    v-for="item in optionsH"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+
+        <el-form-item label="姓名" prop="name">
+          <el-input
+            v-model="fmData.name"
+            class="resi-cell2-input"
+            size="small"
+            clearable
+            placeholder="请输入"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="手机号" prop="mobile">
+          <el-input
+            v-model="fmData.mobile"
+            class="resi-cell2-input"
+            size="small"
+            clearable
+            placeholder="请输入"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="身份证号" prop="idCard">
+          <el-input
+            v-model="fmData.idCard"
+            class="resi-cell2-input"
+            size="small"
+            clearable
+            placeholder="请输入"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="出生日期" prop="birthdayTime">
+          <el-date-picker
+            v-model="fmData.birthdayTime"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="享受福利" prop="remark">
+          <el-select
+            v-model.trim="fmData.isWelfare"
+            placeholder="享受福利"
+            size="small"
+            clearable
+            style="width: 120px"
+            class="resi-cell2-select"
+          >
+            <el-option
+              v-for="item in optionsWelfare"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button
+            class="diy-button--search"
+            size="small"
+            @click="handleSearch"
+            >查询</el-button
+          >
+          <el-button
+            class="diy-button--reset"
+            size="small"
+            @click="resetForm('searchForm')"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card class="resi-card-table">
+      <div class="resi-row-btn">
+        <el-button class="diy-button--add" size="small" @click="handleAdd"
+          >出生登记</el-button
+        >
+        <el-button
+          v-if="false"
+          class="diy-button--export"
+          size="small"
+          @click="handleExportModule('room')"
+          >下载模板</el-button
+        >
+        <el-upload
+          v-if="false"
+          ref="upload"
+          class="upload-btn"
+          action="uploadUlr"
+          :limit="1"
+          :accept="'.xls,.xlsx'"
+          :with-credentials="true"
+          :show-file-list="false"
+          :auto-upload="true"
+          :on-progress="handleProgress"
+          :on-success="handleExcelSuccess"
+          :before-upload="beforeExcelUpload"
+          :http-request="uploadHttpRequest"
+        >
+          <el-button
+            size="small"
+            class="diy-button--delete"
+            :loading="importLoading"
+            >{{ importBtnTitle }}</el-button
+          >
+        </el-upload>
+
+        <el-button @click="handleChu" class="diy-button--reset" size="small"
+          >导出</el-button
+        >
+      </div>
+      <el-table
+        :data="tableData"
+        border
+        style="width: 100%"
+        class="resi-table"
+        :height="maxTableHeight"
+      >
+        <el-table-column
+          label="序号"
+          fixed="left"
+          type="index"
+          align="center"
+          width="50"
+        />
+
+        <el-table-column prop="name" fixed="left" label="姓名" align="center">
+          <template slot-scope="scope">
+            <a class="name-a" @click="handleWatch(scope.$index)">
+              {{ scope.row.name }}
+            </a>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          prop="gridName"
+          align="center"
+          label="所属网格"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop="home"
+          label="所属房屋"
+          align="center"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop="mobile"
+          width="100"
+          align="center"
+          label="手机号"
+        >
+        </el-table-column>
+
+        <el-table-column prop="idCard" align="center" label="身份证号">
+        </el-table-column>
+
+        <el-table-column prop="gender" align="center" label="性别">
+        </el-table-column>
+
+        <el-table-column prop="birthday" align="center" label="出生日期">
+        </el-table-column>
+
+        <el-table-column prop="birthplace" align="center" label="出生地">
+        </el-table-column>
+
+        <el-table-column
+          prop="parentName"
+          align="center"
+          label="出生人父/母姓名"
+        >
+        </el-table-column>
+
+        <el-table-column prop="count" align="center" label="胎次">
+        </el-table-column>
+
+        <el-table-column prop="reportDate" align="center" label="申报户口日期">
+        </el-table-column>
+
+        <el-table-column prop="householderName" align="center" label="户主姓名">
+        </el-table-column>
+
+        <el-table-column
+          prop="householderRelation"
+          align="center"
+          label="与户主关系"
+        >
+        </el-table-column>
+
+        <el-table-column fixed="right" label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <!-- <el-button
+              @click="handleWatch(scope.$index)"
+              type="text"
+              size="small"
+              >查看</el-button
+            > -->
+
+            <el-button
+              @click="handleEdit(scope.$index)"
+              type="text"
+              size="small"
+              class="div-table-button--edit"
+              >修改</el-button
+            >
+
+            <el-popconfirm
+              v-if="false"
+              title="删除之后无法回复，确认删除？"
+              @onConfirm="handleDel(scope.row, scope.$index)"
+              @confirm="handleDel(scope.row, scope.$index)"
+            >
+              <el-button
+                slot="reference"
+                type="text"
+                size="small"
+                class="div-table-button--delete"
+                style="margin-left: 10px"
+                >删除</el-button
+              >
+            </el-popconfirm>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div>
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page.sync="pageNo"
+          :page-sizes="[20, 50, 100, 200]"
+          :page-size="parseInt(pageSize)"
+          layout="sizes, prev, pager, next, total"
+          :total="total"
+        >
+        </el-pagination>
+      </div>
+    </el-card>
+
+    <!-- 修改弹出框 -->
+    <el-dialog
+      :visible.sync="formShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="formTitle"
+      width="850px"
+      top="5vh"
+      class="dialog-h"
+      @closed="handleClose"
+    >
+      <edit-form
+        ref="eleEditForm"
+        @dialogCancle="handleClose"
+        @dialogOk="handleEditSuccess"
+      ></edit-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import { mapGetters } from "vuex";
+import editForm from "./cpts/edit";
+import axios from "axios";
+
+export default {
+  components: { editForm },
+  data() {
+    return {
+      openSearch: false,
+
+      formShow: false,
+      formTitle: "出生登记",
+
+      pageNo: 1,
+      pageSize: window.localStorage.getItem("pageSize") || 20,
+      total: 1,
+
+      tableData: [],
+
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+      optionsG: [],
+
+      optionsWelfare: [
+        {
+          value: "",
+          label: "全部",
+        },
+        {
+          value: "1",
+          label: "是",
+        },
+        {
+          value: "0",
+          label: "否",
+        },
+      ],
+
+      fmData: {
+        gridId: "",
+        villageId: "",
+        buildId: "",
+        unitId: "",
+        homeId: "",
+        name: "",
+        mobile: "",
+        idCard: "",
+        isWelfare: "", //福利0否，1是
+        birthdayStart: "",
+        birthdayEnd: "",
+        birthdayTime: ["", ""],
+      },
+
+      importBtnTitle: "导入",
+      importLoading: false,
+
+      //积分记录
+      scoreDiaTitle: "积分记录",
+      scoreDiaShow: false,
+    };
+  },
+  computed: {
+    maxTableHeight() {
+      return this.$store.state.inIframe
+        ? this.clientHeight - 360 + this.iframeHeigh
+        : this.clientHeight - 360;
+    },
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+    changeVDisabled() {
+      return !this.fmData.villageId;
+    },
+    changeBDisabled() {
+      return !this.fmData.buildId;
+    },
+    changeDDisabled() {
+      return !this.fmData.unitId;
+    },
+  },
+  watch: {
+    "fmData.birthdayTime": function (val) {
+      if (Array.isArray(val) && val.length == 2) {
+        this.fmData.birthdayStart = val[0];
+        this.fmData.birthdayEnd = val[1];
+      } else {
+        this.fmData.birthdayStart = "";
+        this.fmData.birthdayEnd = "";
+      }
+    },
+  },
+  mounted() {
+    this.getGridList();
+    this.getValiheList();
+    this.getTableData();
+  },
+  methods: {
+    handleClearVillage() {
+      this.fmData.buildId = "";
+      this.fmData.homeId = "";
+    },
+    handleClearBuild() {
+      this.fmData.buildId = "";
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
+    },
+    handleClearDan() {
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
+    },
+    handleChangeGrid(val) {
+      console.log("val", val);
+      this.fmData.villageId = "";
+      this.fmData.buildId = "";
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
+      this.getValiheList();
+    },
+    handleChangeV(val) {
+      console.log("val", val);
+      this.fmData.buildId = "";
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
+      this.getBuildList();
+    },
+    handleChangeB(val) {
+      console.log("val", val);
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
+      this.getUniList();
+    },
+    handleChangeD(val) {
+      console.log("val", val);
+      this.fmData.homeId = "";
+      this.getHouseList();
+    },
+
+    getGridList() {
+      const { user } = this.$store.state;
+      this.$http
+        .post("/gov/org/customergrid/gridoption", {
+          agencyId: user.agencyId,
+          purpose: "query",
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsG = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    getValiheList() {
+      const { user } = this.$store.state;
+      this.$http
+        .post("/gov/org/icneighborhood/neighborhoodoption", {
+          gridId: this.fmData.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.fmData.villageId,
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsB = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    getUniList() {
+      this.$http
+        .post("/gov/org/icbuildingunit/unitoption", {
+          buildingId: this.fmData.buildId,
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsD = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    getHouseList() {
+      this.$http
+        .post("/gov/org/ichouse/houseoption", { unitId: this.fmData.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("网络错误");
+        });
+    },
+
+    async handleExportModule() {
+      let url = "/heart/iccommunityselforganization/import-template-download";
+
+      let params = {};
+      await this.$http({
+        method: "POST",
+        url,
+        responseType: "blob",
+        data: params,
+      })
+        .then((res) => {
+          // this.download(res.data, title + '.xls')
+          if (res.headers["content-disposition"]) {
+            let fileName = window.decodeURI(
+              res.headers["content-disposition"].split(";")[1].split("=")[1]
+            );
+            console.log("filename", fileName);
+            let blob = new Blob([res.data], {
+              type: "application/vnd.ms-excel",
+            });
+            var url = window.URL.createObjectURL(blob);
+            var aLink = document.createElement("a");
+            aLink.style.display = "none";
+            aLink.href = url;
+            aLink.setAttribute("download", fileName);
+            document.body.appendChild(aLink);
+            aLink.click();
+            document.body.removeChild(aLink); //下载完成移除元素
+            window.URL.revokeObjectURL(url); //释放掉blob对象
+          } else this.$message.error("下载失败");
+        })
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
+    },
+    // 上传大图标成功
+    handleExcelSuccess(res, file) {
+      if (res.code === 0 && res.msg === "success") {
+        console.log("resss---ppp", res);
+      } else {
+        this.$message.error(res.msg);
+      }
+    },
+    handleProgress(event, file, fileList) {
+      console.log("percentage", file.percentage);
+    },
+
+    beforeExcelUpload(file) {
+      console.log("file", file);
+      const isType = file.type === "application/vnd.ms-excel";
+      const isTypeComputer =
+        file.type ===
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+      const fileType = isType || isTypeComputer;
+      const isLt1M = file.size / 1024 / 1024 < 10;
+      if (!fileType) {
+        this.$message.error("上传文件只能是xls/xlsx格式！");
+      }
+
+      if (!isLt1M) {
+        this.$message.error("上传文件大小不能超过 10MB!");
+      }
+      return fileType && isLt1M;
+    },
+    async uploadHttpRequest(file) {
+      this.importLoading = true;
+      this.importBtnTitle = "正在上传中...";
+      this.$message({
+        showClose: true,
+        message: "导入中，请到系统管理-导入记录中查看进度",
+        duration: 0,
+      });
+      const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+      formData.append("file", file.file); //添加文件对象
+      await this.$http
+        .post(
+          "/heart/iccommunityselforganization/importcommunityselforganization",
+          formData
+        )
+        .then((res) => {
+          console.log("res-up", res);
+          if (res.data.code == 0 && res.data.msg == "success") {
+            // this.$message.success('导入成功')
+            this.getTableData();
+          } else this.$message.error(res.data.msg);
+        })
+        .catch((err) => {
+          console.log("失败", err);
+          file.onError(); //上传失败的文件会从文件列表中删除
+          // this.$message.error('导入失败')
+        });
+      // axios({
+      //   url:
+      //     window.SITE_CONFIG["apiURL"] +
+      //     "/heart/iccommunityselforganization/importcommunityselforganization",
+      //   method: "post",
+      //   data: formData,
+      //   // responseType: "blob",
+      // })
+      //   .then((res) => {
+      //     this.importLoading = false;
+      //     this.importBtnTitle = "导入";
+      //     console.log("resresresresresresres", res);
+
+      //     this.getTableData();
+      //     if (res.data.code == 0) {
+      //       return this.$message.success(res.data.data || "导入成功");
+      //     } else {
+      //       return this.$message.error(res.data.msg);
+      //     }
+      //   })
+      //   .catch((err) => {
+      //     console.log("失败", err);
+      //   });
+      this.importLoading = false;
+      this.importBtnTitle = "导入";
+      this.$refs.upload.clearFiles();
+    },
+
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.pageSize = val;
+      window.localStorage.setItem("pageSize", val);
+      this.getTableData();
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.pageNo = val;
+      this.getTableData();
+    },
+
+    handleClose() {
+      this.formShow = false;
+    },
+    handleSearch(val) {
+      console.log(this.fmData);
+      this.pageNo = 1;
+      this.getTableData();
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.handleSearch();
+    },
+    async handleAdd() {
+      this.formShow = true;
+      await nextTick();
+      console.log(this.$refs);
+      this.$refs.eleEditForm.initForm("add");
+    },
+
+    async handleChu() {
+      const url = "/epmetuser/icBirthRecord/export";
+      const { pageSize, pageNo, fmData } = this;
+      axios({
+        url: window.SITE_CONFIG["apiURL"] + url,
+        method: "post",
+        data: {
+          pageSize,
+          pageNo,
+          ...fmData,
+        },
+        responseType: "blob",
+      })
+        .then((res) => {
+          let fileName = window.decodeURI(
+            res.headers["content-disposition"].split(";")[1].split("=")[1]
+          );
+          console.log("filename", fileName);
+          let blob = new Blob([res.data], { type: "application/vnd.ms-excel" });
+          var url = window.URL.createObjectURL(blob);
+          var aLink = document.createElement("a");
+          aLink.style.display = "none";
+          aLink.href = url;
+          aLink.setAttribute("download", fileName);
+          document.body.appendChild(aLink);
+          aLink.click();
+          document.body.removeChild(aLink); //下载完成移除元素
+          window.URL.revokeObjectURL(url); //释放掉blob对象
+        })
+        .catch((err) => {
+          console.log("获取导出情失败", err);
+          return this.$message.error("网络错误");
+        });
+    },
+
+    async handleWatch(rowIndex) {
+      this.formShow = true;
+      await nextTick();
+      this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]);
+    },
+
+    async handleEdit(rowIndex) {
+      this.formShow = true;
+      await nextTick();
+      this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]);
+    },
+    handleEditSuccess() {
+      this.handleClose();
+      this.getTableData();
+    },
+
+    async handleDel(rowData, rowIndex) {
+      console.log(rowData, rowIndex);
+      const url =
+        "/heart/iccommunityselforganization/delcommunityselforganization";
+      const { tableData } = this;
+
+      const { data, code, msg } = await requestPost(url, {
+        orgId: tableData[rowIndex].orgId,
+      });
+
+      if (code === 0) {
+        this.$message.success("删除成功！");
+        this.getTableData();
+      } else {
+        this.$message.success("操作失败！");
+      }
+    },
+
+    async getTableData() {
+      const url = "/epmetuser/icBirthRecord/page";
+      const { pageSize, pageNo, fmData } = this;
+      const { data, code, msg } = await requestPost(url, {
+        pageSize,
+        pageNo,
+        ...fmData,
+      });
+      if (code === 0) {
+        console.log("列表请求成功！！！！！！！！！！！！！！");
+        this.total = data.total || 0;
+        this.tableData = data.list
+          ? data.list.map((item) => {
+              return item;
+            })
+          : [];
+      } else {
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+
+.resi-container .resi-card-table {
+  ::v-deep .el-table th {
+    color: #fff;
+    background-color: rgba(33, 149, 254, 1);
+    // border-right: 1px solid rgba(33, 149, 254, 1);
+  }
+}
+.resi-table {
+  ::v-deep .el-button--text {
+    text-decoration: underline;
+  }
+}
+.resi-card-table {
+  margin-top: 20px;
+}
+.resi-row-btn {
+  margin-bottom: 13px;
+  .upload-btn {
+    display: inline-block;
+    margin: 0 10px;
+  }
+}
+
+.resi-btns {
+  margin-top: 20px;
+  text-align: center;
+}
+
+.resi-container .resi-card {
+  position: relative;
+  overflow: visible;
+}
+
+.demo-form-inline .resi-cell2 {
+  display: flex;
+  align-items: center;
+  margin-bottom: 20px;
+
+  .resi-cell2-label {
+    flex-shrink: 0;
+    min-width: 0;
+    box-sizing: border-box;
+    margin-right: 15px;
+    // text-align: right;
+    // line-height: 32;
+  }
+  .resi-cell2-label1 {
+    width: max-content;
+  }
+  .resi-cell2-value-radio {
+    display: flex;
+    align-items: center;
+    min-height: 32px;
+  }
+  .resi-cell2-input {
+    width: 200px;
+  }
+  .resi-cell2--daterange {
+    max-width: 260px;
+  }
+  .resi-cell2-select {
+    width: 200px;
+    box-sizing: border-box;
+    margin-right: 10px;
+    &-middle {
+      width: 130px;
+    }
+    &-small {
+      width: 88px;
+    }
+  }
+  .resi-cell2-select:last-child {
+    margin-right: 0;
+  }
+}
+</style>
diff --git a/src/views/modules/base/huji/houseChange/houseChangeList.vue b/src/views/modules/base/huji/houseChange/houseChangeList.vue
new file mode 100644
index 000000000..32ac78153
--- /dev/null
+++ b/src/views/modules/base/huji/houseChange/houseChangeList.vue
@@ -0,0 +1,485 @@
+<template>
+  <div class="div_main">
+    <div class="div_search">
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'90px'">
+        <div>
+
+          <el-form-item label="所属网格"
+                        prop="gridId">
+            <el-select class="item_width_1"
+                       v-model="formData.gridId"
+                       placeholder="全部"
+                       size="small"
+                       @change="handleChangeG"
+                       clearable>
+              <el-option v-for="item in gridList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+
+          </el-form-item>
+
+          <el-form-item label="所属房屋">
+            <div class="resi-cell-value">
+              <div class="resi-cell-col">
+                <el-form-item prop="neighborHoodId">
+                  <el-select v-model.trim="formData.neighborHoodId"
+                             :disabled="!this.formData.gridId"
+                             placeholder="小区"
+                             size="small"
+                             clearable
+                             class="resi-cell-select"
+                             @change="handleChangeV">
+                    <el-option v-for="item in optionsV"
+                               :key="item.value"
+                               :label="item.label"
+                               :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item prop="buildingId">
+                  <el-select v-model.trim="formData.buildingId"
+                             placeholder="楼号"
+                             :disabled="!this.formData.neighborHoodId"
+                             size="small"
+                             clearable
+                             class="resi-cell-select resi-cell-select-middle list_item_width_1"
+                             @change="handleChangeB">
+                    <el-option v-for="item in optionsB"
+                               :key="item.value"
+                               :label="item.label"
+                               :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item prop="buildingUnitId">
+                  <el-select v-model.trim="formData.buildingUnitId"
+                             placeholder="单元"
+                             size="small"
+                             :disabled="!this.formData.buildingId"
+                             clearable
+                             class="resi-cell-select resi-cell-select-middle list_item_width_1"
+                             @change="handleChangeD">
+                    <el-option v-for="item in optionsD"
+                               :key="item.value"
+                               :label="item.label"
+                               :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item prop="houseId">
+                  <el-select v-model.trim="formData.houseId"
+                             placeholder="房号"
+                             :disabled="!this.formData.buildingUnitId"
+                             size="small"
+                             clearable
+                             class="resi-cell-select resi-cell-select-middle list_item_width_1">
+                    <el-option v-for="item in optionsH"
+                               :key="item.value"
+                               :label="item.label"
+                               :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </div>
+
+            </div>
+          </el-form-item>
+
+        </div>
+
+        <div>
+          <el-form-item label="变更时间"
+                        prop="startDate">
+            <el-date-picker v-model="timeRange"
+                            size="small"
+                            type="daterange"
+                            value-format="yyyy-MM-dd"
+                            @change="handleTimeChange"
+                            range-separator="至"
+                            start-placeholder="开始时间"
+                            end-placeholder="结束时间">
+            </el-date-picker>
+
+          </el-form-item>
+          <el-button style="margin-left:30px"
+                     size="small"
+                     class="diy-button--search"
+                     @click="handleSearch">查询</el-button>
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--reset"
+                     @click="resetSearch">重置</el-button>
+        </div>
+      </el-form>
+    </div>
+    <div class="div_table">
+
+      <el-table ref="ref_table"
+                class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%">
+
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"></el-table-column>
+
+        <el-table-column prop="gridName"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="所属网格"
+                         min-width="150">
+        </el-table-column>
+        <el-table-column prop="houseName"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="所属房屋"
+                         min-width="150">
+        </el-table-column>
+        <el-table-column prop="changeBefore"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="变更前"
+                         min-width="250">
+        </el-table-column>
+        <el-table-column prop="changeAfter"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="变更后"
+                         min-width="250">
+        </el-table-column>
+        <el-table-column prop="changeTime"
+                         header-align="center"
+                         align="center"
+                         label="变更时间"
+                         width="130">
+        </el-table-column>
+
+      </el-table>
+      <div>
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
+        </el-pagination>
+      </div>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+
+import util from '@js/util.js';
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      loading: false,
+      total: 0,
+      pageSize: 20,
+      pageNo: 1,
+      tableLoading: false,
+
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+
+
+      tableData: [],
+
+      agencyId: '',
+      gridList: [],//所属网格list--场所区域
+      timeRange: [],
+      formData: {
+        gridId: '',//所属网格【网格Id】
+        neighborHoodId: '',//小区ID	
+        buildingId: '',//楼栋ID	
+        buildingUnitId: '',//楼栋单元ID	
+        houseId: '',//房屋ID	
+        startDate: '',//开始日期，eg：20220510	
+        endDate: '',//结束日期，eg：20220510	
+      }
+
+
+    }
+  },
+  components: {
+
+  },
+  async created () {
+
+  },
+  activated () {
+    this.$refs['ref_table'].doLayout()
+  },
+  async mounted () {
+
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+    //获取网格下拉框数据
+    await this.loadGrid()
+
+    await this.loadTable()
+  },
+
+  methods: {
+    handleSearch () {
+
+      this.loadTable()
+    },
+
+    async loadGrid () {
+      const url = "/gov/org/customergrid/gridoption"
+
+      let params = {
+        agencyId: this.agencyId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.gridList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+
+    async loadTable () {
+      this.tableLoading = true
+
+      const url = "/gov/org/icHouseChangeRecord/list"
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icEpidemicSpecialAttention/list"
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        ...this.formData
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.total = data.total
+        this.tableData = data.list
+
+
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+
+
+    handleChangeG (val) {
+      console.log('val', val)
+      this.formData.neighborHoodId = ''
+      this.formData.buildingId = ''
+      this.formData.buildingUnitId = ''
+      this.formData.houseId = ''
+      this.getValiheList()
+      this.getBuildList()
+      this.getUniList()
+      this.getHouseList()
+    },
+    handleChangeV (val) {
+      console.log('val', val)
+      this.formData.buildingId = ''
+      this.formData.buildingUnitId = ''
+      this.formData.houseId = ''
+      this.getBuildList()
+      this.getUniList()
+      this.getHouseList()
+    },
+    handleChangeB (val) {
+      console.log('val', val)
+      this.formData.buildingUnitId = ''
+      this.formData.houseId = ''
+      this.getUniList()
+      this.getHouseList()
+    },
+    handleChangeD () {
+      this.formData.houseId = ''
+      this.getHouseList()
+    },
+
+    getValiheList () {
+      const { user } = this.$store.state
+      this.$http
+        .post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.formData.gridId })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsV = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+
+    getBuildList () {
+      this.$http
+        .post('/gov/org/icbuilding/buildingoption', { neighborHoodId: this.formData.neighborHoodId })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsB = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getUniList () {
+      this.$http
+        .post('/gov/org/icbuildingunit/unitoption', { buildingId: this.formData.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', { buildingUnitId: this.formData.buildingUnitId })
+        .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('网络错误')
+        })
+    },
+
+    handleTimeChange (time) {
+      if (time) {
+        const startTimeArray = util.dateFormatter(time[0], 'date').split('-')
+        const endTimeArray = util.dateFormatter(time[1], 'date').split('-')
+
+        this.formData.startDate = startTimeArray[0] + startTimeArray[1] + startTimeArray[2]
+        this.formData.endDate = endTimeArray[0] + endTimeArray[1] + endTimeArray[2]
+
+        // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
+        // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
+      } else {
+        this.formData.startDate = ''
+        this.formData.endDate = ''
+        // this.startTimeShow = ''
+        // this.endTimeShow = ''
+      }
+
+    },
+
+
+
+
+    //重置搜索条件
+    resetSearch () {
+      this.timeRange = []
+      this.formData = {
+        gridId: '',//所属网格【网格Id】
+        neighborHoodId: '',//小区ID	
+        buildingId: '',//楼栋ID	
+        buildingUnitId: '',//楼栋单元ID	
+        houseId: '',//房屋ID	
+        startDate: '',//开始日期，eg：20220510	
+        endDate: '',//结束日期，eg：20220510	
+      }
+
+      this.pageNo = 1
+      // this.loadTable()
+    },
+
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+      return this.$store.state.inIframe ? this.clientHeight - 415 + this.iframeHeight : this.clientHeight - 415
+
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  watch: {
+
+  },
+  props: {
+
+  }
+}
+</script>
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+</style>
+
+
+
diff --git a/src/views/modules/plugins/assets/boy.png b/src/views/modules/plugins/assets/boy.png
new file mode 100644
index 000000000..c8b11a8f3
Binary files /dev/null and b/src/views/modules/plugins/assets/boy.png differ
diff --git a/src/views/modules/plugins/assets/girl.png b/src/views/modules/plugins/assets/girl.png
new file mode 100644
index 000000000..db4db50cf
Binary files /dev/null and b/src/views/modules/plugins/assets/girl.png differ
diff --git a/src/views/modules/plugins/power/kernelhouseholdAddMember.vue b/src/views/modules/plugins/power/kernelhouseholdAddMember.vue
new file mode 100644
index 000000000..5bf7d64dd
--- /dev/null
+++ b/src/views/modules/plugins/power/kernelhouseholdAddMember.vue
@@ -0,0 +1,136 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <div>
+        <div class="div_table">
+          <el-table ref="ref_table"
+                    :data="tableData"
+                    border
+                    :height="tableHeight"
+                    v-loading="tableLoading"
+                    :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                    style="width: 100%"
+                    highlight-current-row
+                    @selection-change="selectionChange">
+            <el-table-column type="selection"
+                            width="55">
+            </el-table-column>
+            <el-table-column prop="name"
+                            label="姓名">
+            </el-table-column>
+            <el-table-column prop="mobile"
+                            label="联系方式">
+            </el-table-column>
+            <el-table-column prop="idCard"
+                            label="身份证号">
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+    </div>
+    <div class="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 { mapGetters } from 'vuex'
+import { requestPost } from "@/js/dai/request";
+export default {
+  data () {
+    return {
+      btnDisable: false,
+      // 列表相关
+      tableData: [],
+      tableLoading: false,
+      selection: [],
+      houseId: '',
+      ownerName: ''
+    }
+  },
+  props: {
+  },
+  computed: {
+    tableHeight () {
+      return this.$store.state.inIframe ? this.clientHeight - 410 + this.iframeHeight : this.clientHeight - 410
+    },
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  components: {},
+  // mounted () {
+  //   this.tableLoading = true
+  //   this.loadTable()
+  // },
+  methods: {
+    initForm (id, ownerName) {
+      this.houseId = id
+      this.ownerName = ownerName
+      this.tableLoading = true
+      this.loadTable()
+    },
+    selectionChange (selection) {
+      // console.log(selection)
+      this.selection = []
+      selection.forEach(element => {
+        this.selection.push({
+          kernelMemberId: element.id,
+          kernelMemberName: element.name
+        })
+      });
+    },
+
+
+    // 确定
+    async handleComfirm () {
+      if (this.selection.length === 0 || !this.selection) {
+          return this.$message.error('请选择党员')
+      }
+      const url = "/pli/power/kernelMember/bind";
+      let params = {
+          houseId: this.houseId,
+          ownerName: this.ownerName,
+          kernelMemberList: this.selection
+      }
+      const { data, code, msg } = await requestPost(url, params);
+      this.tableLoading = false
+      if (code === 0) {
+        this.$refs.ref_table.clearSelection();
+        this.$emit('addMemberOk')
+      }
+    },
+    // 取消
+    handleCancle () {
+      this.$refs.ref_table.clearSelection();
+      this.$emit('addMemberCancle')
+    },
+    // 查询列表
+    async loadTable () {
+      const url = `/epmetuser/icresiuser/listhomeuserbrief/${this.houseId}`
+      const { data, code, msg } = await requestPost(url)
+      this.tableLoading = false
+      if (code === 0) {
+        this.tableData = data ? data.map((item) => { return item }) : []
+      }
+    }
+  },
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManage.scss";
+</style>
+<style  lang="scss" scoped>
+.div_btn{
+      display: flex;
+      align-items: center;
+      justify-content: center;
+}
+</style>
+
+
+
diff --git a/src/views/modules/plugins/power/kernelhouseholdTable.vue b/src/views/modules/plugins/power/kernelhouseholdTable.vue
index 66ea920f4..97a45c1f3 100644
--- a/src/views/modules/plugins/power/kernelhouseholdTable.vue
+++ b/src/views/modules/plugins/power/kernelhouseholdTable.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="div_search">
       <div class="resi-cell">
-        <div class="resi-cell-label">房主姓名</div>
+        <div class="resi-cell-label">党员名称</div>
         <div class="resi-cell-value">
           <el-input v-model="ownerName"
                     class="resi-cell-input"
@@ -32,7 +32,11 @@
                 :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
                 style="width: 100%">
         <el-table-column prop="ownerName"
-                         label="姓名"
+                         label="户主"
+                         width="100">
+        </el-table-column>
+        <el-table-column prop="kernelMemberNameConcat"
+                         label="中心党员"
                          width="100">
         </el-table-column>
         <el-table-column prop="address"
@@ -48,7 +52,7 @@
         </el-table-column>
         <el-table-column label="操作"
                          fixed="right"
-                         width="80"
+                         width="150"
                          header-align="center"
                          align="center"
                          class="operate">
@@ -57,6 +61,10 @@
                        class="div-table-button--delete"
                        size="small"
                        @click="handleDelete(scope.row.id)">删除</el-button>
+            <el-button type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleAddMember(scope.row.houseId, scope.row.ownerName)">中心党员</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -86,12 +94,26 @@
                       :axisStructId="axisStructId"></kernelhousehold-form>
     </el-dialog>
 
+    <!-- 添加党员 -->
+    <el-dialog :visible.sync="addMemberShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="addMemberTitle"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="addMemberClose">
+      <kernelhousehold-Add-Member ref="ref_table_Member"
+                      @addMemberCancle="addMemberCancle"
+                      @addMemberOk="addMemberOk"></kernelhousehold-Add-Member>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 
 import KernelhouseholdForm from './kernelhouseholdForm'
+import KernelhouseholdAddMember from './kernelhouseholdAddMember'
 import { requestPost, requestGet } from "@/js/dai/request";
 import { mapGetters } from 'vuex'
 export default {
@@ -105,11 +127,15 @@ export default {
       tableData: [],
       //form相关
       formShow: false,
-      formTitle: '绑定'
+      formTitle: '绑定',
+
+      addMemberShow: false,
+      addMemberTitle: '绑定'
     }
   },
   components: {
-    KernelhouseholdForm
+    KernelhouseholdForm,
+    KernelhouseholdAddMember
   },
   computed: {
     tableHeight () {
@@ -125,7 +151,7 @@ export default {
         limit: this.pageSize,
         page: this.pageNo,
         axisStructId: this.axisStructId,
-        ownerName: this.ownerName
+        kernelMemberName: this.ownerName
       }
       const { data, code, msg, total } = await requestGet(url, params)
       if (code === 0) {        
@@ -149,6 +175,13 @@ export default {
         })
     },
 
+    handleAddMember(id, ownerName) {
+      this.addMemberShow = true
+      this.$nextTick(() => {
+          this.$refs.ref_table_Member.initForm(id, ownerName)
+      })
+    },
+
     async deleteKernelhousehold (id) {
       const url = "/pli/power/kernelHousehold/delete"
       const { data, code, msg } = await requestPost(url, [id])
@@ -181,6 +214,9 @@ export default {
       // this.$refs.ref_form.resetData()
       this.formShow = false
     },
+    addMemberClose () {
+      this.addMemberShow = false
+    },
     handleAdd () {
       if (this.axisStructId) {
           this.formShow = true
@@ -191,10 +227,17 @@ export default {
     addFormCancle () {
       this.formShow = false
     },
+    addMemberCancle () {
+      this.addMemberShow = false
+    },
     addFormOk () {
       this.formShow = false
       this.loadTable()
     },
+    addMemberOk () {
+      this.addMemberShow = false
+      this.loadTable()
+    },
   },
   props: {
     axisStructId: {
diff --git a/src/views/modules/plugins/power/poweraxis_add_leader.vue b/src/views/modules/plugins/power/poweraxis_add_leader.vue
index 22ad049f2..b49fe926f 100644
--- a/src/views/modules/plugins/power/poweraxis_add_leader.vue
+++ b/src/views/modules/plugins/power/poweraxis_add_leader.vue
@@ -82,9 +82,13 @@
 <script>
 import debounce from 'lodash/debounce'
 import { requestPost } from "@/js/dai/request";
+import boy from '../assets/boy.png'
+import girl from '../assets/girl.png'
 export default {
   data () {
     return {
+      boy: boy,
+      girl: girl,
       tagTab: 'add',
       btnDisable: false,
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
@@ -164,8 +168,6 @@ export default {
     },
     handleImgSuccess (type, res, file) {
       if (res.code === 0 && res.msg === 'success') {
-        //         console.log('type', type)
-        // console.log('res.data.url', res.data.url)
         this.dataForm.avatar = res.data.url
       } else {
         this.$message.error(res.msg)
@@ -202,6 +204,11 @@ export default {
             ...this.dataForm,
             ...data
           }
+          if (this.dataForm.gender === '1') {
+              this.dataForm.avatar = this.dataForm.avatar ? this.dataForm.avatar : this.boy
+          } else {
+              this.dataForm.avatar = this.dataForm.avatar ? this.dataForm.avatar : this.girl
+          }
       } else {
           this.$message.error(msg)
       }
diff --git a/src/views/modules/visual/plugin/power/components/screen-org-map.vue b/src/views/modules/visual/plugin/power/components/screen-org-map.vue
index dbec75ded..177bca7ef 100644
--- a/src/views/modules/visual/plugin/power/components/screen-org-map.vue
+++ b/src/views/modules/visual/plugin/power/components/screen-org-map.vue
@@ -23,6 +23,7 @@ import { createStringXY } from 'ol/coordinate'
 import { defaults as defaultControls } from 'ol/control'
 import { mapGetters } from "vuex"
 import { Loading } from 'element-ui'
+import { requestPost } from "@/js/dai/request"
 
 let map
 let mapView
@@ -30,6 +31,19 @@ let gaodeMapLayer // 背景地图图层
 let markerSource
 let markerLayer
 
+
+
+let parentLayer;//上级组织图层
+let parentSource;//上级组织多边形
+
+
+let polygonSource;//变电站标注多边形
+let iconSource; // icon
+let polygonLayer;//变电站标注图层
+let select;//选中标注
+let iconLayer; // icon标注图层
+var centerPointGlobal = [120.38945519, 36.0722275]
+
 const iconArray = [
     'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
     'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png',
@@ -40,35 +54,105 @@ const textColorArray = [
   'rgba(0, 146, 238, 0.75)',
   'rgba(238, 151, 0, 0.8)'
 ]
+let polygonColorArray = [
+  'rgba(210, 2, 2, 0.24)',
+  'rgba(43, 231, 253, 0.25)',
+  'rgba(183, 185, 0, 0.16)'
+];
+let iconUrlArray = [
+  'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
+  'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png',
+  'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png'
+];
+//变电站标注的文字样式
 var createTextStyle = function (feature) {
   return new Text({
     textAlign: undefined,
     font: "18px Arial",
-    text: feature.values_.properties.name,
+    //fontFamily: "Courier New, monospace",
+    // fontWeight: "bold",
+    text: feature.values_.name,
     backgroundFill: new Fill({
-      color: textColorArray[0]
+      // color: 'rgba(0, 146, 238, 0.75)'
+      color: textColorArray[feature.values_.colorIndex]
     }),
     padding: [4, 10, 4, 10],
+    //text: "变电站名称",
     fill: new Fill({ color: "#ffffff" }),
+    // stroke: new Stroke({ color: "#ffffff", width: 3 }),
     offsetY: -30,
     offsetX: -50,
     overflow: true,
-  })
-}
+  });
+};
+//上级组织标注样式
+var parentStyleFunction = (function () {
+  return function (feature) {
+    return new Style({
+      // fill: new Fill({
+      //   color: [255, 255, 255, 0.3]
+      // }),
+      stroke: new Stroke({
+        color: [0, 103, 182, 1],
+        width: 2
+      }),
+
+      // text: createTextStyle(feature)
+    });;
+  };
+})()
+
+
+//变电站标注样式
+var polygonStyleFunction = (function () {
+  return function (feature) {
+    return new Style({
+      fill: new Fill({
+        // color: [255, 255, 255, 0.3]
+        color: polygonColorArray[feature.values_.colorIndex]
+      }),
+      stroke: new Stroke({
+        color: polygonColorArray[feature.values_.colorIndex],
+        width: 3
+      }),
+
+      text: createTextStyle(feature)
+    });;
+  };
+})()
 export default {
   name: "screen-org-map",
   data() {
     return {
-      centerPoint: [120.38945519, 36.0722275], // 中心点位置
-      zoom: 15, // 缩放范围：区14
+      centerPoint: [], // 中心点位置
+      zoom: 14, // 缩放范围：区14
       minZoom: 1, // 最小缩放
+      orgData: {},//当前组织对象
+      iconCoordinators: [],
+      parentPolygon: [],
+      subAgencyArray: []
     }
   },
-  mounted() {
+  async mounted() {
+
+    //加载组织数据
+    await this.loadOrgData()
     this.initMap()
+    this.addParentLayer()
+    this.loadParentPolygon()
+    //添加标注图层
+    this.addPolygonLayer()
+
+    //添加icontuceng
+    this.addIconLayer()
+
+    //加载当前园区的标注
+    this.loadPolygon()
   },
   methods: {
     initMap () {
+      this.firstCenterMap()
+
       gaodeMapLayer = new TileLayer({
         title: "地图",
         source: new XYZ({
@@ -95,6 +179,16 @@ export default {
         // console.log(transform(e.coordinate, 'EPSG:3857', 'EPSG:4326'));
       })
     },
+    firstCenterMap () {
+      this.centerPoint = []
+      if (this.orgData.longitude && this.orgData.latitude) {
+        this.centerPoint.push(this.orgData.longitude)
+        this.centerPoint.push(this.orgData.latitude)
+
+      } else {
+        this.centerPoint = centerPointGlobal
+      }
+    },
     addMarker (list, icon=iconArray[0], scale=1) {
       markerSource = new VectorSource({
         // features: new GeoJSON().readFeatures(geojsonObject)
@@ -151,6 +245,271 @@ export default {
       markerSource.addFeatures(features)
       map.addLayer(markerLayer)
     },
+    //加载组织数据
+    async loadOrgData () {
+
+      const url = "/gov/org/agency/maporg"
+      let params = {
+        orgId: '',
+        level: ''
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+
+        this.orgData = data
+        // this.orgId = this.orgData.id
+        // this.orgLevel = this.orgData.level
+        this.parentPolygon = []
+        this.parentPolygon.push(data)
+        if (data.children && data.children.length > 0) {
+          this.subAgencyArray = data.children
+        } else {
+          this.subAgencyArray = []
+        }
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    //加载父级组织多边形
+    loadParentPolygon () {
+      parentSource.clear()//清空变电站标注
+
+      let featureData = []//标注数据
+      if (this.parentPolygon && this.parentPolygon.length > 0) {//判断是否存在下级标注
+        let oneData = {}
+
+        this.parentPolygon.forEach(agencyItem => {
+
+          if (agencyItem.coordinates && agencyItem.coordinates !== '') {//如果有坐标
+            oneData = {
+              type: 'Feature',
+              id: agencyItem.id,
+              properties: {
+                id: agencyItem.id,
+                level: agencyItem.level,
+                name: agencyItem.name
+              },
+              geometry: {
+                type: 'Polygon',
+                coordinates: [],
+              },
+            }
+            let coorArray = agencyItem.coordinates.split(',')//坐标数组
+
+            let itemArray = []//单个点位的[lon,lat]，数组
+            let polygonArray = []//整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
+
+            coorArray.forEach((item, index) => {
+              itemArray.push(item)
+              if (index % 2 == 0) {//偶
+
+              } else {//奇
+                polygonArray.push(itemArray)
+                itemArray = []
+              }
+
+            });
+            oneData.geometry.coordinates.push(polygonArray)
+            featureData.push(oneData)
+          }
+        });
+      }
+
+      if (featureData && featureData.length > 0) {
+        var geojsonObject = {
+          'type': 'FeatureCollection',
+          'features': featureData
+        };
+        let feature = (new GeoJSON()).readFeatures(geojsonObject)
+        parentSource.addFeatures(feature)
+
+      }
+
+    },
+    //加载当前园区的标注
+    loadPolygon () {
+      let featureData = []//标注数据
+
+      if (this.subAgencyArray && this.subAgencyArray.length > 0) {//判断是否存在下级标注
+        let oneData = {}
+
+        let count = 0
+        for (let i = 0; i < this.subAgencyArray.length; i++) {
+          const agencyItem = this.subAgencyArray[i]
+          
+
+          if (agencyItem.coordinates && agencyItem.coordinates !== '') {//如果有坐标
+            let urlNum = count % 3
+            count++
+
+            oneData = {
+              type: 'Feature',
+              id: agencyItem.id,
+              properties: {
+                id: agencyItem.id,
+                level: agencyItem.level,
+                name: agencyItem.name,
+                colorIndex: urlNum//颜色随机的索引
+              },
+              geometry: {
+                type: 'Polygon',
+                coordinates: [],
+              },
+            }
+            let coorArray = agencyItem.coordinates.split(',')//坐标数组
+
+            let itemArray = []//单个点位的[lon,lat]，数组
+            let polygonArray = []//整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
+
+            coorArray.forEach((item, index) => {
+              itemArray.push(item)
+              if (index % 2 == 0) {//偶
+
+              } else {//奇
+                polygonArray.push(itemArray)
+                itemArray = []
+              }
+
+            });
+            oneData.geometry.coordinates.push(polygonArray)
+            featureData.push(oneData)
+          }
+        }
+      }
+
+      if (featureData && featureData.length > 0) {
+        var geojsonObject = {
+          'type': 'FeatureCollection',
+          'features': featureData
+        };
+        let feature = (new GeoJSON()).readFeatures(geojsonObject)
+        polygonSource.addFeatures(feature)
+
+        let iconFeatures = [];
+        feature.forEach(oneIcon => {
+          var extent = boundingExtent(oneIcon.getGeometry().getCoordinates()[0]); //获取一个坐标数组的边界，格式为[minx,miny,maxx,maxy]
+          // var center = getCenter(extent);   //获取边界区域的中心位置
+          //添加标注
+          let x = (parseFloat(extent[0]) + parseFloat(extent[2])) / 2
+          let y = (parseFloat(extent[1]) + parseFloat(extent[3])) / 2
+
+          let oneArray = [x, y]
+          this.iconCoordinators.push(oneArray)
+          // debugger
+          //地图icon样式
+          let oneCctv = new Feature({
+            geometry: new Point([x, y]),
+            id: oneIcon.id_,
+            properties: {
+              type: "icon",
+              id: oneIcon.id_
+            }
+          });
+
+          let iconStyle = new Style({
+            image: new Icon({
+              // anchor: [0.5, 0.5],
+              // imgSize: [32, 32],
+              scale: 0.5,
+              // src: "/img/largeScreen/icon_camra.png"
+              // src: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png"
+              src: iconUrlArray[oneIcon.values_.colorIndex]
+            })
+          });
+
+          oneCctv.setStyle(iconStyle);
+          iconFeatures.push(oneCctv);
+
+        });
+
+        iconSource.addFeatures(iconFeatures);
+      }
+
+    },
+    //添加变电站标注图层
+    addParentLayer () {
+      parentSource = new VectorSource({
+        //features: (new GeoJSON()).readFeatures(geojsonObject)
+      });
+
+      parentLayer = new VectorLayer({
+        source: parentSource,
+        style: parentStyleFunction,
+        zIndex: 50
+      });
+      map.addLayer(parentLayer)
+    },
+    //添加变电站标注图层
+    addPolygonLayer () {
+      polygonSource = new VectorSource({
+        //features: (new GeoJSON()).readFeatures(geojsonObject)
+      });
+
+      polygonLayer = new VectorLayer({
+        source: polygonSource,
+        style: polygonStyleFunction,
+        zIndex: 50
+      });
+
+      //选中多边形后的样式
+      var overlayStyle = (function () {
+
+        return function (feature) {
+          var styles = {};
+          styles['Polygon'] = [
+            new Style({
+              stroke: new Stroke({
+                color: '#ec9000',
+                width: 2
+              })
+            }),
+
+            new Style({
+              fill: new Fill({
+                color: 'rgba(0, 0, 255, 0.1)'
+              })
+            }),
+            new Style({
+              text: createTextStyle(feature)
+            })
+          ];
+          styles['MultiPolygon'] = styles['Polygon'];
+          return styles[feature.getGeometry().getType()];
+        };
+      })();
+
+      select = new Select({
+        style: overlayStyle
+      });
+
+
+      map.addLayer(polygonLayer)
+      map.addInteraction(select);
+
+      // select.on('select', e => {
+      //   this.toSubAgency('polygon', e)
+      // });
+
+    },
+
+    addIconLayer () {
+      iconSource = new VectorSource({
+        //features: (new GeoJSON()).readFeatures(geojsonObject)
+      });
+
+      iconLayer = new VectorLayer({
+        source: iconSource,
+        zIndex: 70
+      });
+
+      map.addLayer(iconLayer);
+
+    },
+
   },
 }
 </script>
diff --git a/src/views/modules/visual/plugin/power/components/screen-org-tree.vue b/src/views/modules/visual/plugin/power/components/screen-org-tree.vue
index aee878e2b..77263287e 100644
--- a/src/views/modules/visual/plugin/power/components/screen-org-tree.vue
+++ b/src/views/modules/visual/plugin/power/components/screen-org-tree.vue
@@ -249,6 +249,9 @@ export default {
 .screen-org-tree {
   width: 100%;
   height: 100%;
+  .level-row{
+    overflow: auto;
+  }
   .level-1-row {
     width: 100%;
     display: flex;
diff --git a/src/views/modules/visual/plugin/power/organization.vue b/src/views/modules/visual/plugin/power/organization.vue
index 62fdfc1ff..303424b19 100644
--- a/src/views/modules/visual/plugin/power/organization.vue
+++ b/src/views/modules/visual/plugin/power/organization.vue
@@ -129,7 +129,7 @@ export default {
     return {
       headerList: [
         { title: "序号", coulmn: 'index', width: '100px' },
-        { title: "党员", coulmn: 'ownerName' },
+        { title: "党员", coulmn: 'kernelMemberNameConcat' },
         { title: "地址", coulmn: 'address' }
       ],
       headerStyle: [
@@ -170,7 +170,7 @@ export default {
     // this.agencyId = user.agencyId
     // console.log('agencyId-------', this.agencyId)
     // this.agencyId = '50140d770c578100328792121aa7b3c5'
-    this.axisStructId = '1518062548749725697'
+    // this.axisStructId = '1518062548749725697'
     await nextTick(100)
     await this.getAgencylist()//获取组织级别
     await this.getStructTree()
@@ -179,6 +179,7 @@ export default {
   },
   methods: {
     onClickNode (e) {
+      this.pageNo = 1
       this.axisStructId = e.id
       this.getList()
     },
@@ -465,6 +466,7 @@ export default {
     position: relative;
     flex: 1;
     height: 100%;
+    width: 50%;
     &-top {
       width: 100%;
       height: 550px;
@@ -510,6 +512,7 @@ export default {
     position: relative;
     flex: 1;
     height: 100%;
+    width: 50%;
     &-top {
       width: 100%;
       height: 100px;