From f8cf7b939922bf3290e5cfdf8a1b56043225c2c3 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 28 Feb 2024 11:29:04 +0800
Subject: [PATCH] 标签

---
 /dev/null                                             |  217 -------
 src/api/categoryLabel/category.js                     |   14 
 src/views/propertySupervision/residentSupervision.vue | 1603 +++++++++++++++++++++++++-------------------------
 3 files changed, 812 insertions(+), 1,022 deletions(-)

diff --git a/src/api/categoryLabel/category.js b/src/api/categoryLabel/category.js
index a320623..b85246d 100644
--- a/src/api/categoryLabel/category.js
+++ b/src/api/categoryLabel/category.js
@@ -32,13 +32,21 @@
   })
 }
 
-export const remove = (id) => {
+export const remove = (ids) => {
   return request({
     url: '/api/blade-category/category/remove',
     method: 'post',
     params: {
-      id,
+      ids
     }
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/blade-category/category/update',
+    method: 'post',
+    data: row
   })
 }
 
@@ -48,4 +56,4 @@
     method: 'post',
     data: row
   })
-}
+}
\ No newline at end of file
diff --git a/src/views/propertySupervision/residentSupervision.vue b/src/views/propertySupervision/residentSupervision.vue
index eb1c3b3..64a5b87 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>
-            </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 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>
+      </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,815 +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("身份证号格式有误!"))
-                        }
-                    } else {
-                        // 用计算出的验证码与最后一位身份证号码匹配,如果一致,说明通过,否则是无效的身份证号码
-                        if (idCardLast == idCardY[idCardMod]) {
-                            callback()
-                        } else {
-                            callback(new Error("身份证号格式有误!"))
-                        }
-                    }
-                } else {
-                    callback()
-                }
-            } else {
-                //alert("身份证格式不正确!");
+            // 如果等于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 {
+          //alert("身份证格式不正确!");
+          callback(new Error("身份证号格式有误!"))
         }
 
-        //手机号格式校验
-        let validatorPhone = function (rule, value, callback) {
-            if (value) {
-                if (!/^1[3456789]\d{9}$/.test(value)) {
-                    callback(new Error('手机号格式有误!'))
-                } else {
-                    callback()
-                }
-            }
+        callback()
+      }
+
+      //手机号格式校验
+      let validatorPhone = function(rule, value, callback) {
+        if (value) {
+          if (!/^1[3456789]\d{9}$/.test(value)) {
+            callback(new Error('手机号格式有误!'))
+          } else {
             callback()
+          }
         }
+        callback()
+      }
 
-        return {
-            labelData: [],
-            form: {},
-            search: {},
-            excelBox: false,
-            selectionList: [],
-            labelFlag: false,
-            editLabelFlge: false,
-            query: {},
-            loading: true,
-            page: {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0
+      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",
+              }],
             },
-            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",
-                        }],
-                    },
 
-                    {
-                        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
-                        },
-                        {
-                            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
-                    }
-                ]
+            {
+              width: 160,
+              display: true,
+              label: "身份证号",
+              prop: "idCard",
+              search: true,
+              searchSpan: 4,
+              slot: true,
+              rules: [{
+                validator: isCardId,
+                trigger: 'blur'
+              }],
             },
-            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"
+            {
+              width: 60,
+              label: "性别",
+              prop: "gender",
+              type: "select",
+              dicData: [{
+                  label: "男",
+                  value: 1
                 },
                 {
-                    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: 0
                 },
                 {
-                    label: '模板下载',
-                    prop: 'excelTemplate',
-                    formslot: true,
-                    span: 24,
+                  label: "未知",
+                  value: "3"
                 }
-                ]
+              ],
             },
-            currentLabel: {},
-            currentRow: {},
-            householdLabelList: [],
 
-            labelCountList: []
-        }
+            {
+              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: [],
+
+        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: "是",
+                  value: 1
+                }
+              ],
+              value: 0,
+              slot: true,
+              rules: [{
+                required: true,
+                message: "请选择是否覆盖",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: '模板下载',
+              prop: 'excelTemplate',
+              formslot: true,
+              span: 24,
+            }
+          ]
+        },
+        currentLabel: {},
+        currentRow: {},
+        householdLabelList: [],
+
+        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")
-                    }
-                }
-            }
-        },
-
-        labelDispose () {
-            return (list) => {
-                return list.map(item => item.labelName).join(',')
-            }
+      ...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")
+            }
+          }
+        }
+      },
+
+      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
-                                    }
-                                })
-                            }
-                        })
-                    })
-                    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(() => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!"
-                    })
-                })
-        },
-        searchReset () {
-            this.query = {}
-            this.treeDeptId = ''
+      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)
-        },
-        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"
+
+            this.$message({
+              type: "success",
+              message: "操作成功!"
             })
-                .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()
-                })
+            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: "操作成功!"
             })
-        },
-        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)
-        },
-
-        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
-                    }
-                },
-                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,
-                    })
-                }
-
-                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)
-                // })
-            }
-
-
+            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
+          })
+        })
+      },
+      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)
+      },
+      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
+            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
+            }
+          },
+          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,
+            })
+          }
+
+          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
diff --git a/src/views/userHouse/lable/categoryList.vue b/src/views/userHouse/lable/categoryList.vue
deleted file mode 100644
index d1ce22b..0000000
--- a/src/views/userHouse/lable/categoryList.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-<template>
-  <el-row>
-    <el-col :span="24">
-      <basicContainer>
-        <avue-crud ref="crud" :option="option" :before-open="beforeOpen" :before-close="beforeClose" :data="data"
-          @tree-load="treeLoad" @row-save="rowSave" @row-del="rowDel" @refresh-change="refreshChange"
-          @row-update="rowUpdate" @on-load="onLoad">
-
-          <template slot-scope="{row, size}" slot="menu">
-            <el-button :size="size" type="text" icon="el-icon-circle-plus-outline" @click="handleAdd(row)">新增子级
-            </el-button>
-          </template>
-
-        </avue-crud>
-      </basicContainer>
-    </el-col>
-
-  </el-row>
-</template>
-<script>
-  import {
-    getTreeList,
-    submit,
-    update,
-    remove
-  } from '@/api/categoryLabel/category'
-
-  export default {
-    data() {
-      return {
-        query: {
-          parentId: 0
-        },
-        data: [],
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        parentId: undefined,
-        option: {
-          labelWidth: 96,
-          searchLabelWidth: 96,
-          menuWidth: 240,
-          lazy: true,
-          rowKey: 'id',
-          defaultExpandAll: true,
-          column: [{
-            label: '名称',
-            prop: 'name'
-          }, {
-            label: 'ID',
-            prop: 'id',
-            display: false
-          }, {
-            label: '层级',
-            prop: 'level',
-            // display: false
-          }, {
-            label: '编码',
-            prop: 'categoryNo',
-            // display: false
-          }, {
-            label: '父级id',
-            prop: 'parentId',
-            type: "tree",
-            dicData: [],
-            hide: true,
-            addDisabled: false,
-            props: {
-              label: "name",
-              value: 'id'
-            },
-          }]
-        },
-        data1: [],
-        selectionList: [],
-      }
-    },
-
-    methods: {
-
-      refreshChange() {
-        this.onLoad()
-      },
-
-      beforeOpen(done, type) {
-        if (["add", "edit"].includes(type)) {
-          this.initData()
-        }
-        done()
-      },
-
-      beforeClose(done) {
-        this.parentId = ""
-        const column = this.findObject(this.option.column, "parentId")
-        column.value = ""
-        column.addDisabled = false
-        done()
-      },
-
-      initData() {
-        const column = this.findObject(this.option.column, "parentId")
-        column.dicData = this.data
-      },
-
-      selectionClear() {
-        this.selectionList = []
-      },
-
-      onLoad(page, params = {}) {
-        this.loading = true
-        getTreeList().then(res => {
-          const data = res.data.data
-          this.data = data
-          this.loading = false
-          this.selectionClear()
-        })
-      },
-
-      rowDel(row, index, done) {
-        console.log("*************")
-        this.$confirm("确定将选择数据删除?", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
-          .then(() => {
-            return remove(row.id)
-          })
-          .then(() => {
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            })
-            done(row)
-          })
-      },
-
-      rowSave(row, done) {
-        // row.parentId = this.parentId
-        row.categoryName = row.name
-        submit(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) {
-        const column = this.findObject(this.option.column, "parentId")
-        column.value = row.id
-        done(row)
-      },
-
-      handleAdd(row) {
-        const column = this.findObject(this.option.column, "parentId")
-        column.value = row.id
-        column.addDisabled = true
-        this.parentId = row.id
-        this.$refs.crud.rowAdd()
-      },
-
-      treeLoad(tree, treeNode, resolve) {
-        setTimeout(() => {
-          resolve([{
-            id: new Date().getTime(),
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1519 弄',
-            hasChildren: true
-          }])
-        }, 1000)
-      }
-    }
-  }
-</script>
-
-
-
-<style></style>
diff --git a/src/views/userHouse/lable/list.vue b/src/views/userHouse/lable/list.vue
deleted file mode 100644
index a8250b2..0000000
--- a/src/views/userHouse/lable/list.vue
+++ /dev/null
@@ -1,199 +0,0 @@
-<template>
-  <el-row>
-    <el-col :span="24">
-      <basicContainer>
-        <avue-crud ref="crud" :option="option" :before-open="beforeOpen" :before-close="beforeClose" :data="data"
-          @tree-load="treeLoad" @row-save="rowSave" @row-del="rowDel" @refresh-change="refreshChange"
-          @row-update="rowUpdate" @on-load="onLoad">
-
-          <template slot-scope="{row, size}" slot="menu">
-            <el-button :size="size" type="text" icon="el-icon-circle-plus-outline" @click="handleAdd(row)">新增子级
-            </el-button>
-          </template>
-
-        </avue-crud>
-      </basicContainer>
-    </el-col>
-
-  </el-row>
-</template>
-<script>
-  import {
-    getTreeList,
-    add,
-    update,
-    remove
-  } from '@/api/label/label'
-
-  export default {
-    data() {
-      return {
-        query: {
-          parentId: 0
-        },
-        data: [],
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        parentId: undefined,
-        option: {
-          labelWidth: 96,
-          searchLabelWidth: 96,
-          menuWidth: 240,
-
-          lazy: true,
-          rowKey: 'id',
-          // defaultExpandAll: true,
-          column: [{
-            label: '名称',
-            prop: 'name'
-          }, {
-            label: 'ID',
-            prop: 'id',
-            display: false
-          }, {
-            label: '排序',
-            prop: 'sort',
-          }, {
-            label: '父级id',
-            prop: 'parentId',
-            type: "tree",
-            dicData: [],
-            hide: true,
-            addDisabled: false,
-            props: {
-              label: "name",
-              value: 'id'
-            },
-          }]
-        },
-        data1: [],
-        selectionList: [],
-      }
-    },
-
-    methods: {
-
-      refreshChange() {
-        this.onLoad()
-      },
-
-      beforeOpen(done, type) {
-        if (["add", "edit"].includes(type)) {
-          this.initData()
-        }
-        done()
-      },
-
-      beforeClose(done) {
-        this.parentId = ""
-        const column = this.findObject(this.option.column, "parentId")
-        column.value = ""
-        column.addDisabled = false
-        done()
-      },
-
-      initData() {
-        const column = this.findObject(this.option.column, "parentId")
-        column.dicData = this.data
-      },
-
-      selectionClear() {
-        this.selectionList = []
-      },
-
-      onLoad(page, params = {}) {
-        this.loading = true
-        getTreeList().then(res => {
-          const data = res.data.data
-          this.data = data
-          this.loading = false
-          this.selectionClear()
-        })
-      },
-
-      rowDel(row, index, done) {
-        console.log("*************")
-        this.$confirm("确定将选择数据删除?", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
-          .then(() => {
-            return remove(row.id)
-          })
-          .then(() => {
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            })
-            done(row)
-          })
-      },
-
-      rowSave(row, done) {
-        row.parentId = this.parentId
-        row.labelName = row.name
-        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) {
-        const column = this.findObject(this.option.column, "parentId")
-        column.value = row.id
-        update(row).then(
-          () => {
-            this.onLoad(this.page)
-            this.$message({
-              type: "success",
-              message: "操作成功!",
-            })
-            done()
-          },
-          (error) => {
-            window.console.log(error)
-            loading()
-          }
-        )
-        done(row)
-      },
-
-      handleAdd(row) {
-        const column = this.findObject(this.option.column, "parentId")
-        column.value = row.id
-        column.addDisabled = true
-        this.parentId = row.id
-        this.$refs.crud.rowAdd()
-      },
-
-      treeLoad(tree, treeNode, resolve) {
-        setTimeout(() => {
-          resolve([{
-            id: new Date().getTime(),
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1519 弄',
-            hasChildren: true
-          }])
-        }, 1000)
-      }
-    }
-  }
-</script>
-
-
-
-<style></style>
diff --git a/src/views/userHouse/lable/statistics.vue b/src/views/userHouse/lable/statistics.vue
deleted file mode 100644
index 472914e..0000000
--- a/src/views/userHouse/lable/statistics.vue
+++ /dev/null
@@ -1,217 +0,0 @@
-<template>
-  <basic-container style="margin-bottom: 40px;">
-    <div class="current-page-box">
-      <div v-for="(item, index) in data" :key="index">
-        <div v-if="index == 0">
-          <!-- <box-title class="m10" :classVal="9" :title="item.name"></box-title> -->
-
-          <div v-for="(item1, childIndex) in item.children" :key="childIndex">
-            <div v-if="item1.name === '民政标签'">
-              <box-title class="m10" :classVal="9" :title="item1.name"></box-title>
-              <div v-for="(item2, index2) in item1.children" :key="index2">
-                <!-- <box-title class="m10" :classVal="9" :title="item2.name"></box-title> -->
-                <div class="m20 m-t-28 grid-content bg-purple-dark">
-                  <el-divider content-position="left">{{ item2.name }}</el-divider>
-                </div>
-
-                <div class="grid-container" v-if="item2.children">
-                  <div v-for="(item3, index3) in item2.children" :key="index3">
-                    <div>
-                      {{ item3.count }}
-                    </div>
-                    <div>
-                      {{ item3.name }}
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-
-
-
-            <div v-else>
-              <!--  <div class="m20 m-t-28 grid-content bg-purple-dark">
-                <el-divider content-position="left">{{ item1.name }}</el-divider>
-              </div> -->
-              <box-title class="m10" :classVal="9" :title="item1.name"></box-title>
-
-              <div class="grid-container" v-if="item1.children">
-                <div v-for="(item2, childChildIndex) in item1.children" :key="childChildIndex">
-                  <div>
-                    {{ item2.count }}
-                  </div>
-                  <div>
-                    {{ item2.name }}
-                  </div>
-                </div>
-              </div>
-            </div>
-
-          </div>
-        </div>
-      </div>
-
-      <div v-if="index == 1">
-        <box-title class="m10" :classVal="9" :title="item.name"></box-title>
-
-        <div class="grid-container">
-          <div v-for="(item1, childIndex) in item.children" :key="childIndex">
-            <div>
-              {{ item1.count }}
-            </div>
-            <div>
-              {{ item1.name }}
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <div v-if="index == 2">
-        <box-title class="m10" :classVal="9" :title="item.name"></box-title>
-
-        <div class="grid-container">
-          <div>
-            <div>
-              {{ item.count }}
-            </div>
-            <div>
-              {{ item.name }}
-            </div>
-          </div>
-        </div>
-      </div>
-
-    </div>
-    </div>
-  </basic-container>
-</template>
-<script>
-  import {
-    getTreeList,
-    add,
-    update,
-    remove
-  } from '@/api/label/label'
-
-  import boxTitle from '../components/boxTitle.vue'
-
-  export default {
-    data() {
-      return {
-        items: [],
-        query: {
-          parentId: 0
-        },
-        data: [],
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        option: {
-          span: 4,
-          data: []
-        },
-      }
-    },
-
-    components: {
-      boxTitle
-    },
-
-    mounted() {
-      this.onLoad()
-    },
-
-    methods: {
-      onLoad(page, params = {}) {
-        this.loading = true
-        getTreeList().then(res => {
-          const data = res.data.data
-          this.data = data
-          this.loading = false
-          // this.selectionClear();
-        })
-      },
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .m10 {
-    margin: 10px;
-  }
-
-  .m20 {
-    margin: 20px;
-  }
-
-  .m-t-28 {
-    margin-top: 28px;
-  }
-
-  .grid-container {
-    display: flex;
-    flex-wrap: wrap;
-    font-size: 15px;
-    color: #fff;
-  }
-
-  .grid-container>div {
-    margin: 18px;
-    padding: 10px 8px;
-    display: flex;
-    flex-direction: column;
-    width: calc(100% / 6 - 36px);
-    background-color: #429FFF;
-    text-align: center;
-    border-radius: 10px;
-    box-sizing: border-box;
-
-    &>div {
-      font-size: 14px;
-      line-height: 22px;
-      text-align: center;
-    }
-
-    &>div:first-child {
-      font-size: 18px;
-      font-weight: bold;
-    }
-  }
-
-  /* .el-row {
-    margin-bottom: 20px;
-
-    &:last-child {
-      margin-bottom: 0;
-    }
-  }
-
-  .el-col {
-    border-radius: 4px;
-  }
-
-  .bg-purple-dark {
-    background: #99a9bf;
-  }
-
-  .bg-purple {
-    background: #d3dce6;
-  }
-
-  .bg-purple-light {
-    background: #e5e9f2;
-  }
-
-  .grid-content {
-    border-radius: 4px;
-    min-height: 36px;
-  }
-
-  .row-bg {
-    padding: 10px 0;
-    background-color: #f9fafc;
-  } */
-</style>
\ No newline at end of file

--
Gitblit v1.9.3