From 277029ad8509894e1b15d0aa2e393daf58983059 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 11 Aug 2022 10:45:21 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=A0=87=E5=87=86=E7=89=88=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E6=A1=A3=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/sass/apps.import.json                 |    4 +
 project/sass/apps/AppResident/AppResident.vue |  191 ---
 project/sass/apps/AppResident/listTpl.vue     |  358 ------
 .../sass/apps/AppResident/localResident.vue   | 1108 -----------------
 .../sass/apps/AppResident/mobileResident.vue  | 1103 ----------------
 project/sass/apps/AppResident/residentSta.vue |  445 -------
 6 files changed, 4 insertions(+), 3205 deletions(-)
 create mode 100644 project/sass/apps.import.json
 delete mode 100644 project/sass/apps/AppResident/AppResident.vue
 delete mode 100644 project/sass/apps/AppResident/listTpl.vue
 delete mode 100644 project/sass/apps/AppResident/localResident.vue
 delete mode 100644 project/sass/apps/AppResident/mobileResident.vue
 delete mode 100644 project/sass/apps/AppResident/residentSta.vue

diff --git a/project/sass/apps.import.json b/project/sass/apps.import.json
new file mode 100644
index 00000000..b828b279
--- /dev/null
+++ b/project/sass/apps.import.json
@@ -0,0 +1,4 @@
+{
+  "AppResident": "居民档案",
+  "AppResidentTags": "标签管理"
+}
diff --git a/project/sass/apps/AppResident/AppResident.vue b/project/sass/apps/AppResident/AppResident.vue
deleted file mode 100644
index 9a179c2c..00000000
--- a/project/sass/apps/AppResident/AppResident.vue
+++ /dev/null
@@ -1,191 +0,0 @@
-<template>
-  <section class="AppResident">
-    <ai-list v-if="!showDetail" isTabs>
-      <ai-title slot="title" title="居民档案"></ai-title>
-      <template #tabs>
-        <el-tabs v-model="activeName">
-          <el-tab-pane v-for="op in tabs" :key="op.value" :name="op.value" :label="op.label">
-            <component v-if="op.value==activeName" :is="op.comp" :areaId="areaId" :active="activeName"/>
-          </el-tab-pane>
-        </el-tabs>
-      </template>
-    </ai-list>
-    <component v-else :is="detailComponent" :instance="instance" :dict="dict" :permissions="permissions"/>
-  </section>
-</template>
-<script>
-import {mapState} from "vuex";
-import localResident from "./localResident";
-import ListTpl from "./listTpl";
-import MobileResident from "./mobileResident";
-import ResidentSta from "./residentSta";
-
-export default {
-  name: "AppResident",
-  label: "居民档案",
-  props: {
-    instance: Function,
-    dict: Object,
-    permissions: Function,
-  },
-  provide() {
-    return {
-      resident: this
-    }
-  },
-  components: {ResidentSta, MobileResident, ListTpl, localResident},
-  computed: {
-    ...mapState(["user"]),
-    tabs() {
-      let details = {
-        "本地居民": localResident,
-        "流动人员": MobileResident,
-      }
-      return [
-        ...this.dict.getDict('residentType').map(e => ({
-          label: e.dictName,
-          value: e.dictValue,
-          comp: ListTpl,
-          detail: details[e.dictName]
-        }))
-      ]
-    },
-    hideLevel() {
-      return this.user.info.areaList?.length || 0
-    },
-    showDetail() {
-      this.activeName = this.activeName || this.$route.query?.type || 0
-      return !!this.$route.query?.type || !!this.$route.query?.id
-    },
-    detailComponent() {
-      return this.tabs.find(e => e.value == this.activeName)?.detail || ""
-    }
-  },
-  data() {
-    return {
-      areaId: '',
-      activeName: "0",
-    }
-  },
-  created() {
-    this.activeName = this.$route.query?.type
-    // this.areaId = JSON.parse(JSON.stringify(this.user.info.areaId))
-    this.dict.load('residentType', "sex", "faithType", "fileStatus",
-        "legality",
-        "education",
-        "maritalStatus",
-        "politicsStatus",
-        "householdName",
-        "nation",
-        "liveReason",
-        "certificateType",
-        "job",
-        "militaryStatus",
-        "householdRelation",
-        "logoutReason",
-        "nation",
-        "registerStatus",
-        "residentTipType",
-        "liveCategory",
-        "livePeriod",
-        "language",
-        "nationality");
-  },
-}
-</script>
-<style lang="scss" scoped>
-.AppResident {
-  width: 100%;
-  height: 100%;
-  background: rgba(243, 246, 249, 1);
-
-  .iconfont {
-    cursor: pointer;
-  }
-
-  .tab-content-box {
-    padding: 16px 0;
-    width: 100%;
-    box-sizing: border-box;
-    background-color: #f3f6f9;
-    overflow-y: auto;
-  }
-
-  .list {
-    box-sizing: border-box;
-    background-color: #fff;
-    border-radius: 4px;
-    border: solid 1px #d8e0e8;
-    padding: 16px;
-    display: flex;
-    flex-direction: column;
-    gap: 8px;
-
-    .searchBar {
-      padding: 8px 0;
-
-      .el-col {
-        margin-bottom: 8px;
-
-        span {
-          display: inline-block;
-          width: 100px;
-          height: 30px;
-          line-height: 30px;
-          text-align: center;
-          font-size: 14px;
-          background-color: #f5f5f5;
-          border-radius: 2px;
-          border: solid 1px #d0d4dc;
-          border-right: none;
-          margin: 0;
-        }
-      }
-    }
-
-    .addClass {
-      height: 64px;
-    }
-  }
-
-  .dataStatistic {
-    width: 100%;
-    margin-top: 16px;
-    padding: 0 16px 16px 16px;
-    box-sizing: border-box;
-
-    .above {
-      width: 100%;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-
-      .data-item {
-        width: 32%;
-        height: 380px;
-        background: rgba(255, 255, 255, 1);
-        border-radius: 4px;
-        padding: 16px;
-        box-sizing: border-box;
-        position: relative;
-
-        p {
-          position: absolute;
-          right: 16px;
-          top: 16px;
-          font-size: 14px;
-          font-weight: bold;
-
-          span:nth-of-type(1) {
-            color: #999999;
-          }
-
-          span:nth-of-type(2) {
-            color: #333333;
-          }
-        }
-      }
-    }
-  }
-}
-</style>
diff --git a/project/sass/apps/AppResident/listTpl.vue b/project/sass/apps/AppResident/listTpl.vue
deleted file mode 100644
index 58374001..00000000
--- a/project/sass/apps/AppResident/listTpl.vue
+++ /dev/null
@@ -1,358 +0,0 @@
-<template>
-  <section class="listTpl">
-    <ai-list isTabs>
-      <template #content>
-        <ai-search-bar>
-          <template #left>
-            <ai-area-get style="width: 180px;" placeholder="请选择地区" :instance="resident.instance" v-model="search.areaId"
-                         @select="onAreaChange"/>
-            <ai-select placeholder="档案状态" v-model="search.fileStatus"
-                       :selectList="resident.dict.getDict('fileStatus')"
-                       @change="page.current=1,refreshTable()"/>
-            <ai-select placeholder="性别" v-model="search.sex"
-                       :selectList="resident.dict.getDict('sex')"
-                       @change="page.current=1,refreshTable()"/>
-            <ai-select placeholder="文化程度" v-model="search.education"
-                       :selectList="resident.dict.getDict('education')"
-                       @change="page.current=1,refreshTable()"/>
-            <ai-select placeholder="婚姻状况" v-model="search.maritalStatus"
-                       :selectList="resident.dict.getDict('maritalStatus')"
-                       @change="page.current=1,refreshTable()"/>
-            <ai-select placeholder="民族" v-model="search.nation"
-                       :selectList="resident.dict.getDict('nation')"
-                       @change="page.current=1,refreshTable()"/>
-            <el-date-picker
-                value-format="yyyy-MM-dd HH:mm:ss"
-                v-model="search.birthStart"
-                style="width:250px;border-radius:0;"
-                type="date"
-                size="small"
-                unlink-panels
-                placeholder="选择出生开始日期"
-                @change="page.current=1,refreshTable()"
-            />
-            <el-date-picker
-                value-format="yyyy-MM-dd HH:mm:ss"
-                v-model="search.birthEnd"
-                style="width:250px;border-radius:0;"
-                type="date"
-                size="small"
-                placeholder="选择出生结束日期"
-                unlink-panels
-                @change="page.current=1,refreshTable()"
-            />
-            <el-select
-                v-model="search.politicsStatus"
-                placeholder="政治面貌"
-                size="small"
-                @change="page.current=1,refreshTable()"
-                clearable
-            >
-              <el-option
-                  v-for="(item,i) in resident.dict.getDict('politicsStatus')"
-                  :key="i"
-                  :label="item.dictName"
-                  :value="item.dictValue"
-              ></el-option>
-            </el-select>
-            <el-select
-                v-model="search.householdName"
-                placeholder="是否户主"
-                size="small"
-                @change="page.current=1,refreshTable()"
-                clearable
-            >
-              <el-option
-                  v-for="(item,i) in resident.dict.getDict('householdName')"
-                  :key="i"
-                  :label="item.dictName"
-                  :value="item.dictValue"
-              ></el-option>
-            </el-select>
-            <el-select
-                v-model="search.faithType"
-                placeholder="宗教信仰"
-                @change="page.current=1,refreshTable()"
-                size="small"
-                clearable
-            >
-              <el-option
-                  v-for="(item,i) in resident.dict.getDict('faithType')"
-                  :key="i"
-                  :label="item.dictName"
-                  :value="item.dictValue"
-              ></el-option>
-            </el-select>
-          </template>
-          <template #right>
-            <el-input
-                size="small"
-                v-model="search.con"
-                placeholder="姓名/身份证/联系方式"
-                @keyup.enter.native="search.current = 1, refreshTable()"
-                @clear="search.current = 1, refreshTable()"
-                clearable
-                suffix-icon="iconfont iconSearch"/>
-          </template>
-        </ai-search-bar>
-        <ai-search-bar>
-          <template #left>
-            <el-button
-                size="small"
-                type="primary"
-                icon="iconfont iconAdd"
-                @click="gotoAdd()"
-                v-if="$permissions('app_appresident_edit')">
-              添加
-            </el-button>
-            <el-button
-                size="small"
-                icon="iconfont iconDelete"
-                :disabled="multipleSelection.length<=0"
-                @click="beforeDelete()"
-                v-if="$permissions('app_appresident_del')">
-              删除
-            </el-button>
-          </template>
-          <template #right>
-            <ai-import :instance="resident.instance" :dict="resident.dict" type="appresident" name="居民档案"
-                       :importParams="{residentType: active}" @success="refreshTable()">
-              <el-button icon="iconfont iconImport">导入</el-button>
-            </ai-import>
-            <ai-download :instance="resident.instance" :params="params" url="/app/appresident/export"
-                         fileName="居民档案"/>
-          </template>
-        </ai-search-bar>
-
-        <ai-table :tableData="tableData" :col-configs="colConfigs" :dict="resident.dict"
-                  :total="page.total" :current.sync="page.current" :size.sync="page.size"
-                  @getList="refreshTable"
-                  @selection-change="handleSelectionChange">
-          <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="fileStatus" label="档案状态" show-overflow-tooltip align="center">
-            <template slot-scope="scope">
-              <span v-if="scope.row.fileStatus==0" style="color:rgba(46,162,34,1);">正常</span>
-              <span v-if="scope.row.fileStatus==1" style="color:rgba(153,153,153,1);">已注销</span>
-            </template>
-          </el-table-column>
-          <el-table-column slot="options" label="操作" show-overflow-tooltip align="center">
-            <template slot-scope="scope">
-              <div class="table-options">
-                <el-button
-                    title="详情"
-                    type="text"
-                    v-if="$permissions('app_appresident_detail')"
-                    @click="detailShow(scope.row)">
-                  详情
-                </el-button>
-              </div>
-            </template>
-          </el-table-column>
-        </ai-table>
-      </template>
-    </ai-list>
-  </section>
-</template>
-
-<script>
-import {mapState} from "vuex";
-
-export default {
-  name: "listTpl",
-  inject: ['resident'],
-  props: {
-    active: {default: ""},//人员类型
-  },
-  computed: {
-    ...mapState(["user"]),
-    params() {
-      let params = {
-        residentType: this.active
-      }
-      //导出搜索条件
-      if (this.deleteIds.length) {
-        params = {
-          ...params,
-          areaId: this.search.areaId,
-          ids: this.deleteIds
-        }
-      } else {
-        params = {
-          areaId: this.search.areaId,
-          ...params,
-          ...this.search.search
-        }
-      }
-      return params
-    },
-    colConfigs() {
-      return [
-        {type: "selection"},
-        {label: "姓名", prop: "name", align: "center"},
-        {label: "性别", prop: "sex", dict: 'sex', align: "center"},
-        {slot: "idNumber"},
-        {label: "年龄", prop: "age", align: "center"},
-        {label: "民族", prop: "nation", align: "center", dict: "nation"},
-        {label: "文化程度", prop: "education", align: "center", dict: "education"},
-        {label: "政治面貌", prop: "politicsStatus", align: "center", dict: "politicsStatus"},
-        {slot: "fileStatus"},
-        {slot: "options"}
-      ]
-    }
-  },
-
-  data() {
-    return {
-      page: {current: 1, size: 10, total: 0},
-      search: {
-        fileStatus: "",
-        sex: "",
-        nation: "",
-        education: "",
-        politicsStatus: "",
-        birthStart: "",
-        birthEnd: "",
-        faithType: "",
-        householdName: "",
-        areaId: '',
-        con: "",
-        maritalStatus: ""
-      },
-      style: {},
-      tableData: [],
-      multipleSelection: [],
-      deleteIds: [],
-    };
-  },
-  methods: {
-    handleClick() {
-      this.tableData = [];
-      this.multipleSelection = [];
-      this.searchInit()
-    },
-
-    onAreaChange () {
-      this.page.current = 1
-
-      this.$nextTick(() => {
-        this.refreshTable()
-      })
-    },
-    searchInit() {
-      let tempAreaId = this.search.areaId;
-      this.search = {
-        fileStatus: "",
-        sex: "",
-        nation: "",
-        education: "",
-        politicsStatus: "",
-        birth: [],
-        faithType: "",
-        householdName: "",
-        areaId: "",
-        con: "",
-        maritalStatus: ""
-      };
-      this.search.areaId = tempAreaId;
-      this.page = {current: 1, size: 10, total: 0};
-      this.refreshTable()
-    },
-    handleSelectionChange(val) {
-      this.deleteIds = [];
-      this.multipleSelection = val;
-      this.multipleSelection.forEach(e => {
-        this.deleteIds.push(e.id);
-      });
-    },
-    exportrExcle() {
-      if (this.deleteIds.length == 0) {
-        if (this.search.birth) {
-          this.search.birth = this.search.birth.join(",");
-        }
-        this.resident.instance
-        .post(`/app/appresident/exportAll`, null, {
-          params: {
-            ...this.search,
-            ...this.page
-          }
-        })
-        .then(res => {
-          if (res && res.code == 0) {
-            this.$message.success(res.data);
-            if (typeof this.search.birth == "string") {
-              this.search.birth = this.search.birth.split(",");
-            }
-          }
-        });
-      } else {
-        this.resident.instance.post(`/app/appresident/exportByIds`, {
-          ids: this.deleteIds,
-          areaId: this.user.info.areaId
-        }).then(res => {
-          if (res?.code == 0) {
-            this.$message.success(res.data);
-          }
-        });
-      }
-    },
-    handleSizeChange(val) {
-      this.page.size = val;
-      this.refreshTable()
-    },
-    detailShow(row) {
-      this.$router.push({query: {type: this.active, id: row.id}})
-    },
-    gotoAdd() {
-      this.$router.push({query: {type: this.active}})
-    },
-    refreshTable() {
-      this.resident.instance.post(`/app/appresident/list`, null, {
-        params: {...this.search, ...this.page, residentType: this.active}
-      }).then(res => {
-        if (res?.data) {
-          this.tableData = res.data.records
-          this.page.total = res.data.total
-        }
-      })
-    },
-    beforeDelete() {
-      this.$confirm("确定要执行删除操作吗？", {type: "error"})
-      .then(() => {
-        this.deletePersonFn();
-        this.deleteIds = [];
-      })
-      .catch(() => {
-      });
-    },
-    deletePersonFn() {
-      this.resident.instance.post(`/app/appresident/deleteBody`, {
-        ids: this.deleteIds
-      }).then(res => {
-        if (res && res.code == 0) {
-          this.$message.success("删除成功");
-          if (
-              this.page.current == Math.ceil(this.page.total / this.page.size)
-          ) {
-            this.page.total = this.page.total - this.deleteIds.length;
-            this.page.current = Math.ceil(this.page.total / this.page.size);
-          }
-          this.refreshTable();
-        }
-      })
-    },
-  },
-  created() {
-    this.refreshTable()
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.listTpl {
-  height: 100%;
-}
-</style>
diff --git a/project/sass/apps/AppResident/localResident.vue b/project/sass/apps/AppResident/localResident.vue
deleted file mode 100644
index f1973a8e..00000000
--- a/project/sass/apps/AppResident/localResident.vue
+++ /dev/null
@@ -1,1108 +0,0 @@
-<template>
-  <section class="addAborigines">
-    <ai-detail>
-      <ai-title slot="title" :title="showDetail?'本地居民信息':'添加本地居民'" isShowBack @onBackClick="$router.push({query:{}})"
-                isShowBottomBorder>
-        <template v-if="showDetail" #rightBtn>
-          <el-button @click="beforeWriteOff()" icon="el-icon-switch-button" v-if="baseInfo.fileStatus==0">注销档案
-          </el-button>
-          <el-button icon="iconfont iconDelete" @click="handleDelete()" v-if="$permissions('app_appresident_del')">
-            删除人员
-          </el-button>
-        </template>
-      </ai-title>
-      <template #content>
-        <el-form class="content-right" :model="baseInfo" ref="ruleForm" :rules="rules" label-width="130px"
-                 label-position="right" size="small">
-
-          <ai-card title="基本信息">
-            <template v-if="showDetail" #right>
-              <template v-if="$permissions('app_appresident_edit')">
-                <el-button
-                    type="text"
-                    class="iconfont iconEdit"
-                    @click="editInit(),showEdit1=true;"
-                    v-if="!showEdit1"
-                >&nbsp;修改
-                </el-button>
-              </template>
-              <el-button
-                  type="text"
-                  @click="showEdit1=false,searchDetail(baseInfo.id)"
-                  v-if="showEdit1"
-              >取消
-              </el-button>
-              <el-button type="text" v-if="showEdit1" @click="saveFrom('ruleForm')">保存</el-button>
-            </template>
-            <div slot="content" v-if="showEdit1">
-              <div class="above">
-                <div class="left">
-                  <el-form-item label="姓名：" prop="name">
-                    <el-input
-                        v-model="baseInfo.name"
-                        autocomplete="off"
-                        size="small"
-                        placeholder="请输入姓名"
-                        v-if="showEdit1"
-                        :disabled="!!showDetail"
-                    ></el-input>
-                    <!-- <p v-else>{{baseInfo.name||'-'}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="身份证号：" prop="idNumber">
-                    <el-input
-                        v-model="baseInfo.idNumber"
-                        autocomplete="off"
-                        size="small"
-                        placeholder="请输入身份证号"
-                        v-if="showEdit1"
-                        :maxlength="18"
-                        @input="idChange"
-                        :disabled="!!showDetail"
-                    />
-                    <!-- <p v-else>
-                        <ai-id mode="show" v-model="baseInfo.idNumber" right-btn></ai-id>
-                    </p>-->
-                  </el-form-item>
-                  <el-form-item label="性别：" prop="sex">
-                    <el-select v-model="baseInfo.sex"
-                               placeholder="请选择"
-                               disabled
-                               clearable>
-                      <el-option
-                          v-for="(item,i) in dict.getDict('sex')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>
-                        {{dict.getLabel('sex',baseInfo.sex)||'-'}}
-                    </p>-->
-                  </el-form-item>
-                </div>
-                <div class="right">
-                  <el-form-item label="个人照片：" prop="photo">
-                    <!-- <div class="pictrue">
-                        <img :src="imgUrl" alt="" title=""></img>
-                        <el-upload
-                            v-if="showEdit1"
-                            class="upload-demo"
-                            action
-                            multiple
-                            accept=".png,.jpg"
-                            :http-request="uploadFile"
-                            :show-file-list="false"
-                            :on-change="handleChange"
-                            :file-list="fileList"
-                            >
-                            <el-button >上传照片</el-button>
-                            <div slot="tip" class="el-upload__tip">
-                                    图片大小不能超过2M
-                    </div>
-                        </el-upload>
-                    </div>-->
-                    <ai-avatar :instance="instance" v-if="showEdit1" v-model="baseInfo.photo"/>
-                    <ai-avatar v-model="baseInfo.photo" v-else :editable="false"/>
-                    <!--<ai-avatar :instance="instance" v-model="baseInfo.photo"/>-->
-                  </el-form-item>
-                </div>
-              </div>
-              <div class="above">
-                <div class="left">
-                  <el-form-item label="出生日期：" prop="birthday">
-                    <el-date-picker
-                        v-if="showEdit1"
-                        disabled
-                        :editable="false"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        format="yyyy-MM-dd"
-                        v-model="birthday"
-                        type="date"
-
-                        placeholder="选择日期"
-                    ></el-date-picker>
-                    <!-- <p v-else>{{birthday?birthday.substring(0, 10):"-"}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="文化程度：" prop="education">
-                    <el-select
-                        v-model="baseInfo.education"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('education')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('education',baseInfo.education)||'-'}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="政治面貌：" prop="politicsStatus">
-                    <el-select
-                        v-model="baseInfo.politicsStatus"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('politicsStatus')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('politicsStatus',baseInfo.politicsStatus)||'-'}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="职业：" prop="job">
-                    <el-select
-                        v-model="baseInfo.job"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('job')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('job',baseInfo.job)||'-'}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="宗教信仰：" prop="faithType">
-                    <el-select
-                        v-model="baseInfo.faithType"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('faithType')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('faithType',baseInfo.faithType)||'-'}}</p> -->
-                  </el-form-item>
-                </div>
-                <div class="right">
-                  <el-form-item label="年龄：" prop="age">
-                    <el-input
-                        disabled
-                        v-model="baseInfo.age"
-                        autocomplete="off"
-                        size="small"
-                        placeholder="请输入年龄"
-                        v-if="showEdit1"
-                        type="number"
-                        @mousewheel.native.prevent
-                    ></el-input>
-                    <!-- <p v-else>{{baseInfo.age}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="民族：" prop="nation">
-                    <el-select
-                        v-model="baseInfo.nation"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('nation')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('nation',baseInfo.nation)||'-'}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="婚姻状况：" prop="maritalStatus">
-                    <el-select
-                        v-model="baseInfo.maritalStatus"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('maritalStatus')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('maritalStatus',baseInfo.maritalStatus)||'-'}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="兵役状况：" prop="militaryStatus">
-                    <el-select
-                        v-model="baseInfo.militaryStatus"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('militaryStatus')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('militaryStatus',baseInfo.militaryStatus)||'-'}}</p> -->
-                  </el-form-item>
-                </div>
-              </div>
-              <div class="areaList">
-                <el-form-item label="籍贯：" prop=" birthplaceAreaId">
-                  <ai-area-select
-                      clearable
-                      always-show
-                      :instance="instance"
-                      v-if="showEdit1"
-                      v-model="baseInfo.birthplaceAreaId"
-                      :areaLevel="3"
-                  ></ai-area-select>
-                  <!-- <p v-if="!showEdit1">{{baseInfo.birthplaceAreaName||'-'}}</p> -->
-                </el-form-item>
-              </div>
-            </div>
-            <div slot="content" v-else>
-              <el-row type="flex">
-                <div class="detail-info fill">
-                  <h3 class="name">{{ baseInfo.name || '-' }}</h3>
-                  <div class="detail-left fill">
-                    <div class="info">
-                      <span class="label">性别：</span>
-                      <span class="value">{{ dict.getLabel('sex', baseInfo.sex) || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">出生日期：</span>
-                      <span class="value">{{ birthday ? birthday.substring(0, 10) : '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">籍贯：</span>
-                      <span class="value">{{ baseInfo.birthplaceAreaName || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">文化程度：</span>
-                      <span class="value">{{ dict.getLabel('education', baseInfo.education) || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">政治面貌：</span>
-                      <span
-                          class="value"
-                      >{{ dict.getLabel('politicsStatus', baseInfo.politicsStatus) || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">宗教信仰：</span>
-                      <span class="value">{{ dict.getLabel('faithType', baseInfo.faithType) || '-' }}</span>
-                    </div>
-                  </div>
-                  <div class="detail-right fill">
-                    <div class="info">
-                      <span class="label">身份证号：</span>
-                      <span class="value">
-                        <ai-id mode="show" v-model="baseInfo.idNumber" right-btn class="line-center"></ai-id>
-                      </span>
-                    </div>
-                    <div class="info">
-                      <span class="label">年龄：</span>
-                      <span class="value">{{ baseInfo.age }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">民族：</span>
-                      <span class="value">{{ dict.getLabel('nation', baseInfo.nation) || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">婚姻状况：</span>
-                      <span
-                          class="value"
-                      >{{ dict.getLabel('maritalStatus', baseInfo.maritalStatus) || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">兵役状况：</span>
-                      <span
-                          class="value"
-                      >{{ dict.getLabel('militaryStatus', baseInfo.militaryStatus) || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">职业：</span>
-                      <span class="value">{{ dict.getLabel('job', baseInfo.job) || '-' }}</span>
-                    </div>
-                  </div>
-                </div>
-                <ai-avatar v-model="baseInfo.photo" :editable="false"/>
-              </el-row>
-            </div>
-          </ai-card>
-
-          <ai-card title="联络信息">
-            <template v-if="showDetail" #right>
-              <template v-if="$permissions('app_appresident_edit')">
-                <el-button
-                    type="text"
-                    class="iconfont iconEdit"
-                    @click="editInit(),showEdit2=true;"
-                    v-if="!showEdit2">
-                  修改
-                </el-button>
-              </template>
-              <el-button
-                  type="text"
-                  @click="showEdit2=false,searchDetail(baseInfo.id)"
-                  v-if="showEdit2">
-                取消
-              </el-button>
-              <el-button type="text" v-if="showEdit2" @click="saveFrom('ruleForm')">保存</el-button>
-            </template>
-            <div slot="content" v-if="showEdit2">
-              <div class="above">
-                <div class="left">
-                  <el-form-item label="联系方式：" prop="phone">
-                    <el-input v-model="baseInfo.phone" size="small" placeholder="请输入联系方式" v-if="showEdit2"
-                              :maxlength="11"/>
-                  </el-form-item>
-                </div>
-              </div>
-              <el-form-item label="现住址：" prop="currentAreaId">
-                <ai-area-select clearable always-show :instance="instance" v-model="baseInfo.currentAreaId"
-                                :valueLevel="4"/>
-                <el-form-item>
-                  <el-input v-model="baseInfo.currentAddress" placeholder="详细地址" clearable/>
-                </el-form-item>
-              </el-form-item>
-            </div>
-            <div slot="content" v-else style="margin-top: 16px;margin-bottom:24px">
-              <div class="info" style="margin-bottom:8px">
-                <span class="label">联系方式：</span>
-                <span class="value">{{ baseInfo.phone || '-' }}</span>
-              </div>
-              <div class="info">
-                <span class="label">现住址：</span>
-                <span class="value">{{ baseInfo.currentAreaName + baseInfo.currentAddress || "-" }}</span>
-              </div>
-            </div>
-          </ai-card>
-
-          <ai-card title="户籍信息">
-            <template v-if="showDetail" #right>
-              <template v-if="$permissions('app_appresident_edit')">
-                <el-button
-                    type="text"
-                    class="iconfont iconEdit"
-                    @click="editInit(),showEdit3=true;"
-                    v-if="!showEdit3"
-                >&nbsp;修改
-                </el-button>
-              </template>
-              <el-button
-                  type="text"
-                  @click="showEdit3=false,searchDetail(baseInfo.id)"
-                  v-if="showEdit3"
-              >取消
-              </el-button>
-              <el-button type="text" v-if="showEdit3" @click="saveFrom('ruleForm')">保存</el-button>
-            </template>
-            <div slot="content" v-if="showEdit3">
-              <div class="above">
-                <div class="left">
-                  <el-form-item label="是否户主：" prop="householdName">
-                    <el-select v-model="baseInfo.householdName" placeholder="请选择"
-                               @change="householdRelationChange" clearable>
-                      <el-option v-for="(item,i) in dict.getDict('householdName')"
-                                 :label="item.dictName" :key="i" :value="item.dictValue"/>
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item label="与户主关系：" prop="householdRelation" v-if="baseInfo.householdName==0">
-                    <el-select v-model="baseInfo.householdRelation" placeholder="请选择" v-if="showEdit3" clearable>
-                      <el-option v-for="(item,i) in dict.getDict('householdRelation')"
-                                 :label="item.dictName" :key="i" :value="item.dictValue"/>
-                    </el-select>
-                  </el-form-item>
-                </div>
-                <div class="right">
-                  <el-form-item label="户主身份证号：" prop="householdIdNumber" v-if="baseInfo.householdName==0">
-                    <el-input v-model="baseInfo.householdIdNumber" placeholder="请输入户主身份证号" :maxlength="18" clearable/>
-                  </el-form-item>
-                </div>
-              </div>
-              <el-form-item label="户籍地：" prop="householdAreaId">
-                <ai-area-select clearable always-show :instance="instance" v-if="showEdit3"
-                                v-model="baseInfo.householdAreaId" :valueLevel="4"/>
-                <el-form-item>
-                  <el-input v-model="baseInfo.householdAddress" placeholder="详细地址" clearable/>
-                </el-form-item>
-              </el-form-item>
-            </div>
-            <div slot="content" v-else style="margin-top: 16px;margin-bottom:24px">
-              <div class="detail-info">
-                <div class="detail-left fill">
-                  <div class="info">
-                    <span class="label">是否户主：</span>
-                    <span class="value">{{ dict.getLabel('householdName', baseInfo.householdName) || '-' }}</span>
-                  </div>
-                </div>
-                <div class="info fill" v-if="baseInfo.householdName==0">
-                  <span class="label">与户主关系：</span>
-                  <span class="value">{{ dict.getLabel('householdRelation', baseInfo.householdRelation) || '-' }}</span>
-                </div>
-                <div class="info fill" v-if="baseInfo.householdName==0">
-                  <span class="label">户主身份证号：</span>
-                  <span class="value">
-                        <ai-id mode="show" v-model="baseInfo.householdIdNumber" right-btn></ai-id>
-                      </span>
-                </div>
-              </div>
-              <div class="detail-info-p info">
-                <span class="label">户籍地：</span>
-                <span class="value">
-                  {{ baseInfo.householdAreaName + (baseInfo.householdAddress ? baseInfo.householdAddress : "") }}
-                </span>
-              </div>
-            </div>
-          </ai-card>
-
-          <ai-card title="家庭成员" v-if="showDetail">
-            <div slot="content" v-if="showDetail">
-              <el-table
-                  border
-                  ref="multipleTable"
-                  :data="family"
-                  style="margin-top:8px;"
-
-                  header-cell-class-name="table-header"
-                  tooltip-effect="light"
-                  row-class-name="table-row"
-                  cell-class-name="table-cell"
-              >
-                <el-table-column align="center" prop="name" label="与户主关系">
-                  <template slot-scope="scope">
-                      <span>{{
-                          scope.row.householdRelation ? dict.getLabel('householdRelation', scope.row.householdRelation) : "户主"
-                        }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="name" label="姓名" align="center" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="idNumber" label="性别" align="center" show-overflow-tooltip>
-                  <template slot-scope="scope">
-                    <span>{{ parseInt(scope.row.idNumber.substr(16, 1)) % 2 == 1 ? '男' : '女' }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="age" label="年龄" align="center" show-overflow-tooltip></el-table-column>
-                <el-table-column
-                    prop="idNumber"
-                    label="身份证号"
-                    align="center"
-                    width="200"
-                    show-overflow-tooltip>
-                  <template slot-scope="{row}">
-                    <ai-id mode="show" v-model="row.idNumber" :showEyes="false"/>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="address" label="操作" align="center" show-overflow-tooltip>
-                  <template slot-scope="scope">
-                    <el-button icon="iconfont iconShow" title="查看详情" class="dict-list-operation"
-                               @click="showFamily(scope.row)" type="text"/>
-                  </template>
-                </el-table-column>
-                <div slot="empty" class="no-data" style="height:160px;"/>
-              </el-table>
-            </div>
-          </ai-card>
-        </el-form>
-      </template>
-      <template v-if="!showDetail" #footer>
-        <el-button @click="cancelFn()">取消</el-button>
-        <el-button type="primary" @click="saveFrom('ruleForm','goBack')">保存</el-button>
-      </template>
-    </ai-detail>
-
-    <el-dialog class="deleteStyle" :visible.sync="familyDialog" width="720px" title="家庭成员信息" top="30vh">
-      <el-row type="flex" justify="space-between">
-        <ul>
-          <li>
-            <span>姓名：</span>
-            <p>{{ familyInfo.name }}</p>
-          </li>
-          <li>
-            <span>身份证号：</span>
-            <p>
-              <ai-id mode="show" v-model="familyInfo.idNumber" right-btn class="line-center"></ai-id>
-            </p>
-          </li>
-          <li>
-            <span>性别：</span>
-            <p>{{ dict.getLabel('sex', familyInfo.sex) }}</p>
-          </li>
-          <li>
-            <span>年龄：</span>
-            <p>{{ familyInfo.age }}</p>
-          </li>
-          <li>
-            <span>联系方式：</span>
-            <p>{{ familyInfo.phone }}</p>
-          </li>
-          <li>
-            <span>民族：</span>
-            <p>{{ dict.getLabel('nation', familyInfo.nation) }}</p>
-          </li>
-          <li>
-            <span>籍贯：</span>
-            <p>{{ familyInfo.birthplaceAreaName }}</p>
-          </li>
-          <li>
-            <span>文化程度：</span>
-            <p>{{ dict.getLabel('education', familyInfo.education) }}</p>
-          </li>
-          <li>
-            <span>婚姻状况：</span>
-            <p>{{ dict.getLabel('maritalStatus', familyInfo.maritalStatus) }}</p>
-          </li>
-          <li>
-            <span>政治面貌：</span>
-            <p>{{ dict.getLabel('politicsStatus', familyInfo.politicsStatus) }}</p>
-          </li>
-          <li>
-            <span>兵役状况：</span>
-            <p>{{ dict.getLabel('militaryStatus', familyInfo.militaryStatus) }}</p>
-          </li>
-          <li>
-            <span>宗教信仰：</span>
-            <p>{{ dict.getLabel('faithType', familyInfo.faithType) }}</p>
-          </li>
-          <li>
-            <span>职业：</span>
-            <p>{{ dict.getLabel('job', familyInfo.job) }}</p>
-          </li>
-          <li style="width:100%;">
-            <span>现住址：</span>
-            <p>{{ familyInfo.currentAreaName + familyInfo.currentAddress }}</p>
-          </li>
-        </ul>
-        <div class="img_block">
-          <ai-avatar v-model="familyInfo.imgUrl" :editable="false"/>
-        </div>
-      </el-row>
-      <div slot="footer" style="text-align: center;">
-        <el-button style="width:92px" size="small" @click="familyDialog = false">关闭
-        </el-button>
-      </div>
-    </el-dialog>
-    <el-dialog title="档案注销"
-               class="deleteStyle"
-               :visible.sync="writeoffDialog"
-               width="700px" top="25vh"
-               @close="familyInit()"
-               :close-on-click-modal="false">
-      <el-form :model="writeInfo" ref="writeInfo" label-width="100px" size="small">
-        <el-form-item label="姓名：">{{ baseInfo.name }}</el-form-item>
-        <el-form-item label="身份证号：">
-          <ai-id mode="show" v-model="baseInfo.idNumber" right-btn/>
-        </el-form-item>
-        <el-form-item label="注销原因：" prop="logoutReason" autocomplete="off"
-                      :rules="{required: true, message: '注销原因不能为空', trigger: 'change'}">
-          <el-select v-model="writeInfo.logoutReason" placeholder="请选择">
-            <el-option v-for="(item,i) in dict.getDict('logoutReason')"
-                       :label="item.dictName"
-                       :key="i" :value="item.dictValue"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="操作说明：" prop="logoutDescription" :rules="{ required: true, message: '操作说明不能为空'}">
-          <el-input type="textarea" v-model="writeInfo.logoutDescription" :rows="4"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" style="text-align: center;">
-        <el-button
-            style="width:92px"
-            size="small"
-            class="delete-btn"
-            @click="writeoffDialog=false,$refs.writeInfo.resetFields();"
-        >取消
-        </el-button>
-        <el-button
-            style="width:92px"
-            size="small"
-            type="primary"
-            @click="submitForm('writeInfo')"
-        >确认
-        </el-button>
-      </div>
-    </el-dialog>
-  </section>
-</template>
-<script>
-import {mapState} from "vuex";
-
-export default {
-  name: "addAborigines",
-  props: {
-    instance: Function,
-    dict: Object,
-    permissions: Function,
-    detail: Object,
-    active: String
-  },
-  data() {
-    let IdNumberPass = (rule, value, callback) => {
-      if (value) {
-        if (this.idCardNoUtil.checkIdCardNo(value)) {
-          callback();
-        } else {
-          callback(new Error("身份证号格式错误"));
-        }
-      } else {
-        callback(new Error("请输入身份证号"));
-      }
-    };
-    return {
-      buildingCascader: true,
-      houseCascader: true,
-      navId: 0,
-      baseInfo: {
-        registerStatus: "",
-        tips: [],
-        age: "",
-        birthplaceAreaId: "",
-        currentAddress: "",
-        currentAreaId: "",
-        education: "",
-        faithType: "",
-        fileStatus: "",
-        householdAddress: "",
-        householdAreaId: "",
-        householdIdNumber: "",
-        householdName: "",
-        householdRelation: "",
-        id: "",
-        idNumber: "",
-        job: "",
-        logoutDescription: "",
-        logoutReason: "",
-        logoutTime: "",
-        logoutUserId: "",
-        maritalStatus: "",
-        militaryStatus: "",
-        name: "",
-        nation: "",
-        phone: "",
-        photo: "",
-        politicsStatus: "",
-        sex: ""
-      },
-      family: [],
-      familyDialog: false,
-      familyInfo: {},
-      writeoffDialog: false,
-      writeInfo: {
-        id: "",
-        logoutReason: "",
-        logoutDescription: "",
-        fileStatus: "1"
-      },
-      birthday: "",
-      rules: {
-        name: [{required: true, message: "请输入姓名", trigger: "blur"}],
-        idNumber: [
-          {required: true, validator: IdNumberPass, trigger: "blur"}
-        ],
-        sex: [{required: true, message: "请选择性别", trigger: "blur"}],
-        currentAreaId: [{message: "请选择现住址", required: true, trigger: "blur"},
-          {
-            validator: (r, v, cb) => {
-              if (/.+0{3}$/.test(v)) {
-                cb("现住址必须选到村级")
-              } else cb()
-            }, trigger: "blur"
-          }],
-        currentAddress: [{message: "请选择现住址详细地址", required: true}],
-
-        householdName: [
-          {required: true, message: "请选择是否户主", trigger: "change"}
-        ],
-        householdRelation: [
-          {required: true, message: "请选择与户主关系", trigger: "change"}
-        ],
-        householdIdNumber: [
-          {required: true, validator: IdNumberPass, trigger: "blur"}
-        ]
-      },
-      imgUrl: "",
-      fileList: [],
-      showEdit1: false,
-      showEdit2: false,
-      showEdit3: false,
-      showEdit4: false,
-      disabledLevel: 0
-    };
-  },
-  computed: {
-    ...mapState(["user"]),
-    showDetail() {
-      return !!this.$route.query?.id
-    },
-    navList() {
-      return [
-        {name: "本地居民信息", id: "1"},
-        {name: "变更记录", id: "2"}
-      ]
-    },
-    tipOps() {
-      return this.dict.getDict("residentTipType") || []
-    }
-  },
-  methods: {
-    uploadFile(file) {
-      const isLt2M = file.file.size / 1024 / 1024 < 2;
-      if (!isLt2M) {
-        this.$message.warning("头像大小不能超过 2MB!");
-        return;
-      }
-      let formData = new FormData();
-      formData.append("file", file.file);
-      this.instance.post(`/admin/file/add`, formData, {withCredentials: false})
-      .then(res => {
-        if (res && res.code == 0) {
-          let imgInfo = res.data[0].split(";");
-          this.imgUrl = imgInfo[0];
-          this.baseInfo.photo = res.data[0];
-        }
-      });
-    },
-    handleChange(file, fileList) {
-      this.fileList = fileList;
-    },
-    householdRelationChange() {
-      this.baseInfo.householdIdNumber = "";
-      this.baseInfo.householdRelation = "";
-    },
-    saveFrom(formName, type) {
-      this.$refs[formName].validate(valid => {
-        if (valid) {
-          this.saveFromFn(type);
-        }
-      });
-    },
-    cancelFn() {
-      this.$refs.ruleForm?.resetFields()
-      this.$router.push({query: {}});
-    },
-    submitForm(formName) {
-      this.writeInfo.id = this.baseInfo.id;
-      this.$refs[formName].validate(valid => {
-        if (valid) {
-          this.instance.post(`/app/appresident/addOrUpdate`, {
-            ...this.writeInfo
-          }).then(res => {
-            if (res && res.code == 0) {
-              this.$message.success("注销成功");
-              this.writeoffDialog = false;
-              this.$router.push({query: {}});
-            }
-          });
-        } else {
-          return false;
-        }
-      });
-    },
-    familyInit() {
-      Object.keys(this.writeInfo).forEach(e => {
-        this.writeInfo[e] = "";
-      });
-      this.$refs.writeInfo.resetFields();
-    },
-    saveFromFn(type) {
-      let {currentHouseList, householdHouseList, tips} = this.baseInfo
-      this.instance.post(`/app/appresident/addOrUpdate`, {
-        residentType: this.$route.query.type,
-        ...this.baseInfo,
-        currentHouseList: currentHouseList?.join("|"),
-        householdHouseList: householdHouseList?.join("|"),
-        tips: tips?.join("|")
-      }).then(res => {
-        if (res?.code == 0) {
-          this.$message.success("保存成功");
-          if (type) {
-            this.$router.push({query: {}})
-          } else {
-            this.editInit();
-          }
-        }
-      });
-    },
-    editInit() {
-      this.showEdit1 = false;
-      this.showEdit2 = false;
-      this.showEdit3 = false;
-      this.showEdit4 = false;
-      this.searchDetail(this.baseInfo.id);
-    },
-    searchDetail(id, type) {
-      this.instance.post(`/app/appresident/detail`, null, {
-        params: {id}
-      }).then(res => {
-        if (res?.data) {
-          let {currentHouseList, householdHouseList, tips} = res.data.resident
-          this.baseInfo = {
-            ...res.data.resident,
-            currentHouseList: currentHouseList?.split("|"),
-            householdHouseList: householdHouseList?.split("|"),
-            tips: tips ? tips.split("|") : [],
-          };
-          this.family = res.data.family;
-          this.IdCard(this.baseInfo.idNumber);
-          if (type == "family") {
-            this.familyDialog = false;
-          }
-        }
-      });
-    },
-    showFamily(row) {
-      this.familyInfo = row;
-      if (this.familyInfo.photo) {
-        this.familyInfo.imgUrl = this.familyInfo.photo.split(";")[0];
-      } else {
-        this.familyInfo.imgUrl = "";
-      }
-      this.familyDialog = true;
-    },
-    beforeWriteOff() {
-      this.writeoffDialog = true;
-    },
-    handleDelete() {
-      this.$confirm("删掉档案后，\n" +
-          `<span class="username">${this.baseInfo.name}</span>` +
-          "        的历史相关信息可能无法追溯查看，是否确定删除该人员档案？", {
-        title: "档案删除"
-      }).then(() => {
-        this.instance.post(`/app/appresident/delete?ids=${this.baseInfo.id}`).then(res => {
-          if (res && res.code == 0) {
-            this.$message.success("删除成功");
-            this.$router.push({query: {}});
-          }
-        });
-      }).catch(() => 0)
-    },
-    idChange(val) {
-      if (val.length == 18) {
-        this.IdCard(val);
-      }
-    },
-    IdCard(UUserCard) {
-      if (UUserCard) {
-        let arr = [];
-        //获取出生日期
-        let birth =
-            UUserCard.substring(6, 10) +
-            "-" +
-            UUserCard.substring(10, 12) +
-            "-" +
-            UUserCard.substring(12, 14) +
-            " 00:00:00";
-        arr.push(birth);
-
-        if (parseInt(UUserCard.substr(16, 1)) % 2 == 1) {
-          //男
-          arr.push("1");
-        } else {
-          //女
-          arr.push("0");
-        }
-        //获取年龄
-        const myDate = new Date();
-        const month = myDate.getMonth() + 1;
-        const day = myDate.getDate();
-        let age = myDate.getFullYear() - UUserCard.substring(6, 10) - 1;
-        if (
-            UUserCard.substring(10, 12) < month ||
-            (UUserCard.substring(10, 12) == month &&
-                UUserCard.substring(12, 14) <= day)
-        ) {
-          age++;
-        }
-        arr.push(age);
-        this.baseInfo.sex = arr[1];
-        this.baseInfo.age = arr[2];
-        this.birthday = arr[0];
-      }
-    }
-  },
-  created() {
-    if (!this.showDetail) {
-      this.showEdit1 = true;
-      this.showEdit2 = true;
-      this.showEdit3 = true;
-      this.showEdit4 = true;
-      this.$nextTick(() => this.$refs.ruleForm?.resetFields())
-    } else {
-      this.searchDetail(this.$route.query.id);
-    }
-  }
-};
-</script>
-<style lang="scss" scoped>
-.addAborigines {
-  height: 100%;
-  font-size: 14px;
-
-  .el-form-item {
-    margin-bottom: 10px;
-
-    .el-form-item {
-      margin-top: 10px;
-    }
-
-    .el-cascader, .el-select, .el-date-editor {
-      width: 100%;
-    }
-  }
-
-  ::v-deep .el-form-item__error {
-    position: static;
-  }
-
-  ::v-deep .content-right {
-    box-sizing: border-box;
-    display: flex;
-    flex-direction: column;
-    gap: 10px;
-    padding-bottom: 80px;
-
-    .ailist-title {
-      padding: 0;
-    }
-
-    .above {
-      width: 100%;
-      overflow: hidden;
-
-      .left {
-        width: 380px;
-        float: left;
-      }
-
-      .right {
-        width: 380px;
-        float: left;
-
-        .pictrue {
-          display: flex;
-          height: 120px;
-
-          img {
-            width: 104px;
-            height: 120px;
-            border-radius: 2px;
-            border: solid 1px #d0d4dc;
-          }
-
-          .upload-demo {
-            padding: 0 15px;
-          }
-
-          .el-button {
-            width: 104px;
-            height: 32px;
-            background-color: #ffffff;
-            border-radius: 2px;
-            border: solid 1px #8899bb;
-          }
-        }
-      }
-    }
-  }
-
-  ul {
-    flex: 1;
-    min-width: 0;
-    display: flex;
-    flex-wrap: wrap;
-    padding: 0;
-    margin: 0;
-
-    li {
-      display: flex;
-      align-items: center;
-      min-height: 32px;
-      width: 50%;
-
-      span {
-        flex-shrink: 0;
-      }
-
-      p {
-        margin: 0
-      }
-    }
-  }
-
-  .img_block {
-    flex-shrink: 0;
-  }
-
-  .detail-info {
-    display: flex;
-    flex-wrap: wrap;
-
-    h3 {
-      width: 100%;
-      flex-shrink: 0
-    }
-
-  }
-
-  .info {
-    display: flex;
-    align-items: center;
-    line-height: 1.4;
-    margin-bottom: 16px;
-
-    .label {
-      flex-shrink: 0;
-      width: 100px;
-      margin-right: 40px;
-      text-align: right;
-      color: #888;
-      font-size: 14px;
-    }
-
-    .value {
-      color: #222;
-      font-size: 14px;
-      word-break: break-all;
-    }
-  }
-
-  .fill {
-    flex: 1;
-    min-width: 50%;
-  }
-
-  .el-checkbox-group {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 10px;
-
-    .el-checkbox {
-      margin: 0 !important;
-      display: flex;
-      align-items: center;
-
-      ::v-deep .el-checkbox__label {
-        font-size: 14px;
-      }
-    }
-  }
-
-  .tags {
-    gap: 10px;
-    flex-wrap: wrap;
-  }
-}
-</style>
diff --git a/project/sass/apps/AppResident/mobileResident.vue b/project/sass/apps/AppResident/mobileResident.vue
deleted file mode 100644
index f3c1b0bd..00000000
--- a/project/sass/apps/AppResident/mobileResident.vue
+++ /dev/null
@@ -1,1103 +0,0 @@
-<template>
-  <section class="mobileResident">
-    <ai-detail>
-      <ai-title slot="title" :title="showDetail?'流动人口信息':'添加流动人口'" isShowBack @onBackClick="$router.push({query:{}})"
-                isShowBottomBorder>
-        <template v-if="showDetail" #rightBtn>
-          <el-button @click="beforeWriteOff()" icon="el-icon-switch-button" v-if="baseInfo.fileStatus==0">注销档案
-          </el-button>
-          <el-button icon="iconfont iconDelete" @click="handleDelete()" v-if="$permissions('app_appresident_del')">
-            删除人员
-          </el-button>
-        </template>
-      </ai-title>
-      <template #content>
-        <el-form class="content-right" :model="baseInfo" ref="ruleForm" :rules="rules" label-width="130px"
-                 label-position="right" size="small">
-          <ai-card title="基本信息">
-            <template v-if="showDetail" #right>
-              <template v-if="$permissions('app_appresident_edit')">
-                <el-button
-                    type="text"
-                    class="iconfont iconEdit"
-                    @click="editInit(),showEdit1=true;"
-                    v-if="!showEdit1"
-                >&nbsp;修改
-                </el-button>
-              </template>
-              <el-button
-                  type="text"
-                  @click="showEdit1=false,searchDetail(baseInfo.id)"
-                  v-if="showEdit1"
-              >取消
-              </el-button>
-              <el-button type="text" v-if="showEdit1" @click="saveFrom('ruleForm')">保存</el-button>
-            </template>
-            <div slot="content" v-if="showEdit1">
-              <div class="above">
-                <div class="left">
-                  <el-form-item label="姓名：" prop="name">
-                    <el-input
-                        v-model="baseInfo.name"
-                        autocomplete="off"
-                        size="small"
-                        placeholder="请输入姓名"
-                        v-if="showEdit1"
-                        :disabled="!!showDetail"
-                    ></el-input>
-                    <!-- <p v-else>{{baseInfo.name||'-'}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="身份证号：" prop="idNumber">
-                    <el-input
-                        v-model="baseInfo.idNumber"
-                        autocomplete="off"
-                        size="small"
-                        placeholder="请输入身份证号"
-                        v-if="showEdit1"
-                        :maxlength="18"
-                        @input="idChange"
-                        :disabled="!!showDetail"
-                    />
-                    <!-- <p v-else>
-                        <ai-id mode="show" v-model="baseInfo.idNumber" right-btn></ai-id>
-                    </p>-->
-                  </el-form-item>
-                  <el-form-item label="性别：" prop="sex">
-                    <el-select v-model="baseInfo.sex"
-                               placeholder="请选择"
-                               disabled
-                               clearable>
-                      <el-option
-                          v-for="(item,i) in dict.getDict('sex')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>
-                        {{dict.getLabel('sex',baseInfo.sex)||'-'}}
-                    </p>-->
-                  </el-form-item>
-                </div>
-                <div class="right">
-                  <el-form-item label="个人照片：" prop="photo">
-                    <!-- <div class="pictrue">
-                        <img :src="imgUrl" alt="" title=""></img>
-                        <el-upload
-                            v-if="showEdit1"
-                            class="upload-demo"
-                            action
-                            multiple
-                            accept=".png,.jpg"
-                            :http-request="uploadFile"
-                            :show-file-list="false"
-                            :on-change="handleChange"
-                            :file-list="fileList"
-                            >
-                            <el-button >上传照片</el-button>
-                            <div slot="tip" class="el-upload__tip">
-                                    图片大小不能超过2M
-                    </div>
-                        </el-upload>
-                    </div>-->
-                    <ai-avatar :instance="instance" v-if="showEdit1" v-model="baseInfo.photo"/>
-                    <ai-avatar v-model="baseInfo.photo" v-else :editable="false"/>
-                    <!--<ai-avatar :instance="instance" v-model="baseInfo.photo"/>-->
-                  </el-form-item>
-                </div>
-              </div>
-              <div class="above">
-                <div class="left">
-                  <el-form-item label="出生日期：" prop="birthday">
-                    <el-date-picker
-                        v-if="showEdit1"
-                        disabled
-                        :editable="false"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        format="yyyy-MM-dd"
-                        v-model="birthday"
-                        type="date"
-
-                        placeholder="选择日期"
-                    ></el-date-picker>
-                    <!-- <p v-else>{{birthday?birthday.substring(0, 10):"-"}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="文化程度：" prop="education">
-                    <el-select
-                        v-model="baseInfo.education"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('education')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('education',baseInfo.education)||'-'}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="政治面貌：" prop="politicsStatus">
-                    <el-select
-                        v-model="baseInfo.politicsStatus"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('politicsStatus')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('politicsStatus',baseInfo.politicsStatus)||'-'}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="职业：" prop="job">
-                    <el-select
-                        v-model="baseInfo.job"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('job')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('job',baseInfo.job)||'-'}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="宗教信仰：" prop="faithType">
-                    <el-select
-                        v-model="baseInfo.faithType"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('faithType')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('faithType',baseInfo.faithType)||'-'}}</p> -->
-                  </el-form-item>
-                </div>
-                <div class="right">
-                  <el-form-item label="年龄：" prop="age">
-                    <el-input
-                        disabled
-                        v-model="baseInfo.age"
-                        autocomplete="off"
-                        size="small"
-                        placeholder="请输入年龄"
-                        v-if="showEdit1"
-                        type="number"
-                        @mousewheel.native.prevent
-                    ></el-input>
-                    <!-- <p v-else>{{baseInfo.age}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="民族：" prop="nation">
-                    <el-select
-                        v-model="baseInfo.nation"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('nation')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('nation',baseInfo.nation)||'-'}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="婚姻状况：" prop="maritalStatus">
-                    <el-select
-                        v-model="baseInfo.maritalStatus"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('maritalStatus')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('maritalStatus',baseInfo.maritalStatus)||'-'}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="兵役状况：" prop="militaryStatus">
-                    <el-select
-                        v-model="baseInfo.militaryStatus"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('militaryStatus')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('militaryStatus',baseInfo.militaryStatus)||'-'}}</p> -->
-                  </el-form-item>
-                </div>
-              </div>
-              <div class="areaList">
-                <el-form-item label="籍贯：" prop=" birthplaceAreaId">
-                  <ai-area-select
-                      clearable
-                      always-show
-                      :instance="instance"
-                      v-if="showEdit1"
-                      v-model="baseInfo.birthplaceAreaId"
-                      :areaLevel="3"
-                  ></ai-area-select>
-                  <!-- <p v-if="!showEdit1">{{baseInfo.birthplaceAreaName||'-'}}</p> -->
-                </el-form-item>
-              </div>
-            </div>
-            <div slot="content" v-else>
-              <el-row type="flex">
-                <div class="detail-info fill">
-                  <h3 class="name">{{ baseInfo.name || '-' }}</h3>
-                  <div class="detail-left fill">
-                    <div class="info">
-                      <span class="label">性别：</span>
-                      <span class="value">{{ dict.getLabel('sex', baseInfo.sex) || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">出生日期：</span>
-                      <span class="value">{{ birthday ? birthday.substring(0, 10) : '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">籍贯：</span>
-                      <span class="value">{{ baseInfo.birthplaceAreaName || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">文化程度：</span>
-                      <span class="value">{{ dict.getLabel('education', baseInfo.education) || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">政治面貌：</span>
-                      <span
-                          class="value"
-                      >{{ dict.getLabel('politicsStatus', baseInfo.politicsStatus) || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">宗教信仰：</span>
-                      <span class="value">{{ dict.getLabel('faithType', baseInfo.faithType) || '-' }}</span>
-                    </div>
-                  </div>
-                  <div class="detail-right fill">
-                    <div class="info">
-                      <span class="label">身份证号：</span>
-                      <span class="value">
-                        <ai-id mode="show" v-model="baseInfo.idNumber" right-btn class="line-center"></ai-id>
-                      </span>
-                    </div>
-                    <div class="info">
-                      <span class="label">年龄：</span>
-                      <span class="value">{{ baseInfo.age }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">民族：</span>
-                      <span class="value">{{ dict.getLabel('nation', baseInfo.nation) || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">婚姻状况：</span>
-                      <span
-                          class="value"
-                      >{{ dict.getLabel('maritalStatus', baseInfo.maritalStatus) || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">兵役状况：</span>
-                      <span
-                          class="value"
-                      >{{ dict.getLabel('militaryStatus', baseInfo.militaryStatus) || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">职业：</span>
-                      <span class="value">{{ dict.getLabel('job', baseInfo.job) || '-' }}</span>
-                    </div>
-                  </div>
-                </div>
-                <ai-avatar v-model="baseInfo.photo" :editable="false"/>
-              </el-row>
-            </div>
-          </ai-card>
-          <ai-card title="联络信息">
-            <template v-if="showDetail" #right>
-              <template v-if="$permissions('app_appresident_edit')">
-                <el-button
-                    type="text"
-                    class="iconfont iconEdit"
-                    @click="editInit(),showEdit2=true;"
-                    v-if="!showEdit2">
-                  修改
-                </el-button>
-              </template>
-              <el-button
-                  type="text"
-                  @click="showEdit2=false,searchDetail(baseInfo.id)"
-                  v-if="showEdit2">
-                取消
-              </el-button>
-              <el-button type="text" v-if="showEdit2" @click="saveFrom('ruleForm')">保存</el-button>
-            </template>
-            <div slot="content" v-if="showEdit2">
-              <div class="above">
-                <div class="left">
-                  <el-form-item label="联系方式：" prop="phone">
-                    <el-input v-model="baseInfo.phone" size="small" placeholder="请输入联系方式" v-if="showEdit2"
-                              :maxlength="11"/>
-                  </el-form-item>
-                </div>
-              </div>
-              <el-form-item label="现住址：" prop="currentAreaId">
-                <ai-area-select clearable always-show :instance="instance" v-model="baseInfo.currentAreaId"
-                                :valueLevel="4"/>
-                <el-form-item>
-                  <el-input v-model="baseInfo.currentAddress" placeholder="详细地址" clearable/>
-                </el-form-item>
-              </el-form-item>
-            </div>
-            <div slot="content" v-else style="margin-top: 16px;margin-bottom:24px">
-              <div class="info" style="margin-bottom:8px">
-                <span class="label">联系方式：</span>
-                <span class="value">{{ baseInfo.phone || '-' }}</span>
-              </div>
-              <div class="info">
-                <span class="label">现住址：</span>
-                <span class="value">{{ baseInfo.currentAreaName + baseInfo.currentAddress || "-" }}</span>
-              </div>
-            </div>
-          </ai-card>
-          <ai-card title="户籍信息">
-            <template v-if="showDetail" #right>
-              <template v-if="$permissions('app_appresident_edit')">
-                <el-button
-                    type="text"
-                    class="iconfont iconEdit"
-                    @click="editInit(),showEdit3=true;"
-                    v-if="!showEdit3"
-                >&nbsp;修改
-                </el-button>
-              </template>
-              <el-button
-                  type="text"
-                  @click="showEdit3=false,searchDetail(baseInfo.id)"
-                  v-if="showEdit3"
-              >取消
-              </el-button>
-              <el-button type="text" v-if="showEdit3" @click="saveFrom('ruleForm')">保存</el-button>
-            </template>
-            <div slot="content" v-if="showEdit3">
-              <div class="above">
-                <div class="left">
-                  <el-form-item label="是否户主：" prop="householdName">
-                    <el-select v-model="baseInfo.householdName" placeholder="请选择"
-                               @change="householdRelationChange" clearable>
-                      <el-option v-for="(item,i) in dict.getDict('householdName')"
-                                 :label="item.dictName" :key="i" :value="item.dictValue"/>
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item label="与户主关系：" prop="householdRelation" v-if="baseInfo.householdName==0">
-                    <el-select v-model="baseInfo.householdRelation" placeholder="请选择" v-if="showEdit3" clearable>
-                      <el-option v-for="(item,i) in dict.getDict('householdRelation')"
-                                 :label="item.dictName" :key="i" :value="item.dictValue"/>
-                    </el-select>
-                  </el-form-item>
-                </div>
-                <div class="right">
-                  <el-form-item label="户主身份证号：" prop="householdIdNumber" v-if="baseInfo.householdName==0">
-                    <el-input v-model="baseInfo.householdIdNumber" placeholder="请输入户主身份证号" :maxlength="18" clearable/>
-                  </el-form-item>
-                </div>
-              </div>
-              <el-form-item label="户籍地：" prop="householdAreaId">
-                <ai-area-select clearable always-show :instance="instance" v-if="showEdit3"
-                                v-model="baseInfo.householdAreaId" :valueLevel="4"/>
-                <el-form-item v-if="baseInfo.householdAreaId">
-                  <el-input v-model="baseInfo.householdAddress" placeholder="详细地址" clearable/>
-                </el-form-item>
-              </el-form-item>
-            </div>
-            <div slot="content" v-else style="margin-top: 16px;margin-bottom:24px">
-              <div class="detail-info">
-                <div class="detail-left fill">
-                  <div class="info">
-                    <span class="label">是否户主：</span>
-                    <span class="value">{{ dict.getLabel('householdName', baseInfo.householdName) || '-' }}</span>
-                  </div>
-                </div>
-                <div class="info fill" v-if="baseInfo.householdName==0">
-                  <span class="label">与户主关系：</span>
-                  <span class="value">{{ dict.getLabel('householdRelation', baseInfo.householdRelation) || '-' }}</span>
-                </div>
-                <div class="info fill" v-if="baseInfo.householdName==0">
-                  <span class="label">户主身份证号：</span>
-                  <span class="value">
-                        <ai-id mode="show" v-model="baseInfo.householdIdNumber" right-btn></ai-id>
-                      </span>
-                </div>
-              </div>
-              <div class="detail-info-p info">
-                <span class="label">户籍地：</span>
-                <span class="value">
-                  {{ baseInfo.householdAreaName + (baseInfo.householdAddress ? baseInfo.householdAddress : "") }}
-                </span>
-              </div>
-            </div>
-          </ai-card>
-          <ai-card title="家庭成员" v-if="showDetail">
-            <div slot="content" v-if="showDetail">
-              <el-table
-                  border
-                  ref="multipleTable"
-                  :data="family"
-                  style="margin-top:8px;"
-
-                  header-cell-class-name="table-header"
-                  tooltip-effect="light"
-                  row-class-name="table-row"
-                  cell-class-name="table-cell"
-              >
-                <el-table-column align="center" prop="name" label="与户主关系">
-                  <template slot-scope="scope">
-                      <span>{{
-                          scope.row.householdRelation ? dict.getLabel('householdRelation', scope.row.householdRelation) : "户主"
-                        }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="name" label="姓名" align="center" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="idNumber" label="性别" align="center" show-overflow-tooltip>
-                  <template slot-scope="scope">
-                    <span>{{ parseInt(scope.row.idNumber.substr(16, 1)) % 2 == 1 ? '男' : '女' }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="age" label="年龄" align="center" show-overflow-tooltip></el-table-column>
-                <el-table-column
-                    prop="idNumber"
-                    label="身份证号"
-                    align="center"
-                    width="200"
-                    show-overflow-tooltip>
-                  <template slot-scope="{row}">
-                    <ai-id mode="show" v-model="row.idNumber" :showEyes="false"/>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="address" label="操作" align="center" show-overflow-tooltip>
-                  <template slot-scope="scope">
-                    <el-button icon="iconfont iconShow" title="查看详情" class="dict-list-operation"
-                               @click="showFamily(scope.row)" type="text"/>
-                  </template>
-                </el-table-column>
-                <div slot="empty" class="no-data" style="height:160px;"/>
-              </el-table>
-            </div>
-          </ai-card>
-        </el-form>
-      </template>
-      <template v-if="!showDetail" #footer>
-        <el-button @click="cancelFn()">取消</el-button>
-        <el-button type="primary" @click="saveFrom('ruleForm','goBack')">保存</el-button>
-      </template>
-    </ai-detail>
-    <el-dialog class="deleteStyle" :visible.sync="familyDialog" width="720px" title="家庭成员信息" top="30vh">
-      <el-row type="flex" justify="space-between">
-        <ul>
-          <li>
-            <span>姓名：</span>
-            <p>{{ familyInfo.name }}</p>
-          </li>
-          <li>
-            <span>身份证号：</span>
-            <p>
-              <ai-id mode="show" v-model="familyInfo.idNumber" right-btn class="line-center"></ai-id>
-            </p>
-          </li>
-          <li>
-            <span>性别：</span>
-            <p>{{ dict.getLabel('sex', familyInfo.sex) }}</p>
-          </li>
-          <li>
-            <span>年龄：</span>
-            <p>{{ familyInfo.age }}</p>
-          </li>
-          <li>
-            <span>联系方式：</span>
-            <p>{{ familyInfo.phone }}</p>
-          </li>
-          <li>
-            <span>民族：</span>
-            <p>{{ dict.getLabel('nation', familyInfo.nation) }}</p>
-          </li>
-          <li>
-            <span>籍贯：</span>
-            <p>{{ familyInfo.birthplaceAreaName }}</p>
-          </li>
-          <li>
-            <span>文化程度：</span>
-            <p>{{ dict.getLabel('education', familyInfo.education) }}</p>
-          </li>
-          <li>
-            <span>婚姻状况：</span>
-            <p>{{ dict.getLabel('maritalStatus', familyInfo.maritalStatus) }}</p>
-          </li>
-          <li>
-            <span>政治面貌：</span>
-            <p>{{ dict.getLabel('politicsStatus', familyInfo.politicsStatus) }}</p>
-          </li>
-          <li>
-            <span>兵役状况：</span>
-            <p>{{ dict.getLabel('militaryStatus', familyInfo.militaryStatus) }}</p>
-          </li>
-          <li>
-            <span>宗教信仰：</span>
-            <p>{{ dict.getLabel('faithType', familyInfo.faithType) }}</p>
-          </li>
-          <li>
-            <span>职业：</span>
-            <p>{{ dict.getLabel('job', familyInfo.job) }}</p>
-          </li>
-          <li style="width:100%;">
-            <span>现住址：</span>
-            <p>{{ familyInfo.currentAreaName + familyInfo.currentAddress }}</p>
-          </li>
-        </ul>
-        <div class="img_block">
-          <ai-avatar v-model="familyInfo.imgUrl" :editable="false"/>
-        </div>
-      </el-row>
-      <div slot="footer" style="text-align: center;">
-        <el-button style="width:92px" size="small" @click="familyDialog = false">关闭</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog title="档案注销"
-               class="deleteStyle"
-               :visible.sync="writeoffDialog"
-               width="700px" top="25vh"
-               @close="familyInit()"
-               :close-on-click-modal="false">
-      <el-form :model="writeInfo" ref="writeInfo" label-width="100px" size="small">
-        <el-form-item label="姓名：">{{ baseInfo.name }}</el-form-item>
-        <el-form-item label="身份证号：">
-          <ai-id mode="show" v-model="baseInfo.idNumber" right-btn/>
-        </el-form-item>
-        <el-form-item label="注销原因：" prop="logoutReason" autocomplete="off"
-                      :rules="{required: true, message: '注销原因不能为空', trigger: 'change'}">
-          <el-select v-model="writeInfo.logoutReason" placeholder="请选择">
-            <el-option v-for="(item,i) in dict.getDict('logoutReason')"
-                       :label="item.dictName"
-                       :key="i" :value="item.dictValue"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="操作说明：" prop="logoutDescription" :rules="{ required: true, message: '操作说明不能为空'}">
-          <el-input type="textarea" v-model="writeInfo.logoutDescription" :rows="4"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" style="text-align: center;">
-        <el-button
-            style="width:92px"
-            size="small"
-            class="delete-btn"
-            @click="writeoffDialog=false,$refs.writeInfo.resetFields();"
-        >取消
-        </el-button>
-        <el-button
-            style="width:92px"
-            size="small"
-            type="primary"
-            @click="submitForm('writeInfo')"
-        >确认
-        </el-button>
-      </div>
-    </el-dialog>
-  </section>
-</template>
-<script>
-import {mapState} from "vuex";
-
-export default {
-  name: "mobileResident",
-  props: {
-    instance: Function,
-    dict: Object,
-    permissions: Function,
-    detail: Object,
-  },
-  data() {
-    let IdNumberPass = (rule, value, callback) => {
-      if (value) {
-        if (this.idCardNoUtil.checkIdCardNo(value)) {
-          callback();
-        } else {
-          callback(new Error("身份证号格式错误"));
-        }
-      } else {
-        callback(new Error("请输入身份证号"));
-      }
-    };
-    return {
-      buildingCascader: true,
-      houseCascader: true,
-      navId: 0,
-      baseInfo: {
-        registerStatus: "",
-        tips: [],
-        age: "",
-        birthplaceAreaId: "",
-        currentAddress: "",
-        currentAreaId: "",
-        education: "",
-        faithType: "",
-        fileStatus: "",
-        householdAddress: "",
-        householdAreaId: "",
-        householdIdNumber: "",
-        householdName: "",
-        householdRelation: "",
-        id: "",
-        idNumber: "",
-        job: "",
-        logoutDescription: "",
-        logoutReason: "",
-        logoutTime: "",
-        logoutUserId: "",
-        maritalStatus: "",
-        militaryStatus: "",
-        name: "",
-        nation: "",
-        phone: "",
-        photo: "",
-        politicsStatus: "",
-        sex: ""
-      },
-      family: [],
-      familyDialog: false,
-      familyInfo: {},
-      writeoffDialog: false,
-      writeInfo: {
-        id: "",
-        logoutReason: "",
-        logoutDescription: "",
-        fileStatus: "1"
-      },
-      disabledLevel: 0,
-      birthday: "",
-      rules: {
-        name: [{required: true, message: "请输入姓名", trigger: "blur"}],
-        idNumber: [
-          {required: true, validator: IdNumberPass, trigger: "blur"}
-        ],
-        sex: [{required: true, message: "请选择性别", trigger: "blur"}],
-        currentAreaId: [{message: "请选择现住址", required: true, trigger: "blur"},
-          {
-            validator: (r, v, cb) => {
-              if (/.+0{3}$/.test(v)) {
-                cb("现住址必须选到村级")
-              } else cb()
-            }, trigger: "blur"
-          }],
-        currentAddress: [{message: "请选择现住址详细地址", required: true}],
-        householdName: [
-          {required: true, message: "请选择是否户主", trigger: "change"}
-        ],
-        householdRelation: [
-          {required: true, message: "请选择与户主关系", trigger: "change"}
-        ],
-        householdIdNumber: [
-          {required: true, validator: IdNumberPass, trigger: "blur"}
-        ],
-        householdAddress: [
-          {required: true, message: "请选择户籍地详细地址", trigger: "blur"}
-        ]
-      },
-      imgUrl: "",
-      fileList: [],
-      showEdit1: false,
-      showEdit2: false,
-      showEdit3: false,
-      showEdit4: false,
-    };
-  },
-  computed: {
-    ...mapState(["user"]),
-    showDetail() {
-      return !!this.$route.query?.id
-    },
-    navList() {
-      return [
-        {name: "流动人口信息", id: "1"},
-        {name: "变更记录", id: "2"}
-      ]
-    },
-    tipOps() {
-      return this.dict.getDict("residentTipType") || []
-    }
-  },
-  methods: {
-    uploadFile(file) {
-      const isLt2M = file.file.size / 1024 / 1024 < 2;
-      if (!isLt2M) {
-        this.$message.warning("头像大小不能超过 2MB!");
-        return;
-      }
-      let formData = new FormData();
-      formData.append("file", file.file);
-      this.instance.post(`/admin/file/add`, formData, {withCredentials: false})
-      .then(res => {
-        if (res && res.code == 0) {
-          let imgInfo = res.data[0].split(";");
-          this.imgUrl = imgInfo[0];
-          this.baseInfo.photo = res.data[0];
-        }
-      });
-    },
-    handleChange(file, fileList) {
-      this.fileList = fileList;
-    },
-    householdRelationChange() {
-      this.baseInfo.householdIdNumber = "";
-      this.baseInfo.householdRelation = "";
-    },
-    saveFrom(formName, type) {
-      this.$refs[formName].validate(valid => {
-        if (valid) {
-          this.saveFromFn(type);
-        }
-      });
-    },
-    cancelFn() {
-      this.$refs.ruleForm?.resetFields()
-      this.$router.push({query: {}});
-    },
-    submitForm(formName) {
-      this.writeInfo.id = this.baseInfo.id;
-      this.$refs[formName].validate(valid => {
-        if (valid) {
-          this.instance.post(`/app/appresident/addOrUpdate`, {
-            ...this.writeInfo
-          }).then(res => {
-            if (res && res.code == 0) {
-              this.$message.success("注销成功");
-              this.writeoffDialog = false;
-              this.$router.push({query: {}});
-            }
-          });
-        } else {
-          return false;
-        }
-      });
-    },
-    familyInit() {
-      Object.keys(this.writeInfo).forEach(e => {
-        this.writeInfo[e] = "";
-      });
-      this.$refs.writeInfo.resetFields();
-    },
-    saveFromFn(type) {
-      let {currentHouseList, householdHouseList, tips} = this.baseInfo
-      this.instance.post(`/app/appresident/addOrUpdate`, {
-        residentType: this.$route.query.type,
-        ...this.baseInfo,
-        currentHouseList: currentHouseList?.join("|"),
-        householdHouseList: householdHouseList?.join("|"),
-        tips: tips?.join("|"),
-      }).then(res => {
-        if (res?.code == 0) {
-          this.$message.success("保存成功");
-          if (type) {
-            this.$router.push({query: {}})
-          } else {
-            this.editInit();
-          }
-        }
-      });
-    },
-    editInit() {
-      this.showEdit1 = false;
-      this.showEdit2 = false;
-      this.showEdit3 = false;
-      this.showEdit4 = false;
-      this.searchDetail(this.baseInfo.id);
-    },
-    searchDetail(id, type) {
-      this.instance.post(`/app/appresident/detail`, null, {
-        params: {id}
-      }).then(res => {
-        if (res?.data) {
-          let {currentHouseList, householdHouseList, tips} = res.data.resident
-          this.baseInfo = {
-            ...res.data.resident,
-            currentHouseList: currentHouseList?.split("|"),
-            householdHouseList: householdHouseList?.split("|"),
-            tips: tips ? tips.split("|") : [],
-          };
-          this.family = res.data.family;
-          this.IdCard(this.baseInfo.idNumber);
-          if (type == "family") {
-            this.familyDialog = false;
-          }
-        }
-      });
-    },
-    showFamily(row) {
-      this.familyInfo = row;
-      if (this.familyInfo.photo) {
-        this.familyInfo.imgUrl = this.familyInfo.photo.split(";")[0];
-      } else {
-        this.familyInfo.imgUrl = "";
-      }
-      this.familyDialog = true;
-    },
-    beforeWriteOff() {
-      this.writeoffDialog = true;
-    },
-    handleDelete() {
-      this.$confirm("删掉档案后，\n" +
-          `<span class="username">${this.baseInfo.name}</span>` +
-          "        的历史相关信息可能无法追溯查看，是否确定删除该人员档案？", {
-        title: "档案删除"
-      }).then(() => {
-        this.instance.post(`/app/appresident/delete?ids=${this.baseInfo.id}`).then(res => {
-          if (res && res.code == 0) {
-            this.$message.success("删除成功");
-            this.$router.push({query: {}});
-          }
-        });
-      }).catch(() => 0)
-    },
-    idChange(val) {
-      if (val.length == 18) {
-        this.IdCard(val);
-      }
-    },
-    IdCard(UUserCard) {
-      if (UUserCard) {
-        let arr = [];
-        //获取出生日期
-        let birth =
-            UUserCard.substring(6, 10) +
-            "-" +
-            UUserCard.substring(10, 12) +
-            "-" +
-            UUserCard.substring(12, 14) +
-            " 00:00:00";
-        arr.push(birth);
-
-        if (parseInt(UUserCard.substr(16, 1)) % 2 == 1) {
-          //男
-          arr.push("1");
-        } else {
-          //女
-          arr.push("0");
-        }
-        //获取年龄
-        const myDate = new Date();
-        const month = myDate.getMonth() + 1;
-        const day = myDate.getDate();
-        let age = myDate.getFullYear() - UUserCard.substring(6, 10) - 1;
-        if (
-            UUserCard.substring(10, 12) < month ||
-            (UUserCard.substring(10, 12) == month &&
-                UUserCard.substring(12, 14) <= day)
-        ) {
-          age++;
-        }
-        arr.push(age);
-        this.baseInfo.sex = arr[1];
-        this.baseInfo.age = arr[2];
-        this.birthday = arr[0];
-      }
-    }
-  },
-  created() {
-    if (!this.showDetail) {
-      this.showEdit1 = true;
-      this.showEdit2 = true;
-      this.showEdit3 = true;
-      this.showEdit4 = true;
-      this.$nextTick(() => this.$refs.ruleForm?.resetFields())
-    } else {
-      this.searchDetail(this.$route.query.id);
-    }
-  }
-};
-</script>
-<style lang="scss" scoped>
-.mobileResident {
-  height: 100%;
-  font-size: 14px;
-
-  .el-form-item {
-    margin-bottom: 10px;
-
-    .el-form-item {
-      margin-top: 10px;
-    }
-
-    .el-cascader, .el-select, .el-date-editor {
-      width: 100%;
-    }
-  }
-
-  ::v-deep .el-form-item__error {
-    position: static;
-  }
-
-  ::v-deep .content-right {
-    box-sizing: border-box;
-    display: flex;
-    flex-direction: column;
-    gap: 10px;
-    padding-bottom: 80px;
-
-    .ailist-title {
-      padding: 0;
-    }
-
-    .above {
-      width: 100%;
-      overflow: hidden;
-
-      .left {
-        width: 380px;
-        float: left;
-      }
-
-      .right {
-        width: 380px;
-        float: left;
-
-        .pictrue {
-          display: flex;
-          height: 120px;
-
-          img {
-            width: 104px;
-            height: 120px;
-            border-radius: 2px;
-            border: solid 1px #d0d4dc;
-          }
-
-          .upload-demo {
-            padding: 0 15px;
-          }
-
-          .el-button {
-            width: 104px;
-            height: 32px;
-            background-color: #ffffff;
-            border-radius: 2px;
-            border: solid 1px #8899bb;
-          }
-        }
-      }
-    }
-  }
-
-  ul {
-    flex: 1;
-    min-width: 0;
-    display: flex;
-    flex-wrap: wrap;
-    padding: 0;
-    margin: 0;
-
-    li {
-      display: flex;
-      align-items: center;
-      min-height: 32px;
-      width: 50%;
-
-      span {
-        flex-shrink: 0;
-      }
-
-      p {
-        margin: 0
-      }
-    }
-  }
-
-  .img_block {
-    flex-shrink: 0;
-  }
-
-  .detail-info {
-    display: flex;
-    flex-wrap: wrap;
-
-    h3 {
-      width: 100%;
-      flex-shrink: 0
-    }
-
-  }
-
-  .info {
-    display: flex;
-    align-items: center;
-    line-height: 1.4;
-    margin-bottom: 16px;
-
-    .label {
-      flex-shrink: 0;
-      width: 100px;
-      margin-right: 40px;
-      text-align: right;
-      color: #888;
-      font-size: 14px;
-    }
-
-    .value {
-      color: #222;
-      font-size: 14px;
-      word-break: break-all;
-    }
-  }
-
-  .fill {
-    flex: 1;
-    min-width: 50%;
-  }
-
-  .el-checkbox-group {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 10px;
-
-    .el-checkbox {
-      margin: 0 !important;
-      display: flex;
-      align-items: center;
-
-      ::v-deep .el-checkbox__label {
-        font-size: 14px;
-      }
-    }
-  }
-
-  .tags {
-    gap: 10px;
-    flex-wrap: wrap;
-  }
-}
-</style>
diff --git a/project/sass/apps/AppResident/residentSta.vue b/project/sass/apps/AppResident/residentSta.vue
deleted file mode 100644
index 3de0971a..00000000
--- a/project/sass/apps/AppResident/residentSta.vue
+++ /dev/null
@@ -1,445 +0,0 @@
-<template>
-  <section class="residentSta">
-    <div class="dataStatistic">
-      <div class="above">
-        <div class="data-item">
-          <div id="LocalResident" v-if="showStatis"/>
-          <ai-empty v-else/>
-          <h5 v-if="LocalResidentData">
-            更新时间:{{ statisticData.更新时间 }}
-          </h5>
-        </div>
-        <div class="data-item" style="width:66%;">
-          <div id="ResidentDistribution" v-if="showStatis"/>
-          <ai-empty v-else/>
-        </div>
-      </div>
-      <div class="above" style="margin-top:24px;">
-        <div class="data-item">
-          <div id="SexRatio" v-if="showStatis"/>
-          <ai-empty v-else/>
-          <div rightTop><i v-html="'有效数据:'"/> {{ LocalResidentData }}</div>
-        </div>
-        <div class="data-item">
-          <div id="MaritalSta" v-if="showStatis"/>
-          <ai-empty v-else/>
-          <div rightTop><i v-html="'有效数据:'"/>{{ LocalResidentData }}</div>
-        </div>
-        <div class="data-item">
-          <div id="AgeDistribution" v-if="showStatis"/>
-          <ai-empty v-else/>
-          <div rightTop><i v-html="'有效数据:'"/>{{ LocalResidentData }}</div>
-        </div>
-      </div>
-    </div>
-  </section>
-</template>
-
-<script>
-import * as echarts from 'echarts'
-
-export default {
-  name: "residentSta",
-  inject: ['resident'],
-  props: {
-    areaId: String
-  },
-  computed: {
-    LocalResidentData() {
-      return this.statisticData?.总人数 || 0
-    },
-    AgeDistributionData() {
-      return this.statisticData?.年龄层次 || []
-    },
-    MaritalStaData() {
-      return this.statisticData?.婚姻状况 || []
-    },
-    SexRatioData() {
-      return this.statisticData?.男女比例 || []
-    },
-    ResidentDistributionData() {
-      return this.statisticData?.人口分布 || []
-    }
-  },
-  data() {
-    return {
-      statisticData: {},
-      showStatis: true,
-    }
-  },
-  watch: {
-    areaId(v) {
-      v && this.getStaData()
-    }
-  },
-  methods: {
-    getStaData() {
-      this.resident.instance.post(`/app/appresident/queryCustInfoByAreaId`, null, {
-        params: {
-          areaId: this.areaId
-        }
-      }).then(res => {
-        if (res?.data) {
-          this.statisticData = res.data;
-          this.showStatis = this.LocalResidentData > 0;
-          this.showLocalResident();
-          this.showSexRatio();
-          this.showAgeDistribution();
-          this.showResidentDistribution();
-          this.showMaritalSta();
-        }
-      })
-    },
-    showAgeDistribution() {
-      //年龄分布
-      let myChart = echarts.init(document.getElementById("AgeDistribution"));
-      if (!this.showStatis) {
-        return myChart.dispose();
-      }
-      myChart.setOption({
-        title: {
-          text: "年龄层次统计",
-          subtext: "",
-          x: "left"
-        },
-        tooltip: {
-          trigger: "item",
-          formatter: "{a} <br/>{b} : {c} ({d}%)"
-        },
-        legend: {
-          orient: "vertical",
-          bottom: "bottom",
-          data: this.AgeDistributionData.map(e => e.v1)
-        },
-        series: [
-          {
-            name: "年龄层次统计",
-            type: "pie",
-            radius: ["40%", "55%"],
-            center: ["50%", "50%"],
-            data: this.AgeDistributionData.map(e => ({value: e.v2 * 1, name: e.v1})),
-            itemStyle: {
-              emphasis: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: "rgba(0, 0, 0, 0.5)"
-              },
-              normal: {
-                color: function (params) {
-                  //自定义颜色
-                  var colorList = [
-                    "#FB3C3C",
-                    "#fc5947",
-                    "#81E84F",
-                    "#3C76FF",
-                    "#6995FF",
-                    "#FFD500",
-                    "#FEF517",
-                    "#B1E598",
-                    "#81E84F",
-                    "#B1E598",
-                    "#FEBB8E"
-                  ];
-                  return colorList[params.dataIndex];
-                }
-              }
-            }
-          }
-        ]
-      });
-    },
-    showLocalResident() {
-      //本地居民
-      let myChart = echarts.init(document.getElementById("LocalResident"));
-      if (!this.showStatis) {
-        return myChart.dispose();
-      }
-      let option = {
-        title: {
-          text: "本地居民",
-          subtext: "",
-          x: "left"
-        },
-        tooltip: {
-          trigger: "item",
-          formatter: "{a} <br/>{b}: {c} ({d}%)"
-        },
-        series: [
-          {
-            name: "本地居民",
-            type: "pie",
-            radius: ["50%", "65%"],
-            avoidLabelOverlap: false,
-            label: {
-              normal: {
-                show: true,
-                position: "center",
-                textStyle: {
-                  fontSize: "40",
-                  fontWeight: "normal",
-                  color: "#333333"
-                }
-              },
-              emphasis: {
-                show: true,
-                textStyle: {
-                  fontSize: "40",
-                  fontWeight: "normal",
-                  color: "#333333"
-                }
-              }
-            },
-            labelLine: {
-              normal: {
-                show: false
-              }
-            },
-            data: [{value: this.LocalResidentData, name: this.LocalResidentData}],
-            itemStyle: {
-              emphasis: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: "rgba(0, 0, 0, 0.5)"
-              },
-              normal: {
-                color: function (params) {
-                  //自定义颜色
-                  var colorList = ["#5088FF"];
-                  return colorList[params.dataIndex];
-                }
-              }
-            }
-          }
-        ]
-      };
-      myChart.setOption(option);
-    },
-    showMaritalSta() {
-      //婚姻状况
-      let myChart = echarts.init(document.getElementById("MaritalSta"));
-      if (!this.showStatis) {
-        return myChart.dispose();
-      }
-      let option = {
-        color: [
-          "#FB3C3C",
-          "#FC5947",
-          "#FE8B3F",
-          "#3C76FF",
-          "#6995FF",
-          "#FFD500",
-          "#FEF517",
-          "#B1E598",
-          "#81E84F",
-          "#B1E598",
-          "#FEBB8E"
-        ],
-        backgroundColor: "#FFFFFF",
-        title: {
-          text: "婚姻状况统计",
-          x: "left"
-        },
-        tooltip: {
-          trigger: "item",
-          formatter: "{a} <br/>{b} : {c} ({d}%)"
-        },
-        legend: {
-          orient: "vertical",
-          bottom: "bottom",
-          width: "auto",
-          height: 50,
-          data: this.MaritalStaData.map(e => e.v1)
-        },
-        series: [
-          {
-            name: "婚姻状况",
-            type: "pie",
-            radius: ["40%", "55%"],
-            center: ["50%", "50%"],
-            data: this.MaritalStaData.map(e => ({value: e.v2 * 1, name: e.v1})),
-          }
-        ]
-      };
-      myChart.setOption(option);
-    },
-    showResidentDistribution() {
-      //人口分布/居民分布
-      let myChart = echarts.init(document.getElementById("ResidentDistribution"));
-      if (!this.showStatis) {
-        return myChart.dispose();
-      }
-      let option = {
-        title: {
-          text: "人口分布统计",
-          subtext: "",
-          x: "left"
-        },
-        color: ["#5088FF"],
-        tooltip: {
-          trigger: "axis",
-          axisPointer: {
-            // 坐标轴指示器，坐标轴触发有效
-            type: "shadow" // 默认为直线，可选为：'line' | 'shadow'
-          },
-          formatter: "{a} <br/>{b} : {c} "
-        },
-        grid: {
-          left: "3%",
-          right: "4%",
-          bottom: "3%",
-          containLabel: true
-        },
-        xAxis: [
-          {
-            type: "category",
-            data: this.ResidentDistributionData.map(e => e.name),
-            axisTick: {
-              alignWithLabel: true
-            }
-          }
-        ],
-        yAxis: [
-          {
-            type: "value"
-          }
-        ],
-        dataZoom: [
-          {
-            id: "dataZoomX",
-            type: "slider",
-            xAxisIndex: [0],
-            filterMode: "filter"
-          }
-        ],
-        series: [
-          {
-            name: "人口数量",
-            type: "bar",
-            barWidth: "16",
-            data: this.ResidentDistributionData.map(e => e.v1)
-          }
-        ]
-      };
-      myChart.setOption(option);
-    },
-    showSexRatio() {
-      //男女比例
-      let myChart = echarts.init(document.getElementById("SexRatio"));
-      if (!this.showStatis) {
-        return myChart.dispose();
-      }
-      myChart.setOption({
-        title: {
-          text: "男女比例统计",
-          subtext: "",
-          x: "left"
-        },
-        tooltip: {
-          trigger: "item",
-          formatter: "{a} <br/>{b} : {c} ({d}%)"
-        },
-        legend: {
-          orient: "vertical",
-          bottom: "bottom",
-          data: this.SexRatioData.map(e => e.v1)
-        },
-        series: [
-          {
-            name: "男女比例",
-            type: "pie",
-            radius: ["40%", "55%"],
-            center: ["50%", "50%"],
-            data: this.SexRatioData.map(e => ({value: e.v2 * 1, name: e.v1})),
-            itemStyle: {
-              emphasis: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: "rgba(0, 0, 0, 0.5)"
-              },
-              normal: {
-                color: function (params) {
-                  //自定义颜色
-                  let colorList = [
-                    "#FB3C3C",
-                    "#3C76FF",
-                    "#3C76FF",
-                    "#FC5947",
-                    "#6995FF",
-                    "#FB3C3C",
-                    "#FE8B3F",
-                    "#B1E598",
-                    "#81E84F",
-                    "#FEBB8E"
-                  ];
-                  return colorList[params.dataIndex];
-                }
-              }
-            }
-          }
-        ]
-      });
-    },
-  },
-  created() {
-    this.getStaData()
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.residentSta {
-  height: 100%;
-
-  .dataStatistic {
-    width: 100%;
-    height: 100%;
-    overflow-y: auto;
-    padding: 16px 0;
-    box-sizing: border-box;
-
-    .above {
-      width: 100%;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-
-      .data-item {
-        width: 32%;
-        height: 380px;
-        background: rgba(255, 255, 255, 1);
-        border-radius: 4px;
-        padding: 16px;
-        box-sizing: border-box;
-        position: relative;
-
-        div[rightTop] {
-          position: absolute;
-          right: 16px;
-          top: 16px;
-          font-size: 14px;
-          font-weight: bold;
-          color: #333;
-
-          & > i {
-            font-style: normal;
-            color: #999;
-          }
-        }
-
-        & > h5 {
-          width: 100%;
-          color: #999;
-          text-align: center;
-          position: absolute;
-          bottom: 0;
-        }
-      }
-    }
-  }
-
-  #LocalResident, #MaritalSta, #ResidentDistribution, #SexRatio, #AgeDistribution {
-    width: 100%;
-    height: 95%
-  }
-}
-</style>

From 509379e704e8ef5f6e1521502a299c47a6647f40 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 11 Aug 2022 11:14:27 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E7=A0=81=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/meta/AppResident/AppResident.vue    | 4 ++--
 packages/meta/AppResident/residentDetail.vue | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/meta/AppResident/AppResident.vue b/packages/meta/AppResident/AppResident.vue
index fb9af02e..da748af3 100644
--- a/packages/meta/AppResident/AppResident.vue
+++ b/packages/meta/AppResident/AppResident.vue
@@ -68,8 +68,8 @@ export default {
           detail: ResidentDetail
         })),
         {label: "居民统计", value: "3", comp: ResidentSta},
-        {label: "居民档案审核", value: "4", comp: auditList, detail: auditDetail}
-      ]
+        {label: "居民档案审核", value: "4", comp: auditList, detail: auditDetail, permit: "app_appresident_examine"}
+      ].filter(e => !e.permit || this.permissions(e.permit))
     }
   },
   created() {
diff --git a/packages/meta/AppResident/residentDetail.vue b/packages/meta/AppResident/residentDetail.vue
index 43c8eabb..7da7c0d4 100644
--- a/packages/meta/AppResident/residentDetail.vue
+++ b/packages/meta/AppResident/residentDetail.vue
@@ -202,7 +202,8 @@
               </ai-card>
               <tags-manage v-if="currentTab=='0'&&baseInfo.id&&permissions('app_appresidentlabelinfo_detail')" v-bind="$props" :resident-id="baseInfo.id"/>
             </el-tab-pane>
-            <el-tab-pane label="资产信息" lazy>
+            <!--暂时用审核的权限码控制,后端没时间加-->
+            <el-tab-pane label="资产信息" lazy v-if="permissions('app_appresident_examine')">
               <personal-assets v-if="currentTab==1&&baseInfo.id" :resident-id="baseInfo.id" v-bind="$props"/>
             </el-tab-pane>
             <el-tab-pane label="特殊人群" lazy v-if="hasSpecial">

From c4bee85e6fd9c098364effd073f0c30972761edb Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 11 Aug 2022 11:41:58 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/gridScoreManage.vue            |  1 -
 .../components/gridScoreStatistics.vue        | 58 +++++++++++++------
 2 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
index ec6acafb..ec126b84 100644
--- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
+++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
@@ -155,7 +155,6 @@ export default {
         }
       }).then(res => {
         if(res?.data) {
-          console.log(res.data.records);
           this.tableData = res.data.records
           this.page.total = res.data.total
         }
diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue
index f0d4c67d..235294ef 100644
--- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue
+++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue
@@ -14,7 +14,14 @@
       </div>
       <div class="card_list">
         <div class="card">
-          <h2>剩余积分汇总<i class="el-icon-warning-outline"></i></h2>
+          <h2>剩余积分汇总
+            <el-tooltip
+              placement="right"
+              style="width: 240px;"
+              content="截止目前所有网格员剩余可用积分余额的总和">
+              <i class="iconfont iconModal_Warning"></i>
+            </el-tooltip>
+          </h2>
           <p class="color1">{{ data.nowIntegral || 0 }}</p>
         </div>
         <div class="card">
@@ -43,8 +50,8 @@
       <template #content>
         <ai-search-bar>
           <template #left>
-            <el-cascader ref="cascader1" v-model="girdId" :options="girdOptions" placeholder="所属网格" size="small" 
-              :props="defaultProps" :show-all-levels="false" @change="gridChange"></el-cascader>
+            <el-cascader ref="cascader2" v-model="search.girdId" :options="girdOptions" placeholder="所属网格" size="small" 
+              :props="defaultProps" :show-all-levels="false" @change="gridChangeOpt"></el-cascader>
             <!-- <el-date-picker v-model="time" size="small" type="daterange" value-format="yyyy-MM-dd" 
               range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
             </el-date-picker> -->
@@ -75,13 +82,15 @@
       <ai-detail>
         <template #content>
           <ai-wrapper>
-            <ai-info-item label="户主"/>
-            <ai-info-item label="对象"/>
-            <ai-info-item label="事件" isLine/>
-            <ai-info-item label="时间" isLine/>
-            <ai-info-item label="积分"/>
-            <ai-info-item label="积分余额"/>
-            <ai-info-item label="凭证" isLine></ai-info-item>
+            <ai-info-item label="姓名" :value="details.integralUserName" />
+            <ai-info-item label="所属网格" :value="details.girdName"/>
+            <ai-info-item label="事件" isLine :value="details.eventDesc"/>
+            <ai-info-item label="时间" isLine :value="details.createTime"/>
+            <ai-info-item label="积分">{{ details.integralCalcType==0? '-' : '+' }}{{ details.changeIntegral }}</ai-info-item>
+            <ai-info-item label="积分余额" :value="details.nowIntegral"/>
+            <ai-info-item label="凭证" isLine v-if="fileDownLoad.length">
+              <ai-file-list :fileList="fileDownLoad" style="width: 200px;"></ai-file-list>
+            </ai-info-item>
           </ai-wrapper>
         </template>
       </ai-detail>
@@ -119,9 +128,9 @@ export default {
       search: {
         current: 1,
         name: '',
-        girdId: '',
+        girdId: ''
       },
-      page: {current: 1, size: 10, total: 0},
+      page: {current: 1, size: 10,total: 0,},
       girdList: [],
       time: '',
       timeCheck: ['昨日','近7天','近30天','自定义'],
@@ -139,7 +148,12 @@ export default {
         value: 'id',
         checkStrictly: true,
         expandTrigger: 'hover',
-      }
+      },
+      details: {},
+      fileDownLoad: [],
+      girdSortList: [],
+      userSortList: [],
+      
     }
   },
   computed: {
@@ -198,7 +212,9 @@ export default {
           endTime: this.endTime
         }
       }).then((res) => {
-        console.log(res);
+        console.log(res, '积分排行');
+        this.userSortList = res.data.userSortList
+        this.girdSortList = res.data.girdSortList
       })
     },
     // 积分明细
@@ -206,11 +222,10 @@ export default {
       this.instance.post('/app/appintegraluser/girdIntegralDetail',null,{
         params: {
           ...this.page,
-          girdId: this.girdIdUser,
+          ...this.search,
           integralType: this.integralType,
           startTime: this.startTime,
           endTime: this.endTime,
-          name: this.search.name,
         }
       }).then(res => {
         if(res?.data) {
@@ -220,6 +235,12 @@ export default {
       })
     },
 
+    gridChangeOpt() {
+      this.search.girdId = val?.[val.length - 1]
+      this.$refs.cascader2.dropDownVisible = false;
+      this.getTableData()
+    },
+
     getColEcherts1() {
       let chartDom1 = document.getElementById('chart1');
       chartDom1.style.width = (window.innerWidth - 435) / 2 + "px";
@@ -399,7 +420,10 @@ export default {
     getDetail(id) {
       this.instance.post(`/app/appintegraldetail/queryDetailById?id=${id}`).then(res=> {
         if(res?.data) {
-          console.log(res.data);
+          this.details = res.data
+          if(res.data.enclosure) {
+            this.fileDownLoad = [{ url:res.data.enclosure }]
+          }
         }
       })
     },

From d5c1bfe913f81713f6ea2e42d5ce210d12c68b88 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 11 Aug 2022 14:24:49 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=8F=B0?=
 =?UTF-8?q?=E8=B4=A6=E5=AF=B9=E6=8E=A5=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/extra/AppWorkflowManage/workflowLogs.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/extra/AppWorkflowManage/workflowLogs.vue b/packages/extra/AppWorkflowManage/workflowLogs.vue
index 787290e7..fade37d7 100644
--- a/packages/extra/AppWorkflowManage/workflowLogs.vue
+++ b/packages/extra/AppWorkflowManage/workflowLogs.vue
@@ -9,12 +9,11 @@
                       @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">
           <el-table-column slot="options" label="操作" fixed="right" align="center" width="300">
             <template slot-scope="{row}">
-              <el-button type="text" @click="showProcess(row.config)">查看进度</el-button>
+              <el-button type="text" @click="showProcess(row.workflowConfig)">查看进度</el-button>
             </template>
           </el-table-column>
         </ai-table>
@@ -46,8 +45,9 @@ export default {
       page: {current: 1, size: 10, total: 0},
       tableData: [],
       colConfigs: [
-        {prop: "name", label: "流程名称"},
-        {prop: "app", label: "对应应用"}
+        {prop: "pid", label: "流程ID"},
+        {prop: "bid", label: "业务ID"},
+        {prop: "createUserName", label: "创建者"},
       ],
       dialog: false,
       process: null
@@ -55,7 +55,7 @@ export default {
   },
   methods: {
     getTableData() {
-      this.instance.post("/app/appworkflowmanage/list", null, {
+      this.instance.post("/app/appworkflowlog/list", null, {
         params: {...this.page, ...this.search}
       }).then(res => {
         if (res?.data) {
@@ -80,5 +80,6 @@ export default {
 
 <style lang="scss" scoped>
 .workflowLogs {
+  height: 100%;
 }
 </style>

From c08514c60f6205778fa71db9fa28ab4c3ed22947 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 11 Aug 2022 15:01:52 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E5=85=A8=E5=B1=80=E5=9F=8B=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/extra/AppWorkflowManage/add.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/extra/AppWorkflowManage/add.vue b/packages/extra/AppWorkflowManage/add.vue
index 63fda74f..92036097 100644
--- a/packages/extra/AppWorkflowManage/add.vue
+++ b/packages/extra/AppWorkflowManage/add.vue
@@ -33,6 +33,7 @@
 
 <script>
 import AiWorkflow from "./AiWorkflow";
+import {mapActions} from "vuex"
 
 export default {
   name: "add",
@@ -55,6 +56,7 @@ export default {
     }
   },
   methods: {
+    ...mapActions(['getWorkflowConfigs']),
     getDetail() {
       let {id} = this.$route.query
       id && this.instance.post("/app/appworkflowmanage/queryDetailById", null, {
@@ -78,6 +80,7 @@ export default {
           this.instance.post("/app/appworkflowmanage/addOrUpdate", {...this.form, config}).then(res => {
             if (res?.code == 0) {
               this.$message.success("提交成功!")
+              this.getWorkflowConfigs()
               this.back()
             }
           })

From 15eb67168f593cf8a6c46f0ce96dc83acd63b8af Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 11 Aug 2022 15:11:05 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/gridScoreManage.vue            |   1 -
 .../components/gridScoreStatistics.vue        | 114 ++++++++++--------
 2 files changed, 66 insertions(+), 49 deletions(-)

diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
index ec126b84..0659fc9d 100644
--- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
+++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
@@ -116,7 +116,6 @@ export default {
         label: 'girdName',
         value: 'id',
         checkStrictly: true,
-        expandTrigger: 'hover',
       },
     }
   },
diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue
index 235294ef..f6758d24 100644
--- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue
+++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue
@@ -35,12 +35,18 @@
       </div>
       <div class="echertsBox">
         <div class="left_Box">
-          <div id="chart1" style="height: 300px; width: 100%;"></div>
-          <ai-empty v-if="false" style="height: 300px;"></ai-empty>
+          <p>个人积分排行</p>
+          <div>
+            <div id="chart1" style="height: 300px; width: 100%;" v-show="userSortListX.length && userSortListY.length"></div>
+            <ai-empty v-show="!userSortListX.length && !userSortListY.length" style="height: 200px; width: 100%;" id="empty"></ai-empty>
+          </div>
         </div>
         <div class="right_Box">
-          <div id="chart2" style="height: 300px; width: 100%;"></div>
-          <ai-empty v-if="false" style="height: 300px;"></ai-empty>
+          <p>网格积分排行</p>
+          <div>
+            <div id="chart2" style="height: 300px; width: 100%;" v-show="girdSortListX.length && girdSortListY.length"></div>
+            <ai-empty v-show="!girdSortListX.length && !girdSortListY.length" style="height: 200px; width: 100%;" id="empty"></ai-empty>
+          </div>
         </div>
       </div>
     </el-row>
@@ -51,14 +57,16 @@
         <ai-search-bar>
           <template #left>
             <el-cascader ref="cascader2" v-model="search.girdId" :options="girdOptions" placeholder="所属网格" size="small" 
-              :props="defaultProps" :show-all-levels="false" @change="gridChangeOpt"></el-cascader>
-            <!-- <el-date-picker v-model="time" size="small" type="daterange" value-format="yyyy-MM-dd" 
-              range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
-            </el-date-picker> -->
+              :props="defaultProps" :show-all-levels="false" clearable @change="gridChangeOpt"></el-cascader>
+            <ai-select v-model="search.integralType" placeholder="请选择类型" @change="page.current=1, getTableData()" 
+            :selectList="dict.getDict('integralDetailType')"/>
+            <el-date-picker v-model="time" size="small" type="daterange" value-format="yyyy-MM-dd" 
+              range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="onChange">
+            </el-date-picker>
           </template>
           <template #right>
-            <el-input size="small" placeholder="请输入居民名称或真实姓名" v-model="search.name" clearable
-              @clear="page.current = 1, search.name = '', getTableData()" suffix-icon="iconfont iconSearch"
+            <el-input size="small" placeholder="请输入居民名称或真实姓名" v-model="search.userName" clearable
+              @clear="page.current = 1, search.userName = '', getTableData()" suffix-icon="iconfont iconSearch"
               v-throttle="() => {(page.current = 1), getTableData();}" />
           </template>
         </ai-search-bar>
@@ -121,23 +129,25 @@ export default {
   },
   data() {
     return {
-      name: "积分统计", 
       myChart1: null,
       myChart2: null,
       tableData: [],
       search: {
         current: 1,
-        name: '',
-        girdId: ''
+        userName: '',
+        girdId: '',
+        integralType: '',
+        startTime: '',
+        endTime: '',
       },
       page: {current: 1, size: 10,total: 0,},
       girdList: [],
-      time: '',
+      time: [],
       timeCheck: ['昨日','近7天','近30天','自定义'],
       dialog: false,
       dialogDate: false,
-      timeList: '',
-      type: '0',
+      timeList: [],
+      type: '1',
       startTime: '',
       endTime: '',
       data: {},
@@ -147,13 +157,13 @@ export default {
         label: 'girdName',
         value: 'id',
         checkStrictly: true,
-        expandTrigger: 'hover',
       },
       details: {},
       fileDownLoad: [],
-      girdSortList: [],
-      userSortList: [],
-      
+      userSortListX: [],
+      userSortListY: [],
+      girdSortListX: [],
+      girdSortListY: [],
     }
   },
   computed: {
@@ -179,11 +189,12 @@ export default {
     }
   },
   created() {
-    this.$dict.load('epidemicDangerousAreaLevel')
-    this.getStatistics()
-    this.getGridList()
-    this.getRanking()
-    this.getTableData()
+    this.$dict.load('epidemicDangerousAreaLevel').then(() => {
+      this.getStatistics()
+      this.getGridList()
+      this.getRanking()
+      this.getTableData()
+    })
   },
   methods: {
     // 统计接口
@@ -212,9 +223,14 @@ export default {
           endTime: this.endTime
         }
       }).then((res) => {
-        console.log(res, '积分排行');
-        this.userSortList = res.data.userSortList
-        this.girdSortList = res.data.girdSortList
+        if(res?.data) {
+          this.userSortListX = res.data.userSortList.map(e=> e.userName).reverse();
+          this.userSortListY = res.data.userSortList.map(e=> e.changeIntegral).reverse()
+          this.girdSortListX = res.data.girdSortList.map(e=> e.girdName).reverse();
+          this.girdSortListY = res.data.girdSortList.map(e=> e.changeIntegral).reverse()
+          this.getColEcherts1(this.userSortListX,this.userSortListY)
+          this.getColEcherts2(this.girdSortListX,this.girdSortListY)
+        }
       })
     },
     // 积分明细
@@ -223,9 +239,6 @@ export default {
         params: {
           ...this.page,
           ...this.search,
-          integralType: this.integralType,
-          startTime: this.startTime,
-          endTime: this.endTime,
         }
       }).then(res => {
         if(res?.data) {
@@ -235,21 +248,17 @@ export default {
       })
     },
 
-    gridChangeOpt() {
+    gridChangeOpt(val) {
       this.search.girdId = val?.[val.length - 1]
       this.$refs.cascader2.dropDownVisible = false;
       this.getTableData()
     },
 
-    getColEcherts1() {
+    getColEcherts1(xData,yData) {
       let chartDom1 = document.getElementById('chart1');
       chartDom1.style.width = (window.innerWidth - 435) / 2 + "px";
       this.myChart1 = echarts.init(chartDom1);
       this.myChart1.setOption({
-        
-        title: {
-          text: '个人积分排行'
-        },
         tooltip: {
           trigger: 'axis',
           axisPointer: {
@@ -260,7 +269,7 @@ export default {
           left: '16px',
           right: '28px',
           bottom: '14px',
-          top: '50px',
+          top: '16px',
           containLabel: true
         },
         xAxis: {
@@ -269,7 +278,7 @@ export default {
         },
         yAxis: {
           type: 'category',
-          data: ['Brazil', 'Indonesia', 'India', 'China', 'World'],
+          data: xData,
           axisTick: {
             show: false,
           },
@@ -280,7 +289,7 @@ export default {
 
         series: [
           {
-            data: [120, 200, 150, 80, 70,],
+            data: yData,
             type: 'bar',
             itemStyle: {
               normal: {
@@ -302,14 +311,11 @@ export default {
       }, true);
       window.addEventListener("resize", this.onResize)
     },
-    getColEcherts2() {
+    getColEcherts2(xData,yData) {
       let chartDom2 = document.getElementById('chart2');
       chartDom2.style.width = (window.innerWidth - 435) / 2 + "px";
       this.myChart2 = echarts.init(chartDom2);
       this.myChart2.setOption({
-        title: {
-          text: '网格积分排行'
-        },
         tooltip: {
           trigger: 'axis',
           axisPointer: {
@@ -320,7 +326,7 @@ export default {
           left: '16px',
           right: '28px',
           bottom: '14px',
-          top: '50px',
+          top: '16px',
           containLabel: true
         },
         xAxis: {
@@ -329,7 +335,7 @@ export default {
         },
         yAxis: {
           type: 'category',
-          data: ['Brazil', 'Indonesia', 'India', 'China', 'World'],
+          data: xData,
           axisTick: {
             show: false,
           },
@@ -339,7 +345,7 @@ export default {
         },
         series: [
           {
-            data: [120, 200, 150, 80, 70,],
+            data: yData,
             type: 'bar',
             itemStyle: {
               normal: {
@@ -417,6 +423,12 @@ export default {
       this.getDetail(id)
     },
 
+    onChange(val) {
+      this.search.startTime = val?.[0]
+      this.search.endTime = val?.[1]
+      this.getTableData()
+    },
+
     getDetail(id) {
       this.instance.post(`/app/appintegraldetail/queryDetailById?id=${id}`).then(res=> {
         if(res?.data) {
@@ -436,6 +448,7 @@ export default {
       this.endTime = this.timeList?.[1]
       this.dialogDate = false
       this.getStatistics()
+      this.getRanking()
     },
 
   },
@@ -540,9 +553,11 @@ export default {
       display: flex;
       .left_Box {
         margin-right: 16px;
+        flex: 1;
       }
       .right_Box {
         width: 100%;
+        flex: 1;
       }
 
       .left_Box,
@@ -555,7 +570,10 @@ export default {
         #chart1,
         #chart2 {
           width: 100%;
-          height: 260px;
+          height: 300px;
+        }
+        p {
+          font-weight: 600;
         }
       }
     }