From 556e121fdf4b74132e954b47c27784afe776c6e9 Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Fri, 01 Mar 2024 15:08:15 +0800
Subject: [PATCH] 居民监管页面修改

---
 src/styles/avue-ui.css                                |  119 +++
 src/styles/avue-ui.min.css                            |    1 
 src/styles/avue-ui.scss                               |  217 +++--
 src/views/propertySupervision/residentSupervision.vue | 1574 ++++++++++++++++++++++++------------------------
 4 files changed, 1,029 insertions(+), 882 deletions(-)

diff --git a/src/styles/avue-ui.css b/src/styles/avue-ui.css
new file mode 100644
index 0000000..e13c666
--- /dev/null
+++ b/src/styles/avue-ui.css
@@ -0,0 +1,119 @@
+body .avue--disabled {
+  color: #777 !important;
+  cursor: not-allowed;
+}
+
+.place-info-box .el-dialog {
+  display: flex;
+  flex-direction: column;
+  height: 72% !important;
+}
+
+.place-info-box .el-dialog .el-dialog__header {
+  padding-top: 10px !important;
+  padding-bottom: 10px !important;
+}
+
+.place-info-box .el-dialog .el-dialog__header .el-dialog__headerbtn {
+  top: 10px !important;
+}
+
+.place-info-box .el-dialog .el-dialog__body {
+  padding: 0px !important;
+  padding-bottom: 10px !important;
+  height: 0 !important;
+  flex: 1;
+}
+
+.place-info-box .el-dialog .el-dialog__body .el-tabs {
+  display: flex;
+  flex-direction: column;
+  height: 100% !important;
+}
+
+.place-info-box .el-dialog .el-dialog__body .el-tabs .el-tabs__content {
+  flex: 1;
+}
+
+.audit-info-box .el-dialog {
+  height: auto !important;
+}
+
+.turn-over-popup .el-dialog {
+  width: 520px !important;
+}
+
+.cur-house-hold-box .avue-crud__left {
+  flex: 1;
+}
+
+.cur-resident-supervision-page .echarts-wrap {
+  display: flex;
+  flex-wrap: wrap;
+  padding: 0 0 10px 0;
+  justify-content: space-between;
+}
+
+.cur-resident-supervision-page .echarts-wrap .echarts-cell {
+  height: 300px;
+  width: calc(33.3% - 10px);
+  display: flex;
+  flex-direction: column;
+  background: #fff;
+}
+
+.cur-resident-supervision-page .echarts-wrap .echarts-cell .echarts-item {
+  box-sizing: border-box;
+  padding: 10px;
+  width: 100%;
+  height: 0;
+  flex: 1;
+}
+
+.cur-house-hold-supervision-page .echarts-wrap {
+  display: flex;
+  flex-wrap: wrap;
+  padding: 0;
+  justify-content: space-between;
+}
+
+.cur-house-hold-supervision-page .echarts-wrap .echarts-cell {
+  margin: 0 5px;
+  height: 300px;
+  width: calc(20% - 10px);
+  display: flex;
+  flex-direction: column;
+  background: #fff;
+}
+
+.cur-house-hold-supervision-page .echarts-wrap .echarts-cell .echarts-item {
+  box-sizing: border-box;
+  padding: 10px;
+  width: 100%;
+  height: 0;
+  flex: 1;
+}
+
+.cur-house-hold-supervision-page .cur-from-box {
+  margin-top: 10px;
+  padding: 10px;
+  background: #fff;
+}
+
+.cur-house-hold-supervision-page .echarts-cell:first-child {
+  margin-left: 0;
+}
+
+.cur-house-hold-supervision-page .echarts-cell:last-child {
+  margin-right: 0;
+}
+
+.cur-house-hold-supervision-page .echarts-cell:nth-child(1) {
+  width: 0;
+  flex: 1;
+}
+
+.cur-house-hold-supervision-page .echarts-cell:nth-child(2) {
+  width: 0;
+  flex: 2;
+}
diff --git a/src/styles/avue-ui.min.css b/src/styles/avue-ui.min.css
new file mode 100644
index 0000000..763fa66
--- /dev/null
+++ b/src/styles/avue-ui.min.css
@@ -0,0 +1 @@
+body .avue--disabled{color:#777 !important;cursor:not-allowed}.place-info-box .el-dialog{display:flex;flex-direction:column;height:72% !important}.place-info-box .el-dialog .el-dialog__header{padding-top:10px !important;padding-bottom:10px !important}.place-info-box .el-dialog .el-dialog__header .el-dialog__headerbtn{top:10px !important}.place-info-box .el-dialog .el-dialog__body{padding:0px !important;padding-bottom:10px !important;height:0 !important;flex:1}.place-info-box .el-dialog .el-dialog__body .el-tabs{display:flex;flex-direction:column;height:100% !important}.place-info-box .el-dialog .el-dialog__body .el-tabs .el-tabs__content{flex:1}.audit-info-box .el-dialog{height:auto !important}.turn-over-popup .el-dialog{width:520px !important}.cur-house-hold-box .avue-crud__left{flex:1}.cur-resident-supervision-page .echarts-wrap{display:flex;flex-wrap:wrap;padding:0 0 10px 0;justify-content:space-between}.cur-resident-supervision-page .echarts-wrap .echarts-cell{height:300px;width:calc(33.3% - 10px);display:flex;flex-direction:column;background:#fff}.cur-resident-supervision-page .echarts-wrap .echarts-cell .echarts-item{box-sizing:border-box;padding:10px;width:100%;height:0;flex:1}.cur-house-hold-supervision-page .echarts-wrap{display:flex;flex-wrap:wrap;padding:0;justify-content:space-between}.cur-house-hold-supervision-page .echarts-wrap .echarts-cell{margin:0 5px;height:300px;width:calc(20% - 10px);display:flex;flex-direction:column;background:#fff}.cur-house-hold-supervision-page .echarts-wrap .echarts-cell .echarts-item{box-sizing:border-box;padding:10px;width:100%;height:0;flex:1}.cur-house-hold-supervision-page .cur-from-box{margin-top:10px;padding:10px;background:#fff}.cur-house-hold-supervision-page .echarts-cell:first-child{margin-left:0}.cur-house-hold-supervision-page .echarts-cell:last-child{margin-right:0}.cur-house-hold-supervision-page .echarts-cell:nth-child(1){width:0;flex:1}.cur-house-hold-supervision-page .echarts-cell:nth-child(2){width:0;flex:2}
diff --git a/src/styles/avue-ui.scss b/src/styles/avue-ui.scss
index b4a783e..0288883 100644
--- a/src/styles/avue-ui.scss
+++ b/src/styles/avue-ui.scss
@@ -1,126 +1,153 @@
 body {
-    .avue--disabled {
-        color: #777 !important;
-        cursor: not-allowed;
-    }
+  .avue--disabled {
+    color: #777 !important;
+    cursor: not-allowed;
+  }
 }
 
 .place-info-box {
-    .el-dialog {
+  .el-dialog {
+    display: flex;
+    flex-direction: column;
+    height: 72% !important;
+
+    .el-dialog__header {
+      padding-top: 10px !important;
+      padding-bottom: 10px !important;
+
+      .el-dialog__headerbtn {
+        top: 10px !important;
+      }
+    }
+
+    .el-dialog__body {
+      padding: 0px !important;
+      padding-bottom: 10px !important;
+      height: 0 !important;
+      flex: 1;
+
+      .el-tabs {
         display: flex;
         flex-direction: column;
-        height: 72% !important;
+        height: 100% !important;
 
-        .el-dialog__header {
-            padding-top: 10px !important;
-            padding-bottom: 10px !important;
-
-            .el-dialog__headerbtn {
-                top: 10px !important;
-            }
+        .el-tabs__content {
+          flex: 1;
         }
-
-        .el-dialog__body {
-            padding: 0px !important;
-            padding-bottom: 10px !important;
-            height: 0 !important;
-            flex: 1;
-
-            .el-tabs {
-                display: flex;
-                flex-direction: column;
-                height: 100% !important;
-
-                .el-tabs__content {
-                    flex: 1;
-                }
-            }
-        }
+      }
     }
+  }
 }
 
 .audit-info-box {
-    .el-dialog {
-        height: auto !important;
-    }
+  .el-dialog {
+    height: auto !important;
+  }
 }
 
 .turn-over-popup {
-    .el-dialog {
-        width: 520px !important;
-    }
+  .el-dialog {
+    width: 520px !important;
+  }
 }
 
 .cur-house-hold-box {
-    .avue-crud__left {
-        flex: 1;
-    }
+  .avue-crud__left {
+    flex: 1;
+  }
 }
 
-.cur-resident-supervision-page,
-.cur-house-hold-supervision-page {
-    .echarts-wrap {
-        display: flex;
-        flex-wrap: wrap;
-        padding: 0;
-        justify-content: space-between;
+.cur-resident-supervision-page {
+  .echarts-wrap {
+    display: flex;
+    flex-wrap: wrap;
+    padding: 0 0 10px 0;
+    justify-content: space-between;
 
+    .echarts-cell {
+      //   margin: 0 5px;
+      height: 300px;
+      width: calc(33.3% - 10px);
+      display: flex;
+      flex-direction: column;
+      background: #fff;
 
-        // .echarts-cell:nth-child(1),
-        // .echarts-cell:nth-child(2) {
-        //     height: 300px;
-        //     width: calc(50% - 5px);
-        // }
-
-        // .echarts-cell:nth-child(3),
-        // .echarts-cell:nth-child(4),
-        // .echarts-cell:nth-child(5) {
-        //     margin-top: 10px;
-        //     height: 300px;
-        //     width: calc((100% / 3) - 6.66px);
-        // }
-
-        .echarts-cell {
-            margin: 0 5px;
-            height: 300px;
-            width: calc(20% - 10px);
-            display: flex;
-            flex-direction: column;
-            background: #fff;
-
-            .echarts-item {
-                padding: 10px;
-                width: 100%;
-                height: 0;
-                flex: 1;
-            }
-        }
-
-    }
-
-    .cur-from-box {
-        margin-top: 10px;
+      .echarts-item {
+        box-sizing: border-box;
         padding: 10px;
-        background: #fff;
+        width: 100%;
+        height: 0;
+        flex: 1;
+      }
     }
 
-    .echarts-cell:first-child {
-        margin-left: 0;
-    }
-
-    .echarts-cell:last-child {
-        margin-right: 0;
-    }
+  }
 }
 
 .cur-house-hold-supervision-page {
-    .echarts-cell:nth-child(1) {
-        width: 0;
+  .echarts-wrap {
+    display: flex;
+    flex-wrap: wrap;
+    padding: 0;
+    justify-content: space-between;
+
+
+    // .echarts-cell:nth-child(1),
+    // .echarts-cell:nth-child(2) {
+    //     height: 300px;
+    //     width: calc(50% - 5px);
+    // }
+
+    // .echarts-cell:nth-child(3),
+    // .echarts-cell:nth-child(4),
+    // .echarts-cell:nth-child(5) {
+    //     margin-top: 10px;
+    //     height: 300px;
+    //     width: calc((100% / 3) - 6.66px);
+    // }
+
+    .echarts-cell {
+      margin: 0 5px;
+      height: 300px;
+      width: calc(20% - 10px);
+      display: flex;
+      flex-direction: column;
+      background: #fff;
+
+      .echarts-item {
+        box-sizing: border-box;
+        padding: 10px;
+        width: 100%;
+        height: 0;
         flex: 1;
+      }
     }
 
-    .echarts-cell:nth-child(2) {
-        width: 0;
-        flex: 2;
-    }
-}
\ No newline at end of file
+  }
+
+  .cur-from-box {
+    margin-top: 10px;
+    padding: 10px;
+    background: #fff;
+  }
+
+  .echarts-cell:first-child {
+    margin-left: 0;
+  }
+
+  .echarts-cell:last-child {
+    margin-right: 0;
+  }
+}
+
+.cur-house-hold-supervision-page {
+  .echarts-cell:nth-child(1) {
+    width: 0;
+    flex: 1;
+  }
+
+  .echarts-cell:nth-child(2) {
+    width: 0;
+    flex: 2;
+  }
+}
diff --git a/src/views/propertySupervision/residentSupervision.vue b/src/views/propertySupervision/residentSupervision.vue
index 64a5b87..0963b56 100644
--- a/src/views/propertySupervision/residentSupervision.vue
+++ b/src/views/propertySupervision/residentSupervision.vue
@@ -1,85 +1,85 @@
 <template>
-  <div class="cur-resident-supervision-page" v-loading="loading">
-    <div class="echarts-wrap">
-      <div class="echarts-cell" v-for="(i, k) in labelCountList" :key="k">
-        <box-title :title="i.name" :classVal="9" :classStyle="'echarts-title'"></box-title>
-        <div class="echarts-item"></div>
-      </div>
-    </div>
-
-    <div class="cur-from-box">
-      <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud" v-model="form"
-        :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
-        :before-open="beforeOpen" :page.sync="page" @search-change="searchChange" @search-reset="searchReset"
-        @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
-        @refresh-change="refreshChange" @on-load="onLoad">
-        <template slot-scope="{row, size}" slot="menu">
-          <el-button :size="size" type="text" icon="el-icon-circle-plus-outline" v-if="permission.househould_manager"
-            @click="manageLabel(row)">标签
-          </el-button>
-        </template>
-        <template slot-scope="{row, size}" slot="phoneNumber">
-          <el-button :size="size" type="text" @click="showStringDispose(row, 'phoneNumberflag')">
-            {{ textDispose(row, 'phoneNumberflag', 'phoneNumber') }}
-          </el-button>
-        </template>
-        <template slot-scope="{row, size}" slot="idCard">
-          <el-button :size="size" type="text" @click="showStringDispose(row, 'idCardflag')"
-            v-text="textDispose(row, 'idCardflag', 'idCard')"></el-button>
-        </template>
-        <template slot-scope="{row, size}" slot="householdLabelList">
-          {{ labelDispose(row.householdLabelList) }}
-        </template>
-      </avue-crud>
-    </div>
-
-    <el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" width="345px" center>
-
-      <el-tree :data="roleGrantList" show-checkbox check-strictly default-expand-all node-key="id" ref="treeRole"
-        :default-checked-keys="roleTreeObj" :props="props">
-      </el-tree>
-
-      <span slot="footer" class="dialog-footer">
-        <el-button size="small" @click="roleBox = false">取 消</el-button>
-        <el-button size="small" type="primary" @click="submitRole">确 定</el-button>
-      </span>
-    </el-dialog>
-
-    <el-dialog title="标签管理" append-to-body :visible.sync="labelFlag" center width="600px">
-      <div>
-        <div class="grid-container2">
-          <div class="grid-item" :style="{ backgroundColor: item2.color }" v-for="(item2, index2) in labelData"
-            @click="changLabel(item2)" :key="index2">
-            {{ item2.name }}
-          </div>
+    <div class="cur-resident-supervision-page" v-loading="loading">
+        <div class="echarts-wrap">
+            <div class="echarts-cell" v-for="(i, k) in labelCountList" :key="k">
+                <box-title :title="i.name" :classVal="9" :classStyle="'echarts-title'"></box-title>
+                <div class="echarts-item"></div>
+            </div>
         </div>
-      </div>
 
-    </el-dialog>
+        <div class="cur-from-box">
+            <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud"
+                v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
+                :before-open="beforeOpen" :page.sync="page" @search-change="searchChange" @search-reset="searchReset"
+                @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+                @refresh-change="refreshChange" @on-load="onLoad">
+                <template slot-scope="{row, size}" slot="menu">
+                    <el-button :size="size" type="text" icon="el-icon-circle-plus-outline"
+                        v-if="permission.househould_manager" @click="manageLabel(row)">标签
+                    </el-button>
+                </template>
+                <template slot-scope="{row, size}" slot="phoneNumber">
+                    <el-button :size="size" type="text" @click="showStringDispose(row, 'phoneNumberflag')">
+                        {{ textDispose(row, 'phoneNumberflag', 'phoneNumber') }}
+                    </el-button>
+                </template>
+                <template slot-scope="{row, size}" slot="idCard">
+                    <el-button :size="size" type="text" @click="showStringDispose(row, 'idCardflag')"
+                        v-text="textDispose(row, 'idCardflag', 'idCard')"></el-button>
+                </template>
+                <template slot-scope="{row, size}" slot="householdLabelList">
+                    {{ labelDispose(row.householdLabelList) }}
+                </template>
+            </avue-crud>
+        </div>
 
-    <el-dialog :title="'编辑标签   ' + currentLabel.name" append-to-body :visible.sync="editLabelFlge" width="655px">
-      <avue-form :option="labelOption" v-model="labelForm" :submit="onsubmit">
-      </avue-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button size="small" @click="editLabelFlge = false">取 消</el-button>
-        <el-button size="small" type="primary" @click="onsubmit">确 定</el-button>
-      </span>
-    </el-dialog>
+        <el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" width="345px" center>
 
-    <el-dialog title="用户数据导入" append-to-body :visible.sync="excelBox" width="555px">
-      <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
-        <template slot="excelTemplate">
-          <el-button size="small" type="primary" @click="handleTemplate">
-            点击下载<i class="el-icon-download el-icon--right"></i>
-          </el-button>
-        </template>
-      </avue-form>
-    </el-dialog>
-  </div>
+            <el-tree :data="roleGrantList" show-checkbox check-strictly default-expand-all node-key="id" ref="treeRole"
+                :default-checked-keys="roleTreeObj" :props="props">
+            </el-tree>
+
+            <span slot="footer" class="dialog-footer">
+                <el-button size="small" @click="roleBox = false">取 消</el-button>
+                <el-button size="small" type="primary" @click="submitRole">确 定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="标签管理" append-to-body :visible.sync="labelFlag" center width="600px">
+            <div>
+                <div class="grid-container2">
+                    <div class="grid-item" :style="{ backgroundColor: item2.color }" v-for="(item2, index2) in labelData"
+                        @click="changLabel(item2)" :key="index2">
+                        {{ item2.name }}
+                    </div>
+                </div>
+            </div>
+
+        </el-dialog>
+
+        <el-dialog :title="'编辑标签   ' + currentLabel.name" append-to-body :visible.sync="editLabelFlge" width="655px">
+            <avue-form :option="labelOption" v-model="labelForm" :submit="onsubmit">
+            </avue-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button size="small" @click="editLabelFlge = false">取 消</el-button>
+                <el-button size="small" type="primary" @click="onsubmit">确 定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="用户数据导入" append-to-body :visible.sync="excelBox" width="555px">
+            <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
+                <template slot="excelTemplate">
+                    <el-button size="small" type="primary" @click="handleTemplate">
+                        点击下载<i class="el-icon-download el-icon--right"></i>
+                    </el-button>
+                </template>
+            </avue-form>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
-  import {
+import {
     getKeynotePersonnelPage,
     getlabelStatistics,
     remove,
@@ -87,814 +87,814 @@
     update,
     getDetatil,
     getDetatils
-  } from "@/api/userHouse/list/houseHold.js"
-  import {
+} from "@/api/userHouse/list/houseHold.js"
+import {
     removeHouseholdLabel,
     saveOrUpdateHouseholdLabel
-  } from "@/api/userHouse/list/userHouseList.js"
-  import {
+} from "@/api/userHouse/list/userHouseList.js"
+import {
     getLabelList,
-  } from '@/api/label/label'
-  import {
+} from '@/api/label/label'
+import {
     exportBlob
-  } from "@/api/common"
-  import {
+} from "@/api/common"
+import {
     mapGetters
-  } from "vuex"
-  import {
+} from "vuex"
+import {
     getToken
-  } from '@/util/auth'
-  import {
+} from '@/util/auth'
+import {
     downloadXls,
     findParentOrCur,
-  } from "@/util/util"
-  import {
+} from "@/util/util"
+import {
     dateNow
-  } from "@/util/date"
-  import NProgress from 'nprogress'
-  import 'nprogress/nprogress.css'
-  import Qs from "qs"
-  import * as echarts from 'echarts'
-  import {
+} from "@/util/date"
+import NProgress from 'nprogress'
+import 'nprogress/nprogress.css'
+import Qs from "qs"
+import * as echarts from 'echarts'
+import {
     getTreeList
-  } from '@/api/label/label'
-  import boxTitle from "../place/components/boxTitle.vue"
+} from '@/api/label/label'
+import boxTitle from "../place/components/boxTitle.vue"
 
-  export default {
+export default {
     components: {
-      boxTitle
+        boxTitle
     },
-    data() {
-      let isCardId = function(rule, value, callback) {
-        // 15位和18位身份证号码的正则表达式
-        var regIdCard =
-          /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/
+    data () {
+        let isCardId = function (rule, value, callback) {
+            // 15位和18位身份证号码的正则表达式
+            var regIdCard =
+                /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/
 
-        // 如果通过该验证,说明身份证格式正确,但准确性还需计算
-        if (regIdCard.test(value)) {
-          if (value.length == 18) {
-            var idCardWi = new Array(7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10,
-              5, 8, 4, 2) // 将前17位加权因子保存在数组里
-            var idCardY = new Array(1, 0, 10, 9, 8, 7, 6, 5, 4, 3, 2) // 这是除以11后,可能产生的11位余数、验证码,也保存成数组
-            var idCardWiSum = 0 // 用来保存前17位各自乖以加权因子后的总和
-            for (var i = 0; i < 17; i++) {
-              idCardWiSum += value.substring(i, i + 1) * idCardWi[i]
-            }
+            // 如果通过该验证,说明身份证格式正确,但准确性还需计算
+            if (regIdCard.test(value)) {
+                if (value.length == 18) {
+                    var idCardWi = new Array(7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10,
+                        5, 8, 4, 2) // 将前17位加权因子保存在数组里
+                    var idCardY = new Array(1, 0, 10, 9, 8, 7, 6, 5, 4, 3, 2) // 这是除以11后,可能产生的11位余数、验证码,也保存成数组
+                    var idCardWiSum = 0 // 用来保存前17位各自乖以加权因子后的总和
+                    for (var i = 0; i < 17; i++) {
+                        idCardWiSum += value.substring(i, i + 1) * idCardWi[i]
+                    }
 
-            var idCardMod = idCardWiSum % 11 // 计算出校验码所在数组的位置
-            var idCardLast = value.substring(17) // 得到最后一位身份证号码
+                    var idCardMod = idCardWiSum % 11 // 计算出校验码所在数组的位置
+                    var idCardLast = value.substring(17) // 得到最后一位身份证号码
 
-            // 如果等于2,则说明校验码是10,身份证号码最后一位应该是X
-            if (idCardMod == 2) {
-              if (idCardLast == "X" || idCardLast == "x") {
-                callback()
-              } else {
-                callback(new Error("身份证号格式有误!"))
-              }
+                    // 如果等于2,则说明校验码是10,身份证号码最后一位应该是X
+                    if (idCardMod == 2) {
+                        if (idCardLast == "X" || idCardLast == "x") {
+                            callback()
+                        } else {
+                            callback(new Error("身份证号格式有误!"))
+                        }
+                    } else {
+                        // 用计算出的验证码与最后一位身份证号码匹配,如果一致,说明通过,否则是无效的身份证号码
+                        if (idCardLast == idCardY[idCardMod]) {
+                            callback()
+                        } else {
+                            callback(new Error("身份证号格式有误!"))
+                        }
+                    }
+                } else {
+                    callback()
+                }
             } else {
-              // 用计算出的验证码与最后一位身份证号码匹配,如果一致,说明通过,否则是无效的身份证号码
-              if (idCardLast == idCardY[idCardMod]) {
-                callback()
-              } else {
+                //alert("身份证格式不正确!");
                 callback(new Error("身份证号格式有误!"))
-              }
             }
-          } else {
+
             callback()
-          }
-        } else {
-          //alert("身份证格式不正确!");
-          callback(new Error("身份证号格式有误!"))
         }
 
-        callback()
-      }
-
-      //手机号格式校验
-      let validatorPhone = function(rule, value, callback) {
-        if (value) {
-          if (!/^1[3456789]\d{9}$/.test(value)) {
-            callback(new Error('手机号格式有误!'))
-          } else {
+        //手机号格式校验
+        let validatorPhone = function (rule, value, callback) {
+            if (value) {
+                if (!/^1[3456789]\d{9}$/.test(value)) {
+                    callback(new Error('手机号格式有误!'))
+                } else {
+                    callback()
+                }
+            }
             callback()
-          }
         }
-        callback()
-      }
 
-      return {
-        labelData: [],
-        form: {},
-        search: {},
-        excelBox: false,
-        selectionList: [],
-        labelFlag: false,
-        editLabelFlge: false,
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        option: {
-          labelWidth: 144,
-          searchLabelWidth: 96,
-          searchShow: true,
-          searchMenuSpan: 3,
-          menuWidth: 280,
-          menu: false,
-          height: 'auto',
-          calcHeight: 80,
-          tip: false,
-          border: true,
-          index: true,
-          selection: true,
-          viewBtn: false,
-          addBtn: false,
-          delBtn: false,
-          editBtn: false,
-          dialogType: 'drawer',
-          dialogClickModal: false,
-          header: false,
-          column: [{
-              width: 110,
-              label: "姓名",
-              prop: "name",
-              searchSpan: 3,
-              searchLabelWidth: 50,
-              search: true,
-              rules: [{
-                required: true,
-                message: "请输入姓名",
-                trigger: "blur",
-              }],
+        return {
+            labelData: [],
+            form: {},
+            search: {},
+            excelBox: false,
+            selectionList: [],
+            labelFlag: false,
+            editLabelFlge: false,
+            query: {},
+            loading: true,
+            page: {
+                pageSize: 10,
+                currentPage: 1,
+                total: 0
             },
-
-            {
-              width: 160,
-              display: true,
-              label: "身份证号",
-              prop: "idCard",
-              search: true,
-              searchSpan: 4,
-              slot: true,
-              rules: [{
-                validator: isCardId,
-                trigger: 'blur'
-              }],
-            },
-
-            {
-              width: 60,
-              label: "性别",
-              prop: "gender",
-              type: "select",
-              dicData: [{
-                  label: "男",
-                  value: 1
+            option: {
+                labelWidth: 144,
+                searchLabelWidth: 96,
+                searchShow: true,
+                searchMenuSpan: 3,
+                menuWidth: 280,
+                menu: false,
+                height: 'auto',
+                calcHeight: 80,
+                tip: false,
+                border: true,
+                index: true,
+                selection: true,
+                viewBtn: false,
+                addBtn: false,
+                delBtn: false,
+                editBtn: false,
+                dialogType: 'drawer',
+                dialogClickModal: false,
+                header: false,
+                column: [{
+                    width: 110,
+                    label: "姓名",
+                    prop: "name",
+                    searchSpan: 3,
+                    searchLabelWidth: 50,
+                    search: true,
+                    rules: [{
+                        required: true,
+                        message: "请输入姓名",
+                        trigger: "blur",
+                    }],
                 },
+
                 {
-                  label: "女",
-                  value: 0
+                    width: 160,
+                    display: true,
+                    label: "身份证号",
+                    prop: "idCard",
+                    search: true,
+                    searchSpan: 4,
+                    slot: true,
+                    rules: [{
+                        validator: isCardId,
+                        trigger: 'blur'
+                    }],
                 },
+
                 {
-                  label: "未知",
-                  value: "3"
+                    width: 60,
+                    label: "性别",
+                    prop: "gender",
+                    type: "select",
+                    dicData: [{
+                        label: "男",
+                        value: 1
+                    },
+                    {
+                        label: "女",
+                        value: 0
+                    },
+                    {
+                        label: "未知",
+                        value: "3"
+                    }
+                    ],
+                },
+
+                {
+                    width: 120,
+                    label: "手机号码",
+                    prop: "phoneNumber",
+                    search: true,
+                    searchSpan: 4,
+                    slot: true,
+                    rules: [{
+                        required: true,
+                        message: "请输入手机号码",
+                        trigger: "blur",
+                    },
+                    {
+                        validator: validatorPhone,
+                        trigger: 'blur'
+                    }
+                    ],
+                },
+
+                {
+                    width: 220,
+                    overHidden: true,
+                    label: '小区名称',
+                    prop: "aoiName",
+                    search: true,
+                    searchSpan: 4,
+                    display: false
+                },
+
+                {
+                    width: 110,
+                    label: "所属街道",
+                    addDisplay: false,
+                    editDisplay: false,
+                    viewDisplay: false,
+                    prop: "townStreetName",
+                    search: true,
+                    searchSpan: 4
+                },
+
+                {
+                    width: 156,
+                    overHidden: true,
+                    label: "所属社区",
+                    addDisplay: false,
+                    editDisplay: false,
+                    viewDisplay: false,
+                    prop: "neiName",
+                    search: true,
+                    searchSpan: 4
+                },
+
+                {
+                    width: 110,
+                    overHidden: true,
+                    label: "所属网格",
+                    addDisplay: false,
+                    editDisplay: false,
+                    viewDisplay: false,
+                    prop: "gridName",
+                },
+
+                {
+                    width: 156,
+                    overHidden: true,
+                    label: "地址",
+                    prop: "address",
+                    display: false
+                },
+
+                {
+                    overHidden: true,
+                    label: "标签",
+                    prop: "householdLabelList",
+                    display: false
                 }
-              ],
+                ]
             },
+            data: [],
 
-            {
-              width: 120,
-              label: "手机号码",
-              prop: "phoneNumber",
-              search: true,
-              searchSpan: 4,
-              slot: true,
-              rules: [{
-                  required: true,
-                  message: "请输入手机号码",
-                  trigger: "blur",
+            excelForm: {},
+            labelForm: {},
+            labelOption: {
+                submitBtn: false,
+                emptyBtn: false,
+                column: [{
+                    label: '级别',
+                    prop: 'color',
+                    type: 'radio',
+                    button: true,
+                    row: true,
+                    dicData: [{
+                        label: '撤销',
+                        value: '#EBEDF0'
+                    }, {
+                        label: '绿',
+                        value: '#30D17C'
+                    }, {
+                        label: '黄',
+                        value: '#FFB42B'
+                    }, {
+                        label: '红',
+                        value: '#EA1F1F'
+                    }],
+                    rules: [{
+                        required: true,
+                        message: "请选择",
+                        trigger: "blur"
+                    }]
+                }, {
+                    row: true,
+                    label: '备注',
+                    prop: 'remark',
+                    type: 'input'
+                }]
+            },
+            excelOption: {
+                submitBtn: false,
+                emptyBtn: false,
+                column: [{
+                    label: '模板上传',
+                    prop: 'excelFile',
+                    type: 'upload',
+                    drag: true,
+                    loadText: '模板上传中,请稍等',
+                    span: 24,
+                    propsHttp: {
+                        res: 'data'
+                    },
+                    tip: '请上传 .xls,.xlsx 标准格式文件',
+                    action: "/api/blade-system/user/import-user"
                 },
                 {
-                  validator: validatorPhone,
-                  trigger: 'blur'
-                }
-              ],
-            },
-
-            {
-              width: 220,
-              overHidden: true,
-              label: '小区名称',
-              prop: "aoiName",
-              search: true,
-              searchSpan: 4,
-              display: false
-            },
-
-            {
-              width: 110,
-              label: "所属街道",
-              addDisplay: false,
-              editDisplay: false,
-              viewDisplay: false,
-              prop: "townStreetName",
-              search: true,
-              searchSpan: 4
-            },
-
-            {
-              width: 156,
-              overHidden: true,
-              label: "所属社区",
-              addDisplay: false,
-              editDisplay: false,
-              viewDisplay: false,
-              prop: "neiName",
-              search: true,
-              searchSpan: 4
-            },
-
-            {
-              width: 110,
-              overHidden: true,
-              label: "所属网格",
-              addDisplay: false,
-              editDisplay: false,
-              viewDisplay: false,
-              prop: "gridName",
-            },
-
-            {
-              width: 156,
-              overHidden: true,
-              label: "地址",
-              prop: "address",
-              display: false
-            },
-
-            {
-              overHidden: true,
-              label: "标签",
-              prop: "householdLabelList",
-              display: false
-            }
-          ]
-        },
-        data: [],
-
-        excelForm: {},
-        labelForm: {},
-        labelOption: {
-          submitBtn: false,
-          emptyBtn: false,
-          column: [{
-            label: '级别',
-            prop: 'color',
-            type: 'radio',
-            button: true,
-            row: true,
-            dicData: [{
-              label: '撤销',
-              value: '#EBEDF0'
-            }, {
-              label: '绿',
-              value: '#30D17C'
-            }, {
-              label: '黄',
-              value: '#FFB42B'
-            }, {
-              label: '红',
-              value: '#EA1F1F'
-            }],
-            rules: [{
-              required: true,
-              message: "请选择",
-              trigger: "blur"
-            }]
-          }, {
-            row: true,
-            label: '备注',
-            prop: 'remark',
-            type: 'input'
-          }]
-        },
-        excelOption: {
-          submitBtn: false,
-          emptyBtn: false,
-          column: [{
-              label: '模板上传',
-              prop: 'excelFile',
-              type: 'upload',
-              drag: true,
-              loadText: '模板上传中,请稍等',
-              span: 24,
-              propsHttp: {
-                res: 'data'
-              },
-              tip: '请上传 .xls,.xlsx 标准格式文件',
-              action: "/api/blade-system/user/import-user"
-            },
-            {
-              label: "数据覆盖",
-              prop: "isCovered",
-              type: "switch",
-              align: "center",
-              width: 80,
-              dicData: [{
-                  label: "否",
-                  value: 0
+                    label: "数据覆盖",
+                    prop: "isCovered",
+                    type: "switch",
+                    align: "center",
+                    width: 80,
+                    dicData: [{
+                        label: "否",
+                        value: 0
+                    },
+                    {
+                        label: "是",
+                        value: 1
+                    }
+                    ],
+                    value: 0,
+                    slot: true,
+                    rules: [{
+                        required: true,
+                        message: "请选择是否覆盖",
+                        trigger: "blur"
+                    }]
                 },
                 {
-                  label: "是",
-                  value: 1
+                    label: '模板下载',
+                    prop: 'excelTemplate',
+                    formslot: true,
+                    span: 24,
                 }
-              ],
-              value: 0,
-              slot: true,
-              rules: [{
-                required: true,
-                message: "请选择是否覆盖",
-                trigger: "blur"
-              }]
+                ]
             },
-            {
-              label: '模板下载',
-              prop: 'excelTemplate',
-              formslot: true,
-              span: 24,
-            }
-          ]
-        },
-        currentLabel: {},
-        currentRow: {},
-        householdLabelList: [],
+            currentLabel: {},
+            currentRow: {},
+            householdLabelList: [],
 
-        labelCountList: []
-      }
+            labelCountList: []
+        }
     },
     watch: {
-      'form.source': {
-        handler(newData) {
-          let currentAddressColumn = this.findObject(
-            this.option.column,
-            'currentAddress'
-          )
+        'form.source': {
+            handler (newData) {
+                let currentAddressColumn = this.findObject(
+                    this.option.column,
+                    'currentAddress'
+                )
 
-          let homeAdcodeColumn = this.findObject(
-            this.option.column,
-            'homeAdcode'
-          )
+                let homeAdcodeColumn = this.findObject(
+                    this.option.column,
+                    'homeAdcode'
+                )
 
-          if (newData == 1) {
-            currentAddressColumn.disabled = true
-            homeAdcodeColumn.disabled = true
-          } else {
-            currentAddressColumn.disabled = false
-            homeAdcodeColumn.disabled = false
-          }
+                if (newData == 1) {
+                    currentAddressColumn.disabled = true
+                    homeAdcodeColumn.disabled = true
+                } else {
+                    currentAddressColumn.disabled = false
+                    homeAdcodeColumn.disabled = false
+                }
+            },
         },
-      },
 
-      'form.cardType': {
-        handler(newData) {
-          let idCardColumn = this.findObject(
-            this.option.column,
-            'idCard'
-          )
+        'form.cardType': {
+            handler (newData) {
+                let idCardColumn = this.findObject(
+                    this.option.column,
+                    'idCard'
+                )
 
-          let cardNoColumn = this.findObject(
-            this.option.column,
-            'cardNo'
-          )
+                let cardNoColumn = this.findObject(
+                    this.option.column,
+                    'cardNo'
+                )
 
-          if (newData == 111) {
-            idCardColumn.display = true
-            cardNoColumn.display = false
-          } else {
-            idCardColumn.display = false
-            cardNoColumn.display = true
-          }
+                if (newData == 111) {
+                    idCardColumn.display = true
+                    cardNoColumn.display = false
+                } else {
+                    idCardColumn.display = false
+                    cardNoColumn.display = true
+                }
+            },
         },
-      },
 
-      'form.healthStatus': {
-        handler(newData) {
-          let diseaseNameColumn = this.findObject(
-            this.option.column,
-            'diseaseName'
-          )
+        'form.healthStatus': {
+            handler (newData) {
+                let diseaseNameColumn = this.findObject(
+                    this.option.column,
+                    'diseaseName'
+                )
 
-          if (newData == 3) {
-            diseaseNameColumn.disabled = false
-          } else {
-            diseaseNameColumn.disabled = true
-          }
+                if (newData == 3) {
+                    diseaseNameColumn.disabled = false
+                } else {
+                    diseaseNameColumn.disabled = true
+                }
+            },
         },
-      },
     },
     computed: {
-      ...mapGetters(["userInfo", "permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.household_add, false),
-          viewBtn: this.vaildData(this.permission.household_view, true),
-          delBtn: this.vaildData(this.permission.household_delete, true),
-          editBtn: this.vaildData(this.permission.household_edit, true)
-        }
-      },
-
-      textDispose() {
-        return (row, flag, type) => {
-          if (row[flag] || row[type] == null) {
-            return row[type]
-          } else {
-            if (type == 'idCard') {
-              return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
-            } else {
-              return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
+        ...mapGetters(["userInfo", "permission"]),
+        permissionList () {
+            return {
+                addBtn: this.vaildData(this.permission.household_add, false),
+                viewBtn: this.vaildData(this.permission.household_view, true),
+                delBtn: this.vaildData(this.permission.household_delete, true),
+                editBtn: this.vaildData(this.permission.household_edit, true)
             }
-          }
-        }
-      },
+        },
 
-      labelDispose() {
-        return (list) => {
-          return list.map(item => item.labelName).join(',')
+        textDispose () {
+            return (row, flag, type) => {
+                if (row[flag] || row[type] == null) {
+                    return row[type]
+                } else {
+                    if (type == 'idCard') {
+                        return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
+                    } else {
+                        return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
+                    }
+                }
+            }
+        },
+
+        labelDispose () {
+            return (list) => {
+                return list.map(item => item.labelName).join(',')
+            }
         }
-      }
     },
-    mounted() {
-      // this.getLabelCount()
+    mounted () {
+        // this.getLabelCount()
 
     },
     methods: {
-      init(row) {
-        console.log(JSON.stringify(row))
-        this.query.regionCode = row.communityCode
-        // this.onLoad(this.page, this.query)
-      },
-      onsubmit() {
-        if (this.labelForm.color === '#EBEDF0') {
-          let params = {
-            householdId: this.currentRow.id,
-            labelId: this.currentLabel.id
-          }
-          removeHouseholdLabel(params).then(res => {
-            this.onLoad(this.page)
-
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            })
-            this.editLabelFlge = false
-            this.manageLabel(this.currentRow)
-            this.loading = false
-          })
-        } else {
-          this.labelForm.houseCode = this.currentRow.houseCode
-          this.labelForm.householdId = this.currentRow.id
-          this.labelForm.labelId = this.currentLabel.id
-          this.labelForm.lableType = 1
-
-          saveOrUpdateHouseholdLabel(this.labelForm).then(res => {
-            this.onLoad(this.page)
-
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            })
-            this.editLabelFlge = false
-            this.manageLabel(this.currentRow)
-            this.loading = false
-          })
-        }
-      },
-
-      changLabel(item) {
-        this.editLabelFlge = true
-        this.currentLabel = item
-        this.labelForm.color = item.color
-        this.labelForm.remark = item.remark
-      },
-
-      manageLabel(item) {
-        this.loading = true
-        this.currentRow = item
-        this.labelFlag = true
-        let params = {
-          parentId: 103
-        }
-        // 查询标签
-        getLabelList(Object.assign(params)).then(res => {
-          const data = res.data.data
-          // this.labelData = data;
-          // 查询详情
-          getDetatils(item.id).then(res => {
-            this.householdLabelList = res.data.data.householdLabelList
-            // 将细类放到一起
-            data.forEach(e => {
-              e.children.forEach(f => {
-                if (this.householdLabelList.length > 0) {
-                  this.householdLabelList.forEach(h => {
-                    if (Number(f.id) == h.labelId) {
-                      f['color'] = h.color
-                      f['remark'] = h.remark
-                    }
-                  })
+        init (row) {
+            console.log(JSON.stringify(row))
+            this.query.regionCode = row.communityCode
+            // this.onLoad(this.page, this.query)
+        },
+        onsubmit () {
+            if (this.labelForm.color === '#EBEDF0') {
+                let params = {
+                    householdId: this.currentRow.id,
+                    labelId: this.currentLabel.id
                 }
-              })
+                removeHouseholdLabel(params).then(res => {
+                    this.onLoad(this.page)
+
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!"
+                    })
+                    this.editLabelFlge = false
+                    this.manageLabel(this.currentRow)
+                    this.loading = false
+                })
+            } else {
+                this.labelForm.houseCode = this.currentRow.houseCode
+                this.labelForm.householdId = this.currentRow.id
+                this.labelForm.labelId = this.currentLabel.id
+                this.labelForm.lableType = 1
+
+                saveOrUpdateHouseholdLabel(this.labelForm).then(res => {
+                    this.onLoad(this.page)
+
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!"
+                    })
+                    this.editLabelFlge = false
+                    this.manageLabel(this.currentRow)
+                    this.loading = false
+                })
+            }
+        },
+
+        changLabel (item) {
+            this.editLabelFlge = true
+            this.currentLabel = item
+            this.labelForm.color = item.color
+            this.labelForm.remark = item.remark
+        },
+
+        manageLabel (item) {
+            this.loading = true
+            this.currentRow = item
+            this.labelFlag = true
+            let params = {
+                parentId: 103
+            }
+            // 查询标签
+            getLabelList(Object.assign(params)).then(res => {
+                const data = res.data.data
+                // this.labelData = data;
+                // 查询详情
+                getDetatils(item.id).then(res => {
+                    this.householdLabelList = res.data.data.householdLabelList
+                    // 将细类放到一起
+                    data.forEach(e => {
+                        e.children.forEach(f => {
+                            if (this.householdLabelList.length > 0) {
+                                this.householdLabelList.forEach(h => {
+                                    if (Number(f.id) == h.labelId) {
+                                        f['color'] = h.color
+                                        f['remark'] = h.remark
+                                    }
+                                })
+                            }
+                        })
+                    })
+                    this.labelData = data
+                    this.loading = false
+                })
             })
-            this.labelData = data
-            this.loading = false
-          })
-        })
-      },
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.initFlag = false
-          this.onLoad(this.page)
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          })
-          done()
-        }, error => {
-          window.console.log(error)
-          loading()
-        })
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
-          this.initFlag = false
-          this.onLoad(this.page)
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          })
-          done()
-        }, error => {
-          window.console.log(error)
-          loading()
-        })
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
-          .then(() => {
-            return remove(row.id)
-          })
-          .then(() => {
+        },
+        rowSave (row, done, loading) {
+            add(row).then(() => {
+                this.initFlag = false
+                this.onLoad(this.page)
+                this.$message({
+                    type: "success",
+                    message: "操作成功!"
+                })
+                done()
+            }, error => {
+                window.console.log(error)
+                loading()
+            })
+        },
+        rowUpdate (row, index, done, loading) {
+            update(row).then(() => {
+                this.initFlag = false
+                this.onLoad(this.page)
+                this.$message({
+                    type: "success",
+                    message: "操作成功!"
+                })
+                done()
+            }, error => {
+                window.console.log(error)
+                loading()
+            })
+        },
+        rowDel (row) {
+            this.$confirm("确定将选择数据删除?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            })
+                .then(() => {
+                    return remove(row.id)
+                })
+                .then(() => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!"
+                    })
+                })
+        },
+        searchReset () {
+            this.query = {}
+            this.treeDeptId = ''
             this.onLoad(this.page)
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            })
-          })
-      },
-      searchReset() {
-        this.query = {}
-        this.treeDeptId = ''
-        this.onLoad(this.page)
-      },
-      searchChange(params, done) {
-        this.query = params
-        this.page.currentPage = 1
-        this.onLoad(this.page, params)
-        done()
-      },
-      selectionChange(list) {
-        this.selectionList = list
-      },
-      selectionClear() {
-        this.selectionList = []
-        // this.$refs.crud.toggleSelection();
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据")
-          return
-        }
-        this.$confirm("确定将选择数据删除?", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
-          .then(() => {
-            return remove(this.ids)
-          })
-          .then(() => {
-            this.onLoad(this.page)
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            })
-            this.$refs.crud.toggleSelection()
-          })
-      },
-      handleImport() {
-        this.excelBox = true
-      },
-      uploadAfter(res, done, loading, column) {
-        this.excelBox = false
-        this.refreshChange()
-        done()
-      },
-      handleExport() {
-        this.$confirm("是否导出住户数据?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          NProgress.start()
-          var data = {
-            ...this.query
-          }
-          data = Qs.stringify(data)
-          exportBlob(
-            `/api/blade-household/household/export-household?${this.website.tokenHeader}=${getToken()}&` + data
-          ).then(res => {
-            downloadXls(res.data, `住户数据表${dateNow()}.xlsx`)
-            NProgress.done()
-          })
-        })
-      },
-      handleTemplate() {
-        exportBlob(`/api/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
-          downloadXls(res.data, "住户数据模板.xlsx")
-        })
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetatils(this.form.id).then(res => {
-            this.form = res.data.data
+        },
+        searchChange (params, done) {
+            this.query = params
+            this.page.currentPage = 1
+            this.onLoad(this.page, params)
             done()
-          })
-        }
-        this.initFlag = true
-      },
-      currentChange(currentPage) {
-        this.page.currentPage = currentPage
-      },
-      sizeChange(pageSize) {
-        this.page.pageSize = pageSize
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query)
-      },
-
-      onLoad(page, params = {}) {
-        // this.query.parentId = 100
-        this.loading = true
-        getlabelStatistics(Object.assign(params, this.query)).then(res => {
-          const data = res.data.data
-          let list = data[0].children
-          this.labelCountList = list
-          this.$nextTick(() => {
-            this.setEchartsOption(list)
-          })
-        })
-        getKeynotePersonnelPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = {
-            ...res.data.data,
-            records: res.data.data.records.map(item => {
-              return {
-                ...item,
-                'phoneNumberflag': false,
-                'idCardflag': false
-              }
-            })
-          }
-          this.page.total = data.total
-          this.data = data.records
-          this.loading = false
-          this.selectionClear()
-        })
-      },
-
-      showStringDispose(row, type) {
-        row[type] = !row[type]
-      },
-
-      getLabelCount() {
-        getTreeList().then(res => {
-          const data = res.data.data
-          let list = data[0].children
-          this.labelCountList = list
-          this.$nextTick(() => {
-            this.setEchartsOption(list)
-          })
-        })
-      },
-
-      setEchartsOption(data) {
-        let option = {
-          tooltip: {
-            trigger: 'item',
-            confine: true
-          },
-          legend: {
-            orient: 'vertical',
-            right: 20,
-            bottom: 0,
-            padding: [30, 0],
-            formatter: function(name) {
-              return name.length > 6 ? name.substr(0, 6) + '...' : name
+        },
+        selectionChange (list) {
+            this.selectionList = list
+        },
+        selectionClear () {
+            this.selectionList = []
+            // this.$refs.crud.toggleSelection();
+        },
+        handleDelete () {
+            if (this.selectionList.length === 0) {
+                this.$message.warning("请选择至少一条数据")
+                return
             }
-          },
-          labelLine: {
-            length: 15,
-            length2: 0,
-            maxSurfaceAngle: 80
-          },
-          series: [{
-            type: 'pie',
-            center: ['26%', '50%'],
-            radius: '60%', //修改大小
-            data: [],
-            label: {
-              show: false
-            },
-            emphasis: {
-              itemStyle: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
-          }]
-        }
-        let myEchart = document.getElementsByClassName('echarts-item') //获取类名
-        for (let i = 0, ii = data.length; i < ii; i++) {
-          let myCharts = echarts.init(myEchart[i])
-          // option.title.text = data[i].name;
-          let series = []
-          for (let k = 0, kk = data[i].children.length; k < kk; k++) {
-            series.push({
-              value: data[i].children[k].count,
-              name: data[i].children[k].name,
-              id: data[i].children[k].id,
+            this.$confirm("确定将选择数据删除?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
             })
-          }
+                .then(() => {
+                    return remove(this.ids)
+                })
+                .then(() => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!"
+                    })
+                    this.$refs.crud.toggleSelection()
+                })
+        },
+        handleImport () {
+            this.excelBox = true
+        },
+        uploadAfter (res, done, loading, column) {
+            this.excelBox = false
+            this.refreshChange()
+            done()
+        },
+        handleExport () {
+            this.$confirm("是否导出住户数据?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                NProgress.start()
+                var data = {
+                    ...this.query
+                }
+                data = Qs.stringify(data)
+                exportBlob(
+                    `/api/blade-household/household/export-household?${this.website.tokenHeader}=${getToken()}&` + data
+                ).then(res => {
+                    downloadXls(res.data, `住户数据表${dateNow()}.xlsx`)
+                    NProgress.done()
+                })
+            })
+        },
+        handleTemplate () {
+            exportBlob(`/api/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
+                downloadXls(res.data, "住户数据模板.xlsx")
+            })
+        },
+        beforeOpen (done, type) {
+            if (["edit", "view"].includes(type)) {
+                getDetatils(this.form.id).then(res => {
+                    this.form = res.data.data
+                    done()
+                })
+            }
+            this.initFlag = true
+        },
+        currentChange (currentPage) {
+            this.page.currentPage = currentPage
+        },
+        sizeChange (pageSize) {
+            this.page.pageSize = pageSize
+        },
+        refreshChange () {
+            this.onLoad(this.page, this.query)
+        },
 
-          option.legend.type = series.length > 4 ? "scroll" : "plain"
-          option.series[0].data = series
-          option && myCharts.setOption(option)
-          // myCharts.on('click', (params) => {
-          //     console.log(params)
-          //     this.query.labelId = params.data.id
-          //     this.onLoad(this.page, this.query)
-          // })
+        onLoad (page, params = {}) {
+            // this.query.parentId = 100
+            this.loading = true
+            getlabelStatistics(Object.assign(params, this.query)).then(res => {
+                const data = res.data.data
+                let list = data[0].children
+                this.labelCountList = list
+                this.$nextTick(() => {
+                    this.setEchartsOption(list)
+                })
+            })
+            getKeynotePersonnelPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+                const data = {
+                    ...res.data.data,
+                    records: res.data.data.records.map(item => {
+                        return {
+                            ...item,
+                            'phoneNumberflag': false,
+                            'idCardflag': false
+                        }
+                    })
+                }
+                this.page.total = data.total
+                this.data = data.records
+                this.loading = false
+                this.selectionClear()
+            })
+        },
+
+        showStringDispose (row, type) {
+            row[type] = !row[type]
+        },
+
+        getLabelCount () {
+            getTreeList().then(res => {
+                const data = res.data.data
+                let list = data[0].children
+                this.labelCountList = list
+                this.$nextTick(() => {
+                    this.setEchartsOption(list)
+                })
+            })
+        },
+
+        setEchartsOption (data) {
+            let option = {
+                tooltip: {
+                    trigger: 'item',
+                    confine: true
+                },
+                legend: {
+                    orient: 'vertical',
+                    right: 40,
+                    bottom: 0,
+                    padding: [30, 0],
+                    formatter: function (name) {
+                        return name.length > 6 ? name.substr(0, 6) + '...' : name
+                    }
+                },
+                labelLine: {
+                    length: 15,
+                    length2: 0,
+                    maxSurfaceAngle: 80
+                },
+                series: [{
+                    type: 'pie',
+                    center: ['36%', '50%'],
+                    radius: '60%', //修改大小
+                    data: [],
+                    label: {
+                        show: false
+                    },
+                    emphasis: {
+                        itemStyle: {
+                            shadowBlur: 10,
+                            shadowOffsetX: 0,
+                            shadowColor: 'rgba(0, 0, 0, 0.5)'
+                        }
+                    }
+                }]
+            }
+            let myEchart = document.getElementsByClassName('echarts-item') //获取类名
+            for (let i = 0, ii = data.length; i < ii; i++) {
+                let myCharts = echarts.init(myEchart[i])
+                // option.title.text = data[i].name;
+                let series = []
+                for (let k = 0, kk = data[i].children.length; k < kk; k++) {
+                    series.push({
+                        value: data[i].children[k].count,
+                        name: data[i].children[k].name,
+                        id: data[i].children[k].id,
+                    })
+                }
+
+                option.legend.type = series.length > 4 ? "scroll" : "plain"
+                option.series[0].data = series
+                option && myCharts.setOption(option)
+                // myCharts.on('click', (params) => {
+                //     console.log(params)
+                //     this.query.labelId = params.data.id
+                //     this.onLoad(this.page, this.query)
+                // })
+            }
+
+
         }
-
-
-      }
     }
-  }
+}
 </script>
 
 <style lang="scss" scoped>
-  .grid-container2 {
+.grid-container2 {
     /* display: grid;
     grid-template-columns: auto auto auto auto;
     grid-gap: 10px; */
     display: flex;
     flex-wrap: wrap;
     padding-bottom: 20px;
-  }
+}
 
-  .grid-item {
+.grid-item {
     padding: 8px 14px;
     border: 1px solid #dcdfe6;
     margin-right: 10px;
     margin-bottom: 10px;
     border-radius: 20px;
-  }
+}
 
-  .grid-item:hover {
+.grid-item:hover {
     background-color: #e8f4ff;
     color: #017BFC;
     cursor: pointer;
-  }
+}
 
-  .el-scrollbar {
+.el-scrollbar {
     height: 100%;
-  }
+}
 
-  .box .el-scrollbar__wrap {
+.box .el-scrollbar__wrap {
     overflow: scroll;
-  }
+}
 
-  :deep(.avue-form__menu--center) {
+:deep(.avue-form__menu--center) {
     text-align: left;
-  }
+}
 
-  :deep(.avue-form__menu--center .el-button) {
+:deep(.avue-form__menu--center .el-button) {
     margin: 0 5px 0 0;
-  }
+}
 </style>
\ No newline at end of file

--
Gitblit v1.9.3