From abe2f9892ee1fa01ebb2795e7ebfc380c41addc3 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 29 Apr 2022 14:32:08 +0800
Subject: [PATCH 01/45] =?UTF-8?q?=E5=90=88=E5=B9=B6=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=B9=B6=E6=9D=83=E9=99=90=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../2.0.5/AppGridMember/AppGridMember.vue     | 117 ----
 .../2.0.5/AppGridMember/components/list.vue   | 197 -------
 .../AppGridBlock/AppGridBlock.vue             |   0
 .../AppGridBlock/components/add.vue           |   0
 .../AppGridBlock/components/list.vue          |   0
 .../{2.0.5 => grid}/AppGridBlock/index.js     |   0
 .../{2.0.5 => grid}/AppGridMap/AppGridMap.vue |   0
 .../AppGridMap/components/list.vue            |   0
 packages/grid/AppGridMember/AppGridMember.vue | 131 +++++
 .../AppGridMember/components/ApplyAdd.vue     |   0
 .../AppGridMember/components/ApplyDetail.vue  |   0
 .../AppGridMember/components/ApplyList.vue    |   0
 .../AppGridMember/components/Family.vue       |   0
 .../AppGridMember/components/MonitorUser.vue  |   0
 .../AppGridMember/components/add.vue          |   0
 .../AppGridMember/components/list.vue         |   4 +-
 .../AppGridMember/AppGridMemberJp.vue         | 126 ----
 .../AppGridMember/components/ApplyAdd.vue     | 107 ----
 .../AppGridMember/components/ApplyDetail.vue  |  65 ---
 .../AppGridMember/components/ApplyList.vue    | 179 ------
 .../AppGridMember/components/Family.vue       | 499 ----------------
 .../jianping/AppGridMember/components/add.vue | 543 ------------------
 22 files changed, 133 insertions(+), 1835 deletions(-)
 delete mode 100644 packages/2.0.5/AppGridMember/AppGridMember.vue
 delete mode 100644 packages/2.0.5/AppGridMember/components/list.vue
 rename packages/{2.0.5 => grid}/AppGridBlock/AppGridBlock.vue (100%)
 rename packages/{2.0.5 => grid}/AppGridBlock/components/add.vue (100%)
 rename packages/{2.0.5 => grid}/AppGridBlock/components/list.vue (100%)
 rename packages/{2.0.5 => grid}/AppGridBlock/index.js (100%)
 rename packages/{2.0.5 => grid}/AppGridMap/AppGridMap.vue (100%)
 rename packages/{2.0.5 => grid}/AppGridMap/components/list.vue (100%)
 create mode 100644 packages/grid/AppGridMember/AppGridMember.vue
 rename packages/{2.0.5 => grid}/AppGridMember/components/ApplyAdd.vue (100%)
 rename packages/{2.0.5 => grid}/AppGridMember/components/ApplyDetail.vue (100%)
 rename packages/{2.0.5 => grid}/AppGridMember/components/ApplyList.vue (100%)
 rename packages/{2.0.5 => grid}/AppGridMember/components/Family.vue (100%)
 rename packages/{jianping => grid}/AppGridMember/components/MonitorUser.vue (100%)
 rename packages/{2.0.5 => grid}/AppGridMember/components/add.vue (100%)
 rename packages/{jianping => grid}/AppGridMember/components/list.vue (98%)
 delete mode 100644 packages/jianping/AppGridMember/AppGridMemberJp.vue
 delete mode 100644 packages/jianping/AppGridMember/components/ApplyAdd.vue
 delete mode 100644 packages/jianping/AppGridMember/components/ApplyDetail.vue
 delete mode 100644 packages/jianping/AppGridMember/components/ApplyList.vue
 delete mode 100644 packages/jianping/AppGridMember/components/Family.vue
 delete mode 100644 packages/jianping/AppGridMember/components/add.vue

diff --git a/packages/2.0.5/AppGridMember/AppGridMember.vue b/packages/2.0.5/AppGridMember/AppGridMember.vue
deleted file mode 100644
index c26f4894..00000000
--- a/packages/2.0.5/AppGridMember/AppGridMember.vue
+++ /dev/null
@@ -1,117 +0,0 @@
-<template>
-  <ai-list class="AppGridMember" v-if="!isShowDetail">
-    <template slot="title">
-      <ai-title title="网格员管理" :isShowBottomBorder="false"></ai-title>
-    </template>
-    <template slot="tabs">
-      <el-tabs v-model="currIndex">
-        <el-tab-pane v-for="(tab,i) in tabs" :key="i" :label="tab.label">
-          <component :ref="String(i)" v-if="currIndex == i" :is="tab.comp" @change="onChange" lazy :instance="instance" :dict="dict" :permissions="permissions"/>
-        </el-tab-pane>
-      </el-tabs>
-    </template>
-  </ai-list>
-  <Add v-else-if="component === 'Add'" :params="params" :instance="instance" :dict="dict" :permissions="permissions" @change="onChange"></Add>
-  <Family v-else-if="component === 'Family'" :params="params" :instance="instance" :dict="dict" :permissions="permissions" @change="onChange"></Family>
-  <ApplyDetail v-else-if="component === 'ApplyDetail'" :params="params" :instance="instance" :dict="dict" :permissions="permissions" @change="onChange"></ApplyDetail>
-  <ApplyAdd v-else-if="component === 'ApplyAdd'" :params="params" :instance="instance" :dict="dict" :permissions="permissions" @change="onChange"></ApplyAdd>
-</template>
-
-<script>
-  import List from './components/list'
-  import ApplyList from './components/ApplyList'
-  import Add from './components/add'
-  import ApplyDetail from './components/ApplyDetail'
-  import ApplyAdd from './components/ApplyAdd'
-  import Family from './components/Family'
-
-  export default {
-    name: "AppGridMember",
-    label: "网格管理员",
-
-    props: {
-      instance: Function,
-      dict: Object,
-      permissions: Function
-    },
-
-    data() {
-      return {
-        component: "List",
-        params: {},
-        include: [],
-        currIndex: '0',
-        isShowDetail: false
-      };
-    },
-
-      computed: {
-        tabs () {
-          const tabList = [
-            {label: '网格员信息', name: 'List', comp: List, permission: ''},
-            {label: '申报信息', name: 'ApplyList', comp: ApplyList, permission: 'app_appgirdmemberapply_detail'}
-          ].filter(item => {
-            return item.name !== 'ApplyList' || this.permissions(item.permission)
-          })
-
-          return tabList
-        }
-      },
-
-    components: {
-      Add,
-      List,
-      Family,
-      ApplyList,
-      ApplyDetail,
-      ApplyAdd
-    },
-
-    mounted() {},
-
-    methods: {
-      onChange(data) {
-        if (data.type === "Add") {
-          this.component = "Add"
-          this.isShowDetail = true
-          this.params = data.params
-        }
-
-        if (data.type === "Family") {
-          this.component = "Family"
-          this.isShowDetail = true
-          this.params = data.params
-        }
-        if (data.type === "ApplyDetail") {
-          this.component = "ApplyDetail"
-          this.isShowDetail = true
-          this.params = data.params
-        }
-
-        if (data.type === "ApplyAdd") {
-          this.component = "ApplyAdd"
-          this.isShowDetail = true
-          this.params = data.params
-        }
-
-        if (data.type === "list") {
-          this.component = "List"
-          this.isShowDetail = false
-          this.params = data.params
-        }
-
-        if (data.type === "ApplyList") {
-          this.component = "ApplyList"
-          this.isShowDetail = false
-          this.params = data.params
-        }
-      }
-    }
-  }
-</script>
-
-<style lang="scss">
-  .AppGridMember {
-    height: 100%;
-  }
-</style>
diff --git a/packages/2.0.5/AppGridMember/components/list.vue b/packages/2.0.5/AppGridMember/components/list.vue
deleted file mode 100644
index 8aebb285..00000000
--- a/packages/2.0.5/AppGridMember/components/list.vue
+++ /dev/null
@@ -1,197 +0,0 @@
-<template>
-  <ai-list class="list" isTabs>
-    <template slot="content">
-      <ai-search-bar bottomBorder>
-        <template slot="left">
-          <el-date-picker
-            v-model="searchObj.selectionDate"
-            type="date"
-            @change="(page.current = 1), getList()"
-            value-format="yyyy-MM-dd"
-            size="small"
-            placeholder="选用时间">
-          </el-date-picker>
-        </template>
-        <template slot="right">
-          <el-input
-            v-model="searchObj.name"
-            size="small"
-            placeholder="网格员/责任网格"
-            v-throttle="() => {page.current = 1, getList()}"
-            @keyup.enter.native="(page.current = 1), getList()"
-            clearable
-            @clear="(searchObj.name = '', page.current = 1), getList()"
-            suffix-icon="iconfont iconSearch" />
-        </template>
-      </ai-search-bar>
-      <ai-search-bar style="padding: 16px 0 0">
-        <template slot="left">
-          <el-button
-            icon="iconfont iconAdd"
-            type="primary"
-            size="small"
-            @click="add('')"
-            >添加</el-button
-          >
-          <el-button
-            icon="iconfont iconDelete"
-            @click="deleteById(ids.join(','))"
-            :disabled="!Boolean(ids.length)"
-            >删除</el-button
-          >
-        </template>
-      </ai-search-bar>
-      <ai-table
-        :tableData="tableData"
-        :col-configs="colConfigs"
-        :total="page.total"
-        ref="aitableex"
-        :current.sync="page.current"
-        :size.sync="page.size"
-        @selection-change="(v) => (ids = v.map((e) => e.id))"
-        @getList="getList()">
-        <el-table-column label="操作" slot="options" align="center" fixed="right" width="170">
-          <template slot-scope="{ row }">
-            <div class="table-options">
-              <el-button type="text" @click="toFamily(row.id)">责任家庭</el-button>
-              <el-button type="text" @click="add(row.id)">详情</el-button>
-              <el-button type="text" @click="deleteById(row.id)">删除</el-button>
-            </div>
-          </template>
-        </el-table-column>
-      </ai-table>
-    </template>
-  </ai-list>
-</template>
-
-<script>
-export default {
-  name: "List",
-  label: "网格员管理",
-  props: {
-    instance: Function,
-    dict: Object,
-    permissions: Function,
-  },
-  data() {
-    return {
-      searchObj: {
-        name: "",
-        selectionDate: "",
-      },
-      page: {
-        current: 1,
-        size: 10,
-        total: 0,
-      },
-      goAdd: false,
-      tableData: [],
-      fileList: [],
-      ids: [],
-      detail: {},
-    };
-  },
-  created() {
-    this.dict.load("sex", "girdMemberType", "politicsStatus", "education");
-    this.getList();
-  },
-  computed: {
-    colConfigs() {
-      let _ = this;
-      return [
-        {
-          type: "selection",
-        },
-        {
-          prop: "name",
-          label: "网格员姓名",
-        },
-        {
-          prop: "girdInfoListStr",
-          align: "center",
-          label: "责任网格",
-        },
-        {
-          prop: "phone",
-          align: "center",
-          label: "联系电话",
-        },
-        {
-          prop: "selectionDate",
-          align: "center",
-          label: "选用时间",
-        },
-      ];
-    },
-  },
-  methods: {
-    getList() {
-      this.instance
-        .post("/app/appgirdmemberinfo/list", null, {
-          params: {
-            ...this.searchObj,
-            ...this.page,
-          },
-        })
-        .then((res) => {
-          if (res.code == 0) {
-            this.tableData = res.data.records;
-            this.page.total = res.data.total;
-          }
-        });
-    },
-    deleteById(ids) {
-      ids &&
-        this.$confirm("是否要删除该网格员？", {
-          type: "error",
-        })
-          .then(() => {
-            this.instance
-              .post("/app/appgirdmemberinfo/delete", null, {
-                params: { ids },
-              })
-              .then((res) => {
-                if (res?.code == 0) {
-                  this.$message.success("删除成功!");
-                  this.getList();
-                }
-              });
-          })
-          .catch(() => {});
-    },
-    add(id) {
-      this.$emit('change', {
-        type: 'Add',
-        params: {
-          id: id || ''
-        }
-      })
-    },
-
-    toFamily (id) {
-      this.$emit('change', {
-        type: 'Family',
-        params: {
-          id
-        }
-      })
-    },
-
-    handleSelectionChange(val) {
-      this.ids = [];
-      val.map((e) => {
-        this.ids.push(e.id);
-      });
-    },
-    resetSearch() {
-      Object.keys(this.searchObj).map((e) => {
-        this.searchObj[e] = "";
-      });
-      this.getList();
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-</style>
\ No newline at end of file
diff --git a/packages/2.0.5/AppGridBlock/AppGridBlock.vue b/packages/grid/AppGridBlock/AppGridBlock.vue
similarity index 100%
rename from packages/2.0.5/AppGridBlock/AppGridBlock.vue
rename to packages/grid/AppGridBlock/AppGridBlock.vue
diff --git a/packages/2.0.5/AppGridBlock/components/add.vue b/packages/grid/AppGridBlock/components/add.vue
similarity index 100%
rename from packages/2.0.5/AppGridBlock/components/add.vue
rename to packages/grid/AppGridBlock/components/add.vue
diff --git a/packages/2.0.5/AppGridBlock/components/list.vue b/packages/grid/AppGridBlock/components/list.vue
similarity index 100%
rename from packages/2.0.5/AppGridBlock/components/list.vue
rename to packages/grid/AppGridBlock/components/list.vue
diff --git a/packages/2.0.5/AppGridBlock/index.js b/packages/grid/AppGridBlock/index.js
similarity index 100%
rename from packages/2.0.5/AppGridBlock/index.js
rename to packages/grid/AppGridBlock/index.js
diff --git a/packages/2.0.5/AppGridMap/AppGridMap.vue b/packages/grid/AppGridMap/AppGridMap.vue
similarity index 100%
rename from packages/2.0.5/AppGridMap/AppGridMap.vue
rename to packages/grid/AppGridMap/AppGridMap.vue
diff --git a/packages/2.0.5/AppGridMap/components/list.vue b/packages/grid/AppGridMap/components/list.vue
similarity index 100%
rename from packages/2.0.5/AppGridMap/components/list.vue
rename to packages/grid/AppGridMap/components/list.vue
diff --git a/packages/grid/AppGridMember/AppGridMember.vue b/packages/grid/AppGridMember/AppGridMember.vue
new file mode 100644
index 00000000..2c8f2706
--- /dev/null
+++ b/packages/grid/AppGridMember/AppGridMember.vue
@@ -0,0 +1,131 @@
+<template>
+  <ai-list class="AppGridMember" v-if="!isShowDetail">
+    <template slot="title">
+      <ai-title title="网格员管理" :isShowBottomBorder="false"></ai-title>
+    </template>
+    <template slot="tabs">
+      <el-tabs v-model="currIndex">
+        <el-tab-pane v-for="(tab,i) in tabs" :key="i" :label="tab.label">
+          <component :ref="String(i)" v-if="currIndex == i" :is="tab.comp" @change="onChange" lazy :instance="instance"
+                     :dict="dict" :permissions="permissions"/>
+        </el-tab-pane>
+      </el-tabs>
+    </template>
+  </ai-list>
+  <Add v-else-if="component === 'Add'" :params="params" :instance="instance" :dict="dict" :permissions="permissions"
+       @change="onChange"></Add>
+  <Family v-else-if="component === 'Family'" :params="params" :instance="instance" :dict="dict"
+          :permissions="permissions" @change="onChange"></Family>
+  <MonitorUser v-else-if="component === 'MonitorUser'" :params="params" :instance="instance" :dict="dict"
+               :permissions="permissions" @change="onChange"></MonitorUser>
+  <ApplyDetail v-else-if="component === 'ApplyDetail'" :params="params" :instance="instance" :dict="dict"
+               :permissions="permissions" @change="onChange"></ApplyDetail>
+  <ApplyAdd v-else-if="component === 'ApplyAdd'" :params="params" :instance="instance" :dict="dict"
+            :permissions="permissions" @change="onChange"></ApplyAdd>
+</template>
+
+<script>
+import List from './components/list'
+import ApplyList from './components/ApplyList'
+import Add from './components/add'
+import ApplyDetail from './components/ApplyDetail'
+import ApplyAdd from './components/ApplyAdd'
+import Family from './components/Family'
+import MonitorUser from './components/MonitorUser'
+
+export default {
+  name: "AppGridMember",
+  label: "网格管理员",
+
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+
+  data() {
+    return {
+      component: "List",
+      params: {},
+      include: [],
+      currIndex: '0',
+      isShowDetail: false
+    };
+  },
+
+  computed: {
+    tabs() {
+      return [
+        {label: '网格员信息', name: 'List', comp: List, permission: ''},
+        {label: '申报信息', name: 'ApplyList', comp: ApplyList, permission: 'app_appgirdmemberapply_detail'}
+      ].filter(item => {
+        return item.name !== 'ApplyList' || this.permissions(item.permission)
+      })
+    }
+  },
+
+  components: {
+    Add,
+    List,
+    Family,
+    ApplyList,
+    ApplyDetail,
+    MonitorUser,
+    ApplyAdd
+  },
+
+  mounted() {
+  },
+
+  methods: {
+    onChange(data) {
+      if (data.type === "Add") {
+        this.component = "Add"
+        this.isShowDetail = true
+        this.params = data.params
+      }
+
+      if (data.type === "Family") {
+        this.component = "Family"
+        this.isShowDetail = true
+        this.params = data.params
+      }
+
+      if (data.type === "MonitorUser") {
+        this.component = "MonitorUser"
+        this.isShowDetail = true
+        this.params = data.params
+      }
+      if (data.type === "ApplyDetail") {
+        this.component = "ApplyDetail"
+        this.isShowDetail = true
+        this.params = data.params
+      }
+
+      if (data.type === "ApplyAdd") {
+        this.component = "ApplyAdd"
+        this.isShowDetail = true
+        this.params = data.params
+      }
+
+      if (data.type === "list") {
+        this.component = "List"
+        this.isShowDetail = false
+        this.params = data.params
+      }
+
+      if (data.type === "ApplyList") {
+        this.component = "ApplyList"
+        this.isShowDetail = false
+        this.params = data.params
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.AppGridMember {
+  height: 100%;
+}
+</style>
diff --git a/packages/2.0.5/AppGridMember/components/ApplyAdd.vue b/packages/grid/AppGridMember/components/ApplyAdd.vue
similarity index 100%
rename from packages/2.0.5/AppGridMember/components/ApplyAdd.vue
rename to packages/grid/AppGridMember/components/ApplyAdd.vue
diff --git a/packages/2.0.5/AppGridMember/components/ApplyDetail.vue b/packages/grid/AppGridMember/components/ApplyDetail.vue
similarity index 100%
rename from packages/2.0.5/AppGridMember/components/ApplyDetail.vue
rename to packages/grid/AppGridMember/components/ApplyDetail.vue
diff --git a/packages/2.0.5/AppGridMember/components/ApplyList.vue b/packages/grid/AppGridMember/components/ApplyList.vue
similarity index 100%
rename from packages/2.0.5/AppGridMember/components/ApplyList.vue
rename to packages/grid/AppGridMember/components/ApplyList.vue
diff --git a/packages/2.0.5/AppGridMember/components/Family.vue b/packages/grid/AppGridMember/components/Family.vue
similarity index 100%
rename from packages/2.0.5/AppGridMember/components/Family.vue
rename to packages/grid/AppGridMember/components/Family.vue
diff --git a/packages/jianping/AppGridMember/components/MonitorUser.vue b/packages/grid/AppGridMember/components/MonitorUser.vue
similarity index 100%
rename from packages/jianping/AppGridMember/components/MonitorUser.vue
rename to packages/grid/AppGridMember/components/MonitorUser.vue
diff --git a/packages/2.0.5/AppGridMember/components/add.vue b/packages/grid/AppGridMember/components/add.vue
similarity index 100%
rename from packages/2.0.5/AppGridMember/components/add.vue
rename to packages/grid/AppGridMember/components/add.vue
diff --git a/packages/jianping/AppGridMember/components/list.vue b/packages/grid/AppGridMember/components/list.vue
similarity index 98%
rename from packages/jianping/AppGridMember/components/list.vue
rename to packages/grid/AppGridMember/components/list.vue
index 57ae3c57..5083f1a1 100644
--- a/packages/jianping/AppGridMember/components/list.vue
+++ b/packages/grid/AppGridMember/components/list.vue
@@ -53,7 +53,7 @@
           <template slot-scope="{ row }">
             <div class="table-options">
               <el-button type="text" @click="toFamily(row.id)">责任家庭</el-button>
-              <el-button type="text" @click="toMonitorUser(row.id)">监测对象</el-button>
+              <el-button type="text" @click="toMonitorUser(row.id)" v-if="permissions('girdmemberpovertyconfig')">监测对象</el-button>
               <el-button type="text" @click="add(row.id)">详情</el-button>
               <el-button type="text" @click="deleteById(row.id)">删除</el-button>
             </div>
@@ -203,4 +203,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/packages/jianping/AppGridMember/AppGridMemberJp.vue b/packages/jianping/AppGridMember/AppGridMemberJp.vue
deleted file mode 100644
index 3df9b35a..00000000
--- a/packages/jianping/AppGridMember/AppGridMemberJp.vue
+++ /dev/null
@@ -1,126 +0,0 @@
-<template>
-  <ai-list class="AppGridMember" v-if="!isShowDetail">
-    <template slot="title">
-      <ai-title title="网格员管理" :isShowBottomBorder="false"></ai-title>
-    </template>
-    <template slot="tabs">
-      <el-tabs v-model="currIndex">
-        <el-tab-pane v-for="(tab,i) in tabs" :key="i" :label="tab.label">
-          <component :ref="String(i)" v-if="currIndex == i" :is="tab.comp" @change="onChange" lazy :instance="instance" :dict="dict" :permissions="permissions"/>
-        </el-tab-pane>
-      </el-tabs>
-    </template>
-  </ai-list>
-  <Add v-else-if="component === 'Add'" :params="params" :instance="instance" :dict="dict" :permissions="permissions" @change="onChange"></Add>
-  <Family v-else-if="component === 'Family'" :params="params" :instance="instance" :dict="dict" :permissions="permissions" @change="onChange"></Family>
-  <MonitorUser v-else-if="component === 'MonitorUser'" :params="params" :instance="instance" :dict="dict" :permissions="permissions" @change="onChange"></MonitorUser>
-  <ApplyDetail v-else-if="component === 'ApplyDetail'" :params="params" :instance="instance" :dict="dict" :permissions="permissions" @change="onChange"></ApplyDetail>
-  <ApplyAdd v-else-if="component === 'ApplyAdd'" :params="params" :instance="instance" :dict="dict" :permissions="permissions" @change="onChange"></ApplyAdd>
-</template>
-
-<script>
-  import List from './components/list'
-  import ApplyList from './components/ApplyList'
-  import Add from './components/add'
-  import ApplyDetail from './components/ApplyDetail'
-  import ApplyAdd from './components/ApplyAdd'
-  import Family from './components/Family'
-  import MonitorUser from './components/MonitorUser'
-
-  export default {
-    name: "AppGridMemberJp",
-    label: "网格管理员(防返贫)",
-
-    props: {
-      instance: Function,
-      dict: Object,
-      permissions: Function
-    },
-
-    data() {
-      return {
-        component: "List",
-        params: {},
-        include: [],
-        currIndex: '0',
-        isShowDetail: false
-      };
-    },
-
-      computed: {
-        tabs () {
-          const tabList = [
-            {label: '网格员信息', name: 'List', comp: List, permission: ''},
-            {label: '申报信息', name: 'ApplyList', comp: ApplyList, permission: 'app_appgirdmemberapply_detail'}
-          ].filter(item => {
-            return item.name !== 'ApplyList' || this.permissions(item.permission)
-          })
-
-          return tabList
-        }
-      },
-
-    components: {
-      Add,
-      List,
-      Family,
-      ApplyList,
-      ApplyDetail,
-      MonitorUser,
-      ApplyAdd
-    },
-
-    mounted() {},
-
-    methods: {
-      onChange(data) {
-        if (data.type === "Add") {
-          this.component = "Add"
-          this.isShowDetail = true
-          this.params = data.params
-        }
-
-        if (data.type === "Family") {
-          this.component = "Family"
-          this.isShowDetail = true
-          this.params = data.params
-        }
-
-        if (data.type === "MonitorUser") {
-          this.component = "MonitorUser"
-          this.isShowDetail = true
-          this.params = data.params
-        }
-        if (data.type === "ApplyDetail") {
-          this.component = "ApplyDetail"
-          this.isShowDetail = true
-          this.params = data.params
-        }
-
-        if (data.type === "ApplyAdd") {
-          this.component = "ApplyAdd"
-          this.isShowDetail = true
-          this.params = data.params
-        }
-
-        if (data.type === "list") {
-          this.component = "List"
-          this.isShowDetail = false
-          this.params = data.params
-        }
-
-        if (data.type === "ApplyList") {
-          this.component = "ApplyList"
-          this.isShowDetail = false
-          this.params = data.params
-        }
-      }
-    }
-  }
-</script>
-
-<style lang="scss">
-  .AppGridMember {
-    height: 100%;
-  }
-</style>
diff --git a/packages/jianping/AppGridMember/components/ApplyAdd.vue b/packages/jianping/AppGridMember/components/ApplyAdd.vue
deleted file mode 100644
index c2906b86..00000000
--- a/packages/jianping/AppGridMember/components/ApplyAdd.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <ai-detail class="content-add">
-    <template slot="title">
-      <ai-title :title="params.id ? '编辑' : '添加'" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
-      </ai-title>
-    </template>
-    <template slot="content">
-      <ai-card title="基本信息">
-        <template #content>
-          <el-form class="ai-form" :model="form" label-width="120px" ref="form">
-            <el-form-item label="姓名" style="width: 100%;" prop="name" :rules="[{required: true, message: '请输入姓名', trigger: 'blur'}]">
-              <el-input size="small" v-model="form.name" placeholder="请输入..." :maxlength="20"></el-input>
-            </el-form-item>
-            <el-form-item label="联系电话" style="width: 100%;" prop="phone" :rules="[{required: true, message: '请输入联系电话', trigger: 'blur'}]">
-              <el-input size="small" v-model="form.phone" placeholder="请输入..." :maxlength="11"></el-input>
-            </el-form-item>
-            <el-form-item label="网格名称" style="width: 100%;" prop="girdName" :rules="[{required: true, message: '请输入网格名称', trigger: 'blur'}]">
-              <el-input size="small" v-model="form.girdName" placeholder="请输入..." :maxlength="50"></el-input>
-            </el-form-item>
-          </el-form>
-        </template>
-      </ai-card>
-    </template>
-    <template #footer>
-      <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" :loading="isLoading" @click="confirm">提交</el-button>
-    </template>
-  </ai-detail>
-</template>
-
-<script>
-  export default {
-    name: 'ApplyAdd',
-
-    props: {
-      instance: Function,
-      dict: Object,
-      params: Object
-    },
-
-    data () {
-      return {
-        form: {
-          name: '',
-          phone: '',
-          gridName: ''
-        },
-        isLoading: false,
-        id: ''
-      }
-    },
-
-    created () {
-      if (this.params && this.params.id) {
-        this.id = this.params.id
-        this.getInfo(this.params.id)
-      }
-    },
-
-    methods: {
-      getInfo (id) {
-        this.instance.post(`/app/appcontentinfo/queryDetailById?id=${id}`).then(res => {
-          if (res.code === 0) {
-            this.form = res.data
-          }
-        })
-      },
-
-      onChange () {
-        this.form.files = []
-      },
-
-      confirm () {
-        this.$refs.form.validate((valid) => {
-          if (valid) {
-            this.isLoading = true
-            this.instance.post(`/app/appgirdmemberapply/addOrUpdate`, {
-              ...this.form,
-              id: this.params.id || ''
-            }).then(res => {
-              if (res.code == 0) {
-                this.$message.success('提交成功')
-                setTimeout(() => {
-                  this.cancel(true)
-                }, 600)
-              } else {
-                this.isLoading = false
-              }
-            }).catch(() => {
-              this.isLoading = false
-            })
-          }
-        })
-      },
-
-      cancel (isRefresh) {
-        this.$emit('change', {
-          type: 'list',
-          isRefresh: !!isRefresh
-        })
-      }
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-</style>
diff --git a/packages/jianping/AppGridMember/components/ApplyDetail.vue b/packages/jianping/AppGridMember/components/ApplyDetail.vue
deleted file mode 100644
index e50a258a..00000000
--- a/packages/jianping/AppGridMember/components/ApplyDetail.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-<template>
-  <ai-detail>
-    <template slot="title">
-      <ai-title title="详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
-      </ai-title>
-    </template>
-    <template slot="content">
-      <ai-card title="基本信息">
-        <template #content>
-          <ai-wrapper>
-            <ai-info-item label="姓名" isLine :value="info.name"></ai-info-item>
-            <ai-info-item label="联系电话" isLine :value="info.phone"></ai-info-item>
-            <ai-info-item label="网格名称" isLine :value="info.girdName"></ai-info-item>
-          </ai-wrapper>
-        </template>
-      </ai-card>
-    </template>
-  </ai-detail>
-</template>
-
-<script>
-  export default {
-    name: 'ApplyDetail',
-
-    props: {
-      instance: Function,
-      dict: Object,
-      params: Object
-    },
-
-    data () {
-      return {
-        info: {},
-        id: ''
-      }
-    },
-
-    created () {
-      if (this.params && this.params.id) {
-        this.id = this.params.id
-        this.getInfo(this.params.id)
-      }
-    },
-
-    methods: {
-      getInfo (id) {
-        this.instance.post(`/app/appgirdmemberapply/queryDetailById?id=${id}`).then(res => {
-          if (res.code === 0) {
-            this.info = res.data
-          }
-        })
-      },
-
-      cancel (isRefresh) {
-        this.$emit('change', {
-          type: 'ApplyList',
-          isRefresh: !!isRefresh
-        })
-      }
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-</style>
diff --git a/packages/jianping/AppGridMember/components/ApplyList.vue b/packages/jianping/AppGridMember/components/ApplyList.vue
deleted file mode 100644
index ef3a43fd..00000000
--- a/packages/jianping/AppGridMember/components/ApplyList.vue
+++ /dev/null
@@ -1,179 +0,0 @@
-<template>
-  <ai-list class="list" isTabs>
-    <template slot="content">
-      <ai-search-bar bottomBorder>
-        <template slot="left">
-          <el-button
-            icon="iconfont iconAdd"
-            type="primary"
-            size="small"
-            @click="add('')">添加</el-button>
-          <el-button
-            icon="iconfont iconDelete"
-            @click="deleteById(ids.join(','))"
-            :disabled="!Boolean(ids.length)">
-            删除
-          </el-button>
-          <ai-import :instance="instance" :dict="dict" type="appgirdmemberapply" name="网格员申报" @success="getList()">
-            <el-button icon="iconfont iconImport">导入</el-button>
-          </ai-import>
-        </template>
-        <template slot="right">
-          <el-input
-            v-model="searchObj.name"
-            size="small"
-            placeholder="网格员/责任网格"
-            @keyup.enter.native="(page.current = 1), getList()"
-            clearable
-            @clear="(searchObj.name = '', page.current = 1), getList()"
-            suffix-icon="iconfont iconSearch" />
-        </template>
-      </ai-search-bar>
-      <ai-table
-        :tableData="tableData"
-        :col-configs="colConfigs"
-        :total="page.total"
-        ref="aitableex"
-        :current.sync="page.current"
-        :size.sync="page.size"
-        @selection-change="(v) => (ids = v.map((e) => e.id))"
-        @getList="getList()">
-        <el-table-column label="操作" slot="options" align="center" fixed="right" width="120">
-          <template slot-scope="{ row }">
-            <div class="table-options">
-              <el-button type="text" @click="toDetail(row.id)">详情</el-button>
-              <el-button type="text" @click="deleteById(row.id)">删除</el-button>
-            </div>
-          </template>
-        </el-table-column>
-      </ai-table>
-    </template>
-  </ai-list>
-</template>
-
-<script>
-  export default {
-    name: 'ApplyList',
-    label: '网格员管理',
-    props: {
-      instance: Function,
-      dict: Object,
-      permissions: Function,
-    },
-    data() {
-      return {
-        searchObj: {
-          name: "",
-          selectionDate: "",
-        },
-        page: {
-          current: 1,
-          size: 10,
-          total: 0,
-        },
-        goAdd: false,
-        tableData: [],
-        fileList: [],
-        ids: [],
-        detail: {},
-      };
-    },
-    created() {
-      this.dict.load("sex", "girdMemberType", "politicsStatus", "education");
-      this.getList();
-    },
-    computed: {
-      colConfigs() {
-        let _ = this;
-        return [
-          {
-            type: "selection",
-          },
-          {
-            prop: "name",
-            label: "网格员姓名",
-          },
-          {
-            prop: "girdName",
-            align: "left",
-            label: "责任网格",
-          },
-          {
-            prop: "phone",
-            align: "center",
-            label: "联系电话",
-          }
-        ];
-      },
-    },
-    methods: {
-      getList() {
-        this.instance
-          .post("/app/appgirdmemberapply/list", null, {
-            params: {
-              ...this.searchObj,
-              ...this.page,
-            },
-          })
-          .then((res) => {
-            if (res.code == 0) {
-              this.tableData = res.data.records;
-              this.page.total = res.data.total;
-            }
-          });
-      },
-      deleteById(ids) {
-        ids &&
-          this.$confirm("是否要删除该网格员？", {
-            type: "error",
-          })
-            .then(() => {
-              this.instance
-                .post("/app/appgirdmemberapply/delete", null, {
-                  params: { ids },
-                })
-                .then((res) => {
-                  if (res?.code == 0) {
-                    this.$message.success("删除成功!");
-                    this.getList();
-                  }
-                });
-            })
-            .catch(() => {});
-      },
-      add (id) {
-        this.$emit('change', {
-          type: 'ApplyAdd',
-          params: {
-            id: id || ''
-          }
-        })
-      },
-
-      toDetail (id) {
-        this.$emit('change', {
-          type: 'ApplyDetail',
-          params: {
-            id
-          }
-        })
-      },
-
-      handleSelectionChange(val) {
-        this.ids = [];
-        val.map((e) => {
-          this.ids.push(e.id);
-        });
-      },
-      resetSearch() {
-        Object.keys(this.searchObj).map((e) => {
-          this.searchObj[e] = "";
-        });
-        this.getList();
-      },
-    },
-  }
-</script>
-
-<style lang="scss" scoped>
-</style>
\ No newline at end of file
diff --git a/packages/jianping/AppGridMember/components/Family.vue b/packages/jianping/AppGridMember/components/Family.vue
deleted file mode 100644
index 91b33a2f..00000000
--- a/packages/jianping/AppGridMember/components/Family.vue
+++ /dev/null
@@ -1,499 +0,0 @@
-<template>
-  <ai-list class="Family">
-    <template slot="title">
-      <ai-title title="责任家庭" isShowBack isShowBottomBorder @onBackClick="onBack"></ai-title>
-    </template>
-    <template slot="content">
-      <ai-search-bar class="search-bar">
-        <template #left>
-          <el-button size="small" type="primary" icon="iconfont iconAdd" @click="isShow = true">添加</el-button>
-          <el-button size="small" :disabled="!ids.length" icon="iconfont iconDelete" @click="removeAll">批量删除</el-button>
-          <el-select size="small" style="width: 200px;" v-model="search.girdId" placeholder="所属网格" clearable @change="getListInit()">
-            <el-option
-              v-for="(item,i) in girdList"
-              :key="i"
-              :label="item.girdName"
-              :value="item.id"
-            >
-            </el-option>
-          </el-select>
-        </template>
-        <template #right>
-          <el-input
-            v-model="search.name"
-            class="search-input"
-            size="small"
-            v-throttle="() => {search.current = 1, getList()}"
-            placeholder="姓名/身份证/联系方式"
-            clearable
-            @clear="search.current = 1, search.name = '', getList()"
-            suffix-icon="iconfont iconSearch">
-          </el-input>
-        </template>
-      </ai-search-bar>
-      <ai-table
-        :tableData="tableData"
-        :col-configs="colConfigs"
-        :total="total"
-        style="margin-top: 6px;"
-        :current.sync="search.current"
-        :size.sync="search.size"
-        @handleSelectionChange="handleSelectionChange"
-        @getList="getList">
-        <el-table-column slot="options" width="100px" fixed="right" label="操作" align="center">
-          <template slot-scope="{ row }">
-            <div class="table-options">
-              <el-button type="text" @click="remove(row.gmrId)">删除</el-button>
-            </div>
-          </template>
-        </el-table-column>
-      </ai-table>
-      <ai-dialog
-        :visible.sync="isShow"
-        width="890px"
-        @close="closeDialog"
-        title="添加户主"
-        @onConfirm="onConfirm">
-        <ai-area-select clearable always-show :instance="instance"  v-model="areaId" :disabled-level="disabledLevel" @change="search.current = 1, getUserList()"></ai-area-select>
-        <span style="margin-top:16px;"><span style="color:#f46;margin-right:4px;">*</span>网格：</span>
-        <el-select size="small" style="width: 280px;margin-top:16px;" v-model="girdId" placeholder="请选择网格" clearable>
-          <el-option
-            v-for="(item,i) in girdList"
-            :key="i"
-            :label="item.girdName"
-            :value="item.id"
-          >
-          </el-option>
-        </el-select>
-        <div class="AiWechatSelecter-container">
-          <div class="AiWechatSelecter-container__left" v-loading="isLoading">
-            <div class="AiWechatSelecter-header">
-              <div class="AiWechatSelecter-header__left">
-                <h2>户主信息列表</h2>
-              </div>
-              <el-input
-                class="search-input"
-                size="mini"
-                placeholder="请输入姓名/身份证号"
-                v-model="name"
-                clearable
-                @keyup.enter.native="getUserList()"
-                @clear="name = '', getUserList()"
-                suffix-icon="iconfont iconSearch">
-              </el-input>
-            </div>
-            <el-scrollbar class="AiWechatSelecter-list">
-              <el-checkbox-group v-model="chooseUser">
-                <el-checkbox
-                  :label="`${item.name}~${item.id}`"
-                  v-for="(item, index) in userList"
-                  :key="index">
-                  {{ item.name }}-{{ item.idNumber }}
-                </el-checkbox>
-              </el-checkbox-group>
-              <AiEmpty v-if="!this.userList.length"></AiEmpty>
-            </el-scrollbar>
-          </div>
-          <div class="AiWechatSelecter-container__right">
-            <div class="AiWechatSelecter-header AiWechatSelecter-header__right">
-              <h2>已选择</h2>
-              <el-button size="mini" icon="el-icon-delete" @click="clearAll">清空</el-button>
-            </div>
-            <el-scrollbar class="AiWechatSelecter-list">
-              <div class="tags-wrapper">
-                <el-tag
-                  v-for="(item, index) in chooseUser"
-                  :key="index"
-                  closable
-                  @close="del(item)"
-                  size="small"
-                  type="info">
-                  {{ item.split('~')[0] }}
-                </el-tag>
-              </div>
-            </el-scrollbar>
-          </div>
-        </div>
-      </ai-dialog>
-    </template>
-  </ai-list>
-</template>
-
-<script>
-  import { mapState } from 'vuex'
-  export default {
-    name: 'Family',
-
-    props: {
-      instance: Function,
-      dict: Object,
-      params: Object
-    },
-
-    data() {
-      return {
-        search: {
-          current: 1,
-          size: 10,
-          name: '',
-          girdId: ''
-        },
-        isLoading: false,
-        form: {
-
-        },
-        userList: [],
-        name: '',
-        chooseUser: [],
-        isShow: false,
-        total: 10,
-        colConfigs: [
-          { type: 'selection', label: '' },
-          { prop: 'name',  label: '户主姓名', align: 'left', width: '200px' },
-          { prop: 'idNumber', label: '身份证号', align: 'center' },
-          { prop: 'phone', label: '联系方式', align: 'center' },
-          { prop: 'girdName', label: '所属网格', align: 'center' },
-          { prop: 'createTime', label: '添加时间', align: 'center' },
-          { slot: 'options', label: '操作', align: 'center' }
-        ],
-        tableData: [],
-        areaId: '',
-        ids: [],
-        disabledLevel: 0,
-        girdList: [],
-        girdId: '',
-      }
-    },
-
-    computed: {
-      ...mapState(['user'])
-    },
-
-    created() {
-      this.areaId = this.user.info.areaId
-      this.disabledLevel = this.user.info.areaList.length
-      this.dict.load('epidemicDangerousAreaLevel').then(() => {
-        this.getGirdList()
-        this.getList()
-        this.getUserList()
-      })
-    },
-
-    methods: {
-      getGirdList() {
-        this.instance.post(`/app/appgirdmemberinfo/queryMyGirdListByLevel2?girdMemberId=${this.params.id}`).then(res => {
-          if (res.code == 0) {
-            this.girdList = res.data
-          }
-        })
-      },
-      getListInit() {
-        this.search.current = 1
-        this.getList()
-      },
-      getList () {
-        this.instance.post(`/app/appgirdmemberresident/listByGirdMember`, null, {
-          params: {
-            ...this.search,
-            girdMemberId: this.params.id,
-            areaId: this.areaId
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            this.tableData = res.data.records
-            this.total = res.data.total
-          }
-        })
-      },
-
-    removeAll() {
-        if (!this.ids) {
-          return this.$message.error('请选择户主')
-        }
-        this.remove(this.ids.join(','))
-      },
-      handleSelectionChange(e) {
-        this.ids = e.map(v => v.gmrId)
-      },
-
-      clearAll () {
-        this.chooseUser = []
-      },
-
-      onConfirm () {
-        if(!this.girdId) {
-          return this.$message.error('请选择网格')
-        }
-
-        if (!this.chooseUser.length) {
-          return this.$message.error('请选择户主')
-        }
-
-        const residentList = this.chooseUser.map(v => {
-          return {
-            girdMemberId: this.params.id,
-            name: v.split('~')[0],
-            residentId: v.split('~')[1],
-            girdId: this.girdId
-          }
-        })
-        this.instance.post(`/app/appgirdmemberresident/add`, {
-          residentList
-        }).then(res => {
-          if (res.code == 0) {
-            this.current = 1
-            this.getList()
-            this.$message.success('添加成功')
-            this.closeDialog()
-          }
-        })
-      },
-      closeDialog() {
-        this.isShow = false
-        this.chooseUser = []
-        this.girdId = ''
-        this.name = ''
-        this.areaId = this.user.info.areaId
-        this.getUserList()
-      },
-
-      del (e) {
-        this.chooseUser.splice(this.chooseUser.indexOf(e), 1)
-      },
-
-      getUserList () {
-        this.isLoading = true
-        this.instance.post(`/app/appresident/list`, null, {
-          params: {
-            current: 1,
-            size: 200,
-            con: this.name,
-            householdName: 1,
-            areaId: this.areaId,
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            this.userList = res.data.records
-          }
-
-          this.isLoading = false
-        })
-      },
-
-      onBack () {
-        this.$emit('change', {
-          type: 'list'
-        })
-      },
-
-      remove(id) {
-        this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appgirdmemberresident/delete?ids=${id}`).then(res => {
-            if (res.code == 0) {
-              this.$message.success('删除成功！')
-              this.getList()
-            }
-          })
-        })
-      }
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .Family {
-    .AiWechatSelecter-container {
-      display: flex;
-      height: 380px;
-      margin-top: 20px;
-
-      ::v-deep {
-        .el-icon-circle-close {
-          display: inline-block!important;
-        }
-      }
-
-      .tree-container {
-        & > span {
-          display: block;
-          margin-bottom: 4px;
-        }
-
-        .tree-user__item {
-          display: flex;
-          align-items: center;
-          margin-bottom: 10px;
-
-          &:last-child {
-            margin-bottom: 0;
-          }
-        }
-        img {
-          width: 27px;
-          height: 27px;
-          margin-right: 10px;
-        }
-      }
-
-      ::v-deep .el-tree {
-        background: transparent;
-
-        .el-tree-node {
-          margin-bottom: 8px;
-
-          &:last-child {
-            margin-bottom: 0;
-          }
-        }
-
-        .el-tree-node__content {
-          height: auto;
-          margin-top: 2px;
-          // align-items: inherit;
-        }
-        
-        .el-tree-node__expand-icon {
-          height: 24px;
-        }
-      }
-
-      .mask-btn__wrapper {
-        position: relative;
-      }
-
-      .mask-btn {
-        position: absolute;
-        left: 0;
-        top: 0;
-        width: 100%;
-        height: 100%;
-        z-index: 1;
-      }
-
-      .userlist-item {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        margin-bottom: 8px;
-        padding: 0 17px;
-        cursor: pointer;
-        user-select: none;
-
-        ::v-deep .el-checkbox__label {
-          display: none;
-        }
-
-        .userlist-item__left {
-          display: flex;
-          align-items: center;
-
-          span {
-            color: #222222;
-            font-size: 14px;
-          }
-
-          img {
-            width: 40px;
-            height: 40px;
-            margin-right: 8px;
-          }
-        }
-      }
-
-      & > div {
-        width: 280px;
-        background: #FCFCFC;
-        border: 1px solid #D0D4DC;
-      }
-
-      .AiWechatSelecter-list {
-        height: calc(100% - 40px);
-        padding: 8px 0;
-
-        ::v-deep .el-scrollbar__wrap {
-          margin-bottom: 0!important;
-          overflow-x: hidden;
-        }
-
-        ::v-deep .el-checkbox-group {
-          padding: 0 8px;
-
-          .el-checkbox {
-            display: block;
-            margin-right: 0;
-          }
-        }
-      }
-
-      .AiWechatSelecter-container__left {
-        flex: 1;
-      }
-
-      .AiWechatSelecter-container__right {
-        flex: 1;
-        margin-left: 20px;
-
-        .AiWechatSelecter-list {
-          .tags-wrapper {
-            padding: 0 8px;
-          }
-          .el-tag {
-            margin: 0 8px 8px 0px;
-            color: #222222;
-            font-size: 14px;
-          }
-        }
-      }
-
-      .AiWechatSelecter-header {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        height: 40px;
-        padding: 0 8px 0 0;
-        border-bottom: 1px solid #D0D4DC;
-        background: #F5F7FA;
-
-        .AiWechatSelecter-header__left {
-          display: flex;
-          align-items: center;
-          padding: 0 8px;
-
-          h2 {
-            height: 100%;
-            line-height: 40px;
-            color: #222222;
-            font-size: 14px;
-            text-align: center;
-            cursor: pointer;
-            border-bottom: 2px solid transparent;
-
-            &.active {
-              color: #2266FF;
-              border-color: #2266FF;
-            }
-          }
-        }
-
-        .el-button {
-          height: 28px;
-          padding: 7px 5px;
-        }
-
-        .el-input {
-          width: 160px;
-        }
-      }
-
-      .AiWechatSelecter-header__right {
-        padding: 0 8px;
-
-        h2 {
-          color: #222222;
-          font-size: 14px;
-          text-align: center;
-        }
-      }
-    }
-  }
-</style>
diff --git a/packages/jianping/AppGridMember/components/add.vue b/packages/jianping/AppGridMember/components/add.vue
deleted file mode 100644
index d3d6fd90..00000000
--- a/packages/jianping/AppGridMember/components/add.vue
+++ /dev/null
@@ -1,543 +0,0 @@
-<template>
-  <section style="height: 100%">
-    <ai-detail class="add">
-      <template #title>
-        <ai-title :title="title" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="cancel(false)"></ai-title>
-      </template>
-      <template #content>
-        <el-form
-          ref="rules"
-          :model="forms"
-          :rules="formRules"
-          size="small"
-          label-suffix="："
-          label-width="136px">
-          <ai-card title="基础信息" >
-            <template #right  v-if="title=='网格员详情'">
-              <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="editOne==false" @click="editOne=true">修改</span>
-              <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="editOne==true" @click="searchDetail(),editOne=false">取消</span>
-              <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="editOne==true" @click="save()">保存</span>
-            </template>
-            <template slot="content">
-              <div class="above" v-if="editOne==true">
-                <div class="left">
-                  <el-form-item label="网格员姓名" prop="name" >
-                    <el-input v-model="forms.name" placeholder="请选择网格员" disabled>
-                      <template #append>
-                        <ai-wechat-selecter :isMultiple="false" refs="addTags" :instance="instance" v-model="users" @change="getSelectPerson">
-                          <el-button size="small" type="primary"><span style="color: #fff">选择成员</span></el-button>
-                        </ai-wechat-selecter>
-                      </template>
-                    </el-input>
-                  </el-form-item>
-                  <el-form-item label="选用日期" prop="selectionDate" >
-                    <el-date-picker
-                      v-model="forms.selectionDate"
-                      type="date"
-                      style="width: 100%"
-                      value-format="yyyy-MM-dd"
-                      size="medium"
-                      placeholder="选择日期">
-                    </el-date-picker>
-                  </el-form-item>
-                  <el-form-item label="身份证号" prop="idNumber" >
-                      <el-input v-model="forms.idNumber" placeholder="请输入…" maxlength="18" show-word-limit></el-input>
-                  </el-form-item>
-                </div>
-                <div class="right">
-                  <el-form-item label="照片" prop="photo">
-                    <!-- <ai-uploader :instance="instance" v-model="photoList" :limit="1" @change="photoChange"></ai-uploader> -->
-                    <ai-avatar :instance="instance"  v-model="forms.photo"/>
-                  </el-form-item>
-                </div>
-              </div>
-              <div class="above" v-if="editOne==true">
-                <div class="left">
-                  <el-form-item label="出生日期" prop="birthday" >
-                    <el-date-picker
-                        v-model="forms.birthday"
-                        type="date"
-                        style="width: 100%"
-                        value-format="yyyy-MM-dd"
-                        size="medium"
-                        placeholder="选择日期">
-                    </el-date-picker>
-                  </el-form-item>
-                  <el-form-item label="联系电话" prop="phone" >
-                    <el-input v-model.number="forms.phone" placeholder="请输入…" maxlength="11" show-word-limit></el-input>
-                  </el-form-item>
-                </div>
-                <div class="right">
-                  <el-form-item label="性别" prop="sex" >
-                    <el-select size="medium" style="width: 100%" v-model="forms.sex" placeholder="请选择..." clearable>
-                      <el-option
-                        v-for="(item,i) in dict.getDict('sex')"
-                        :key="i"
-                        :label="item.dictName"
-                        :value="item.dictValue"
-                      >
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item label="电子邮箱" prop="mail" >
-                      <el-input v-model="forms.mail" placeholder="请输入…"></el-input>
-                  </el-form-item>
-                </div>
-              </div>
-              <template  v-if="editOne==false">
-                <div class="above">
-                  <div class="left">
-                    <ai-wrapper label-width="120px"  :columnsNumber="1"  style="margin-top: 16px;">
-                      <ai-info-item label="网格员姓名："><span >{{forms.name}}</span></ai-info-item>
-                      <ai-info-item label="选用日期："><span >{{forms.selectionDate}}</span></ai-info-item>
-                      <ai-info-item label="身份证号："><span >{{forms.idNumber}}</span></ai-info-item>
-                      <ai-info-item label="性别："><span >{{dict.getLabel('sex', forms.sex)}}</span></ai-info-item>
-                      <ai-info-item label="出生日期："><span >{{forms.birthday}}</span></ai-info-item>
-                      <ai-info-item label="电子邮箱："><span >{{forms.mail}}</span></ai-info-item>
-                    </ai-wrapper>
-                  </div>
-                  <div class="right">
-                    <ai-wrapper label-width="120px"  :columnsNumber="1"  style="margin-top: 16px;">
-                      <ai-info-item label="照片：" v-if="forms.photo">
-                        <span >
-                          <ai-uploader :instance="instance" v-model="photoList" disabled :limit="1" @change="photoChange"></ai-uploader>
-                        </span>
-                      </ai-info-item>
-                      <ai-info-item label="联系电话："><span >{{forms.phone}}</span></ai-info-item>
-                    </ai-wrapper>
-                  </div>
-                </div>
-              </template>
-            </template>
-          </ai-card>
-          <ai-card title="关联信息" >
-            <template #right  v-if="title=='网格员详情'">
-              <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="editTwo==false" @click="editTwo=true">修改</span>
-              <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="editTwo==true" @click="searchDetail(),editTwo=false">取消</span>
-              <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="editTwo==true" @click="save()">保存</span>
-            </template>
-            <template slot="content">
-              <template v-if="editTwo==true">
-                <el-form-item label="责任网格" prop="girdInfoList" style="margin-top: 8px;">
-                  <el-form-item style="width: 100%" label-width="80px" :label="'网格' + (index + 1)" v-for="(item, index) in forms.girdInfoList" :key="'选项' + (index + 1)">
-                    <div class="form-flex">
-                      <el-select v-model="item.checkType" placeholder="请选择网格角色">
-                        <el-option
-                          v-for="item in options"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value">
-                        </el-option>
-                      </el-select>
-                      <el-input disabled v-model="item.girdName" :maxlength="200" size="small" placeholder="请选择责任网格">
-                        <template slot="append">
-                          <el-button size="small" @click="currIndex = index, showGrid = true">选择网格</el-button>
-                        </template>
-                      </el-input>
-                      <el-button type="danger" size="small" @click="removeGrid(index)">删除</el-button>
-                    </div>
-                  </el-form-item>
-                  <el-button type="primary" size="small" @click="addGrid">添加选项</el-button>
-                  <!-- <el-button size="small" @click="showGrid=true">选择网格</el-button> -->
-                </el-form-item>
-                <div class="above">
-                  <div class="left">
-                    <el-form-item label="是否特殊网格员" prop="isGirdMember" >
-                      <el-radio-group v-model="forms.isGirdMember">
-                        <el-radio label="0">否</el-radio>
-                        <el-radio label="1">是</el-radio>
-                      </el-radio-group>
-                    </el-form-item>
-                    <el-form-item label="政治面貌" prop="politicsStatus" >
-                      <el-select v-model="forms.politicsStatus" size="small" style="width: 100%" placeholder="请选择..." clearable>
-                        <el-option v-for="(item,i) in dict.getDict('politicsStatus')" :key="i" :label="item.dictName" :value="item.dictValue"></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </div>
-                  <div class="right">
-                    <el-form-item label="特殊网格员" prop="girdMemberType" v-if="forms.isGirdMember==1">
-                      <el-select v-model="forms.girdMemberType" size="small" placeholder="请选择..." clearable>
-                        <el-option v-for="(item,i) in dict.getDict('girdMemberType')" :key="i" :label="item.dictName" :value="item.dictValue"></el-option>
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item label="学历" prop="education" >
-                      <el-select v-model="forms.education" style="width: 100%" size="small" placeholder="请选择..." clearable>
-                        <el-option v-for="(item,i) in dict.getDict('education')" :key="i" :label="item.dictName" :value="item.dictValue"></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </div>
-                </div>
-                <el-form-item label="个人简介" prop="introduction" >
-                  <el-input
-                    type="textarea"
-                    maxlength="200"
-                    show-word-limit
-                    :rows="4"
-                    placeholder="请输入内容"
-                    v-model="forms.introduction">
-                  </el-input>
-                </el-form-item>
-                <el-form-item label="人生格言" prop="motto" >
-                  <el-input
-                    type="textarea"
-                    maxlength="200"
-                    show-word-limit
-                    :rows="4"
-                    placeholder="请输入内容"
-                    v-model="forms.motto">
-                  </el-input>
-                </el-form-item>
-              </template>
-              <template v-if="editTwo==false">
-                <ai-wrapper label-width="120px" :columnsNumber="2" style="margin-top: 16px;">
-                  <ai-info-item label="责任网格：" style="width: 100%;"><span v-html="girdInfoStr || '-'"></span></ai-info-item>
-                  <ai-info-item label="是否特殊网格员：">
-                    <span>{{ !forms.isGirdMember ? '-' : forms.isGirdMember === '0' ? '否' : '是' }}</span>
-                  </ai-info-item>
-                  <ai-info-item label="特殊网格员：" v-if="forms.isGirdMember==1"><span >{{dict.getLabel('girdMemberType', forms.girdMemberType)}}</span></ai-info-item>
-                  <ai-info-item label="政治面貌："><span >{{dict.getLabel('politicsStatus', forms.politicsStatus)}}</span></ai-info-item>
-                  <ai-info-item label="学历："><span >{{dict.getLabel('education', forms.education)}}</span></ai-info-item>
-                  <ai-info-item label="人生格言：" style="width: 100%;"><span >{{forms.motto}}</span></ai-info-item>
-                  <ai-info-item label="个人简介：" style="width: 100%;"><span >{{forms.introduction}}</span></ai-info-item>
-                </ai-wrapper>
-              </template>
-            </template>
-          </ai-card>
-        </el-form>
-        <ai-dialog title="选择网格" :visible.sync="showGrid" :customFooter="true"  :destroyOnClose="true" border  width="720px">
-          <div class="grid">
-            <el-tree
-              :data="treeObj.treeList"
-              :props="treeObj.defaultProps"
-              node-key="id"
-              ref="tree"
-              :check-strictly="true"
-              show-checkbox
-              :default-checked-keys="currCheckedKeys"
-              default-expand-all
-              @check="onCheckChange">
-            </el-tree>
-          </div>
-          <div class="dialog-footer" slot="footer" >
-            <el-button  size="medium" @click="showGrid=false">取消</el-button>
-            <el-button  type="primary" size="medium" @click="getCheckedTree()">确认</el-button>
-          </div>
-        </ai-dialog>
-      </template>
-      <template #footer v-if="title=='添加网格员'">
-        <el-button @click="cancel(false)" class="delete-btn footer-btn" >取 消</el-button>
-        <el-button type="primary" @click="save()"  class="footer-btn">提 交</el-button>
-      </template>
-    </ai-detail>
-  </section>
-</template>
-
-<script>
-export default {
-  name: "add",
-  props: {
-    instance: Function,
-    dict: Object,
-    permissions: Function,
-    params: Object,
-  },
-  data() {
-    return {
-      users: [],
-      currIndex: 0,
-      forms: {
-        birthday: "",
-        education: "",
-        girdId: "",
-        girdInfoList: [],
-        girdMemberType: "",
-        id: "",
-        wxUserId: '',
-        introduction: "",
-        isGirdMember: "",
-        mail: "",
-        motto: "",
-        name: "",
-        phone: "",
-        photo: "",
-        politicsStatus: "",
-        selectionDate: "",
-        sex: "",
-        userId: "",
-      },
-      options: [{
-        value: '2',
-        label: '网格长'
-      }, {
-        value: '1',
-        label: '网格员'
-      }],
-      showGrid: false,
-      treeObj: {
-        treeList: [],
-        defaultProps: {
-          children: "girdList",
-          label: "girdName",
-        },
-        checkedKeys: [],
-      },
-      girdInfoStr: '',
-      photoList: [],
-      title: "添加网格员",
-      editOne: false,
-      editTwo: false,
-    };
-  },
-  created() {
-    this.beforeSelectTree()
-    if (this.params.id) {
-      this.searchDetail();
-      this.title = "网格员详情";
-      this.editOne = false;
-      this.editTwo = false;
-    } else {
-      this.title = "添加网格员";
-      this.editOne = true;
-      this.editTwo = true;
-    }
-  },
-  computed: {
-    currCheckedKeys () {
-      if (this.forms && this.forms.girdInfoList && this.forms.girdInfoList[this.currIndex] && this.forms.girdInfoList[this.currIndex].id) {
-        return [this.forms.girdInfoList[this.currIndex].id]
-      }
-
-      return []
-    },
-    formRules() {
-      let phonePass = (rule, value, callback) => {
-        let reg = /^(?:(?:\+|00)86)?1\d{10}$/;
-        if (value) {
-          if (reg.test(value)) {
-            callback();
-          } else {
-            callback(new Error("联系电话格式错误"));
-          }
-        } else {
-          callback(new Error("请输入联系电话"));
-        }
-      };
-      return {
-        name: [
-          { required: true, message: "请输入网格员姓名", trigger: "change" },
-        ],
-        selectionDate: [
-          { required: true, message: "请选择选用日期", trigger: "change" },
-        ],
-        phone: [{ required: true, validator: phonePass, trigger: "blur" }],
-        girdInfoList: [
-          { required: true, message: "请选择责任网络", trigger: "change" },
-        ],
-        mail: [
-          {
-            type: "email",
-            message: "请输入正确的邮箱地址",
-            trigger: ["blur", "change"],
-          },
-        ]
-      };
-    },
-  },
-  methods: {
-    cancel (isRefresh) {
-      this.$emit('change', {
-        type: 'list',
-        isRefresh: !!isRefresh,
-      })
-    },
-
-    onCheckChange (e) {
-      this.$nextTick(() => {
-        this.$refs.tree.getCheckedKeys().forEach(v => {
-          this.$refs.tree.setChecked(v, false)
-        })
-        this.$refs.tree.setChecked(e.id, true)
-      })
-    },
-
-    removeGrid (index) {
-      this.forms.girdInfoList.splice(index, 1)
-    },
-
-    addGrid () {
-      this.forms.girdInfoList.push({
-        id: '',
-        girdName: '',
-        checkType: ''
-      })
-    },
-    photoChange(val) {
-      this.forms.photo = val[0].url;
-    },
-    getSelectPerson(val) {
-      this.forms.name = val[0].name;
-      this.forms.phone = val[0].phone;
-      this.forms.userId = val[0].sysUserId
-      this.forms.wxUserId = val[0].id
-    },
-    getCheckedTree() {
-      if (!this.$refs.tree.getCheckedNodes().length) {
-        return this.$message.error('请选择网格')
-      }
-
-      if (this.$refs.tree.getCheckedNodes().length > 1) {
-        return this.$message.error('不支持多选')
-      }
-      this.$set(this.forms.girdInfoList, this.currIndex, {
-        ...this.$refs.tree.getCheckedNodes()[0],
-        checkType: this.forms.girdInfoList[this.currIndex].checkType
-      })
-      this.showGrid = false;
-    },
-    handleClose(tag) {
-      this.forms.girdInfoList.splice(this.forms.girdInfoList.indexOf(tag), 1);
-    },
-    beforeSelectTree() {
-      this.treeObj.checkedKeys = [];
-      this.instance.post(`/app/appgirdinfo/listAll`, null, null).then((res) => {
-        if (res.code == 0) {
-          this.treeObj.treeList = res.data;
-          this.forms.girdInfoList.map((e) => {
-            this.treeObj.checkedKeys.push(e.id);
-          });
-        }
-      });
-    },
-    save() {
-      this.$refs["rules"].validate((valid) => {
-        if (valid) {
-          for (let i = 0; i < this.forms.girdInfoList.length; i++) {
-            const currInfo = this.forms.girdInfoList[i]
-            const arr = JSON.parse(JSON.stringify(this.forms.girdInfoList))
-            arr.splice(i, 1)
-            const sameInfo = arr.filter(v => v.id === currInfo.id)
-            if (!currInfo.checkType) {
-              return this.$message.error('请选择网格员类型')
-            }
-
-            if (!currInfo.id) {
-              return this.$message.error('请选择网格')
-            }
-
-            if (currInfo.checkType === '1' && currInfo.girdLevel !== '2') {
-              return this.$message.error(`一级、二级网格不能添加网格员`)
-            }
-
-            if (sameInfo.length) {
-              return this.$message.error('不能选择同一网格重复绑定')
-            }
-          }
-
-          this.instance.post(`/app/appgirdmemberinfo/addOrUpdate`,{
-            ...this.forms,
-            girdInfoListStr: this.forms.girdInfoList.map(v => v.girdName).join(',')
-          }).then((res) => {
-            if (res.code == 0) {
-              if (this.title == "添加网格员") {
-                this.cancel(true)
-              } else {
-                this.editOne = false
-                this.editTwo = false
-                this.searchDetail()
-              }
-            }
-          });
-        } else {
-          return false
-        }
-      });
-    },
-    searchDetail() {
-      this.instance
-        .post(`/app/appgirdmemberinfo/queryDetailById`, null, {
-          params: { id: this.params.id },
-        })
-        .then((res) => {
-          if (res.code == 0) {
-            this.forms = {
-              ...res.data,
-              girdInfoList: res.data.girdInfoList || []
-            };
-            this.users = [{
-              name: res.data.name,
-              phone: res.data.phone,
-              userId: res.data.id,
-              id: res.data.wxUserId
-            }]
-            this.girdInfoStr = ''
-            this.photoList = [{ url: this.forms.photo }];
-            if (res.data.girdInfoList) {
-              res.data.girdInfoList.forEach((e) => {
-                this.girdInfoStr = this.girdInfoStr + `${e.checkType === '1' ? '网格员' : '网格长'}-${e.girdName}&emsp;`
-              })
-            }
-          }
-        });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.add {
-  height: 100%;
-
-    .form-flex {
-      display: flex;
-      align-items: center;
-
-      & > .el-button {
-        margin-left: 20px;
-      }
-
-      .el-input {
-        width: 300px;
-        margin-left: 20px;
-      }
-
-      ::v-deep .el-form-item__content {
-        margin-left: 0!important;
-      }
-    }
-  .ai-detail__title {
-    background-color: #fff;
-  }
-  .ai-detail__content {
-    .ai-detail__content--wrapper {
-      .el-form {
-        // background-color: #fff;
-        // padding: 0 60px;
-        .flex {
-          display: flex;
-          flex-wrap: wrap;
-          justify-content: space-between;
-          .el-form-item {
-            width: 48%;
-          }
-          .buildingTypes {
-            width: 100%;
-          }
-        }
-      }
-    }
-  }
-  ::v-deep .el-tag {
-    margin-right: 8px;
-    color: #333333;
-  }
-  .footer-btn {
-    width: 92px;
-  }
-  .above{
-    display: flex;
-    .left, .right{
-      flex: 1;
-    }
-  }
-}
-</style>

From c398a354b986b7b69d23d932d9fb72ca4cd03c1a Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 29 Apr 2022 15:44:01 +0800
Subject: [PATCH 02/45] BUG 29286

---
 packages/grid/AppGridMember/components/MonitorUser.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/grid/AppGridMember/components/MonitorUser.vue b/packages/grid/AppGridMember/components/MonitorUser.vue
index 701a4b81..0c1b57e7 100644
--- a/packages/grid/AppGridMember/components/MonitorUser.vue
+++ b/packages/grid/AppGridMember/components/MonitorUser.vue
@@ -44,7 +44,7 @@
         <el-table-column slot="options" width="100px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
             <div class="table-options">
-              <el-button type="text" @click="remove(row.gmrId)">删除</el-button>
+              <el-button type="text" @click="remove(row.gmpId)">删除</el-button>
             </div>
           </template>
         </el-table-column>
@@ -286,9 +286,11 @@ export default {
       })
     },
 
-    remove(id) {
+    remove(ids) {
       this.$confirm('确定删除该数据？').then(() => {
-        this.instance.post(`/app/appgirdmemberresident/delete?ids=${id}`).then(res => {
+        this.instance.post(`/app/appgirdmemberpoverty/delete`, null, {
+          params: {ids}
+        }).then(res => {
           if (res.code == 0) {
             this.$message.success('删除成功！')
             this.getList()

From 6298eeaae39428502c580f0f2ad795304ae2ebfe Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 29 Apr 2022 15:53:42 +0800
Subject: [PATCH 03/45] BUG 29306

---
 .../jianping/AppPublicizeInformation/List.vue | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/packages/jianping/AppPublicizeInformation/List.vue b/packages/jianping/AppPublicizeInformation/List.vue
index db6e17cb..ee97c6d3 100644
--- a/packages/jianping/AppPublicizeInformation/List.vue
+++ b/packages/jianping/AppPublicizeInformation/List.vue
@@ -7,8 +7,9 @@
       <template #content>
         <div class="flex fill">
           <div class="type">
-            <div class="title">宣传板块<span><el-button type="text"
-                                                    @click="addType(0, typeList.length+1, '')">添加</el-button></span>
+            <div class="title">宣传板块
+              <span>
+              <el-button type="text" @click="addType(0, typeList.length+1, '')">添加</el-button></span>
             </div>
             <div class="list">
               <div class="item" v-for="(item, index) in typeList" :key="index"
@@ -36,30 +37,29 @@
             </div>
           </div>
           <div class="content">
-            <ai-search-bar>
-              <template #right>
-                <el-input size="small" placeholder="请输入标题" v-model="search.title" clearable
-                          @change="page.current=1,getTableData()"/>
-              </template>
-            </ai-search-bar>
-            <ai-search-bar>
-              <template #left>
-                <el-button type="primary" icon="iconfont iconAdd" @click="showEdit('')"
-                           v-if="typeList.length && miniTypeList.length">添加
-                </el-button>
-                <!-- <el-button icon="iconfont iconDelete" :disabled="!ids.length" @click="handleDelete(ids)">删除</el-button> -->
-              </template>
-            </ai-search-bar>
-            <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
-                      @getList="getTableData" :col-configs="colConfigs" :dict="dict"
-                      @selection-change="v=>ids=v.map(e=>e.id)">
-              <el-table-column slot="options" label="操作" fixed="right" align="center" width='150px'>
-                <template slot-scope="{row}">
-                  <el-button type="text" @click="showEdit(row.id)">编辑</el-button>
-                  <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
+            <template v-if="typeList.length && miniTypeList.length">
+              <ai-search-bar>
+                <template #left>
+                  <el-button type="primary" icon="iconfont iconAdd" @click="showEdit('')">添加</el-button>
+                  <!-- <el-button icon="iconfont iconDelete" :disabled="!ids.length" @click="handleDelete(ids)">删除</el-button> -->
                 </template>
-              </el-table-column>
-            </ai-table>
+                <template #right>
+                  <el-input size="small" placeholder="请输入标题" v-model="search.title" clearable
+                            @change="page.current=1,getTableData()"/>
+                </template>
+              </ai-search-bar>
+              <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
+                        @getList="getTableData" :col-configs="colConfigs" :dict="dict"
+                        @selection-change="v=>ids=v.map(e=>e.id)">
+                <el-table-column slot="options" label="操作" fixed="right" align="center" width='150px'>
+                  <template slot-scope="{row}">
+                    <el-button type="text" @click="showEdit(row.id)">编辑</el-button>
+                    <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
+                  </template>
+                </el-table-column>
+              </ai-table>
+            </template>
+            <ai-empty v-else>请选择或者添加模块</ai-empty>
           </div>
         </div>
       </template>

From 85324959a05afc199af291d5ce43671c386da9b3 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 29 Apr 2022 16:04:32 +0800
Subject: [PATCH 04/45] BUG 29420

---
 packages/jianping/AppHelpedResident/hrList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/jianping/AppHelpedResident/hrList.vue b/packages/jianping/AppHelpedResident/hrList.vue
index d12cd9b7..95af2057 100644
--- a/packages/jianping/AppHelpedResident/hrList.vue
+++ b/packages/jianping/AppHelpedResident/hrList.vue
@@ -37,7 +37,7 @@
                        suffixName="xlsx"
                        url="/app/apppreventionreturntopoverty/downloadTemplate"
                        importUrl="/app/apppreventionreturntopoverty/import"
-                       @onSuccess="page.current=1,search={},getTableData()"/>
+                       @onSuccess="page.current=1,getTableData()"/>
             <ai-download url="/app/apppreventionreturntopoverty/export" :params="{...search,ids}"
                          :instance="instance" fileName="监测对象导出文件"/>
           </template>

From f764b37c8a3e0face2b77812d7a5f8c90c0888cf Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 29 Apr 2022 16:08:43 +0800
Subject: [PATCH 05/45] BUG 29436

---
 packages/jianping/AppHelpedResident/hrAdd.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/jianping/AppHelpedResident/hrAdd.vue b/packages/jianping/AppHelpedResident/hrAdd.vue
index ad678faf..115e6357 100644
--- a/packages/jianping/AppHelpedResident/hrAdd.vue
+++ b/packages/jianping/AppHelpedResident/hrAdd.vue
@@ -383,7 +383,7 @@ export default {
         healthyStatusList: [],
         guaranteeList: [],
         basicsList: [],
-        file: [], 
+        file: [],
       },
       isSelectUser: false, //是否选择人员
     }
@@ -397,8 +397,8 @@ export default {
         this.form.phone =''
         this.form.currentAreaId = ''
         this.form.currentAddress = ''
-        this.form.birthDate = '' 
-        this.form.sex = '' 
+        this.form.birthDate = ''
+        this.form.sex = ''
         this.form.age = ''
         return
       }
@@ -439,7 +439,7 @@ export default {
     handleIdNumberAutocomplete(v) {
       var idNumber = v
       if(v.length == 20) {
-        idNumber = v.substring(0, 17)
+        idNumber = v.substring(0, 18)
       }
       let {birthday: birthDate, sex} = this.idCardNoUtil.getIdCardInfo(idNumber)
       this.form = {...this.form, birthDate, sex, age: this.$calcAge(idNumber)}

From 47024dde2ab77d4c2c4b3dd2736ac45e88fe1aef Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 29 Apr 2022 16:11:09 +0800
Subject: [PATCH 06/45] BUG 29439

---
 packages/jianping/AppHelpedResident/hrDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index 3f1d2561..f7dc2db1 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -195,7 +195,7 @@
           <el-form :model="form" ref="ruleForm" :rules="rules" label-width="130px" label-position="right" size="small">
             <div flex class="half wrap">
               <div flex class="column">
-                <el-form-item label="户主姓名" prop="name">
+                <el-form-item label="成员姓名" prop="name">
                   <el-input size="small" class="user-selecter" v-model="form.name" placeholder="请输入姓名" clearable :disabled="isEdit || isSelectUser">
                     <template slot="append">
                       <ai-person-select :instance="instance" @selectPerson="checkName" :url="'/app/appresident/list?auditStatus=1&areaId='+user.info.areaId"></ai-person-select>

From 6eb9dd2ee6a2b154fb63c03d31376826d56b2bca Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 29 Apr 2022 16:13:28 +0800
Subject: [PATCH 07/45] BUG 29441

---
 packages/jianping/AppHelpedResident/hrAdd.vue    |  4 ++--
 packages/jianping/AppHelpedResident/hrDetail.vue | 10 +++++-----
 packages/jianping/AppHelpedResident/hrList.vue   |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/jianping/AppHelpedResident/hrAdd.vue b/packages/jianping/AppHelpedResident/hrAdd.vue
index 115e6357..3e046c9f 100644
--- a/packages/jianping/AppHelpedResident/hrAdd.vue
+++ b/packages/jianping/AppHelpedResident/hrAdd.vue
@@ -336,7 +336,7 @@ export default {
     },
     rules() {
       return {
-        idNumber: [{required: true, message: "请输入身份证号"}],
+        idNumber: [{required: true, message: "请输入证件号"}],
         name: [{required: true, message: "请输入姓名"}],
         sex: [{required: true, message: "请选择性别"}],
         phone: [{required: true, message: "请输入联系方式"}],
@@ -346,7 +346,7 @@ export default {
         ],
         isHousehold: [{required: true, message: "请选择是否户主"}],
         householdRelation: [{required: true, message: "请选择与户主关系"}],
-        householdIdNumber: [{required: true, message: "请选择户主身份证号"}],
+        householdIdNumber: [{required: true, message: "请选择户主证件号"}],
         riskType: [{required: true, message: "请选择风险因素"}],
         objectType: [{required: true, message: "请选择监测对象类型"}],
       }
diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index f7dc2db1..17e96515 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -31,7 +31,7 @@
                   <div flex class="flex-start">
                     <div flex class="half wrap fill">
                       <el-form-item label="联系电话">{{ detail.phone}}</el-form-item>
-                      <el-form-item label="身份证号">{{ detail.idNumber}}</el-form-item>
+                      <el-form-item label="证件号">{{ detail.idNumber}}</el-form-item>
                       <el-form-item label="性别" prop="sex">{{ dict.getLabel("sex", detail.sex)}}</el-form-item>
                       <el-form-item label="出生日期">{{ detail.birthDate}}</el-form-item>
                       <!-- <el-form-item label="年龄" prop="age">{{ detail.age}}</el-form-item> -->
@@ -302,7 +302,7 @@
             <div flex class="flex-start">
               <div flex class="half wrap fill">
                 <el-form-item label="联系电话">{{ familyInfo.phone}}</el-form-item>
-                <el-form-item label="身份证号">{{ familyInfo.idNumber}}</el-form-item>
+                <el-form-item label="证件号">{{ familyInfo.idNumber}}</el-form-item>
                 <el-form-item label="性别" prop="sex">{{ dict.getLabel("sex", familyInfo.sex)}}</el-form-item>
                 <el-form-item label="出生日期">{{ familyInfo.birthDate}}</el-form-item>
                 <el-form-item label="与户主关系">{{dict.getLabel("fpRelationship", familyInfo.householdRelation)}}</el-form-item>
@@ -454,7 +454,7 @@ export default {
         { label: "性别", prop: "sex", dict: "sex" },
         { label: "年龄", prop: "age" },
         {
-          label: "身份证号",
+          label: "证件号",
           render: (h, { row }) =>
             h("p", null, this.idCardNoUtil.hideId(row.idNumber)),
         },
@@ -474,7 +474,7 @@ export default {
     },
     rules() {
       return {
-        idNumber: [{ required: true, message: "请输入身份证号" }],
+        idNumber: [{ required: true, message: "请输入证件号" }],
         name: [{ required: true, message: "请输入姓名" }],
         sex: [{ required: true, message: "请选择性别" }],
         phone: [{ required: true, message: "请输入联系方式" }],
@@ -484,7 +484,7 @@ export default {
         ],
         isHousehold: [{ required: true, message: "请选择是否户主" }],
         householdRelation: [{ required: true, message: "请选择与户主关系" }],
-        householdIdNumber: [{ required: true, message: "请选择户主身份证号" }],
+        householdIdNumber: [{ required: true, message: "请选择户主证件号" }],
       };
     },
     rulesApply() {
diff --git a/packages/jianping/AppHelpedResident/hrList.vue b/packages/jianping/AppHelpedResident/hrList.vue
index 95af2057..7b6ba9d4 100644
--- a/packages/jianping/AppHelpedResident/hrList.vue
+++ b/packages/jianping/AppHelpedResident/hrList.vue
@@ -23,7 +23,7 @@
             <ai-select placeholder="政治面貌" v-model="search.politicsStatus" :selectList="dict.getDict('fpPoliticalOutlook')" @change="page.current=1,getTableData()"/> -->
           </template>
           <template #right>
-            <el-input size="small" placeholder="姓名/身份证/联系方式" v-model="search.con" clearable
+            <el-input size="small" placeholder="姓名/证件/联系方式" v-model="search.con" clearable
                       @change="page.current=1,getTableData()"/>
           </template>
         </ai-search-bar>
@@ -45,7 +45,7 @@
         <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
                   @getList="getTableData" :col-configs="colConfigs" :dict="dict"
                   @selection-change="v=>ids=v.map(e=>e.id)">
-          <el-table-column slot="idNumber" label="身份证号" show-overflow-tooltip align="center">
+          <el-table-column slot="idNumber" label="证件号" show-overflow-tooltip align="center">
             <template slot-scope="{row}">
               <ai-id mode="show" v-model="row.idNumber" :showEyes="false"/>
             </template>

From 869d9a4635af5068e3435b7fb6564ae66bc199f8 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 29 Apr 2022 16:24:13 +0800
Subject: [PATCH 08/45] BUG 29446

---
 packages/jianping/AppHelpedResident/hrDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index 17e96515..85ab77d7 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -80,7 +80,7 @@
                 <template slot="content">
                   <div flex class="half wrap">
                     <el-form-item label="住房面积(m²)">{{detail.houseArea}}</el-form-item>
-                    <el-form-item label="户类型">{{ dict.getLabel("fpYesOrNo", detail.houseType)}}</el-form-item>
+                    <el-form-item label="户类型">{{ dict.getLabel("fpHouseType", detail.houseType)}}</el-form-item>
                     <el-form-item label="与村主干路距离(公里)">{{ detail.trunkRoadDistance}}</el-form-item>
                     <el-form-item label="入户路类型">{{ dict.getLabel("fpHouseRoadType", detail.houseRoadType)}}</el-form-item>
                     <el-form-item label="是否危房">{{ dict.getLabel("fpYesOrNo", detail.dilapidatedHousehold)}}</el-form-item>

From 8a0141bf2d1dca94516b664abc3127c5f5d0e13e Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 29 Apr 2022 16:39:37 +0800
Subject: [PATCH 09/45] BUG 29450

---
 .../jianping/AppHelpedResident/hrDetail.vue   | 586 ++++++++++--------
 1 file changed, 327 insertions(+), 259 deletions(-)

diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index 85ab77d7..fc9dd154 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -3,22 +3,30 @@
     <ai-detail>
       <ai-title slot="title" title="监测对象详情" isShowBottomBorder isShowBack @onBackClick="back">
         <template #rightBtn>
-          <el-button type="primary" icon="iconfont iconEdit" @click="gotoEdit" v-if="$permissions('app_apppreventionreturntopoverty_edit')">编辑</el-button>
+          <el-button type="primary" icon="iconfont iconEdit" @click="gotoEdit"
+                     v-if="$permissions('app_apppreventionreturntopoverty_edit')">编辑
+          </el-button>
           <template v-if="isGridAdmin">
             <template v-if="detail.status == 0 || detail.status == 4">
-              <el-button type="primary" @click="applyMonitor('纳入监测', 1)" v-if="girdAdminApplyStatus != 1">纳入监测</el-button>
-              <el-button type="primary" @click="examine('纳入监测审批', 2)" v-if="girdAdminApplyStatus == 1">纳入监测审批</el-button>
+              <el-button type="primary" @click="applyMonitor('纳入监测', 1)" v-if="girdAdminApplyStatus != 1">纳入监测
+              </el-button>
+              <el-button type="primary" @click="examine('纳入监测审批', 2)" v-if="girdAdminApplyStatus == 1">纳入监测审批
+              </el-button>
             </template>
             <el-button type="primary" @click="applyMonitor('纳入监测', 1)" v-if="detail.status == 3">纳入监测</el-button>
             <el-button type="primary" @click="applyMonitor('解除风险', 4)" v-if="detail.status == 1">解除风险</el-button>
             <el-button type="primary" @click="examine('解除风险审批', 5)" v-if="detail.status == 2">解除风险审批</el-button>
           </template>
           <template v-if="user.info.girdCheckType == 1">
-            <el-button type="primary" @click="applyMonitor('申请纳入监测', 0)" v-if="detail.status == 4 || detail.status == 3">申请纳入监测</el-button>
+            <el-button type="primary" @click="applyMonitor('申请纳入监测', 0)"
+                       v-if="detail.status == 4 || detail.status == 3">申请纳入监测
+            </el-button>
             <el-button type="primary" @click="applyMonitor('申请解除风险', 3)" v-if="detail.status == 1">申请解除风险</el-button>
           </template>
           <template v-if="detail.status == 3 || detail.status == 4">
-            <el-button v-if="$permissions('app_apppreventionreturntopoverty_del') && user.info.girdCheckType != 0" icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除</el-button>
+            <el-button v-if="$permissions('app_apppreventionreturntopoverty_del') && user.info.girdCheckType != 0"
+                       icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除
+            </el-button>
           </template>
         </template>
       </ai-title>
@@ -30,96 +38,123 @@
                 <template #content>
                   <div flex class="flex-start">
                     <div flex class="half wrap fill">
-                      <el-form-item label="联系电话">{{ detail.phone}}</el-form-item>
-                      <el-form-item label="证件号">{{ detail.idNumber}}</el-form-item>
-                      <el-form-item label="性别" prop="sex">{{ dict.getLabel("sex", detail.sex)}}</el-form-item>
-                      <el-form-item label="出生日期">{{ detail.birthDate}}</el-form-item>
+                      <el-form-item label="联系电话">{{ detail.phone }}</el-form-item>
+                      <el-form-item label="证件号">{{ detail.idNumber }}</el-form-item>
+                      <el-form-item label="性别" prop="sex">{{ dict.getLabel("sex", detail.sex) }}</el-form-item>
+                      <el-form-item label="出生日期">{{ detail.birthDate }}</el-form-item>
                       <!-- <el-form-item label="年龄" prop="age">{{ detail.age}}</el-form-item> -->
-                      <el-form-item label="民族">{{dict.getLabel("fpNation", detail.nation)}}</el-form-item>
-                      <el-form-item label="文化程度">{{ dict.getLabel("fpEducation", detail.education)}}</el-form-item>
-                      <el-form-item label="政治面貌">{{dict.getLabel("fpPoliticalOutlook",detail.politicsStatus)}}</el-form-item>
-                      <el-form-item label="在校生状况">{{dict.getLabel( "fpStudentsInSchool", detail.schoolStatus)}}</el-form-item>
+                      <el-form-item label="民族">{{ dict.getLabel("fpNation", detail.nation) }}</el-form-item>
+                      <el-form-item label="文化程度">{{ dict.getLabel("fpEducation", detail.education) }}</el-form-item>
+                      <el-form-item label="政治面貌">{{ dict.getLabel("fpPoliticalOutlook", detail.politicsStatus) }}
+                      </el-form-item>
+                      <el-form-item label="在校生状况">{{ dict.getLabel("fpStudentsInSchool", detail.schoolStatus) }}
+                      </el-form-item>
                     </div>
-                    <ai-avatar :instance="instance" v-model="detail.photo" :editable="false" />
+                    <ai-avatar :instance="instance" v-model="detail.photo" :editable="false"/>
                   </div>
                   <el-form-item label="健康状况">
-                    <span v-for="(item, index) in detail.healthyStatusList" :key="index"><span v-if="index > 0">,</span>{{dict.getLabel("fpHealth", item)}}</span>
+                    <span v-for="(item, index) in detail.healthyStatusList" :key="index"><span v-if="index > 0">,</span>{{
+                        dict.getLabel("fpHealth", item)
+                      }}</span>
                   </el-form-item>
                   <div flex class="half wrap">
-                    <el-form-item label="残疾类别">{{dict.getLabel("fpDisabilityType", detail.disabilityType)}}</el-form-item>
-                    <el-form-item label="残疾办证年度">{{dict.getLabel("fpYear", detail.disabilityCertificateYear)}}</el-form-item>
+                    <el-form-item label="残疾类别">{{ dict.getLabel("fpDisabilityType", detail.disabilityType) }}
+                    </el-form-item>
+                    <el-form-item label="残疾办证年度">{{ dict.getLabel("fpYear", detail.disabilityCertificateYear) }}
+                    </el-form-item>
                   </div>
                   <div flex class="half wrap">
-                    <el-form-item label="城乡居民基本医疗保险">{{dict.getLabel("fpYesOrNo", detail.jcbxCxyiliao)}}</el-form-item>
-                    <el-form-item label="城镇职工基本医疗保险">{{dict.getLabel("fpYesOrNo", detail.jcbxCzyiliao)}}</el-form-item>
-                    <el-form-item label="大病保险">{{dict.getLabel("fpYesOrNo", detail.jcbxDabing)}}</el-form-item>
-                    <el-form-item label="商业补充医疗保险">{{dict.getLabel("fpYesOrNo", detail.jcbxShangye)}}</el-form-item>
-                    <el-form-item label="城乡居民基本养老保险">{{dict.getLabel("fpYesOrNo", detail.jcbxCxyanglao)}}</el-form-item>
-                    <el-form-item label="城镇职工基本养老保险">{{dict.getLabel("fpYesOrNo", detail.jcbxCzyanglao)}}</el-form-item>
-                    <el-form-item label="享受人身意外保险补贴">{{dict.getLabel("fpYesOrNo", detail.jcbxRenshenyiwai)}}</el-form-item>
-                    <el-form-item label="享受农村最低生活保障">{{dict.getLabel("fpYesOrNo", detail.bzcsNongcundibao)}}</el-form-item>
-                    <el-form-item label="是否特困供养人员">{{dict.getLabel("fpYesOrNo", detail.bzcsTekungongyang)}}</el-form-item>
-                    <el-form-item label="分散供养五保户转集中供养（减少）">{{dict.getLabel("fpYesOrNo", detail.bzcsWubaohu)}}</el-form-item>
-                    <el-form-item label="是否接受医疗救助">{{dict.getLabel("fpYesOrNo", detail.bzcsYiliaojiuzhu)}}</el-form-item>
-                    <el-form-item label="是否接受其它健康扶贫">{{dict.getLabel("fpYesOrNo", detail.bzcsQita)}}</el-form-item>
-                    <el-form-item label="劳动技能">{{dict.getLabel("fpLaborSkills", detail.labourStatus)}}</el-form-item>
-                    <el-form-item label="是否会讲普通话">{{dict.getLabel("fpYesOrNo", detail.mandarin)}}</el-form-item>
-                    <el-form-item label="务工时间(月)">{{detail.workeMonths}}</el-form-item>
-                    <el-form-item label="就业渠道">{{dict.getLabel("fpEmploymentChannels", detail.employmentChannels)}}</el-form-item>
-                    <el-form-item label="务工企业名称">{{detail.migrantEnterprises}}</el-form-item>
-                    <el-form-item label="公益性岗位">{{detail.publicWelfarePosts}}</el-form-item>
-                    <el-form-item label="是否国外务工">{{dict.getLabel("fpYesOrNo", detail.foreignWorkers)}}</el-form-item>
-                    <el-form-item label="公益性岗位(月数)">{{detail.publicWelfarePostsMonths}}</el-form-item>
+                    <el-form-item label="城乡居民基本医疗保险">{{ dict.getLabel("fpYesOrNo", detail.jcbxCxyiliao) }}
+                    </el-form-item>
+                    <el-form-item label="城镇职工基本医疗保险">{{ dict.getLabel("fpYesOrNo", detail.jcbxCzyiliao) }}
+                    </el-form-item>
+                    <el-form-item label="大病保险">{{ dict.getLabel("fpYesOrNo", detail.jcbxDabing) }}</el-form-item>
+                    <el-form-item label="商业补充医疗保险">{{ dict.getLabel("fpYesOrNo", detail.jcbxShangye) }}</el-form-item>
+                    <el-form-item label="城乡居民基本养老保险">{{ dict.getLabel("fpYesOrNo", detail.jcbxCxyanglao) }}
+                    </el-form-item>
+                    <el-form-item label="城镇职工基本养老保险">{{ dict.getLabel("fpYesOrNo", detail.jcbxCzyanglao) }}
+                    </el-form-item>
+                    <el-form-item label="享受人身意外保险补贴">{{ dict.getLabel("fpYesOrNo", detail.jcbxRenshenyiwai) }}
+                    </el-form-item>
+                    <el-form-item label="享受农村最低生活保障">{{ dict.getLabel("fpYesOrNo", detail.bzcsNongcundibao) }}
+                    </el-form-item>
+                    <el-form-item label="是否特困供养人员">{{ dict.getLabel("fpYesOrNo", detail.bzcsTekungongyang) }}
+                    </el-form-item>
+                    <el-form-item label="分散供养五保户转集中供养（减少）">{{ dict.getLabel("fpYesOrNo", detail.bzcsWubaohu) }}
+                    </el-form-item>
+                    <el-form-item label="是否接受医疗救助">{{ dict.getLabel("fpYesOrNo", detail.bzcsYiliaojiuzhu) }}
+                    </el-form-item>
+                    <el-form-item label="是否接受其它健康扶贫">{{ dict.getLabel("fpYesOrNo", detail.bzcsQita) }}</el-form-item>
+                    <el-form-item label="劳动技能">{{ dict.getLabel("fpLaborSkills", detail.labourStatus) }}</el-form-item>
+                    <el-form-item label="是否会讲普通话">{{ dict.getLabel("fpYesOrNo", detail.mandarin) }}</el-form-item>
+                    <el-form-item label="务工时间(月)">{{ detail.workeMonths }}</el-form-item>
+                    <el-form-item label="就业渠道">{{ dict.getLabel("fpEmploymentChannels", detail.employmentChannels) }}
+                    </el-form-item>
+                    <el-form-item label="务工企业名称">{{ detail.migrantEnterprises }}</el-form-item>
+                    <el-form-item label="公益性岗位">{{ detail.publicWelfarePosts }}</el-form-item>
+                    <el-form-item label="是否国外务工">{{ dict.getLabel("fpYesOrNo", detail.foreignWorkers) }}</el-form-item>
+                    <el-form-item label="公益性岗位(月数)">{{ detail.publicWelfarePostsMonths }}</el-form-item>
                   </div>
-                  <el-form-item label="务工所在地">{{detail.foreignWorkersAddress}}
+                  <el-form-item label="务工所在地">{{ detail.foreignWorkersAddress }}
                   </el-form-item>
-                  <el-form-item label="现住址">{{currentFullAddress}}</el-form-item>
+                  <el-form-item label="现住址">{{ currentFullAddress }}</el-form-item>
                 </template>
               </ai-card>
               <ai-card title="生产生活条件">
                 <template slot="content">
                   <div flex class="half wrap">
-                    <el-form-item label="住房面积(m²)">{{detail.houseArea}}</el-form-item>
-                    <el-form-item label="户类型">{{ dict.getLabel("fpHouseType", detail.houseType)}}</el-form-item>
-                    <el-form-item label="与村主干路距离(公里)">{{ detail.trunkRoadDistance}}</el-form-item>
-                    <el-form-item label="入户路类型">{{ dict.getLabel("fpHouseRoadType", detail.houseRoadType)}}</el-form-item>
-                    <el-form-item label="是否危房">{{ dict.getLabel("fpYesOrNo", detail.dilapidatedHousehold)}}</el-form-item>
-                    <el-form-item label="是否住房损耗">{{ dict.getLabel("fpYesOrNo", detail.houseDamage)}}</el-form-item>
-                    <el-form-item label="是否解决安全饮水">{{ dict.getLabel("fpYesOrNo", detail.drinkingWaterSafety)}}</el-form-item>
-                    <el-form-item label="是否饮水设施损坏">{{ dict.getLabel("fpYesOrNo", detail.drinkingWaterDamage)}}</el-form-item>
-                    <el-form-item label="是否有卫生厕所">{{ dict.getLabel("fpYesOrNo", detail.toilet)}}</el-form-item>
-                    <el-form-item label="主要燃料类型">{{ dict.getLabel("fpFuelType", detail.fuelType)}}</el-form-item>
-                    <el-form-item label="是否通生活用电">{{ dict.getLabel("fpYesOrNo", detail.electric)}}</el-form-item>
-                    <el-form-item label="是否通广播电视">{{ dict.getLabel("fpYesOrNo", detail.television)}}</el-form-item>
-                    <el-form-item label="耕地面积(亩)">{{detail.cultivatedLandArea}}</el-form-item>
-                    <el-form-item label="林地面积(亩)">{{detail.woodlandArea}}</el-form-item>
-                    <el-form-item label="林果面积(亩)">{{detail.orchardArea}}</el-form-item>
-                    <el-form-item label="退耕还林面积(亩)">{{detail.grainForGreenArea}}</el-form-item>
-                    <el-form-item label="牧草地面积(亩)">{{detail.grazingGrasslandArea}}</el-form-item>
-                    <el-form-item label="水面面积(亩)">{{detail.watersArea}}</el-form-item>
-                    <el-form-item label="是否加入农民专业合作社">{{ dict.getLabel("fpYesOrNo", detail.nongheshe)}}</el-form-item>
-                    <el-form-item label="是否有龙头企业带动">{{ dict.getLabel("fpYesOrNo", detail.longtouqiye)}}</el-form-item>
-                    <el-form-item label="是否有创业致富人带头人带动">{{ dict.getLabel("fpYesOrNo", detail.cyzfdtr)}}</el-form-item>
-                    <el-form-item label="是否通生产通电">{{ dict.getLabel("fpYesOrNo", detail.produceElectric)}}</el-form-item>
+                    <el-form-item label="住房面积(m²)">{{ detail.houseArea }}</el-form-item>
+                    <el-form-item label="户类型">{{ dict.getLabel("fpHouseType", detail.houseType) }}</el-form-item>
+                    <el-form-item label="与村主干路距离(公里)">{{ detail.trunkRoadDistance }}</el-form-item>
+                    <el-form-item label="入户路类型">{{ dict.getLabel("fpHouseRoadType", detail.houseRoadType) }}
+                    </el-form-item>
+                    <el-form-item label="是否危房">{{ dict.getLabel("fpYesOrNo", detail.dilapidatedHousehold) }}
+                    </el-form-item>
+                    <el-form-item label="是否住房损耗">{{ dict.getLabel("fpYesOrNo", detail.houseDamage) }}</el-form-item>
+                    <el-form-item label="是否解决安全饮水">{{ dict.getLabel("fpYesOrNo", detail.drinkingWaterSafety) }}
+                    </el-form-item>
+                    <el-form-item label="是否饮水设施损坏">{{ dict.getLabel("fpYesOrNo", detail.drinkingWaterDamage) }}
+                    </el-form-item>
+                    <el-form-item label="是否有卫生厕所">{{ dict.getLabel("fpYesOrNo", detail.toilet) }}</el-form-item>
+                    <el-form-item label="主要燃料类型">{{ dict.getLabel("fpFuelType", detail.fuelType) }}</el-form-item>
+                    <el-form-item label="是否通生活用电">{{ dict.getLabel("fpYesOrNo", detail.electric) }}</el-form-item>
+                    <el-form-item label="是否通广播电视">{{ dict.getLabel("fpYesOrNo", detail.television) }}</el-form-item>
+                    <el-form-item label="耕地面积(亩)">{{ detail.cultivatedLandArea }}</el-form-item>
+                    <el-form-item label="林地面积(亩)">{{ detail.woodlandArea }}</el-form-item>
+                    <el-form-item label="林果面积(亩)">{{ detail.orchardArea }}</el-form-item>
+                    <el-form-item label="退耕还林面积(亩)">{{ detail.grainForGreenArea }}</el-form-item>
+                    <el-form-item label="牧草地面积(亩)">{{ detail.grazingGrasslandArea }}</el-form-item>
+                    <el-form-item label="水面面积(亩)">{{ detail.watersArea }}</el-form-item>
+                    <el-form-item label="是否加入农民专业合作社">{{ dict.getLabel("fpYesOrNo", detail.nongheshe) }}</el-form-item>
+                    <el-form-item label="是否有龙头企业带动">{{ dict.getLabel("fpYesOrNo", detail.longtouqiye) }}</el-form-item>
+                    <el-form-item label="是否有创业致富人带头人带动">{{ dict.getLabel("fpYesOrNo", detail.cyzfdtr) }}</el-form-item>
+                    <el-form-item label="是否通生产通电">{{ dict.getLabel("fpYesOrNo", detail.produceElectric) }}
+                    </el-form-item>
                   </div>
                 </template>
               </ai-card>
               <ai-card title="家庭风险情况">
                 <template slot="content">
                   <div flex class="half wrap">
-                    <el-form-item label="监测对象类型" prop="objectType">{{ dict.getLabel("fpType", detail.objectType)}}</el-form-item>
-                    <el-form-item label="是否军烈属">{{ dict.getLabel("fpYesOrNo", detail.militaryMartyrs)}}</el-form-item>
-                    <el-form-item label="风险因素" prop="riskType">{{ dict.getLabel("fpRiskType", detail.riskType)}} </el-form-item>
-                    <el-form-item label="脱贫年度">{{ dict.getLabel("fpYear", detail.povertyYear)}} </el-form-item>
-                    <el-form-item label="因自然灾害子项">{{ dict.getLabel("fpNaturalDisaster", detail.naturalDisasterType)}}</el-form-item>
-                    <el-form-item label="是否义务阶段失学辍学">{{ dict.getLabel("fpYesOrNo", detail.dropOutOfSchool)}}</el-form-item>
-                    <el-form-item label="识别监测时间">{{ detail.createTime}}</el-form-item>
-                    <el-form-item label="风险是否已消除">{{ dict.getLabel("fpYesOrNo", detail.riskEliminated)}}</el-form-item>
-                    <el-form-item label="是否有家庭成员未参加医疗保险">{{ dict.getLabel("fpYesOrNo", detail.notCoveredMedicalInsurance)}}</el-form-item>
-                    <el-form-item label="信息采集人">{{detail.updateUserName}}</el-form-item>
-                    <el-form-item label="信息采集人联系电话">{{ detail.updateUserPhone}}</el-form-item>
+                    <el-form-item label="监测对象类型" prop="objectType">{{ dict.getLabel("fpType", detail.objectType) }}
+                    </el-form-item>
+                    <el-form-item label="是否军烈属">{{ dict.getLabel("fpYesOrNo", detail.militaryMartyrs) }}</el-form-item>
+                    <el-form-item label="风险因素" prop="riskType">{{ dict.getLabel("fpRiskType", detail.riskType) }}
+                    </el-form-item>
+                    <el-form-item label="脱贫年度">{{ dict.getLabel("fpYear", detail.povertyYear) }}</el-form-item>
+                    <el-form-item label="因自然灾害子项">{{ dict.getLabel("fpNaturalDisaster", detail.naturalDisasterType) }}
+                    </el-form-item>
+                    <el-form-item label="是否义务阶段失学辍学">{{ dict.getLabel("fpYesOrNo", detail.dropOutOfSchool) }}
+                    </el-form-item>
+                    <el-form-item label="识别监测时间">{{ detail.createTime }}</el-form-item>
+                    <el-form-item label="风险是否已消除">{{ dict.getLabel("fpYesOrNo", detail.riskEliminated) }}</el-form-item>
+                    <el-form-item label="是否有家庭成员未参加医疗保险">
+                      {{ dict.getLabel("fpYesOrNo", detail.notCoveredMedicalInsurance) }}
+                    </el-form-item>
+                    <el-form-item label="信息采集人">{{ detail.updateUserName }}</el-form-item>
+                    <el-form-item label="信息采集人联系电话">{{ detail.updateUserPhone }}</el-form-item>
                   </div>
-                  <el-form-item label="义务阶段未上学原因">{{detail.dropOutOfSchoolReason}}</el-form-item>
+                  <el-form-item label="义务阶段未上学原因">{{ detail.dropOutOfSchoolReason }}</el-form-item>
                   <!-- <el-form-item label="备注说明">{{detail.detail}}</el-form-item>
                   <el-form-item label="图片">
                     <ai-uploader disabled v-model="detail.files"></ai-uploader>
@@ -129,45 +164,46 @@
               <ai-card title="家庭收支情况">
                 <template slot="content">
                   <div flex class="half wrap">
-                    <el-form-item label="纳入监测对象的收入参考范围">{{detail.income1}}</el-form-item>
-                    <el-form-item label="纳入监测对象的人均收入参考范围">{{detail.income2}}</el-form-item>
-                    <el-form-item label="工资性收入(元)">{{detail.income3}}</el-form-item>
-                    <el-form-item label="生产经营性收入(元)">{{detail.income4}}</el-form-item>
-                    <el-form-item label="计划生育金(元)">{{detail.income5}}</el-form-item>
-                    <el-form-item label="资产收益扶贫分红收入">{{detail.income6}}</el-form-item>
-                    <el-form-item label="低保金(元)">{{detail.income7}}</el-form-item>
-                    <el-form-item label="特困供养金(元)">{{detail.income8}}</el-form-item>
-                    <el-form-item label="养老保险金(元)">{{detail.income9}}</el-form-item>
-                    <el-form-item label="生态补偿金(元)">{{detail.income10}}</el-form-item>
-                    <el-form-item label="转移性收入(元)">{{detail.income11}}</el-form-item>
-                    <el-form-item label="其它转移性收入(元)">{{detail.income12}}</el-form-item>
-                    <el-form-item label="财产性收入(元)">{{detail.income13}}</el-form-item>
-                    <el-form-item label="其它财产收入(元)">{{detail.income14}}</el-form-item>
-                    <el-form-item label="生产经营性支出(元)">{{detail.income15}}</el-form-item>
-                    <el-form-item label="年收入(元)">{{detail.income16}}</el-form-item>
-                    <el-form-item label="家庭纯收入(元)">{{detail.familyIncome}}</el-form-item>
-                    <el-form-item label="人均纯收入(元)">{{detail.perCapitaIncome}}</el-form-item>
+                    <el-form-item label="纳入监测对象的收入参考范围">{{ detail.income1 }}</el-form-item>
+                    <el-form-item label="纳入监测对象的人均收入参考范围">{{ detail.income2 }}</el-form-item>
+                    <el-form-item label="工资性收入(元)">{{ detail.income3 }}</el-form-item>
+                    <el-form-item label="生产经营性收入(元)">{{ detail.income4 }}</el-form-item>
+                    <el-form-item label="计划生育金(元)">{{ detail.income5 }}</el-form-item>
+                    <el-form-item label="资产收益扶贫分红收入">{{ detail.income6 }}</el-form-item>
+                    <el-form-item label="低保金(元)">{{ detail.income7 }}</el-form-item>
+                    <el-form-item label="特困供养金(元)">{{ detail.income8 }}</el-form-item>
+                    <el-form-item label="养老保险金(元)">{{ detail.income9 }}</el-form-item>
+                    <el-form-item label="生态补偿金(元)">{{ detail.income10 }}</el-form-item>
+                    <el-form-item label="转移性收入(元)">{{ detail.income11 }}</el-form-item>
+                    <el-form-item label="其它转移性收入(元)">{{ detail.income12 }}</el-form-item>
+                    <el-form-item label="财产性收入(元)">{{ detail.income13 }}</el-form-item>
+                    <el-form-item label="其它财产收入(元)">{{ detail.income14 }}</el-form-item>
+                    <el-form-item label="生产经营性支出(元)">{{ detail.income15 }}</el-form-item>
+                    <el-form-item label="年收入(元)">{{ detail.income16 }}</el-form-item>
+                    <el-form-item label="家庭纯收入(元)">{{ detail.familyIncome }}</el-form-item>
+                    <el-form-item label="人均纯收入(元)">{{ detail.perCapitaIncome }}</el-form-item>
                   </div>
                 </template>
               </ai-card>
               <ai-card title="风险消除情况" v-if="detail.status == 3">
                 <template slot="content">
                   <div flex class="half wrap">
-                    <el-form-item label="工资性收入情况">{{detail.fxxcIncome1}}</el-form-item>
-                    <el-form-item label="生产经营性收入情况">{{detail.fxxcIncome2}}</el-form-item>
-                    <el-form-item label="财产性收入情况">{{detail.fxxcIncome3}}</el-form-item>
-                    <el-form-item label="转移性收入情况">{{detail.fxxcIncome4}}</el-form-item>
-                    <el-form-item label="理赔收入情况">{{detail.fxxcIncome5}}</el-form-item>
-                    <el-form-item label="生产经营性支出情况">{{detail.fxxcIncome6}}</el-form-item>
-                    <el-form-item label="合规自然收支情况">{{detail.fxxcIncome7}}</el-form-item>
-                    <el-form-item label="家庭纯收入情况">{{detail.fxxcIncome8}}</el-form-item>
-                    <el-form-item label="家庭人均纯收入情况">{{detail.fxxcIncome9}}</el-form-item>
+                    <el-form-item label="工资性收入情况">{{ detail.fxxcIncome1 }}</el-form-item>
+                    <el-form-item label="生产经营性收入情况">{{ detail.fxxcIncome2 }}</el-form-item>
+                    <el-form-item label="财产性收入情况">{{ detail.fxxcIncome3 }}</el-form-item>
+                    <el-form-item label="转移性收入情况">{{ detail.fxxcIncome4 }}</el-form-item>
+                    <el-form-item label="理赔收入情况">{{ detail.fxxcIncome5 }}</el-form-item>
+                    <el-form-item label="生产经营性支出情况">{{ detail.fxxcIncome6 }}</el-form-item>
+                    <el-form-item label="合规自然收支情况">{{ detail.fxxcIncome7 }}</el-form-item>
+                    <el-form-item label="家庭纯收入情况">{{ detail.fxxcIncome8 }}</el-form-item>
+                    <el-form-item label="家庭人均纯收入情况">{{ detail.fxxcIncome9 }}</el-form-item>
                   </div>
                 </template>
               </ai-card>
               <ai-card title="家庭成员">
                 <template #right>
-                  <span style=" color: #2266ff; margin-left: 16px;cursor: pointer;font-size: 12px;" @click="addFamily({})">添加</span>
+                  <span style=" color: #2266ff; margin-left: 16px;cursor: pointer;font-size: 12px;"
+                        @click="addFamily({})">添加</span>
                 </template>
                 <template #content>
                   <ai-table :tableData="detail.family" :colConfigs="colConfigs" :dict="dict" :isShowPagination="false">
@@ -183,116 +219,133 @@
               </ai-card>
               <div style="height:20px;"></div>
             </el-tab-pane>
-            <el-tab-pane label="走访日志" lazy name="HrLog" v-if="$permissions('app_apppreventionreturntopovertylog_detail')">
-              <hr-log v-if="currentTab == 'HrLog'" :instance="instance" :dict="dict" :permissions="permissions" />
+            <el-tab-pane label="走访日志" lazy name="HrLog"
+                         v-if="$permissions('app_apppreventionreturntopovertylog_detail')">
+              <hr-log v-if="currentTab == 'HrLog'" :instance="instance" :dict="dict" :permissions="permissions"/>
             </el-tab-pane>
             <el-tab-pane label="帮扶措施" lazy name="HrMeasure">
-              <hr-measure v-if="currentTab == 'HrMeasure'" :instance="instance" :dict="dict" :permissions="permissions" />
+              <hr-measure v-if="currentTab == 'HrMeasure'" :instance="instance" :dict="dict"
+                          :permissions="permissions"/>
             </el-tab-pane>
           </el-tabs>
         </el-form>
-        <ai-dialog :visible.sync="isShowAdd" width="1000px" height="500px" title="添加家庭成员" @close="onClose" @onConfirm="onConfirm">
+        <ai-dialog :visible.sync="isShowAdd" width="1000px" height="500px" title="添加家庭成员" @close="onClose"
+                   @onConfirm="onConfirm">
           <el-form :model="form" ref="ruleForm" :rules="rules" label-width="130px" label-position="right" size="small">
             <div flex class="half wrap">
               <div flex class="column">
                 <el-form-item label="成员姓名" prop="name">
-                  <el-input size="small" class="user-selecter" v-model="form.name" placeholder="请输入姓名" clearable :disabled="isEdit || isSelectUser">
+                  <el-input size="small" class="user-selecter" v-model="form.name" placeholder="请输入姓名" clearable
+                            :disabled="isEdit || isSelectUser">
                     <template slot="append">
-                      <ai-person-select :instance="instance" @selectPerson="checkName" :url="'/app/appresident/list?auditStatus=1&areaId='+user.info.areaId"></ai-person-select>
+                      <ai-person-select :instance="instance" @selectPerson="checkName"
+                                        :url="'/app/appresident/list?auditStatus=1&areaId='+user.info.areaId"></ai-person-select>
                     </template>
                   </el-input>
                 </el-form-item>
                 <el-form-item label="联系方式" prop="phone">
-                  <el-input v-model="form.phone" placeholder="请输入联系方式" :maxlength="11" show-word-limit />
+                  <el-input v-model="form.phone" placeholder="请输入联系方式" :maxlength="11" show-word-limit/>
                 </el-form-item>
                 <el-form-item label="证件号码" prop="idNumber">
-                  <el-input v-model="form.idNumber" placeholder="请输入证件号码" :maxlength="18" :disabled="isEdit || isSelectUser" @change="handleIdNumberAutocomplete" />
+                  <el-input v-model="form.idNumber" placeholder="请输入证件号码" :maxlength="18"
+                            :disabled="isEdit || isSelectUser" @change="handleIdNumberAutocomplete"/>
                 </el-form-item>
               </div>
               <el-form-item label="个人照片" prop="photo">
-                <ai-avatar :instance="instance" v-model="form.photo" />
+                <ai-avatar :instance="instance" v-model="form.photo"/>
               </el-form-item>
               <el-form-item label="性别" prop="sex">
-                <ai-select v-model="form.sex" :selectList="dict.getDict('sex')" disabled />
+                <ai-select v-model="form.sex" :selectList="dict.getDict('sex')" disabled/>
               </el-form-item>
               <el-form-item label="出生日期" prop="birthDate">
-                <el-date-picker disabled value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" v-model="form.birthDate" type="date" placeholder="选择日期" />
+                <el-date-picker disabled value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" v-model="form.birthDate"
+                                type="date" placeholder="选择日期"/>
               </el-form-item>
               <el-form-item label="与户主关系" prop="householdRelation">
-                <ai-select v-model="form.householdRelation" :selectList="dict.getDict('fpRelationship')" />
+                <ai-select v-model="form.householdRelation" :selectList="dict.getDict('fpRelationship')"/>
               </el-form-item>
               <!-- <el-form-item label="年龄" prop="age">
                 <el-input disabled v-model="form.age" placeholder="请输入年龄" type="number"/>
               </el-form-item> -->
               <el-form-item label="民族">
-                <ai-select v-model="form.nation" :selectList="dict.getDict('fpNation')" />
+                <ai-select v-model="form.nation" :selectList="dict.getDict('fpNation')"/>
               </el-form-item>
               <el-form-item label="文化程度">
-                <ai-select v-model="form.education" :selectList="dict.getDict('fpEducation')" />
+                <ai-select v-model="form.education" :selectList="dict.getDict('fpEducation')"/>
               </el-form-item>
               <el-form-item label="政治面貌">
-                <ai-select v-model="form.politicsStatus" :selectList="dict.getDict('fpPoliticalOutlook')" />
+                <ai-select v-model="form.politicsStatus" :selectList="dict.getDict('fpPoliticalOutlook')"/>
               </el-form-item>
               <el-form-item label="在校生状况">
-                <ai-select v-model="form.schoolStatus" :selectList="dict.getDict('fpStudentsInSchool')" />
+                <ai-select v-model="form.schoolStatus" :selectList="dict.getDict('fpStudentsInSchool')"/>
               </el-form-item>
             </div>
             <el-form-item label="健康状况">
               <el-checkbox-group v-model="form.healthyStatusList">
-                <el-checkbox :label="item.dictValue" v-for="(item, index) in dict.getDict('fpHealth')" :key="index">{{item.dictName}}</el-checkbox>
+                <el-checkbox :label="item.dictValue" v-for="(item, index) in dict.getDict('fpHealth')" :key="index">
+                  {{ item.dictName }}
+                </el-checkbox>
               </el-checkbox-group>
             </el-form-item>
             <div flex class="half wrap">
               <el-form-item label="残疾类别">
-                <ai-select v-model="form.disabilityType" :selectList="dict.getDict('fpDisabilityType')" placeholder="请选择" />
+                <ai-select v-model="form.disabilityType" :selectList="dict.getDict('fpDisabilityType')"
+                           placeholder="请选择"/>
               </el-form-item>
               <el-form-item label="残疾办证年度">
-                <el-date-picker v-model="form.disabilityCertificateYear" type="year" placeholder="请选择" />
+                <el-date-picker v-model="form.disabilityCertificateYear" type="year" placeholder="请选择"/>
               </el-form-item>
             </div>
             <el-form-item label="基础保险">
               <el-checkbox-group v-model="form.basicsList">
-                <el-checkbox :label="item.value" v-for="(item, index) in basicsCheckList" :key="index">{{item.label}}</el-checkbox>
+                <el-checkbox :label="item.value" v-for="(item, index) in basicsCheckList" :key="index">
+                  {{ item.label }}
+                </el-checkbox>
               </el-checkbox-group>
             </el-form-item>
             <el-form-item label="保障措施">
               <el-checkbox-group v-model="form.guaranteeList">
-                <el-checkbox :label="item.value" v-for="(item, index) in guaranteeCheckList" :key="index">{{item.label}}</el-checkbox>
+                <el-checkbox :label="item.value" v-for="(item, index) in guaranteeCheckList" :key="index">
+                  {{ item.label }}
+                </el-checkbox>
               </el-checkbox-group>
             </el-form-item>
             <div flex class="half wrap">
               <el-form-item label="劳动技能">
-                <ai-select v-model="form.labourStatus" :selectList="dict.getDict('fpLaborSkills')" />
+                <ai-select v-model="form.labourStatus" :selectList="dict.getDict('fpLaborSkills')"/>
               </el-form-item>
               <el-form-item label="是否会讲普通话">
-                <ai-select v-model="form.mandarin" :selectList="dict.getDict('fpYesOrNo')" placeholder="请选择" />
+                <ai-select v-model="form.mandarin" :selectList="dict.getDict('fpYesOrNo')" placeholder="请选择"/>
               </el-form-item>
               <el-form-item label="务工时间(月)">
-                <el-input type="number" v-model="form.workeMonths" placeholder="请输入" clearable @input="numberInput('workeMonths')" />
+                <el-input type="number" v-model="form.workeMonths" placeholder="请输入" clearable
+                          @input="numberInput('workeMonths')"/>
               </el-form-item>
               <el-form-item label="就业渠道">
-                <ai-select v-model="form.employmentChannels" :selectList="dict.getDict('fpEmploymentChannels')" />
+                <ai-select v-model="form.employmentChannels" :selectList="dict.getDict('fpEmploymentChannels')"/>
               </el-form-item>
               <el-form-item label="务工企业名称">
-                <el-input v-model="form.migrantEnterprises" placeholder="请输入" clearable />
+                <el-input v-model="form.migrantEnterprises" placeholder="请输入" clearable/>
               </el-form-item>
               <el-form-item label="公益性岗位">
-                <el-input v-model="form.publicWelfarePosts" placeholder="请输入" clearable />
+                <el-input v-model="form.publicWelfarePosts" placeholder="请输入" clearable/>
               </el-form-item>
               <el-form-item label="是否国外务工">
-                <ai-select v-model="form.foreignWorkers" :selectList="dict.getDict('fpYesOrNo')" placeholder="请选择" />
+                <ai-select v-model="form.foreignWorkers" :selectList="dict.getDict('fpYesOrNo')" placeholder="请选择"/>
               </el-form-item>
               <el-form-item label="公益性岗位(月数)">
-                <el-input type="number" v-model="form.publicWelfarePostsMonths" placeholder="请输入" clearable @input="numberInput('publicWelfarePostsMonths')" />
+                <el-input type="number" v-model="form.publicWelfarePostsMonths" placeholder="请输入" clearable
+                          @input="numberInput('publicWelfarePostsMonths')"/>
               </el-form-item>
             </div>
             <el-form-item label="务工所在地">
-              <el-input v-model="form.foreignWorkersAddress" placeholder="请输入" clearable maxlength="30" show-word-limit />
+              <el-input v-model="form.foreignWorkersAddress" placeholder="请输入" clearable maxlength="30"
+                        show-word-limit/>
             </el-form-item>
             <el-form-item label="现住址" prop="currentAreaId">
-              <ai-area-get :instance="instance" v-model="form.currentAreaId" :root="rootArea" valueLevel="5" />
+              <ai-area-get :instance="instance" v-model="form.currentAreaId" :root="rootArea" valueLevel="5"/>
               <el-form-item prop="currentAddress">
-                <el-input v-model="form.currentAddress" placeholder="详细地址" maxlength="30" show-word-limit clearable />
+                <el-input v-model="form.currentAddress" placeholder="详细地址" maxlength="30" show-word-limit clearable/>
               </el-form-item>
             </el-form-item>
           </el-form>
@@ -301,66 +354,72 @@
           <el-form :model="familyInfo" label-width="160px" label-position="right" size="small">
             <div flex class="flex-start">
               <div flex class="half wrap fill">
-                <el-form-item label="联系电话">{{ familyInfo.phone}}</el-form-item>
-                <el-form-item label="证件号">{{ familyInfo.idNumber}}</el-form-item>
-                <el-form-item label="性别" prop="sex">{{ dict.getLabel("sex", familyInfo.sex)}}</el-form-item>
-                <el-form-item label="出生日期">{{ familyInfo.birthDate}}</el-form-item>
-                <el-form-item label="与户主关系">{{dict.getLabel("fpRelationship", familyInfo.householdRelation)}}</el-form-item>
+                <el-form-item label="联系电话">{{ familyInfo.phone }}</el-form-item>
+                <el-form-item label="证件号">{{ familyInfo.idNumber }}</el-form-item>
+                <el-form-item label="性别" prop="sex">{{ dict.getLabel("sex", familyInfo.sex) }}</el-form-item>
+                <el-form-item label="出生日期">{{ familyInfo.birthDate }}</el-form-item>
+                <el-form-item label="与户主关系">{{ dict.getLabel("fpRelationship", familyInfo.householdRelation) }}
+                </el-form-item>
                 <!-- <el-form-item label="年龄" prop="age">{{ familyInfo.age}}</el-form-item> -->
-                <el-form-item label="民族">{{dict.getLabel("fpNation", familyInfo.nation)}}</el-form-item>
-                <el-form-item label="文化程度">{{ dict.getLabel("fpEducation", familyInfo.education)}}</el-form-item>
-                <el-form-item label="政治面貌">{{dict.getLabel("fpPoliticalOutlook",familyInfo.politicsStatus)}}</el-form-item>
-                <el-form-item label="在校生状况">{{dict.getLabel( "fpStudentsInSchool", familyInfo.schoolStatus)}}</el-form-item>
+                <el-form-item label="民族">{{ dict.getLabel("fpNation", familyInfo.nation) }}</el-form-item>
+                <el-form-item label="文化程度">{{ dict.getLabel("fpEducation", familyInfo.education) }}</el-form-item>
+                <el-form-item label="政治面貌">{{ dict.getLabel("fpPoliticalOutlook", familyInfo.politicsStatus) }}
+                </el-form-item>
+                <el-form-item label="在校生状况">{{ dict.getLabel("fpStudentsInSchool", familyInfo.schoolStatus) }}
+                </el-form-item>
               </div>
-              <ai-avatar :instance="instance" v-model="familyInfo.photo" :editable="false" />
+              <ai-avatar :instance="instance" v-model="familyInfo.photo" :editable="false"/>
             </div>
             <el-form-item label="健康状况">
-              <span v-for="(item, index) in familyInfo.healthyStatusList" :key="index"><span v-if="index > 0">,</span>{{dict.getLabel("fpHealth", item)}}</span>
+              <span v-for="(item, index) in familyInfo.healthyStatusList" :key="index"><span
+                  v-if="index > 0">,</span>{{ dict.getLabel("fpHealth", item) }}</span>
             </el-form-item>
             <div flex class="half wrap">
-              <el-form-item label="残疾类别">{{dict.getLabel("fpDisabilityType", familyInfo.disabilityType)}}</el-form-item>
-              <el-form-item label="残疾办证年度">{{familyInfo.disabilityCertificateYear}}</el-form-item>
+              <el-form-item label="残疾类别">{{ dict.getLabel("fpDisabilityType", familyInfo.disabilityType) }}</el-form-item>
+              <el-form-item label="残疾办证年度">{{ dict.getLabel("fpYear", familyInfo.disabilityCertificateYear) }}</el-form-item>
             </div>
             <div flex class="half wrap">
-              <el-form-item label="城乡居民基本医疗保险">{{dict.getLabel("fpYesOrNo", familyInfo.jcbxCxyiliao)}}</el-form-item>
-              <el-form-item label="城镇职工基本医疗保险">{{dict.getLabel("fpYesOrNo", familyInfo.jcbxCzyiliao)}}</el-form-item>
-              <el-form-item label="大病保险">{{dict.getLabel("fpYesOrNo", familyInfo.jcbxDabing)}}</el-form-item>
-              <el-form-item label="商业补充医疗保险">{{dict.getLabel("fpYesOrNo", familyInfo.jcbxShangye)}}</el-form-item>
-              <el-form-item label="城乡居民基本养老保险">{{dict.getLabel("fpYesOrNo", familyInfo.jcbxCxyanglao)}}</el-form-item>
-              <el-form-item label="城镇职工基本养老保险">{{dict.getLabel("fpYesOrNo", familyInfo.jcbxCzyanglao)}}</el-form-item>
-              <el-form-item label="享受人身意外保险补贴">{{dict.getLabel("fpYesOrNo", familyInfo.jcbxRenshenyiwai)}}</el-form-item>
-              <el-form-item label="享受农村最低生活保障">{{dict.getLabel("fpYesOrNo", familyInfo.bzcsNongcundibao)}}</el-form-item>
-              <el-form-item label="是否特困供养人员">{{dict.getLabel("fpYesOrNo", familyInfo.bzcsTekungongyang)}}</el-form-item>
-              <el-form-item label="分散供养五保户转集中供养（减少）">{{dict.getLabel("fpYesOrNo", familyInfo.bzcsWubaohu)}}</el-form-item>
-              <el-form-item label="是否接受医疗救助">{{dict.getLabel("fpYesOrNo", familyInfo.bzcsYiliaojiuzhu)}}</el-form-item>
-              <el-form-item label="是否接受其它健康扶贫">{{dict.getLabel("fpYesOrNo", familyInfo.bzcsQita)}}</el-form-item>
-              <el-form-item label="劳动技能">{{dict.getLabel("fpLaborSkills", familyInfo.labourStatus)}}</el-form-item>
-              <el-form-item label="是否会讲普通话">{{dict.getLabel("fpYesOrNo", familyInfo.mandarin)}}</el-form-item>
-              <el-form-item label="务工时间(月)">{{familyInfo.workeMonths}}</el-form-item>
-              <el-form-item label="就业渠道">{{dict.getLabel("fpEmploymentChannels", familyInfo.employmentChannels)}}</el-form-item>
-              <el-form-item label="务工企业名称">{{familyInfo.migrantEnterprises}}</el-form-item>
-              <el-form-item label="公益性岗位">{{familyInfo.publicWelfarePosts}}</el-form-item>
-              <el-form-item label="是否国外务工">{{dict.getLabel("fpYesOrNo", familyInfo.foreignWorkers)}}</el-form-item>
-              <el-form-item label="公益性岗位(月数)">{{familyInfo.publicWelfarePostsMonths}}</el-form-item>
+              <el-form-item label="城乡居民基本医疗保险">{{ dict.getLabel("fpYesOrNo", familyInfo.jcbxCxyiliao) }}</el-form-item>
+              <el-form-item label="城镇职工基本医疗保险">{{ dict.getLabel("fpYesOrNo", familyInfo.jcbxCzyiliao) }}</el-form-item>
+              <el-form-item label="大病保险">{{ dict.getLabel("fpYesOrNo", familyInfo.jcbxDabing) }}</el-form-item>
+              <el-form-item label="商业补充医疗保险">{{ dict.getLabel("fpYesOrNo", familyInfo.jcbxShangye) }}</el-form-item>
+              <el-form-item label="城乡居民基本养老保险">{{ dict.getLabel("fpYesOrNo", familyInfo.jcbxCxyanglao) }}</el-form-item>
+              <el-form-item label="城镇职工基本养老保险">{{ dict.getLabel("fpYesOrNo", familyInfo.jcbxCzyanglao) }}</el-form-item>
+              <el-form-item label="享受人身意外保险补贴">{{ dict.getLabel("fpYesOrNo", familyInfo.jcbxRenshenyiwai) }}</el-form-item>
+              <el-form-item label="享受农村最低生活保障">{{ dict.getLabel("fpYesOrNo", familyInfo.bzcsNongcundibao) }}</el-form-item>
+              <el-form-item label="是否特困供养人员">{{ dict.getLabel("fpYesOrNo", familyInfo.bzcsTekungongyang) }}</el-form-item>
+              <el-form-item label="分散供养五保户转集中供养（减少）">{{ dict.getLabel("fpYesOrNo", familyInfo.bzcsWubaohu) }}</el-form-item>
+              <el-form-item label="是否接受医疗救助">{{ dict.getLabel("fpYesOrNo", familyInfo.bzcsYiliaojiuzhu) }}</el-form-item>
+              <el-form-item label="是否接受其它健康扶贫">{{ dict.getLabel("fpYesOrNo", familyInfo.bzcsQita) }}</el-form-item>
+              <el-form-item label="劳动技能">{{ dict.getLabel("fpLaborSkills", familyInfo.labourStatus) }}</el-form-item>
+              <el-form-item label="是否会讲普通话">{{ dict.getLabel("fpYesOrNo", familyInfo.mandarin) }}</el-form-item>
+              <el-form-item label="务工时间(月)">{{ familyInfo.workeMonths }}</el-form-item>
+              <el-form-item label="就业渠道">{{ dict.getLabel("fpEmploymentChannels", familyInfo.employmentChannels) }}</el-form-item>
+              <el-form-item label="务工企业名称">{{ familyInfo.migrantEnterprises }}</el-form-item>
+              <el-form-item label="公益性岗位">{{ familyInfo.publicWelfarePosts }}</el-form-item>
+              <el-form-item label="是否国外务工">{{ dict.getLabel("fpYesOrNo", familyInfo.foreignWorkers) }}</el-form-item>
+              <el-form-item label="公益性岗位(月数)">{{ familyInfo.publicWelfarePostsMonths }}</el-form-item>
             </div>
-            <el-form-item label="务工所在地">{{familyInfo.foreignWorkersAddress}}
-            </el-form-item>
-            <el-form-item label="现住址">{{currentFullAddressFamily}}</el-form-item>
+            <el-form-item label="务工所在地">{{ familyInfo.foreignWorkersAddress }}</el-form-item>
+            <el-form-item label="现住址">{{ currentFullAddressFamily }}</el-form-item>
           </el-form>
           <template slot="footer">
             <el-button @click="isShowDetail=false">关闭</el-button>
           </template>
         </ai-dialog>
-        <ai-dialog :visible.sync="isShowApply" :title="dialogTitle" @closed="applyInfo={},applyFileList=[]" @onConfirm="submitApply" width="600px">
+        <ai-dialog :visible.sync="isShowApply" :title="dialogTitle" @closed="applyInfo={},applyFileList=[]"
+                   @onConfirm="submitApply" width="600px">
           <el-form :model="applyInfo" :rules="rulesApply" ref="dialogApplyInfo" size="small" label-width="120px">
             <el-form-item label="风险因素" prop="riskType" v-if="changeStatus == 0 || changeStatus == 1">
-              <ai-select v-model="applyInfo.riskType" :selectList="dict.getDict('fpRiskType')" />
+              <ai-select v-model="applyInfo.riskType" :selectList="dict.getDict('fpRiskType')"/>
             </el-form-item>
             <el-form-item label="风险消除方式" prop="riskEliminationMethod" v-if="changeStatus == 3 || changeStatus == 4">
-              <ai-select v-model="applyInfo.riskEliminationMethod" :selectList="dict.getDict('fpRiskEliminationMethod')" />
+              <ai-select v-model="applyInfo.riskEliminationMethod"
+                         :selectList="dict.getDict('fpRiskEliminationMethod')"/>
             </el-form-item>
             <el-form-item label="备注说明">
-              <el-input type="textarea" v-model="applyInfo.opinion" placeholder="请输入" maxlength="500" show-word-limit rows="5" />
+              <el-input type="textarea" v-model="applyInfo.opinion" placeholder="请输入" maxlength="500" show-word-limit
+                        rows="5"/>
             </el-form-item>
             <el-form-item label="图片">
               <ai-uploader v-model="applyFileList" :instance="instance" acceptType=".jpg,.jpeg,.png">
@@ -379,16 +438,18 @@
           </el-steps>
           <div class="info" v-if="examineStep == 1">
             <ai-wrapper label-width="120px" :columnsNumber="2" style="margin-top: 16px;">
-              <ai-info-item label="操作类型" :value="changeStatus == 2 ? '申请纳入监测' : '申请解除风险' " />
-              <ai-info-item label="风险因素" :value="dict.getLabel('fpRiskType', examineInfo.bizDictValue)" v-if="changeStatus == 2" />
-              <ai-info-item label="风险消除方式" :value="dict.getLabel('fpRiskEliminationMethod', examineInfo.bizDictValue)" v-if="changeStatus == 5" />
-              <ai-info-item label="申请人" :value="examineInfo.operationUserName" />
-              <ai-info-item label="申请时间" :value="examineInfo.createTime" />
+              <ai-info-item label="操作类型" :value="changeStatus == 2 ? '申请纳入监测' : '申请解除风险' "/>
+              <ai-info-item label="风险因素" :value="dict.getLabel('fpRiskType', examineInfo.bizDictValue)"
+                            v-if="changeStatus == 2"/>
+              <ai-info-item label="风险消除方式" :value="dict.getLabel('fpRiskEliminationMethod', examineInfo.bizDictValue)"
+                            v-if="changeStatus == 5"/>
+              <ai-info-item label="申请人" :value="examineInfo.operationUserName"/>
+              <ai-info-item label="申请时间" :value="examineInfo.createTime"/>
             </ai-wrapper>
             <ai-wrapper label-width="120px" :columnsNumber="1">
-              <ai-info-item label="备注说明" :value="examineInfo.detail" />
+              <ai-info-item label="备注说明" :value="examineInfo.detail"/>
             </ai-wrapper>
-            <ai-uploader v-model="examineInfo.files" disabled style="padding-left:150px;" />
+            <ai-uploader v-model="examineInfo.files" disabled style="padding-left:150px;"/>
           </div>
           <div class="form" v-if="examineStep == 2">
             <el-form :model="examineFrom" size="small" label-width="80px">
@@ -400,7 +461,8 @@
                 </el-radio-group>
               </el-form-item>
               <el-form-item label="备注说明">
-                <el-input type="textarea" v-model="examineFrom.opinion" placeholder="请输入" maxlength="500" show-word-limit rows="5" />
+                <el-input type="textarea" v-model="examineFrom.opinion" placeholder="请输入" maxlength="500"
+                          show-word-limit rows="5"/>
               </el-form-item>
               <el-form-item label="图片">
                 <ai-uploader v-model="examineFileList" :instance="instance" acceptType=".jpg,.jpeg,.png">
@@ -416,7 +478,7 @@
             <p>审核成功</p>
           </div>
           <template slot="footer" v-if="examineStep != 3">
-            <el-button @click="cancelExamine">{{examineStep == 2 ? '上一步' : '取消'}}</el-button>
+            <el-button @click="cancelExamine">{{ examineStep == 2 ? '上一步' : '取消' }}</el-button>
             <el-button type="primary" @click="examineNext">下一步</el-button>
           </template>
           <template slot="footer" v-if="examineStep == 3">
@@ -429,13 +491,13 @@
 </template>
 
 <script>
-import { mapState } from "vuex";
+import {mapState} from "vuex";
 import HrMeasure from "./detail/hrMeasure";
 import HrLog from "./detail/hrLog";
 
 export default {
   name: "hrDetail",
-  components: { HrLog, HrMeasure },
+  components: {HrLog, HrMeasure},
   props: {
     instance: Function,
     dict: Object,
@@ -450,47 +512,47 @@ export default {
           prop: "householdRelation",
           dict: "fpRelationship",
         },
-        { label: "姓名", prop: "name" },
-        { label: "性别", prop: "sex", dict: "sex" },
-        { label: "年龄", prop: "age" },
+        {label: "姓名", prop: "name"},
+        {label: "性别", prop: "sex", dict: "sex"},
+        {label: "年龄", prop: "age"},
         {
           label: "证件号",
-          render: (h, { row }) =>
-            h("p", null, this.idCardNoUtil.hideId(row.idNumber)),
+          render: (h, {row}) =>
+              h("p", null, this.idCardNoUtil.hideId(row.idNumber)),
         },
-        { slot: "options" },
+        {slot: "options"},
       ];
     },
     isGridAdmin() {
       return this.user.info.girdCheckType == 2;
     },
     currentFullAddress() {
-      let { countyName, townName, villageName, currentAddress } = this.detail;
+      let {countyName, townName, villageName, currentAddress} = this.detail;
       return [countyName, townName, villageName, currentAddress].join("");
     },
     currentFullAddressFamily() {
-      let { countyName, townName, villageName, currentAddress } = this.familyInfo;
+      let {countyName, townName, villageName, currentAddress} = this.familyInfo;
       return [countyName, townName, villageName, currentAddress].join("");
     },
     rules() {
       return {
-        idNumber: [{ required: true, message: "请输入证件号" }],
-        name: [{ required: true, message: "请输入姓名" }],
-        sex: [{ required: true, message: "请选择性别" }],
-        phone: [{ required: true, message: "请输入联系方式" }],
+        idNumber: [{required: true, message: "请输入证件号"}],
+        name: [{required: true, message: "请输入姓名"}],
+        sex: [{required: true, message: "请选择性别"}],
+        phone: [{required: true, message: "请输入联系方式"}],
         currentAreaId: [
-          { required: true, message: "请选择现住址" },
-          { pattern: /[^0]0{0,2}$/, message: "请选择到村/社区" },
+          {required: true, message: "请选择现住址"},
+          {pattern: /[^0]0{0,2}$/, message: "请选择到村/社区"},
         ],
-        isHousehold: [{ required: true, message: "请选择是否户主" }],
-        householdRelation: [{ required: true, message: "请选择与户主关系" }],
-        householdIdNumber: [{ required: true, message: "请选择户主证件号" }],
+        isHousehold: [{required: true, message: "请选择是否户主"}],
+        householdRelation: [{required: true, message: "请选择与户主关系"}],
+        householdIdNumber: [{required: true, message: "请选择户主证件号"}],
       };
     },
     rulesApply() {
       return {
-        riskType: [{ required: true, message: "请选择风险因素" }],
-        riskEliminationMethod: [{ required: true, message: "请选择风险消除方式" }],
+        riskType: [{required: true, message: "请选择风险因素"}],
+        riskEliminationMethod: [{required: true, message: "请选择风险消除方式"}],
       };
     },
     rootArea() {
@@ -522,7 +584,7 @@ export default {
       detail: {},
       currentTab: "",
       isShowAdd: false,
-      form: { healthyStatusList: [], basicsList: [], guaranteeList: [] },
+      form: {healthyStatusList: [], basicsList: [], guaranteeList: []},
       isEdit: false,
       isShowDetail: false,
       familyInfo: {},
@@ -533,7 +595,7 @@ export default {
       isShowExamine: false,
       examineInfo: {},
       examineStep: 1, //审批步骤
-      examineFrom: { pass: 1 },
+      examineFrom: {pass: 1},
       applyFileList: [],
       examineFileList: [],
       changeStatus: 0,  //操作状态 0:申请纳入监测 1:纳入监测 2:纳入监测审批 3:申请解除风险 4:解除风险 5:解除风险审批
@@ -579,7 +641,7 @@ export default {
       if (row && row.guaranteeCheck) {
         row.guaranteeList = row.guaranteeCheck.split(',')
       }
-      this.form = { ...row }
+      this.form = {...row}
       this.isShowAdd = true
     },
     viewFamily(row) {
@@ -595,7 +657,7 @@ export default {
       if (row.guaranteeCheck) {
         row.guaranteeList = row.guaranteeCheck.split(',')
       }
-      this.familyInfo = { ...row }
+      this.familyInfo = {...row}
       this.isShowDetail = true
     },
     delFamily(row) {
@@ -612,8 +674,8 @@ export default {
       })
     },
     handleIdNumberAutocomplete(v) {
-      let { birthday: birthDate, sex } = this.idCardNoUtil.getIdCardInfo(v);
-      this.form = { ...this.form, birthDate, sex, age: this.$calcAge(v) };
+      let {birthday: birthDate, sex} = this.idCardNoUtil.getIdCardInfo(v);
+      this.form = {...this.form, birthDate, sex, age: this.$calcAge(v)};
     },
     onConfirm() {
       this.$refs.ruleForm.validate((v) => {
@@ -629,19 +691,19 @@ export default {
           if (this.form.guaranteeList.length) {
             this.form.guaranteeCheck = this.form.basicsList.join(',')
           }
-          this.checkInit('jcbxCxyiliao',this.form.basicsList, '0')
-          this.checkInit('jcbxCzyiliao',this.form.basicsList, '1')
-          this.checkInit('jcbxDabing',this.form.basicsList, '2')
-          this.checkInit('jcbxShangye',this.form.basicsList, '3')
-          this.checkInit('jcbxCxyanglao',this.form.basicsList, '4')
-          this.checkInit('jcbxCzyanglao',this.form.basicsList, '5')
-          this.checkInit('jcbxRenshenyiwai',this.form.basicsList, '6')
+          this.checkInit('jcbxCxyiliao', this.form.basicsList, '0')
+          this.checkInit('jcbxCzyiliao', this.form.basicsList, '1')
+          this.checkInit('jcbxDabing', this.form.basicsList, '2')
+          this.checkInit('jcbxShangye', this.form.basicsList, '3')
+          this.checkInit('jcbxCxyanglao', this.form.basicsList, '4')
+          this.checkInit('jcbxCzyanglao', this.form.basicsList, '5')
+          this.checkInit('jcbxRenshenyiwai', this.form.basicsList, '6')
 
-          this.checkInit('bzcsNongcundibao',this.form.guaranteeList, '0')
-          this.checkInit('bzcsTekungongyang',this.form.guaranteeList, '1')
-          this.checkInit('bzcsWubaohu',this.form.guaranteeList, '2')
-          this.checkInit('bzcsYiliaojiuzhu',this.form.guaranteeList, '3')
-          this.checkInit('bzcsQita',this.form.guaranteeList, '4')
+          this.checkInit('bzcsNongcundibao', this.form.guaranteeList, '0')
+          this.checkInit('bzcsTekungongyang', this.form.guaranteeList, '1')
+          this.checkInit('bzcsWubaohu', this.form.guaranteeList, '2')
+          this.checkInit('bzcsYiliaojiuzhu', this.form.guaranteeList, '3')
+          this.checkInit('bzcsQita', this.form.guaranteeList, '4')
           this.instance.post(`/app/apppreventionreturntopoverty/addOrUpdate`, this.form).then(res => {
             if (res.code == 0) {
               this.getDetail()
@@ -653,9 +715,9 @@ export default {
       });
     },
     checkInit(formName, list, value) {
-      if(list.includes(value)) {
+      if (list.includes(value)) {
         this.form[formName] = '01'
-      }else {
+      } else {
         this.form[formName] = '02'
       }
     },
@@ -666,42 +728,42 @@ export default {
       this.$router.push({});
     },
     getDetail() {
-      let { id } = this.$route.query;
+      let {id} = this.$route.query;
       id &&
-        this.instance
-          .post("/app/apppreventionreturntopoverty/queryDetailById", null, {
-            params: { id },
-          })
-          .then((res) => {
-            if (res?.data) {
-              this.detail = res.data;
-              this.detail.family?.map((e) => {
-                e.householdRelation = e.householdRelation || "户主";
-              });
-
-              if (this.detail.healthyStatus) {
-                this.detail.healthyStatusList = this.detail.healthyStatus.split(',')
-              }
-              if (this.detail.basicsCheck) {
-                this.detail.basicsList = this.detail.basicsCheck.split(',')
-              }
-              if (this.detail.guaranteeCheck) {
-                this.detail.guaranteeList = this.detail.guaranteeCheck.split(',')
-              }
-
-              if (this.detail.status == 0 && this.isGridAdmin) {
-                this.instance.post(`/app/apppreventionreturntopoverty/popup?id=${this.detail.id}`).then(res => {
-                  if (res.code == 0 && res.data) { //纳入监测审批
-                    this.girdAdminApplyStatus = 1
-                  }
-                })
-              }
-            }
+      this.instance
+      .post("/app/apppreventionreturntopoverty/queryDetailById", null, {
+        params: {id},
+      })
+      .then((res) => {
+        if (res?.data) {
+          this.detail = res.data;
+          this.detail.family?.map((e) => {
+            e.householdRelation = e.householdRelation || "户主";
           });
+
+          if (this.detail.healthyStatus) {
+            this.detail.healthyStatusList = this.detail.healthyStatus.split(',')
+          }
+          if (this.detail.basicsCheck) {
+            this.detail.basicsList = this.detail.basicsCheck.split(',')
+          }
+          if (this.detail.guaranteeCheck) {
+            this.detail.guaranteeList = this.detail.guaranteeCheck.split(',')
+          }
+
+          if (this.detail.status == 0 && this.isGridAdmin) {
+            this.instance.post(`/app/apppreventionreturntopoverty/popup?id=${this.detail.id}`).then(res => {
+              if (res.code == 0 && res.data) { //纳入监测审批
+                this.girdAdminApplyStatus = 1
+              }
+            })
+          }
+        }
+      });
     },
     gotoEdit() {
-      let { query } = this.$route;
-      this.$router.push({ query, hash: "#add" });
+      let {query} = this.$route;
+      this.$router.push({query, hash: "#add"});
     },
     applyMonitor(title, status) {
       this.dialogTitle = title
@@ -768,7 +830,7 @@ export default {
         for (let key in this.examineFrom) {
           fromData.append(key, this.examineFrom[key])
         }
-        this.instance.post(url, fromData ).then(res => {
+        this.instance.post(url, fromData).then(res => {
           if (res.code == 0) {
             this.getDetail()
             this.$message.success('提交成功!');
@@ -777,7 +839,7 @@ export default {
       }
       if (this.examineStep == 3) {
         this.isShowExamine = false
-        this.examineFrom = { pass: 1 }
+        this.examineFrom = {pass: 1}
         return
       }
       this.examineStep++
@@ -790,7 +852,7 @@ export default {
     },
     handleDelete(ids) {
       this.$confirm("是否要删除监测对象").then(() => {
-        this.instance.post("/app/apppreventionreturntopoverty/delete", null, { params: { ids: ids?.toString() }, }).then((res) => {
+        this.instance.post("/app/apppreventionreturntopoverty/delete", null, {params: {ids: ids?.toString()},}).then((res) => {
           if (res?.code == 0) {
             this.$message.success("删除成功!");
             this.back();
@@ -799,7 +861,7 @@ export default {
       })
     },
     numberInput(name) {
-      if(!/^[0-9]*[1-9][0-9]*$/g.test(this.form[name])){
+      if (!/^[0-9]*[1-9][0-9]*$/g.test(this.form[name])) {
         this.form[name] = ''
         return this.$message.error('请输入正整数')
       }
@@ -838,10 +900,12 @@ export default {
   .success {
     text-align: center;
     padding-top: 20px;
+
     .el-icon-success {
       color: rgb(46, 162, 34);
       font-size: 100px;
     }
+
     p {
       text-align: center;
       font-size: 16px;
@@ -866,16 +930,20 @@ export default {
   ::v-deep .el-step__icon {
     border-color: #ccc !important;
   }
+
   ::v-deep .el-step__line {
     background-color: #ccc !important;
   }
+
   ::v-deep .el-step__title,
   ::v-deep .is-wait {
     color: #666 !important;
   }
+
   ::v-deep .is-finish {
     color: #26f !important;
   }
+
   ::v-deep .is-finish .el-step__icon {
     border-color: #26f !important;
   }

From 46596b6d573cb8c09bc819e5937cddd9e9a24df0 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 29 Apr 2022 16:42:26 +0800
Subject: [PATCH 10/45] BUG 29451

---
 .../jianping/AppHelpedResident/hrList.vue     | 39 ++++++++++---------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/packages/jianping/AppHelpedResident/hrList.vue b/packages/jianping/AppHelpedResident/hrList.vue
index 7b6ba9d4..f419b623 100644
--- a/packages/jianping/AppHelpedResident/hrList.vue
+++ b/packages/jianping/AppHelpedResident/hrList.vue
@@ -4,7 +4,9 @@
       <ai-title slot="title" title="监测对象" isShowBottomBorder isShowArea v-model="search.areaId" :instance="instance"
                 @change="page.current=1,getTableData()">
         <template #rightBtn>
-          <el-button type="primary" icon="iconfont iconSetting" @click="dialog=true" v-if="$permissions('app_apppreventionreturntopovertyalarmconfig_edit')">预警规则</el-button>
+          <el-button type="primary" icon="iconfont iconSetting" @click="dialog=true" v-if="$permissions('app_apppreventionreturntopovertyalarmconfig_edit')">
+            预警规则
+          </el-button>
         </template>
       </ai-title>
       <template #content>
@@ -13,18 +15,15 @@
             <ai-select placeholder="档案状态" v-model="search.status" :selectList="dict.getDict('fpPrtpStatus')" @change="page.current=1,getTableData()"/>
             <ai-select placeholder="监测对象类型" v-model="search.objectType" :selectList="dict.getDict('fpType')" @change="page.current=1,getTableData()"/>
             <ai-select placeholder="风险因素" v-model="search.riskType" :selectList="dict.getDict('fpRiskType')" @change="page.current=1,getTableData()"/>
-            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.birthStart"  type="date" size="small"
-              unlink-panels placeholder="选择出生开始日期" @change="page.current=1,getTableData()" />
-            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.birthEnd" type="date" size="small" placeholder="选择出生结束日期"
-              unlink-panels @change="page.current=1,getTableData()" />
+            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.birthStart" type="date" size="small" unlink-panels placeholder="选择出生开始日期" @change="page.current=1,getTableData()"/>
+            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.birthEnd" type="date" size="small" placeholder="选择出生结束日期" unlink-panels @change="page.current=1,getTableData()"/>
             <ai-select placeholder="性别" v-model="search.sex" :selectList="dict.getDict('sex')" @change="page.current=1,getTableData()"/>
             <!-- <ai-select placeholder="文化程度" v-model="search.education" :selectList="dict.getDict('fpEducation')" @change="page.current=1,getTableData()"/>
             <ai-select placeholder="民族" v-model="search.nation" :selectList="dict.getDict('fpNation')" @change="page.current=1,getTableData()"/>
             <ai-select placeholder="政治面貌" v-model="search.politicsStatus" :selectList="dict.getDict('fpPoliticalOutlook')" @change="page.current=1,getTableData()"/> -->
           </template>
           <template #right>
-            <el-input size="small" placeholder="姓名/证件/联系方式" v-model="search.con" clearable
-                      @change="page.current=1,getTableData()"/>
+            <el-input size="small" placeholder="姓名/证件/联系方式" v-model="search.con" clearable @change="page.current=1,getTableData()"/>
           </template>
         </ai-search-bar>
         <ai-search-bar>
@@ -83,26 +82,28 @@ export default {
     permissions: Function
   },
   computed: {
-    ...mapState(['user'])
-  },
-  data() {
-    return {
-      search: {name: '', objectType: '', riskType: '',isHousehold: 1},
-      page: {current: 1, size: 10, total: 0},
-      tableData: [],
-      colConfigs: [
+    ...mapState(['user']),
+    colConfigs() {
+      return [
         {type: 'selection'},
         {label: "姓名", prop: "name", align: "center"},
         {label: "性别", prop: "sex", dict: 'sex', align: "center"},
-        {slot: "idNumber"},
+        {label: "身份证号", render: (h, {row}) => h('p', this.idCardNoUtil.hideId(row.idNumber))},
         {label: "年龄", prop: "age", align: "center"},
         {label: "民族", prop: "nation", align: "center", dict: "fpNation"},
         {label: "文化程度", prop: "education", align: "center", dict: "fpEducation"},
-        {label: "监测对象类型", prop: "objectType", align: "center", dict:"fpType"},
-        {label: "风险因素", prop: "riskType", align: "center", dict:"fpRiskType"},
+        {label: "监测对象类型", prop: "objectType", align: "center", dict: "fpType"},
+        {label: "风险因素", prop: "riskType", align: "center", dict: "fpRiskType"},
         {label: "档案状态", prop: "status", dict: "fpPrtpStatus", align: "center"},
         {slot: "options"}
-      ],
+      ]
+    }
+  },
+  data() {
+    return {
+      search: {name: '', objectType: '', riskType: '', isHousehold: 1},
+      page: {current: 1, size: 10, total: 0},
+      tableData: [],
       ids: [],
       dialog: false,
       form: {},

From 5a730afb99e9e14baef7ca137c0832d889d90369 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 29 Apr 2022 16:42:40 +0800
Subject: [PATCH 11/45] BUG 29451

---
 packages/jianping/AppHelpedResident/hrList.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/jianping/AppHelpedResident/hrList.vue b/packages/jianping/AppHelpedResident/hrList.vue
index f419b623..cce46399 100644
--- a/packages/jianping/AppHelpedResident/hrList.vue
+++ b/packages/jianping/AppHelpedResident/hrList.vue
@@ -44,11 +44,6 @@
         <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
                   @getList="getTableData" :col-configs="colConfigs" :dict="dict"
                   @selection-change="v=>ids=v.map(e=>e.id)">
-          <el-table-column slot="idNumber" label="证件号" show-overflow-tooltip align="center">
-            <template slot-scope="{row}">
-              <ai-id mode="show" v-model="row.idNumber" :showEyes="false"/>
-            </template>
-          </el-table-column>
           <el-table-column slot="options" label="操作" fixed="right" align="center">
             <template slot-scope="{row}">
               <el-button type="text" @click="showDetail(row.id)" v-if="$permissions('app_apppreventionreturntopoverty_detail')">详情</el-button>

From 3464798fd98a524c6b7bea3d4c8800d6f3b0f87b Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 29 Apr 2022 16:44:14 +0800
Subject: [PATCH 12/45] BUG 29452

---
 packages/jianping/AppHelpedResident/hrList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/jianping/AppHelpedResident/hrList.vue b/packages/jianping/AppHelpedResident/hrList.vue
index cce46399..92ddc557 100644
--- a/packages/jianping/AppHelpedResident/hrList.vue
+++ b/packages/jianping/AppHelpedResident/hrList.vue
@@ -47,7 +47,7 @@
           <el-table-column slot="options" label="操作" fixed="right" align="center">
             <template slot-scope="{row}">
               <el-button type="text" @click="showDetail(row.id)" v-if="$permissions('app_apppreventionreturntopoverty_detail')">详情</el-button>
-              <el-button type="text" @click="handleDelete(row.id)" v-if="$permissions('app_apppreventionreturntopoverty_del') && row.status == 4">删除</el-button>
+              <el-button type="text" @click="handleDelete(row.id)" v-if="$permissions('app_apppreventionreturntopoverty_del') &&/[34]/.test(row.status)">删除</el-button>
             </template>
           </el-table-column>
         </ai-table>

From e8439fe40abe22d44e45d6baaee124eeacbdd210 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 29 Apr 2022 16:47:21 +0800
Subject: [PATCH 13/45] BUG 29454

---
 packages/jianping/AppHelpedResident/hrAdd.vue | 98 ++++++++++---------
 .../jianping/AppHelpedResident/hrList.vue     | 16 ++-
 2 files changed, 63 insertions(+), 51 deletions(-)

diff --git a/packages/jianping/AppHelpedResident/hrAdd.vue b/packages/jianping/AppHelpedResident/hrAdd.vue
index 3e046c9f..b563a1f8 100644
--- a/packages/jianping/AppHelpedResident/hrAdd.vue
+++ b/packages/jianping/AppHelpedResident/hrAdd.vue
@@ -11,7 +11,8 @@
                   <el-form-item label="户主姓名" prop="name">
                     <el-input size="small" class="user-selecter" v-model="form.name" placeholder="请输入姓名" clearable :disabled="isEdit || isSelectUser">
                       <template slot="append">
-                        <ai-person-select :instance="instance" @selectPerson="checkName" :url="'/app/appresident/list?auditStatus=1&householdName=1&areaId='+user.info.areaId"></ai-person-select>
+                        <ai-person-select :instance="instance" @selectPerson="checkName"
+                                          :url="'/app/appresident/list?auditStatus=1&householdName=1&areaId='+user.info.areaId"/>
                       </template>
                     </el-input>
                   </el-form-item>
@@ -19,7 +20,8 @@
                     <el-input v-model="form.phone" placeholder="请输入联系方式" :maxlength="11" show-word-limit/>
                   </el-form-item>
                   <el-form-item label="证件号码" prop="idNumber">
-                    <el-input v-model="form.idNumber" placeholder="请输入证件号码" :maxlength="20" :disabled="isEdit || isSelectUser" @change="handleIdNumberAutocomplete"/>
+                    <el-input v-model="form.idNumber" placeholder="请输入证件号码" :maxlength="20" :disabled="isEdit || isSelectUser"
+                              @change="handleIdNumberAutocomplete"/>
                   </el-form-item>
                 </div>
                 <el-form-item label="个人照片" prop="photo">
@@ -49,25 +51,25 @@
               </div>
               <el-form-item label="健康状况">
                 <el-checkbox-group v-model="form.healthyStatusList">
-                  <el-checkbox :label="item.dictValue" v-for="(item, index) in dict.getDict('fpHealth')" :key="index">{{item.dictName}}</el-checkbox>
+                  <el-checkbox :label="item.dictValue" v-for="(item, index) in dict.getDict('fpHealth')" :key="index">{{ item.dictName }}</el-checkbox>
                 </el-checkbox-group>
               </el-form-item>
               <div flex class="half wrap">
                 <el-form-item label="残疾类别">
-                  <ai-select v-model="form.disabilityType" :selectList="dict.getDict('fpDisabilityType')" />
+                  <ai-select v-model="form.disabilityType" :selectList="dict.getDict('fpDisabilityType')"/>
                 </el-form-item>
                 <el-form-item label="残疾办证年度">
-                  <ai-select v-model="form.disabilityCertificateYear" :selectList="dict.getDict('fpYear')" />
+                  <ai-select v-model="form.disabilityCertificateYear" :selectList="dict.getDict('fpYear')"/>
                 </el-form-item>
               </div>
               <el-form-item label="基础保险">
                 <el-checkbox-group v-model="form.basicsList">
-                  <el-checkbox :label="item.value" v-for="(item, index) in basicsCheckList" :key="index">{{item.label}}</el-checkbox>
+                  <el-checkbox :label="item.value" v-for="(item, index) in basicsCheckList" :key="index">{{ item.label }}</el-checkbox>
                 </el-checkbox-group>
               </el-form-item>
               <el-form-item label="保障措施">
                 <el-checkbox-group v-model="form.guaranteeList">
-                  <el-checkbox :label="item.value" v-for="(item, index) in guaranteeCheckList" :key="index">{{item.label}}</el-checkbox>
+                  <el-checkbox :label="item.value" v-for="(item, index) in guaranteeCheckList" :key="index">{{ item.label }}</el-checkbox>
                 </el-checkbox-group>
               </el-form-item>
               <div flex class="half wrap">
@@ -75,13 +77,13 @@
                   <ai-select v-model="form.labourStatus" :selectList="dict.getDict('fpLaborSkills')"/>
                 </el-form-item>
                 <el-form-item label="是否会讲普通话">
-                  <ai-select v-model="form.mandarin" :selectList="dict.getDict('fpYesOrNo')" />
+                  <ai-select v-model="form.mandarin" :selectList="dict.getDict('fpYesOrNo')"/>
                 </el-form-item>
                 <el-form-item label="务工时间(月)">
-                  <el-input type="number" v-model="form.workeMonths" placeholder="请输入" clearable @input="numberInput('workeMonths')" />
+                  <el-input type="number" v-model="form.workeMonths" placeholder="请输入" clearable @input="numberInput('workeMonths')"/>
                 </el-form-item>
                 <el-form-item label="就业渠道">
-                  <ai-select v-model="form.employmentChannels" :selectList="dict.getDict('fpEmploymentChannels')" />
+                  <ai-select v-model="form.employmentChannels" :selectList="dict.getDict('fpEmploymentChannels')"/>
                 </el-form-item>
                 <el-form-item label="务工企业名称">
                   <el-input v-model="form.migrantEnterprises" placeholder="请输入" clearable/>
@@ -90,10 +92,10 @@
                   <el-input v-model="form.publicWelfarePosts" placeholder="请输入" clearable/>
                 </el-form-item>
                 <el-form-item label="是否国外务工">
-                  <ai-select v-model="form.foreignWorkers" :selectList="dict.getDict('fpYesOrNo')" />
+                  <ai-select v-model="form.foreignWorkers" :selectList="dict.getDict('fpYesOrNo')"/>
                 </el-form-item>
                 <el-form-item label="公益性岗位(月数)">
-                  <el-input type="number" v-model="form.publicWelfarePostsMonths" placeholder="请输入" clearable @input="numberInput('publicWelfarePostsMonths')" />
+                  <el-input type="number" v-model="form.publicWelfarePostsMonths" placeholder="请输入" clearable @input="numberInput('publicWelfarePostsMonths')"/>
                 </el-form-item>
               </div>
               <el-form-item label="务工所在地">
@@ -207,14 +209,14 @@
               <el-form-item label="备注说明">
                 <el-input v-model="form.detail" placeholder="请输入" type="textarea" maxlength="500" show-word-limit clearable/>
               </el-form-item>
-              <el-form-item label="图片（最多9张）" >
+              <el-form-item label="图片（最多9张）">
                 <ai-uploader
-                  :isShowTip="true"
-                  :instance="instance"
-                  v-model="form.files"
-                  fileType="img"
-                  acceptType=".png,.jpg,.jpeg"
-                  :limit="9">
+                    :isShowTip="true"
+                    :instance="instance"
+                    v-model="form.files"
+                    fileType="img"
+                    acceptType=".png,.jpg,.jpeg"
+                    :limit="9">
                   <template slot="tips">最多上传9张图片,单张图片最大10MB<br/>支持.png,.jpg,.jpeg格式</template>
                 </ai-uploader>
               </el-form-item>
@@ -390,11 +392,11 @@ export default {
   },
   methods: {
     checkName(e) {
-      if(!e) {
+      if (!e) {
         this.isSelectUser = false
         this.form.name = ''
         this.form.idNumber = ''
-        this.form.phone =''
+        this.form.phone = ''
         this.form.currentAreaId = ''
         this.form.currentAddress = ''
         this.form.birthDate = ''
@@ -422,13 +424,13 @@ export default {
           res.data.healthyStatusList = []
           res.data.basicsList = []
           res.data.guaranteeList = []
-          if(res.data.healthyStatus) {
+          if (res.data.healthyStatus) {
             res.data.healthyStatusList = res.data.healthyStatus.split(',')
           }
-          if(res.data.basicsCheck) {
+          if (res.data.basicsCheck) {
             res.data.basicsList = res.data.basicsCheck.split(',')
           }
-          if(res.data.guaranteeCheck) {
+          if (res.data.guaranteeCheck) {
             res.data.guaranteeList = res.data.guaranteeCheck.split(',')
           }
           console.log(res.data)
@@ -438,7 +440,7 @@ export default {
     },
     handleIdNumberAutocomplete(v) {
       var idNumber = v
-      if(v.length == 20) {
+      if (v.length == 20) {
         idNumber = v.substring(0, 18)
       }
       let {birthday: birthDate, sex} = this.idCardNoUtil.getIdCardInfo(idNumber)
@@ -452,58 +454,60 @@ export default {
           if (this.form.healthyStatusList.length) {
             this.form.healthyStatus = this.form.healthyStatusList.join(',')
           }
-          if(this.user.info.girdCheckType == 1) {
+          if (this.user.info.girdCheckType == 1) {
             this.form.girdId = this.user.info.girdId
           }
-          if(this.form.basicsList.length) {
+          if (this.form.basicsList.length) {
             this.form.basicsCheck = this.form.basicsList.join(',')
           }
-          if(this.form.guaranteeList.length) {
+          if (this.form.guaranteeList.length) {
             this.form.guaranteeCheck = this.form.basicsList.join(',')
           }
-          if([1, 2, 3].includes(2)) {
+          if ([1, 2, 3].includes(2)) {
             this.form.jcbxCxyiliao = '01'
-          }else {
+          } else {
             this.form.jcbxCxyiliao = '02'
           }
-          this.checkInit('jcbxCxyiliao',this.form.basicsList, '0')
-          this.checkInit('jcbxCzyiliao',this.form.basicsList, '1')
-          this.checkInit('jcbxDabing',this.form.basicsList, '2')
-          this.checkInit('jcbxShangye',this.form.basicsList, '3')
-          this.checkInit('jcbxCxyanglao',this.form.basicsList, '4')
-          this.checkInit('jcbxCzyanglao',this.form.basicsList, '5')
-          this.checkInit('jcbxRenshenyiwai',this.form.basicsList, '6')
-
-          this.checkInit('bzcsNongcundibao',this.form.guaranteeList, '0')
-          this.checkInit('bzcsTekungongyang',this.form.guaranteeList, '1')
-          this.checkInit('bzcsWubaohu',this.form.guaranteeList, '2')
-          this.checkInit('bzcsYiliaojiuzhu',this.form.guaranteeList, '3')
-          this.checkInit('bzcsQita',this.form.guaranteeList, '4')
+          this.checkInit('jcbxCxyiliao', this.form.basicsList, '0')
+          this.checkInit('jcbxCzyiliao', this.form.basicsList, '1')
+          this.checkInit('jcbxDabing', this.form.basicsList, '2')
+          this.checkInit('jcbxShangye', this.form.basicsList, '3')
+          this.checkInit('jcbxCxyanglao', this.form.basicsList, '4')
+          this.checkInit('jcbxCzyanglao', this.form.basicsList, '5')
+          this.checkInit('jcbxRenshenyiwai', this.form.basicsList, '6')
 
+          this.checkInit('bzcsNongcundibao', this.form.guaranteeList, '0')
+          this.checkInit('bzcsTekungongyang', this.form.guaranteeList, '1')
+          this.checkInit('bzcsWubaohu', this.form.guaranteeList, '2')
+          this.checkInit('bzcsYiliaojiuzhu', this.form.guaranteeList, '3')
+          this.checkInit('bzcsQita', this.form.guaranteeList, '4')
+          let loading = this.$loading({text: "提交中..."})
           this.instance.post(`/app/apppreventionreturntopoverty/addOrUpdate`, this.form).then(res => {
             if (res.code == 0) {
               this.$message.success('提交成功!');
               this.back()
             }
+          }).finally(() => {
+            loading.close()
           })
         }
       })
     },
     checkInit(formName, list, value) {
-      if(list.includes(value)) {
+      if (list.includes(value)) {
         this.form[formName] = '01'
-      }else {
+      } else {
         this.form[formName] = '02'
       }
     },
     decimalInput(name) {
-      if(!/^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/g.test(this.form[name])){
+      if (!/^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/g.test(this.form[name])) {
         this.form[name] = ''
         return this.$message.error('最多只保留两位小数点')
       }
     },
     numberInput(name) {
-      if(!/^[0-9]*[1-9][0-9]*$/g.test(this.form[name])){
+      if (!/^[0-9]*[1-9][0-9]*$/g.test(this.form[name])) {
         this.form[name] = ''
         return this.$message.error('请输入正整数')
       }
diff --git a/packages/jianping/AppHelpedResident/hrList.vue b/packages/jianping/AppHelpedResident/hrList.vue
index 92ddc557..46d04dae 100644
--- a/packages/jianping/AppHelpedResident/hrList.vue
+++ b/packages/jianping/AppHelpedResident/hrList.vue
@@ -15,8 +15,10 @@
             <ai-select placeholder="档案状态" v-model="search.status" :selectList="dict.getDict('fpPrtpStatus')" @change="page.current=1,getTableData()"/>
             <ai-select placeholder="监测对象类型" v-model="search.objectType" :selectList="dict.getDict('fpType')" @change="page.current=1,getTableData()"/>
             <ai-select placeholder="风险因素" v-model="search.riskType" :selectList="dict.getDict('fpRiskType')" @change="page.current=1,getTableData()"/>
-            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.birthStart" type="date" size="small" unlink-panels placeholder="选择出生开始日期" @change="page.current=1,getTableData()"/>
-            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.birthEnd" type="date" size="small" placeholder="选择出生结束日期" unlink-panels @change="page.current=1,getTableData()"/>
+            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.birthStart" type="date" size="small" unlink-panels placeholder="选择出生开始日期"
+                            @change="page.current=1,getTableData()"/>
+            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.birthEnd" type="date" size="small" placeholder="选择出生结束日期" unlink-panels
+                            @change="page.current=1,getTableData()"/>
             <ai-select placeholder="性别" v-model="search.sex" :selectList="dict.getDict('sex')" @change="page.current=1,getTableData()"/>
             <!-- <ai-select placeholder="文化程度" v-model="search.education" :selectList="dict.getDict('fpEducation')" @change="page.current=1,getTableData()"/>
             <ai-select placeholder="民族" v-model="search.nation" :selectList="dict.getDict('fpNation')" @change="page.current=1,getTableData()"/>
@@ -29,7 +31,9 @@
         <ai-search-bar>
           <template #left>
             <el-button type="primary" icon="iconfont iconAdd" @click="showEdit()" v-if="$permissions('app_apppreventionreturntopoverty_edit')">添加</el-button>
-            <el-button icon="iconfont iconDelete" :disabled="!ids.length" @click="handleDelete(ids)" v-if="$permissions('app_apppreventionreturntopoverty_del')">删除</el-button>
+            <el-button icon="iconfont iconDelete" :disabled="!ids.length" @click="handleDelete(ids)"
+                       v-if="$permissions('app_apppreventionreturntopoverty_del')">删除
+            </el-button>
           </template>
           <template #right>
             <ai-import :instance="instance" name="监测对象" title="导入监测对象"
@@ -47,7 +51,8 @@
           <el-table-column slot="options" label="操作" fixed="right" align="center">
             <template slot-scope="{row}">
               <el-button type="text" @click="showDetail(row.id)" v-if="$permissions('app_apppreventionreturntopoverty_detail')">详情</el-button>
-              <el-button type="text" @click="handleDelete(row.id)" v-if="$permissions('app_apppreventionreturntopoverty_del') &&/[34]/.test(row.status)">删除</el-button>
+              <el-button type="text" @click="handleDelete(row.id)" v-if="$permissions('app_apppreventionreturntopoverty_del') &&/[34]/.test(row.status)">删除
+              </el-button>
             </template>
           </el-table-column>
         </ai-table>
@@ -140,12 +145,15 @@ export default {
     submitDialog() {
       this.$refs.DialogForm.validate(v => {
         if (v) {
+          let loading = this.$loading({text: "提交中..."})
           this.instance.post(`/app/apppreventionreturntopovertyalarmconfig/addOrUpdate`, this.form).then(res => {
             if (res.code == 0) {
               this.$message.success('预警规则设置成功');
               this.getTableData()
               this.dialog = false
             }
+          }).finally(() => {
+            loading.close()
           })
         }
       })

From cc46a5a9c8cf5df40361359a264776016b0007c3 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 29 Apr 2022 17:53:10 +0800
Subject: [PATCH 14/45] BUG 29441

---
 packages/jianping/AppHelpedResident/hrList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/jianping/AppHelpedResident/hrList.vue b/packages/jianping/AppHelpedResident/hrList.vue
index 46d04dae..69e0d6bc 100644
--- a/packages/jianping/AppHelpedResident/hrList.vue
+++ b/packages/jianping/AppHelpedResident/hrList.vue
@@ -88,7 +88,7 @@ export default {
         {type: 'selection'},
         {label: "姓名", prop: "name", align: "center"},
         {label: "性别", prop: "sex", dict: 'sex', align: "center"},
-        {label: "身份证号", render: (h, {row}) => h('p', this.idCardNoUtil.hideId(row.idNumber))},
+        {label: "证件号", render: (h, {row}) => h('p', this.idCardNoUtil.hideId(row.idNumber))},
         {label: "年龄", prop: "age", align: "center"},
         {label: "民族", prop: "nation", align: "center", dict: "fpNation"},
         {label: "文化程度", prop: "education", align: "center", dict: "fpEducation"},

From 376a4778b85c821cfa2438542012a643d4a3a473 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 29 Apr 2022 19:39:17 +0800
Subject: [PATCH 15/45] BUG 29467

---
 packages/jianping/AppHelpedResident/hrDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index fc9dd154..7ec7647b 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -293,7 +293,7 @@
                            placeholder="请选择"/>
               </el-form-item>
               <el-form-item label="残疾办证年度">
-                <el-date-picker v-model="form.disabilityCertificateYear" type="year" placeholder="请选择"/>
+                <ai-select v-model="form.disabilityCertificateYear" :selectList="dict.getDict('fpYear')"/>
               </el-form-item>
             </div>
             <el-form-item label="基础保险">

From 890cbaa0b9b6034d4966fd1f61e90314aae8ac8e Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 29 Apr 2022 19:47:51 +0800
Subject: [PATCH 16/45] BUG 29468

---
 packages/jianping/AppHelpedResident/hrDetail.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index 7ec7647b..0b9fa7a1 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -210,8 +210,10 @@
                     <el-table-column slot="options" label="操作" align="center" width="200px">
                       <template slot-scope="{ row }">
                         <el-button type="text" @click="viewFamily(row)">详情</el-button>
-                        <el-button type="text" @click="addFamily(row)">编辑</el-button>
-                        <el-button type="text" @click="delFamily(row)">删除</el-button>
+                        <template v-if="row.isHousehold==0">
+                          <el-button type="text" @click="addFamily(row)">编辑</el-button>
+                          <el-button type="text" @click="delFamily(row)">删除</el-button>
+                        </template>
                       </template>
                     </el-table-column>
                   </ai-table>

From 92516a7753b5124e16715eaefd98bc98bd44c64d Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 5 May 2022 15:16:28 +0800
Subject: [PATCH 17/45] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/build.js | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/project/build.js b/project/build.js
index 0da1c102..95e93705 100644
--- a/project/build.js
+++ b/project/build.js
@@ -50,8 +50,6 @@ const start = () => {
     }])
   }).then(res => new Promise(resolve => {
     const {PROJECT} = res
-    let install = path.join(__dirname, PROJECT, 'index.js')
-    fsExtra.ensureFile(install)
     const coreLib = path.join(__dirname, PROJECT, 'core.import.json')
     fsExtra.readJson(coreLib, (err, data) => {
       chalkTag.info("加载核心库配置..")
@@ -94,6 +92,7 @@ const start = () => {
           name: "CONFIRM",
           type: 'confirm',
           message: "未读取到业务应用配置文件,是否要打包整个packages?",
+          default: false
         }]).then(res => {
           if (res.CONFIRM) {
             findApp(appDir, file => {
@@ -115,14 +114,15 @@ const start = () => {
     })
   })).then(prj => new Promise(resolve => {
     if (prj == 'dvui') {
-      return resolve(prj)
-    }
-    chalkTag.info('正在生成打包文件...')
-    let bin = path.join(__dirname, prj.toString(), 'index.js'),
-        coreApps = cores.map(e => `{name:'${e.name}',component:require('../../${e.component}').default}`),
-        bizApps = apps.map(e => `{name:'${e.name}',component:require('../../${e.component}').default}`),
-        comps = [...coreApps, ...bizApps],
-        content = `
+      resolve(prj)
+    } else {
+      chalkTag.info('正在生成打包文件...')
+      let install = path.join(__dirname, PROJECT, 'index.js')
+      fsExtra.ensureFile(install)
+      let coreApps = cores.map(e => `{name:'${e.name}',component:require('../../${e.component}').default}`),
+          bizApps = apps.map(e => `{name:'${e.name}',component:require('../../${e.component}').default}`),
+          comps = [...coreApps, ...bizApps],
+          content = `
         const apps = [${comps.toString()}]
         const install = function (Vue) {
           if (install.installed) return Promise.resolve()
@@ -154,13 +154,14 @@ const start = () => {
             install
          }
         `
-    fsExtra.outputFile(bin, content, err => {
-      if (err) {
-        chalkTag.error(err)
-        reject()
-      } else chalkTag.done('生成打包文件')
-      resolve(prj)
-    })
+      fsExtra.outputFile(install, content, err => {
+        if (err) {
+          chalkTag.error(err)
+          reject()
+        } else chalkTag.done('生成打包文件')
+        resolve(prj)
+      })
+    }
   })).then(project => new Promise((resolve, reject) => {
     fsExtra.readJson(path.join(__dirname, project.toString(), 'package.json'), (err, json) => {
       let cmd = `vue-cli-service build --target lib --dest project/${project}/dist project/${project}/${project == 'dvui' ? 'entries' : 'index'}.js --name ${json.name}`
@@ -171,18 +172,18 @@ const start = () => {
         log(stdout);
         if (!err) {
           chalkTag.done('打包成功!')
-          resolve(project)
+          resolve({project, name: json.name})
         } else {
           chalkTag.error(err)
           reject()
         }
       })
     })
-  })).then(project => {
+  })).then((prj) => {
     chalkTag.info('正在发布中...')
-    let cmd = `cd ${project}&npm unpublish --force&npm publish`
+    let cmd = `npm unpublish ${prj.name} --force&npm publish --workspace project/${prj.project}`
     exec(cmd, {
-      cwd: path.join(__dirname, '.')
+      cwd: path.join(__dirname, '..')
     }, (err, stdout) => {
       log(stdout);
       if (!err) {

From f38eff656489ceaee8df39da92f1795a5e2808b0 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 5 May 2022 15:26:44 +0800
Subject: [PATCH 18/45] BUG 29501

---
 project/sass/apps/grid/AppGridBlock/components/list.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/project/sass/apps/grid/AppGridBlock/components/list.vue b/project/sass/apps/grid/AppGridBlock/components/list.vue
index 053832ad..67ae87ab 100644
--- a/project/sass/apps/grid/AppGridBlock/components/list.vue
+++ b/project/sass/apps/grid/AppGridBlock/components/list.vue
@@ -665,10 +665,6 @@ export default {
     }
   }
 
-  ::v-deep.ai-list__content--right {
-    overflow: visible !important;
-  }
-
   ::v-deep .treePanel {
     display: flex;
     flex-direction: column;

From f757852ac497e15219675e849601495952bf6ef8 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 5 May 2022 15:18:18 +0800
Subject: [PATCH 19/45] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/bigscreen/designer/AppDesigner.vue    | 18 ++++++------------
 packages/bigscreen/designer/components/Add.vue | 14 +++++++-------
 .../bigscreen/designer/components/Layout.vue   | 13 ++++++++++++-
 .../designer/components/RenderElement.vue      | 16 +++++++++++++++-
 4 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/packages/bigscreen/designer/AppDesigner.vue b/packages/bigscreen/designer/AppDesigner.vue
index 1b051b33..bcacab2f 100644
--- a/packages/bigscreen/designer/AppDesigner.vue
+++ b/packages/bigscreen/designer/AppDesigner.vue
@@ -6,19 +6,13 @@
     <template slot="tabs">
       <el-tabs v-model="currIndex">
         <el-tab-pane v-for="(tab,i) in tabs" :key="i" :label="tab.label">
-          <component :urlPrefix="urlPrefix" :areaId="areaId" :ref="tab.name" v-if="currIndex == i" :is="tab.comp"
-                     @change="onChange" lazy
-                     :instance="instance" :dict="dict" :permissions="permissions"/>
+          <component :urlPrefix="urlPrefix" :areaId="areaId" :ref="tab.name" v-if="currIndex == i" :is="tab.comp" @change="onChange" lazy :instance="instance" :dict="dict" :permissions="permissions" />
         </el-tab-pane>
       </el-tabs>
     </template>
   </ai-list>
-  <Add v-else-if="componentName === 'Add'" :urlPrefix="urlPrefix" :areaId="areaId" :params="params" :instance="instance"
-       :dict="dict"
-       :permissions="permissions" @change="onChange"></Add>
-  <SourceData v-else-if="componentName === 'SourceData'" :urlPrefix="urlPrefix" :params="params" :instance="instance"
-              :dict="dict"
-              :permissions="permissions" @change="onChange"></SourceData>
+  <Add v-else-if="componentName === 'Add'" :urlPrefix="urlPrefix" :areaId="areaId" :params="params" :instance="instance" :dict="dict" :permissions="permissions" @change="onChange"></Add>
+  <SourceData v-else-if="componentName === 'SourceData'" :urlPrefix="urlPrefix" :params="params" :instance="instance" :dict="dict" :permissions="permissions" @change="onChange"></SourceData>
 </template>
 
 <script>
@@ -27,12 +21,12 @@ import Add from './components/Add'
 import SourceData from './components/SourceData'
 import dvui from '../../../project/dvui/entries'
 import Vue from "vue";
-
+ 
 Vue.use(dvui)
 export default {
-  name: 'AppDesigner',
+  name: 'AppDesigner' ,
   label: '大屏设计',
-
+ 
   components: {
     List,
     Add,
diff --git a/packages/bigscreen/designer/components/Add.vue b/packages/bigscreen/designer/components/Add.vue
index 81302c44..9a267dd3 100644
--- a/packages/bigscreen/designer/components/Add.vue
+++ b/packages/bigscreen/designer/components/Add.vue
@@ -55,13 +55,13 @@
         </ai-card>
       </el-form>
       <Layout
-          v-if="isShowLayout"
-          :instance="instance"
-          :dict="dict"
-          :params="query"
-          @change="onChange"
-          :urlPrefix="urlPrefix"
-          @close="isShowLayout = false">
+        v-if="isShowLayout"
+        :instance="instance"
+        :dict="dict"
+        :params="query"
+        @change="onChange"
+        :urlPrefix="urlPrefix"
+        @close="isShowLayout = false">
       </Layout>
       <ai-dv-wrapper :views="[{label: '返回'}]" @change="screenId = false" v-if="screenId" :title="form.name">
         <AppGigscreenViewer :urlPrefix="urlPrefix" :instance="instance" :dict="dict" :id="screenId"></AppGigscreenViewer>
diff --git a/packages/bigscreen/designer/components/Layout.vue b/packages/bigscreen/designer/components/Layout.vue
index a7a6b9b9..03ddd261 100644
--- a/packages/bigscreen/designer/components/Layout.vue
+++ b/packages/bigscreen/designer/components/Layout.vue
@@ -63,6 +63,7 @@
               <ai-dv-wrapper style="height: 100%" :title="params.name">
                 <div style="width: 100%; height: 100%">
                   <AiDvBackground
+                    :theme="dashboard.theme"
                     v-if="dashboard.backgroundImage.length"
                     :src="dashboard.backgroundImage[0].url">
                   </AiDvBackground>
@@ -90,7 +91,7 @@
                       <div class="coordinate-top"></div>
                       <div class="coordinate-label">{{ item.left }}, {{ item.top }}</div>
                     </div>
-                    <RenderElement :data="item" :index="index"></RenderElement>
+                    <RenderElement :data="item" :theme="dashboard.theme" :index="index"></RenderElement>
                   </vue-draggable-resizable>
                 </div>
               </ai-dv-wrapper>
@@ -251,6 +252,15 @@
                 <el-input v-model="dashboard.title" size="mini"></el-input>
               </div>
             </div>
+            <div class="layout-config__item">
+              <label>主题设置</label>
+              <div class="layout-config__item--right">
+                <el-select size="mini" v-model="dashboard.theme" placeholder="请选择">
+                  <el-option label="默认" value="0"></el-option>
+                  <el-option label="党建" value="1"></el-option>
+                </el-select>
+              </div>
+            </div>
             <div class="layout-config__item">
               <label>背景图</label>
               <div class="layout-config__item--right layout-config__item--bg">
@@ -372,6 +382,7 @@
           title: '大屏',
           width: 1920,
           height: 1080,
+          theme: '0',
           backgroundColor: '',
           backgroundImage: []
         },
diff --git a/packages/bigscreen/designer/components/RenderElement.vue b/packages/bigscreen/designer/components/RenderElement.vue
index b24f25c3..6a59f58b 100644
--- a/packages/bigscreen/designer/components/RenderElement.vue
+++ b/packages/bigscreen/designer/components/RenderElement.vue
@@ -12,18 +12,21 @@
         v-if="data.type === 'table'"
         :config="formatTable(data[data.dataType], data.isShowIndex, data.rowNum)"
         :key="data.height"
+        :theme="theme"
         :style="{height: data.height + 'px', width: '100%'}" />
       <ai-echart
         v-else-if="data.type === 'barChart1'"
         style="height: 100%; width: 100%;"
         :ref="'chart' + index"
         :key="`chart${index}`"
+        :theme="theme"
         :data="data[data.dataType]"
         :ops="data.config"/>
       <ai-echart
         v-else-if="data.type === 'barChart2'"
         style="height: 100%; width: 100%;"
         :ref="'chart' + index"
+        :theme="theme"
         :key="`chart${index}`"
         :data="data[data.dataType]"
         :ops="data.config"/>
@@ -32,6 +35,7 @@
         style="height: 100%; width: 100%;"
         :ref="'chart' + index"
         :key="`chart${index}`"
+        :theme="theme"
         :data="data[data.dataType]"
         :ops="data.config"/>
       <ai-echart
@@ -39,6 +43,7 @@
         style="height: 100%; width: 100%;"
         :ref="'chart' + index"
         :key="`chart${index}`"
+        :theme="theme"
         :data="data[data.dataType]"
         :ops="data.config"/>
       <ai-echart
@@ -46,6 +51,7 @@
         style="height: 100%; width: 100%;"
         :ref="'chart' + index"
         :key="`chart${index}`"
+        :theme="theme"
         :data="data[data.dataType]"
         :ops="data.config"/>
       <ai-echart
@@ -53,6 +59,7 @@
         style="height: 100%; width: 100%;"
         :ref="'chart' + index"
         :key="`chart${index}`"
+        :theme="theme"
         :data="data[data.dataType]"
         :ops="data.config"/>
       <ai-echart
@@ -60,6 +67,7 @@
         style="height: 100%; width: 100%;"
         :ref="'chart' + index"
         :key="`chart${index}`"
+        :theme="theme"
         :data="data[data.dataType]"
         :ops="data.config"/>
       <ai-echart
@@ -67,6 +75,7 @@
         style="height: 100%; width: 100%;"
         :ref="'chart' + index"
         :key="`chart${index}`"
+        :theme="theme"
         :data="data[data.dataType]"
         :ops="lineChart1"/>
       <ai-echart
@@ -74,6 +83,7 @@
         style="height: 100%; width: 100%;"
         :ref="'chart' + index"
         :key="`chart${index}`"
+        :theme="theme"
         :data="data[data.dataType]"
         :ops="lineChart2"/>
       <ai-echart
@@ -81,6 +91,7 @@
         style="height: 100%; width: 100%;"
         :ref="'chart' + index"
         :key="`chart${index}`"
+        :theme="theme"
         :data="data[data.dataType]"
         :ops="data.config"/>
       <ai-echart
@@ -88,6 +99,7 @@
         style="height: 100%; width: 100%;"
         :ref="'chart' + index"
         :key="`chart${index}`"
+        :theme="theme"
         :data="data[data.dataType]"
         :ops="data.config"/>
       <ai-echart
@@ -95,6 +107,7 @@
         style="height: 100%; width: 100%;"
         :ref="'chart' + index"
         :key="`chart${index}`"
+        :theme="theme"
         :data="data[data.dataType]"
         :ops="lineChart5"/>
       <ai-echart
@@ -102,6 +115,7 @@
         style="height: 100%; width: 100%;"
         :ref="'chart' + index"
         :key="`chart${index}`"
+        :theme="theme"
         :data="data[data.dataType]"
         :ops="pieChart"/>
       <ai-map :markers="data[data.dataType]" v-else-if="data.type=='map'" :mask="data.mask === '1'" :areaId="data.areaId || user.info.areaId" map-style="amap://styles/e51987628aee5206d4c9ca8c6e98b4f7"/>
@@ -122,7 +136,7 @@
   export default {
     name: 'RenderElement',
 
-    props: ['data', 'index'],
+    props: ['data', 'index', 'theme'],
 
     components: {
       AiSwiper

From 64202161dde07663cd32607a9e8242c576c29b9f Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 5 May 2022 16:02:58 +0800
Subject: [PATCH 20/45] BUG 29507

---
 .../sass/apps/grid/AppGridMember/components/add.vue  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/project/sass/apps/grid/AppGridMember/components/add.vue b/project/sass/apps/grid/AppGridMember/components/add.vue
index 735ef3ca..81ac9ded 100644
--- a/project/sass/apps/grid/AppGridMember/components/add.vue
+++ b/project/sass/apps/grid/AppGridMember/components/add.vue
@@ -426,13 +426,13 @@ export default {
               return this.$message.error('请选择网格')
             }
 
-            if (currInfo.checkType === '1' && currInfo.girdLevel !== '2') {
-              return this.$message.error(`一级、二级网格不能添加网格员`)
-            }
+            // if (currInfo.checkType === '1' && currInfo.girdLevel !== '2') {
+            //   return this.$message.error(`一级、二级网格不能添加网格员`)
+            // }
 
-            if (sameInfo.length) {
-              return this.$message.error('不能选择同一网格重复绑定')
-            }
+            // if (sameInfo.length) {
+            //   return this.$message.error('不能选择同一网格重复绑定')
+            // }
           }
 
           this.instance.post(`/app/appgirdmemberinfo/addOrUpdate`,{

From 6d3984654c64b0d83d909c5eb7462a1a38ff5800 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 5 May 2022 16:21:13 +0800
Subject: [PATCH 21/45] BUG 29503

---
 .../sass/apps/grid/AppGridBlock/components/list.vue | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/project/sass/apps/grid/AppGridBlock/components/list.vue b/project/sass/apps/grid/AppGridBlock/components/list.vue
index 67ae87ab..652874ce 100644
--- a/project/sass/apps/grid/AppGridBlock/components/list.vue
+++ b/project/sass/apps/grid/AppGridBlock/components/list.vue
@@ -5,7 +5,7 @@
         <ai-title title="网格区块" :isShowBottomBorder="true"></ai-title>
       </template>
       <template slot="left">
-        <ai-tree-menu title="网格层级" @search="(v) => $refs.tree.filter(v)">
+        <ai-tree-menu title="网格层级" @search="v=> $refs.tree.filter(v)">
           <el-tree
               :data="treeObj.treeList"
               :props="treeObj.defaultProps"
@@ -14,8 +14,13 @@
               ref="tree"
               :filter-node-method="filterNode"
               default-expand-all
-              highlight-current
-          />
+              highlight-current>
+            <template slot-scope="{node,data}">
+              <el-tooltip placement="right" :content="node.label">
+                <div v-text="node.label"/>
+              </el-tooltip>
+            </template>
+          </el-tree>
         </ai-tree-menu>
       </template>
       <template slot="content">
@@ -608,7 +613,7 @@ export default {
 
       background: #2266FF;
 
-      span {
+      .el-tooltip {
         color: #fff;
       }
     }

From 7d99c2fb5ff57f1dce29760923fa50e5b961ad24 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 5 May 2022 16:25:17 +0800
Subject: [PATCH 22/45] BUG 29505

---
 project/sass/apps/AppCommunityManage/components/Add.vue   | 2 +-
 project/sass/apps/AppSpecialAdjustment/components/Add.vue | 4 ++--
 project/sass/apps/AppSpecialDisabled/components/Add.vue   | 6 +++---
 project/sass/apps/AppSpecialDrug/components/Add.vue       | 4 ++--
 project/sass/apps/AppSpecialMental/components/Add.vue     | 4 ++--
 project/sass/apps/AppSpecialPrison/components/Add.vue     | 4 ++--
 project/sass/apps/grid/AppGridMap/components/list.vue     | 6 +++---
 project/sass/apps/grid/AppGridMember/components/add.vue   | 2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/project/sass/apps/AppCommunityManage/components/Add.vue b/project/sass/apps/AppCommunityManage/components/Add.vue
index 648ab1e4..6fe36b5e 100644
--- a/project/sass/apps/AppCommunityManage/components/Add.vue
+++ b/project/sass/apps/AppCommunityManage/components/Add.vue
@@ -123,7 +123,7 @@ export default {
   methods: {
     beforeSelectTree() {
       this.treeObj.checkedKeys = [];
-      this.instance.post(`/app/appgirdinfo/listAll`).then((res) => {
+      this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => {
         if (res.code == 0) {
           this.treeObj.treeList = this.format(res.data)
           if (this.form.girdInfoList.length) {
diff --git a/project/sass/apps/AppSpecialAdjustment/components/Add.vue b/project/sass/apps/AppSpecialAdjustment/components/Add.vue
index d7d0c2df..64c3922c 100644
--- a/project/sass/apps/AppSpecialAdjustment/components/Add.vue
+++ b/project/sass/apps/AppSpecialAdjustment/components/Add.vue
@@ -134,7 +134,7 @@ export default {
         }
       }
     }
-    
+
     let IdNumberPass = (rule, value, callback) => {
       if (value) {
         if (this.idCardNoUtil.checkIdCardNo(value)) {
@@ -315,7 +315,7 @@ export default {
     },
 
     getGridList() {
-      this.instance.post(`/app/appgirdinfo/listAll`).then((res) => {
+      this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => {
         if (res.code == 0) {
           this.treeObj.treeList = this.format(res.data)
           if (this.formData.girdId) {
diff --git a/project/sass/apps/AppSpecialDisabled/components/Add.vue b/project/sass/apps/AppSpecialDisabled/components/Add.vue
index 32d8322c..5948f99a 100644
--- a/project/sass/apps/AppSpecialDisabled/components/Add.vue
+++ b/project/sass/apps/AppSpecialDisabled/components/Add.vue
@@ -134,7 +134,7 @@ export default {
         }
       }
     }
-    
+
     let IdNumberPass = (rule, value, callback) => {
       if (value) {
         if (this.idCardNoUtil.checkIdCardNo(value)) {
@@ -146,7 +146,7 @@ export default {
         callback(new Error('请输入身份证号'))
       }
     }
-    
+
     let regIcome = (rule, value, callback) => {
       if (value) {
         const reg = /^([0-9]{1,5})(\.[0-9]{1,3}){0,1}$/
@@ -325,7 +325,7 @@ export default {
     },
 
     getGridList() {
-      this.instance.post(`/app/appgirdinfo/listAll`).then((res) => {
+      this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => {
         if (res.code == 0) {
           this.treeObj.treeList = this.format(res.data)
           if (this.formData.girdId) {
diff --git a/project/sass/apps/AppSpecialDrug/components/Add.vue b/project/sass/apps/AppSpecialDrug/components/Add.vue
index 9057ae61..dfcdfdd3 100644
--- a/project/sass/apps/AppSpecialDrug/components/Add.vue
+++ b/project/sass/apps/AppSpecialDrug/components/Add.vue
@@ -134,7 +134,7 @@ export default {
         }
       }
     }
-    
+
     let IdNumberPass = (rule, value, callback) => {
       if (value) {
         if (this.idCardNoUtil.checkIdCardNo(value)) {
@@ -324,7 +324,7 @@ export default {
     },
 
     getGridList() {
-      this.instance.post(`/app/appgirdinfo/listAll`).then((res) => {
+      this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => {
         if (res.code == 0) {
           this.treeObj.treeList = this.format(res.data)
           if (this.formData.girdId) {
diff --git a/project/sass/apps/AppSpecialMental/components/Add.vue b/project/sass/apps/AppSpecialMental/components/Add.vue
index 5599e20c..f10f7b0f 100644
--- a/project/sass/apps/AppSpecialMental/components/Add.vue
+++ b/project/sass/apps/AppSpecialMental/components/Add.vue
@@ -134,7 +134,7 @@ export default {
         }
       }
     }
-    
+
     let IdNumberPass = (rule, value, callback) => {
       if (value) {
         if (this.idCardNoUtil.checkIdCardNo(value)) {
@@ -316,7 +316,7 @@ export default {
     },
 
     getGridList() {
-      this.instance.post(`/app/appgirdinfo/listAll`).then((res) => {
+      this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => {
         if (res.code == 0) {
           this.treeObj.treeList = this.format(res.data)
           if (this.formData.girdId) {
diff --git a/project/sass/apps/AppSpecialPrison/components/Add.vue b/project/sass/apps/AppSpecialPrison/components/Add.vue
index 4a223de0..1a742004 100644
--- a/project/sass/apps/AppSpecialPrison/components/Add.vue
+++ b/project/sass/apps/AppSpecialPrison/components/Add.vue
@@ -134,7 +134,7 @@ export default {
         }
       }
     }
-    
+
     let IdNumberPass = (rule, value, callback) => {
       if (value) {
         if (this.idCardNoUtil.checkIdCardNo(value)) {
@@ -335,7 +335,7 @@ export default {
     },
 
     getGridList() {
-      this.instance.post(`/app/appgirdinfo/listAll`).then((res) => {
+      this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => {
         if (res.code == 0) {
           this.treeObj.treeList = this.format(res.data)
           if (this.formData.girdId) {
diff --git a/project/sass/apps/grid/AppGridMap/components/list.vue b/project/sass/apps/grid/AppGridMap/components/list.vue
index 1019fae1..990e74ef 100644
--- a/project/sass/apps/grid/AppGridMap/components/list.vue
+++ b/project/sass/apps/grid/AppGridMap/components/list.vue
@@ -22,7 +22,7 @@
               :filter-node-method="filterNode"
               default-expand-all
               highlight-current>
-              
+
               <span class="custom-tree-node" :title="node.label" style="" slot-scope="{ node, data }">{{ node.label }}</span>
             </el-tree>
           </div>
@@ -100,7 +100,7 @@
         return data.girdName.indexOf(value) !== -1;
       },
       getTreeList() {
-        return this.instance.post(`/app/appgirdinfo/listAll`).then((res) => {
+        return this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => {
           if (res.code == 0) {
             this.treeObj.treeList = res.data;
 
@@ -140,7 +140,7 @@
 
           return false
         }
-        
+
         this.instance.post(`/app/appgirdinfo/queryChildGirdInfoByGirdId?girdId=${val.id}`).then((res) => {
           if (res?.data) {
             const arr = res.data.map(v => {
diff --git a/project/sass/apps/grid/AppGridMember/components/add.vue b/project/sass/apps/grid/AppGridMember/components/add.vue
index 81ac9ded..3c560d60 100644
--- a/project/sass/apps/grid/AppGridMember/components/add.vue
+++ b/project/sass/apps/grid/AppGridMember/components/add.vue
@@ -401,7 +401,7 @@ export default {
     },
     beforeSelectTree() {
       this.treeObj.checkedKeys = [];
-      this.instance.post(`/app/appgirdinfo/listAll`, null, null).then((res) => {
+      this.instance.post(`/app/appgirdinfo/listAllByTop`, null, null).then((res) => {
         if (res.code == 0) {
           this.treeObj.treeList = res.data;
           this.forms.girdInfoList.map((e) => {

From bd2b066e9a785d6a66c76f8596910882c8ec7818 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 5 May 2022 16:45:19 +0800
Subject: [PATCH 23/45] BUG 29508

---
 .../apps/grid/AppGridMap/components/list.vue  | 617 +++++++++---------
 1 file changed, 310 insertions(+), 307 deletions(-)

diff --git a/project/sass/apps/grid/AppGridMap/components/list.vue b/project/sass/apps/grid/AppGridMap/components/list.vue
index 990e74ef..307e4178 100644
--- a/project/sass/apps/grid/AppGridMap/components/list.vue
+++ b/project/sass/apps/grid/AppGridMap/components/list.vue
@@ -13,17 +13,20 @@
           </header>
           <div class="tree-div">
             <el-tree
-              :data="treeObj.treeList"
-              :props="treeObj.defaultProps"
-              @node-click="handleNodeClick"
-              node-key="id"
-              ref="tree"
-              :expand-on-click-node="false"
-              :filter-node-method="filterNode"
-              default-expand-all
-              highlight-current>
-
-              <span class="custom-tree-node" :title="node.label" style="" slot-scope="{ node, data }">{{ node.label }}</span>
+                :data="treeObj.treeList"
+                :props="treeObj.defaultProps"
+                @node-click="handleNodeClick"
+                node-key="id"
+                ref="tree"
+                :expand-on-click-node="false"
+                :filter-node-method="filterNode"
+                default-expand-all
+                highlight-current>
+              <template slot-scope="{ node, data }">
+                <el-tooltip effect="light" :content="node.label" placement="right">
+                  <div v-text="node.label"/>
+                </el-tooltip>
+              </template>
             </el-tree>
           </div>
         </div>
@@ -35,295 +38,295 @@
   </div>
 </template>
 <script>
-  import {mapState} from 'vuex'
+import {mapState} from 'vuex'
 
-  export default {
-    name: 'AppGridMap',
-    label: "网格地图",
-    props: {
-      instance: Function,
-      dict: Object,
-      permissions: Function,
-    },
-    data() {
-      return {
-        map: null,
-        mapLib: null,
-        show: true,
-        retryMapCount: 0,
-        polygons: [],
+export default {
+  name: 'AppGridMap',
+  label: "网格地图",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function,
+  },
+  data() {
+    return {
+      map: null,
+      mapLib: null,
+      show: true,
+      retryMapCount: 0,
+      polygons: [],
 
-        drawer: false,
-        filterText: "",
-        treeObj: {
-          treeList: [],
-          defaultProps: {
-            children: "girdList",
-            label: "girdName",
-          },
-          defaultExpandedKeys: [],
+      drawer: false,
+      filterText: "",
+      treeObj: {
+        treeList: [],
+        defaultProps: {
+          children: "girdList",
+          label: "girdName",
         },
-        ops: {},
+        defaultExpandedKeys: [],
+      },
+      ops: {},
 
-        path: [],
-        searchObj: {
-          onlineStatus: "",
-          girdMemberName: "",
-        },
-        member: {
-          memberList: [],
-        },
-        currInfo: {},
-        infoWindowHtml: "",
-        marker: {},
-        activeId: null,
-        labels: []
-      };
+      path: [],
+      searchObj: {
+        onlineStatus: "",
+        girdMemberName: "",
+      },
+      member: {
+        memberList: [],
+      },
+      currInfo: {},
+      infoWindowHtml: "",
+      marker: {},
+      activeId: null,
+      labels: []
+    };
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  created() {
+    this.dict.load("onlineStatus")
+    this.getTreeList().then(() => {
+      this.getLeafNodes()
+    })
+  },
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val);
     },
-    computed: {
-      ...mapState(['user']),
+  },
+  methods: {
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.girdName.indexOf(value) !== -1;
     },
-    created() {
-      this.dict.load("onlineStatus")
-      this.getTreeList().then(() => {
-        this.getLeafNodes()
+    getTreeList() {
+      return this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => {
+        if (res.code == 0) {
+          this.treeObj.treeList = [res.data];
+
+          this.$nextTick(() => {
+            res.data.length && this.$refs.tree.setCurrentKey(res.data[0].id)
+          })
+        }
       })
     },
-    watch: {
-      filterText(val) {
-        this.$refs.tree.filter(val);
-      },
+
+    onMapInit() {
+      this.instance.post("/app/appdvcpconfig/getCorpLocation").then(res => {
+        if (res.code === 0) {
+          this.map.setCenter(new this.mapLib.LatLng(res.data.lat, res.data.lng))
+        }
+      })
     },
-    methods: {
-      filterNode(value, data) {
-        if (!value) return true;
-        return data.girdName.indexOf(value) !== -1;
-      },
-      getTreeList() {
-        return this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => {
-          if (res.code == 0) {
-            this.treeObj.treeList = res.data;
 
-            this.$nextTick(() => {
-              res.data.length && this.$refs.tree.setCurrentKey(res.data[0].id)
-            })
-          }
-        })
-      },
-
-      onMapInit () {
-        this.instance.post("/app/appdvcpconfig/getCorpLocation").then(res=>{
-          if (res.code === 0) {
-            this.map.setCenter(new this.mapLib.LatLng(res.data.lat, res.data.lng))
-          }
-        })
-      },
-
-      getLeafNodes() {
-        this.instance.post(`/app/appgirdinfo/listAll2`).then((res) => {
-          if (res?.data) {
-            const arr = res.data.map(v => {
-              return {
-                id: v.id,
-                girdName: v.girdName,
-                points: v.points ? v.points.map(p => [p.lng, p.lat]) : []
-              }
-            }).filter(v => v.points.length)
-
-            this.renderGridMap(arr)
-          }
-        })
-      },
-      handleNodeClick (val) {
-        if (val.girdLevel === '0') {
-          this.getLeafNodes()
-
-          return false
-        }
-
-        this.instance.post(`/app/appgirdinfo/queryChildGirdInfoByGirdId?girdId=${val.id}`).then((res) => {
-          if (res?.data) {
-            const arr = res.data.map(v => {
-              return {
-                id: v.id,
-                girdName: v.girdName,
-                points: v.points ? v.points.map(p => [p.lng, p.lat]) : []
-              }
-            }).filter(v => v.points.length)
-
-            if (!arr.length) {
-              return this.$message.error('该网格还未标绘')
+    getLeafNodes() {
+      this.instance.post(`/app/appgirdinfo/listAll2`).then((res) => {
+        if (res?.data) {
+          const arr = res.data.map(v => {
+            return {
+              id: v.id,
+              girdName: v.girdName,
+              points: v.points ? v.points.map(p => [p.lng, p.lat]) : []
             }
+          }).filter(v => v.points.length)
 
-            this.renderGridMap(arr)
-          }
-        })
-      },
-
-      fitBounds(latLngList, count = 0) {
-        let {mapLib: TMap} = this
-        if (TMap) {
-          if (latLngList.length === 0) {
-            return null;
-          }
-          let boundsN = latLngList[0].getLat();
-          let boundsS = boundsN;
-          let boundsW = latLngList[0].getLng();
-          let boundsE = boundsW;
-          latLngList.forEach((point) => {
-            point.getLat() > boundsN && (boundsN = point.getLat());
-            point.getLat() < boundsS && (boundsS = point.getLat());
-            point.getLng() > boundsE && (boundsE = point.getLng());
-            point.getLng() < boundsW && (boundsW = point.getLng());
-          });
-          return new TMap.LatLngBounds(
-              new TMap.LatLng(boundsS, boundsW),
-              new TMap.LatLng(boundsN, boundsE)
-          );
-        } else {
-          if (count < 5) {
-            this.fitBounds(latLngList, ++count)
-          }
+          this.renderGridMap(arr)
         }
-      },
+      })
+    },
+    handleNodeClick(val) {
+      if (val.girdLevel === '0') {
+        this.getLeafNodes()
 
-      renderGridMap(paths) {
-        let {map, mapLib: TMap } = this
-        if (TMap) {
-          if (this.polygons.length > 0) {
-            this.polygons.forEach(e => e.destroy())
-            this.labels.forEach(e => {
-              e.destroy(e.id)
-            })
-            this.polygons = []
-            this.labels = []
+        return false
+      }
+
+      this.instance.post(`/app/appgirdinfo/queryChildGirdInfoByGirdId?girdId=${val.id}`).then((res) => {
+        if (res?.data) {
+          const arr = res.data.map(v => {
+            return {
+              id: v.id,
+              girdName: v.girdName,
+              points: v.points ? v.points.map(p => [p.lng, p.lat]) : []
+            }
+          }).filter(v => v.points.length)
+
+          if (!arr.length) {
+            return this.$message.error('该网格还未标绘')
           }
-          if (paths?.length > 0) {
-            let bounds = []
-            paths.forEach((path, i) => {
-              let polygon = new TMap.MultiPolygon({
-                map, styles: {
-                  default: new TMap.PolygonStyle({
-                    showBorder: true,
-                    borderColor: '#5088FF',
-                    borderWidth: 2,
-                    color: this.$colorUtils.Hex2RGBA('#5088FF', 0.1)
-                  })
-                },
-                id: path.id,
-                geometries: [{paths: path.points.map(e => new TMap.LatLng(e[1], e[0]))}]
-              })
-              this.polygons.push(polygon)
-              bounds.push(this.fitBounds(path.points.map(e => new TMap.LatLng(e[1], e[0]))))
 
-              polygon.on('click', e => {
-                // const id = e.target.id
-                // this.getGridInfo(id)
-              })
+          this.renderGridMap(arr)
+        }
+      })
+    },
 
-              const points = path.points.map(e => new TMap.LatLng(e[1], e[0]))
-
-              var position = TMap.geometry.computeCentroid(points)
-
-              let label = new TMap.MultiLabel({
-                id: `label~${path.id}`,
-                data: path.id,
-                map: map,
-                styles: {
-                  building:  new TMap.LabelStyle({
-                    color: '#3777FF',
-                    size: 20,
-                    alignment: 'center',
-                    verticalAlignment: 'middle'
-                  })
-                },
-                geometries: [
-                  {
-                    id: `label-class-${i}`,
-                    styleId: 'building',
-                    position: position,
-                    content: path.girdName,
-                  }
-                ]
-              })
-              this.labels.push(label)
-              label.on('click', e => {
-                // this.getGridInfo(e.target.id.split('~')[1])
-              });
-            })
-            bounds = bounds.reduce((a, b) => {
-              return this.fitBounds([
-                a.getNorthEast(),
-                a.getSouthWest(),
-                b.getNorthEast(),
-                b.getSouthWest(),
-              ]);
-            });
-            map.fitBounds(bounds, {padding: 100})
-          }
+    fitBounds(latLngList, count = 0) {
+      let {mapLib: TMap} = this
+      if (TMap) {
+        if (latLngList.length === 0) {
+          return null;
         }
-      },
-      hasClass(ele, cls) {
-        return ele.className.match(new RegExp("(\\s|^)" + cls + "(\\s|$)"));
-      },
-      addClass(ele, cls) {
-        if (!this.hasClass(ele, cls)) ele.className += " " + cls;
-      },
-      removeClass(ele, cls) {
-        if (this.hasClass(ele, cls)) {
-          const reg = new RegExp("(\\s|^)" + cls + "(\\s|$)");
-          ele.className = ele.className.replace(reg, " ");
-        }
-      },
-      changClass(ele, className) {
-        if (!this.hasClass(ele, className)) {
-          this.addClass(ele, className);
-        } else {
-          this.removeClass(ele, className);
-        }
-      },
-      percentage() {
-        if (this.member.onlineNumber == 0) {
-          return 0;
-        } else {
-          return (
-              100 *
-              (this.member.onlineNumber / this.member.allMemberNumber)
-          ).toFixed(2);
-        }
-      },
-      getMemberList() {
-        this.instance.post(`/app/appgirdmemberinfo/queryGirdMemberByMap`, this.searchObj).then((res) => {
-          if (res.code == 0) {
-            let markers = [];
-            this.member = res.data;
-            this.member.memberList.map((e) => {
-              if (e.onlineStatus == "1") {
-                markers.push({lng: e.lng, lat: e.lat, name: e.name});
-              }
-            });
-            this.initMap(null, null, markers);
-          }
+        let boundsN = latLngList[0].getLat();
+        let boundsS = boundsN;
+        let boundsW = latLngList[0].getLng();
+        let boundsE = boundsW;
+        latLngList.forEach((point) => {
+          point.getLat() > boundsN && (boundsN = point.getLat());
+          point.getLat() < boundsS && (boundsS = point.getLat());
+          point.getLng() > boundsE && (boundsE = point.getLng());
+          point.getLng() < boundsW && (boundsW = point.getLng());
         });
-      },
-      clickMember(marker) {
-        if (marker.onlineStatus == 1) {
-          this.activeId = marker.id;
-          this.marker = marker;
-          this.infoWindowContent(marker);
+        return new TMap.LatLngBounds(
+            new TMap.LatLng(boundsS, boundsW),
+            new TMap.LatLng(boundsN, boundsE)
+        );
+      } else {
+        if (count < 5) {
+          this.fitBounds(latLngList, ++count)
         }
-      },
-      infoWindowContent(marker) {
-        this.instance
-        .post(`/app/location/xyToAddress`, null, {
-          params: {
-            x: marker.lat,
-            y: marker.lng,
-          },
-        })
-        .then((res) => {
-          if (res.code == 0) {
-            this.infoWindowHtml = `<div class="info">
+      }
+    },
+
+    renderGridMap(paths) {
+      let {map, mapLib: TMap} = this
+      if (TMap) {
+        if (this.polygons.length > 0) {
+          this.polygons.forEach(e => e.destroy())
+          this.labels.forEach(e => {
+            e.destroy(e.id)
+          })
+          this.polygons = []
+          this.labels = []
+        }
+        if (paths?.length > 0) {
+          let bounds = []
+          paths.forEach((path, i) => {
+            let polygon = new TMap.MultiPolygon({
+              map, styles: {
+                default: new TMap.PolygonStyle({
+                  showBorder: true,
+                  borderColor: '#5088FF',
+                  borderWidth: 2,
+                  color: this.$colorUtils.Hex2RGBA('#5088FF', 0.1)
+                })
+              },
+              id: path.id,
+              geometries: [{paths: path.points.map(e => new TMap.LatLng(e[1], e[0]))}]
+            })
+            this.polygons.push(polygon)
+            bounds.push(this.fitBounds(path.points.map(e => new TMap.LatLng(e[1], e[0]))))
+
+            polygon.on('click', e => {
+              // const id = e.target.id
+              // this.getGridInfo(id)
+            })
+
+            const points = path.points.map(e => new TMap.LatLng(e[1], e[0]))
+
+            var position = TMap.geometry.computeCentroid(points)
+
+            let label = new TMap.MultiLabel({
+              id: `label~${path.id}`,
+              data: path.id,
+              map: map,
+              styles: {
+                building: new TMap.LabelStyle({
+                  color: '#3777FF',
+                  size: 20,
+                  alignment: 'center',
+                  verticalAlignment: 'middle'
+                })
+              },
+              geometries: [
+                {
+                  id: `label-class-${i}`,
+                  styleId: 'building',
+                  position: position,
+                  content: path.girdName,
+                }
+              ]
+            })
+            this.labels.push(label)
+            label.on('click', e => {
+              // this.getGridInfo(e.target.id.split('~')[1])
+            });
+          })
+          bounds = bounds.reduce((a, b) => {
+            return this.fitBounds([
+              a.getNorthEast(),
+              a.getSouthWest(),
+              b.getNorthEast(),
+              b.getSouthWest(),
+            ]);
+          });
+          map.fitBounds(bounds, {padding: 100})
+        }
+      }
+    },
+    hasClass(ele, cls) {
+      return ele.className.match(new RegExp("(\\s|^)" + cls + "(\\s|$)"));
+    },
+    addClass(ele, cls) {
+      if (!this.hasClass(ele, cls)) ele.className += " " + cls;
+    },
+    removeClass(ele, cls) {
+      if (this.hasClass(ele, cls)) {
+        const reg = new RegExp("(\\s|^)" + cls + "(\\s|$)");
+        ele.className = ele.className.replace(reg, " ");
+      }
+    },
+    changClass(ele, className) {
+      if (!this.hasClass(ele, className)) {
+        this.addClass(ele, className);
+      } else {
+        this.removeClass(ele, className);
+      }
+    },
+    percentage() {
+      if (this.member.onlineNumber == 0) {
+        return 0;
+      } else {
+        return (
+            100 *
+            (this.member.onlineNumber / this.member.allMemberNumber)
+        ).toFixed(2);
+      }
+    },
+    getMemberList() {
+      this.instance.post(`/app/appgirdmemberinfo/queryGirdMemberByMap`, this.searchObj).then((res) => {
+        if (res.code == 0) {
+          let markers = [];
+          this.member = res.data;
+          this.member.memberList.map((e) => {
+            if (e.onlineStatus == "1") {
+              markers.push({lng: e.lng, lat: e.lat, name: e.name});
+            }
+          });
+          this.initMap(null, null, markers);
+        }
+      });
+    },
+    clickMember(marker) {
+      if (marker.onlineStatus == 1) {
+        this.activeId = marker.id;
+        this.marker = marker;
+        this.infoWindowContent(marker);
+      }
+    },
+    infoWindowContent(marker) {
+      this.instance
+      .post(`/app/location/xyToAddress`, null, {
+        params: {
+          x: marker.lat,
+          y: marker.lng,
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          this.infoWindowHtml = `<div class="info">
                                           <p>
                                               <span class="name">${marker.name}</span>
                                               <span class="lat">${marker.lng},${marker.lat}</span>
@@ -335,31 +338,31 @@
                                               <span class="iconfont iconarea" id="addressSpan">当日轨迹</span>
                                           </p>
                                       </div>`;
-            this.initMap(false, marker);
-          }
-        });
-      },
-      queryTrajectory() {
-        this.instance
-        .post(`/app/appgirdmembertrajectory/queryTrajectory`, null, {
-          params: {
-            userId: this.marker.userId,
-          },
-        })
-        .then((res) => {
-          if (res.code == 0) {
-            let path = [];
-            if (res.data) {
-              res.data.map((e, index) => {
-                path[index] = [e.lng, e.lat];
-              });
-            }
-            this.initMap(path, this.marker);
-          }
-        });
-      },
+          this.initMap(false, marker);
+        }
+      });
     },
-  }
+    queryTrajectory() {
+      this.instance
+      .post(`/app/appgirdmembertrajectory/queryTrajectory`, null, {
+        params: {
+          userId: this.marker.userId,
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          let path = [];
+          if (res.data) {
+            res.data.map((e, index) => {
+              path[index] = [e.lng, e.lat];
+            });
+          }
+          this.initMap(path, this.marker);
+        }
+      });
+    },
+  },
+}
 </script>
 
 <style lang="scss" scoped>
@@ -374,7 +377,7 @@
   }
 
   ::v-deep .is-current {
-    & > .el-tree-node__content > .custom-tree-node {
+    & > .el-tree-node__content > .el-tooltip {
       color: #5088ff;
     }
   }
@@ -576,7 +579,7 @@
             background: #333c53;
           }
 
-          .el-tree-node__label {
+          .el-tooltip {
             color: #fff;
           }
 
@@ -585,7 +588,7 @@
           }
 
           .is-current > .el-tree-node__content {
-            .el-tree-node__label {
+            .el-tooltip {
               color: #5088ff;
             }
           }

From a0c2bf8f67ba3f4918abc48310ef4b9257528298 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 5 May 2022 18:00:11 +0800
Subject: [PATCH 24/45] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +-
 .../bigscreen/designer/components/Add.vue     | 13 ++++
 .../bigscreen/designer/components/Layout.vue  |  8 +-
 .../bigscreen/viewer/AppGigscreenViewer.vue   |  3 +-
 project/dvui/layout/AiDvPanel/AiDvPanel.vue   |  3 +-
 project/dvui/layout/AiDvPanel/asset/dq.svg    |  1 +
 project/dvui/layout/AiDvPanel/asset/gz.svg    |  1 +
 .../dvui/layout/AiDvPanel/borders/border5.vue | 78 +++++++++++++++++++
 8 files changed, 102 insertions(+), 7 deletions(-)
 create mode 100644 project/dvui/layout/AiDvPanel/asset/dq.svg
 create mode 100644 project/dvui/layout/AiDvPanel/asset/gz.svg
 create mode 100644 project/dvui/layout/AiDvPanel/borders/border5.vue

diff --git a/package.json b/package.json
index 161087b4..3ebb719c 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "bin-code-editor": "^0.9.0",
     "dayjs": "^1.8.35",
     "dvcp-dv": "^1.0.0",
-    "dvcp-dv-ui": "^2.0.1",
+    "dvcp-dv-ui": "file:project/dvui",
     "dvcp-ui": "^1.42.2",
     "echarts": "^5.1.2",
     "mp4box": "^0.4.1",
diff --git a/packages/bigscreen/designer/components/Add.vue b/packages/bigscreen/designer/components/Add.vue
index 9a267dd3..8816e424 100644
--- a/packages/bigscreen/designer/components/Add.vue
+++ b/packages/bigscreen/designer/components/Add.vue
@@ -64,6 +64,11 @@
         @close="isShowLayout = false">
       </Layout>
       <ai-dv-wrapper :views="[{label: '返回'}]" @change="screenId = false" v-if="screenId" :title="form.name">
+        <AiDvBackground
+          :theme="config.theme"
+          v-if="config.length || config.theme === '1'"
+          :src="config.theme === '1' ? 'https://cdn.cunwuyun.cn/dvcp/dv/img/dj-bg.png' : config.backgroundImage[0].url">
+        </AiDvBackground>
         <AppGigscreenViewer :urlPrefix="urlPrefix" :instance="instance" :dict="dict" :id="screenId"></AppGigscreenViewer>
       </ai-dv-wrapper>
       <ai-dialog :visible.sync="dialog" title="定制大屏" @closed="custom={}" @onConfirm="handleCustomizedDV">
@@ -137,6 +142,9 @@ export default {
       rules: {
         dv: [{required: true, message: "请选择 定制大屏"}],
         title: [{required: true, message: "请输入 大屏标题"}],
+      },
+      config: {
+        backgroundImage: []
       }
     }
   },
@@ -193,6 +201,11 @@ export default {
     },
 
     toViewer(id) {
+      this.instance.post(`${this.urlPrefix}/appdiylargescreen/queryLargeScreenDetailById?id=${id}`).then(res => {
+        if (res.data) {
+          this.config = JSON.parse(res.data.config).dashboard
+        }
+      })
       this.screenId = id
     },
 
diff --git a/packages/bigscreen/designer/components/Layout.vue b/packages/bigscreen/designer/components/Layout.vue
index 03ddd261..f7df281b 100644
--- a/packages/bigscreen/designer/components/Layout.vue
+++ b/packages/bigscreen/designer/components/Layout.vue
@@ -64,8 +64,8 @@
                 <div style="width: 100%; height: 100%">
                   <AiDvBackground
                     :theme="dashboard.theme"
-                    v-if="dashboard.backgroundImage.length"
-                    :src="dashboard.backgroundImage[0].url">
+                    v-if="dashboard.backgroundImage.length || dashboard.theme === '1'"
+                    :src="dashboard.theme === '1' ? 'https://cdn.cunwuyun.cn/dvcp/dv/img/dj-bg.png' : dashboard.backgroundImage[0].url">
                   </AiDvBackground>
                   <vue-draggable-resizable
                     :w="item.width"
@@ -404,7 +404,7 @@
         }],
         images: [],
         summaryList: ['summary0', 'summary1', 'summary2', 'summary3', 'summary4', 'summary5', 'summary7', 'summary9', 'summary10'],
-        borderList: ['border0', 'border1', 'border2', 'border3', 'border4']
+        borderList: ['border0', 'border1', 'border2', 'border3', 'border4', 'border5']
       }
     },
 
@@ -608,7 +608,7 @@
         this.$set(this.componentList[index], 'height', h)
 
         if (type.indexOf('Chart') > -1) {
-          this.$refs[`chart${index}`][0].watchResize()
+          // this.$refs[`chart${index}`][0].watchResize()
         }
       },
 
diff --git a/packages/bigscreen/viewer/AppGigscreenViewer.vue b/packages/bigscreen/viewer/AppGigscreenViewer.vue
index 6e26e49e..dc0f1c35 100644
--- a/packages/bigscreen/viewer/AppGigscreenViewer.vue
+++ b/packages/bigscreen/viewer/AppGigscreenViewer.vue
@@ -14,7 +14,7 @@
         }"
           v-for="(item, index) in componentList"
           :key="index">
-        <RenderElement :data="item" :index="index"></RenderElement>
+        <RenderElement :data="item" :index="index" :theme="dashboard.theme"></RenderElement>
       </div>
     </div>
     <components v-else :is="component" :dict="dict" :instance="instance" :nav="meta"/>
@@ -56,6 +56,7 @@ export default {
         width: 1920,
         height: 1080,
         backgroundColor: '',
+        theme: '0',
         backgroundImage: []
       },
       componentList: [],
diff --git a/project/dvui/layout/AiDvPanel/AiDvPanel.vue b/project/dvui/layout/AiDvPanel/AiDvPanel.vue
index 77386e08..ec9f3eac 100644
--- a/project/dvui/layout/AiDvPanel/AiDvPanel.vue
+++ b/project/dvui/layout/AiDvPanel/AiDvPanel.vue
@@ -16,10 +16,11 @@ import Border0 from "./borders/border0";
 import Border2 from "./borders/border2";
 import Border3 from "./borders/border3";
 import Border4 from "./borders/border4";
+import Border5 from "./borders/border5";
 
 export default {
   name: "AiDvPanel",
-  components: { Border0, Border1, Border2, Border3, Border4 },
+  components: { Border0, Border1, Border2, Border3, Border4, Border5 },
   props: {
     title: {default: "请传入标题"},
     border: {default: "border0"}
diff --git a/project/dvui/layout/AiDvPanel/asset/dq.svg b/project/dvui/layout/AiDvPanel/asset/dq.svg
new file mode 100644
index 00000000..e99ced04
--- /dev/null
+++ b/project/dvui/layout/AiDvPanel/asset/dq.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="180" height="40" viewBox="0 0 180 40"><defs><linearGradient id="a" x1="100%" x2="0%" y1="50%" y2="50%"><stop offset="0%" stop-color="#FF5244"/><stop offset="100%" stop-color="#D21600"/></linearGradient><linearGradient id="d" x1="50%" x2="50%" y1="0%" y2="100%"><stop offset="0%" stop-color="#FFF6C7"/><stop offset="100%" stop-color="#FF9A02"/></linearGradient><filter id="c" width="170%" height="170%" x="-35%" y="-25%" filterUnits="objectBoundingBox"><feOffset dy="2" in="SourceAlpha" result="shadowOffsetOuter1"/><feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation="2"/><feColorMatrix in="shadowBlurOuter1" values="0 0 0 0 0.457823822 0 0 0 0 0.0353836399 0 0 0 0 0.0353836399 0 0 0 0.5 0"/></filter><path id="b" d="M14.0068268,4.00341841 C19.1676737,5.93854789 22.2992804,12.1241478 19.6165546,17.1359344 L13.0698171,10.5587743 L15.5689049,8.05113932 L14.0059386,6.49580357 C13.1435377,7.34040354 11.7729399,7.52047681 10.8486002,7.14810955 L5.8726766,12.1267591 L8.69064405,14.9339591 L10.5689895,13.0633646 L17.1135326,19.6296095 C13.9108489,21.3881387 9.47146108,20.8339486 6.19504112,17.4306894 L4.60852179,19.0122006 C5.08399639,19.6710504 5.48226026,20.2679818 5.97736409,20.7685363 C5.93418188,20.8204223 5.79807822,20.9320541 5.79546587,20.9351093 C5.71214222,20.9215829 5.61356765,20.8893337 5.52588659,20.8893337 C4.6818088,20.8893337 4,21.6240357 4,22.4686514 C4,23.3119353 4.68835536,24 5.53242792,24 C6.3769498,24 7.09931278,23.3058249 7.09931278,22.4616793 C7.09931278,22.3631299 7.0770712,22.2733022 7.06004909,22.1804193 L7.30389669,21.941044 C11.0706294,24.4813878 15.1989851,24.797947 19.6409696,22.1398662 L21.4752551,23.9808072 L23.9861142,21.5041262 L22.140047,19.6387699 C27.4379223,11.6549703 20.3738238,3.81244048 14.0068268,4.00341841 L14.0068268,4.00341841 L14.0068268,4.00341841 Z"/></defs><g fill="none" fill-rule="evenodd"><path fill="#850100" d="M148,0 L148,20 L59.9048072,11.9285139 L10,13.9990592 C15.970231,4.66635305 27.2050908,0.226703614 43.7045795,0.680110841 C68.4538125,1.36022168 99.8326471,7.79622159 116.382143,8.89811079 C127.415141,9.6327036 137.954427,6.66666667 148,0 Z"/><path fill="url(#a)" d="M0,32.567 C0,30.6617245 0,28.1127921 0,24.9202028 C9.58415484,22.7190157 8.28549035,6.15276659 30.4031861,2.50814365 C52.5208819,-1.13647928 100.23732,16.019279 119.855503,16.019279 C132.934291,16.019279 145.385696,13.1031801 157.209716,7.27098241 L157.209716,22.1589448 C166.282732,22.9696483 173.879493,26.439 180,32.567 C168.804955,37.9116546 144.843267,40 124.922081,40 C105.000895,40 83.8242706,36.2095908 66.6700235,27.6117443 C49.5157764,19.0138977 29.8385713,12.4021534 20,21 C13.4409524,26.7318977 6.77428577,30.5875644 0,32.567 Z"/><g transform="translate(0 2)"><rect width="28" height="28" fill="#000" fill-rule="nonzero" opacity="0"/><use xlink:href="#b" fill="#000" filter="url(#c)"/><use xlink:href="#b" fill="url(#d)"/></g></g></svg>
\ No newline at end of file
diff --git a/project/dvui/layout/AiDvPanel/asset/gz.svg b/project/dvui/layout/AiDvPanel/asset/gz.svg
new file mode 100644
index 00000000..2ad812db
--- /dev/null
+++ b/project/dvui/layout/AiDvPanel/asset/gz.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="26" viewBox="0 0 64 26"><path fill="#FFD581" fill-rule="evenodd" d="M1271.01668,142.463297 C1271.22293,142.627888 1271.44093,142.463297 1271.89854,142.463297 C1272.35616,142.463297 1272.44196,142.603037 1272.93771,142.98999 C1273.43345,143.376944 1273.37625,143.996352 1273.76713,143.822353 C1274.158,143.648354 1274.53935,143.032315 1274.89209,143.272148 C1275.24483,143.511981 1275.37831,144.557363 1275.0351,145.013516 C1274.98934,145.074336 1274.94336,145.139071 1274.89736,145.205183 L1274.75951,145.405113 C1274.50739,145.76992 1274.26061,146.099621 1274.05183,145.972024 C1273.76713,145.798027 1273.62889,144.428987 1272.93771,144.428987 L1271.56963,144.428987 L1271.56963,144.428987 C1271.05958,144.428987 1270.81171,144.584173 1270.32073,144.264396 C1269.82975,143.944619 1269.39597,144.015158 1269.53421,143.648354 C1269.67245,143.281551 1269.69151,142.999394 1270.10145,143.140473 C1270.5114,143.281551 1271.04528,143.44144 1270.683,143.140473 C1270.32073,142.839506 1269.95845,142.759151 1270.32073,142.463297 C1270.683,142.167443 1270.81043,142.298706 1271.01668,142.463297 Z M1258.22937,138.674998 C1258.41838,138.753887 1258.60254,138.763449 1258.66312,138.964257 C1258.7237,139.165064 1258.94179,139.387388 1259.14777,139.533213 C1259.35374,139.679038 1259.46279,139.600149 1259.51852,139.81052 C1259.57425,140.02089 1259.60575,140.140424 1259.51852,140.267122 C1259.43128,140.39382 1259.30285,140.38426 1259.30285,140.527694 C1259.30285,140.671128 1259.26166,140.855197 1259.43128,140.855197 L1259.74872,140.855197 L1259.74872,140.855197 C1259.95384,140.855197 1260.03139,140.732626 1260.15739,140.660909 C1260.2834,140.589192 1260.34882,140.660909 1260.54995,140.660909 C1260.75108,140.660909 1260.80439,140.738711 1260.8892,140.855197 C1260.97401,140.971683 1261.1509,141.071668 1261.02005,141.291602 C1260.8892,141.511535 1260.92797,141.578474 1260.73896,141.717127 C1260.54995,141.85578 1260.63234,141.917936 1260.36578,142.025511 C1260.09923,142.133087 1260.09111,142.1044 1259.83553,142.1044 C1259.57995,142.1044 1259.55971,142.188726 1259.43128,142.025511 C1259.30285,141.862296 1259.36743,141.90664 1259.30285,141.717127 C1259.23828,141.527614 1259.14777,141.385489 1259.14777,141.291602 C1259.14777,141.197715 1259.14377,141.111654 1259.02504,141.154684 C1258.9063,141.197715 1258.77146,141.151213 1258.71729,141.291602 C1258.66312,141.43199 1258.75435,141.457628 1258.66312,141.587378 L1258.64187,141.620312 L1258.64187,141.620312 L1258.635,141.635 C1258.61751,141.640338 1258.57945,141.659536 1258.49193,141.717127 C1258.22937,141.889902 1258.36364,141.946622 1258.0348,142.025511 C1257.70596,142.1044 1257.37881,142.1044 1257.15473,142.1044 C1256.93065,142.1044 1256.75518,142.167443 1256.59525,142.167443 C1256.43531,142.167443 1256.24872,142.015991 1256.37958,141.801684 C1256.51043,141.587378 1256.73364,141.427256 1256.94419,141.359429 C1257.15473,141.291602 1257.31624,141.220776 1257.43367,141.154684 C1257.55109,141.088593 1257.63084,141.001022 1257.52664,140.855197 C1257.42244,140.709373 1257.23343,140.269508 1257.32794,140.209743 C1257.42244,140.149979 1257.54603,140.453584 1257.70596,140.39382 C1257.86589,140.334056 1258.05005,140.193011 1257.78835,139.894189 C1257.52664,139.595368 1257.26736,139.659915 1257.32794,139.401732 C1257.38852,139.14355 1257.34732,138.952304 1257.52664,138.892539 C1257.70596,138.832775 1258.04036,138.596109 1258.22937,138.674998 Z M1292.22894,135.357319 C1292.72813,135.118849 1292.93505,135.244089 1293.05094,135.59579 C1293.16683,135.947491 1293.39261,136.320141 1293.5994,136.716978 C1293.80619,137.113814 1294.10351,137.477893 1294.0502,137.817234 C1293.99689,138.156574 1293.93796,138.221241 1294.0502,138.527362 C1294.16244,138.833482 1294.02577,139.306037 1293.80768,139.36102 C1293.58958,139.416003 1293.49763,139.946144 1293.5994,140.153811 C1293.70118,140.361479 1294.85769,140.758433 1294.98651,141.039106 C1295.11534,141.319779 1294.28762,141.914301 1293.93796,142.052954 C1293.58831,142.191608 1293.36596,141.648395 1293.27145,141.244386 C1293.17695,140.840377 1293.09126,140.460844 1292.8441,140.365888 C1292.59693,140.270933 1292.2889,140.712118 1291.89149,140.903363 C1291.49409,141.094609 1290.07612,140.630562 1289.32777,140.365888 C1288.57942,140.101214 1288.7616,139.6778 1289.06692,139.574771 C1289.37224,139.471742 1289.62583,139.6778 1289.9859,139.574771 C1290.34596,139.471742 1291.28852,139.18212 1291.40241,139.115184 C1291.5163,139.048248 1290.90494,138.496157 1290.60688,138.221241 C1290.30883,137.946325 1290.36568,137.82901 1290.52319,137.721435 C1290.6807,137.613859 1291.00038,137.903982 1291.20254,137.997214 C1291.40469,138.090446 1291.4663,138.322398 1291.55111,138.527362 C1291.63592,138.732325 1292.06725,138.746345 1292.14237,138.527362 C1292.21749,138.308378 1291.90083,138.007656 1291.78374,137.582128 C1291.66664,137.1566 1291.63835,136.716978 1291.55111,136.305964 C1291.46388,135.89495 1291.72976,135.59579 1292.22894,135.357319 Z M1283.35465,136.098737 C1283.66053,136.35691 1283.46341,136.108795 1284.0072,136.232853 C1284.55098,136.35691 1285.39207,137.410559 1285.73533,137.76932 C1286.0786,138.12808 1286.63299,137.759262 1287.09521,137.943671 C1287.55743,138.12808 1287.84433,138.627235 1287.25846,139.460731 C1286.6726,140.294226 1286.0214,140.500004 1285.73533,140.288771 C1285.44927,140.077539 1285.17087,138.623741 1284.83981,138.476214 C1284.50875,138.328686 1284.77385,138.944503 1284.53254,139.236146 C1284.29123,139.527789 1283.80453,139.917268 1282.61714,139.917268 C1281.42975,139.917268 1280.88935,139.537636 1280.58687,139.537636 C1280.28439,139.537636 1280.10486,139.890117 1279.68002,139.460731 C1279.25518,139.031345 1279.47893,138.25436 1280.45036,137.943671 C1281.42178,137.632983 1282.94307,137.714059 1283.05369,137.600607 C1283.16432,137.487155 1283.35464,137.496898 1283.16432,137.148197 C1282.974,136.799496 1282.9672,136.695556 1282.61714,136.564793 C1282.26708,136.43403 1281.81165,136.132266 1282.31806,135.954562 C1282.82446,135.776859 1283.04877,135.840564 1283.35465,136.098737 Z M1274.12206,124.696269 C1274.53406,124.696269 1276.49208,125.036272 1275.07397,125.484504 C1273.90909,125.852695 1274.23962,125.998779 1274.66607,126.104254 L1274.83473,126.143856 C1274.87192,126.152376 1274.90845,126.160766 1274.94341,126.169149 C1275.43282,126.2865 1274.79387,126.936968 1275.2323,127.218611 C1275.67072,127.500254 1275.74163,128.655217 1275.74163,129.269195 C1275.74163,129.883173 1275.39025,129.968718 1275.07397,130.181975 C1274.75769,130.395232 1275.55679,130.554148 1275.74163,130.876027 C1275.92648,131.197907 1274.59825,130.987264 1275.07397,131.494397 C1275.54969,132.00153 1274.80887,131.951146 1274.59825,131.951146 C1274.38762,131.951146 1274.56077,132.583251 1273.91943,132.909099 C1272.75488,132.909099 1273.07843,133.137309 1273.60915,133.609156 C1274.13988,134.081003 1275.45086,135.01192 1275.74163,135.411642 C1276.03241,135.811364 1275.56592,136.229493 1274.59825,136.854942 C1273.63058,137.480391 1272.95927,137.6468 1272.20612,137.331725 C1271.45296,137.01665 1271.84861,135.01192 1271.84861,134.62155 C1271.84861,134.231179 1271.62803,134.34519 1271.39922,134.34519 C1271.17041,134.34519 1270.06928,135.275266 1269.4782,135.566828 C1269.1334,135.736906 1268.70969,135.671755 1268.27642,135.578601 L1267.90432,135.49673 C1267.71872,135.457199 1267.535,135.423399 1267.35863,135.411642 C1266.65314,135.364616 1266.56134,135.458668 1265.76175,135.148296 C1264.96215,134.837924 1265.4376,135.01192 1264.90849,135.01192 C1264.37938,135.01192 1264.05523,134.62155 1263.80754,134.34519 C1263.55985,134.06883 1262.14794,134.62155 1261.59499,134.34519 C1261.04204,134.06883 1261.8722,134.048926 1262.30048,133.747959 C1262.57302,133.556434 1262.14157,133.608668 1261.66031,133.671982 L1261.45291,133.699116 C1261.24628,133.725573 1261.04767,133.747959 1260.90856,133.747959 C1260.56853,133.747959 1260.30723,133.357916 1260.12467,132.57783 C1260.75272,132.760414 1261.33523,132.851706 1261.8722,132.851706 C1262.67765,132.851706 1262.82556,132.597765 1263.80754,132.414363 C1264.78951,132.230961 1264.88342,131.951146 1266.56134,131.951146 C1268.23926,131.951146 1268.3767,131.751749 1269.12424,131.494397 C1269.12424,131.292185 1268.70122,130.316711 1268.39139,129.968718 C1268.08155,129.620725 1267.61178,129.269195 1267.61178,128.93967 C1267.61178,128.610146 1267.61178,129.084012 1268.12091,129.084012 C1268.63004,129.084012 1269.12424,129.15107 1269.4782,129.543358 C1269.83215,129.935647 1270.07904,130.689904 1270.4325,130.476647 C1270.78596,130.263389 1270.56733,129.477238 1270.78558,128.088658 C1271.00384,126.700079 1271.95732,125.458251 1272.39469,125.069316 C1272.83206,124.68038 1273.71005,124.696269 1274.12206,124.696269 Z M1246.98854,120.023403 C1247.64496,119.931228 1247.27228,120.115577 1247.27228,120.501557 C1247.27228,120.887537 1247.67177,120.501557 1248.7404,120.501557 C1249.80903,120.501557 1248.22652,120.956668 1247.67177,120.956668 C1247.11701,120.956668 1247.81981,121.345245 1248.36083,121.345245 C1248.90185,121.345245 1248.49706,121.708182 1248.22652,121.852204 C1247.95598,121.996227 1248.49706,122.20938 1248.22652,122.399489 C1247.95598,122.589599 1248.22652,122.7221 1248.49706,122.860361 C1248.7676,122.998623 1248.7404,123.194493 1248.49706,123.401885 C1248.25373,123.609278 1248.7404,123.856997 1248.7404,124.162325 L1248.7404,124.162325 L1248.7404,124.974613 C1248.7404,125.176245 1248.49706,125.320267 1248.7404,125.654399 C1248.98373,125.988531 1248.72872,126.194912 1248.22652,126.402304 C1247.72433,126.609697 1248.49706,126.811328 1248.49706,127.053286 C1248.49706,127.295243 1248.49706,127.301004 1248.08637,127.519918 C1247.67568,127.738832 1248.08637,128.007212 1248.08637,128.199704 C1248.08637,128.392196 1247.85863,128.536448 1247.67177,128.781555 C1247.4849,129.026661 1247.28052,129.403869 1246.98854,129.795482 C1246.87175,129.952128 1246.72132,129.920799 1246.56753,129.863304 L1246.41374,129.80308 C1246.23563,129.736627 1246.06667,129.707972 1245.95494,129.974063 C1245.71552,130.544256 1246.69332,131.1836 1248.49706,132.559838 C1249.93186,133.654572 1248.29991,134.457631 1246.74323,135.008197 L1246.4777,135.100113 C1246.17014,135.204481 1245.87277,135.298838 1245.61072,135.383498 C1243.96361,135.91565 1244.25959,133.556474 1244.25959,132.415815 C1244.25959,131.275156 1244.01433,131.47117 1243.68732,131.47117 C1243.36031,131.47117 1243.54133,131.47117 1243.38951,131.793638 C1243.23768,132.116107 1242.93402,131.793638 1242.70628,132.024074 C1242.47854,132.25451 1242.30336,132.415815 1241.95299,132.415815 C1241.60262,132.415815 1241.42743,132.807556 1240.98946,132.813317 C1240.5515,132.819078 1240.30623,132.807556 1239.89747,132.559838 C1239.4887,132.312119 1239.15,132.559838 1238.55437,132.559838 L1238.55437,132.559838 L1237.44485,132.559838 C1236.94579,132.559838 1237.05361,132.214184 1236.37037,132.214184 C1235.68714,132.214184 1235.85066,132.19114 1235.58204,131.793638 C1235.31342,131.396136 1234.1194,131.47117 1233.41865,131.47117 C1232.7179,131.47117 1232.50787,131.535015 1232.50787,131.1836 C1232.50787,130.832185 1233.50643,130.763052 1233.02759,130.555659 C1232.02903,130.791856 1231.30365,129.920252 1231,128.912085 C1231.51972,129.102656 1232.81639,129.565174 1233.73904,129.403869 C1234.6617,129.242564 1236.99072,128.536448 1237.94392,128.536448 C1238.89711,128.536448 1240.4977,128.174278 1241.12253,128.007212 C1241.09499,127.591477 1241.05853,127.482171 1240.99919,127.361183 L1240.94241,127.247198 C1240.90038,127.159409 1240.84959,127.038128 1240.78742,126.823999 C1240.58539,126.128079 1240.3845,126.144212 1239.89747,125.498986 C1239.41044,124.85376 1239.89747,124.974613 1240.53048,125.147576 C1241.1635,125.320539 1241.12253,125.130294 1241.67503,125.654399 C1242.22753,126.178505 1242.21227,126.402304 1242.52176,126.823999 C1242.83125,127.245693 1243.04148,127.192696 1243.19331,126.823999 C1243.34513,126.455301 1243.19331,125.965618 1243.19331,125.498986 C1243.19331,125.032353 1243.68732,123.401885 1243.82297,122.546889 C1243.95862,121.691893 1244.85092,120.750857 1245.31809,120.501557 C1245.78525,120.252257 1246.33211,120.115577 1246.98854,120.023403 Z" transform="translate(-1231 -120)"/></svg>
\ No newline at end of file
diff --git a/project/dvui/layout/AiDvPanel/borders/border5.vue b/project/dvui/layout/AiDvPanel/borders/border5.vue
new file mode 100644
index 00000000..6bdfeea1
--- /dev/null
+++ b/project/dvui/layout/AiDvPanel/borders/border5.vue
@@ -0,0 +1,78 @@
+<template>
+  <section class="border5">
+    <div class="title">
+      <div class="title-left">
+        <h2>{{ title }}</h2>
+      </div>
+      <img src="https://cdn.cunwuyun.cn/dvcp/dv/img/gz.svg" />
+    </div>
+    <div class="slot">
+      <slot/>
+    </div>
+  </section>
+</template>
+
+<script>
+export default {
+  name: 'border5',
+  props: {title: String}
+}
+</script>
+
+<style lang="scss" scoped>
+  .border5 {
+    width: 100%;
+    height: 100%;
+    padding-top: 10px;
+    box-sizing: border-box;
+    overflow: hidden;
+
+    .slot {
+      width: 100%;
+      height: calc(100% - 0px);
+      background: rgba(120, 0, 0, 0.2);
+      border: 1px solid rgba(203, 45, 0, 0.5);
+    }
+
+    .title {
+      display: flex;
+      position: absolute;
+      align-items: center;
+      justify-content: space-between;
+      top: 0;
+      left: 0;
+      z-index: 111;
+      width: 100%;
+
+      .title-left {
+        width: 180px;
+        height: 38px;
+        padding-left: 32px;
+        background: url(./../asset/dq.svg);
+        background-size: 100% 100%;
+
+        h2 {
+          padding-top: 4px;
+          font-size: 18px;
+          font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
+          font-weight: bold;
+          color: #FFFFFF;
+          line-height: 24px;
+          text-shadow: 0px 2px 4px rgba(117, 9, 9, 0.5);
+          background: linear-gradient(180deg, #FFF6C7 0%, #FF9A02 100%);
+          -webkit-background-clip: text;
+          -webkit-text-fill-color: transparent;
+        }
+      }
+
+      img {
+        width: 64px;
+        height: 26px;
+      }
+    }
+
+    * {
+      box-sizing: border-box;
+    }
+  }
+</style>

From 55e3ab06123882d4d4c69c444473375d7f458d5a Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 5 May 2022 18:22:27 +0800
Subject: [PATCH 25/45] BUG 29505

---
 .../AppCommunityManage/components/Add.vue     |  2 +-
 .../AppSpecialAdjustment/components/Add.vue   |  4 ++--
 .../AppSpecialDisabled/components/Add.vue     |  6 ++---
 .../apps/AppSpecialDrug/components/Add.vue    |  4 ++--
 .../apps/AppSpecialMental/components/Add.vue  |  4 ++--
 .../apps/AppSpecialPrison/components/Add.vue  |  4 ++--
 .../apps/grid/AppGridMap/components/list.vue  | 23 +++++++++----------
 .../grid/AppGridMember/components/add.vue     |  2 +-
 8 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/project/sass/apps/AppCommunityManage/components/Add.vue b/project/sass/apps/AppCommunityManage/components/Add.vue
index 6fe36b5e..648ab1e4 100644
--- a/project/sass/apps/AppCommunityManage/components/Add.vue
+++ b/project/sass/apps/AppCommunityManage/components/Add.vue
@@ -123,7 +123,7 @@ export default {
   methods: {
     beforeSelectTree() {
       this.treeObj.checkedKeys = [];
-      this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => {
+      this.instance.post(`/app/appgirdinfo/listAll`).then((res) => {
         if (res.code == 0) {
           this.treeObj.treeList = this.format(res.data)
           if (this.form.girdInfoList.length) {
diff --git a/project/sass/apps/AppSpecialAdjustment/components/Add.vue b/project/sass/apps/AppSpecialAdjustment/components/Add.vue
index 64c3922c..d7d0c2df 100644
--- a/project/sass/apps/AppSpecialAdjustment/components/Add.vue
+++ b/project/sass/apps/AppSpecialAdjustment/components/Add.vue
@@ -134,7 +134,7 @@ export default {
         }
       }
     }
-
+    
     let IdNumberPass = (rule, value, callback) => {
       if (value) {
         if (this.idCardNoUtil.checkIdCardNo(value)) {
@@ -315,7 +315,7 @@ export default {
     },
 
     getGridList() {
-      this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => {
+      this.instance.post(`/app/appgirdinfo/listAll`).then((res) => {
         if (res.code == 0) {
           this.treeObj.treeList = this.format(res.data)
           if (this.formData.girdId) {
diff --git a/project/sass/apps/AppSpecialDisabled/components/Add.vue b/project/sass/apps/AppSpecialDisabled/components/Add.vue
index 5948f99a..32d8322c 100644
--- a/project/sass/apps/AppSpecialDisabled/components/Add.vue
+++ b/project/sass/apps/AppSpecialDisabled/components/Add.vue
@@ -134,7 +134,7 @@ export default {
         }
       }
     }
-
+    
     let IdNumberPass = (rule, value, callback) => {
       if (value) {
         if (this.idCardNoUtil.checkIdCardNo(value)) {
@@ -146,7 +146,7 @@ export default {
         callback(new Error('请输入身份证号'))
       }
     }
-
+    
     let regIcome = (rule, value, callback) => {
       if (value) {
         const reg = /^([0-9]{1,5})(\.[0-9]{1,3}){0,1}$/
@@ -325,7 +325,7 @@ export default {
     },
 
     getGridList() {
-      this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => {
+      this.instance.post(`/app/appgirdinfo/listAll`).then((res) => {
         if (res.code == 0) {
           this.treeObj.treeList = this.format(res.data)
           if (this.formData.girdId) {
diff --git a/project/sass/apps/AppSpecialDrug/components/Add.vue b/project/sass/apps/AppSpecialDrug/components/Add.vue
index dfcdfdd3..9057ae61 100644
--- a/project/sass/apps/AppSpecialDrug/components/Add.vue
+++ b/project/sass/apps/AppSpecialDrug/components/Add.vue
@@ -134,7 +134,7 @@ export default {
         }
       }
     }
-
+    
     let IdNumberPass = (rule, value, callback) => {
       if (value) {
         if (this.idCardNoUtil.checkIdCardNo(value)) {
@@ -324,7 +324,7 @@ export default {
     },
 
     getGridList() {
-      this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => {
+      this.instance.post(`/app/appgirdinfo/listAll`).then((res) => {
         if (res.code == 0) {
           this.treeObj.treeList = this.format(res.data)
           if (this.formData.girdId) {
diff --git a/project/sass/apps/AppSpecialMental/components/Add.vue b/project/sass/apps/AppSpecialMental/components/Add.vue
index f10f7b0f..5599e20c 100644
--- a/project/sass/apps/AppSpecialMental/components/Add.vue
+++ b/project/sass/apps/AppSpecialMental/components/Add.vue
@@ -134,7 +134,7 @@ export default {
         }
       }
     }
-
+    
     let IdNumberPass = (rule, value, callback) => {
       if (value) {
         if (this.idCardNoUtil.checkIdCardNo(value)) {
@@ -316,7 +316,7 @@ export default {
     },
 
     getGridList() {
-      this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => {
+      this.instance.post(`/app/appgirdinfo/listAll`).then((res) => {
         if (res.code == 0) {
           this.treeObj.treeList = this.format(res.data)
           if (this.formData.girdId) {
diff --git a/project/sass/apps/AppSpecialPrison/components/Add.vue b/project/sass/apps/AppSpecialPrison/components/Add.vue
index 1a742004..4a223de0 100644
--- a/project/sass/apps/AppSpecialPrison/components/Add.vue
+++ b/project/sass/apps/AppSpecialPrison/components/Add.vue
@@ -134,7 +134,7 @@ export default {
         }
       }
     }
-
+    
     let IdNumberPass = (rule, value, callback) => {
       if (value) {
         if (this.idCardNoUtil.checkIdCardNo(value)) {
@@ -335,7 +335,7 @@ export default {
     },
 
     getGridList() {
-      this.instance.post(`/app/appgirdinfo/listAllByTop`).then((res) => {
+      this.instance.post(`/app/appgirdinfo/listAll`).then((res) => {
         if (res.code == 0) {
           this.treeObj.treeList = this.format(res.data)
           if (this.formData.girdId) {
diff --git a/project/sass/apps/grid/AppGridMap/components/list.vue b/project/sass/apps/grid/AppGridMap/components/list.vue
index 307e4178..2d5984d4 100644
--- a/project/sass/apps/grid/AppGridMap/components/list.vue
+++ b/project/sass/apps/grid/AppGridMap/components/list.vue
@@ -141,18 +141,17 @@ export default {
       if (val.girdLevel === '0') {
         this.getLeafNodes()
 
-        return false
-      }
-
-      this.instance.post(`/app/appgirdinfo/queryChildGirdInfoByGirdId?girdId=${val.id}`).then((res) => {
-        if (res?.data) {
-          const arr = res.data.map(v => {
-            return {
-              id: v.id,
-              girdName: v.girdName,
-              points: v.points ? v.points.map(p => [p.lng, p.lat]) : []
-            }
-          }).filter(v => v.points.length)
+          return false
+        }
+        this.instance.post(`/app/appgirdinfo/queryChildGirdInfoByGirdId?girdId=${val.id}`).then((res) => {
+          if (res?.data) {
+            const arr = res.data.map(v => {
+              return {
+                id: v.id,
+                girdName: v.girdName,
+                points: v.points ? v.points.map(p => [p.lng, p.lat]) : []
+              }
+            }).filter(v => v.points.length)
 
           if (!arr.length) {
             return this.$message.error('该网格还未标绘')
diff --git a/project/sass/apps/grid/AppGridMember/components/add.vue b/project/sass/apps/grid/AppGridMember/components/add.vue
index 3c560d60..81ac9ded 100644
--- a/project/sass/apps/grid/AppGridMember/components/add.vue
+++ b/project/sass/apps/grid/AppGridMember/components/add.vue
@@ -401,7 +401,7 @@ export default {
     },
     beforeSelectTree() {
       this.treeObj.checkedKeys = [];
-      this.instance.post(`/app/appgirdinfo/listAllByTop`, null, null).then((res) => {
+      this.instance.post(`/app/appgirdinfo/listAll`, null, null).then((res) => {
         if (res.code == 0) {
           this.treeObj.treeList = res.data;
           this.forms.girdInfoList.map((e) => {

From 39f6cb1ff2702a5f4fa8b0e60907ea5195c72d39 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 6 May 2022 16:25:55 +0800
Subject: [PATCH 26/45] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bigscreen/designer/components/Add.vue     |  3 +-
 .../bigscreen/designer/components/Layout.vue  |  2 +-
 project/build.js                              |  1 -
 .../dvui/layout/AiDvPanel/borders/border5.vue |  1 +
 .../dvui/layout/AiDvWrapper/AiDvWrapper.vue   | 98 ++++++++++++++++++-
 5 files changed, 101 insertions(+), 4 deletions(-)

diff --git a/packages/bigscreen/designer/components/Add.vue b/packages/bigscreen/designer/components/Add.vue
index 8816e424..2ef44329 100644
--- a/packages/bigscreen/designer/components/Add.vue
+++ b/packages/bigscreen/designer/components/Add.vue
@@ -61,9 +61,10 @@
         :params="query"
         @change="onChange"
         :urlPrefix="urlPrefix"
+        :theme="config.theme"
         @close="isShowLayout = false">
       </Layout>
-      <ai-dv-wrapper :views="[{label: '返回'}]" @change="screenId = false" v-if="screenId" :title="form.name">
+      <ai-dv-wrapper :views="[{label: '返回'}]" :theme="config.theme" @change="screenId = false" v-if="screenId" :title="form.name">
         <AiDvBackground
           :theme="config.theme"
           v-if="config.length || config.theme === '1'"
diff --git a/packages/bigscreen/designer/components/Layout.vue b/packages/bigscreen/designer/components/Layout.vue
index f7df281b..fee2b464 100644
--- a/packages/bigscreen/designer/components/Layout.vue
+++ b/packages/bigscreen/designer/components/Layout.vue
@@ -60,7 +60,7 @@
                 width: bigscreenWidth + 'px',
                 height: bigscreenHeight + 'px'
               }">
-              <ai-dv-wrapper style="height: 100%" :title="params.name">
+              <ai-dv-wrapper style="height: 100%" :title="params.name" :theme="dashboard.theme">
                 <div style="width: 100%; height: 100%">
                   <AiDvBackground
                     :theme="dashboard.theme"
diff --git a/project/build.js b/project/build.js
index 95e93705..3f2d551a 100644
--- a/project/build.js
+++ b/project/build.js
@@ -13,7 +13,6 @@ const promisify = fn => {
     return new Promise(function (resolve, reject) {
       [].push.call(args, function (err, result) {
         if (err) {
-          console.log(err)
           reject(err);
         } else {
           resolve(result);
diff --git a/project/dvui/layout/AiDvPanel/borders/border5.vue b/project/dvui/layout/AiDvPanel/borders/border5.vue
index 6bdfeea1..4ae68278 100644
--- a/project/dvui/layout/AiDvPanel/borders/border5.vue
+++ b/project/dvui/layout/AiDvPanel/borders/border5.vue
@@ -30,6 +30,7 @@ export default {
     .slot {
       width: 100%;
       height: calc(100% - 0px);
+      padding: 20px 10px 20px;
       background: rgba(120, 0, 0, 0.2);
       border: 1px solid rgba(203, 45, 0, 0.5);
     }
diff --git a/project/dvui/layout/AiDvWrapper/AiDvWrapper.vue b/project/dvui/layout/AiDvWrapper/AiDvWrapper.vue
index 38644565..e1733388 100644
--- a/project/dvui/layout/AiDvWrapper/AiDvWrapper.vue
+++ b/project/dvui/layout/AiDvWrapper/AiDvWrapper.vue
@@ -1,5 +1,5 @@
 <template>
-  <section class="AiDvWrapper">
+  <section class="AiDvWrapper" :class="'AiDvWrapper' + theme">
     <dv-full-screen-container>
       <div class="viewPanel column" flex>
         <el-row type="flex" class="headerPane">
@@ -74,6 +74,10 @@ export default {
     views: {
       default: () => []
     },
+    theme: {
+      default: '0',
+      type: String
+    },
     value: {default: ''}
   },
   computed: {
@@ -519,6 +523,98 @@ export default {
       }
     }
   }
+
+  &.AiDvWrapper1 {
+    .headerBottomBorder {
+      display: none;
+      background-image: none;
+
+      &::before {
+        display: none;
+      }
+    }
+    .headerPane {
+      align-items: initial;
+      z-index: 11;
+      padding-bottom: 32px;
+      background-image: url("https://cdn.cunwuyun.cn/dvcp/dv/img/dj-title.svg");
+      background-repeat: no-repeat;
+      // background-size: 100% 88px;
+      background-position-x: -8px;
+    }
+    .breatheLights {
+      display: none!important;
+    }
+
+    .headerPane .headerCenter {
+      height: 100%;
+      line-height: 1;
+      background-image: none;
+
+      &::before {
+        display: none;
+      }
+
+      .headerZone {
+        height: 88px;
+        background-image: none;
+
+        span {
+          top: 45%;
+          line-height: 1;
+          font-size: 32px;
+          font-family: FZZZHONGJW--GB1-0, FZZZHONGJW--GB1;
+          font-weight: normal;
+          color: #CEE1FF;
+          font-weight: 600;
+          line-height: 38px;
+          letter-spacing: 2px;
+          text-shadow: 0px 2px 4px rgba(117, 9, 9, 0.1);
+          background: linear-gradient(180deg, #FFF6C7 0%, #FF9A02 100%);
+          -webkit-background-clip: text;
+          -webkit-text-fill-color: transparent;
+        }
+      }
+
+      .fly {
+        display: none;
+      }
+    }
+    
+    .rightTopBorder {
+      background: none;
+      box-shadow: none;
+
+      ::v-deep .corner {
+        display: none!important;
+      }
+    }
+
+    .time {
+      font-size: 20px;
+      font-weight: 400;
+      color: #FF9A02;
+      line-height: 22px;
+      text-shadow: 0px 2px 4px rgba(117, 9, 9, 0.1);
+      background: linear-gradient(180deg, #FFF6C7 0%, #FF9A02 100%);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+    }
+
+    .setting {
+      cursor: pointer;
+      background-image: url("https://cdn.cunwuyun.cn/dvcp/dv/img/setting.svg")!important;
+      background-repeat: no-repeat;
+      background-position: center center;
+    }
+
+    .fullscreen {
+      cursor: pointer;
+      background-image: url("https://cdn.cunwuyun.cn/dvcp/dv/img/fullscreen.svg")!important;
+      background-repeat: no-repeat;
+      background-position: center center;
+    }
+  }
 }
 
 @keyframes breatheList {

From 1db79c53a08dcc02eb7b0995fcd0177516cde8ba Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 6 May 2022 16:31:24 +0800
Subject: [PATCH 27/45] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/bigscreen/viewer/AppGigscreenViewer.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/bigscreen/viewer/AppGigscreenViewer.vue b/packages/bigscreen/viewer/AppGigscreenViewer.vue
index dc0f1c35..cc6cd85f 100644
--- a/packages/bigscreen/viewer/AppGigscreenViewer.vue
+++ b/packages/bigscreen/viewer/AppGigscreenViewer.vue
@@ -22,6 +22,7 @@
 </template>
 
 <script>
+
 import RenderElement from '../designer/components/RenderElement'
 
 export default {

From a0cc85027cc2c95a86dfbd296534285f159279e4 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 6 May 2022 17:36:11 +0800
Subject: [PATCH 28/45] 29522

---
 project/sass/apps/grid/AppGridMember/components/add.vue | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/project/sass/apps/grid/AppGridMember/components/add.vue b/project/sass/apps/grid/AppGridMember/components/add.vue
index 81ac9ded..41c155be 100644
--- a/project/sass/apps/grid/AppGridMember/components/add.vue
+++ b/project/sass/apps/grid/AppGridMember/components/add.vue
@@ -425,14 +425,6 @@ export default {
             if (!currInfo.id) {
               return this.$message.error('请选择网格')
             }
-
-            // if (currInfo.checkType === '1' && currInfo.girdLevel !== '2') {
-            //   return this.$message.error(`一级、二级网格不能添加网格员`)
-            // }
-
-            // if (sameInfo.length) {
-            //   return this.$message.error('不能选择同一网格重复绑定')
-            // }
           }
 
           this.instance.post(`/app/appgirdmemberinfo/addOrUpdate`,{

From c1010119aa3d95c7cafa0bd07d0eb24b42d4f61f Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 6 May 2022 17:47:41 +0800
Subject: [PATCH 29/45] 29520

---
 .../grid/AppGridBlock/components/list.vue     | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/project/sass/apps/grid/AppGridBlock/components/list.vue b/project/sass/apps/grid/AppGridBlock/components/list.vue
index 652874ce..8a15d17a 100644
--- a/project/sass/apps/grid/AppGridBlock/components/list.vue
+++ b/project/sass/apps/grid/AppGridBlock/components/list.vue
@@ -7,18 +7,16 @@
       <template slot="left">
         <ai-tree-menu title="网格层级" @search="v=> $refs.tree.filter(v)">
           <el-tree
-              :data="treeObj.treeList"
-              :props="treeObj.defaultProps"
-              @node-click="handleNodeClick"
-              node-key="id"
-              ref="tree"
-              :filter-node-method="filterNode"
-              default-expand-all
-              highlight-current>
+            :data="treeObj.treeList"
+            :props="treeObj.defaultProps"
+            @node-click="handleNodeClick"
+            node-key="id"
+            ref="tree"
+            :filter-node-method="filterNode"
+            default-expand-all
+            highlight-current>
             <template slot-scope="{node,data}">
-              <el-tooltip placement="right" :content="node.label">
-                <div v-text="node.label"/>
-              </el-tooltip>
+              <div v-text="node.label"/>
             </template>
           </el-tree>
         </ai-tree-menu>
@@ -321,6 +319,7 @@ export default {
             this.$message.success("删除成功!");
 
             this.getList();
+            this.getTreeList();
           }
         });
       })
@@ -606,6 +605,7 @@ export default {
     }
 
     .is-current > .el-tree-node__content {
+      color: #fff!important;
       &:hover {
         background: #2266FF;
         color: #fff;

From db406eb8fa8c518a134438ad11a7bbefd90be08c Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 6 May 2022 17:49:33 +0800
Subject: [PATCH 30/45] 29519

---
 project/sass/apps/grid/AppGridBlock/components/list.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/sass/apps/grid/AppGridBlock/components/list.vue b/project/sass/apps/grid/AppGridBlock/components/list.vue
index 8a15d17a..e5ce75a1 100644
--- a/project/sass/apps/grid/AppGridBlock/components/list.vue
+++ b/project/sass/apps/grid/AppGridBlock/components/list.vue
@@ -306,7 +306,7 @@ export default {
     },
     deleteById(ids) {
       ids &&
-      this.$confirm("是否要删除该网格区块？", {
+      this.$confirm("删除网格后，会清除网格内网格员和责任家庭信息，如有下级网格，会同步删除下级网格所有数据!", {
         type: "error",
       })
       .then(() => {

From bc8cc63d17952fd6a39fdbf5325a4fe72eea86c6 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 6 May 2022 18:47:09 +0800
Subject: [PATCH 31/45] bug

---
 .../apps/grid/AppGridBlock/components/add.vue     | 15 +++++++++++----
 .../apps/grid/AppGridMember/components/Family.vue |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/project/sass/apps/grid/AppGridBlock/components/add.vue b/project/sass/apps/grid/AppGridBlock/components/add.vue
index 4c13d10a..96ddba12 100644
--- a/project/sass/apps/grid/AppGridBlock/components/add.vue
+++ b/project/sass/apps/grid/AppGridBlock/components/add.vue
@@ -17,10 +17,10 @@
                 <el-input v-model="forms.girdName" placeholder="请输入…" :maxlength="50" show-word-limit clearable/>
               </el-form-item>
               <el-form-item label="网格长" prop="girdMemberManageList">
-                <AiUserGet :instance="instance" v-model="forms.girdMemberManageList" isShowUser :props="{label:'wxUserId'}"/>
+                <AiUserGet :instance="instance" v-model="forms.girdMemberManageList" isShowUser :props="{label:'wxUserId', id: 'id'}"/>
               </el-form-item>
               <el-form-item label="网格员" prop="girdMemberList">
-                <AiUserGet :instance="instance" v-model="forms.girdMemberList" isShowUser :props="{label:'wxUserId'}"/>
+                <AiUserGet :instance="instance" v-model="forms.girdMemberList" isShowUser :props="{label:'wxUserId', id: 'id'}"/>
               </el-form-item>
             </template>
           </ai-card>
@@ -181,7 +181,10 @@ export default {
     if (this.isEdit) {
       this.searchDetail();
     } else {
-      this.forms = this.$route.query
+      this.forms = {
+        ...this.forms,
+        ...this.$route.query
+      }
     }
   },
   methods: {
@@ -372,7 +375,11 @@ export default {
         params: {id},
       }).then((res) => {
         if (res?.data) {
-          this.forms = {...res.data};
+          this.forms = {
+            ...res.data,
+            girdMemberManageList: res.data.girdMemberManageList ? res.data.girdMemberManageList : [],
+            girdMemberList: res.data.girdMemberList ? res.data.girdMemberList : [],
+          };
           this.parentGirdInfo = res.data.parentGirdInfo;
           this.forms.parentGirdName = res.data.parentGirdInfo && res.data.parentGirdInfo.girdName;
         }
diff --git a/project/sass/apps/grid/AppGridMember/components/Family.vue b/project/sass/apps/grid/AppGridMember/components/Family.vue
index 99c69374..f76dfd5c 100644
--- a/project/sass/apps/grid/AppGridMember/components/Family.vue
+++ b/project/sass/apps/grid/AppGridMember/components/Family.vue
@@ -267,7 +267,7 @@
             size: 200,
             con: this.name,
             householdName: 1,
-            areaId: this.areaId,
+            searchAreaId: this.areaId,
           }
         }).then(res => {
           if (res.code == 0) {

From b6a686a0211d378e90695ecfa23c67ae4ddc6bc4 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 6 May 2022 18:53:46 +0800
Subject: [PATCH 32/45] bug

---
 project/sass/apps/grid/AppGridBlock/components/add.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/sass/apps/grid/AppGridBlock/components/add.vue b/project/sass/apps/grid/AppGridBlock/components/add.vue
index 96ddba12..77e25b9f 100644
--- a/project/sass/apps/grid/AppGridBlock/components/add.vue
+++ b/project/sass/apps/grid/AppGridBlock/components/add.vue
@@ -17,10 +17,10 @@
                 <el-input v-model="forms.girdName" placeholder="请输入…" :maxlength="50" show-word-limit clearable/>
               </el-form-item>
               <el-form-item label="网格长" prop="girdMemberManageList">
-                <AiUserGet :instance="instance" v-model="forms.girdMemberManageList" isShowUser :props="{label:'wxUserId', id: 'id'}"/>
+                <AiUserGet :instance="instance" v-model="forms.girdMemberManageList" isShowUser :props="{label:'name', id: 'id'}"/>
               </el-form-item>
               <el-form-item label="网格员" prop="girdMemberList">
-                <AiUserGet :instance="instance" v-model="forms.girdMemberList" isShowUser :props="{label:'wxUserId', id: 'id'}"/>
+                <AiUserGet :instance="instance" v-model="forms.girdMemberList" isShowUser :props="{label:'name', id: 'id'}"/>
               </el-form-item>
             </template>
           </ai-card>

From 046b1d0c5add7f22b4fcefba5e4d08c5e4c72b49 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 6 May 2022 18:54:17 +0800
Subject: [PATCH 33/45] bug

---
 project/sass/apps/grid/AppGridMember/components/add.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/sass/apps/grid/AppGridMember/components/add.vue b/project/sass/apps/grid/AppGridMember/components/add.vue
index 41c155be..0e68c9d4 100644
--- a/project/sass/apps/grid/AppGridMember/components/add.vue
+++ b/project/sass/apps/grid/AppGridMember/components/add.vue
@@ -24,7 +24,7 @@
                   <el-form-item label="网格员姓名" prop="wxUserId" >
                     <div class="flex-box">
                       <ai-open-data :style="{marginRight: forms.wxUserId ? '20px' : 0}" type="userName" :openid="forms.wxUserId" />
-                      <AiUserGet :isMultiple="false" refs="addTags" :instance="instance" v-model="users" @change="getSelectPerson">
+                      <AiUserGet :isMultiple="false" refs="addTags" :instance="instance" v-model="users" @change="getSelectPerson" :props="{label:'name', id: 'id'}">
                         <el-button size="small" type="primary"><span style="color: #fff">选择网格员</span></el-button>
                       </AiUserGet>
                     </div>

From 195c6e3aa67bc27f72b4bf9d6484151bdbfc43f6 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 6 May 2022 19:06:41 +0800
Subject: [PATCH 34/45] 29512

---
 project/sass/apps/AppCommunityManage/components/Add.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/sass/apps/AppCommunityManage/components/Add.vue b/project/sass/apps/AppCommunityManage/components/Add.vue
index 648ab1e4..0123f775 100644
--- a/project/sass/apps/AppCommunityManage/components/Add.vue
+++ b/project/sass/apps/AppCommunityManage/components/Add.vue
@@ -137,9 +137,9 @@ export default {
 
     format (list) {
       return list.map(item => {
-        if (item.girdLevel !== '2') {
-          item.disabled = true
-        }
+        // if (item.girdLevel !== '2') {
+        //   item.disabled = true
+        // }
 
         if (item.girdList && item.girdList.length) {
           item.girdList = this.format(item.girdList)

From a076c7b331ef44177d3ccd1a661c476fa1b142fc Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 6 May 2022 19:08:32 +0800
Subject: [PATCH 35/45] 29513

---
 project/sass/apps/AppSpecialPrison/components/Add.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/project/sass/apps/AppSpecialPrison/components/Add.vue b/project/sass/apps/AppSpecialPrison/components/Add.vue
index 4a223de0..7a1ebd95 100644
--- a/project/sass/apps/AppSpecialPrison/components/Add.vue
+++ b/project/sass/apps/AppSpecialPrison/components/Add.vue
@@ -347,10 +347,6 @@ export default {
 
     format (list) {
       return list.map(item => {
-        if (item.girdLevel !== '2') {
-          item.disabled = true
-        }
-
         if (item.girdList && item.girdList.length) {
           item.girdList = this.format(item.girdList)
         }

From 1355ef7509a1a66c515466c006b1603c8ee9fcfd Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 6 May 2022 19:20:33 +0800
Subject: [PATCH 36/45] 29511

---
 project/sass/apps/grid/AppGridBlock/components/list.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/sass/apps/grid/AppGridBlock/components/list.vue b/project/sass/apps/grid/AppGridBlock/components/list.vue
index e5ce75a1..445d84cf 100644
--- a/project/sass/apps/grid/AppGridBlock/components/list.vue
+++ b/project/sass/apps/grid/AppGridBlock/components/list.vue
@@ -249,7 +249,7 @@ export default {
       gridInfo: {},
       gridMemberColConfigs: [
         {prop: "wxUserId", openType: 'userName'},
-        {prop: "girdMemberType", dict: "girdMemberType"},
+        {prop: "girdMemberType", formart: v => v === '1' ? '网格员' : '网格长'},
         {slot: "tags"}
       ]
     };

From 018b926c6c1fef7d7dfc5b78d0d6e3adf115e367 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 6 May 2022 19:54:01 +0800
Subject: [PATCH 37/45] bug

---
 project/sass/apps/grid/AppGridBlock/components/add.vue | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/project/sass/apps/grid/AppGridBlock/components/add.vue b/project/sass/apps/grid/AppGridBlock/components/add.vue
index 77e25b9f..60ef5d69 100644
--- a/project/sass/apps/grid/AppGridBlock/components/add.vue
+++ b/project/sass/apps/grid/AppGridBlock/components/add.vue
@@ -355,6 +355,16 @@ export default {
               `/app/appgirdinfo/addOrUpdate`,
               {
                 ...this.forms,
+                girdMemberManageList: this.forms.girdMemberManageList.map(v => {
+                  return {
+                    wxUserId: v.wxOpenUserId
+                  }
+                }),
+                girdMemberList: this.forms.girdMemberList.map(v => {
+                  return {
+                    wxUserId: v.wxOpenUserId
+                  }
+                })
               },
               null
           )

From 4b9bd8ffa863a18bb766e1efe59689070e2c6af8 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 6 May 2022 19:55:26 +0800
Subject: [PATCH 38/45] bug

---
 project/sass/apps/grid/AppGridBlock/components/list.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/sass/apps/grid/AppGridBlock/components/list.vue b/project/sass/apps/grid/AppGridBlock/components/list.vue
index 445d84cf..4a5b4cc4 100644
--- a/project/sass/apps/grid/AppGridBlock/components/list.vue
+++ b/project/sass/apps/grid/AppGridBlock/components/list.vue
@@ -249,7 +249,7 @@ export default {
       gridInfo: {},
       gridMemberColConfigs: [
         {prop: "wxUserId", openType: 'userName'},
-        {prop: "girdMemberType", formart: v => v === '1' ? '网格员' : '网格长'},
+        {prop: "checkType", formart: v => v === '1' ? '网格员' : '网格长'},
         {slot: "tags"}
       ]
     };

From 74e34e52e835f0117c6efd0f48ce353dee40b43a Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 6 May 2022 20:10:07 +0800
Subject: [PATCH 39/45] 2

---
 project/sass/apps/AppConference/addMeeting.vue       | 2 +-
 project/sass/apps/AppNotification/components/add.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/sass/apps/AppConference/addMeeting.vue b/project/sass/apps/AppConference/addMeeting.vue
index 2f315c0c..55ef653f 100644
--- a/project/sass/apps/AppConference/addMeeting.vue
+++ b/project/sass/apps/AppConference/addMeeting.vue
@@ -176,7 +176,7 @@ export default {
           this.saveData.fileList.map((item) => {
             this.saveData.files.push(item.id)
           })
-          this.instance.post(`/app/appmeetinginfo/add-update`, {
+          this.instance.post(`/app/appmeetinginfo/add-update-web`, {
             ...this.saveData,
             status: status,
           }).then(res => {
diff --git a/project/sass/apps/AppNotification/components/add.vue b/project/sass/apps/AppNotification/components/add.vue
index f1a1ba21..27fba97b 100644
--- a/project/sass/apps/AppNotification/components/add.vue
+++ b/project/sass/apps/AppNotification/components/add.vue
@@ -117,7 +117,7 @@
             if(this.form.releaseTime && (new Date(this.form.releaseTime).getTime() <= Date.now())){
               return this.$message.error("发送时间要大于当前时间")
             }
-            this.instance.post("/app/appannouncement/addOrUpdate", {
+            this.instance.post("/app/appannouncement/addOrUpdateWeb", {
               ...this.form,
               status: e
             }).then(res => {

From 32aae8fe4f0d1d78677d5bbf0b5a7043cc6e05d3 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Sat, 7 May 2022 09:17:21 +0800
Subject: [PATCH 40/45] 29536

---
 .../sass/apps/grid/AppGridBlock/components/add.vue   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/project/sass/apps/grid/AppGridBlock/components/add.vue b/project/sass/apps/grid/AppGridBlock/components/add.vue
index 60ef5d69..6bddb6cb 100644
--- a/project/sass/apps/grid/AppGridBlock/components/add.vue
+++ b/project/sass/apps/grid/AppGridBlock/components/add.vue
@@ -355,16 +355,16 @@ export default {
               `/app/appgirdinfo/addOrUpdate`,
               {
                 ...this.forms,
-                girdMemberManageList: this.forms.girdMemberManageList.map(v => {
+                girdMemberManageList: this.forms.girdMemberManageList.length ? this.forms.girdMemberManageList.map(v => {
                   return {
-                    wxUserId: v.wxOpenUserId
+                    wxUserId: v.wxOpenUserId || v.wxUserId
                   }
-                }),
-                girdMemberList: this.forms.girdMemberList.map(v => {
+                }) : [],
+                girdMemberList:  this.forms.girdMemberList.length ? this.forms.girdMemberList.map(v => {
                   return {
-                    wxUserId: v.wxOpenUserId
+                    wxUserId: v.wxOpenUserId || v.wxUserId
                   }
-                })
+                }) : []
               },
               null
           )

From 61fed1f99f89e7eb4bcb3dc8cfe07a2abfb698d1 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Sat, 7 May 2022 15:57:54 +0800
Subject: [PATCH 41/45] bug

---
 .../sass/apps/grid/AppGridBlock/components/add.vue | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/project/sass/apps/grid/AppGridBlock/components/add.vue b/project/sass/apps/grid/AppGridBlock/components/add.vue
index 6bddb6cb..94d55408 100644
--- a/project/sass/apps/grid/AppGridBlock/components/add.vue
+++ b/project/sass/apps/grid/AppGridBlock/components/add.vue
@@ -387,8 +387,18 @@ export default {
         if (res?.data) {
           this.forms = {
             ...res.data,
-            girdMemberManageList: res.data.girdMemberManageList ? res.data.girdMemberManageList : [],
-            girdMemberList: res.data.girdMemberList ? res.data.girdMemberList : [],
+            girdMemberManageList: res.data.girdMemberManageList ? res.data.girdMemberManageList.map(v => {
+              return {
+                ...v,
+                id: v.wxUserId
+              }
+            }) : [],
+            girdMemberList: res.data.girdMemberList ? res.data.girdMemberList.map(v => {
+              return {
+                ...v,
+                id: v.wxUserId
+              }
+            }) : []
           };
           this.parentGirdInfo = res.data.parentGirdInfo;
           this.forms.parentGirdName = res.data.parentGirdInfo && res.data.parentGirdInfo.girdName;

From 409fcd6f448f4526e860dfd9706098087a5efed5 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Sat, 7 May 2022 18:14:37 +0800
Subject: [PATCH 42/45] =?UTF-8?q?=E6=A0=87=E7=BB=98=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apps/grid/AppGridBlock/components/add.vue | 256 +++---------------
 .../grid/AppGridBlock/components/list.vue     | 244 ++---------------
 .../AppGridBlock/components/mapPlotting.vue   | 173 ++++++++++++
 3 files changed, 234 insertions(+), 439 deletions(-)
 create mode 100644 project/sass/apps/grid/AppGridBlock/components/mapPlotting.vue

diff --git a/project/sass/apps/grid/AppGridBlock/components/add.vue b/project/sass/apps/grid/AppGridBlock/components/add.vue
index 6bddb6cb..dc768f6b 100644
--- a/project/sass/apps/grid/AppGridBlock/components/add.vue
+++ b/project/sass/apps/grid/AppGridBlock/components/add.vue
@@ -50,7 +50,7 @@
                 <el-input v-model="forms.address" placeholder="限200字" maxlength="200"></el-input>
               </el-form-item>
               <el-form-item label="网格范围" prop="enclosure">
-                <el-button size="small" @click="showMap = true">地图标绘</el-button>
+                <el-button size="small" @click="handlePlotting">地图标绘</el-button>
               </el-form-item>
             </template>
           </ai-card>
@@ -65,56 +65,19 @@
         </el-button>
       </template>
     </ai-detail>
-    <ai-dialog
-        title="网格范围"
-        :visible.sync="showMap"
-        :customFooter="true"
-        :destroyOnClose="true"
-        @opened="beforeSelectMap"
-        border
-        width="850px"
-    >
-      <div class="map">
-        <div class="tipinput">
-          <el-input
-              v-model="searchAddress"
-              @change="addressChange"
-              clearable
-              placeholder="请输入关键字"
-              id="tipinput"
-              size="medium"
-              style="width: 200px"
-          />
-        </div>
-        <div id="panel"/>
-        <div class="container" id="container"></div>
-        <el-button-group style="margin-top: 8px" v-if="forms.plottingStatus==1">
-          <el-button type="primary" size="mini" @click="polyEditor.open()">开始编辑</el-button>
-          <el-button size="mini" @click="polyEditor.close()">结束编辑</el-button>
-        </el-button-group>
-        <el-button-group
-            style="margin-top: 8px"
-            v-if="forms.plottingStatus == 0"
-        >
-          <el-button size="mini" @click="draw('polygon')">开始绘制多边形</el-button>
-          <!-- <el-button  size="mini" @click="close()">关闭绘制</el-button> -->
-          <el-button size="mini" @click="clear()">清除绘制</el-button>
-        </el-button-group>
-      </div>
-      <div class="dialog-footer" slot="footer">
-        <el-button size="medium" @click="showMap = false">取消</el-button>
-        <el-button type="primary" size="medium" @click="surePotting()">确认</el-button>
-      </div>
+    <ai-dialog class="fullscreenMap" title="网格范围" :visible.sync="showMap" @onConfirm="surePotting" fullscreen>
+      <map-plotting v-model="path"/>
     </ai-dialog>
   </div>
 </template>
 
 <script>
-import AMapLoader from "@amap/amap-jsapi-loader";
 import {mapState} from "vuex";
+import MapPlotting from "./mapPlotting";
 
 export default {
   name: "addBlock",
+  components: {MapPlotting},
   props: {
     instance: Function,
     dict: Object,
@@ -127,16 +90,8 @@ export default {
         girdMemberList: []
       },
       showMap: false,
-      map: "",
-      mouseTool: "",
-      searchAddress: "",
-      placeSearch: "",
-      overlays: [],
       options: [],
       path: [],
-      location: {},
-      polyEditor: "",
-      title: "添加网格区块",
       parentGirdInfo: {},
     };
   },
@@ -177,7 +132,6 @@ export default {
     }
   },
   created() {
-    this.getCorpLocation()
     if (this.isEdit) {
       this.searchDetail();
     } else {
@@ -206,145 +160,8 @@ export default {
         }
       });
     },
-    beforeSelectMap() {
-      AMapLoader.load({
-        key: "b553334ba34f7ac3cd09df9bc8b539dc", // 申请好的Web端开发者Key，首次调用 load 时必填
-        version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-        plugins: ["AMap.MouseTool", "AMap.PlaceSearch", "AMap.PolygonEditor"], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-        AMapUI: {
-          // 是否加载 AMapUI，缺省不加载
-          version: "1.1", // AMapUI 缺省 1.1
-          plugins: [], // 需要加载的 AMapUI ui插件
-        },
-      })
-      .then((AMap) => {
-        this.map = new AMap.Map("container", {
-          resizeEnable: true,
-        });
-        if (this.forms.plottingStatus == 1) {
-          let path = [];
-          this.forms.points.map((e, index) => {
-            path[index] = [e.lng, e.lat];
-          });
-          let polygon = new AMap.Polygon({
-            path: path,
-            strokeColor: "#FF33FF",
-            strokeWeight: 6,
-            strokeOpacity: 0.2,
-            fillOpacity: 0.4,
-            fillColor: "#1791fc",
-            zIndex: 50,
-            bubble: true,
-          });
-          this.map.add([polygon]);
-          this.map.setFitView();
-          this.polyEditor = new AMap.PolygonEditor(this.map, polygon);
-        } else {
-          this.mouseTool = new AMap.MouseTool(this.map);
-          // this.map.add(new AMap.Marker({
-          //     position:this.map.getCenter()
-          // }));
-          this.placeSearch = new AMap.PlaceSearch({
-            pageSize: 3, // 单页显示结果条数
-            pageIndex: 1, // 页码
-            city: "", // 兴趣点城市
-            citylimit: false, //是否强制限制在设置的城市内搜索
-            map: this.map, // 展现结果的地图实例
-            panel: "panel", // 结果列表将在此容器中进行展示。
-            autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
-          });
-          // this.map.setZoomAndCenter(14, [this.location.lng, this.location.lat], false, 600);
-          this.eventOn();
-        }
-      })
-    },
-    getCorpLocation() {
-      this.instance.post("/app/appdvcpconfig/getCorpLocation").then(res => {
-        if (res?.data) {
-          this.location = res.data
-        }
-      })
-    },
-    //地图事件绑定
-    eventOn() {
-      this.path = [];
-      this.overlays = [];
-      this.map.on("mousemove", null, this);
-      this.mouseTool.on("draw", ({obj}) => {
-        obj.getPath().map((e) => {
-          this.path.push({lat: e.getLat(), lng: e.getLng()});
-        });
-        this.overlays.push(obj);
-      })
-    },
-    //map搜索
-    addressChange(val) {
-      this.placeSearch.search(val);
-    },
-    close() {
-      this.mouseTool.close(true);
-    },
-    clear() {
-      this.map.remove(this.overlays);
-      this.overlays = [];
-      this.path = [];
-    },
-    draw(type) {
-      switch (type) {
-        case "marker": {
-          this.mouseTool.marker({
-            //同Marker的Option设置
-          });
-          break;
-        }
-        case "polyline": {
-          this.mouseTool.polyline({
-            strokeColor: "#80d8ff",
-            //同Polyline的Option设置
-          });
-          break;
-        }
-        case "polygon": {
-          this.mouseTool.polygon({
-            fillColor: "#00b0ff",
-            strokeColor: "#80d8ff",
-            borderWeight: 2,
-            strokeWeight: 4,
-            //同Polygon的Option设置
-          });
-          break;
-        }
-        case "rectangle": {
-          this.mouseTool.rectangle({
-            fillColor: "#00b0ff",
-            strokeColor: "#80d8ff",
-            //同Polygon的Option设置
-          });
-          break;
-        }
-        case "circle": {
-          this.mouseTool.circle({
-            fillColor: "#00b0ff",
-            strokeColor: "#80d8ff",
-            //同Circle的Option设置
-          });
-          break;
-        }
-      }
-    },
     surePotting() {
-      this.forms.points = [];
-      // this.forms.eventReportUnit = this.$refs.cascader.getCheckedNodes().label;
-      if (this.forms.plottingStatus == 1) {
-        this.polyEditor
-        .getTarget()
-        .getPath()
-        .map((e) => {
-          this.forms.points.push({lng: e.lng, lat: e.lat});
-        });
-      } else {
-        this.forms.points = [...this.path];
-      }
+      this.forms.points = JSON.parse(JSON.stringify(this.path));
       this.showMap = false;
     },
     save() {
@@ -360,7 +177,7 @@ export default {
                     wxUserId: v.wxOpenUserId || v.wxUserId
                   }
                 }) : [],
-                girdMemberList:  this.forms.girdMemberList.length ? this.forms.girdMemberList.map(v => {
+                girdMemberList: this.forms.girdMemberList.length ? this.forms.girdMemberList.map(v => {
                   return {
                     wxUserId: v.wxOpenUserId || v.wxUserId
                   }
@@ -395,6 +212,10 @@ export default {
         }
       });
     },
+    handlePlotting() {
+      if (this.forms.points?.length > 0) this.path = JSON.parse(JSON.stringify(this.forms.points))
+      this.showMap = true
+    }
   },
 };
 </script>
@@ -412,40 +233,31 @@ export default {
     display: none !important;
   }
 
+  ::v-deep.fullscreenMap {
+    .el-dialog {
+      display: flex;
+      flex-direction: column;
+
+      .el-dialog__body {
+        padding: 0;
+        flex: 1;
+        min-height: 0;
+
+        .ai-dialog__content {
+          max-height: unset !important;
+          padding-bottom: 0;
+          height: 100%;
+
+          .ai-dialog__content--wrapper {
+            padding-right: 0 !important;
+          }
+        }
+      }
+    }
+  }
+
   .footer-btn {
     width: 92px;
   }
-
-  .map {
-    width: 780px;
-    position: relative;
-    overflow: hidden;
-
-    .container {
-      width: 760px;
-      height: 420px;
-      border-radius: 2px;
-      border: 1px solid #d0d4dc;
-    }
-
-    #panel {
-      position: absolute;
-      height: 400px;
-      right: 30px;
-      top: 20px;
-      width: 280px;
-      overflow: hidden;
-      z-index: 10000;
-    }
-
-    .tipinput {
-      position: absolute;
-      width: 200px;
-      height: 38px;
-      left: 20px;
-      top: 20px;
-      z-index: 10000;
-    }
-  }
 }
 </style>
diff --git a/project/sass/apps/grid/AppGridBlock/components/list.vue b/project/sass/apps/grid/AppGridBlock/components/list.vue
index 4a5b4cc4..f34c728a 100644
--- a/project/sass/apps/grid/AppGridBlock/components/list.vue
+++ b/project/sass/apps/grid/AppGridBlock/components/list.vue
@@ -129,56 +129,17 @@
       </template>
     </ai-list>
     <ai-dialog
-        title="网格范围"
+        title="网格范围" class="fullscreenMap"
         :visible.sync="showMap"
         :customFooter="true"
-        :destroyOnClose="true"
-        border
+        border fullscreen
         width="850px"
     >
-      <div class="map">
-        <div class="tipinput">
-          <el-input
-              v-if="editRow.plottingStatus == 0"
-              v-model="searchAddress"
-              @change="addressChange"
-              clearable
-              placeholder="请输入关键字"
-              id="tipinput"
-              size="medium"
-              style="width: 200px"
-          ></el-input>
-        </div>
-        <div id="panel" v-if="editRow.plottingStatus == 0"></div>
-        <div class="container" id="container"></div>
-        <el-button-group
-            style="margin-top: 8px"
-            v-if="editRow.plottingStatus == 1"
-        >
-          <el-button type="primary" size="mini" @click="beginPoltting()"
-          >开始编辑
-          </el-button
-          >
-          <el-button size="mini" @click="finishPoltting()">结束编辑</el-button>
-        </el-button-group>
-        <el-button-group
-            style="margin-top: 8px"
-            v-if="editRow.plottingStatus == 0"
-        >
-          <el-button size="mini" @click="draw('polygon')"
-          >开始绘制多边形
-          </el-button
-          >
-          <!-- <el-button  size="mini" @click="close()">关闭绘制</el-button> -->
-          <el-button size="mini" @click="clear()">清除绘制</el-button>
-        </el-button-group>
-      </div>
+      <map-plotting v-model="path"/>
       <div class="dialog-footer" slot="footer">
-        <el-button size="medium" @click="showMap = false">取消</el-button>
-        <el-button type="primary" size="medium" @click="confirm()"
-        >确认
-        </el-button
-        >
+        <el-button size="medium" @click="showMap=false">取消</el-button>
+        <el-button type="primary" size="medium" @click="confirm()">确认
+        </el-button>
       </div>
     </ai-dialog>
     <ai-dialog :title="`${gridInfo.girdName}网格成员`" :visible.sync="dialog" customFooter @closed="gridInfo={}"
@@ -200,9 +161,11 @@
 
 <script>
 import AMapLoader from "@amap/amap-jsapi-loader";
+import MapPlotting from "./mapPlotting";
 
 export default {
   name: "List",
+  components: {MapPlotting},
   label: "网格区块",
   props: {
     instance: Function,
@@ -244,7 +207,6 @@ export default {
       isEdit: false,
       searchId: "",
       fileList: [],
-      location: {},
       dialog: false,
       gridInfo: {},
       gridMemberColConfigs: [
@@ -257,7 +219,6 @@ export default {
   created() {
     this.getTreeList();
     this.getList();
-    this.getCorpLocation()
     this.dict.load("girdLevel", "girdType", "isLastLevel", "plottingStatus", "girdMemberType");
   },
   computed: {
@@ -273,13 +234,6 @@ export default {
     },
   },
   methods: {
-    getCorpLocation() {
-      this.instance.post("/app/appdvcpconfig/getCorpLocation").then(res => {
-        if (res.code == 0) {
-          this.location = res.data
-        }
-      })
-    },
     handleNodeClick(val) {
       this.info = {...val};
       this.searchId = val.id;
@@ -392,140 +346,18 @@ export default {
     },
     poltting(row) {
       this.showMap = true;
+      if (this.editRow.points?.length > 0) this.path = JSON.parse(JSON.stringify(this.editRow.points))
       this.editRow = {...row};
-      AMapLoader.load({
-        key: "b553334ba34f7ac3cd09df9bc8b539dc", // 申请好的Web端开发者Key，首次调用 load 时必填
-        version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-        plugins: ["AMap.PolygonEditor", "AMap.MouseTool", "AMap.PlaceSearch"], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-        AMapUI: {
-          // 是否加载 AMapUI，缺省不加载
-          version: "1.1", // AMapUI 缺省 1.1
-          plugins: [], // 需要加载的 AMapUI ui插件
-        },
-      })
-      .then((AMap) => {
-        this.map = new AMap.Map("container", {
-          resizeEnable: true,
-          zoom: 14,
-        });
-        if (this.editRow.plottingStatus == 1) {
-          let path = [];
-          this.editRow.points.map((e, index) => {
-            path[index] = [e.lng, e.lat];
-          });
-          let polygon = new AMap.Polygon({
-            path: path,
-            strokeColor: "#FF33FF",
-            strokeWeight: 6,
-            strokeOpacity: 0.2,
-            fillOpacity: 0.4,
-            fillColor: "#1791fc",
-            zIndex: 50,
-            bubble: true,
-          });
-          this.map.add([polygon]);
-          this.map.setFitView();
-          this.polyEditor = new AMap.PolygonEditor(this.map, polygon);
-        } else {
-          this.mouseTool = new AMap.MouseTool(this.map);
-          this.placeSearch = new AMap.PlaceSearch({
-            pageSize: 3, // 单页显示结果条数
-            pageIndex: 1, // 页码
-            city: "", // 兴趣点城市
-            citylimit: false, //是否强制限制在设置的城市内搜索
-            map: this.map, // 展现结果的地图实例
-            panel: "panel", // 结果列表将在此容器中进行展示。
-            autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
-          });
-          // this.map.setZoomAndCenter(14, [this.location.lng, this.location.lat], false, 600);
-          this.eventOn();
-        }
-      })
-      .catch((e) => {
-        console.log(e);
-      });
     },
     showEdit(id) {
       this.$router.push({hash: "#add", query: {id}})
     },
-    draw(type) {
-      switch (type) {
-        case "marker": {
-          this.mouseTool.marker({
-            //同Marker的Option设置
-          });
-          break;
-        }
-        case "polyline": {
-          this.mouseTool.polyline({
-            strokeColor: "#80d8ff",
-            //同Polyline的Option设置
-          });
-          break;
-        }
-        case "polygon": {
-          this.mouseTool.polygon({
-            fillColor: "#00b0ff",
-            strokeColor: "#80d8ff",
-            borderWeight: 2,
-            strokeWeight: 4,
-            //同Polygon的Option设置
-          });
-          break;
-        }
-        case "rectangle": {
-          this.mouseTool.rectangle({
-            fillColor: "#00b0ff",
-            strokeColor: "#80d8ff",
-            //同Polygon的Option设置
-          });
-          break;
-        }
-        case "circle": {
-          this.mouseTool.circle({
-            fillColor: "#00b0ff",
-            strokeColor: "#80d8ff",
-            //同Circle的Option设置
-          });
-          break;
-        }
-      }
-    },
     //map搜索
-    addressChange(val) {
-      this.placeSearch.search(val);
-    },
-    close() {
-      this.mouseTool.close(true);
-    },
-    clear() {
-      this.map.remove(this.overlays);
-      this.overlays = [];
-      this.path = [];
-    },
-    beginPoltting() {
-      this.polyEditor.open();
-    },
-    finishPoltting() {
-      this.polyEditor.close();
-    },
     confirm() {
-      let path = [];
-      if (this.editRow.plottingStatus == 1) {
-        this.polyEditor
-        .getTarget()
-        .getPath()
-        .map((e) => {
-          path.push({lng: e.lng, lat: e.lat});
-        });
-      } else {
-        path = [...this.path];
-      }
-      delete this.editRow.points;
+      this.editRow.points = JSON.parse(JSON.stringify(this.path));
       let {girdMemberNames} = this.editRow
       this.instance.post(`/app/appgirdinfo/addOrUpdate`, {
         ...this.editRow,
-        points: path,
         girdMemberNames: girdMemberNames?.toString()
       }).then((res) => {
         if (res.code == 0) {
@@ -534,18 +366,6 @@ export default {
         }
       });
     },
-    eventOn() {
-      this.path = [];
-      this.overlays = [];
-      this.map.on("mousemove", this.showInfoMove, this);
-      this.mouseTool.on("draw", ({type, obj}) => {
-        obj.getPath().map((e) => {
-          console.log(e)
-          this.path.push({lat: e.getLat(), lng: e.getLng()});
-        });
-        this.overlays.push(obj);
-      });
-    },
     resetSearch() {
       Object.keys(this.searchObj).map((e) => {
         this.searchObj[e] = "";
@@ -638,38 +458,28 @@ export default {
     padding: 8px 0;
   }
 
-  .map {
-    width: 780px;
-    position: relative;
-    overflow: hidden;
+  ::v-deep.fullscreenMap {
+    .el-dialog {
+      display: flex;
+      flex-direction: column;
 
-    .container {
-      width: 760px;
-      height: 420px;
-      border-radius: 2px;
-      border: 1px solid #d0d4dc;
-    }
+      .el-dialog__body {
+        padding: 0;
+        flex: 1;
+        min-height: 0;
 
-    #panel {
-      position: absolute;
-      height: 400px;
-      right: 30px;
-      top: 20px;
-      width: 280px;
-      overflow: hidden;
-      z-index: 10000;
-    }
+        .ai-dialog__content {
+          max-height: unset !important;
+          padding-bottom: 0;
+          height: 100%;
 
-    .tipinput {
-      position: absolute;
-      width: 200px;
-      height: 38px;
-      left: 20px;
-      top: 20px;
-      z-index: 10000;
+          .ai-dialog__content--wrapper {
+            padding-right: 0 !important;
+          }
+        }
+      }
     }
   }
-
   ::v-deep .treePanel {
     display: flex;
     flex-direction: column;
diff --git a/project/sass/apps/grid/AppGridBlock/components/mapPlotting.vue b/project/sass/apps/grid/AppGridBlock/components/mapPlotting.vue
new file mode 100644
index 00000000..4e26acaa
--- /dev/null
+++ b/project/sass/apps/grid/AppGridBlock/components/mapPlotting.vue
@@ -0,0 +1,173 @@
+<template>
+  <section class="mapPlotting">
+    <div class="tipinput">
+      <el-input
+          v-model="searchAddress"
+          @change="addressChange"
+          clearable
+          placeholder="请输入关键字"
+          id="tipinput"
+          size="medium"/>
+    </div>
+    <div id="panel"/>
+    <div class="container fill" id="container"/>
+    <div class="operationBtns">
+      <el-alert type="success" title="操作说明:" :closable="false">
+        <li>1.双击覆盖物即可编辑</li>
+        <li>2.编辑状态,对点双击可删除该点</li>
+        <li>3.绘制状态,右键结束绘制</li>
+        <li>4.结束编辑才能保存绘制的覆盖物信息</li>
+      </el-alert>
+      <el-button-group>
+        <el-button type="primary" @click="handleAdd">新建</el-button>
+        <el-button @click="polyEditor.close()">结束编辑</el-button>
+        <el-button @click="clear()">清除绘制</el-button>
+      </el-button-group>
+    </div>
+  </section>
+</template>
+
+<script>
+import AMapLoader from "@amap/amap-jsapi-loader";
+
+export default {
+  name: "mapPlotting",
+  model: {
+    prop: "value",
+    event: "change"
+  },
+  props: {
+    value: Array
+  },
+  data() {
+    return {
+      map: null,
+      polyEditor: null,
+      placeSearch: null,
+      searchAddress: "",
+      overlays: [],
+      points: []
+    }
+  },
+  watch: {
+    points: {
+      deep: true, handler(v) {
+        this.$emit('change', v.flat())
+      }
+    }
+  },
+  methods: {
+    addressChange(val) {
+      this.placeSearch.search(val);
+    },
+    clear() {
+      this.map.remove(this.overlays);
+      this.overlays = [];
+      this.points = []
+    },
+    handleAdd() {
+      let {polyEditor} = this
+      polyEditor.close();
+      polyEditor.setTarget();
+      polyEditor.open();
+    }
+  },
+  mounted() {
+    setTimeout(() => AMapLoader.load({
+      key: "b553334ba34f7ac3cd09df9bc8b539dc", // 申请好的Web端开发者Key，首次调用 load 时必填
+      version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+      plugins: ["AMap.PlaceSearch", "AMap.PolygonEditor"], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+      AMapUI: {
+        // 是否加载 AMapUI，缺省不加载
+        version: "1.1", // AMapUI 缺省 1.1
+        plugins: [], // 需要加载的 AMapUI ui插件
+      },
+    }).then((AMap) => {
+      this.map = new AMap.Map("container", {
+        resizeEnable: true,
+      });
+      this.placeSearch = new AMap.PlaceSearch({
+        pageSize: 5, // 单页显示结果条数
+        pageIndex: 1, // 页码
+        city: "", // 兴趣点城市
+        citylimit: false, //是否强制限制在设置的城市内搜索
+        map: this.map, // 展现结果的地图实例
+        panel: "panel", // 结果列表将在此容器中进行展示。
+        autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
+      });
+      this.polyEditor = new AMap.PolygonEditor(this.map).on('add', ({target}) => {
+        this.polyEditor.addAdsorbPolygons(target)
+        target.on("dblclick", () => {
+          this.polyEditor.setTarget(target);
+          this.polyEditor.open()
+        })
+      })
+      this.polyEditor.on('end', ({target}) => {
+        this.overlays.push(target);
+        this.points.push(target.getPath().map((e) => ({lat: e.getLat(), lng: e.getLng()})))
+      });
+      if (this.value?.length > 0) {
+        let path = this.value.map(e => [e.lng, e.lat]);
+        let polygon = new AMap.Polygon({
+          path,
+          strokeColor: "#FF33FF",
+          strokeWeight: 6,
+          strokeOpacity: 0.2,
+          fillOpacity: 0.4,
+          fillColor: "#1791fc",
+        })
+        this.map.add([polygon]);
+        this.map.setFitView();
+        this.polyEditor.addAdsorbPolygons(polygon)
+        polygon.on('dblclick', () => {
+          this.polyEditor.setTarget(polygon);
+          this.polyEditor.open()
+        });
+        this.polyEditor.setTarget(polygon);
+        this.polyEditor.open()
+      }
+    }), 500)
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.mapPlotting {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+
+  .container {
+    width: inherit;
+  }
+
+  #panel {
+    position: absolute;
+    height: 400px;
+    right: 30px;
+    top: 20px;
+    width: 280px;
+    overflow: hidden;
+    z-index: 10000;
+  }
+
+  .tipinput {
+    position: absolute;
+    width: 300px;
+    height: 38px;
+    left: 20px;
+    top: 20px;
+    z-index: 10000;
+  }
+
+  .operationBtns {
+    position: absolute;
+    left: 20px;
+    bottom: 20px;
+    z-index: 10000;
+  }
+}
+</style>

From 70557adefde30ed53ef7f7b9aa723d33f38bcbc7 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Sat, 7 May 2022 19:31:07 +0800
Subject: [PATCH 43/45] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=A0=87=E7=BB=98?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apps/grid/AppGridBlock/components/add.vue |  48 +--
 .../grid/AppGridBlock/components/list.vue     |  52 +---
 .../AppGridBlock/components/mapPlotting.vue   | 280 +++++++++++-------
 3 files changed, 186 insertions(+), 194 deletions(-)

diff --git a/project/sass/apps/grid/AppGridBlock/components/add.vue b/project/sass/apps/grid/AppGridBlock/components/add.vue
index 6edd2760..0f56b13d 100644
--- a/project/sass/apps/grid/AppGridBlock/components/add.vue
+++ b/project/sass/apps/grid/AppGridBlock/components/add.vue
@@ -50,7 +50,9 @@
                 <el-input v-model="forms.address" placeholder="限200字" maxlength="200"></el-input>
               </el-form-item>
               <el-form-item label="网格范围" prop="enclosure">
-                <el-button size="small" @click="handlePlotting">地图标绘</el-button>
+                <map-plotting v-model="forms.points">
+                  <el-button size="small">地图标绘</el-button>
+                </map-plotting>
               </el-form-item>
             </template>
           </ai-card>
@@ -65,9 +67,6 @@
         </el-button>
       </template>
     </ai-detail>
-    <ai-dialog class="fullscreenMap" title="网格范围" :visible.sync="showMap" @onConfirm="surePotting" fullscreen>
-      <map-plotting v-model="path"/>
-    </ai-dialog>
   </div>
 </template>
 
@@ -89,9 +88,7 @@ export default {
         girdMemberManageList: [],
         girdMemberList: []
       },
-      showMap: false,
       options: [],
-      path: [],
       parentGirdInfo: {},
     };
   },
@@ -160,10 +157,6 @@ export default {
         }
       });
     },
-    surePotting() {
-      this.forms.points = JSON.parse(JSON.stringify(this.path));
-      this.showMap = false;
-    },
     save() {
       this.$refs["rules"].validate((valid) => {
         if (valid) {
@@ -222,10 +215,6 @@ export default {
         }
       });
     },
-    handlePlotting() {
-      if (this.forms.points?.length > 0) this.path = JSON.parse(JSON.stringify(this.forms.points))
-      this.showMap = true
-    }
   },
 };
 </script>
@@ -235,37 +224,6 @@ export default {
   width: 100%;
   height: 100%;
 
-  ::v-deep .amap-copyright {
-    display: none !important;
-  }
-
-  ::v-deep .amap-logo {
-    display: none !important;
-  }
-
-  ::v-deep.fullscreenMap {
-    .el-dialog {
-      display: flex;
-      flex-direction: column;
-
-      .el-dialog__body {
-        padding: 0;
-        flex: 1;
-        min-height: 0;
-
-        .ai-dialog__content {
-          max-height: unset !important;
-          padding-bottom: 0;
-          height: 100%;
-
-          .ai-dialog__content--wrapper {
-            padding-right: 0 !important;
-          }
-        }
-      }
-    }
-  }
-
   .footer-btn {
     width: 92px;
   }
diff --git a/project/sass/apps/grid/AppGridBlock/components/list.vue b/project/sass/apps/grid/AppGridBlock/components/list.vue
index f34c728a..b3b9b1ae 100644
--- a/project/sass/apps/grid/AppGridBlock/components/list.vue
+++ b/project/sass/apps/grid/AppGridBlock/components/list.vue
@@ -7,14 +7,14 @@
       <template slot="left">
         <ai-tree-menu title="网格层级" @search="v=> $refs.tree.filter(v)">
           <el-tree
-            :data="treeObj.treeList"
-            :props="treeObj.defaultProps"
-            @node-click="handleNodeClick"
-            node-key="id"
-            ref="tree"
-            :filter-node-method="filterNode"
-            default-expand-all
-            highlight-current>
+              :data="treeObj.treeList"
+              :props="treeObj.defaultProps"
+              @node-click="handleNodeClick"
+              node-key="id"
+              ref="tree"
+              :filter-node-method="filterNode"
+              default-expand-all
+              highlight-current>
             <template slot-scope="{node,data}">
               <div v-text="node.label"/>
             </template>
@@ -120,7 +120,7 @@
             <template slot-scope="{ row }">
               <div class="table-options">
                 <el-button type="text" @click="showEdit(row.id)">编辑</el-button>
-                <el-button type="text" @click="poltting(row)">标绘</el-button>
+                <map-plotting :value="row.points" @change="v=>confirm(row,v)"/>
                 <el-button type="text" @click="deleteById(row.id)">删除</el-button>
               </div>
             </template>
@@ -128,20 +128,6 @@
         </ai-table>
       </template>
     </ai-list>
-    <ai-dialog
-        title="网格范围" class="fullscreenMap"
-        :visible.sync="showMap"
-        :customFooter="true"
-        border fullscreen
-        width="850px"
-    >
-      <map-plotting v-model="path"/>
-      <div class="dialog-footer" slot="footer">
-        <el-button size="medium" @click="showMap=false">取消</el-button>
-        <el-button type="primary" size="medium" @click="confirm()">确认
-        </el-button>
-      </div>
-    </ai-dialog>
     <ai-dialog :title="`${gridInfo.girdName}网格成员`" :visible.sync="dialog" customFooter @closed="gridInfo={}"
                width="700px">
       <ai-table :tableData="gridInfo.tableData" :colConfigs="gridMemberColConfigs" :dict="dict"
@@ -344,25 +330,15 @@ export default {
         this.getTreeList();
       });
     },
-    poltting(row) {
-      this.showMap = true;
-      if (this.editRow.points?.length > 0) this.path = JSON.parse(JSON.stringify(this.editRow.points))
-      this.editRow = {...row};
-    },
     showEdit(id) {
       this.$router.push({hash: "#add", query: {id}})
     },
     //map搜索
-    confirm() {
-      this.editRow.points = JSON.parse(JSON.stringify(this.path));
-      let {girdMemberNames} = this.editRow
-      this.instance.post(`/app/appgirdinfo/addOrUpdate`, {
-        ...this.editRow,
-        girdMemberNames: girdMemberNames?.toString()
-      }).then((res) => {
+    confirm(row, points) {
+      this.instance.post(`/app/appgirdinfo/addOrUpdate`, {...row, points}).then((res) => {
         if (res.code == 0) {
+          this.$message.success("提交成功!")
           this.getList();
-          this.showMap = false;
         }
       });
     },
@@ -425,7 +401,8 @@ export default {
     }
 
     .is-current > .el-tree-node__content {
-      color: #fff!important;
+      color: #fff !important;
+
       &:hover {
         background: #2266FF;
         color: #fff;
@@ -480,6 +457,7 @@ export default {
       }
     }
   }
+
   ::v-deep .treePanel {
     display: flex;
     flex-direction: column;
diff --git a/project/sass/apps/grid/AppGridBlock/components/mapPlotting.vue b/project/sass/apps/grid/AppGridBlock/components/mapPlotting.vue
index 4e26acaa..2b7e57fb 100644
--- a/project/sass/apps/grid/AppGridBlock/components/mapPlotting.vue
+++ b/project/sass/apps/grid/AppGridBlock/components/mapPlotting.vue
@@ -1,34 +1,49 @@
 <template>
   <section class="mapPlotting">
-    <div class="tipinput">
-      <el-input
-          v-model="searchAddress"
-          @change="addressChange"
-          clearable
-          placeholder="请输入关键字"
-          id="tipinput"
-          size="medium"/>
-    </div>
-    <div id="panel"/>
-    <div class="container fill" id="container"/>
-    <div class="operationBtns">
-      <el-alert type="success" title="操作说明:" :closable="false">
-        <li>1.双击覆盖物即可编辑</li>
-        <li>2.编辑状态,对点双击可删除该点</li>
-        <li>3.绘制状态,右键结束绘制</li>
-        <li>4.结束编辑才能保存绘制的覆盖物信息</li>
-      </el-alert>
-      <el-button-group>
-        <el-button type="primary" @click="handleAdd">新建</el-button>
-        <el-button @click="polyEditor.close()">结束编辑</el-button>
-        <el-button @click="clear()">清除绘制</el-button>
-      </el-button-group>
+    <div class="clicker" @click="dialog=true,$emit('open')">
+      <slot v-if="$slots.default"/>
+      <el-button v-else type="text">标绘</el-button>
     </div>
+    <ai-dialog :title="title" class="fullscreenMap"
+               :visible.sync="dialog"
+               :destroyOnClose="true"
+               @close="points=[]"
+               border fullscreen
+               @open="initMap" :modal="false"
+               @onConfirm="$emit('change',points.flat()),dialog=false">
+      <div class="mapPanel">
+        <div class="tipinput">
+          <el-input
+              v-model="searchAddress"
+              @change="addressChange"
+              clearable
+              placeholder="请输入关键字"
+              id="tipinput"
+              size="medium"/>
+        </div>
+        <div id="panel"/>
+        <div class="container fill" id="container"/>
+        <div class="operationBtns" v-if="map">
+          <el-alert type="success" title="操作说明:" :closable="false">
+            <li>1.双击覆盖物即可编辑</li>
+            <li>2.编辑状态,对点双击可删除该点</li>
+            <li>3.绘制状态,右键结束绘制</li>
+            <li>4.结束编辑才能保存绘制的覆盖物信息</li>
+          </el-alert>
+          <el-button-group>
+            <el-button type="primary" @click="handleAdd">新建</el-button>
+            <el-button @click="polyEditor.close()">结束编辑</el-button>
+            <el-button @click="clear()">清除绘制</el-button>
+          </el-button-group>
+        </div>
+      </div>
+    </ai-dialog>
   </section>
 </template>
 
 <script>
 import AMapLoader from "@amap/amap-jsapi-loader";
+import {mapState} from "vuex";
 
 export default {
   name: "mapPlotting",
@@ -37,8 +52,12 @@ export default {
     event: "change"
   },
   props: {
+    title: {default: "地图标绘"},
     value: Array
   },
+  computed: {
+    ...mapState(['user']),
+  },
   data() {
     return {
       map: null,
@@ -46,14 +65,8 @@ export default {
       placeSearch: null,
       searchAddress: "",
       overlays: [],
-      points: []
-    }
-  },
-  watch: {
-    points: {
-      deep: true, handler(v) {
-        this.$emit('change', v.flat())
-      }
+      points: [],
+      dialog: false
     }
   },
   methods: {
@@ -70,104 +83,147 @@ export default {
       polyEditor.close();
       polyEditor.setTarget();
       polyEditor.open();
-    }
-  },
-  mounted() {
-    setTimeout(() => AMapLoader.load({
-      key: "b553334ba34f7ac3cd09df9bc8b539dc", // 申请好的Web端开发者Key，首次调用 load 时必填
-      version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-      plugins: ["AMap.PlaceSearch", "AMap.PolygonEditor"], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-      AMapUI: {
-        // 是否加载 AMapUI，缺省不加载
-        version: "1.1", // AMapUI 缺省 1.1
-        plugins: [], // 需要加载的 AMapUI ui插件
-      },
-    }).then((AMap) => {
-      this.map = new AMap.Map("container", {
-        resizeEnable: true,
-      });
-      this.placeSearch = new AMap.PlaceSearch({
-        pageSize: 5, // 单页显示结果条数
-        pageIndex: 1, // 页码
-        city: "", // 兴趣点城市
-        citylimit: false, //是否强制限制在设置的城市内搜索
-        map: this.map, // 展现结果的地图实例
-        panel: "panel", // 结果列表将在此容器中进行展示。
-        autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
-      });
-      this.polyEditor = new AMap.PolygonEditor(this.map).on('add', ({target}) => {
-        this.polyEditor.addAdsorbPolygons(target)
-        target.on("dblclick", () => {
-          this.polyEditor.setTarget(target);
-          this.polyEditor.open()
+    },
+    initMap() {
+      setTimeout(() => AMapLoader.load({
+        key: "b553334ba34f7ac3cd09df9bc8b539dc", // 申请好的Web端开发者Key，首次调用 load 时必填
+        version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+        plugins: ["AMap.PlaceSearch", "AMap.PolygonEditor"], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+        AMapUI: {
+          // 是否加载 AMapUI，缺省不加载
+          version: "1.1", // AMapUI 缺省 1.1
+          plugins: [], // 需要加载的 AMapUI ui插件
+        },
+      }).then((AMap) => {
+        this.map = new AMap.Map("container", {
+          resizeEnable: true,
+        });
+        this.placeSearch = new AMap.PlaceSearch({
+          pageSize: 5, // 单页显示结果条数
+          pageIndex: 1, // 页码
+          city: this.user.info.areaId?.substring(0, 6), // 兴趣点城市
+          citylimit: true, //是否强制限制在设置的城市内搜索
+          map: this.map, // 展现结果的地图实例
+          panel: "panel", // 结果列表将在此容器中进行展示。
+          autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
+        });
+        this.polyEditor = new AMap.PolygonEditor(this.map).on('add', ({target}) => {
+          this.polyEditor.addAdsorbPolygons(target)
+          target.on("dblclick", () => {
+            this.polyEditor.setTarget(target);
+            this.polyEditor.open()
+          })
         })
-      })
-      this.polyEditor.on('end', ({target}) => {
-        this.overlays.push(target);
-        this.points.push(target.getPath().map((e) => ({lat: e.getLat(), lng: e.getLng()})))
-      });
-      if (this.value?.length > 0) {
-        let path = this.value.map(e => [e.lng, e.lat]);
-        let polygon = new AMap.Polygon({
-          path,
-          strokeColor: "#FF33FF",
-          strokeWeight: 6,
-          strokeOpacity: 0.2,
-          fillOpacity: 0.4,
-          fillColor: "#1791fc",
-        })
-        this.map.add([polygon]);
-        this.map.setFitView();
-        this.polyEditor.addAdsorbPolygons(polygon)
-        polygon.on('dblclick', () => {
+        this.polyEditor.on('end', ({target}) => {
+          this.overlays.push(target);
+          this.points.push(target.getPath().map((e) => ({lat: e.getLat(), lng: e.getLng()})))
+        });
+        if (this.value?.length > 0) {
+          let path = this.value.map(e => [e.lng, e.lat]);
+          let polygon = new AMap.Polygon({
+            path,
+            strokeColor: "#FF33FF",
+            strokeWeight: 6,
+            strokeOpacity: 0.2,
+            fillOpacity: 0.4,
+            fillColor: "#1791fc",
+          })
+          this.map.add([polygon]);
+          this.map.setFitView();
+          this.polyEditor.addAdsorbPolygons(polygon)
+          polygon.on('dblclick', () => {
+            this.polyEditor.setTarget(polygon);
+            this.polyEditor.open()
+          });
           this.polyEditor.setTarget(polygon);
           this.polyEditor.open()
-        });
-        this.polyEditor.setTarget(polygon);
-        this.polyEditor.open()
-      }
-    }), 500)
+        } else {
+          this.map.setCity(this.user.info.areaId?.substring(0, 6))
+          this.map.setZoom(14, false, 600)
+        }
+      }), 500)
+    }
   }
 }
 </script>
 
 <style lang="scss" scoped>
 .mapPlotting {
-  width: 100%;
-  height: 100%;
-  position: relative;
-  overflow: hidden;
-  display: flex;
-  flex-direction: column;
+  display: inline-block;
+  text-align: left;
 
-  .container {
-    width: inherit;
+  .clicker {
+    display: inline-block;
   }
 
-  #panel {
-    position: absolute;
-    height: 400px;
-    right: 30px;
-    top: 20px;
-    width: 280px;
+  .mapPanel {
+    width: 100%;
+    height: 100%;
+    position: relative;
     overflow: hidden;
-    z-index: 10000;
+    display: flex;
+    flex-direction: column;
+
+    .container {
+      width: inherit;
+    }
+
+    #panel {
+      position: absolute;
+      height: 400px;
+      right: 30px;
+      top: 20px;
+      width: 280px;
+      overflow: hidden;
+      z-index: 10000;
+    }
+
+    .tipinput {
+      position: absolute;
+      width: 300px;
+      height: 38px;
+      left: 20px;
+      top: 20px;
+      z-index: 10000;
+    }
+
+    .operationBtns {
+      position: absolute;
+      left: 20px;
+      bottom: 20px;
+      z-index: 10000;
+    }
   }
 
-  .tipinput {
-    position: absolute;
-    width: 300px;
-    height: 38px;
-    left: 20px;
-    top: 20px;
-    z-index: 10000;
+  ::v-deep.fullscreenMap {
+    .el-dialog {
+      display: flex;
+      flex-direction: column;
+
+      .el-dialog__body {
+        padding: 0;
+        flex: 1;
+        min-height: 0;
+
+        .ai-dialog__content {
+          max-height: unset !important;
+          padding-bottom: 0;
+          height: 100%;
+
+          .ai-dialog__content--wrapper {
+            padding-right: 0 !important;
+          }
+        }
+      }
+    }
   }
 
-  .operationBtns {
-    position: absolute;
-    left: 20px;
-    bottom: 20px;
-    z-index: 10000;
+  ::v-deep .amap-copyright {
+    display: none !important;
+  }
+
+  ::v-deep .amap-logo {
+    display: none !important;
   }
 }
 </style>

From 61de1da32d372991aa6d9bcb20e8d4b7d481bfb6 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 9 May 2022 08:43:37 +0800
Subject: [PATCH 44/45] 29553

---
 packages/jianping/AppPublicizeInformation/Add.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/jianping/AppPublicizeInformation/Add.vue b/packages/jianping/AppPublicizeInformation/Add.vue
index 2a2c9fcb..ae73f62e 100644
--- a/packages/jianping/AppPublicizeInformation/Add.vue
+++ b/packages/jianping/AppPublicizeInformation/Add.vue
@@ -148,7 +148,7 @@ export default {
     submit() {
       this.$refs.ruleForm.validate(v => {
         if (v) {
-          if(this.form.pictureUrlList.length) {
+          if(this.form.pictureUrlList && this.form.pictureUrlList.length) {
             this.form.pictureUrl = this.form.pictureUrlList[0].url
           }
           this.instance.post(`/app/apppublicityinfo/addOrUpdate`, this.form).then(res => {
@@ -166,6 +166,7 @@ export default {
         params: {id}
       }).then(res => {
         if (res?.data) {
+          res.data.pictureUrlList = []
           if(res.data.pictureUrl) {
             res.data.pictureUrlList = [{url: res.data.pictureUrl}]
           }

From ae24b4d6b447d9e105dbc36873f3c1528f723413 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 9 May 2022 14:32:42 +0800
Subject: [PATCH 45/45] BUG 29559

---
 project/sass/apps/grid/AppGridBlock/components/list.vue | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/project/sass/apps/grid/AppGridBlock/components/list.vue b/project/sass/apps/grid/AppGridBlock/components/list.vue
index b3b9b1ae..62378d11 100644
--- a/project/sass/apps/grid/AppGridBlock/components/list.vue
+++ b/project/sass/apps/grid/AppGridBlock/components/list.vue
@@ -118,11 +118,9 @@
               fixed="right"
               width="160">
             <template slot-scope="{ row }">
-              <div class="table-options">
-                <el-button type="text" @click="showEdit(row.id)">编辑</el-button>
-                <map-plotting :value="row.points" @change="v=>confirm(row,v)"/>
-                <el-button type="text" @click="deleteById(row.id)">删除</el-button>
-              </div>
+              <el-button type="text" @click="showEdit(row.id)">编辑</el-button>
+              <map-plotting :value="row.points" @change="v=>confirm(row,v)"/>
+              <el-button type="text" @click="deleteById(row.id)">删除</el-button>
             </template>
           </el-table-column>
         </ai-table>
@@ -146,7 +144,6 @@
 </template>
 
 <script>
-import AMapLoader from "@amap/amap-jsapi-loader";
 import MapPlotting from "./mapPlotting";
 
 export default {