From 4abff19fb4c63cf973e2d09ff3626cd4d68da515 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Wed, 24 Jan 2024 15:50:57 +0800
Subject: [PATCH] 居民监管、住房监管样式修改

---
 src/views/propertySupervision/houseHoldSupervision.vue | 1596 ++++++++++++++++++++++++++++++----------------------------
 1 files changed, 821 insertions(+), 775 deletions(-)

diff --git a/src/views/propertySupervision/houseHoldSupervision.vue b/src/views/propertySupervision/houseHoldSupervision.vue
index 0d7e7e8..8465b7a 100644
--- a/src/views/propertySupervision/houseHoldSupervision.vue
+++ b/src/views/propertySupervision/houseHoldSupervision.vue
@@ -1,20 +1,12 @@
 <template>
   <el-row>
     <el-col :span="24">
-
-
-
-      <basic-container>
-
-
-
-
-        <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"
+      <basic-container class="cur-house-hold-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"
@@ -24,11 +16,11 @@
               @click="manageLabel(row)">标签
             </el-button>
           </template> -->
-          
 
-          <template  slot="menuLeft">
-            <div  class="echarts-wrap">
-                <div  class="echarts-item"   id="echarts"></div> 
+          <template slot="menuLeft">
+            <div class="echarts-wrap-box">
+              <div class="echarts-item-box" id="echarts"></div>
+              <div class="echarts-item-box" id="bar-echarts"></div>
             </div>
           </template>
 
@@ -100,804 +92,858 @@
 </template>
 
 <script>
-  import {
-    getList,
-    remove,
-    add,
-    update,
-    getDetatil,
-    getDetatils
-  } from "@/api/userHouse/list/house.js"
-  import {
-    removeHouseholdLabel,
-    saveOrUpdateHouseholdLabel
-  } from "@/api/userHouse/list/userHouseList.js"
-  import {
-    getLabelList,
-  } from '@/api/label/label'
-  import {
-    exportBlob
-  } from "@/api/common"
-  import {
-    mapGetters
-  } from "vuex"
-  import website from '@/config/website'
-  import {
-    getToken
-  } from '@/util/auth'
-  import {
-    downloadXls
-  } from "@/util/util"
-  import {
-    dateNow
-  } from "@/util/date"
-  import NProgress from 'nprogress'
-  import 'nprogress/nprogress.css'
-  import func from "@/util/func"
-  // import householdManager from "./components/householdManager"
-  import Qs from "qs"
-  import * as echarts from 'echarts';
-  import {
-    getTreeList
+import {
+  getList,
+  remove,
+  add,
+  update,
+  getDetatil,
+  getDetatils
+} from "@/api/userHouse/list/house.js"
+import {
+  removeHouseholdLabel,
+  saveOrUpdateHouseholdLabel
+} from "@/api/userHouse/list/userHouseList.js"
+import {
+  getLabelList,
+} from '@/api/label/label'
+import {
+  exportBlob
+} from "@/api/common"
+import {
+  mapGetters
+} from "vuex"
+import website from '@/config/website'
+import {
+  getToken
+} from '@/util/auth'
+import {
+  downloadXls
+} from "@/util/util"
+import {
+  dateNow
+} from "@/util/date"
+import NProgress from 'nprogress'
+import 'nprogress/nprogress.css'
+import func from "@/util/func"
+// import householdManager from "./components/householdManager"
+import Qs from "qs"
+import * as echarts from 'echarts';
+import {
+  getTreeList
 } from '@/api/label/label'
 
-  export default {
-    components: {
-      // householdManager
-    },
-    data() {
+export default {
+  components: {
+    // householdManager
+  },
+  data() {
 
-      //手机号格式校验
-      let validatorPhone = function(rule, value, callback) {
-        if (value) {
-          if (!/^1[3456789]\d{9}$/.test(value)) {
-            callback(new Error('手机号格式有误!'))
-          } else {
-            callback()
-          }
+    //手机号格式校验
+    let validatorPhone = function (rule, value, callback) {
+      if (value) {
+        if (!/^1[3456789]\d{9}$/.test(value)) {
+          callback(new Error('手机号格式有误!'))
+        } else {
+          callback()
         }
-        callback()
       }
+      callback()
+    }
 
-      return {
-        labelData: [],
-        labelForm: {},
-        userHouseLabelVOList: [],
-        currentLabel: {},
-        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"
-            }]
+    return {
+      labelData: [],
+      labelForm: {},
+      userHouseLabelVOList: [],
+      currentLabel: {},
+      labelOption: {
+        submitBtn: false,
+        emptyBtn: false,
+        column: [{
+          label: '级别',
+          prop: 'color',
+          type: 'radio',
+          button: true,
+          row: true,
+          dicData: [{
+            label: '撤销',
+            value: '#EBEDF0'
           }, {
-            row: true,
-            label: '备注',
-            prop: 'remark',
-            type: 'input'
+            label: '绿',
+            value: '#30D17C'
+          }, {
+            label: '黄',
+            value: '#FFB42B'
+          }, {
+            label: '红',
+            value: '#EA1F1F'
+          }],
+          rules: [{
+            required: true,
+            message: "请选择",
+            trigger: "blur"
+          }]
+        }, {
+          row: true,
+          label: '备注',
+          prop: 'remark',
+          type: 'input'
+        }]
+      },
+      editLabelFlge: false,
+      labelFlag: false,
+      householdManagerVisible: false,
+      form: {},
+      search: {},
+      excelBox: false,
+      selectionList: [],
+      query: {},
+      loading: true,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      option: {
+        labelWidth: 120,
+        searchLabelWidth: 96,
+        searchShow: true,
+        searchMenuSpan: 3,
+        menuWidth: 350,
+        menu: false,
+        height: 'auto',
+        calcHeight: 80,
+        tip: false,
+        border: true,
+        index: true,
+        selection: true,
+        addBtn: false,
+        viewBtn: true,
+        dialogType: 'drawer',
+        dialogClickModal: false,
+        column: [{
+          label: "房屋编号",
+          prop: "houseCode",
+          width: 180,
+          hide: true,
+          display: false
+        },
+        // {
+        //   width: 156,
+        //   overHidden: true,
+        //   label: "地址",
+        //   prop: "address",
+        //   display: false,
+        // },
+        {
+          // hide: true,
+          width: 220,
+          overHidden: true,
+          label: '地址',
+          parent: false,
+          prop: "houseName",
+          searchSpan: 4,
+          display: false,
+          search: true,
+        },
+        {
+          hide: true,
+          parent: false,
+          label: "小区名称",
+          prop: "districtCode",
+          type: 'tree',
+          dicUrl: `/api/blade-district/district/getDistrictTree`,
+          props: {
+            label: "name",
+            value: "id"
+          },
+          defaultExpandedKeys: ["361102003"],
+          span: 12,
+          width: 220,
+          overHidden: true,
+        },
+
+        {
+          width: 220,
+          overHidden: true,
+          label: '小区名称',
+          parent: false,
+          prop: "districtName",
+          searchSpan: 4,
+          display: false,
+          search: true,
+        },
+
+        {
+          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,
+          rules: [{
+            required: true,
+            message: "请选择所属社区",
+            trigger: "blur",
+          }],
+        },
+
+        {
+          hide: true,
+          parent: false,
+          label: "所属社区",
+          prop: "neiCode",
+          search: false,
+          type: "tree",
+          dicUrl: "/api/blade-system/region/tree",
+          props: {
+            label: "name",
+            value: "id",
+          },
+          cascader: ["gridId"],
+          rules: [{
+            required: true,
+            message: "请选择所属社区",
+            trigger: "blur",
+          },],
+        },
+
+        {
+          width: 110,
+          overHidden: true,
+          label: "所属网格",
+          addDisplay: false,
+          editDisplay: false,
+          viewDisplay: false,
+          prop: "gridName",
+          rules: [{
+            required: true,
+            message: "请选择所属网格",
+            trigger: "blur",
+          }],
+        },
+
+        {
+          hide: true,
+          label: "所属网格",
+          prop: "gridId",
+          type: "tree",
+          cell: true,
+          props: {
+            label: "gridName",
+            value: "id",
+          },
+          dicUrl: "/api/blade-grid/grid/getGridList?communityCode={{neiCode}}",
+          rules: [{
+            required: true,
+            message: "请选择所属网格",
+            trigger: "blur",
+          },],
+        },
+
+        {
+          label: "房屋照片",
+          prop: "imageUrls",
+          width: 110,
+          type: "upload",
+          listType: "picture-card",
+          dataType: "string",
+          multiple: true,
+          action: "/api/blade-resource/oss/endpoint/put-file",
+          propsHttp: {
+            res: "data",
+            name: 'name',
+            url: "link",
+          },
+          span: 24,
+        },
+
+
+        {
+          width: 120,
+          label: "电话",
+          prop: "phone",
+          slot: true,
+          rules: [{
+            validator: validatorPhone,
+            trigger: 'blur'
+          }],
+        },
+
+        {
+          label: "幢",
+          prop: "building",
+        },
+        {
+          label: "单元",
+          prop: "unit",
+        },
+        {
+          label: "室",
+          prop: "room",
+        },
+        {
+          label: "楼层",
+          prop: "floor",
+          type: "number",
+          rules: [{
+            required: true,
+            message: "请输入楼层",
+            trigger: "blur",
+          },],
+        },
+        {
+          label: "面积",
+          prop: "area",
+          type: "number",
+        },
+        {
+          label: "物业费",
+          prop: "propertyPrice",
+          type: "number",
+        },
+        {
+          label: "服务到期",
+          prop: "serviceDue",
+          type: "datetime",
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd",
+        },
+        {
+          width: 210,
+          overHidden: true,
+          label: "标签",
+          prop: "userHouseLabelVOList",
+          display: false
+        },
+        ]
+      },
+      data: [],
+      excelForm: {},
+      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"
           }]
         },
-        editLabelFlge: false,
-        labelFlag: false,
-        householdManagerVisible: false,
-        form: {},
-        search: {},
-        excelBox: false,
-        selectionList: [],
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        option: {
-          labelWidth: 120,
-          searchLabelWidth: 96,
-          searchShow: true,
-          searchMenuSpan: 3,
-          menuWidth: 350,
-          menu: false,
-          height: 'auto',
-          calcHeight: 80,
-          tip: false,
-          border: true,
-          index: true,
-          selection: true,
-          addBtn: false,
-          viewBtn: true,
-          dialogType: 'drawer',
-          dialogClickModal: false,
-          column: [{
-              label: "房屋编号",
-              prop: "houseCode",
-              width: 180,
-              hide: true,
-              display: false
-            },
-            // {
-            //   width: 156,
-            //   overHidden: true,
-            //   label: "地址",
-            //   prop: "address",
-            //   display: false,
-            // },
-            {
-              // hide: true,
-              width: 220,
-              overHidden: true,
-              label: '地址',
-              parent: false,
-              prop: "houseName",
-              searchSpan: 4,
-              display: false,
-              search: true,
-            },
-            {
-              hide: true,
-              parent: false,
-              label: "小区名称",
-              prop: "districtCode",
-              type: 'tree',
-              dicUrl: `/api/blade-district/district/getDistrictTree`,
-              props: {
-                label: "name",
-                value: "id"
-              },
-              defaultExpandedKeys: ["361102003"],
-              span: 12,
-              width: 220,
-              overHidden: true,
-            },
-
-            {
-              width: 220,
-              overHidden: true,
-              label: '小区名称',
-              parent: false,
-              prop: "districtName",
-              searchSpan: 4,
-              display: false,
-              search: true,
-            },
-
-            {
-              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,
-              rules: [{
-                required: true,
-                message: "请选择所属社区",
-                trigger: "blur",
-              }],
-            },
-
-            {
-              hide: true,
-              parent: false,
-              label: "所属社区",
-              prop: "neiCode",
-              search: false,
-              type: "tree",
-              dicUrl: "/api/blade-system/region/tree",
-              props: {
-                label: "name",
-                value: "id",
-              },
-              cascader: ["gridId"],
-              rules: [{
-                required: true,
-                message: "请选择所属社区",
-                trigger: "blur",
-              }, ],
-            },
-
-            {
-              width: 110,
-              overHidden: true,
-              label: "所属网格",
-              addDisplay: false,
-              editDisplay: false,
-              viewDisplay: false,
-              prop: "gridName",
-              rules: [{
-                required: true,
-                message: "请选择所属网格",
-                trigger: "blur",
-              }],
-            },
-
-            {
-              hide: true,
-              label: "所属网格",
-              prop: "gridId",
-              type: "tree",
-              cell: true,
-              props: {
-                label: "gridName",
-                value: "id",
-              },
-              dicUrl: "/api/blade-grid/grid/getGridList?communityCode={{neiCode}}",
-              rules: [{
-                required: true,
-                message: "请选择所属网格",
-                trigger: "blur",
-              }, ],
-            },
-
-            {
-              label: "房屋照片",
-              prop: "imageUrls",
-              width: 110,
-              type: "upload",
-              listType: "picture-card",
-              dataType: "string",
-              multiple: true,
-              action: "/api/blade-resource/oss/endpoint/put-file",
-              propsHttp: {
-                res: "data",
-                name: 'name',
-                url: "link",
-              },
-              span: 24,
-            },
-
-
-            {
-              width: 120,
-              label: "电话",
-              prop: "phone",
-              slot: true,
-              rules: [{
-                validator: validatorPhone,
-                trigger: 'blur'
-              }],
-            },
-
-            {
-              label: "幢",
-              prop: "building",
-            },
-            {
-              label: "单元",
-              prop: "unit",
-            },
-            {
-              label: "室",
-              prop: "room",
-            },
-            {
-              label: "楼层",
-              prop: "floor",
-              type: "number",
-              rules: [{
-                required: true,
-                message: "请输入楼层",
-                trigger: "blur",
-              }, ],
-            },
-            {
-              label: "面积",
-              prop: "area",
-              type: "number",
-            },
-            {
-              label: "物业费",
-              prop: "propertyPrice",
-              type: "number",
-            },
-            {
-              label: "服务到期",
-              prop: "serviceDue",
-              type: "datetime",
-              format: "yyyy-MM-dd",
-              valueFormat: "yyyy-MM-dd",
-            },
-            {
-              width: 210,
-              overHidden: true,
-              label: "标签",
-              prop: "userHouseLabelVOList",
-              display: false
-            },
-          ]
-        },
-        data: [],
-        excelForm: {},
-        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,
-            }
-          ],
-          labelCountList:[]
+        {
+          label: '模板下载',
+          prop: 'excelTemplate',
+          formslot: true,
+          span: 24,
         }
+        ],
+        labelCountList: []
+      }
+    }
+  },
+  watch: {},
+  computed: {
+    ...mapGetters(["userInfo", "permission"]),
+    permissionList() {
+      return {
+        addBtn: this.vaildData(this.permission.house_add, true),
+        viewBtn: this.vaildData(this.permission.house_view, true),
+        delBtn: this.vaildData(this.permission.house_delete, true),
+        editBtn: this.vaildData(this.permission.house_edit, true)
       }
     },
-    watch: {},
-    computed: {
-      ...mapGetters(["userInfo", "permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.house_add, true),
-          viewBtn: this.vaildData(this.permission.house_view, true),
-          delBtn: this.vaildData(this.permission.house_delete, true),
-          editBtn: this.vaildData(this.permission.house_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()
-    },
-    methods: {
-
-      onsubmit() {
-        if (this.labelForm.color === '#EBEDF0') {
-          let params = {
-            householdId: this.currentRow.id,
-            labelId: this.currentLabel.id
-          }
-          removeHouseholdLabel(params).then(res => {
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            })
-            this.editLabelFlge = false
-            this.manageLabel(this.currentRow)
-            this.loading = false
-          })
+    textDispose() {
+      return (row, flag, type) => {
+        if (row[flag] || row[type] == null) {
+          return row[type]
         } else {
-          this.labelForm.houseCode = this.currentRow.houseCode
-          this.labelForm.householdId = this.currentRow.id
-          this.labelForm.labelId = this.currentLabel.id
-          this.labelForm.lableType = 2
-          saveOrUpdateHouseholdLabel(this.labelForm).then(res => {
-            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: 1001
-        }
-        // 查询标签
-        getLabelList(Object.assign(params)).then(res => {
-          const data = res.data.data
-          // 查询详情
-          getDetatils({
-            houseCode: item.houseCode
-          }).then(res => {
-            if (res.data.data) {
-              this.userHouseLabelVOList = res.data.data.userHouseLabelVOList
-              this.loading = false
-              // 将细类放到一起
-              data.forEach(f => {
-                if (this.userHouseLabelVOList.length > 0) {
-                  this.userHouseLabelVOList.forEach(h => {
-                    if (Number(f.id) == h.labelId) {
-                      f['color'] = h.color
-                      f['remark'] = h.remark
-                    }
-                  })
-                }
-              })
-            }
-            this.labelData = data
-            this.loading = false
-          })
-        })
-      },
-      handleHouseholdManager(row) {
-        var that = this
-        this.householdManagerVisible = true
-        this.$nextTick(() => {
-          that.$refs.householdManager.init(row)
-        })
-      },
-      rowSave(row, done, loading) {
-        if (row.imageUrls.length > 0) {
-          var urls = []
-          var split = row.imageUrls.split(",")
-          split.forEach(url => {
-            var names = url.split("jczz/")
-            urls.push(names[1])
-          })
-          row.imageUrls = urls.join(",")
-        }
-
-        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) {
-        if (row.imageUrls.length > 0) {
-          var urls = []
-          var split = row.imageUrls.split(",")
-          split.forEach(url => {
-            var names = url.split("jczz/")
-            urls.push(names[1])
-          })
-          row.imageUrls = urls.join(",")
-        }
-
-        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) {
-        window.console.log(column)
-        this.excelBox = false
-        this.refreshChange()
-        done()
-      },
-      handleExport() {
-        this.$confirm("是否导出房屋数据?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          NProgress.start()
-          var data = {
-            ...this.query
+          if (type == 'idCard') {
+            return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
+          } else {
+            return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
           }
-          data = Qs.stringify(data)
-          exportBlob(
-            `/api/blade-house/house/export-house?${this.website.tokenHeader}=${getToken()}&` + data
-          ).then(res => {
-            downloadXls(res.data, `房屋数据表${dateNow()}.xlsx`)
-            NProgress.done()
+        }
+      }
+    },
+
+    labelDispose() {
+      return (list) => {
+        return list.map(item => item.labelName).join(',')
+      }
+    }
+  },
+  mounted() {
+    this.getLabelCount()
+    this.setBarEchartsOption();
+  },
+  methods: {
+
+    onsubmit() {
+      if (this.labelForm.color === '#EBEDF0') {
+        let params = {
+          householdId: this.currentRow.id,
+          labelId: this.currentLabel.id
+        }
+        removeHouseholdLabel(params).then(res => {
+          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 = 2
+        saveOrUpdateHouseholdLabel(this.labelForm).then(res => {
+          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: 1001
+      }
+      // 查询标签
+      getLabelList(Object.assign(params)).then(res => {
+        const data = res.data.data
+        // 查询详情
+        getDetatils({
+          houseCode: item.houseCode
+        }).then(res => {
+          if (res.data.data) {
+            this.userHouseLabelVOList = res.data.data.userHouseLabelVOList
+            this.loading = false
+            // 将细类放到一起
+            data.forEach(f => {
+              if (this.userHouseLabelVOList.length > 0) {
+                this.userHouseLabelVOList.forEach(h => {
+                  if (Number(f.id) == h.labelId) {
+                    f['color'] = h.color
+                    f['remark'] = h.remark
+                  }
+                })
+              }
+            })
+          }
+          this.labelData = data
+          this.loading = false
+        })
+      })
+    },
+    handleHouseholdManager(row) {
+      var that = this
+      this.householdManagerVisible = true
+      this.$nextTick(() => {
+        that.$refs.householdManager.init(row)
+      })
+    },
+    rowSave(row, done, loading) {
+      if (row.imageUrls.length > 0) {
+        var urls = []
+        var split = row.imageUrls.split(",")
+        split.forEach(url => {
+          var names = url.split("jczz/")
+          urls.push(names[1])
+        })
+        row.imageUrls = urls.join(",")
+      }
+
+      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) {
+      if (row.imageUrls.length > 0) {
+        var urls = []
+        var split = row.imageUrls.split(",")
+        split.forEach(url => {
+          var names = url.split("jczz/")
+          urls.push(names[1])
+        })
+        row.imageUrls = urls.join(",")
+      }
+
+      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: "操作成功!"
           })
         })
-      },
-      handleTemplate() {
-        exportBlob(`/api/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
-          downloadXls(res.data, "房屋数据模板.xlsx")
+    },
+    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)
         })
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetatil({
-            id: this.form.id
-          }).then(res => {
-            this.form = res.data.data
+        .then(() => {
+          this.onLoad(this.page)
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          })
+          this.$refs.crud.toggleSelection()
+        })
+    },
+    handleImport() {
+      this.excelBox = true
+    },
+    uploadAfter(res, done, loading, column) {
+      window.console.log(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-house/house/export-house?${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)) {
+        getDetatil({
+          id: this.form.id
+        }).then(res => {
+          this.form = res.data.data
 
-            if (this.form.imageUrls) {
-              if (this.form.imageUrls.length > 0) {
+          if (this.form.imageUrls) {
+            if (this.form.imageUrls.length > 0) {
+              var urls = []
+              var names = this.form.imageUrls.split(",")
+              names.forEach(name => {
+                urls.push(website.minioUrl + name)
+              })
+              this.form.imageUrls = urls.join(",")
+            }
+          }
+        })
+      }
+      this.initFlag = true
+      done()
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query)
+    },
+    onLoad(page, params = {}) {
+      this.loading = true
+      this.query.parentId = 1001
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        const data = {
+          ...res.data.data,
+          records: res.data.data.records.map(item => {
+            if (item.imageUrls) {
+              if (item.imageUrls.length > 0) {
                 var urls = []
-                var names = this.form.imageUrls.split(",")
+                var names = item.imageUrls.split(",")
                 names.forEach(name => {
                   urls.push(website.minioUrl + name)
                 })
-                this.form.imageUrls = urls.join(",")
+                item.imageUrls = urls.join(",")
               }
+            }
+
+            return {
+              ...item,
+              'phoneflag': false,
             }
           })
         }
-        this.initFlag = true
-        done()
-      },
-      currentChange(currentPage) {
-        this.page.currentPage = currentPage
-      },
-      sizeChange(pageSize) {
-        this.page.pageSize = pageSize
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query)
-      },
-      onLoad(page, params = {}) {
-        this.loading = true
-        this.query.parentId = 1001
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = {
-            ...res.data.data,
-            records: res.data.data.records.map(item => {
-              if (item.imageUrls) {
-                if (item.imageUrls.length > 0) {
-                  var urls = []
-                  var names = item.imageUrls.split(",")
-                  names.forEach(name => {
-                    urls.push(website.minioUrl + name)
-                  })
-                  item.imageUrls = urls.join(",")
-                }
-              }
+        this.page.total = data.total
+        this.data = data.records
+        this.loading = false
+        this.selectionClear()
+      })
+    },
+    showStringDispose(row, type) {
+      row[type] = !row[type]
+    },
 
-              return {
-                ...item,
-                'phoneflag': false,
-              }
-            })
-          }
-          this.page.total = data.total
-          this.data = data.records
-          this.loading = false
-          this.selectionClear()
+    getLabelCount() {
+      getTreeList().then(res => {
+        const data = res.data.data
+        let list = data[1].children;
+        this.labelCountList = list;
+        this.$nextTick(() => {
+          this.setEchartsOption(list)
         })
-      },
-      showStringDispose(row, type) {
-        row[type] = !row[type]
-      },
-      
-      getLabelCount(){
-        getTreeList().then(res => {
-            const data = res.data.data
-            let list = data[1].children;
-            this.labelCountList = list;
-            this.$nextTick(()=>{
-              this.setEchartsOption(list)
-            })
-        })
-      },
+      })
+    },
 
-      setEchartsOption(data){
-        let  option = {
-                  // title: {
-                  //     text:"房屋",
-                  //     left: 'center',
-                  //     top:20,
-                  // },
-                  tooltip: {
-                      trigger: 'item'
-                  },
-                 legend: {
-                  orient: 'horizontal',
-          left: 'right',
+    setEchartsOption(data) {
+      let option = {
+        // title: {
+        //     text:"房屋",
+        //     left: 'center',
+        //     top:20,
+        // },
+        tooltip: {
+          trigger: 'item'
+        },
+        legend: {
+          orient: 'horizontal',
+          left: 'center',
           top: 'bottom',
-                  },
-      //             labelLine: {
-      //   length: 15,
-      //   length2: 0,
-      //   maxSurfaceAngle: 80
-      // },
-                series: [
-                      {
-                    type: 'pie',
-                    radius: '50%',
-                    data: [],
-                    emphasis: {
-                      itemStyle: {
-                        shadowBlur: 10,
-                        shadowOffsetX: 0,
-                        shadowColor: 'rgba(0, 0, 0, 0.5)'
-                      }
-                   }
-                 }
-               ]
-           };
-          let myEchart = document.getElementById('echarts'); //获取类名
-          let myCharts =  echarts.init(myEchart);
-         for(let i = 0,ii = data.length;i<ii;i++){
-            option.series[0].data.push({
-              name:data[i].name,
-              value:data[i].count,
-              id:data[i].id
-            });
-            option && myCharts.setOption(option);
-            myCharts.on('click',(params)=>{
-                     console.log(params)
-                     this.query.labelId = params.data.id;
-                this.onLoad(this.page, this.query)     
-            })
-         }
-        
+        },
+        //             labelLine: {
+        //   length: 15,
+        //   length2: 0,
+        //   maxSurfaceAngle: 80
+        // },
+        series: [
+          {
+            type: 'pie',
+            center: '50%',
+            radius: '50%', //修改大小
+            data: [],
+            emphasis: {
+              itemStyle: {
+                shadowBlur: 10,
+                shadowOffsetX: 0,
+                shadowColor: 'rgba(0, 0, 0, 0.5)'
+              }
+            }
+          }
+        ]
+      };
+      let myEchart = document.getElementById('echarts'); //获取类名
+      let myCharts = echarts.init(myEchart);
+      for (let i = 0, ii = data.length; i < ii; i++) {
+        option.series[0].data.push({
+          name: data[i].name,
+          value: data[i].count,
+          id: data[i].id
+        });
+        option && myCharts.setOption(option);
+        myCharts.on('click', (params) => {
+          console.log(params)
+          this.query.labelId = params.data.id;
+          this.onLoad(this.page, this.query)
+        })
       }
 
+    },
+
+    setBarEchartsOption() {
+      var chartDom = document.getElementById('bar-echarts');
+      var myChart = echarts.init(chartDom);
+      var option;
+
+      option = {
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'shadow'
+          }
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: [
+          {
+            type: 'category',
+            data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+            axisTick: {
+              alignWithLabel: true
+            }
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value'
+          }
+        ],
+        series: [
+          {
+            name: 'Direct',
+            type: 'bar',
+            barWidth: '60%',
+            data: [10, 52, 200, 334, 390, 330, 220]
+          }
+        ]
+      };
+
+      option && myChart.setOption(option);
+
+
     }
+
+
   }
+}
 </script>
 
-<style>
-  .box {
-    height: 800px;
-  }
+<style lang="scss" scoped>
+.box {
+  height: 800px;
+}
 
-  .el-scrollbar {
-    height: 100%;
-  }
+.el-scrollbar {
+  height: 100%;
+}
 
-  .box .el-scrollbar__wrap {
-    overflow: scroll;
+.box .el-scrollbar__wrap {
+  overflow: scroll;
+}
+
+.echarts-wrap-box {
+  display: flex;
+  justify-content: space-between;
+  padding: 0;
+  margin-bottom: 20px;
+
+  .echarts-item-box {
+    width: 48%;
+    height: 300px;
+    border: 1px solid #999;
   }
-  .echarts-wrap{
-    display: flex;
-    padding:0 30px;
-    justify-content: center
-  }
-  .echarts-item{
-    width:100%;
-    height:300px;
-  }
+}
 </style>
\ No newline at end of file

--
Gitblit v1.9.3