From 7144ac4c756bbcacb8d3ea107669be4851e14611 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Sun, 9 Oct 2022 17:46:40 +0800
Subject: [PATCH 01/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/organization/organization.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 7853ade91..54cdf2e95 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -2477,7 +2477,7 @@ export default {
       const url = "/gov/org/agency/addagency-v2";
 
       let params = {
-        parentAgencyId: this.parentAgencyId,
+        parentAgencyId: this.currentAgencyId,
         agencyName: this.agencyForm.agencyName,
         level: this.agencyForm.level,
         areaCodeSwitch: "closed",

From 03fa771115fa0d0ed161594f7c2cd9f52f0b757d Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 10 Oct 2022 16:48:08 +0800
Subject: [PATCH 02/18] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20=E5=BF=83=E7=B4=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/organization/organization.vue        | 117 ++++++++----------
 1 file changed, 52 insertions(+), 65 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 54cdf2e95..8195c3c4f 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -728,11 +728,20 @@
         <el-form-item label="调动至">
           <el-cascader
             clearable
-            :props="{ checkStrictly: true }"
+            :props="{ multiple: false }"
             v-model="selectValue"
             :options="options"
-            @change="handleChange"
+            style="width: 100%"
+            @change="handleChangeTransferCascader"
           >
+            <template slot-scope="{ data }">
+              <span>{{ data.label }}</span>
+              <span
+                v-if="data.type != 'agency'"
+                style="color: #aaa; font-size: 12px"
+                >（{{ data.typeName }}）
+              </span>
+            </template>
           </el-cascader>
         </el-form-item>
         <el-form-item label="调动原因">
@@ -1254,24 +1263,7 @@ export default {
       roleList: [],
 
       // 级联数据
-      options: [
-        {
-          value: "",
-          label: "",
-          children: [
-            {
-              value: "",
-              label: "",
-              children: [],
-            },
-            {
-              value: "",
-              label: "",
-              children: [],
-            },
-          ],
-        },
-      ],
+      options: [],
       selectValue: [],
       // 顶部 面包屑
       breadcrumbArr: [],
@@ -1358,30 +1350,24 @@ export default {
   },
   methods: {
     // 点击后获取id
-    handleChange(e) {
-      this.transferForm.orgId = e[1];
-      if (this.transferForm.orgId != null || "") {
-        if (this.transferForm.orgId === 0) {
-          if (e[2] == null || "") {
-            this.transferForm.orgType = "dept";
-            this.transferForm.orgId = "14f572e724eecf7668b655505d789cab";
-          } else {
-            this.transferForm.orgId = e[2];
-            this.transferForm.orgType = "dept";
-          }
+    handleChangeTransferCascader(e) {
+      console.log("*********************");
+      function findItem(valueArr, coll) {
+        console.log("--------------------");
+        console.log(valueArr);
+        let copyArr = [...valueArr];
+        let firstValue = copyArr.shift();
+        let item = coll.find((a) => a.value == firstValue);
+        console.log(item);
+        if (copyArr.length > 0) {
+          return findItem(copyArr, item.children);
         } else {
-          if (e[2] == null || "") {
-            this.transferForm.orgType = "grid";
-            this.transferForm.orgId = "63d5ff92ea981b1c58e4914ac894c610";
-          } else {
-            this.transferForm.orgId = e[2];
-            this.transferForm.orgType = "grid";
-          }
+          return item;
         }
-      } else {
-        this.transferForm.orgId = e[0];
-        this.transferForm.orgType = "agency";
       }
+      let item = findItem(e, this.options);
+      this.transferForm.orgId = item.value;
+      this.transferForm.orgType = item.type;
     },
     /** 查询系统工作人员角色（职责） */
     async getDutyList() {
@@ -2166,31 +2152,32 @@ export default {
       const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.options[0].label = data.agencyName;
-        this.options[0].value = data.agencyId;
-
-        console.log("--------", this.options);
-        let depart = Array.from(data.departmentList);
-        let gr = Array.from(data.gridList);
-
-        depart.forEach((item) => {
-          const ob = {
-            value: item.deptId,
-            label: item.deptName,
-          };
-          this.options[0].children[0].children.push(ob);
-        });
-        this.options[0].children[0].value = 0;
-        this.options[0].children[0].label = "部门";
-        this.options[0].children[1].value = 1;
-        this.options[0].children[1].label = "网格";
-        gr.forEach((item) => {
-          const obj = {
-            value: item.gridId,
-            label: item.gridName,
+        function computeOption(opt) {
+          return {
+            label: opt.agencyName,
+            value: opt.agencyId,
+            type: "agency",
+            children: [
+              ...(opt.departmentList || []).map((item) => ({
+                label: item.deptName,
+                value: item.deptId,
+                type: "dept",
+                typeName: "部门",
+              })),
+              ...(opt.gridList || []).map((item) => ({
+                label: item.gridName,
+                value: item.gridId,
+                type: "grid",
+                typeName: "网格",
+              })),
+              ...(opt.subAgencyList || []).map((item) => computeOption(item)),
+            ],
           };
-          this.options[0].children[1].children.push(obj);
-        });
+        }
+        if (data) {
+          this.options = [computeOption(data)];
+          console.log("树树树树树树树树树树", this.options[0]);
+        }
       } else {
         this.$message.error("树查询失败", msg);
       }

From 8ff19694ab70536ad1e514b052ac9d75304e27d5 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 10 Oct 2022 17:35:59 +0800
Subject: [PATCH 03/18] =?UTF-8?q?=E5=86=8D=E5=8F=91=E5=86=8D=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/organization/organization.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 8195c3c4f..8833356ca 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -728,7 +728,7 @@
         <el-form-item label="调动至">
           <el-cascader
             clearable
-            :props="{ multiple: false }"
+            :props="{ checkStrictly: true, multiple: false }"
             v-model="selectValue"
             :options="options"
             style="width: 100%"

From 3e96d1023f743f4850e362c8287425ad58029701 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 11 Oct 2022 10:43:31 +0800
Subject: [PATCH 04/18] =?UTF-8?q?=E4=B8=AD=E9=80=94=E5=8E=BB=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/renFangTongJi/index.vue | 110 ++++++++++++++++++++++
 1 file changed, 110 insertions(+)
 create mode 100644 src/views/modules/renFangTongJi/index.vue

diff --git a/src/views/modules/renFangTongJi/index.vue b/src/views/modules/renFangTongJi/index.vue
new file mode 100644
index 000000000..dddb7413a
--- /dev/null
+++ b/src/views/modules/renFangTongJi/index.vue
@@ -0,0 +1,110 @@
+<template>
+  <div class="g-cnt">
+    <el-card class="m-tb">
+      <h2>下级平台使用进度汇总</h2>
+      <el-table
+        :data="tableData"
+        border
+        style="width: 100%"
+        class="tb"
+        :max-height="maxTableHeight"
+      >
+        <el-table-column label="序号" type="index" align="center" width="50" />
+        <el-table-column prop="orgName" label="所属组织"> </el-table-column>
+        <el-table-column prop="usingCommunityNum" label="开通平台社区数">
+        </el-table-column>
+        <el-table-column prop="userTotal" label="人口总数"></el-table-column>
+        <el-table-column
+          prop="czUserTotal"
+          label="常住人口总数"
+        ></el-table-column>
+        <el-table-column
+          prop="ldUserTotal"
+          label="流动人口总数"
+        ></el-table-column>
+        <el-table-column prop="houseTotal" label="房屋总数"></el-table-column>
+        <el-table-column
+          prop="zzHouseTotal"
+          label="自住房屋总数"
+        ></el-table-column>
+        <el-table-column
+          prop="czHouseTotal"
+          label="出租房屋总数"
+        ></el-table-column>
+        <el-table-column
+          prop="xzHouseTotal"
+          label="闲置房屋总数"
+        ></el-table-column>
+      </el-table>
+    </el-card>
+
+    <!-- 修改弹出框 -->
+    <el-dialog
+      :visible.sync="displayedDetail"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="开放社区数"
+      width="850px"
+      top="5vh"
+      @closed="displayedDetail = false"
+    >
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import { mapGetters } from "vuex";
+
+export default {
+  name: "renFangTongJi",
+  components: {},
+  data() {
+    return {
+      displayedDetail: false,
+      tableData: [],
+
+      orgId: "",
+      orgType: "",
+    };
+  },
+  computed: {
+    maxTableHeight() {
+      return this.clientHeight - 450;
+    },
+    ...mapGetters(["clientHeight"]),
+  },
+  watch: {
+    orgId() {
+      this.getTableData();
+    },
+  },
+  mounted() {
+    this.getTableData();
+  },
+  methods: {
+    async getTableData() {
+      const url = "/gov/org/house/subuserhouselist";
+
+      const { data, code, msg } = await requestPost(url, {
+        orgId: this.orgId,
+        orgType: this.orgType,
+      });
+
+      if (code === 0) {
+        this.tableData = data
+          ? data.map((item) => {
+              return item;
+            })
+          : [];
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/scss/c/config";
+@import "@/assets/scss/c/function";
+</style>

From 957451d0be49cd59468fe056d33d997e2f23d8d1 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 11 Oct 2022 13:57:54 +0800
Subject: [PATCH 05/18] =?UTF-8?q?=E6=89=80=E6=9C=89=E7=9A=84=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E6=94=B9=E4=BA=86=E4=B8=80=E9=81=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/buildForm.vue      |    6 +-
 .../modules/base/community/communityForm.vue  |    6 +-
 .../communityParty/heart/heartForm.vue        | 1010 +++++++++--------
 .../regionalParty/activitysForm.vue           |    8 +-
 .../regionalParty/unitsForm.vue               |    8 +-
 .../communityService/dqfwzx/cpts/edit.vue     |    8 +-
 .../communityService/fuwuzuzhi/cpts/edit.vue  |    8 +-
 .../communityService/shzz/cpts/edit.vue       |  294 ++---
 .../communityService/sqzzz/cpts/edit.vue      |   12 +-
 src/views/modules/cpts/base/cpts/edit.vue     |    8 +-
 .../modules/shequzhili/csgltc/csglForm.vue    |    8 +-
 .../modules/shequzhili/event/cpts/add.vue     |    8 +-
 .../modules/shequzhili/ggfwtc/ggfwForm.vue    |    8 +-
 13 files changed, 742 insertions(+), 650 deletions(-)

diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue
index e0335a6cb..9393d5d9d 100644
--- a/src/views/modules/base/community/buildForm.vue
+++ b/src/views/modules/base/community/buildForm.vue
@@ -372,9 +372,11 @@ export default {
       markers.setGeometries([])
       // 在地图显示范围内以给定的关键字搜索地点
       search
-        .searchRectangle({
+        .searchNearby({
           keyword: this.keyWords,
-          bounds: map.getBounds()
+          radius: 1000,
+          autoExtend: true,
+          center: map.getCenter(),
         })
         .then((result) => {
           let { data } = result
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index c3d8f4203..13f0437a2 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -285,9 +285,11 @@ export default {
       markers.setGeometries([])
       // 在地图显示范围内以给定的关键字搜索地点
       search
-        .searchRectangle({
+        .searchNearby({
           keyword: this.keyWords,
-          bounds: map.getBounds()
+          radius: 1000,
+          autoExtend: true,
+          center: map.getCenter(),
         })
         .then((result) => {
           let { data } = result
diff --git a/src/views/modules/communityParty/heart/heartForm.vue b/src/views/modules/communityParty/heart/heartForm.vue
index 1203f9cf5..093b3e690 100644
--- a/src/views/modules/communityParty/heart/heartForm.vue
+++ b/src/views/modules/communityParty/heart/heartForm.vue
@@ -1,221 +1,279 @@
 <template>
   <div>
     <div class="dialog-h-content scroll-h">
-
-      <el-form ref="ref_form"
-               :inline="true"
-               :model="formData"
-               :rules="dataRule"
-               :disabled="formType === 'detail'"
-               class="div_form ">
+      <el-form
+        ref="ref_form"
+        :inline="true"
+        :model="formData"
+        :rules="dataRule"
+        :disabled="formType === 'detail'"
+        class="div_form"
+      >
         <div class="form_flex">
-
           <div class="form_item">
-            <el-form-item label="主办方"
-                          prop="sponsorId"
-                          label-width="150px">
-
-              <el-cascader v-if="formData.richTextFlag||formType==='add'"
-                           class="item_width_6"
-                           ref="myCascader"
-                           v-model="agencyIdArray"
-                           :options="orgOptions"
-                           :props="orgOptionProps"
-                           :show-all-levels="false"
-                           @change="handleChangeAgency"></el-cascader>
-              <el-input v-else
-                        class="item_width_6"
-                        v-model="formData.sponsorName"></el-input>
+            <el-form-item label="主办方" prop="sponsorId" label-width="150px">
+              <el-cascader
+                v-if="formData.richTextFlag || formType === 'add'"
+                class="item_width_6"
+                ref="myCascader"
+                v-model="agencyIdArray"
+                :options="orgOptions"
+                :props="orgOptionProps"
+                :show-all-levels="false"
+                @change="handleChangeAgency"
+              ></el-cascader>
+              <el-input
+                v-else
+                class="item_width_6"
+                v-model="formData.sponsorName"
+              ></el-input>
             </el-form-item>
 
-            <el-form-item label="活动标题"
-                          prop="title"
-                          label-width="150px"
-                          style="display: block">
-              <el-input class="item_width_6"
-                        type="textarea"
-                        maxlength="50"
-                        show-word-limit
-                        :rows="2"
-                        placeholder="请输入活动标题，不超过50字"
-                        v-model="formData.title"></el-input>
+            <el-form-item
+              label="活动标题"
+              prop="title"
+              label-width="150px"
+              style="display: block"
+            >
+              <el-input
+                class="item_width_6"
+                type="textarea"
+                maxlength="50"
+                show-word-limit
+                :rows="2"
+                placeholder="请输入活动标题，不超过50字"
+                v-model="formData.title"
+              ></el-input>
             </el-form-item>
 
-            <el-form-item label="封面"
-                          prop="coverPic"
-                          label-width="150px"
-                          style="display:block">
-              <el-upload :headers="$getElUploadHeaders()"  :class="['avatar-uploader', {'hide': hideUploadBtn}] "
-                         ref="uploadPic"
-                         :action="uploadUlr"
-                         list-type="picture-card"
-                         :on-exceed="exceedPic"
-                         :before-upload="beforeAvatarUpload"
-                         :on-remove="removePic"
-                         :file-list="replayImgList"
-                         :on-change="handleEditChange"
-                         :on-success="handleSuccess"
-                         :limit="1">
+            <el-form-item
+              label="封面"
+              prop="coverPic"
+              label-width="150px"
+              style="display: block"
+            >
+              <el-upload
+                :headers="$getElUploadHeaders()"
+                :class="['avatar-uploader', { hide: hideUploadBtn }]"
+                ref="uploadPic"
+                :action="uploadUlr"
+                list-type="picture-card"
+                :on-exceed="exceedPic"
+                :before-upload="beforeAvatarUpload"
+                :on-remove="removePic"
+                :file-list="replayImgList"
+                :on-change="handleEditChange"
+                :on-success="handleSuccess"
+                :limit="1"
+              >
                 <span class="font-14">选择图片</span>
-
               </el-upload>
             </el-form-item>
 
-            <el-form-item label="活动时间"
-                          label-width="150px"
-                          prop="actStartTime">
-              <el-date-picker v-model="formData.actStartTime"
-                              class="list_item_width_3"
-                              type="datetime"
-                              value-format="yyyy-MM-dd HH:mm"
-                              format="yyyy-MM-dd HH:mm"
-                              placeholder="开始时间">
+            <el-form-item
+              label="活动时间"
+              label-width="150px"
+              prop="actStartTime"
+            >
+              <el-date-picker
+                v-model="formData.actStartTime"
+                class="list_item_width_3"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm"
+                format="yyyy-MM-dd HH:mm"
+                placeholder="开始时间"
+              >
               </el-date-picker>
               <span class="data-tag">至</span>
-              <el-date-picker v-model="formData.actEndTime"
-                              class="list_item_width_3 data-tag"
-                              type="datetime"
-                              value-format="yyyy-MM-dd HH:mm"
-                              format="yyyy-MM-dd HH:mm"
-                              placeholder="结束时间">
+              <el-date-picker
+                v-model="formData.actEndTime"
+                class="list_item_width_3 data-tag"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm"
+                format="yyyy-MM-dd HH:mm"
+                placeholder="结束时间"
+              >
               </el-date-picker>
             </el-form-item>
 
-            <el-form-item label="活动人数"
-                          prop="actQuota"
-                          style="display: block"
-                          label-width="150px">
-              <el-input-number class="item_width_2"
-                               :min="0"
-                               v-model="formData.actQuota"
-                               label="活动人数"></el-input-number>
+            <el-form-item
+              label="活动人数"
+              prop="actQuota"
+              style="display: block"
+              label-width="150px"
+            >
+              <el-input-number
+                class="item_width_2"
+                :min="0"
+                v-model="formData.actQuota"
+                label="活动人数"
+              ></el-input-number>
             </el-form-item>
 
-            <el-form-item label="活动积分"
-                          prop="reward"
-                          style="display: block"
-                          label-width="150px">
-              <el-input-number class="item_width_2"
-                               :min="0"
-                               v-model="formData.reward"
-                               label="活动积分"></el-input-number>
+            <el-form-item
+              label="活动积分"
+              prop="reward"
+              style="display: block"
+              label-width="150px"
+            >
+              <el-input-number
+                class="item_width_2"
+                :min="0"
+                v-model="formData.reward"
+                label="活动积分"
+              ></el-input-number>
             </el-form-item>
-            <el-form-item label="联系人"
-                          prop="sponsorContacts"
-                          label-width="150px"
-                          style="display: block">
-              <el-input class="item_width_6"
-                        maxlength="20"
-                        placeholder="请输入联系人"
-                        v-model="formData.sponsorContacts">
+            <el-form-item
+              label="联系人"
+              prop="sponsorContacts"
+              label-width="150px"
+              style="display: block"
+            >
+              <el-input
+                class="item_width_6"
+                maxlength="20"
+                placeholder="请输入联系人"
+                v-model="formData.sponsorContacts"
+              >
               </el-input>
             </el-form-item>
           </div>
           <div class="form_item">
-
-            <el-form-item label="联系电话"
-                          prop="sponsorTel"
-                          label-width="150px"
-                          style="display: block">
-              <el-input class="item_width_6"
-                        maxlength="20"
-                        placeholder="请输入联系电话"
-                        v-model="formData.sponsorTel">
+            <el-form-item
+              label="联系电话"
+              prop="sponsorTel"
+              label-width="150px"
+              style="display: block"
+            >
+              <el-input
+                class="item_width_6"
+                maxlength="20"
+                placeholder="请输入联系电话"
+                v-model="formData.sponsorTel"
+              >
               </el-input>
             </el-form-item>
-            <el-form-item label="报名仅限志愿者"
-                          prop="volunteerLimit"
-                          label-width="150px"
-                          style="display: block">
+            <el-form-item
+              label="报名仅限志愿者"
+              prop="volunteerLimit"
+              label-width="150px"
+              style="display: block"
+            >
               <el-checkbox v-model="formData.volunteerLimit"></el-checkbox>
-
             </el-form-item>
 
-            <el-form-item label="报名无需审核"
-                          prop="auditSwitch"
-                          label-width="150px"
-                          style="display: block">
+            <el-form-item
+              label="报名无需审核"
+              prop="auditSwitch"
+              label-width="150px"
+              style="display: block"
+            >
               <el-checkbox v-model="noauditSwitch"></el-checkbox>
-              <span class="div-tooltip">（选中后报名参加活动人员可以直接审核通过）</span>
-
+              <span class="div-tooltip"
+                >（选中后报名参加活动人员可以直接审核通过）</span
+              >
             </el-form-item>
 
-            <el-form-item label="报名截止时间"
-                          style="display: block"
-                          prop="signUpEndTime"
-                          label-width="150px">
-              <el-date-picker class="item_width_2"
-                              v-model="formData.signUpEndTime"
-                              value-format="yyyy-MM-dd HH:mm"
-                              format="yyyy-MM-dd HH:mm"
-                              type="datetime"
-                              placeholder="选择时间">
+            <el-form-item
+              label="报名截止时间"
+              style="display: block"
+              prop="signUpEndTime"
+              label-width="150px"
+            >
+              <el-date-picker
+                class="item_width_2"
+                v-model="formData.signUpEndTime"
+                value-format="yyyy-MM-dd HH:mm"
+                format="yyyy-MM-dd HH:mm"
+                type="datetime"
+                placeholder="选择时间"
+              >
               </el-date-picker>
             </el-form-item>
 
-            <el-form-item label="报名条件"
-                          prop="requirement"
-                          label-width="150px"
-                          style="display: block">
-              <el-input class="item_width_6"
-                        type="textarea"
-                        maxlength="200"
-                        show-word-limit
-                        :rows="7"
-                        placeholder="请输入报名条件，不超过200字"
-                        v-model="formData.requirement"></el-input>
+            <el-form-item
+              label="报名条件"
+              prop="requirement"
+              label-width="150px"
+              style="display: block"
+            >
+              <el-input
+                class="item_width_6"
+                type="textarea"
+                maxlength="200"
+                show-word-limit
+                :rows="7"
+                placeholder="请输入报名条件，不超过200字"
+                v-model="formData.requirement"
+              ></el-input>
             </el-form-item>
 
-            <el-form-item label="签到时间"
-                          label-width="150px"
-                          prop="signInStartTime">
-              <el-date-picker v-model="formData.signInStartTime"
-                              class="list_item_width_3"
-                              type="datetime"
-                              value-format="yyyy-MM-dd HH:mm"
-                              format="yyyy-MM-dd HH:mm"
-                              placeholder="开始时间">
+            <el-form-item
+              label="签到时间"
+              label-width="150px"
+              prop="signInStartTime"
+            >
+              <el-date-picker
+                v-model="formData.signInStartTime"
+                class="list_item_width_3"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm"
+                format="yyyy-MM-dd HH:mm"
+                placeholder="开始时间"
+              >
               </el-date-picker>
               <span class="data-tag">至</span>
-              <el-date-picker v-model="formData.signInEndTime"
-                              class="list_item_width_3 data-tag"
-                              type="datetime"
-                              value-format="yyyy-MM-dd HH:mm"
-                              format="yyyy-MM-dd HH:mm"
-                              placeholder="结束时间">
+              <el-date-picker
+                v-model="formData.signInEndTime"
+                class="list_item_width_3 data-tag"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm"
+                format="yyyy-MM-dd HH:mm"
+                placeholder="结束时间"
+              >
               </el-date-picker>
             </el-form-item>
 
-            <el-form-item label="签到有效范围（米）"
-                          prop="signInRadius"
-                          style="display: block"
-                          label-width="150px">
-              <el-input-number class="item_width_2"
-                               :min="0"
-                               v-model="formData.signInRadius"
-                               label="签到有效范围"></el-input-number>
+            <el-form-item
+              label="签到有效范围（米）"
+              prop="signInRadius"
+              style="display: block"
+              label-width="150px"
+            >
+              <el-input-number
+                class="item_width_2"
+                :min="0"
+                v-model="formData.signInRadius"
+                label="签到有效范围"
+              ></el-input-number>
             </el-form-item>
           </div>
         </div>
         <div class="form_flex">
           <div class="form_item">
-            <el-form-item label="活动地点"
-                          prop="actAddress"
-                          label-width="150px">
+            <el-form-item
+              label="活动地点"
+              prop="actAddress"
+              label-width="150px"
+            >
               <div style="width: 400px">
-                <el-input class="item_width_4"
-                          maxlength="100"
-                          style="width: 330px"
-                          show-word-limit
-                          placeholder="请输入所在地址"
-                          v-model="formData.actAddress">
+                <el-input
+                  class="item_width_4"
+                  maxlength="100"
+                  style="width: 330px"
+                  show-word-limit
+                  placeholder="请输入所在地址"
+                  v-model="formData.actAddress"
+                >
                 </el-input>
-                <el-button style="margin-left: 10px"
-                           type="default"
-                           size="small"
-                           @click="handleSearchMapAct">查询</el-button>
-                <div id="map_act_id"
-                     class="div_map"></div>
+                <el-button
+                  style="margin-left: 10px"
+                  type="default"
+                  size="small"
+                  @click="handleSearchMapAct"
+                  >查询</el-button
+                >
+                <div id="map_act_id" class="div_map"></div>
                 <!-- <div style="margin-top: 10px">
                   <span>经度</span>
                   <el-input class="item_width_3"
@@ -234,23 +292,29 @@
             </el-form-item>
           </div>
           <div class="form_item">
-            <el-form-item label="签到地点"
-                          prop="signInAddress"
-                          label-width="150px">
+            <el-form-item
+              label="签到地点"
+              prop="signInAddress"
+              label-width="150px"
+            >
               <div style="width: 400px">
-                <el-input class="item_width_4"
-                          maxlength="100"
-                          style="width: 330px"
-                          show-word-limit
-                          placeholder="请输入所在地址"
-                          v-model="formData.signInAddress">
+                <el-input
+                  class="item_width_4"
+                  maxlength="100"
+                  style="width: 330px"
+                  show-word-limit
+                  placeholder="请输入所在地址"
+                  v-model="formData.signInAddress"
+                >
                 </el-input>
-                <el-button style="margin-left: 10px"
-                           type="default"
-                           size="small"
-                           @click="handleSearchMapSignin">查询</el-button>
-                <div id="map_signin_id"
-                     class="div_map"></div>
+                <el-button
+                  style="margin-left: 10px"
+                  type="default"
+                  size="small"
+                  @click="handleSearchMapSignin"
+                  >查询</el-button
+                >
+                <div id="map_signin_id" class="div_map"></div>
                 <!-- <div style="margin-top: 10px">
                   <span>经度</span>
                   <el-input class="item_width_3"
@@ -269,83 +333,86 @@
             </el-form-item>
           </div>
         </div>
-        <el-form-item label="活动详情"
-                      prop="actContentHtml"
-                      label-width="150px"
-                      style="display: block">
-
-          <div v-if="formData.richTextFlag||formType === 'add'">
-            <Tinymce class="tinymce_view"
-                     v-if="formType!='detail'"
-                     v-model="formData.actContentHtml"
-                     :height="250"
-                     style="width:1000px"
-                     :customerId="customerId"
-                     placeholder="在这里输入文字" />
-            <p v-else
-               class="text_p"
-               v-html="formData.actContentHtml"></p>
+        <el-form-item
+          label="活动详情"
+          prop="actContentHtml"
+          label-width="150px"
+          style="display: block"
+        >
+          <div v-if="formData.richTextFlag || formType === 'add'">
+            <Tinymce
+              class="tinymce_view"
+              v-if="formType != 'detail'"
+              v-model="formData.actContentHtml"
+              :height="250"
+              style="width: 1000px"
+              :customerId="customerId"
+              placeholder="在这里输入文字"
+            />
+            <p v-else class="text_p" v-html="formData.actContentHtml"></p>
           </div>
-          <div class="div_content"
-               v-else>
-            <div v-for="(item,index) in formData.actContent"
-                 :key="index">
-              <div v-if="item.contentType==='text'">{{item.content}}</div>
-              <img v-if="item.contentType==='img'"
-                   class="img_icon"
-                   :src="item.content">
+          <div class="div_content" v-else>
+            <div v-for="(item, index) in formData.actContent" :key="index">
+              <div v-if="item.contentType === 'text'">{{ item.content }}</div>
+              <img
+                v-if="item.contentType === 'img'"
+                class="img_icon"
+                :src="item.content"
+              />
             </div>
           </div>
         </el-form-item>
 
-        <el-form-item v-if="formData.summaryFlag"
-                      label="活动回顾"
-                      prop="summaryContentHtml"
-                      label-width="150px"
-                      style="display: block">
-
+        <el-form-item
+          v-if="formData.summaryFlag"
+          label="活动回顾"
+          prop="summaryContentHtml"
+          label-width="150px"
+          style="display: block"
+        >
           <div v-if="formData.richTextFlag">
-
-            <p class="text_p"
-               v-html="formData.summaryContentHtml"></p>
+            <p class="text_p" v-html="formData.summaryContentHtml"></p>
           </div>
-          <div class="div_content"
-               v-else>
-            <div v-for="(item,index) in formData.summaryContent"
-                 :key="index">
-              <div v-if="item.contentType==='text'">{{item.content}}</div>
-              <img v-if="item.contentType==='img'"
-                   class="img_icon"
-                   :src="item.content">
-              <p v-if="item.contentType==='rich_text'"
-                 class="text_p"
-                 v-html="item.content"></p>
+          <div class="div_content" v-else>
+            <div v-for="(item, index) in formData.summaryContent" :key="index">
+              <div v-if="item.contentType === 'text'">{{ item.content }}</div>
+              <img
+                v-if="item.contentType === 'img'"
+                class="img_icon"
+                :src="item.content"
+              />
+              <p
+                v-if="item.contentType === 'rich_text'"
+                class="text_p"
+                v-html="item.content"
+              ></p>
             </div>
           </div>
         </el-form-item>
       </el-form>
-
     </div>
     <div class="div_btn">
-      <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button size="small"
-                 v-if="formType != 'detail'"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
+      <el-button size="small" @click="handleCancle">取 消</el-button>
+      <el-button
+        size="small"
+        v-if="formType != 'detail'"
+        type="primary"
+        :disabled="btnDisable"
+        @click="handleComfirm"
+        >确 定</el-button
+      >
     </div>
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui' // 引入Loading服务
-import { requestPost } from '@/js/dai/request'
+import { mapGetters } from "vuex";
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost } from "@/js/dai/request";
 
-import Tinymce from '@c/tinymce2/index.vue'
+import Tinymce from "@c/tinymce2/index.vue";
 
-let loading // 加载动画
+let loading; // 加载动画
 
 var map_act;
 var search_act;
@@ -360,44 +427,45 @@ var infoWindowList_signin;
 var geocoder_signin; // 新建一个正逆地址解析类
 
 export default {
-  data () {
-    let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now()
+  data() {
+    let endDisabledDate = (time) => {
+      //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+      let nowData = Date.now();
       if (this.formData.actStartTime) {
-        let startTime = new Date(this.formData.actStartTime + ':00')
-        return time.getTime() < startTime
+        let startTime = new Date(this.formData.actStartTime + ":00");
+        return time.getTime() < startTime;
       } else {
-        return ''
+        return "";
       }
-
-    }
-    let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now()
-      return time.getTime() > nowData
-    }
+    };
+    let startDisabledDate = (time) => {
+      //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+      let nowData = Date.now();
+      return time.getTime() > nowData;
+    };
     const valActTime = (rule, value, callback) => {
-      if (value === '' || value === null) {
-        callback(new Error('请选择活动开始时间'))
+      if (value === "" || value === null) {
+        callback(new Error("请选择活动开始时间"));
       } else if (!this.formData.actEndTime) {
-        callback(new Error('请选择活动结束时间'))
+        callback(new Error("请选择活动结束时间"));
       } else {
-        callback()
+        callback();
       }
-    }
+    };
     const valSigninTime = (rule, value, callback) => {
-      if (value === '' || value === null) {
-        callback(new Error('请选择签到开始时间'))
+      if (value === "" || value === null) {
+        callback(new Error("请选择签到开始时间"));
       } else if (!this.formData.signInEndTime) {
-        callback(new Error('请选择签到结束时间'))
+        callback(new Error("请选择签到结束时间"));
       } else {
-        callback()
+        callback();
       }
-    }
+    };
     return {
-      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+      formType: "add", //表单操作类型 add新增，edit编辑，detail详情
       btnDisable: false,
-      customerId: '',
-      actId: '',
+      customerId: "",
+      actId: "",
       valActTime: valActTime,
       valSigninTime: valSigninTime,
 
@@ -433,7 +501,7 @@ export default {
         signUpEndTime: "",
         sponsorContacts: "",
         sponsorId: "",
-        sponsorPath: '',
+        sponsorPath: "",
         sponsorName: "",
         sponsorTel: "",
         sponsorType: "",
@@ -446,173 +514,157 @@ export default {
       orgOptions: [],
       orgOptionProps: {
         multiple: false,
-        value: 'gridId',
-        label: 'agencyGridName',
-        children: 'agencyGridList',
-        checkStrictly: true
+        value: "gridId",
+        label: "agencyGridName",
+        children: "agencyGridList",
+        checkStrictly: true,
       },
       agencyIdArray: [],
 
       endPickerOptions: {
-        disabledDate: endDisabledDate
+        disabledDate: endDisabledDate,
       },
       startPickerOptions: {
-        disabledDate: startDisabledDate
+        disabledDate: startDisabledDate,
       },
 
       //图片相关  oss/file/uploadvariedfile
-      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
+      uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
       //  upload_url: '', // 上传URL
-      upload_name: '', // 图片或视频名称
+      upload_name: "", // 图片或视频名称
       replayImgList: [
         // {
         //   id: '1',
         //   url: 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20220629/db05fed5cc56417299364ab8362ac9a0.png'
         // }
       ],
-      hideUploadBtn: false
-
-    }
+      hideUploadBtn: false,
+    };
   },
   components: { Tinymce },
-  mounted () {
-    this.customerId = localStorage.getItem('customerId')
-    this.loadSponsorlist()
-    this.initMap()
-
-
+  mounted() {
+    this.customerId = localStorage.getItem("customerId");
+    this.loadSponsorlist();
+    this.initMap();
 
     // this.replayImgList.push()
   },
 
   methods: {
-
-    async initForm (type, actId) {
+    async initForm(type, actId) {
       this.$refs.ref_form.resetFields();
 
-      this.formType = type
+      this.formType = type;
       if (actId) {
-        this.startLoading()
-        this.actId = actId
-        this.formData.actId = actId
-        await this.loadFormData()
-        this.endLoading()
-
+        this.startLoading();
+        this.actId = actId;
+        this.formData.actId = actId;
+        await this.loadFormData();
+        this.endLoading();
       } else {
-        this.actId = ''
-        this.formData.actId = ''
+        this.actId = "";
+        this.formData.actId = "";
         // this.formData = JSON.parse(JSON.stringify(this.formDataTemp));
         // this.agencyIdArray = this.formData.sponsorPath.split(',')
       }
-
     },
 
     //获取主办方
-    async loadSponsorlist () {
-      const url = "/heart/work/act/sponsorlist"
+    async loadSponsorlist() {
+      const url = "/heart/work/act/sponsorlist";
 
-      let params = {}
+      let params = {};
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-
-        data.agencyGridName = data.agencyName
-        data.gridId = data.agencyId
-        data.level = 'agency'
-        this.orgOptions.push(data)
-
+        data.agencyGridName = data.agencyName;
+        data.gridId = data.agencyId;
+        data.level = "agency";
+        this.orgOptions.push(data);
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
-
     },
 
-    handleChangeAgency (val) {
-      let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
+    handleChangeAgency(val) {
+      let obj = this.$refs["myCascader"].getCheckedNodes()[0].data;
       if (obj) {
+        this.formData.sponsorId = obj.gridId;
+        this.formData.sponsorName = obj.agencyGridName;
+        this.formData.sponsorPath = this.agencyIdArray.join(",");
 
-        this.formData.sponsorId = obj.gridId
-        this.formData.sponsorName = obj.agencyGridName
-        this.formData.sponsorPath = this.agencyIdArray.join(',')
-
-
-        if (obj.level === 'agency') {
-          this.formData.sponsorType = 'agency'
+        if (obj.level === "agency") {
+          this.formData.sponsorType = "agency";
         } else {
-          this.formData.sponsorType = 'grid'
+          this.formData.sponsorType = "grid";
         }
-
       } else {
-        this.formData.sponsorId = ''
-        this.formData.sponsorPath = ''
-        this.formData.sponsorName = ''
-        this.formData.sponsorType = ''
+        this.formData.sponsorId = "";
+        this.formData.sponsorPath = "";
+        this.formData.sponsorName = "";
+        this.formData.sponsorType = "";
       }
-
     },
 
     //加载form
-    async loadFormData () {
-      const url = '/heart/work/act/detail'
+    async loadFormData() {
+      const url = "/heart/work/act/detail";
 
       let params = {
-        actId: this.actId
-      }
+        actId: this.actId,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-
         this.formData = JSON.parse(JSON.stringify(data));
         if (this.formData.richTextFlag) {
-          this.agencyIdArray = this.formData.sponsorPath.split(',')
+          this.agencyIdArray = this.formData.sponsorPath.split(",");
           if (this.formData.actContent && this.formData.actContent.length > 0) {
-            this.formData.actContentHtml = this.formData.actContent[0].content
+            this.formData.actContentHtml = this.formData.actContent[0].content;
           }
-          if (this.formData.summaryContent && this.formData.summaryContent.length > 0) {
-            this.formData.summaryContentHtml = this.formData.summaryContent[0].content
+          if (
+            this.formData.summaryContent &&
+            this.formData.summaryContent.length > 0
+          ) {
+            this.formData.summaryContentHtml =
+              this.formData.summaryContent[0].content;
           }
         }
 
-        this.noauditSwitch = !this.formData.auditSwitch
-
-
+        this.noauditSwitch = !this.formData.auditSwitch;
 
         if (this.formData.coverPic) {
           let obj = {
-            id: '111',
-            url: this.formData.coverPic
-          }
+            id: "111",
+            url: this.formData.coverPic,
+          };
 
-          this.replayImgList = []
-          this.replayImgList.push(obj)
+          this.replayImgList = [];
+          this.replayImgList.push(obj);
 
-          this.hideUploadBtn = true
+          this.hideUploadBtn = true;
         }
-
-
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
-    async handleComfirm () {
-      console.log(this.formData)
+    async handleComfirm() {
+      console.log(this.formData);
 
-      this.btnDisable = true
+      this.btnDisable = true;
       setTimeout(() => {
-        this.btnDisable = false
-      }, 3000)
-
-      this.$refs['ref_form'].validate((valid, messageObj) => {
+        this.btnDisable = false;
+      }, 3000);
 
+      this.$refs["ref_form"].validate((valid, messageObj) => {
         if (!valid) {
-
-          app.util.validateRule(messageObj)
-          this.btnDisable = false
+          app.util.validateRule(messageObj);
+          this.btnDisable = false;
         } else {
-          let errBeforeSubmit = ''
+          let errBeforeSubmit = "";
 
           if (
             new Date(this.formData.actEndTime).getTime() <=
@@ -628,117 +680,111 @@ export default {
 
           if (errBeforeSubmit) {
             this.$message({
-              type: 'info',
-              message: errBeforeSubmit
-            })
-            return false
+              type: "info",
+              message: errBeforeSubmit,
+            });
+            return false;
           }
 
-          this.addHeartAct()
+          this.addHeartAct();
         }
-
-      })
-
+      });
     },
-    async addHeartAct () {
+    async addHeartAct() {
       let obj = {
-        contentType: 'rich_text',
-        content: this.dormatHtml(this.formData.actContentHtml)
-      }
-      this.formData.actContent = []
-      this.formData.actContent.push(obj)
+        contentType: "rich_text",
+        content: this.dormatHtml(this.formData.actContentHtml),
+      };
+      this.formData.actContent = [];
+      this.formData.actContent.push(obj);
 
-      this.formData.customerId = this.customerId
-      this.formData.noticePassedPeople = false
+      this.formData.customerId = this.customerId;
+      this.formData.noticePassedPeople = false;
 
-      this.formData.auditSwitch = !this.noauditSwitch
+      this.formData.auditSwitch = !this.noauditSwitch;
 
-      let url = "/heart/work/act/publishV2"
+      let url = "/heart/work/act/publishV2";
       if (this.actId) {
-        this.formData.actId = this.actId
-        url = '/heart/work/act/republishV2'
+        this.formData.actId = this.actId;
+        url = "/heart/work/act/republishV2";
       } else {
-        url = "/heart/work/act/publishV2"
+        url = "/heart/work/act/publishV2";
       }
 
       // let url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/add"
 
-      this.startLoading()
-      const { data, code, msg } = await requestPost(url, this.formData)
-      this.endLoading()
+      this.startLoading();
+      const { data, code, msg } = await requestPost(url, this.formData);
+      this.endLoading();
       if (code === 0) {
         this.$message({
-          type: 'success',
-          message: '操作成功'
-        })
-        this.resetData()
-        this.$emit('dialogOk')
-        this.btnDisable = false
+          type: "success",
+          message: "操作成功",
+        });
+        this.resetData();
+        this.$emit("dialogOk");
+        this.btnDisable = false;
       } else {
-        this.btnDisable = false
-        this.$message.error(msg)
+        this.btnDisable = false;
+        this.$message.error(msg);
       }
-
     },
 
-    dormatHtml (content) {
-      let c = ''
-      if (content.indexOf('DOCTYPE') != -1) {
+    dormatHtml(content) {
+      let c = "";
+      if (content.indexOf("DOCTYPE") != -1) {
         c = content.slice(45, -16);
       }
-      console.log('content', typeof content)
-      return c || content
+      console.log("content", typeof content);
+      return c || content;
     },
 
-    removePic (file, fileList) {
-
-      this.formData.coverPic = ''
-      this.replayImgList = []
+    removePic(file, fileList) {
+      this.formData.coverPic = "";
+      this.replayImgList = [];
       this.hideUploadBtn = fileList.length >= 1;
-
     },
     // 最多上传3张图，超过时隐藏上传按钮
-    handleEditChange (file, fileList) {
-
+    handleEditChange(file, fileList) {
       this.hideUploadBtn = fileList.length >= 1;
     },
-    exceedPic () {
-      this.$message.warning("只能上传1张封面图")
-
+    exceedPic() {
+      this.$message.warning("只能上传1张封面图");
     },
-    beforeAvatarUpload (file) {
-      const isJPG = file.type === 'image/jpeg';
+    beforeAvatarUpload(file) {
+      const isJPG = file.type === "image/jpeg";
       const isLt2M = file.size / 1024 / 1024 < 10;
 
-
       if (!isLt2M) {
-        this.$message.error('上传图片大小不能超过 10MB!');
+        this.$message.error("上传图片大小不能超过 10MB!");
       }
       return isLt2M;
     },
-    handleSuccess (response, file, fileList) {
-      this.replayImgList.push(file)
-      this.formData.coverPic = response.data.url
-
+    handleSuccess(response, file, fileList) {
+      this.replayImgList.push(file);
+      this.formData.coverPic = response.data.url;
     },
 
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap () {
+    initMap() {
       // 定义地图中心点坐标
       var center = new window.TMap.LatLng(36.0722275, 120.38945519);
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
       map_act = new window.TMap.Map(document.getElementById("map_act_id"), {
         center: center, // 设置地图中心点坐标
-        zoom: 17.2, // 设置地图缩放级别
-        pitch: 43.5, // 设置俯仰角
-        rotation: 45, // 设置地图旋转角度
-      });
-      map_signin = new window.TMap.Map(document.getElementById("map_signin_id"), {
-        center: center, // 设置地图中心点坐标
-        zoom: 17.2, // 设置地图缩放级别
+        zoom: 16.2, // 设置地图缩放级别
         pitch: 43.5, // 设置俯仰角
         rotation: 45, // 设置地图旋转角度
       });
+      map_signin = new window.TMap.Map(
+        document.getElementById("map_signin_id"),
+        {
+          center: center, // 设置地图中心点坐标
+          zoom: 16.2, // 设置地图缩放级别
+          pitch: 43.5, // 设置俯仰角
+          rotation: 45, // 设置地图旋转角度
+        }
+      );
 
       search_act = new window.TMap.service.Search({ pageSize: 10 });
       // 新建一个地点搜索类
@@ -773,7 +819,7 @@ export default {
       this.handleMoveCenterSignin();
     },
 
-    setMarkerAct (lat, lng) {
+    setMarkerAct(lat, lng) {
       markers_act.setGeometries([]);
       markers_act.add([
         {
@@ -787,7 +833,7 @@ export default {
       ]);
     },
 
-    handleSearchMapAct () {
+    handleSearchMapAct() {
       infoWindowList_act.forEach((infoWindow) => {
         infoWindow.close();
       });
@@ -795,9 +841,11 @@ export default {
       markers_act.setGeometries([]);
       // 在地图显示范围内以给定的关键字搜索地点
       search_act
-        .searchRectangle({
+        .searchNearby({
           keyword: this.formData.actAddress,
-          bounds: map_act.getBounds(),
+          radius: 1000,
+          autoExtend: true,
+          center: map_act.getCenter(),
         })
         .then((result) => {
           let { data } = result;
@@ -815,7 +863,7 @@ export default {
         });
     },
 
-    handleMoveCenterAct (e) {
+    handleMoveCenterAct(e) {
       //修改地图中心点
       const center = map_act.getCenter();
       const lat = center.getLat();
@@ -832,7 +880,7 @@ export default {
           });
       }
     },
-    setMarkerSignin (lat, lng) {
+    setMarkerSignin(lat, lng) {
       markers_signin.setGeometries([]);
       markers_signin.add([
         {
@@ -846,7 +894,7 @@ export default {
       ]);
     },
 
-    handleSearchMapSignin () {
+    handleSearchMapSignin() {
       infoWindowList_signin.forEach((infoWindow) => {
         infoWindow.close();
       });
@@ -854,9 +902,11 @@ export default {
       markers_signin.setGeometries([]);
       // 在地图显示范围内以给定的关键字搜索地点
       search_signin
-        .searchRectangle({
+        .searchNearby({
           keyword: this.formData.signInAddress,
-          bounds: map_signin.getBounds(),
+          radius: 1000,
+          autoExtend: true,
+          center: map_signin.getCenter(),
         })
         .then((result) => {
           let { data } = result;
@@ -874,7 +924,7 @@ export default {
         });
     },
 
-    handleMoveCenterSignin (e) {
+    handleMoveCenterSignin(e) {
       //修改地图中心点
       const center = map_signin.getCenter();
       const lat = center.getLat();
@@ -892,19 +942,17 @@ export default {
       }
     },
 
-    handleCancle () {
-
-      this.resetData()
-      this.$emit('dialogCancle')
-
+    handleCancle() {
+      this.resetData();
+      this.$emit("dialogCancle");
     },
 
-    resetData () {
-      this.actId = ''
-      this.replayImgList = []
-      this.agencyIdArray = []
-      this.hideUploadBtn = false
-      this.noauditSwitch = false
+    resetData() {
+      this.actId = "";
+      this.replayImgList = [];
+      this.agencyIdArray = [];
+      this.hideUploadBtn = false;
+      this.noauditSwitch = false;
       this.formData = {
         actAddress: "",
         actContentHtml: "",
@@ -936,7 +984,7 @@ export default {
         signUpEndTime: "",
         sponsorContacts: "",
         sponsorId: "",
-        sponsorPath: '',
+        sponsorPath: "",
         sponsorName: "",
         sponsorTel: "",
         sponsorType: "",
@@ -944,84 +992,97 @@ export default {
         title: "",
 
         volunteerLimit: false,
-      }
+      };
     },
     // 开启加载动画
-    startLoading () {
+    startLoading() {
       loading = Loading.service({
         lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
     },
     // 结束加载动画
-    endLoading () {
+    endLoading() {
       // clearTimeout(timer);
       if (loading) {
-        loading.close()
+        loading.close();
       }
-    }
+    },
   },
   computed: {
-    dataRule () {
+    dataRule() {
       return {
-
         sponsorId: [
-          { required: true, message: '主办方不能为空', trigger: 'change' }
+          { required: true, message: "主办方不能为空", trigger: "change" },
         ],
         title: [
-          { required: true, message: '活动标题不能为空', trigger: 'change' },
+          { required: true, message: "活动标题不能为空", trigger: "change" },
         ],
 
         coverPic: [
-          { required: true, message: '封面图不能为空', trigger: 'change' }
+          { required: true, message: "封面图不能为空", trigger: "change" },
         ],
 
         actContentHtml: [
-          { required: true, message: '活动详情不能为空', trigger: 'change' }
+          { required: true, message: "活动详情不能为空", trigger: "change" },
         ],
         actAddress: [
-          { required: true, message: '活动地点不能为空', trigger: 'change' }
+          { required: true, message: "活动地点不能为空", trigger: "change" },
         ],
         actStartTime: [
-          { required: true, validator: this.valActTime, message: '活动时间不能为空', trigger: 'change' }
+          {
+            required: true,
+            validator: this.valActTime,
+            message: "活动时间不能为空",
+            trigger: "change",
+          },
         ],
         actQuota: [
-          { required: true, message: '活动人数不能为空', trigger: 'change' }
+          { required: true, message: "活动人数不能为空", trigger: "change" },
         ],
         reward: [
-          { required: true, message: '活动积分不能为空', trigger: 'change' }
+          { required: true, message: "活动积分不能为空", trigger: "change" },
         ],
         signUpEndTime: [
-          { required: true, message: '报名截止时间不能为空', trigger: 'change' }
+          {
+            required: true,
+            message: "报名截止时间不能为空",
+            trigger: "change",
+          },
         ],
         signInStartTime: [
-          { required: true, validator: this.valSigninTime, message: '签到时间不能为空', trigger: 'change' }
+          {
+            required: true,
+            validator: this.valSigninTime,
+            message: "签到时间不能为空",
+            trigger: "change",
+          },
         ],
         signInAddress: [
-          { required: true, message: '签到地点不能为空', trigger: 'change' }
+          { required: true, message: "签到地点不能为空", trigger: "change" },
         ],
         signInRadius: [
-          { required: true, message: '签到有效范围不能为空', trigger: 'change' }
+          {
+            required: true,
+            message: "签到有效范围不能为空",
+            trigger: "change",
+          },
         ],
         sponsorContacts: [
-          { required: true, message: '联系人不能为空', trigger: 'change' }
+          { required: true, message: "联系人不能为空", trigger: "change" },
         ],
         sponsorTel: [
-          { required: true, message: '联系电话不能为空', trigger: 'change' }
+          { required: true, message: "联系电话不能为空", trigger: "change" },
         ],
-      }
+      };
     },
-
   },
-  props: {
-
-
-  }
-}
+  props: {},
+};
 </script>
 
-<style lang="scss" scoped >
+<style lang="scss" scoped>
 @import "@/assets/scss/modules/management/form-main.scss";
 
 .avatar-uploader {
@@ -1064,4 +1125,3 @@ export default {
   }
 }
 </style>
-
diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue
index 0ac5a774b..34e2a63f7 100644
--- a/src/views/modules/communityParty/regionalParty/activitysForm.vue
+++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue
@@ -425,7 +425,7 @@ export default {
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
       map = new window.TMap.Map(document.getElementById('app'), {
         center: center, // 设置地图中心点坐标
-        zoom: 17.2, // 设置地图缩放级别
+        zoom: 16.2, // 设置地图缩放级别
         pitch: 43.5, // 设置俯仰角
         rotation: 45 // 设置地图旋转角度
       })
@@ -470,9 +470,11 @@ export default {
       markers.setGeometries([])
       // 在地图显示范围内以给定的关键字搜索地点
       search
-        .searchRectangle({
+        .searchNearby({
           keyword: this.keyWords,
-          bounds: map.getBounds()
+          radius: 1000,
+          autoExtend: true,
+          center: map.getCenter(),
         })
         .then((result) => {
           let { data } = result
diff --git a/src/views/modules/communityParty/regionalParty/unitsForm.vue b/src/views/modules/communityParty/regionalParty/unitsForm.vue
index 79f801e2a..c62a9e57a 100644
--- a/src/views/modules/communityParty/regionalParty/unitsForm.vue
+++ b/src/views/modules/communityParty/regionalParty/unitsForm.vue
@@ -354,7 +354,7 @@ export default {
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
       map = new window.TMap.Map(document.getElementById('app'), {
         center: center, // 设置地图中心点坐标
-        zoom: 17.2, // 设置地图缩放级别
+        zoom: 16.2, // 设置地图缩放级别
         pitch: 43.5, // 设置俯仰角
         rotation: 45 // 设置地图旋转角度
       })
@@ -399,9 +399,11 @@ export default {
       markers.setGeometries([])
       // 在地图显示范围内以给定的关键字搜索地点
       search
-        .searchRectangle({
+        .searchNearby({
           keyword: this.keyWords,
-          bounds: map.getBounds()
+          radius: 1000,
+          autoExtend: true,
+          center: map.getCenter(),
         })
         .then((result) => {
           let { data } = result
diff --git a/src/views/modules/communityService/dqfwzx/cpts/edit.vue b/src/views/modules/communityService/dqfwzx/cpts/edit.vue
index 742bacaaf..ff734b0d5 100644
--- a/src/views/modules/communityService/dqfwzx/cpts/edit.vue
+++ b/src/views/modules/communityService/dqfwzx/cpts/edit.vue
@@ -449,7 +449,7 @@ export default {
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
       map = new window.TMap.Map(document.getElementById("app"), {
         center: center, // 设置地图中心点坐标
-        zoom: 17.2, // 设置地图缩放级别
+        zoom: 16.2, // 设置地图缩放级别
         pitch: 43.5, // 设置俯仰角
         rotation: 45, // 设置地图旋转角度
       });
@@ -493,9 +493,11 @@ export default {
       markers.setGeometries([]);
       // 在地图显示范围内以给定的关键字搜索地点
       search
-        .searchRectangle({
+        .searchNearby({
           keyword: this.dataForm.locationAddress,
-          bounds: map.getBounds(),
+          radius: 1000,
+          autoExtend: true,
+          center: map.getCenter(),
         })
         .then((result) => {
           let { data } = result;
diff --git a/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue b/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
index dd59b13b5..d37b1d612 100644
--- a/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
+++ b/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
@@ -279,7 +279,7 @@ export default {
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
       map = new window.TMap.Map(document.getElementById("app"), {
         center: center, // 设置地图中心点坐标
-        zoom: 17.2, // 设置地图缩放级别
+        zoom: 16.2, // 设置地图缩放级别
         pitch: 43.5, // 设置俯仰角
         rotation: 45, // 设置地图旋转角度
       });
@@ -323,9 +323,11 @@ export default {
       markers.setGeometries([]);
       // 在地图显示范围内以给定的关键字搜索地点
       search
-        .searchRectangle({
+        .searchNearby({
           keyword: this.fmData.address,
-          bounds: map.getBounds(),
+          radius: 1000,
+          autoExtend: true,
+          center: map.getCenter(),
         })
         .then((result) => {
           let { data } = result;
diff --git a/src/views/modules/communityService/shzz/cpts/edit.vue b/src/views/modules/communityService/shzz/cpts/edit.vue
index b8ee24a09..d30f9ad1e 100644
--- a/src/views/modules/communityService/shzz/cpts/edit.vue
+++ b/src/views/modules/communityService/shzz/cpts/edit.vue
@@ -2,76 +2,90 @@
   <div>
     <div>
       <el-form
-          ref="ref_form"
-          :inline="true"
-          :model="dataForm"
-          :rules="dataRule"
-          :disabled="formType === 'detail'"
-          class="form"
+        ref="ref_form"
+        :inline="true"
+        :model="dataForm"
+        :rules="dataRule"
+        :disabled="formType === 'detail'"
+        class="form"
       >
-
-        <el-form-item label="头像" label-width="150px"
-                      prop="imageList"
-                      style="display: block">
+        <el-form-item
+          label="头像"
+          label-width="150px"
+          prop="imageList"
+          style="display: block"
+        >
           <div class="imsg-list">
-            <div v-for="(item, index) in dataForm.imageList" :key="index" class="imgs-item">
+            <div
+              v-for="(item, index) in dataForm.imageList"
+              :key="index"
+              class="imgs-item"
+            >
               <el-image
-                  style="width: 100px; height: 100px"
-                  :src="item"
-                  fit="fill"
-                  :preview-src-list="dataForm.imageList"></el-image>
+                style="width: 100px; height: 100px"
+                :src="item"
+                fit="fill"
+                :preview-src-list="dataForm.imageList"
+              ></el-image>
               <i class="el-icon-delete" @click="handleDelimg(item, index)"></i>
             </div>
-            <el-upload :headers="$getElUploadHeaders()"  class="avatar-uploader"
-                       v-if="dataForm.imageList.length < 1 && !disabled"
-                       :action="uploadUlr"
-                       :data="{customerId:customerId}"
-                       :show-file-list="false"
-                       :disabled="disabled"
-                       :on-progress="handleProgress"
-                       :on-success="handleImgSuccess"
-                       :before-upload="beforeImgUpload"
-                       accept=".jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP">
-              <el-progress v-if="uploading" :width="100" type="circle" :percentage="unloadPencent"></el-progress>
+            <el-upload
+              :headers="$getElUploadHeaders()"
+              class="avatar-uploader"
+              v-if="dataForm.imageList.length < 1 && !disabled"
+              :action="uploadUlr"
+              :data="{ customerId: customerId }"
+              :show-file-list="false"
+              :disabled="disabled"
+              :on-progress="handleProgress"
+              :on-success="handleImgSuccess"
+              :before-upload="beforeImgUpload"
+              accept=".jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP"
+            >
+              <el-progress
+                v-if="uploading"
+                :width="100"
+                type="circle"
+                :percentage="unloadPencent"
+              ></el-progress>
               <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-
             </el-upload>
           </div>
         </el-form-item>
         <el-form-item
-            label="组织名称	"
-            prop="societyName"
-            label-width="150px"
-            style="display: block"
+          label="组织名称	"
+          prop="societyName"
+          label-width="150px"
+          style="display: block"
         >
           <el-input
-              class="item_width_1"
-              maxlength="50"
-              show-word-limit
-              placeholder="请输入组织名称	"
-              v-model="dataForm.societyName"
+            class="item_width_1"
+            maxlength="50"
+            show-word-limit
+            placeholder="请输入组织名称	"
+            v-model="dataForm.societyName"
           >
           </el-input>
         </el-form-item>
 
         <el-form-item
-            label="服务内容"
-            prop="serviceMatters"
-            label-width="150px"
-            style="display: block"
+          label="服务内容"
+          prop="serviceMatters"
+          label-width="150px"
+          style="display: block"
         >
           <el-input
-              class="item_width_1"
-              type="textarea"
-              maxlength="1000"
-              show-word-limit
-              :rows="3"
-              placeholder="请输入服务内容，不超过1000字"
-              v-model="dataForm.serviceMatters"
+            class="item_width_1"
+            type="textarea"
+            maxlength="1000"
+            show-word-limit
+            :rows="3"
+            placeholder="请输入服务内容，不超过1000字"
+            v-model="dataForm.serviceMatters"
           ></el-input>
         </el-form-item>
 
-<!--        <el-form-item
+        <!--        <el-form-item
             label="负责人姓名	"
             prop="personInCharge"
             label-width="150px"
@@ -88,36 +102,36 @@
         </el-form-item>-->
 
         <el-form-item
-            label="服务电话	"
-            prop="mobile"
-            label-width="150px"
-            style="display: block"
+          label="服务电话	"
+          prop="mobile"
+          label-width="150px"
+          style="display: block"
         >
           <el-input
-              class="item_width_1"
-              maxlength="50"
-              show-word-limit
-              placeholder="请输入服务电话	"
-              v-model="dataForm.mobile"
+            class="item_width_1"
+            maxlength="50"
+            show-word-limit
+            placeholder="请输入服务电话	"
+            v-model="dataForm.mobile"
           >
           </el-input>
         </el-form-item>
 
         <el-form-item
-            label="服务时间	"
-            prop="serviceTimeStr"
-            label-width="150px"
-            style="display: block"
+          label="服务时间	"
+          prop="serviceTimeStr"
+          label-width="150px"
+          style="display: block"
         >
           <el-input
-              class="item_width_1"
-              maxlength="50"
-              show-word-limit
-              placeholder="请输入服务时间	"
-              v-model="dataForm.serviceTimeStr"
+            class="item_width_1"
+            maxlength="50"
+            show-word-limit
+            placeholder="请输入服务时间	"
+            v-model="dataForm.serviceTimeStr"
           >
           </el-input>
-<!--          <el-date-picker
+          <!--          <el-date-picker
               v-model="dataForm.serviceTime"
               type="daterange"
               range-separator="至"
@@ -129,23 +143,23 @@
         </el-form-item>
 
         <el-form-item
-            label="绑定管理员"
-            prop="adminStaffId"
-            label-width="150px"
-            style="display: block"
+          label="绑定管理员"
+          prop="adminStaffId"
+          label-width="150px"
+          style="display: block"
         >
           <el-select
-              class="item_width_1"
-              v-model="dataForm.adminStaffId"
-              placeholder="请选择"
-              clearable
-              filterable
+            class="item_width_1"
+            v-model="dataForm.adminStaffId"
+            placeholder="请选择"
+            clearable
+            filterable
           >
             <el-option
-                v-for="item in staffList"
-                :key="item.staffId"
-                :label="item.staffName"
-                :value="item.staffId"
+              v-for="item in staffList"
+              :key="item.staffId"
+              :label="item.staffName"
+              :value="item.staffId"
             >
             </el-option>
           </el-select>
@@ -198,21 +212,20 @@
     <div class="div_btn">
       <el-button @click="handleCancle">取 消</el-button>
       <el-button
-          v-if="formType != 'detail'"
-          type="primary"
-          :disabled="btnDisable"
-          @click="handleComfirm"
-      >确 定
-      </el-button
-      >
+        v-if="formType != 'detail'"
+        type="primary"
+        :disabled="btnDisable"
+        @click="handleComfirm"
+        >确 定
+      </el-button>
     </div>
   </div>
 </template>
 
 <script>
-import {mapGetters} from "vuex";
-import {Loading} from "element-ui"; // 引入Loading服务
-import {requestPost} from "@/js/dai/request";
+import { mapGetters } from "vuex";
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost } from "@/js/dai/request";
 
 var map;
 var search;
@@ -223,11 +236,11 @@ let loading; // 加载动画
 export default {
   data() {
     return {
-      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+      uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2",
       btnLoading: false,
       uploading: false,
       disabled: false,
-      customerId: '',
+      customerId: "",
       formType: "add", //表单操作类型 add新增，edit编辑，detail详情
 
       agencyId: "",
@@ -259,7 +272,7 @@ export default {
     dataRule() {
       return {
         societyName: [
-          {required: true, message: "组织名称	不能为空", trigger: "blur"},
+          { required: true, message: "组织名称	不能为空", trigger: "blur" },
           {
             min: 1,
             max: 50,
@@ -268,10 +281,10 @@ export default {
           },
         ],
         imageList: [
-          {required: true, message: "头像不能为空", trigger: "blur"},
+          { required: true, message: "头像不能为空", trigger: "blur" },
         ],
         serviceMatters: [
-          {required: true, message: "服务内容不能为空", trigger: "blur"},
+          { required: true, message: "服务内容不能为空", trigger: "blur" },
         ],
         /*personInCharge: [
           {required: true, message: "负责人姓名不能为空", trigger: "blur"},
@@ -280,10 +293,10 @@ export default {
           { required: true, message: "绑定管理员不能为空", trigger: "blur" },
         ],*/
         mobile: [
-          {required: true, message: "服务电话不能为空", trigger: "blur"},
+          { required: true, message: "服务电话不能为空", trigger: "blur" },
         ],
         serviceTimeStr: [
-          {required: true, message: "服务时间不能为空", trigger: "blur"},
+          { required: true, message: "服务时间不能为空", trigger: "blur" },
         ],
         /*longitude: [
           { required: true, message: "位置坐标不能为空", trigger: "blur" },
@@ -316,12 +329,12 @@ export default {
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
       map = new window.TMap.Map(document.getElementById("app"), {
         center: center, // 设置地图中心点坐标
-        zoom: 17.2, // 设置地图缩放级别
+        zoom: 16.2, // 设置地图缩放级别
         pitch: 43.5, // 设置俯仰角
         rotation: 45, // 设置地图旋转角度
       });
 
-      search = new window.TMap.service.Search({pageSize: 10});
+      search = new window.TMap.service.Search({ pageSize: 10 });
       // 新建一个地点搜索类
       markers = new TMap.MultiMarker({
         map: map,
@@ -358,52 +371,54 @@ export default {
       markers.setGeometries([]);
       // 在地图显示范围内以给定的关键字搜索地点
       search
-          .searchRectangle({
-            keyword: this.dataForm.address,
-            bounds: map.getBounds(),
-          })
-          .then((result) => {
-            let {data} = result;
-            if (Array.isArray(data) && data.length > 0) {
-              const {
-                location: {lat, lng},
-              } = data[0];
-              map.setCenter(new TMap.LatLng(lat, lng));
-              this.setMarker(lat, lng);
-              this.dataForm.latitude = lat;
-              this.dataForm.longitude = lng;
-            } else {
-              this.$message.error("未检索到相关位置坐标");
-            }
-          });
+        .searchNearby({
+          keyword: this.dataForm.address,
+          radius: 1000,
+          autoExtend: true,
+          center: map.getCenter(),
+        })
+        .then((result) => {
+          let { data } = result;
+          if (Array.isArray(data) && data.length > 0) {
+            const {
+              location: { lat, lng },
+            } = data[0];
+            map.setCenter(new TMap.LatLng(lat, lng));
+            this.setMarker(lat, lng);
+            this.dataForm.latitude = lat;
+            this.dataForm.longitude = lng;
+          } else {
+            this.$message.error("未检索到相关位置坐标");
+          }
+        });
     },
     beforeImgUpload(file) {
-      const isPNG = (file.type === 'image/png') || (file.type === 'image/jpeg')
-      const isLt1M = file.size / 1024 / 1024 < 10
+      const isPNG = file.type === "image/png" || file.type === "image/jpeg";
+      const isLt1M = file.size / 1024 / 1024 < 10;
 
       if (!isPNG) {
-        this.$message.error('上传图片只能是 PNG 或 JPEG 格式!')
+        this.$message.error("上传图片只能是 PNG 或 JPEG 格式!");
       }
       if (!isLt1M) {
-        this.$message.error('上传图片大小不能超过 10MB!')
+        this.$message.error("上传图片大小不能超过 10MB!");
       }
-      return isPNG && isLt1M
+      return isPNG && isLt1M;
     },
     handleProgress(event, file, fileList) {
-      this.uploading = true
-      this.unloadPencent = Number(file.percentage.toFixed(0))
+      this.uploading = true;
+      this.unloadPencent = Number(file.percentage.toFixed(0));
     },
     handleImgSuccess(res, file) {
-      if (res.code === 0 && res.msg === 'success') {
-        this.uploading = false
-        this.unloadPencent = 0
-        this.dataForm.imageList.push(res.data.url)
+      if (res.code === 0 && res.msg === "success") {
+        this.uploading = false;
+        this.unloadPencent = 0;
+        this.dataForm.imageList.push(res.data.url);
       } else {
-        this.$message.error(res.msg)
+        this.$message.error(res.msg);
       }
     },
     handleDelimg(item, index) {
-      this.dataForm.imageList.splice(index, 1)
+      this.dataForm.imageList.splice(index, 1);
     },
     handleMoveCenter() {
       //修改地图中心点
@@ -419,9 +434,9 @@ export default {
       this.$refs.ref_form.resetFields();
 
       this.formType = type;
-      this.dataForm.imageList = []
+      this.dataForm.imageList = [];
       if (row) {
-        this.dataForm = {...this.dataForm, ...row};
+        this.dataForm = { ...this.dataForm, ...row };
         if (row.imgUrl) {
           this.dataForm.imageList.push(row.imgUrl);
         }
@@ -436,7 +451,7 @@ export default {
     async loadAgency() {
       const url = "/epmetuser/customerstaff/staffbasicinfo";
       let params = {};
-      const {data, code, msg} = await requestPost(url, params);
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
         this.agencyId = data.agencyId;
@@ -455,7 +470,7 @@ export default {
         pageSize: 100000,
       };
 
-      const {data, code, msg} = await requestPost(url, params);
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
         this.staffList = data.staffList.map((item) => {
@@ -485,7 +500,6 @@ export default {
     },
 
     async submit() {
-
       let url = "";
       if (this.formType === "add") {
         url = "/heart/societyorg/add";
@@ -496,7 +510,7 @@ export default {
         this.dataForm.societyId = this.societyId;
       }
 
-      const {data, code, msg} = await requestPost(url, this.dataForm);
+      const { data, code, msg } = await requestPost(url, this.dataForm);
 
       if (code === 0) {
         this.$message({
@@ -520,7 +534,7 @@ export default {
       this.societyId = ""; //小区ID
       this.$refs.ref_form.resetFields();
       this.propertyFormShow = false;
-     /*
+      /*
       this.dataForm = {
         societyName: "",
         serviceMatters: "",
@@ -535,7 +549,6 @@ export default {
         latitude: "",
         imageList:[]
       };*/
-
     },
     // 开启加载动画
     startLoading() {
@@ -597,15 +610,14 @@ export default {
 }
 
 .avatar-uploader {
-  ::v-deep
-  .el-upload {
+  ::v-deep .el-upload {
     cursor: pointer;
     position: relative;
     overflow: hidden;
   }
 
   .el-upload:hover {
-    border-color: #409EFF;
+    border-color: #409eff;
   }
 
   .avatar {
diff --git a/src/views/modules/communityService/sqzzz/cpts/edit.vue b/src/views/modules/communityService/sqzzz/cpts/edit.vue
index 9537cccc3..01ba67f11 100644
--- a/src/views/modules/communityService/sqzzz/cpts/edit.vue
+++ b/src/views/modules/communityService/sqzzz/cpts/edit.vue
@@ -314,9 +314,7 @@ export default {
         principalPhone: [
           { required: true, message: "联系电话不能为空", trigger: "blur" },
         ],
-        address: [
-          { required: true, message: "地址不能为空", trigger: "blur" },
-        ],
+        address: [{ required: true, message: "地址不能为空", trigger: "blur" }],
         longitude: [
           { required: true, message: "请拖动地图选择坐标点", trigger: "blur" },
         ],
@@ -404,7 +402,7 @@ export default {
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
       map = new window.TMap.Map(document.getElementById("app"), {
         center: center, // 设置地图中心点坐标
-        zoom: 17.2, // 设置地图缩放级别
+        zoom: 16.2, // 设置地图缩放级别
         pitch: 43.5, // 设置俯仰角
         rotation: 45, // 设置地图旋转角度
       });
@@ -448,9 +446,11 @@ export default {
       markers.setGeometries([]);
       // 在地图显示范围内以给定的关键字搜索地点
       search
-        .searchRectangle({
+        .searchNearby({
           keyword: this.dataForm.address,
-          bounds: map.getBounds(),
+          radius: 1000,
+          autoExtend: true,
+          center: map.getCenter(),
         })
         .then((result) => {
           let { data } = result;
diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue
index 7668658b8..f3989e228 100644
--- a/src/views/modules/cpts/base/cpts/edit.vue
+++ b/src/views/modules/cpts/base/cpts/edit.vue
@@ -635,7 +635,7 @@ export default {
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
       map = new window.TMap.Map(document.getElementById("app"), {
         center: center, // 设置地图中心点坐标
-        zoom: 13, // 设置地图缩放级别
+        zoom: 16.2, // 设置地图缩放级别
         pitch: 43.5, // 设置俯仰角
         rotation: 45, // 设置地图旋转角度
       });
@@ -679,9 +679,11 @@ export default {
       markers.setGeometries([]);
       // 在地图显示范围内以给定的关键字搜索地点
       search
-        .searchRectangle({
+        .searchNearby({
           keyword: this.fmData[item.keyName],
-          bounds: map.getBounds(),
+          radius: 1000,
+          autoExtend: true,
+          center: map.getCenter(),
         })
         .then((result) => {
           let { data } = result;
diff --git a/src/views/modules/shequzhili/csgltc/csglForm.vue b/src/views/modules/shequzhili/csgltc/csglForm.vue
index cdde575ea..854e03e15 100644
--- a/src/views/modules/shequzhili/csgltc/csglForm.vue
+++ b/src/views/modules/shequzhili/csgltc/csglForm.vue
@@ -307,7 +307,7 @@ export default {
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
       map = new window.TMap.Map(document.getElementById('app'), {
         center: center, // 设置地图中心点坐标
-        zoom: 17.2, // 设置地图缩放级别
+        zoom: 16.2, // 设置地图缩放级别
         pitch: 43.5, // 设置俯仰角
         rotation: 45 // 设置地图旋转角度
       })
@@ -352,9 +352,11 @@ export default {
       markers.setGeometries([])
       // 在地图显示范围内以给定的关键字搜索地点
       search
-        .searchRectangle({
+        .searchNearby({
           keyword: this.formData.address,
-          bounds: map.getBounds()
+          radius: 1000,
+          autoExtend: true,
+          center: map.getCenter(),
         })
         .then((result) => {
           let { data } = result
diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue
index dfb95312d..fd2048832 100644
--- a/src/views/modules/shequzhili/event/cpts/add.vue
+++ b/src/views/modules/shequzhili/event/cpts/add.vue
@@ -625,7 +625,7 @@ export default {
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
       map = new window.TMap.Map(document.getElementById("app"), {
         center: center, // 设置地图中心点坐标
-        zoom: 17.2, // 设置地图缩放级别
+        zoom: 16.2, // 设置地图缩放级别
         pitch: 43.5, // 设置俯仰角
         rotation: 45, // 设置地图旋转角度
       });
@@ -670,9 +670,11 @@ export default {
       markers.setGeometries([]);
       // 在地图显示范围内以给定的关键字搜索地点
       search
-        .searchRectangle({
+        .searchNearby({
           keyword: this.keyWords,
-          bounds: map.getBounds(),
+          radius: 1000,
+          autoExtend: true,
+          center: map.getCenter(),
         })
         .then((result) => {
           let { data } = result;
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
index ceeb3ab97..c4b6d3bdc 100644
--- a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
@@ -284,7 +284,7 @@ export default {
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
       map = new window.TMap.Map(document.getElementById('app'), {
         center: center, // 设置地图中心点坐标
-        zoom: 17.2, // 设置地图缩放级别
+        zoom: 16.2, // 设置地图缩放级别
         pitch: 43.5, // 设置俯仰角
         rotation: 45 // 设置地图旋转角度
       })
@@ -329,9 +329,11 @@ export default {
       markers.setGeometries([])
       // 在地图显示范围内以给定的关键字搜索地点
       search
-        .searchRectangle({
+        .searchNearby({
           keyword: this.formData.address,
-          bounds: map.getBounds()
+          radius: 1000,
+          autoExtend: true,
+          center: map.getCenter(),
         })
         .then((result) => {
           let { data } = result

From 03f16fad928a23fe8ab382f4c36d34058c4e9eb7 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 11 Oct 2022 15:11:53 +0800
Subject: [PATCH 06/18] =?UTF-8?q?=E5=BC=80=E9=80=9A=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/renFangTongJi/index.vue | 212 +++++++++++++++++++++-
 1 file changed, 205 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/renFangTongJi/index.vue b/src/views/modules/renFangTongJi/index.vue
index dddb7413a..0d21d6ddd 100644
--- a/src/views/modules/renFangTongJi/index.vue
+++ b/src/views/modules/renFangTongJi/index.vue
@@ -1,13 +1,29 @@
 <template>
-  <div class="g-cnt">
-    <el-card class="m-tb">
-      <h2>下级平台使用进度汇总</h2>
+  <el-card class="g-cnt">
+    <div class="m-cards">
+      <div class="item" :key="item.name" v-for="item in list">
+        <div class="item-left">
+          <div class="num">{{ item.num }}</div>
+          <div class="name">{{ item.name }}</div>
+        </div>
+        <div class="item-right">
+          <div class="hint">
+            <div class="hint-title">较上月</div>
+            <b v-if="item.variation >= 0">+ {{ item.variationAbs }}</b>
+            <b v-else>- {{ item.variationAbs }}</b>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="m-tb">
+      <h3>下级平台使用进度汇总</h3>
       <el-table
         :data="tableData"
         border
         style="width: 100%"
         class="tb"
-        :max-height="maxTableHeight"
+        :height="maxTableHeight"
       >
         <el-table-column label="序号" type="index" align="center" width="50" />
         <el-table-column prop="orgName" label="所属组织"> </el-table-column>
@@ -36,7 +52,7 @@
           label="闲置房屋总数"
         ></el-table-column>
       </el-table>
-    </el-card>
+    </div>
 
     <!-- 修改弹出框 -->
     <el-dialog
@@ -49,7 +65,7 @@
       @closed="displayedDetail = false"
     >
     </el-dialog>
-  </div>
+  </el-card>
 </template>
 
 <script>
@@ -67,11 +83,69 @@ export default {
 
       orgId: "",
       orgType: "",
+
+      list: [
+        {
+          name: "开通平台社区数",
+          num: "--",
+          variation: 0,
+          variationAbs: "0",
+        },
+
+        {
+          name: "人口总数",
+          num: "--",
+          variation: 0,
+          variationAbs: "0",
+        },
+
+        {
+          name: "常住人口数",
+          num: "--",
+          variation: 0,
+          variationAbs: "0",
+        },
+
+        {
+          name: "流动人口数",
+          num: "--",
+          variation: 0,
+          variationAbs: "0",
+        },
+
+        {
+          name: "房屋总数",
+          num: "--",
+          variation: 0,
+          variationAbs: "0",
+        },
+
+        {
+          name: "自住房屋数",
+          num: "--",
+          variation: 0,
+          variationAbs: "0",
+        },
+
+        {
+          name: "出租房屋数",
+          num: "--",
+          variation: 0,
+          variationAbs: "0",
+        },
+
+        {
+          name: "闲置房屋数",
+          num: "--",
+          variation: 0,
+          variationAbs: "0",
+        },
+      ],
     };
   },
   computed: {
     maxTableHeight() {
-      return this.clientHeight - 450;
+      return this.clientHeight - 420;
     },
     ...mapGetters(["clientHeight"]),
   },
@@ -81,9 +155,83 @@ export default {
     },
   },
   mounted() {
+    this.getCommunityData();
+    this.getResiData();
+    this.getHouseData();
     this.getTableData();
   },
   methods: {
+    async getCommunityData() {
+      const url = "/gov/org/agency/usingCommunityStats";
+
+      const { data, code, msg } = await requestPost(url, {
+        orgId: this.orgId,
+        orgType: this.orgType,
+      });
+
+      if (code === 0) {
+        const { list } = this;
+        let item1 = list.find((item) => item.name == "开通平台社区数");
+        item1.num = data.usingCommunityNum;
+        item1.variation = parseInt(data.usingCommunityNumJSY);
+        item1.variationAbs = Math.abs(item1.variation);
+      }
+    },
+
+    async getResiData() {
+      const url = "/epmetuser/icresiuser/userchart";
+
+      const { data, code, msg } = await requestPost(url, {
+        orgId: this.orgId,
+        orgType: this.orgType,
+      });
+
+      if (code === 0) {
+        const { list } = this;
+        let item1 = list.find((item) => item.name == "人口总数");
+        item1.num = data.userTotal;
+        item1.variation = parseInt(data.userTotalJSY);
+        item1.variationAbs = Math.abs(item1.variation);
+        let item2 = list.find((item) => item.name == "常住人口数");
+        item2.num = data.czUserTotal;
+        item2.variation = parseInt(data.czUserTotalJSY);
+        item2.variationAbs = Math.abs(item2.variation);
+        let item3 = list.find((item) => item.name == "流动人口数");
+        item3.num = data.ldUserTotal;
+        item3.variation = parseInt(data.ldUserTotalJSY);
+        item3.variationAbs = Math.abs(item3.variation);
+      }
+    },
+
+    async getHouseData() {
+      const url = "/gov/org/house/housechart";
+
+      const { data, code, msg } = await requestPost(url, {
+        orgId: this.orgId,
+        orgType: this.orgType,
+      });
+
+      if (code === 0) {
+        const { list } = this;
+        let item1 = list.find((item) => item.name == "房屋总数");
+        item1.num = data.houseTotal;
+        item1.variation = parseInt(data.houseTotalJSY);
+        item1.variationAbs = Math.abs(item1.variation);
+        let item2 = list.find((item) => item.name == "自住房屋数");
+        item2.num = data.zzHouseTotal;
+        item2.variation = parseInt(data.zzHouseTotalJSY);
+        item2.variationAbs = Math.abs(item2.variation);
+        let item3 = list.find((item) => item.name == "出租房屋数");
+        item3.num = data.czHouseTotal;
+        item3.variation = parseInt(data.czHouseTotalJSY);
+        item3.variationAbs = Math.abs(item3.variation);
+        let item4 = list.find((item) => item.name == "闲置房屋数");
+        item4.num = data.xzHouseTotal;
+        item4.variation = parseInt(data.xzHouseTotalJSY);
+        item4.variationAbs = Math.abs(item4.variation);
+      }
+    },
+
     async getTableData() {
       const url = "/gov/org/house/subuserhouselist";
 
@@ -107,4 +255,54 @@ export default {
 <style lang="scss" scoped>
 @import "@/assets/scss/c/config";
 @import "@/assets/scss/c/function";
+
+.m-cards {
+  display: flex;
+  flex-wrap: wrap;
+  //   align-items: center;
+
+  .item {
+    display: flex;
+    width: 24%;
+    margin-top: 15px;
+    margin-right: 1%;
+    box-sizing: border-box;
+    color: #ffffff;
+    padding: 12px;
+    border-radius: 4px;
+    background-image: linear-gradient(to left, #43c8c4, #2aa5c6);
+
+    .item-right {
+      margin-left: auto;
+    }
+
+    .item-left {
+      text-align: center;
+    }
+
+    .num {
+      font-size: 28px;
+      font-weight: bold;
+      line-height: 40px;
+    }
+    .name {
+      font-size: 14px;
+      line-height: 20px;
+    }
+
+    .hint {
+      margin-top: 10px;
+      line-height: 20px;
+      text-align: center;
+      font-size: 18px;
+      .hint-title {
+        font-size: 14px;
+      }
+    }
+  }
+}
+
+.m-tb {
+  margin-top: 20px;
+}
 </style>

From 75649d66ec385b189f4483614db58fbd7dcf6cf0 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 11 Oct 2022 15:26:14 +0800
Subject: [PATCH 07/18] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=962?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/fuwujilu/addForm.vue     |    6 +-
 .../communityService/fuwujilu/editForm.vue    |    6 +-
 .../partymember/icpartyorg-add-or-update.vue  | 1060 +++++++++--------
 ...icpointnucleicmonitoring-add-or-update.vue |    6 +-
 ...pointvaccinesinoculation-add-or-update.vue |    6 +-
 5 files changed, 603 insertions(+), 481 deletions(-)

diff --git a/src/views/modules/communityService/fuwujilu/addForm.vue b/src/views/modules/communityService/fuwujilu/addForm.vue
index ec2af6ab9..fdf967767 100644
--- a/src/views/modules/communityService/fuwujilu/addForm.vue
+++ b/src/views/modules/communityService/fuwujilu/addForm.vue
@@ -1023,9 +1023,11 @@ export default {
       markers.setGeometries([]);
       // 在地图显示范围内以给定的关键字搜索地点
       search
-        .searchRectangle({
+        .searchNearby({
           keyword: this.keyWords,
-          bounds: map.getBounds(),
+          radius: 1000,
+          autoExtend: true,
+          center: map.getCenter(),
         })
         .then((result) => {
           let { data } = result;
diff --git a/src/views/modules/communityService/fuwujilu/editForm.vue b/src/views/modules/communityService/fuwujilu/editForm.vue
index b7e975f49..dc73d062f 100644
--- a/src/views/modules/communityService/fuwujilu/editForm.vue
+++ b/src/views/modules/communityService/fuwujilu/editForm.vue
@@ -608,9 +608,11 @@ export default {
       markers.setGeometries([])
       // 在地图显示范围内以给定的关键字搜索地点
       search
-        .searchRectangle({
+        .searchNearby({
           keyword: this.keyWords,
-          bounds: map.getBounds()
+          radius: 1000,
+          autoExtend: true,
+          center: map.getCenter(),
         })
         .then((result) => {
           let { data } = result
diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue
index 74a482bd4..31444e936 100644
--- a/src/views/modules/partymember/icpartyorg-add-or-update.vue
+++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue
@@ -1,82 +1,134 @@
 <template>
-    <el-dialog :visible.sync="visible" :title="!dataForm.id ? '新增党组织' : '更新党组织'" :close-on-click-modal="false"
-               :close-on-press-escape="false">
-        <el-form class="form"
-                 :model="dataForm"
-                 :rules="dataRule"
-                 ref="dataForm"
-                 @keyup.enter.native="dataFormSubmitHandle()"
-                 :label-width="$i18n.locale === 'en-US' ? '120px' : '100px'">
-            <el-form-item prop="partyOrgType" label="党组织类型">
-                <el-select :disabled="dataForm.id || dataForm.orgId ? true : false" v-model="dataForm.partyOrgType" @change="changePartyOrgType" clearable placeholder="请选择党组织类型">
-                    <el-option
-                    v-for="item in partyOrgTypeList"
-                    :key="item.value"
-                    :label="item.name"
-                    :value="item.value">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item  prop="partyOrgName" label="党组织名称">
-                <el-input  v-model="dataForm.partyOrgName" placeholder="请输入党组织名称"  style="width:300px"></el-input>
-            </el-form-item>
-            <el-form-item label="党组织编码" prop="partyOrgCode">
-                <el-input v-model="dataForm.partyOrgCode" placeholder="党组织编码" style="width:300px"></el-input>
-            </el-form-item>
-            <el-form-item v-if="dataForm.partyOrgType != '5'" prop="agencyId" label="行政组织">
-                <el-cascader
-                    style="width:300px"
-                    v-model="dataForm.agencyId"
-                    :options="agencyOrgList"
-                    placeholder="请选择行政组织"
-                    :props="{ emitPath:false, checkStrictly: true, label: 'name', value: 'id', children: 'children' }"
-                    :disabled="dataForm.id ? true : false"
-                    :show-all-levels="false"
-                    @change="changeAgencyOrg"
-                    clearable />
-            </el-form-item>
-            <el-form-item v-if="!dataForm.sjdzzName"  prop="mySelectOrg" label="上级党组织">
-                <el-cascader
-                    ref="myOrg"
-                    style="width:300px"
-                    v-model="dataForm.mySelectOrg"
-                    :options="orgList"
-                    placeholder="请选择上级党组织"
-                    :props="{ checkStrictly: true, label: 'partyOrgName', value: 'id', children: 'children' }"
-                    @change="handleChangeOrg"
-                    :disabled="dataForm.id || dataForm.orgId ? true : false"
-                    clearable />
-            </el-form-item>
-            <el-form-item v-if="dataForm.sjdzzName" label="上级党组织">
-                <el-input :disabled="true" v-model="dataForm.sjdzzName" style="width:300px"></el-input>
-            </el-form-item>
-            <el-form-item label="党组织介绍" prop="introduction">
-                <el-input style="width:300px" v-model="dataForm.introduction" type="textarea" maxlength="500" placeholder="党组织介绍"></el-input>
-            </el-form-item>
-            <el-form-item label="党组织位置"
-                            prop="longitude"
-                            style="display: block">
-                <div class="item_width_1">
+  <el-dialog
+    :visible.sync="visible"
+    :title="!dataForm.id ? '新增党组织' : '更新党组织'"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+  >
+    <el-form
+      class="form"
+      :model="dataForm"
+      :rules="dataRule"
+      ref="dataForm"
+      @keyup.enter.native="dataFormSubmitHandle()"
+      :label-width="$i18n.locale === 'en-US' ? '120px' : '100px'"
+    >
+      <el-form-item prop="partyOrgType" label="党组织类型">
+        <el-select
+          :disabled="dataForm.id || dataForm.orgId ? true : false"
+          v-model="dataForm.partyOrgType"
+          @change="changePartyOrgType"
+          clearable
+          placeholder="请选择党组织类型"
+        >
+          <el-option
+            v-for="item in partyOrgTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="partyOrgName" label="党组织名称">
+        <el-input
+          v-model="dataForm.partyOrgName"
+          placeholder="请输入党组织名称"
+          style="width: 300px"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="党组织编码" prop="partyOrgCode">
+        <el-input
+          v-model="dataForm.partyOrgCode"
+          placeholder="党组织编码"
+          style="width: 300px"
+        ></el-input>
+      </el-form-item>
+      <el-form-item
+        v-if="dataForm.partyOrgType != '5'"
+        prop="agencyId"
+        label="行政组织"
+      >
+        <el-cascader
+          style="width: 300px"
+          v-model="dataForm.agencyId"
+          :options="agencyOrgList"
+          placeholder="请选择行政组织"
+          :props="{
+            emitPath: false,
+            checkStrictly: true,
+            label: 'name',
+            value: 'id',
+            children: 'children',
+          }"
+          :disabled="dataForm.id ? true : false"
+          :show-all-levels="false"
+          @change="changeAgencyOrg"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item
+        v-if="!dataForm.sjdzzName"
+        prop="mySelectOrg"
+        label="上级党组织"
+      >
+        <el-cascader
+          ref="myOrg"
+          style="width: 300px"
+          v-model="dataForm.mySelectOrg"
+          :options="orgList"
+          placeholder="请选择上级党组织"
+          :props="{
+            checkStrictly: true,
+            label: 'partyOrgName',
+            value: 'id',
+            children: 'children',
+          }"
+          @change="handleChangeOrg"
+          :disabled="dataForm.id || dataForm.orgId ? true : false"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item v-if="dataForm.sjdzzName" label="上级党组织">
+        <el-input
+          :disabled="true"
+          v-model="dataForm.sjdzzName"
+          style="width: 300px"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="党组织介绍" prop="introduction">
+        <el-input
+          style="width: 300px"
+          v-model="dataForm.introduction"
+          type="textarea"
+          maxlength="500"
+          placeholder="党组织介绍"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="党组织位置" prop="longitude" style="display: block">
+        <div class="item_width_1">
+          <div class="div_map">
+            <div id="app"></div>
+            <div style="display: none" id="mapSeach_id" class="div_searchmap">
+              <el-input
+                class="item_width_4"
+                maxlength="50"
+                size="mini"
+                placeholder="请输入关键字"
+                v-model="keyWords"
+              >
+              </el-input>
+              <el-button
+                style="margin-left: 10px"
+                type="primary"
+                size="mini"
+                @click="handleSearchMap"
+                >查询</el-button
+              >
+            </div>
+          </div>
 
-                <div class="div_map">
-                    <div id="app">
-
-                    </div>
-                    <div style="display: none" id="mapSeach_id" class="div_searchmap">
-                    <el-input class="item_width_4"
-                                maxlength="50"
-                                size="mini"
-                                placeholder="请输入关键字"
-                                v-model="keyWords">
-                    </el-input>
-                    <el-button style="margin-left: 10px"
-                                type="primary"
-                                size="mini"
-                                @click="handleSearchMap">查询</el-button>
-                    </div>
-                </div>
-
-                <!-- <div id="lon_lat_id" style="margin-top: 10px; display: none">
+          <!-- <div id="lon_lat_id" style="margin-top: 10px; display: none">
                     <span>经度</span>
                     <el-input class="item_width_3"
                             maxlength="50"
@@ -92,419 +144,482 @@
                             v-model="dataForm.latitude">
                     </el-input>
                 </div> -->
-                </div>
-            </el-form-item>
-        </el-form>
-        <template slot="footer">
-            <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-            <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
-        </template>
-    </el-dialog>
+        </div>
+      </el-form-item>
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t("cancel") }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{
+        $t("confirm")
+      }}</el-button>
+    </template>
+  </el-dialog>
 </template>
 
 <script>
-    var map
-    var search
-    var markers
-    var infoWindowList
-    var geocoder // 新建一个正逆地址解析类
-    import debounce from 'lodash/debounce'
+var map;
+var search;
+var markers;
+var infoWindowList;
+var geocoder; // 新建一个正逆地址解析类
+import debounce from "lodash/debounce";
 
-    export default {
-        data() {
-            return {
-                visible: false,
-                keyWords: '',
-                dataForm: {
-                    id: '',
-                    partyOrgType: '', // 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部
-                    partyOrgName: '', // 组织名称
-                    partyOrgCode: '', // 组织编码
-                    mySelectOrg:'', // 我选中的当前党组织
-                    orgPid: '', // 党组织的上级ID,没有上级时为0
-                    orgPids: '', // 党组织的所有上级ID,没有上级时为0
-                    agencyId: '', // 行政组织id
-                    agencyPids:'', // 行政组织父ids(英文逗号隔开)
-                    longitude: '', //经度
-                    latitude: '', //纬度
-                    address: '',
-                    introduction: '', // 党组织介绍
-                    orgId: '',
-                    customerId: '',
-                    staffId:'',
-                    orgPidName: '',
-                    agencyName:'',
-                    pid: '',
-                    sjdzzName: '' // 新增下级上级党组织名字
-                },
-                orgListVisible: false,
-                agencyListVisible:false,
-                orgList: [],
-                agencyId: '',
-                level: '',
-                partyOrgTypeList: [],
-                agencyOrgList:[]
-            }
-        },
-        methods: {
-            init() {
-                this.visible = true
-                this.agencyId = localStorage.getItem('agencyId')
-                this.dataForm.customerId = localStorage.getItem('customerId')
-                this.dataForm.staffId = localStorage.getItem('staffId')
-                this.keyWords = ''
-                //设置党组织类型
-                setTimeout(() => {
-                    this.$refs['dataForm'].resetFields()
-                    this.dataForm.latitude = ''
-                    this.dataForm.agencyId = ''
-                    if (this.dataForm.id) {
-                        this.setPartyOrgType()
-                        this.getInfo()
-                    } else {
-                        this.setPartyOrgType()
-                        this.initMap()
-                        if(this.dataForm.orgId) {
-                            this.dataForm.mySelectOrg = this.dataForm.orgId
-                            this.dataForm.orgPid = this.dataForm.orgId
-                            this.dataForm.orgPids = this.dataForm.orgPids ? this.dataForm.orgPids + ':' + this.dataForm.orgId : this.dataForm.orgId
-                            this.dataForm.partyOrgType = this.dataForm._partyOrgType
-  
-                            this.setPartyOrgType_xzxj()
-                            this.getInfoAgencyLisy()
-                        } else {
-                            this.dataForm.mySelectOrg = ''
-                        }
-                    }
-                }, 50);
-                // this.$nextTick(() => {
-                    
-                // })
-            },
-            // 设置组织类型 新增党组织
-            setPartyOrgType_xzxj() {
-                if (this.dataForm.partyOrgType === '0') { // 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部
-                    this.dataForm.partyOrgType = '1'
-                } else if (this.dataForm.partyOrgType === '1') {
-                    this.dataForm.partyOrgType = '2'
-                } else if (this.dataForm.partyOrgType === '2') {
-                    this.dataForm.partyOrgType = '3'
-                } else if (this.dataForm.partyOrgType === '3') {
-                    this.dataForm.partyOrgType = '4'
-                } else if (this.dataForm.partyOrgType === '4') {
-                    this.dataForm.partyOrgType = '5'
-                }
-            },
-            //设置组织类型
-            setPartyOrgType() {
-                // 社区级：community，街道级:street,区县级: district,市级: city 省级:province
-                // 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部
-                this.level = localStorage.getItem('level') ? localStorage.getItem('level') : ''
-                if (this.level == 'province') {
-                    this.partyOrgTypeList = [
-                        {value: '0', name: '省委'},
-                        {value: '1', name: '市委'},
-                        {value: '2', name: '区委'},
-                        {value: '3', name: '党工委'},
-                        {value: '4', name: '党委'},
-                        {value: '5', name: '支部'}
-                    ]
-                }else if(this.level == 'city'){
-                    this.partyOrgTypeList = [
-                        {value: '1', name: '市委'},
-                        {value: '2', name: '区委'},
-                        {value: '3', name: '党工委'},
-                        {value: '4', name: '党委'},
-                        {value: '5', name: '支部'}
-                    ]
-                }else if(this.level == 'district'){
-                    this.partyOrgTypeList = [
-                        {value: '2', name: '区委'},
-                        {value: '3', name: '党工委'},
-                        {value: '4', name: '党委'},
-                        {value: '5', name: '支部'}
-                    ]
-                }else if(this.level == 'street'){
-                    this.partyOrgTypeList = [
-                        {value: '3', name: '党工委'},
-                        {value: '4', name: '党委'},
-                        {value: '5', name: '支部'}
-                    ]
-                }else if(this.level == 'community'){
-                    this.partyOrgTypeList = [
-                        {value: '4', name: '党委'},
-                        {value: '5', name: '支部'}
-                    ]
-                }
-            },
-            // 选中行政组织
-            changeAgencyOrg () {
-                if(!this.dataForm.orgId){ // 有orgId 证明是从新增下级过来的，新增下级操作 上级党组织不需要查询
-                    this.getOrgList()
-                }
-            },
-            // 选中组织类型 组织类型为支部时不需要选择行政组织
-            changePartyOrgType(value){
-                if(value == '5'){ // 支部 不选择行政组织
-                    this.dataForm.agencyId = localStorage.getItem('agencyId')
-                    this.dataForm.agencyPids = ''
-                    // 先清空数据
-                    this.orgList = []
-                    this.dataForm.mySelectOrg = '', // 我选中的当前党组织
-                    this.dataForm.orgPid = '', // 党组织的上级ID,没有上级时为0
-                    this.dataForm.orgPids = ''
-                    this.getOrgList()
-                } else {
-                    // 先清空数据
-                    this.agencyOrgList = []
-                    this.dataForm.agencyId = ''
+export default {
+  data() {
+    return {
+      visible: false,
+      keyWords: "",
+      dataForm: {
+        id: "",
+        partyOrgType: "", // 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部
+        partyOrgName: "", // 组织名称
+        partyOrgCode: "", // 组织编码
+        mySelectOrg: "", // 我选中的当前党组织
+        orgPid: "", // 党组织的上级ID,没有上级时为0
+        orgPids: "", // 党组织的所有上级ID,没有上级时为0
+        agencyId: "", // 行政组织id
+        agencyPids: "", // 行政组织父ids(英文逗号隔开)
+        longitude: "", //经度
+        latitude: "", //纬度
+        address: "",
+        introduction: "", // 党组织介绍
+        orgId: "",
+        customerId: "",
+        staffId: "",
+        orgPidName: "",
+        agencyName: "",
+        pid: "",
+        sjdzzName: "", // 新增下级上级党组织名字
+      },
+      orgListVisible: false,
+      agencyListVisible: false,
+      orgList: [],
+      agencyId: "",
+      level: "",
+      partyOrgTypeList: [],
+      agencyOrgList: [],
+    };
+  },
+  methods: {
+    init() {
+      this.visible = true;
+      this.agencyId = localStorage.getItem("agencyId");
+      this.dataForm.customerId = localStorage.getItem("customerId");
+      this.dataForm.staffId = localStorage.getItem("staffId");
+      this.keyWords = "";
+      //设置党组织类型
+      setTimeout(() => {
+        this.$refs["dataForm"].resetFields();
+        this.dataForm.latitude = "";
+        this.dataForm.agencyId = "";
+        if (this.dataForm.id) {
+          this.setPartyOrgType();
+          this.getInfo();
+        } else {
+          this.setPartyOrgType();
+          this.initMap();
+          if (this.dataForm.orgId) {
+            this.dataForm.mySelectOrg = this.dataForm.orgId;
+            this.dataForm.orgPid = this.dataForm.orgId;
+            this.dataForm.orgPids = this.dataForm.orgPids
+              ? this.dataForm.orgPids + ":" + this.dataForm.orgId
+              : this.dataForm.orgId;
+            this.dataForm.partyOrgType = this.dataForm._partyOrgType;
 
-                    // 先清空数据
-                    this.orgList = []
-                    this.dataForm.mySelectOrg = '', // 我选中的当前党组织
-                    this.dataForm.orgPid = '', // 党组织的上级ID,没有上级时为0
-                    this.dataForm.orgPids = ''
-                    this.getInfoAgencyLisy()
-                }
-            },
-            // 获取上级党组织列表
-            getOrgList() {
-                if (!this.dataForm.id) { // 修改不做处理
-                    this.orgList = []
-                    this.dataForm.mySelectOrg = '', // 我选中的当前党组织
-                    this.dataForm.orgPid = '', // 党组织的上级ID,没有上级时为0
-                    this.dataForm.orgPids = ''
-                }
-                this.$http.get('/resi/partymember/icPartyOrg/getParentOrgList', {params: {agencyId: this.dataForm.agencyId, partyOrgType: this.dataForm.partyOrgType}}).then(({data: res}) => {
-                    if (res.code !== 0) {
-                        return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
-                    }        
-                    this.orgList = this.removeEmptyChildren(res.data)
-                }).catch(() => {
-                })
-            },
-            removeEmptyChildren (orgArray) {
-                orgArray.forEach((orgInfo) => {
-                    if (orgInfo && orgInfo.children) {
-                        if (orgInfo.children.length === 0) {
-                            orgInfo.children = undefined
-                        } else {
-                            this.removeEmptyChildren(orgInfo.children)
-                        }
-                    }
-                })
-                return orgArray;
-            },
-            // 党组织选中事件
-            handleChangeOrg(e) {
-                if (this.dataForm.mySelectOrg.length > 0 && this.dataForm.mySelectOrg) {
-                    this.dataForm.orgPid = this.dataForm.mySelectOrg[this.dataForm.mySelectOrg.length - 1]
-                    this.dataForm.orgPids = this.$refs.myOrg.getCheckedNodes()[0].data.orgPids;
-                    this.dataForm.mySelectOrg.forEach(element => {
-                        this.dataForm.orgPids = this.dataForm.orgPids ? this.dataForm.orgPids + ':' + element : element
-                    });
-                } else {
-                    this.dataForm.orgPid = ''
-                    this.dataForm.orgPids = ''
-                }
-            },
-            // 获取信息
-            getInfo() {
-                this.$http.get(`/resi/partymember/icPartyOrg/${this.dataForm.id}`).then(({data: res}) => {
-                    if (res.code !== 0) {
-                        return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
-                    }
-                    this.dataForm = {
-                        ...this.dataForm,
-                        ...res.data
-                    }
-                    // 党组织组织
-                    this.dataForm.mySelectOrg = this.dataForm.orgPid
-                    // 行政组织
-                    this.dataForm.agencyId = this.dataForm.agencyId
-                    //根据组织类型获取行政组织
-                    this.getInfoAgencyLisy()
-                    // 获取上级党组织
-                    this.getOrgList()
-                    this.initMap()
-                }).catch(() => {
-                })
-            },
-            getInfoAgencyLisy(){
-                this.$http.get('/gov/org/customeragency/getOrgTreeByUserAndType', {params: {agencyId: this.dataForm.pid?this.dataForm.pid:this.agencyId, orgType: this.dataForm.partyOrgType}}).then(({data: res}) => {
-                    if (res.code !== 0) {
-                        return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
-                    }
-                    this.agencyOrgList = this.removeEmptyChildren(res.data)
-                }).catch(() => {
-                })
-            },
-            // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-            initMap () {
-            document.getElementById('app').innerHTML = ''
-            if (document.getElementById('app')) {
-                document.getElementById('mapSeach_id').style.display = "block"
-                // document.getElementById('lon_lat_id').style.display = "block"
-            }
+            this.setPartyOrgType_xzxj();
+            this.getInfoAgencyLisy();
+          } else {
+            this.dataForm.mySelectOrg = "";
+          }
+        }
+      }, 50);
+      // this.$nextTick(() => {
 
-            // 定义地图中心点坐标
-            var center = new window.TMap.LatLng( this.dataForm.latitude ? this.dataForm.latitude : 36.0722275,  this.dataForm.longitude ? this.dataForm.longitude : 120.38945519)
-            // 定义map变量，调用 TMap.Map() 构造函数创建地图
-            map = new window.TMap.Map(document.getElementById('app'), {
-                center: center, // 设置地图中心点坐标
-                zoom: 17.2, // 设置地图缩放级别
-                pitch: 43.5, // 设置俯仰角
-                rotation: 45 // 设置地图旋转角度
-            })
+      // })
+    },
+    // 设置组织类型 新增党组织
+    setPartyOrgType_xzxj() {
+      if (this.dataForm.partyOrgType === "0") {
+        // 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部
+        this.dataForm.partyOrgType = "1";
+      } else if (this.dataForm.partyOrgType === "1") {
+        this.dataForm.partyOrgType = "2";
+      } else if (this.dataForm.partyOrgType === "2") {
+        this.dataForm.partyOrgType = "3";
+      } else if (this.dataForm.partyOrgType === "3") {
+        this.dataForm.partyOrgType = "4";
+      } else if (this.dataForm.partyOrgType === "4") {
+        this.dataForm.partyOrgType = "5";
+      }
+    },
+    //设置组织类型
+    setPartyOrgType() {
+      // 社区级：community，街道级:street,区县级: district,市级: city 省级:province
+      // 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部
+      this.level = localStorage.getItem("level")
+        ? localStorage.getItem("level")
+        : "";
+      if (this.level == "province") {
+        this.partyOrgTypeList = [
+          { value: "0", name: "省委" },
+          { value: "1", name: "市委" },
+          { value: "2", name: "区委" },
+          { value: "3", name: "党工委" },
+          { value: "4", name: "党委" },
+          { value: "5", name: "支部" },
+        ];
+      } else if (this.level == "city") {
+        this.partyOrgTypeList = [
+          { value: "1", name: "市委" },
+          { value: "2", name: "区委" },
+          { value: "3", name: "党工委" },
+          { value: "4", name: "党委" },
+          { value: "5", name: "支部" },
+        ];
+      } else if (this.level == "district") {
+        this.partyOrgTypeList = [
+          { value: "2", name: "区委" },
+          { value: "3", name: "党工委" },
+          { value: "4", name: "党委" },
+          { value: "5", name: "支部" },
+        ];
+      } else if (this.level == "street") {
+        this.partyOrgTypeList = [
+          { value: "3", name: "党工委" },
+          { value: "4", name: "党委" },
+          { value: "5", name: "支部" },
+        ];
+      } else if (this.level == "community") {
+        this.partyOrgTypeList = [
+          { value: "4", name: "党委" },
+          { value: "5", name: "支部" },
+        ];
+      }
+    },
+    // 选中行政组织
+    changeAgencyOrg() {
+      if (!this.dataForm.orgId) {
+        // 有orgId 证明是从新增下级过来的，新增下级操作 上级党组织不需要查询
+        this.getOrgList();
+      }
+    },
+    // 选中组织类型 组织类型为支部时不需要选择行政组织
+    changePartyOrgType(value) {
+      if (value == "5") {
+        // 支部 不选择行政组织
+        this.dataForm.agencyId = localStorage.getItem("agencyId");
+        this.dataForm.agencyPids = "";
+        // 先清空数据
+        this.orgList = [];
+        (this.dataForm.mySelectOrg = ""), // 我选中的当前党组织
+          (this.dataForm.orgPid = ""), // 党组织的上级ID,没有上级时为0
+          (this.dataForm.orgPids = "");
+        this.getOrgList();
+      } else {
+        // 先清空数据
+        this.agencyOrgList = [];
+        this.dataForm.agencyId = "";
 
-            search = new window.TMap.service.Search({ pageSize: 10 })
-            // 新建一个地点搜索类
-            markers = new TMap.MultiMarker({
-                map: map,
-                geometries: []
-            })
-            infoWindowList = Array(10)
+        // 先清空数据
+        this.orgList = [];
+        (this.dataForm.mySelectOrg = ""), // 我选中的当前党组织
+          (this.dataForm.orgPid = ""), // 党组织的上级ID,没有上级时为0
+          (this.dataForm.orgPids = "");
+        this.getInfoAgencyLisy();
+      }
+    },
+    // 获取上级党组织列表
+    getOrgList() {
+      if (!this.dataForm.id) {
+        // 修改不做处理
+        this.orgList = [];
+        (this.dataForm.mySelectOrg = ""), // 我选中的当前党组织
+          (this.dataForm.orgPid = ""), // 党组织的上级ID,没有上级时为0
+          (this.dataForm.orgPids = "");
+      }
+      this.$http
+        .get("/resi/partymember/icPartyOrg/getParentOrgList", {
+          params: {
+            agencyId: this.dataForm.agencyId,
+            partyOrgType: this.dataForm.partyOrgType,
+          },
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(
+              res.internalMsg ? res.internalMsg : res.msg ? res.msg : "查询失败"
+            );
+          }
+          this.orgList = this.removeEmptyChildren(res.data);
+        })
+        .catch(() => {});
+    },
+    removeEmptyChildren(orgArray) {
+      orgArray.forEach((orgInfo) => {
+        if (orgInfo && orgInfo.children) {
+          if (orgInfo.children.length === 0) {
+            orgInfo.children = undefined;
+          } else {
+            this.removeEmptyChildren(orgInfo.children);
+          }
+        }
+      });
+      return orgArray;
+    },
+    // 党组织选中事件
+    handleChangeOrg(e) {
+      if (this.dataForm.mySelectOrg.length > 0 && this.dataForm.mySelectOrg) {
+        this.dataForm.orgPid =
+          this.dataForm.mySelectOrg[this.dataForm.mySelectOrg.length - 1];
+        this.dataForm.orgPids =
+          this.$refs.myOrg.getCheckedNodes()[0].data.orgPids;
+        this.dataForm.mySelectOrg.forEach((element) => {
+          this.dataForm.orgPids = this.dataForm.orgPids
+            ? this.dataForm.orgPids + ":" + element
+            : element;
+        });
+      } else {
+        this.dataForm.orgPid = "";
+        this.dataForm.orgPids = "";
+      }
+    },
+    // 获取信息
+    getInfo() {
+      this.$http
+        .get(`/resi/partymember/icPartyOrg/${this.dataForm.id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(
+              res.internalMsg ? res.internalMsg : res.msg ? res.msg : "查询失败"
+            );
+          }
+          this.dataForm = {
+            ...this.dataForm,
+            ...res.data,
+          };
+          // 党组织组织
+          this.dataForm.mySelectOrg = this.dataForm.orgPid;
+          // 行政组织
+          this.dataForm.agencyId = this.dataForm.agencyId;
+          //根据组织类型获取行政组织
+          this.getInfoAgencyLisy();
+          // 获取上级党组织
+          this.getOrgList();
+          this.initMap();
+        })
+        .catch(() => {});
+    },
+    getInfoAgencyLisy() {
+      this.$http
+        .get("/gov/org/customeragency/getOrgTreeByUserAndType", {
+          params: {
+            agencyId: this.dataForm.pid ? this.dataForm.pid : this.agencyId,
+            orgType: this.dataForm.partyOrgType,
+          },
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(
+              res.internalMsg ? res.internalMsg : res.msg ? res.msg : "查询失败"
+            );
+          }
+          this.agencyOrgList = this.removeEmptyChildren(res.data);
+        })
+        .catch(() => {});
+    },
+    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+    initMap() {
+      document.getElementById("app").innerHTML = "";
+      if (document.getElementById("app")) {
+        document.getElementById("mapSeach_id").style.display = "block";
+        // document.getElementById('lon_lat_id').style.display = "block"
+      }
 
-            geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+      // 定义地图中心点坐标
+      var center = new window.TMap.LatLng(
+        this.dataForm.latitude ? this.dataForm.latitude : 36.0722275,
+        this.dataForm.longitude ? this.dataForm.longitude : 120.38945519
+      );
+      // 定义map变量，调用 TMap.Map() 构造函数创建地图
+      map = new window.TMap.Map(document.getElementById("app"), {
+        center: center, // 设置地图中心点坐标
+        zoom: 16.2, // 设置地图缩放级别
+        pitch: 43.5, // 设置俯仰角
+        rotation: 45, // 设置地图旋转角度
+      });
 
-            // 监听地图平移结束
-            map.on('panend', () => {
-                this.handleMoveCenter()
-            })
-            this.handleMoveCenter()
-            this.convert()
-            },
-            setMarker (lat, lng) {
-                markers.setGeometries([])
-                markers.add([
-                    {
-                    id: '4',
-                    styleId: 'marker',
-                    position: new TMap.LatLng(lat, lng),
-                    properties: {
-                        title: 'marker4'
-                    }
-                    }
-                ])
-            },
+      search = new window.TMap.service.Search({ pageSize: 10 });
+      // 新建一个地点搜索类
+      markers = new TMap.MultiMarker({
+        map: map,
+        geometries: [],
+      });
+      infoWindowList = Array(10);
 
-            handleSearchMap () {
-            infoWindowList.forEach((infoWindow) => {
-                infoWindow.close()
-            })
-            infoWindowList.length = 0
-            markers.setGeometries([])
-            // 在地图显示范围内以给定的关键字搜索地点
-            search.searchRectangle({ keyword: this.keyWords, bounds: map.getBounds()}).then((result) => {
-                    let { data } = result
-                    if (Array.isArray(data) && data.length > 0) {
-                        const {
-                        location: { lat, lng }
-                        } = data[0]
-                        map.setCenter(new TMap.LatLng(lat, lng))
-                        this.setMarker(lat, lng)
-                        this.dataForm.latitude = lat
-                        this.dataForm.longitude = lng
-                        this.convert()
-                    } else {
-                        this.$message.error('未检索到相关位置坐标')
-                    }
-                })
-            },
+      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+
+      // 监听地图平移结束
+      map.on("panend", () => {
+        this.handleMoveCenter();
+      });
+      this.handleMoveCenter();
+      this.convert();
+    },
+    setMarker(lat, lng) {
+      markers.setGeometries([]);
+      markers.add([
+        {
+          id: "4",
+          styleId: "marker",
+          position: new TMap.LatLng(lat, lng),
+          properties: {
+            title: "marker4",
+          },
+        },
+      ]);
+    },
+
+    handleSearchMap() {
+      infoWindowList.forEach((infoWindow) => {
+        infoWindow.close();
+      });
+      infoWindowList.length = 0;
+      markers.setGeometries([]);
+      // 在地图显示范围内以给定的关键字搜索地点
+      search
+        .searchNearby({
+          keyword: this.keyWords,
+          radius: 1000,
+          autoExtend: true,
+          center: map.getCenter(),
+        })
+        .then((result) => {
+          let { data } = result;
+          if (Array.isArray(data) && data.length > 0) {
+            const {
+              location: { lat, lng },
+            } = data[0];
+            map.setCenter(new TMap.LatLng(lat, lng));
+            this.setMarker(lat, lng);
+            this.dataForm.latitude = lat;
+            this.dataForm.longitude = lng;
+            this.convert();
+          } else {
+            this.$message.error("未检索到相关位置坐标");
+          }
+        });
+    },
 
-            handleMoveCenter () {
-                //修改地图中心点
-                const center = map.getCenter()
-                const lat = center.getLat()
-                const lng = center.getLng()
-                if (lng === 120.38945519) {
-                    this.dataForm.latitude = ''
-                    this.dataForm.longitude = ''
-                } else {
-                    this.dataForm.latitude = lat
-                    this.dataForm.longitude = lng
-                }
-                this.setMarker(lat, lng)
-                this.convert(lat, lng)
-            },
+    handleMoveCenter() {
+      //修改地图中心点
+      const center = map.getCenter();
+      const lat = center.getLat();
+      const lng = center.getLng();
+      if (lng === 120.38945519) {
+        this.dataForm.latitude = "";
+        this.dataForm.longitude = "";
+      } else {
+        this.dataForm.latitude = lat;
+        this.dataForm.longitude = lng;
+      }
+      this.setMarker(lat, lng);
+      this.convert(lat, lng);
+    },
 
-            convert (lat, lng) {
-                markers.setGeometries([]);
-                // var input = document.getElementById('location').value.split(':');
-                let location
-                if (lat && lng) {
-                    location = new TMap.LatLng(lat, lng);
-                } else {
-                    location = new TMap.LatLng(this.dataForm.latitude, this.dataForm.longitude);
-                }
-                // map.setCenter(location);
-                markers.updateGeometries([
-                    {
-                    id: 'main', // 点标注数据数组
-                    position: location,
-                    },
-                ]);
-                // 将给定的坐标位置转换为地址
-                geocoder.getAddress({ location: location }).then((result) => {
-                    this.dataForm.address = result.result.address
-                    // 显示搜索到的地址
-                });
-            },
-            // 表单提交
-            dataFormSubmitHandle: debounce(function () {
-                if (!this.dataForm.latitude || !this.dataForm.longitude) {
-                    return this.$message.error('请滑动地图选择党组织位置')
-                }
-                if (this.dataForm.orgPids === '0') {
-                    this.dataForm.orgPids = ''
-                }
-                this.$refs['dataForm'].validate((valid) => {
-                    if (!valid) {
-                        return false
-                    }
-                    this.$http[!this.dataForm.id ? 'post' : 'put']('/resi/partymember/icPartyOrg/', this.dataForm).then(({data: res}) => {
-                        if (res.code !== 0) {
-                            return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
-                        }
-                        this.$message({
-                            message: this.$t('prompt.success'),
-                            type: 'success',
-                            duration: 500,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refreshDataList')
-                            }
-                        })
-                    }).catch(() => {
-                    })
-                })
-            }, 1000, {'leading': true, 'trailing': false})
+    convert(lat, lng) {
+      markers.setGeometries([]);
+      // var input = document.getElementById('location').value.split(':');
+      let location;
+      if (lat && lng) {
+        location = new TMap.LatLng(lat, lng);
+      } else {
+        location = new TMap.LatLng(
+          this.dataForm.latitude,
+          this.dataForm.longitude
+        );
+      }
+      // map.setCenter(location);
+      markers.updateGeometries([
+        {
+          id: "main", // 点标注数据数组
+          position: location,
         },
-        computed: {
-            dataRule() {
-                return {
-                    partyOrgName: [
-                        {required: true, message: "党组织名称不能为空", trigger: 'blur'}
-                    ],
-                    mySelectOrg: [
-                        {required: true, message: "上级党组织不能为空", trigger: 'blur'}
-                    ],
-                    partyOrgType: [
-                        {required: true, message: "党组织类型不能为空", trigger: 'blur'}
-                    ],
-                    agencyId: [
-                        {required: true, message: "行政组织不能为空", trigger: 'blur'}
-                    ]
-                }
-            }
+      ]);
+      // 将给定的坐标位置转换为地址
+      geocoder.getAddress({ location: location }).then((result) => {
+        this.dataForm.address = result.result.address;
+        // 显示搜索到的地址
+      });
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(
+      function () {
+        if (!this.dataForm.latitude || !this.dataForm.longitude) {
+          return this.$message.error("请滑动地图选择党组织位置");
         }
-    }
+        if (this.dataForm.orgPids === "0") {
+          this.dataForm.orgPids = "";
+        }
+        this.$refs["dataForm"].validate((valid) => {
+          if (!valid) {
+            return false;
+          }
+          this.$http[!this.dataForm.id ? "post" : "put"](
+            "/resi/partymember/icPartyOrg/",
+            this.dataForm
+          )
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                return this.$message.error(
+                  res.internalMsg
+                    ? res.internalMsg
+                    : res.msg
+                    ? res.msg
+                    : "查询失败"
+                );
+              }
+              this.$message({
+                message: this.$t("prompt.success"),
+                type: "success",
+                duration: 500,
+                onClose: () => {
+                  this.visible = false;
+                  this.$emit("refreshDataList");
+                },
+              });
+            })
+            .catch(() => {});
+        });
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+  },
+  computed: {
+    dataRule() {
+      return {
+        partyOrgName: [
+          { required: true, message: "党组织名称不能为空", trigger: "blur" },
+        ],
+        mySelectOrg: [
+          { required: true, message: "上级党组织不能为空", trigger: "blur" },
+        ],
+        partyOrgType: [
+          { required: true, message: "党组织类型不能为空", trigger: "blur" },
+        ],
+        agencyId: [
+          { required: true, message: "行政组织不能为空", trigger: "blur" },
+        ],
+      };
+    },
+  },
+};
 </script>
 
-<style lang="scss" scoped >
+<style lang="scss" scoped>
 @import "@/assets/scss/modules/visual/communityManageForm.scss";
 </style>
-<style  lang="scss" scoped>
+<style lang="scss" scoped>
 .item_width_1 {
   width: 560px;
 
@@ -513,7 +628,6 @@
   }
 }
 
-
 .div_map {
   position: relative;
 }
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
index 141762661..56402097a 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
@@ -282,9 +282,11 @@ export default {
       markers.setGeometries([]);
       // 在地图显示范围内以给定的关键字搜索地点
       search
-        .searchRectangle({
+        .searchNearby({
           keyword: this.dataForm.address,
-          bounds: map.getBounds(),
+          radius: 1000,
+          autoExtend: true,
+          center: map.getCenter(),
         })
         .then((result) => {
           let { data } = result;
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
index 1fffd7400..222a3bc17 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -367,9 +367,11 @@ export default {
       markers.setGeometries([]);
       // 在地图显示范围内以给定的关键字搜索地点
       search
-        .searchRectangle({
+        .searchNearby({
           keyword: this.dataForm.address,
-          bounds: map.getBounds(),
+          radius: 1000,
+          autoExtend: true,
+          center: map.getCenter(),
         })
         .then((result) => {
           let { data } = result;

From 56de1897d2e2a94a550ab93d67e974d14d5ea703 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 11 Oct 2022 17:02:34 +0800
Subject: [PATCH 08/18] =?UTF-8?q?=E4=BA=BA=E9=98=B2=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cpts/base/index.vue         | 478 ++++++++++--------
 .../renFangTongJi/cpts/shequtongji.vue        | 102 ++++
 src/views/modules/renFangTongJi/index.vue     |  71 ++-
 3 files changed, 432 insertions(+), 219 deletions(-)
 create mode 100644 src/views/modules/renFangTongJi/cpts/shequtongji.vue

diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue
index 299e4dd2c..de404384f 100644
--- a/src/views/modules/cpts/base/index.vue
+++ b/src/views/modules/cpts/base/index.vue
@@ -1,239 +1,296 @@
 <template>
   <div class="div_main">
     <div v-show="true">
-      <div class="div_search"
-           ref="ref_search">
-        <el-form :inline="true"
-                 ref="ref_searchform"
-                 label-width="100px">
+      <div class="div_search" ref="ref_search">
+        <el-form :inline="true" ref="ref_searchform" label-width="100px">
           <div>
-            <el-form-item v-for="item in searchParams"
-                          :key="'serach' + item.keyName"
-                          :label="item.field"
-                          :prop="item.keyName">
+            <el-form-item
+              v-for="item in searchParams"
+              :key="'serach' + item.keyName"
+              :label="item.field"
+              :prop="item.keyName"
+            >
               <template v-if="item.type == 'input'">
-                <el-input v-model="item.value"
-                          style="width: 240px"
-                          size="small"
-                          clearable
-                          :placeholder="item.placeholder || '请输入'">
+                <el-input
+                  v-model="item.value"
+                  style="width: 240px"
+                  size="small"
+                  clearable
+                  :placeholder="item.placeholder || '请输入'"
+                >
                 </el-input>
               </template>
               <template v-else-if="item.type == 'select'">
-                <el-select v-model="item.value"
-                           :placeholder="item.placeholder || '请选择'"
-                           size="small"
-                           clearable
-                           style="width: 240px"
-                           :multiple="item.multiple || false">
-                  <el-option v-for="item in item.optionList"
-                             :key="'serach' + item.keyName + item.value"
-                             :label="item.label"
-                             :value="item.value">
+                <el-select
+                  v-model="item.value"
+                  :placeholder="item.placeholder || '请选择'"
+                  size="small"
+                  clearable
+                  style="width: 240px"
+                  :multiple="item.multiple || false"
+                >
+                  <el-option
+                    v-for="item in item.optionList"
+                    :key="'serach' + item.keyName + item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
                   </el-option>
                 </el-select>
               </template>
               <template v-else-if="item.type == 'cascader'">
-                <el-cascader v-model="item.value"
-                             :placeholder="item.placeholder || '请选择'"
-                             :options="item.optionList"
-                             :props="item.optionProps"
-                             :show-all-levels="false"
-                             size="small"
-                             clearable
-                             style="width: 240px"
-                             @change="(e) => handleChangeCascader(e, item)">
+                <el-cascader
+                  v-model="item.value"
+                  :placeholder="item.placeholder || '请选择'"
+                  :options="item.optionList"
+                  :props="item.optionProps"
+                  :show-all-levels="false"
+                  size="small"
+                  clearable
+                  style="width: 240px"
+                  @change="(e) => handleChangeCascader(e, item)"
+                >
                 </el-cascader>
               </template>
               <template v-if="item.type == 'date-range'">
-                <el-date-picker v-model="item.supValues[0]"
-                                type="date"
-                                placeholder="开始时间"
-                                style="width: 150px"
-                                value-format="yyyy-MM-dd"
-                                clearable>
+                <el-date-picker
+                  v-model="item.supValues[0]"
+                  type="date"
+                  placeholder="开始时间"
+                  style="width: 150px"
+                  value-format="yyyy-MM-dd"
+                  clearable
+                >
                 </el-date-picker>
                 <span style="display: inline-block; margin: 0 10px">至</span>
-                <el-date-picker v-model="item.supValues[1]"
-                                type="date"
-                                placeholder="结束时间"
-                                style="width: 150px"
-                                value-format="yyyy-MM-dd"
-                                clearable>
+                <el-date-picker
+                  v-model="item.supValues[1]"
+                  type="date"
+                  placeholder="结束时间"
+                  style="width: 150px"
+                  value-format="yyyy-MM-dd"
+                  clearable
+                >
                 </el-date-picker>
               </template>
             </el-form-item>
 
-            <el-button style="margin-left: 30px; margin-bottom: 20px"
-                       size="small"
-                       class="diy-button--search"
-                       @click="handleSearch">查询</el-button>
-            <el-button style="margin-left: 10px; margin-bottom: 20px"
-                       size="small"
-                       class="diy-button--reset"
-                       @click="resetSearch">重置</el-button>
+            <el-button
+              style="margin-left: 30px; margin-bottom: 20px"
+              size="small"
+              class="diy-button--search"
+              @click="handleSearch"
+              >查询</el-button
+            >
+            <el-button
+              style="margin-left: 10px; margin-bottom: 20px"
+              size="small"
+              class="diy-button--reset"
+              @click="resetSearch"
+              >重置</el-button
+            >
           </div>
         </el-form>
       </div>
 
-      <div class="div_table"
-           :style="{ height: maxTableHeight + 130 + 'px' }">
+      <div class="div_table" :style="{ height: maxTableHeight + 130 + 'px' }">
         <div class="div_btn">
-          <el-button class="diy-button--add"
-                     v-if="addUrl"
-                     size="small"
-                     @click="handleAdd">新增</el-button>
-
-          <el-button v-if="mubanUrl"
-                     class="btn_upload diy-button--export"
-                     size="small"
-                     @click="handleExportModule('room')">下载模板</el-button>
-
-          <el-upload :headers="$getElUploadHeaders()"
-                     v-if="importUrl"
-                     ref="upload"
-                     class="upload-btn"
-                     action="uploadUlr"
-                     :limit="1"
-                     :accept="'.xls,.xlsx'"
-                     :with-credentials="true"
-                     :show-file-list="false"
-                     :auto-upload="true"
-                     :before-upload="beforeExcelUpload"
-                     :http-request="uploadHttpRequest">
-            <el-button size="small"
-                       class="btn_upload diy-button--delete">导入</el-button>
+          <el-button
+            class="diy-button--add"
+            v-if="addUrl"
+            size="small"
+            @click="handleAdd"
+            >新增</el-button
+          >
+
+          <el-button
+            v-if="mubanUrl"
+            class="btn_upload diy-button--export"
+            size="small"
+            @click="handleExportModule('room')"
+            >下载模板</el-button
+          >
+
+          <el-upload
+            :headers="$getElUploadHeaders()"
+            v-if="importUrl"
+            ref="upload"
+            class="upload-btn"
+            action="uploadUlr"
+            :limit="1"
+            :accept="'.xls,.xlsx'"
+            :with-credentials="true"
+            :show-file-list="false"
+            :auto-upload="true"
+            :before-upload="beforeExcelUpload"
+            :http-request="uploadHttpRequest"
+          >
+            <el-button size="small" class="btn_upload diy-button--delete"
+              >导入</el-button
+            >
           </el-upload>
 
-          <el-button v-if="exportUrl"
-                     @click="handleExport"
-                     class="btn_upload diy-button--reset"
-                     size="small">导出</el-button>
+          <el-button
+            v-if="exportUrl"
+            @click="handleExport"
+            class="btn_upload diy-button--reset"
+            size="small"
+            >导出</el-button
+          >
         </div>
 
-        <el-table ref="ref_table"
-                  :data="tableData"
-                  border
-                  :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
-                  class="table"
-                  style="width: 100%"
-                  :height="maxTableHeight">
-          <template v-for="item in tableParams"
-                    :prop="item.keyName">
-            <el-table-column v-if="item.type == 'no'"
-                             :key="'table-no' + item.keyName"
-                             :label="item.field"
-                             fixed="left"
-                             type="index"
-                             align="center"
-                             width="50" />
-
-            <el-table-column v-else-if="item.type == 'text'"
-                             :key="'table' + item.keyName"
-                             :prop="item.keyName"
-                             :label="item.field"
-                             align="center"
-                             :width="item.width || ''"
-                             :show-overflow-tooltip="true">
+        <el-table
+          ref="ref_table"
+          :data="tableData"
+          border
+          :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+          class="table"
+          style="width: 100%"
+          :height="maxTableHeight"
+        >
+          <template v-for="item in tableParams" :prop="item.keyName">
+            <el-table-column
+              v-if="item.type == 'no'"
+              :key="'table-no' + item.keyName"
+              :label="item.field"
+              fixed="left"
+              type="index"
+              align="center"
+              width="50"
+            />
+
+            <el-table-column
+              v-else-if="item.type == 'text'"
+              :key="'table' + item.keyName"
+              :prop="item.keyName"
+              :label="item.field"
+              align="center"
+              :width="item.width || ''"
+              :show-overflow-tooltip="true"
+            >
             </el-table-column>
 
-            <el-table-column v-else-if="item.type == 'array'"
-                             :key="'table-array' + item.keyName"
-                             :prop="item.keyName"
-                             :label="item.field"
-                             align="center"
-                             :width="item.width || ''"
-                             :show-overflow-tooltip="true">
+            <el-table-column
+              v-else-if="item.type == 'array'"
+              :key="'table-array' + item.keyName"
+              :prop="item.keyName"
+              :label="item.field"
+              align="center"
+              :width="item.width || ''"
+              :show-overflow-tooltip="true"
+            >
               <template slot-scope="scope">
                 {{ scope.row[item.keyName].join(item.arrayDiv || ",") }}
               </template>
             </el-table-column>
           </template>
 
-          <el-table-column fixed="right"
-                           label="操作"
-                           align="center"
-                           width="200">
+          <el-table-column
+            v-if="operateCol"
+            fixed="right"
+            label="操作"
+            align="center"
+            width="200"
+          >
             <template slot-scope="scope">
-              <slot name="listBtnbefore"
-                    v-bind:item="scope.row"></slot>
-              <el-button v-if="infoUrl && infoAuth(scope.row)"
-                         @click="handleWatch(scope.row)"
-                         type="text"
-                         size="small"
-                         class=".div-table-button--detail">查看</el-button>
-              <el-button v-if="editUrl && editAuth(scope.row)"
-                         @click="handleEdit(scope.row)"
-                         type="text"
-                         size="small"
-                         class="div-table-button--edit">{{ editBtnName(scope.row) }}</el-button>
-              <el-popconfirm v-if="delUrl && delAuth(scope.row)"
-                             title="删除之后无法回复，确认删除？"
-                             @onConfirm="handleDelete(scope.row, scope.$index)"
-                             @confirm="handleDelete(scope.row, scope.$index)">
-                <el-button slot="reference"
-                           type="text"
-                           size="small"
-                           style="margin-left: 10px"
-                           class="div-table-button--delete">删除</el-button>
+              <slot name="listBtnbefore" v-bind:item="scope.row"></slot>
+              <el-button
+                v-if="infoUrl && infoAuth(scope.row)"
+                @click="handleWatch(scope.row)"
+                type="text"
+                size="small"
+                class=".div-table-button--detail"
+                >查看</el-button
+              >
+              <el-button
+                v-if="editUrl && editAuth(scope.row)"
+                @click="handleEdit(scope.row)"
+                type="text"
+                size="small"
+                class="div-table-button--edit"
+                >{{ editBtnName(scope.row) }}</el-button
+              >
+              <el-popconfirm
+                v-if="delUrl && delAuth(scope.row)"
+                title="删除之后无法回复，确认删除？"
+                @onConfirm="handleDelete(scope.row, scope.$index)"
+                @confirm="handleDelete(scope.row, scope.$index)"
+              >
+                <el-button
+                  slot="reference"
+                  type="text"
+                  size="small"
+                  style="margin-left: 10px"
+                  class="div-table-button--delete"
+                  >删除</el-button
+                >
               </el-popconfirm>
 
-              <slot name="listBtnSup"
-                    v-bind:item="scope.row"></slot>
+              <slot name="listBtnSup" v-bind:item="scope.row"></slot>
             </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
+            @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>
       </div>
     </div>
 
     <!-- 修改弹出框 -->
-    <el-dialog v-if="formShow"
-               :visible.sync="formShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="formTitle"
-               :width="editParamsDiv ? '1100px' : '850px'"
-               top="5vh"
-               class="dialog-h"
-               @closed="handleClose">
-      <edit-form v-if="formShow"
-                 ref="editForm"
-                 :idName="idName"
-                 :formId="formId"
-                 :formType="formType"
-                 :infoUrl="infoUrl"
-                 :addUrl="addUrl"
-                 :editUrl="editUrl"
-                 :editParams="editParams"
-                 :editParamsDiv="editParamsDiv"
-                 :editElseRules="editElseRules"
-                 :editFixedParams="editFixedParams"
-                 :formBtnFixed="formBtnFixed"
-                 :editConfig="editConfig"
-                 @close="handleClose"
-                 @afterEdit="handleEditSuccess">
+    <el-dialog
+      v-if="formShow"
+      :visible.sync="formShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="formTitle"
+      :width="editParamsDiv ? '1100px' : '850px'"
+      top="5vh"
+      class="dialog-h"
+      @closed="handleClose"
+    >
+      <edit-form
+        v-if="formShow"
+        ref="editForm"
+        :idName="idName"
+        :formId="formId"
+        :formType="formType"
+        :infoUrl="infoUrl"
+        :addUrl="addUrl"
+        :editUrl="editUrl"
+        :editParams="editParams"
+        :editParamsDiv="editParamsDiv"
+        :editElseRules="editElseRules"
+        :editFixedParams="editFixedParams"
+        :formBtnFixed="formBtnFixed"
+        :editConfig="editConfig"
+        @close="handleClose"
+        @afterEdit="handleEditSuccess"
+      >
         <template v-slot:bottomSup="{ id, formType, info }">
-          <slot name="editBottomSup"
-                v-bind:id="id"
-                v-bind:formType="formType"
-                v-bind:info="info"></slot>
+          <slot
+            name="editBottomSup"
+            v-bind:id="id"
+            v-bind:formType="formType"
+            v-bind:info="info"
+          ></slot>
         </template>
         <template v-slot:operateSup="{ id, formType, info }">
-          <slot name="editOperateSup"
-                v-bind:id="id"
-                v-bind:formType="formType"
-                v-bind:info="info"></slot>
+          <slot
+            name="editOperateSup"
+            v-bind:id="id"
+            v-bind:formType="formType"
+            v-bind:info="info"
+          ></slot>
         </template>
       </edit-form>
     </el-dialog>
@@ -346,9 +403,14 @@ export default {
       type: Boolean,
       default: true,
     },
+
+    operateCol: {
+      type: Boolean,
+      default: true,
+    },
   },
 
-  data () {
+  data() {
     return {
       tableData: [],
 
@@ -366,7 +428,7 @@ export default {
   },
 
   computed: {
-    maxTableHeight () {
+    maxTableHeight() {
       const { ref_search_height } = this;
       return this.$store.state.inIframe
         ? this.clientHeight - ref_search_height - 265 + this.iframeHeight
@@ -377,7 +439,7 @@ export default {
 
   watch: {},
 
-  async mounted () {
+  async mounted() {
     console.log(this.$store.state);
     this.user = this.$store.state.user;
 
@@ -391,19 +453,19 @@ export default {
     this.computeSearchHeight();
   },
 
-  activated () {
+  activated() {
     console.log("-------------activated");
     this.$refs["ref_table"].doLayout();
   },
 
   methods: {
-    computeSearchHeight () {
+    computeSearchHeight() {
       this.ref_search_height = this.$refs["ref_search"].clientHeight;
       console.log(this.$refs["ref_search"]);
       console.log(this.ref_search_height);
     },
 
-    iniSearchData () {
+    iniSearchData() {
       const { searchParams } = this;
       searchParams.forEach((item, index) => {
         if (item.type == "select" || item.type == "cascader") {
@@ -419,7 +481,7 @@ export default {
       });
     },
 
-    async getFmOptions (index, url, params, cookFn) {
+    async getFmOptions(index, url, params, cookFn) {
       const { data, code, msg } = await requestPost(url, {
         ...params,
       });
@@ -432,19 +494,19 @@ export default {
       }
     },
 
-    handleChangeCascader (vals, item) {
+    handleChangeCascader(vals, item) {
       if (typeof item.handleChangeFn == "function") {
         item.handleChangeFn(vals, item);
       }
     },
 
-    handleSearch (val) {
+    handleSearch(val) {
       this.pageNo = 1;
 
       this.getTableData();
     },
 
-    beforeExcelUpload (file) {
+    beforeExcelUpload(file) {
       console.log("file", file);
       const isType = file.type === "application/vnd.ms-excel";
       const isTypeComputer =
@@ -462,7 +524,7 @@ export default {
       return fileType && isLt1M;
     },
 
-    async uploadHttpRequest (file) {
+    async uploadHttpRequest(file) {
       let { importUrl: url } = this;
       if (!url) return;
 
@@ -491,7 +553,7 @@ export default {
         });
     },
 
-    async handleExportModule () {
+    async handleExportModule() {
       let { mubanUrl: url } = this;
       if (!url) return;
 
@@ -528,7 +590,7 @@ export default {
         });
     },
 
-    async handleExport () {
+    async handleExport() {
       const { exportUrl: url } = this;
       if (!url) return;
 
@@ -566,13 +628,13 @@ export default {
         });
     },
 
-    handleAdd () {
+    handleAdd() {
       this.formType = "add";
       this.formTitle = "新增";
       this.formShow = true;
     },
 
-    handleWatch (row) {
+    handleWatch(row) {
       const { idName } = this;
       this.formType = "watch";
       this.formId = row[idName];
@@ -580,7 +642,7 @@ export default {
       this.formShow = true;
     },
 
-    handleEdit (row) {
+    handleEdit(row) {
       const { idName } = this;
       this.formType = "edit";
       this.formId = row[idName];
@@ -588,17 +650,17 @@ export default {
       this.formShow = true;
     },
 
-    handleClose () {
+    handleClose() {
       this.formShow = false;
       this.getTableData();
     },
 
-    handleEditSuccess () {
+    handleEditSuccess() {
       this.handleClose();
       // this.getTableData();
     },
 
-    async handleDelete (rowData, rowIndex) {
+    async handleDelete(rowData, rowIndex) {
       console.log(rowData, rowIndex);
       let { delUrl: url } = this;
       if (!url) return;
@@ -621,7 +683,7 @@ export default {
       }
     },
 
-    computeFmData () {
+    computeFmData() {
       let fmData = {};
       this.searchParams.forEach((item) => {
         fmData[item.keyName] = item.value;
@@ -634,11 +696,11 @@ export default {
       return fmData;
     },
 
-    refresh () {
+    refresh() {
       this.getTableData();
     },
 
-    async getTableData () {
+    async getTableData() {
       const { tableUrl: url } = this;
       if (!url) return;
 
@@ -653,25 +715,25 @@ export default {
         this.total = data.total || 0;
         this.tableData = data.list
           ? data.list.map((item) => {
-            return item;
-          })
+              return item;
+            })
           : [];
       } else {
         this.$message.error(msg);
       }
     },
 
-    handleSizeChange (val) {
+    handleSizeChange(val) {
       this.pageSize = val;
       window.localStorage.setItem("pageSize", val);
       this.getTableData();
     },
-    handleCurrentChange (val) {
+    handleCurrentChange(val) {
       this.pageNo = val;
       this.getTableData();
     },
 
-    resetSearch () {
+    resetSearch() {
       console.log("----------------resetSearch", this.searchParams);
       this.searchParams.forEach((item) => {
         if (typeof item.value == "string") {
diff --git a/src/views/modules/renFangTongJi/cpts/shequtongji.vue b/src/views/modules/renFangTongJi/cpts/shequtongji.vue
new file mode 100644
index 000000000..f5bfbd123
--- /dev/null
+++ b/src/views/modules/renFangTongJi/cpts/shequtongji.vue
@@ -0,0 +1,102 @@
+<template>
+  <div v-if="iniLoaded">
+    <base-page
+      :searchParams="searchParams"
+      :tableParams="tableParams"
+      :tableUrl="tableUrl"
+      :operateCol="false"
+      idName="icDangerousChemicalsId"
+    ></base-page>
+  </div>
+</template>
+
+<script>
+import basePage from "@/views/modules/cpts/base/index";
+import { getItemByIdInCascader, collapse } from "@/utils/cascader";
+
+export default {
+  props: {
+    orgId: {
+      type: String,
+      default: "",
+    },
+  },
+
+  data() {
+    return {
+      iniLoaded: false,
+
+      searchParams: [
+        {
+          field: "发布范围",
+          keyName: "org",
+          type: "cascader",
+          value: "",
+          optionUrl: "/gov/org/customeragency/agencygridtree",
+          optionUrlParams: {
+            agencyId: this.$store.state.user.agencyId,
+          },
+          optionList: [],
+          optionProps: {
+            multiple: false,
+            value: "agencyId",
+            label: "agencyName",
+            children: "subAgencyList",
+            checkStrictly: true,
+          },
+          optionCook(obj) {
+            return [obj];
+          },
+          supKeys: ["orgId", "orgType"],
+          supValues: ["", ""],
+          handleChangeFn(vals, item) {
+            const { optionList } = item;
+            if (vals.length > 0) {
+              item["supValues"][0] = vals[vals.length - 1];
+              item["supValues"][1] = getItemByIdInCascader(
+                optionList,
+                vals,
+                "agencyId",
+                "subAgencyList"
+              )[vals.length - 1]["level"];
+              item["supValues"][1] =
+                item["supValues"][1] == "grid" ? "grid" : "agency";
+            } else {
+              item["supValues"][0] = "";
+              item["supValues"][1] = "";
+            }
+          },
+        },
+      ],
+
+      tableParams: [
+        { field: "序号", keyName: "", type: "no" },
+        { field: "所属组织", keyName: "orgName", type: "text", width: "220" },
+        { field: "人口总数", keyName: "userTotal", type: "text" },
+        { field: "常住人口数", keyName: "czUserTotal", type: "text" },
+        { field: "流动人口数", keyName: "ldUserTotal", type: "text" },
+        { field: "房屋总数", keyName: "houseTotal", type: "text" },
+        { field: "自住房屋数", keyName: "zzHouseTotal", type: "text" },
+        { field: "出租房屋数", keyName: "czHouseTotal", type: "text" },
+        { field: "闲置房屋数", keyName: "xzHouseTotal", type: "text" },
+      ],
+      tableUrl: "/gov/org/house/communityUserHouseStats",
+    };
+  },
+  components: { basePage },
+  computed: {},
+  watch: {},
+
+  async mounted() {
+    this.searchParams[0].supValues[0] = this.orgId;
+    if (this.orgId) {
+      this.searchParams[0].supValues[1] = "agency";
+    }
+    this.iniLoaded = true;
+  },
+
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/modules/renFangTongJi/index.vue b/src/views/modules/renFangTongJi/index.vue
index 0d21d6ddd..81c97c1d7 100644
--- a/src/views/modules/renFangTongJi/index.vue
+++ b/src/views/modules/renFangTongJi/index.vue
@@ -1,7 +1,12 @@
 <template>
   <el-card class="g-cnt">
     <div class="m-cards">
-      <div class="item" :key="item.name" v-for="item in list">
+      <div
+        class="item"
+        :key="item.name"
+        @click="handleClickCard(item)"
+        v-for="item in list"
+      >
         <div class="item-left">
           <div class="num">{{ item.num }}</div>
           <div class="name">{{ item.name }}</div>
@@ -24,46 +29,75 @@
         style="width: 100%"
         class="tb"
         :height="maxTableHeight"
+        align="center"
       >
         <el-table-column label="序号" type="index" align="center" width="50" />
-        <el-table-column prop="orgName" label="所属组织"> </el-table-column>
-        <el-table-column prop="usingCommunityNum" label="开通平台社区数">
+        <el-table-column
+          prop="orgName"
+          label="所属组织"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="usingCommunityNum"
+          label="开通平台社区数"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <a style="cursor: pointer" @click="showDetail(scope.row.orgId)">{{
+              scope.row.usingCommunityNum
+            }}</a>
+          </template>
         </el-table-column>
-        <el-table-column prop="userTotal" label="人口总数"></el-table-column>
+        <el-table-column
+          prop="userTotal"
+          label="人口总数"
+          align="center"
+        ></el-table-column>
         <el-table-column
           prop="czUserTotal"
           label="常住人口总数"
+          align="center"
         ></el-table-column>
         <el-table-column
           prop="ldUserTotal"
           label="流动人口总数"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="houseTotal"
+          label="房屋总数"
+          align="center"
         ></el-table-column>
-        <el-table-column prop="houseTotal" label="房屋总数"></el-table-column>
         <el-table-column
           prop="zzHouseTotal"
           label="自住房屋总数"
+          align="center"
         ></el-table-column>
         <el-table-column
           prop="czHouseTotal"
           label="出租房屋总数"
+          align="center"
         ></el-table-column>
         <el-table-column
           prop="xzHouseTotal"
           label="闲置房屋总数"
+          align="center"
         ></el-table-column>
       </el-table>
     </div>
 
     <!-- 修改弹出框 -->
     <el-dialog
-      :visible.sync="displayedDetail"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
+      v-if="displayedDetail"
+      :visible="true"
       title="开放社区数"
-      width="850px"
+      width="1150px"
       top="5vh"
-      @closed="displayedDetail = false"
+      @close="displayedDetail = false"
     >
+      <shequtongji ref="shequtongji" :orgId="detailOrgId" />
     </el-dialog>
   </el-card>
 </template>
@@ -72,10 +106,11 @@
 import { requestPost } from "@/js/dai/request";
 import nextTick from "dai-js/tools/nextTick";
 import { mapGetters } from "vuex";
+import shequtongji from "./cpts/shequtongji";
 
 export default {
   name: "renFangTongJi",
-  components: {},
+  components: { shequtongji },
   data() {
     return {
       displayedDetail: false,
@@ -84,6 +119,8 @@ export default {
       orgId: "",
       orgType: "",
 
+      detailOrgId: "",
+
       list: [
         {
           name: "开通平台社区数",
@@ -161,6 +198,17 @@ export default {
     this.getTableData();
   },
   methods: {
+    handleClickCard(item) {
+      if (item.name == "开通平台社区数") {
+        this.showDetail();
+      }
+    },
+
+    async showDetail(orgId = "") {
+      this.displayedDetail = true;
+      this.detailOrgId = orgId;
+    },
+
     async getCommunityData() {
       const url = "/gov/org/agency/usingCommunityStats";
 
@@ -271,6 +319,7 @@ export default {
     padding: 12px;
     border-radius: 4px;
     background-image: linear-gradient(to left, #43c8c4, #2aa5c6);
+    cursor: pointer;
 
     .item-right {
       margin-left: auto;

From 409dfaa0a88a69706393b64b927dbdb52aabf181 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 11 Oct 2022 17:06:22 +0800
Subject: [PATCH 09/18] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/renFangTongJi/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/renFangTongJi/index.vue b/src/views/modules/renFangTongJi/index.vue
index 81c97c1d7..b32a3d954 100644
--- a/src/views/modules/renFangTongJi/index.vue
+++ b/src/views/modules/renFangTongJi/index.vue
@@ -92,7 +92,7 @@
     <el-dialog
       v-if="displayedDetail"
       :visible="true"
-      title="开放社区数"
+      title="社区列表 "
       width="1150px"
       top="5vh"
       @close="displayedDetail = false"

From 68f57496d0a080236f74a88462841352624bc0a8 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 11 Oct 2022 17:13:38 +0800
Subject: [PATCH 10/18] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/renFangTongJi/index.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/renFangTongJi/index.vue b/src/views/modules/renFangTongJi/index.vue
index b32a3d954..42cdb4e2e 100644
--- a/src/views/modules/renFangTongJi/index.vue
+++ b/src/views/modules/renFangTongJi/index.vue
@@ -307,13 +307,14 @@ export default {
 .m-cards {
   display: flex;
   flex-wrap: wrap;
-  //   align-items: center;
+  align-items: center;
+  justify-content: space-between;
 
   .item {
     display: flex;
     width: 24%;
     margin-top: 15px;
-    margin-right: 1%;
+    // margin-right: 1%;
     box-sizing: border-box;
     color: #ffffff;
     padding: 12px;

From 655210976bf91b3db191cdb4708c9cdaba5868d9 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 12 Oct 2022 13:56:34 +0800
Subject: [PATCH 11/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/renFangTongJi/cpts/shequtongji.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/renFangTongJi/cpts/shequtongji.vue b/src/views/modules/renFangTongJi/cpts/shequtongji.vue
index f5bfbd123..338af4eaa 100644
--- a/src/views/modules/renFangTongJi/cpts/shequtongji.vue
+++ b/src/views/modules/renFangTongJi/cpts/shequtongji.vue
@@ -28,11 +28,12 @@ export default {
 
       searchParams: [
         {
-          field: "发布范围",
+          field: "选择范围",
           keyName: "org",
           type: "cascader",
           value: "",
-          optionUrl: "/gov/org/customeragency/agencygridtree",
+          //   optionUrl: "/gov/org/customeragency/agencygridtree",
+          optionUrl: "/gov/org/customeragency/my-subagency-list",
           optionUrlParams: {
             agencyId: this.$store.state.user.agencyId,
           },

From c4d833f230753c0bd7f1ad5133d04668cafcdf29 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 12 Oct 2022 14:05:59 +0800
Subject: [PATCH 12/18] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/renFangTongJi/cpts/shequtongji.vue | 5 +++++
 src/views/modules/renFangTongJi/index.vue            | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/renFangTongJi/cpts/shequtongji.vue b/src/views/modules/renFangTongJi/cpts/shequtongji.vue
index 338af4eaa..91647d995 100644
--- a/src/views/modules/renFangTongJi/cpts/shequtongji.vue
+++ b/src/views/modules/renFangTongJi/cpts/shequtongji.vue
@@ -20,6 +20,10 @@ export default {
       type: String,
       default: "",
     },
+    orgIds: {
+      type: String,
+      default: "",
+    },
   },
 
   data() {
@@ -89,6 +93,7 @@ export default {
   watch: {},
 
   async mounted() {
+    this.searchParams[0].value = this.orgIds;
     this.searchParams[0].supValues[0] = this.orgId;
     if (this.orgId) {
       this.searchParams[0].supValues[1] = "agency";
diff --git a/src/views/modules/renFangTongJi/index.vue b/src/views/modules/renFangTongJi/index.vue
index 42cdb4e2e..c2b03e9a0 100644
--- a/src/views/modules/renFangTongJi/index.vue
+++ b/src/views/modules/renFangTongJi/index.vue
@@ -97,7 +97,11 @@
       top="5vh"
       @close="displayedDetail = false"
     >
-      <shequtongji ref="shequtongji" :orgId="detailOrgId" />
+      <shequtongji
+        ref="shequtongji"
+        :orgId="detailOrgId"
+        :orgIds="[orgId, detailOrgId]"
+      />
     </el-dialog>
   </el-card>
 </template>
@@ -236,6 +240,8 @@ export default {
 
       if (code === 0) {
         const { list } = this;
+        this.orgId = data.orgId;
+        this.orgType = data.orgType;
         let item1 = list.find((item) => item.name == "人口总数");
         item1.num = data.userTotal;
         item1.variation = parseInt(data.userTotalJSY);

From 18c28d6808c2a63a6678611eeb67d799b994465e Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 12 Oct 2022 16:00:50 +0800
Subject: [PATCH 13/18] =?UTF-8?q?=E6=94=B9=E6=8E=A5=E5=8F=A3=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/renFangTongJi/cpts/shequtongji.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/renFangTongJi/cpts/shequtongji.vue b/src/views/modules/renFangTongJi/cpts/shequtongji.vue
index 91647d995..beb663f96 100644
--- a/src/views/modules/renFangTongJi/cpts/shequtongji.vue
+++ b/src/views/modules/renFangTongJi/cpts/shequtongji.vue
@@ -85,7 +85,7 @@ export default {
         { field: "出租房屋数", keyName: "czHouseTotal", type: "text" },
         { field: "闲置房屋数", keyName: "xzHouseTotal", type: "text" },
       ],
-      tableUrl: "/gov/org/house/communityUserHouseStats",
+      tableUrl: "/gov/org/house/usingCommunityUserHouseStats",
     };
   },
   components: { basePage },

From 581251d90b26acd0c65141ed0f7c18264faf5638 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 13 Oct 2022 11:13:55 +0800
Subject: [PATCH 14/18] =?UTF-8?q?=E6=9B=B4=E6=94=B9vue=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E4=B8=ADsass=E5=BC=95=E7=94=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/renFangTongJi/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/renFangTongJi/index.vue b/src/views/modules/renFangTongJi/index.vue
index c2b03e9a0..8fcd403d7 100644
--- a/src/views/modules/renFangTongJi/index.vue
+++ b/src/views/modules/renFangTongJi/index.vue
@@ -307,8 +307,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "@/assets/scss/c/config";
-@import "@/assets/scss/c/function";
+@import "@/assets/scss/c/config.scss";
+@import "@/assets/scss/c/function.scss";
 
 .m-cards {
   display: flex;

From bc2d70e06b8ed9a1e6575dff421cf0b993eb157a Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 13 Oct 2022 16:35:54 +0800
Subject: [PATCH 15/18] =?UTF-8?q?=E5=81=9A=E4=BA=86=E4=B8=80=E7=82=B9?=
 =?UTF-8?q?=EF=BC=8C=E5=85=88=E5=AD=98=E7=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cpts/base/index.vue   |  50 ++++++-
 src/views/modules/shujuduibi/canji.vue  | 179 ++++++++++++++++++++++++
 src/views/modules/shujuduibi/siwang.vue | 111 +++++++++++++++
 3 files changed, 339 insertions(+), 1 deletion(-)
 create mode 100644 src/views/modules/shujuduibi/canji.vue
 create mode 100644 src/views/modules/shujuduibi/siwang.vue

diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue
index de404384f..7bdf0f82a 100644
--- a/src/views/modules/cpts/base/index.vue
+++ b/src/views/modules/cpts/base/index.vue
@@ -137,6 +137,16 @@
             size="small"
             >导出</el-button
           >
+          <el-button
+            v-if="delMultipleUrl"
+            size="small"
+            @click="handleDeleteMultiple"
+            >批量删除</el-button
+          >
+          <slot
+            name="listBtn"
+            v-bind:multipleSelection="multipleSelection"
+          ></slot>
         </div>
 
         <el-table
@@ -147,8 +157,17 @@
           class="table"
           style="width: 100%"
           :height="maxTableHeight"
+          @selection-change="handleSelectionChange"
         >
-          <template v-for="item in tableParams" :prop="item.keyName">
+          <template v-for="(item, index) in tableParams" :prop="item.keyName">
+            <el-table-column
+              v-if="item.type == 'selection'"
+              :key="'table-selection' + index"
+              type="selection"
+              align="center"
+              width="50"
+            />
+
             <el-table-column
               v-if="item.type == 'no'"
               :key="'table-no' + item.keyName"
@@ -339,6 +358,10 @@ export default {
       type: String,
       default: "",
     },
+    delMultipleUrl: {
+      type: String,
+      default: "",
+    },
     infoUrl: {
       type: String,
       default: "",
@@ -424,6 +447,8 @@ export default {
       formType: "", // 列表list 新增add  修改edit 详情info
 
       ref_search_height: 100,
+
+      multipleSelection: [],
     };
   },
 
@@ -459,6 +484,11 @@ export default {
   },
 
   methods: {
+    handleSelectionChange(val) {
+      console.log(val);
+      this.multipleSelection = val;
+    },
+
     computeSearchHeight() {
       this.ref_search_height = this.$refs["ref_search"].clientHeight;
       console.log(this.$refs["ref_search"]);
@@ -660,6 +690,24 @@ export default {
       // this.getTableData();
     },
 
+    async handleDeleteMultiple() {
+      let { delMultipleUrl: url } = this;
+      if (!url) return;
+
+      const { multipleSelection, idName } = this;
+
+      const { data, code, msg } = await requestPost(url, [
+        ...multipleSelection.map((item) => item[idName]),
+      ]);
+
+      if (code === 0) {
+        this.$message.success("批量删除成功！");
+        this.getTableData();
+      } else {
+        this.$message.error("操作失败！");
+      }
+    },
+
     async handleDelete(rowData, rowIndex) {
       console.log(rowData, rowIndex);
       let { delUrl: url } = this;
diff --git a/src/views/modules/shujuduibi/canji.vue b/src/views/modules/shujuduibi/canji.vue
new file mode 100644
index 000000000..fc921ef03
--- /dev/null
+++ b/src/views/modules/shujuduibi/canji.vue
@@ -0,0 +1,179 @@
+<template>
+  <div>
+    <base-page
+      ref="basePage"
+      :searchParams="searchParams"
+      :tableParams="tableParams"
+      :tableUrl="tableUrl"
+      :delUrl="delUrl"
+      :delMultipleUrl="delMultipleUrl"
+      :delAuth="delAuth"
+      :infoUrl="infoUrl"
+      :exportUrl="exportUrl"
+      :editParams="editParams"
+      :editElseRules="editElseRules"
+      :editBtnName="(item) => (!item.latitude ? '待完善' : '修改')"
+      idName="id"
+    >
+      <template v-slot:listBtn="{ multipleSelection }">
+        <el-button @click="handleSyncMultiple(multipleSelection)" size="small"
+          >批量更新</el-button
+        >
+      </template>
+
+      <template v-slot:listBtnSup="{ item }">
+        <el-button type="text" @click="handleSync(item)" size="small"
+          >全部更新</el-button
+        >
+      </template>
+
+      <template v-slot:editOperateSup="{ id, info }">
+        <h3>对比信息</h3>
+        <el-table
+          :data="cookInfo(info)"
+          style="width: 100%"
+          :row-class-name="tableRowClassName"
+        >
+          <el-table-column prop="resiinfo" label="对比信息" width="180">
+          </el-table-column>
+          <el-table-column prop="result" label="结果">
+            <template slot-scope="scope">
+              <i class="el-icon-time"></i>
+              <span style="margin-left: 10px">{{ scope.row.date }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </template>
+    </base-page>
+  </div>
+</template>
+
+<script>
+import basePage from "@/views/modules/cpts/base/index";
+import { requestPost } from "@/js/dai/request";
+
+export default {
+  props: {},
+
+  data() {
+    return {
+      searchParams: [
+        { field: "姓名", keyName: "name", type: "input" },
+        { field: "证件号", keyName: "idCard", type: "input" },
+        { field: "手机", keyName: "mobile", type: "input" },
+      ],
+
+      tableParams: [
+        { field: "选择框", keyName: "", type: "selection" },
+        { field: "序号", keyName: "", type: "no" },
+        { field: "姓名", keyName: "name", type: "text" },
+        { field: "证件号", keyName: "idCard", type: "text" },
+        { field: "手机", keyName: "mobile", type: "text" },
+        { field: "性别", keyName: "gender", type: "text" },
+        { field: "民族", keyName: "mz", type: "text" },
+        { field: "家庭住址", keyName: "address", type: "text" },
+        { field: "残疾类别", keyName: "cjlb", type: "text" },
+        { field: "残疾等级", keyName: "cardNum", type: "text" },
+        { field: "残疾证号", keyName: "cjzk", type: "text" },
+        { field: "监护人", keyName: "guardian", type: "text" },
+        { field: "状态", keyName: "dealStatus", type: "text" },
+        { field: "失败原因", keyName: "dealResult", type: "text" },
+      ],
+
+      tableUrl: "/epmetuser/dataSyncRecordDisability/page",
+      delMultipleUrl: "/epmetuser/dataSyncRecordDisability/delete",
+
+      infoUrl: "/epmetuser/dataSyncRecordDisability/detail/",
+      //   delUrl: "/gov/org/icDangerousChemicals/del",
+      exportUrl: "/epmetuser/dataSyncRecordDisability/export",
+
+      editParams: [
+        { field: "姓名", keyName: "name", type: "input" },
+        { field: "证件号", keyName: "idCard", type: "input" },
+        { field: "手机", keyName: "mobile", type: "input" },
+        { field: "性别", keyName: "gender", type: "input" },
+        { field: "民族", keyName: "mz", type: "input" },
+        { field: "家庭住址", keyName: "address", type: "input" },
+        { field: "残疾类别", keyName: "cjlb", type: "input" },
+        { field: "残疾等级", keyName: "cardNum", type: "input" },
+        { field: "残疾证号", keyName: "cjzk", type: "input" },
+        { field: "监护人", keyName: "guardian", type: "input" },
+        { field: "状态", keyName: "dealStatus", type: "input" },
+        { field: "失败原因", keyName: "dealResult", type: "input" },
+      ],
+    };
+  },
+  components: { basePage },
+  computed: {},
+  watch: {},
+
+  async mounted() {},
+
+  methods: {
+    cookInfo(info) {
+      let arr = [
+        { field: "姓名", keyName: "name", type: "text" },
+        { field: "证件号", keyName: "idCard", type: "text" },
+        { field: "手机", keyName: "mobile", type: "text" },
+        { field: "性别", keyName: "gender", type: "text" },
+        { field: "民族", keyName: "mz", type: "text" },
+        { field: "家庭住址", keyName: "address", type: "text" },
+        { field: "残疾类别", keyName: "cjlb", type: "text" },
+        { field: "残疾等级", keyName: "cardNum", type: "text" },
+        { field: "残疾证号", keyName: "cjzk", type: "text" },
+        { field: "监护人", keyName: "guardian", type: "text" },
+      ];
+      return arr.map((item) => {
+        return {
+          resiinfo: item.field + "：" + info.resiinfo[item.keyName],
+          result:
+            info.resiinfo[item.keyName] == info[item.keyName]
+              ? "一致"
+              : "不一致",
+        };
+      });
+    },
+
+    tableRowClassName({ row }) {
+      if (row.result === "不一致") {
+        return "z-stress";
+      }
+      return "";
+    },
+
+    async handleSync(item) {
+      const { data, code, msg } = await requestPost(
+        "/epmetuser/dataSyncRecordDisability/batchUpdate",
+        [item["id"]]
+      );
+
+      if (code === 0) {
+        this.$message.success("更新成功！");
+        this.$refs.basePage.getTableData();
+      } else {
+        this.$message.error("操作失败！");
+      }
+    },
+
+    async handleSyncMultiple(multipleSelection) {
+      const { data, code, msg } = await requestPost(
+        "/epmetuser/dataSyncRecordDisability/batchUpdate",
+        [...multipleSelection.map((item) => item["id"])]
+      );
+
+      if (code === 0) {
+        this.$message.success("批量更新成功！");
+        this.$refs.basePage.getTableData();
+      } else {
+        this.$message.error("操作失败！");
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.el-table .z-stress {
+  background: #f0f9eb;
+}
+</style>
diff --git a/src/views/modules/shujuduibi/siwang.vue b/src/views/modules/shujuduibi/siwang.vue
new file mode 100644
index 000000000..7deababc0
--- /dev/null
+++ b/src/views/modules/shujuduibi/siwang.vue
@@ -0,0 +1,111 @@
+<template>
+  <div>
+    <base-page
+      ref="basePage"
+      :searchParams="searchParams"
+      :tableParams="tableParams"
+      :tableUrl="tableUrl"
+      :delUrl="delUrl"
+      :delMultipleUrl="delMultipleUrl"
+      :delAuth="delAuth"
+      :infoUrl="infoUrl"
+      :exportUrl="exportUrl"
+      :editParams="editParams"
+      :editElseRules="editElseRules"
+      :editBtnName="(item) => (!item.latitude ? '待完善' : '修改')"
+      idName="id"
+    >
+      <template v-slot:listBtn="{ multipleSelection }">
+        <el-button @click="handleSyncMultiple(multipleSelection)" size="small"
+          >批量更新</el-button
+        >
+      </template>
+
+      <template v-slot:listBtnSup="{ item }">
+        <el-button type="text" @click="handleSync(item)" size="small"
+          >全部更新</el-button
+        >
+      </template>
+    </base-page>
+  </div>
+</template>
+
+<script>
+import basePage from "@/views/modules/cpts/base/index";
+import { requestPost } from "@/js/dai/request";
+
+export default {
+  props: {},
+
+  data() {
+    return {
+      searchParams: [
+        { field: "姓名", keyName: "name", type: "input" },
+        { field: "证件号", keyName: "idCard", type: "input" },
+      ],
+
+      tableParams: [
+        { field: "选择框", keyName: "", type: "selection" },
+        { field: "序号", keyName: "", type: "no" },
+        { field: "姓名", keyName: "name", type: "text" },
+        { field: "证件号", keyName: "idCard", type: "text" },
+        { field: "死亡日期", keyName: "deathDate", type: "text" },
+        { field: "现年龄", keyName: "age", type: "text" },
+        { field: "家庭住址", keyName: "address", type: "text" },
+      ],
+
+      tableUrl: "/epmetuser/dataSyncRecordDeath/page",
+      delMultipleUrl: "/epmetuser/dataSyncRecordDeath/delete",
+
+      infoUrl: "/epmetuser/dataSyncRecordDeath/detail/",
+      //   delUrl: "/gov/org/icDangerousChemicals/del",
+      exportUrl: "/epmetuser/dataSyncRecordDeath/expoprt",
+
+      editParams: [
+        { field: "姓名", keyName: "name", type: "input" },
+        { field: "证件号", keyName: "idCard", type: "input" },
+        { field: "死亡日期", keyName: "deathDate", type: "input" },
+        { field: "现年龄", keyName: "age", type: "input" },
+        { field: "家庭住址", keyName: "address", type: "input" },
+      ],
+    };
+  },
+  components: { basePage },
+  computed: {},
+  watch: {},
+
+  async mounted() {},
+
+  methods: {
+    async handleSync(item) {
+      const { data, code, msg } = await requestPost(
+        "/epmetuser/dataSyncRecordDeath/batchupdate",
+        [item["id"]]
+      );
+
+      if (code === 0) {
+        this.$message.success("更新成功！");
+        this.$refs.basePage.getTableData();
+      } else {
+        this.$message.error("操作失败！");
+      }
+    },
+
+    async handleSyncMultiple(multipleSelection) {
+      const { data, code, msg } = await requestPost(
+        "/epmetuser/dataSyncRecordDeath/batchupdate",
+        [...multipleSelection.map((item) => item["id"])]
+      );
+
+      if (code === 0) {
+        this.$message.success("批量更新成功！");
+        this.$refs.basePage.getTableData();
+      } else {
+        this.$message.error("操作失败！");
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>

From 385957fa9ad329322f26c00d1a4bd1561eff9053 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 14 Oct 2022 10:14:47 +0800
Subject: [PATCH 16/18] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E5=90=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shujuduibi/canji.vue  | 80 ++++++++++++-------------
 src/views/modules/shujuduibi/siwang.vue |  8 +--
 2 files changed, 41 insertions(+), 47 deletions(-)

diff --git a/src/views/modules/shujuduibi/canji.vue b/src/views/modules/shujuduibi/canji.vue
index fc921ef03..0b3846306 100644
--- a/src/views/modules/shujuduibi/canji.vue
+++ b/src/views/modules/shujuduibi/canji.vue
@@ -5,14 +5,11 @@
       :searchParams="searchParams"
       :tableParams="tableParams"
       :tableUrl="tableUrl"
-      :delUrl="delUrl"
       :delMultipleUrl="delMultipleUrl"
-      :delAuth="delAuth"
       :infoUrl="infoUrl"
       :exportUrl="exportUrl"
       :editParams="editParams"
-      :editElseRules="editElseRules"
-      :editBtnName="(item) => (!item.latitude ? '待完善' : '修改')"
+      :editParamsDiv="5"
       idName="id"
     >
       <template v-slot:listBtn="{ multipleSelection }">
@@ -27,22 +24,19 @@
         >
       </template>
 
-      <template v-slot:editOperateSup="{ id, info }">
-        <h3>对比信息</h3>
-        <el-table
-          :data="cookInfo(info)"
-          style="width: 100%"
-          :row-class-name="tableRowClassName"
-        >
-          <el-table-column prop="resiinfo" label="对比信息" width="180">
-          </el-table-column>
-          <el-table-column prop="result" label="结果">
-            <template slot-scope="scope">
-              <i class="el-icon-time"></i>
-              <span style="margin-left: 10px">{{ scope.row.date }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
+      <template v-slot:editBottomSup="{ id, info }">
+        <div class="m-duibi">
+          <h3>对比信息</h3>
+          <el-table
+            :data="cookInfo(info)"
+            style="width: 100%"
+            :row-class-name="tableRowClassName"
+          >
+            <el-table-column prop="resiInfo" label="数据库信息">
+            </el-table-column>
+            <el-table-column prop="result" label="结果"></el-table-column>
+          </el-table>
+        </div>
       </template>
     </base-page>
   </div>
@@ -67,14 +61,14 @@ export default {
         { field: "选择框", keyName: "", type: "selection" },
         { field: "序号", keyName: "", type: "no" },
         { field: "姓名", keyName: "name", type: "text" },
-        { field: "证件号", keyName: "idCard", type: "text" },
-        { field: "手机", keyName: "mobile", type: "text" },
+        { field: "证件号", keyName: "idCard", type: "text", width: 200 },
+        { field: "手机", keyName: "mobile", type: "text", width: 120 },
         { field: "性别", keyName: "gender", type: "text" },
-        { field: "民族", keyName: "mz", type: "text" },
+        { field: "民族", keyName: "mzCn", type: "text" },
         { field: "家庭住址", keyName: "address", type: "text" },
-        { field: "残疾类别", keyName: "cjlb", type: "text" },
-        { field: "残疾等级", keyName: "cardNum", type: "text" },
-        { field: "残疾证号", keyName: "cjzk", type: "text" },
+        { field: "残疾类别", keyName: "cjlbCn", type: "text" },
+        { field: "残疾等级", keyName: "cjzkCn", type: "text" },
+        { field: "残疾证号", keyName: "cardNum", type: "text", width: 200 },
         { field: "监护人", keyName: "guardian", type: "text" },
         { field: "状态", keyName: "dealStatus", type: "text" },
         { field: "失败原因", keyName: "dealResult", type: "text" },
@@ -92,11 +86,11 @@ export default {
         { field: "证件号", keyName: "idCard", type: "input" },
         { field: "手机", keyName: "mobile", type: "input" },
         { field: "性别", keyName: "gender", type: "input" },
-        { field: "民族", keyName: "mz", type: "input" },
+        { field: "民族", keyName: "mzCn", type: "input" },
         { field: "家庭住址", keyName: "address", type: "input" },
-        { field: "残疾类别", keyName: "cjlb", type: "input" },
-        { field: "残疾等级", keyName: "cardNum", type: "input" },
-        { field: "残疾证号", keyName: "cjzk", type: "input" },
+        { field: "残疾类别", keyName: "cjlbCn", type: "input" },
+        { field: "残疾等级", keyName: "cjzkCn", type: "input" },
+        { field: "残疾证号", keyName: "cardNum", type: "input" },
         { field: "监护人", keyName: "guardian", type: "input" },
         { field: "状态", keyName: "dealStatus", type: "input" },
         { field: "失败原因", keyName: "dealResult", type: "input" },
@@ -116,20 +110,20 @@ export default {
         { field: "证件号", keyName: "idCard", type: "text" },
         { field: "手机", keyName: "mobile", type: "text" },
         { field: "性别", keyName: "gender", type: "text" },
-        { field: "民族", keyName: "mz", type: "text" },
+        { field: "民族", keyName: "mzCn", type: "text" },
         { field: "家庭住址", keyName: "address", type: "text" },
-        { field: "残疾类别", keyName: "cjlb", type: "text" },
-        { field: "残疾等级", keyName: "cardNum", type: "text" },
-        { field: "残疾证号", keyName: "cjzk", type: "text" },
+        { field: "残疾类别", keyName: "cjlbCn", type: "text" },
+        { field: "残疾等级", keyName: "cjzkCn", type: "text" },
+        { field: "残疾证号", keyName: "cardNum", type: "text" },
         { field: "监护人", keyName: "guardian", type: "text" },
       ];
       return arr.map((item) => {
+        let val = info[item.keyName] || "--";
+        let resiVal = info.resiInfo[item.keyName] || "--";
+
         return {
-          resiinfo: item.field + "：" + info.resiinfo[item.keyName],
-          result:
-            info.resiinfo[item.keyName] == info[item.keyName]
-              ? "一致"
-              : "不一致",
+          resiInfo: item.field + "：" + resiVal,
+          result: resiVal == val ? "一致" : "不一致",
         };
       });
     },
@@ -173,7 +167,11 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.el-table .z-stress {
-  background: #f0f9eb;
+.m-duibi {
+  padding: 10px;
+}
+
+::v-deep .el-table .z-stress {
+  background: oldlace;
 }
 </style>
diff --git a/src/views/modules/shujuduibi/siwang.vue b/src/views/modules/shujuduibi/siwang.vue
index 7deababc0..4f34e3331 100644
--- a/src/views/modules/shujuduibi/siwang.vue
+++ b/src/views/modules/shujuduibi/siwang.vue
@@ -5,14 +5,10 @@
       :searchParams="searchParams"
       :tableParams="tableParams"
       :tableUrl="tableUrl"
-      :delUrl="delUrl"
       :delMultipleUrl="delMultipleUrl"
-      :delAuth="delAuth"
       :infoUrl="infoUrl"
       :exportUrl="exportUrl"
       :editParams="editParams"
-      :editElseRules="editElseRules"
-      :editBtnName="(item) => (!item.latitude ? '待完善' : '修改')"
       idName="id"
     >
       <template v-slot:listBtn="{ multipleSelection }">
@@ -48,7 +44,7 @@ export default {
         { field: "选择框", keyName: "", type: "selection" },
         { field: "序号", keyName: "", type: "no" },
         { field: "姓名", keyName: "name", type: "text" },
-        { field: "证件号", keyName: "idCard", type: "text" },
+        { field: "证件号", keyName: "idCard", type: "text", width: 200 },
         { field: "死亡日期", keyName: "deathDate", type: "text" },
         { field: "现年龄", keyName: "age", type: "text" },
         { field: "家庭住址", keyName: "address", type: "text" },
@@ -59,7 +55,7 @@ export default {
 
       infoUrl: "/epmetuser/dataSyncRecordDeath/detail/",
       //   delUrl: "/gov/org/icDangerousChemicals/del",
-      exportUrl: "/epmetuser/dataSyncRecordDeath/expoprt",
+      exportUrl: "/epmetuser/dataSyncRecordDeath/export",
 
       editParams: [
         { field: "姓名", keyName: "name", type: "input" },

From 035a85cad9ce540732c12bfb0e8de3919f3930d3 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 14 Oct 2022 10:57:34 +0800
Subject: [PATCH 17/18] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E4=B8=8D=E7=BB=99?=
 =?UTF-8?q?=E9=9D=A2=E5=AD=90=EF=BC=8C=E5=8F=AA=E5=A5=BD=E9=83=BD=E6=94=B9?=
 =?UTF-8?q?=E4=B8=80=E9=81=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cpts/base/index.vue   | 11 ++++++-----
 src/views/modules/shujuduibi/canji.vue  | 10 +++++-----
 src/views/modules/shujuduibi/siwang.vue | 17 ++++++++++++++++-
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue
index 7bdf0f82a..f06ecc7ac 100644
--- a/src/views/modules/cpts/base/index.vue
+++ b/src/views/modules/cpts/base/index.vue
@@ -431,6 +431,11 @@ export default {
       type: Boolean,
       default: true,
     },
+
+    cookTableData: {
+      type: Function,
+      default: (val) => val,
+    },
   },
 
   data() {
@@ -761,11 +766,7 @@ export default {
 
       if (code === 0) {
         this.total = data.total || 0;
-        this.tableData = data.list
-          ? data.list.map((item) => {
-              return item;
-            })
-          : [];
+        this.tableData = data.list ? this.cookTableData(data.list) : [];
       } else {
         this.$message.error(msg);
       }
diff --git a/src/views/modules/shujuduibi/canji.vue b/src/views/modules/shujuduibi/canji.vue
index 0b3846306..2acd45d28 100644
--- a/src/views/modules/shujuduibi/canji.vue
+++ b/src/views/modules/shujuduibi/canji.vue
@@ -63,14 +63,14 @@ export default {
         { field: "姓名", keyName: "name", type: "text" },
         { field: "证件号", keyName: "idCard", type: "text", width: 200 },
         { field: "手机", keyName: "mobile", type: "text", width: 120 },
-        { field: "性别", keyName: "gender", type: "text" },
+        { field: "性别", keyName: "genderCn", type: "text" },
         { field: "民族", keyName: "mzCn", type: "text" },
         { field: "家庭住址", keyName: "address", type: "text" },
         { field: "残疾类别", keyName: "cjlbCn", type: "text" },
         { field: "残疾等级", keyName: "cjzkCn", type: "text" },
         { field: "残疾证号", keyName: "cardNum", type: "text", width: 200 },
         { field: "监护人", keyName: "guardian", type: "text" },
-        { field: "状态", keyName: "dealStatus", type: "text" },
+        { field: "状态", keyName: "dealStatusName", type: "text" },
         { field: "失败原因", keyName: "dealResult", type: "text" },
       ],
 
@@ -85,14 +85,14 @@ export default {
         { field: "姓名", keyName: "name", type: "input" },
         { field: "证件号", keyName: "idCard", type: "input" },
         { field: "手机", keyName: "mobile", type: "input" },
-        { field: "性别", keyName: "gender", type: "input" },
+        { field: "性别", keyName: "genderCn", type: "input" },
         { field: "民族", keyName: "mzCn", type: "input" },
         { field: "家庭住址", keyName: "address", type: "input" },
         { field: "残疾类别", keyName: "cjlbCn", type: "input" },
         { field: "残疾等级", keyName: "cjzkCn", type: "input" },
         { field: "残疾证号", keyName: "cardNum", type: "input" },
         { field: "监护人", keyName: "guardian", type: "input" },
-        { field: "状态", keyName: "dealStatus", type: "input" },
+        { field: "状态", keyName: "dealStatusName", type: "input" },
         { field: "失败原因", keyName: "dealResult", type: "input" },
       ],
     };
@@ -109,7 +109,7 @@ export default {
         { field: "姓名", keyName: "name", type: "text" },
         { field: "证件号", keyName: "idCard", type: "text" },
         { field: "手机", keyName: "mobile", type: "text" },
-        { field: "性别", keyName: "gender", type: "text" },
+        { field: "性别", keyName: "genderCn", type: "text" },
         { field: "民族", keyName: "mzCn", type: "text" },
         { field: "家庭住址", keyName: "address", type: "text" },
         { field: "残疾类别", keyName: "cjlbCn", type: "text" },
diff --git a/src/views/modules/shujuduibi/siwang.vue b/src/views/modules/shujuduibi/siwang.vue
index 4f34e3331..274c8566a 100644
--- a/src/views/modules/shujuduibi/siwang.vue
+++ b/src/views/modules/shujuduibi/siwang.vue
@@ -9,6 +9,7 @@
       :infoUrl="infoUrl"
       :exportUrl="exportUrl"
       :editParams="editParams"
+      :cookTableData="cookTableData"
       idName="id"
     >
       <template v-slot:listBtn="{ multipleSelection }">
@@ -45,9 +46,11 @@ export default {
         { field: "序号", keyName: "", type: "no" },
         { field: "姓名", keyName: "name", type: "text" },
         { field: "证件号", keyName: "idCard", type: "text", width: 200 },
-        { field: "死亡日期", keyName: "deathDate", type: "text" },
+        { field: "死亡日期", keyName: "deathDate", type: "text", width: 120 },
         { field: "现年龄", keyName: "age", type: "text" },
         { field: "家庭住址", keyName: "address", type: "text" },
+        { field: "状态", keyName: "dealStatusName", type: "text" },
+        { field: "失败原因", keyName: "dealResult", type: "text" },
       ],
 
       tableUrl: "/epmetuser/dataSyncRecordDeath/page",
@@ -73,6 +76,18 @@ export default {
   async mounted() {},
 
   methods: {
+    cookTableData(tableData) {
+      return tableData.map((item) => {
+        item.dealStatusName =
+          !item.dealStatus || item.dealStatus == 0
+            ? "未处理"
+            : item.dealStatus == 1
+            ? "处理成功"
+            : "处理失败";
+        return item;
+      });
+    },
+
     async handleSync(item) {
       const { data, code, msg } = await requestPost(
         "/epmetuser/dataSyncRecordDeath/batchupdate",

From fed29fd2c3a8d94821db3bfaec8d107f31bf0efb Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 14 Oct 2022 13:46:30 +0800
Subject: [PATCH 18/18] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E4=B8=9C=E8=A5=BF=20=E8=AE=A9=E4=B8=8D=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shujuduibi/canji.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/shujuduibi/canji.vue b/src/views/modules/shujuduibi/canji.vue
index 2acd45d28..0d7a877c7 100644
--- a/src/views/modules/shujuduibi/canji.vue
+++ b/src/views/modules/shujuduibi/canji.vue
@@ -118,8 +118,9 @@ export default {
         { field: "监护人", keyName: "guardian", type: "text" },
       ];
       return arr.map((item) => {
-        let val = info[item.keyName] || "--";
-        let resiVal = info.resiInfo[item.keyName] || "--";
+        let val = (info && info[item.keyName]) || "--";
+        let resiVal =
+          (info && info.resiInfo && info.resiInfo[item.keyName]) || "--";
 
         return {
           resiInfo: item.field + "：" + resiVal,