From 9ab2b71cc64df0acda41728902beacd9e9c35792 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 10 Jan 2024 17:56:21 +0800
Subject: [PATCH] 重点人员管理

---
 src/views/publicSecurity/keynotePlaceManage.vue         | 1111 +++++++++++-----------
 src/api/userHouse/list/userHouseList.js                 |    2 
 src/views/propertySupervision/propertyCapitalManage.vue |  506 ++++++++++
 src/views/publicSecurity/keynotePersonnelManage.vue     |  209 ---
 src/views/publicSecurity/components/userHouseList.vue   | 1140 ++++++++++++++++++++++
 5 files changed, 2,238 insertions(+), 730 deletions(-)

diff --git a/src/api/userHouse/list/userHouseList.js b/src/api/userHouse/list/userHouseList.js
index 684c277..17d396c 100644
--- a/src/api/userHouse/list/userHouseList.js
+++ b/src/api/userHouse/list/userHouseList.js
@@ -88,7 +88,7 @@
 
 export const statisticalLabels = (current, size, params) => {
   return request({
-    url: '/api/blade-houseLabel/userHouseLabel/statisticalLabels',
+    url: '/api/blade-householdLabel/householdLabel/statisticalLabels',
     method: 'get',
     params: {
       ...params,
diff --git a/src/views/propertySupervision/propertyCapitalManage.vue b/src/views/propertySupervision/propertyCapitalManage.vue
new file mode 100644
index 0000000..fafdd55
--- /dev/null
+++ b/src/views/propertySupervision/propertyCapitalManage.vue
@@ -0,0 +1,506 @@
+<!-- 物业公司管理 -->
+<template>
+  <basic-container>
+    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
+      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
+      @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, index }" slot="menu">
+        <!-- <el-button :size="size" type="text" v-if="row.applyStatus === 4" @click="handleWork(row)">调整申请
+                </el-button> -->
+        <el-button :size="size" type="text" @click="goDetail(row)">查看申请
+        </el-button>
+        <!-- <el-button :size="size" type="text" @click="goDetail(row)">删 除
+        </el-button> -->
+      </template>
+      <!-- <template slot="menuLeft">
+         <el-button size="small" icon="el-icon-delete" plain v-if="permission.propertyCapitalApply_delete"
+          @click="handleDelete">删 除
+        </el-button>
+      </template> -->
+      <!-- <template slot="constructionSchemeUrlsType" slot-scope="{file}">
+        <span>{{ file }}</span>
+      </template> -->
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+  import {
+    getList,
+    remove,
+    update,
+    add,
+    getPropertyCapitalApply
+  } from "@/api/property/propertyCapitalApply"
+  import {
+    mapGetters
+  } from "vuex"
+  import website from '@/config/website'
+  import func from "@/util/func"
+  export default {
+    data() {
+      return {
+        form: {
+          // constructionSchemeUrls:[]
+        },
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0,
+        },
+        datetime: "",
+        selectionList: [],
+        option: {
+          labelWidth: 154,
+          searchLabelWidth: 96,
+          searchShow: true,
+          searchMenuSpan: 3,
+          menuWidth: 210,
+
+          height: "auto",
+          calcHeight: 54,
+          dialogWidth: 1150,
+          tip: false,
+          border: true,
+          //stripe:true,
+          index: true,
+          editBtn: false,
+          viewBtn: false,
+          delBtn: false,
+          selection: true,
+          dialogClickModal: false,
+          column: [{
+              width: 220,
+              overHidden: true,
+              label: '小区名称',
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              prop: "districtName",
+              search: true,
+              searchSpan: 4,
+              rules: [{
+                required: true,
+                message: "请输入小区名称",
+                trigger: "blur",
+              }],
+            },
+
+            {
+              hide: true,
+              parent: false,
+              label: "小区",
+              prop: "districtId",
+              search: false,
+              type: 'tree',
+              dicUrl: `/api/blade-district/district/getDistrictTree`,
+              props: {
+                label: "name",
+                value: "id"
+              },
+              defaultExpandedKeys: ["361102003"],
+              span: 12,
+              width: 260,
+              rules: [{
+                required: true,
+                message: "请选择小区",
+                trigger: "blur",
+              }, ],
+            },
+
+            {
+              label: '维修项目名称',
+              prop: 'name',
+              searchSpan: 5,
+              searchLabelWidth: 124,
+              search: true,
+              span: 12,
+              rules: [{
+                required: true,
+                message: "请输入维修项目名称",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              width: 100,
+              label: "预计开工时间",
+              prop: "runTime",
+              span: 12,
+              type: "date",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              rules: [{
+                required: true,
+                message: "请选择合同开始时间",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              width: 100,
+              label: "预计竣工时间",
+              prop: "completedTime",
+              span: 12,
+              type: "date",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              rules: [{
+                required: true,
+                message: "请选择合同结束时间",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              label: "项目分摊方式",
+              prop: "allocationWay",
+              value: '按建筑面积分摊',
+              span: 14,
+              row: true,
+            },
+            {
+              width: 110,
+              label: '联系人',
+              prop: 'linkman',
+              span: 12,
+              searchSpan: 4,
+              searchLabelWidth: 80,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入联系人",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              width: 120,
+              label: '联系方式',
+              prop: 'linkPhone',
+              span: 12,
+              rules: [{
+                required: true,
+                message: "请输入联系方式",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              width: 100,
+              label: '申请时间',
+              prop: 'applyTime',
+              span: 12,
+              display: false,
+            }, {
+              label: '审核进度',
+              prop: 'applyStatus',
+              span: 12,
+              display: false,
+              dicData: [{
+                label: "待审核",
+                value: 0,
+              }, {
+                label: "业委会",
+                value: 1,
+              }, {
+                label: "街道",
+                value: 2,
+              }, {
+                label: "住建局",
+                value: 3,
+              }, {
+                label: "调整申请",
+                value: 4,
+              }, {
+                label: "审核通过",
+                value: 5,
+              }, {
+                label: "审核不通过",
+                value: 6,
+              }]
+            },
+            {
+              label: "项目预算总金额(元)",
+              prop: "budgetAmount",
+              span: 12,
+              hide: true,
+              type: 'number',
+              precision: 2,
+              value: '0.00'
+            },
+            {
+              label: "实际预算金额(元)",
+              prop: "actualAmount",
+              span: 12,
+              hide: true,
+              type: 'number',
+              precision: 2,
+              value: '0.00'
+            },
+            {
+              label: "自筹金额(元)",
+              prop: "selfAmount",
+              span: 12,
+              hide: true,
+              type: 'number',
+              precision: 2,
+              value: '0.00'
+            },
+            {
+              label: "预算应拨付金额(元)",
+              prop: "budgetAppropriateAmount",
+              span: 12,
+              hide: true,
+              type: 'number',
+              precision: 2,
+              value: '0.00'
+            },
+            {
+              label: "项目摘要",
+              span: 24,
+              hide: true,
+              prop: "projectDigest",
+              placeholder: "例如:“XX小区XX栋XX设施设备维修,总的预算金额是X,是否含有审价,本次维修涉及范围共XX户,总面积的建筑面积为XX平方米”",
+              type: "textarea"
+            },
+            {
+              label: "项目进度描述",
+              span: 24,
+              hide: true,
+              prop: "projectDescribe",
+              type: "textarea"
+            },
+            {
+              label: '施工方案附件',
+              prop: 'constructionSchemeUrls',
+              type: 'upload',
+              span: 24,
+              hide: true,
+              multiple: true,
+              // showFileList: true,
+              propsHttp: {
+                res: 'data',
+                name: "originalName",
+                url: "link"
+              },
+              action: '/api/blade-resource/oss/endpoint/put-file-attach',
+              rules: [{
+                required: true,
+                message: "请上传施工方案",
+                trigger: "blur",
+              }, ],
+            }
+          ],
+        },
+        data: [],
+      }
+    },
+    watch: {},
+    computed: {
+      ...mapGetters(["permission", "userInfo"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.propertyCapitalApply_add, true),
+          viewBtn: this.vaildData(this.permission.propertyCapitalApply_view, true),
+          delBtn: this.vaildData(this.permission.propertyCapitalApply_delete, true),
+          editBtn: this.vaildData(this.permission.propertyCapitalApply_edit, true),
+        }
+      },
+      ids() {
+        let ids = []
+        this.selectionList.forEach((ele) => {
+          ids.push(ele.id)
+        })
+        return ids.join(",")
+      },
+    },
+    methods: {
+      handleWork(row) {
+        this.$router.push({
+          path: `/work/process/maintenanceFundApply/edit/${row.taskId}/${row.processInstanceId}/${row.id}`
+        })
+      },
+      goDetail(row) {
+        this.$router.push({
+          path: `/work/process/maintenanceFundApply/detail/${row.processInstanceId}/${row.id}`
+        })
+      },
+      rowSave(row, done, loading) {
+        row.constructionSchemeUrls = func.join(row.constructionSchemeUrls)
+        if (row.constructionSchemeUrls.length > 0) {
+          var urls = []
+          var split = row.constructionSchemeUrls.split(",")
+          split.forEach(url => {
+            var names = url.split("jczz/")
+            urls.push(names[1])
+          })
+          row.constructionSchemeUrls = urls.join(",")
+        }
+        row.propertyFlag = 1
+        add(row).then(
+          () => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            })
+            done()
+          },
+          (error) => {
+            window.console.log(error)
+            loading()
+          }
+        )
+      },
+      rowUpdate(row, index, done, loading) {
+        if (row.constructionSchemeUrls.length > 0) {
+          var urls = []
+          var split = row.constructionSchemeUrls.split(",")
+          split.forEach(url => {
+            var names = url.split("jczz/")
+            urls.push(names[1])
+          })
+          row.constructionSchemeUrls = urls.join(",")
+        }
+        update(row).then(
+          () => {
+            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.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()
+          })
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getPropertyCapitalApply(this.form.id).then((res) => {
+            this.form = res.data.data
+            this.form.propertyFlag = 1
+            if (this.form.constructionSchemeUrls.length > 0) {
+              var urls = []
+              var names = this.form.constructionSchemeUrls.split(",")
+              names.forEach(name => {
+                urls.push(website.minioUrl + name)
+              })
+              this.form.constructionSchemeUrls = urls.join(",")
+            }
+          })
+        }
+        // con
+        done()
+      },
+      currentChange(currentPage) {
+        this.page.currentPage = currentPage
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query)
+      },
+      onLoad(page, params = {}) {
+        const {
+          dateTime
+        } = this.query
+        let values = {
+          ...params,
+        }
+        if (dateTime) {
+          values = {
+            ...params,
+            startTime: dateTime[0],
+            endTime: dateTime[1],
+            ...this.query,
+          }
+          values.dateTime = null
+        }
+        this.loading = true
+        getList(page.currentPage, page.pageSize, values).then((res) => {
+          const data = res.data.data
+          this.page.total = data.total
+          this.data = data.records
+          this.data.forEach(item => {
+            if (item.constructionSchemeUrls.length > 0) {
+              var urls = []
+              var names = item.constructionSchemeUrls.split(",")
+              names.forEach(name => {
+                urls.push(website.minioUrl + name)
+              })
+              item.constructionSchemeUrls = urls.join(",")
+            }
+          })
+          this.loading = false
+          this.selectionClear()
+        })
+      }
+    }
+  }
+</script>
+
+<style>
+  .avue-upload__icon {
+    line-height: 6;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/publicSecurity/components/userHouseList.vue b/src/views/publicSecurity/components/userHouseList.vue
new file mode 100644
index 0000000..ea49734
--- /dev/null
+++ b/src/views/publicSecurity/components/userHouseList.vue
@@ -0,0 +1,1140 @@
+<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"
+          :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="menuLeft">
+            <el-button type="danger" size="small" plain icon="el-icon-delete" v-if="permission.household_delete"
+              @click="handleDelete">删 除
+            </el-button>
+            <el-button type="success" size="small" plain v-if="this.permission.household_import" icon="el-icon-upload2"
+              @click="handleImport">导入
+            </el-button>
+            <el-button type="warning" size="small" plain v-if="this.permission.household_export" icon="el-icon-download"
+              @click="handleExport">导出
+            </el-button>
+          </template> -->
+
+          <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>
+        <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 v-for="(item, index) in labelData" :key="index">
+            <el-row>
+              <el-col :span="24">
+                <div>
+                  <el-divider content-position="left">{{ item.name }}</el-divider>
+                </div>
+              </el-col>
+            </el-row>
+            <div class="grid-container2" v-if="item.children">
+              <div class="grid-item" :style="{ backgroundColor: item2.color }" v-for="(item2, index2) in item.children"
+                @click="changLabel(item2)" :key="index2">
+                {{ item2.name }}
+              </div>
+            </div>
+          </div>
+
+          <!-- <span slot="footer" class="dialog-footer">
+            <el-button @click="labelFlag = false">取 消</el-button>
+            <el-button type="primary" @click="submitRole">确 定</el-button>
+          </span> -->
+        </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>
+      </basic-container>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+  import {
+    getList,
+    remove,
+    add,
+    update,
+    getDetatil,
+    getDetatils
+  } from "@/api/userHouse/list/houseHold.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 {
+    getToken
+  } from '@/util/auth'
+  import {
+    downloadXls,
+    findParentOrCur,
+  } from "@/util/util"
+  import {
+    dateNow
+  } from "@/util/date"
+  import NProgress from 'nprogress'
+  import 'nprogress/nprogress.css'
+  import Qs from "qs"
+
+
+  export default {
+    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]
+            }
+
+            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("身份证格式不正确!");
+          callback(new Error("身份证号格式有误!"))
+        }
+
+        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
+        },
+        option: {
+          labelWidth: 144,
+          searchLabelWidth: 96,
+          searchShow: true,
+          searchMenuSpan: 3,
+          menuWidth: 280,
+
+          height: 'auto',
+          calcHeight: 80,
+          tip: false,
+          border: true,
+          index: true,
+          selection: true,
+          viewBtn: true,
+          addBtn: true,
+          dialogType: 'drawer',
+          dialogClickModal: false,
+          menuFixed: 'right',
+          column: [{
+              label: "与业主关系",
+              prop: "relationship",
+              type: "select",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=roleRelation",
+              dataType: "number",
+              hide: true,
+              props: {
+                label: "dictValue",
+                value: "dictKey",
+              },
+              rules: [{
+                required: true,
+                message: "请选择与业主关系",
+                trigger: "blur",
+              }],
+            },
+
+            {
+              width: 110,
+              label: "姓名",
+              prop: "name",
+              searchSpan: 3,
+              searchLabelWidth: 66,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入姓名",
+                trigger: "blur",
+              }],
+            },
+
+            {
+              hide: true,
+              label: "证件类型",
+              prop: "cardType",
+              type: "select",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=cardType",
+              dataType: "number",
+              props: {
+                label: "dictValue",
+                value: "dictKey",
+              },
+            },
+
+            {
+              width: 160,
+              display: true,
+              label: "身份证号",
+              prop: "idCard",
+              search: true,
+              searchSpan: 4,
+              slot: true,
+              rules: [{
+                validator: isCardId,
+                trigger: 'blur'
+              }],
+            },
+
+            {
+              hide: true,
+              display: false,
+              width: 160,
+              label: "证件号码",
+              prop: "cardNo",
+            },
+
+            {
+              label: "出生日期",
+              prop: "birthday",
+              type: "date",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              hide: true,
+            },
+
+
+            {
+              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'
+                }
+              ],
+            },
+
+            {
+              label: "居住情况",
+              prop: "residentialStatus",
+              type: "select",
+              hide: true,
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=residentialStatusType",
+              dataType: "number",
+              props: {
+                label: "dictValue",
+                value: "dictKey",
+              },
+            },
+
+            {
+              label: "其他联系方式",
+              prop: "otherContact",
+              hide: true,
+              rules: [{
+                validator: validatorPhone,
+                trigger: 'blur'
+              }],
+            },
+
+            {
+              label: "是否主要联系人",
+              prop: "isPrimaryContact",
+              type: "select",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=primaryContactType",
+              dataType: "number",
+              hide: true,
+              props: {
+                label: "dictValue",
+                value: "dictKey",
+              },
+            },
+
+            // {
+            // label: "关系",
+            // prop: "roleType",
+            // type: "select",
+            // dicUrl: "/api/blade-system/dict-biz/dictionary?code=roleType",
+            // dataType: "number",
+            //     props: {
+            //         label: "dictValue",
+            //         value: "dictKey",
+            //     },
+            // },
+
+            {
+              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
+            },
+
+
+            {
+              hide: true,
+              parent: false,
+              width: 160,
+              label: "籍贯地区",
+              prop: "nativePlaceAdcode",
+              type: "tree",
+              typeformat(item, label, value) {
+                return item.addressDetail
+              },
+              change: ({
+                value,
+                column,
+                item,
+                dic
+              }) => {
+                item.addressDetail = findParentOrCur(dic, item.id)
+              },
+              props: {
+                label: 'name',
+                value: 'id'
+              },
+              dicUrl: `/api/blade-system/region/getBaseTree`,
+            },
+
+            {
+              hide: true,
+              label: "户籍类型",
+              prop: "residentType",
+              type: "select",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=residentType",
+              dataType: "number",
+              props: {
+                label: "dictValue",
+                value: "dictKey",
+              },
+            },
+
+            {
+              hide: true,
+              parent: false,
+              width: 160,
+              label: "户籍地区",
+              prop: "residentAdcode",
+              type: "tree",
+              typeformat(item, label, value) {
+                return item.addressDetail
+              },
+              change: ({
+                value,
+                column,
+                item,
+                dic
+              }) => {
+                item.addressDetail = findParentOrCur(dic, item.id)
+              },
+              props: {
+                label: 'name',
+                value: 'id'
+              },
+              dicUrl: `/api/blade-system/region/getBaseTree`,
+            },
+
+            {
+              label: "户籍地址",
+              prop: "hukouRegistration",
+              hide: true,
+            },
+
+            {
+              disabled: false,
+              label: "居住地区",
+              prop: "homeAdcode",
+              hide: true,
+              type: 'select',
+              props: {
+                label: 'name',
+                value: 'code'
+              },
+              dicUrl: `/api/blade-system/region/select?code=361102`,
+            },
+
+            {
+              disabled: false,
+              label: "现居住地",
+              prop: "currentAddress",
+              hide: true,
+            },
+
+            {
+              width: 210,
+              overHidden: true,
+              label: "标签",
+              prop: "householdLabelList",
+              display: false
+            },
+
+            {
+              label: "民族",
+              prop: "ethnicity",
+              type: "select",
+              hide: true,
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=nationType",
+              dataType: "number",
+              props: {
+                label: "dictValue",
+                value: "dictKey",
+              },
+            },
+
+            {
+              label: "学历",
+              prop: "education",
+              type: "select",
+              hide: true,
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
+              dataType: "number",
+              props: {
+                label: "dictValue",
+                value: "dictKey",
+              },
+            },
+
+            {
+              hide: true,
+              width: 160,
+              label: "职业类别",
+              prop: "occupation"
+            },
+
+            {
+              label: "工作单位",
+              prop: "employer",
+              hide: true,
+            },
+
+            {
+              hide: true,
+              width: 160,
+              label: "工作单位地址",
+              prop: "cmpyRegAddr"
+            },
+
+            {
+              label: "工作状态",
+              prop: "workStatus",
+              type: "select",
+              hide: true,
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=workStatusType",
+              dataType: "number",
+              props: {
+                label: "dictValue",
+                value: "dictKey",
+              },
+            },
+
+            {
+              label: "婚姻状态",
+              prop: "maritalStatus",
+              type: "select",
+              hide: true,
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=marriageStatusType",
+              dataType: "number",
+              props: {
+                label: "dictValue",
+                value: "dictKey",
+              },
+            },
+
+            {
+              hide: true,
+              width: 160,
+              label: "宗教信仰",
+              prop: "religiousBelief",
+            },
+
+            {
+              hide: true,
+              label: "健康状态",
+              prop: "healthStatus",
+              type: "select",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=healthStatus",
+              dataType: "number",
+              props: {
+                label: "dictValue",
+                value: "dictKey",
+              },
+            },
+
+            {
+              disabled: true,
+              hide: true,
+              width: 160,
+              label: "疾病名称",
+              prop: "diseaseName"
+            },
+
+            {
+              hide: true,
+              width: 160,
+              label: "外出去向",
+              prop: "goOutWhere"
+            },
+
+            {
+              hide: true,
+              width: 160,
+              label: "外出原因",
+              prop: "goOutReason"
+            },
+
+            {
+              hide: true,
+              label: "外出时间",
+              prop: "goOutTime",
+              type: "date",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              width: 160,
+            },
+
+            {
+              hide: true,
+              width: 160,
+              label: "外出详址",
+              prop: "goOutAddr"
+            },
+
+            {
+              label: "车牌号",
+              prop: "cardNumber",
+              hide: true,
+            },
+          ]
+        },
+        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: [],
+      }
+    },
+    watch: {
+      'form.source': {
+        handler(newData) {
+          let currentAddressColumn = this.findObject(
+            this.option.column,
+            'currentAddress'
+          )
+
+          let homeAdcodeColumn = this.findObject(
+            this.option.column,
+            'homeAdcode'
+          )
+
+          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'
+          )
+
+          let cardNoColumn = this.findObject(
+            this.option.column,
+            'cardNo'
+          )
+
+          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'
+          )
+
+          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(',')
+        }
+      }
+    },
+    mounted() {},
+    methods: {
+      init(row) {
+
+      },
+      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: 1000
+        }
+        // 查询标签
+        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.loading = true
+
+        getList(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]
+      }
+    }
+  }
+</script>
+
+<style>
+  .box {
+    height: 800px;
+  }
+
+  .grid-container2 {
+    /* display: grid;
+    grid-template-columns: auto auto auto auto;
+    grid-gap: 10px; */
+    display: flex;
+    flex-wrap: wrap;
+    padding-bottom: 20px;
+  }
+
+  .grid-item {
+    padding: 8px 14px;
+    border: 1px solid #dcdfe6;
+    margin-right: 10px;
+    margin-bottom: 10px;
+    border-radius: 20px;
+  }
+
+  .grid-item:hover {
+    background-color: #e8f4ff;
+    color: #017BFC;
+    cursor: pointer;
+  }
+
+  .el-scrollbar {
+    height: 100%;
+  }
+
+  .box .el-scrollbar__wrap {
+    overflow: scroll;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/publicSecurity/keynotePersonnelManage.vue b/src/views/publicSecurity/keynotePersonnelManage.vue
index 30e8fb3..018e995 100644
--- a/src/views/publicSecurity/keynotePersonnelManage.vue
+++ b/src/views/publicSecurity/keynotePersonnelManage.vue
@@ -6,22 +6,22 @@
       @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
 
       <template slot-scope="scope" slot="menu">
-        <el-button type="text" size="small" icon="el-icon-view" plain @click="lookDetail(scope.row,0)">查 看
+        <el-button type="text" size="small" icon="el-icon-view" plain @click="lookDetail(scope.row)">查 看
         </el-button>
-        <el-button type="text" size="small" icon="el-icon-s-check" v-if="scope.row.status == 1" plain
+        <!-- <el-button type="text" size="small" icon="el-icon-s-check" v-if="scope.row.status == 1" plain
           @click="lookDetail(scope.row,1)">审 核
-        </el-button>
-        <el-button type="text" size="small" icon="el-icon-delete" plain @click="rowDel(scope.row)">删 除
-        </el-button>
+        </el-button> -->
+        <!-- <el-button type="text" size="small" icon="el-icon-delete" plain @click="rowDel(scope.row)">删 除
+        </el-button> -->
       </template>
 
     </avue-crud>
 
 
-    <el-dialog title="" append-to-body :visible.sync="auditBasePopup" width="60%">
-      <campusReporting @colseDetail="colseDetail" v-if="taskType == 6" ref="campusReporting"></campusReporting>
-      <hotelReporting @colseDetail="colseDetail" v-if="taskType == 2" ref="hotelReporting"></hotelReporting>
-      <labelReporting @colseDetail="colseDetail" v-if="taskType == 3" ref="labelReporting"></labelReporting>
+    <el-dialog title="" append-to-body :visible.sync="auditBasePopup" width="80%">
+      <userHouseList ref="userHouseList"></userHouseList>
+      <!-- <hotelReporting @colseDetail="colseDetail" v-if="taskType == 2" ref="hotelReporting"></hotelReporting> -->
+      <!-- <labelReporting @colseDetail="colseDetail" v-if="taskType == 3" ref="labelReporting"></labelReporting> -->
     </el-dialog>
   </basic-container>
 </template>
@@ -43,9 +43,9 @@
   } from "vuex"
 
   import website from '@/config/website'
-  import campusReporting from './components/campusReporting'
-  import hotelReporting from './components/hotelReporting'
-  import labelReporting from './components/labelReporting'
+  import userHouseList from './components/userHouseList'
+  // import hotelReporting from './components/hotelReporting'
+  // import labelReporting from './components/labelReporting'
 
   export default {
     data() {
@@ -80,6 +80,7 @@
           // viewBtn: true,
           editBtn: false,
           delBtn: false,
+          addBtn: false,
           selection: true,
           dialogClickModal: false,
           column: [
@@ -92,149 +93,28 @@
             // },
             {
               span: 12,
-              label: "社区",
-              prop: "communityName",
-              searchSpan: 4,
-              search: true,
-              hide: true,
-            },
-            {
-              span: 12,
-              label: "小区",
-              prop: "districtName",
-              searchSpan: 4,
-              search: true,
-              hide: true,
-            },
-            {
-              span: 12,
-              label: "名称",
-              prop: "realName",
-              searchSpan: 4,
-              search: true,
-            }, {
-              span: 12,
-              label: "电话",
-              prop: "phone",
-              searchSpan: 4,
-              search: true,
-            }, {
-              addDisplay: false,
-              editDisplay: false,
-              viewDisplay: false,
-              label: '类型',
-              prop: 'reportType',
-              type: 'radio',
-              slot: true,
-              search: true,
-              searchSpan: 3,
-              dicData: [{
-                label: '旅馆安全',
-                value: 2
-              }, {
-                label: '打金店',
-                value: 3
-              }, {
-                label: '二手手机维修',
-                value: 4
-              }, {
-                label: '二手车交易',
-                value: 5
-              }, {
-                label: '校园安全',
-                value: 6
-              }]
-            },
-            {
-              addDisplay: false,
-              editDisplay: false,
-              viewDisplay: false,
-              label: '审核状态',
-              prop: 'status',
-              type: 'radio',
-              slot: true,
-              dicData: [{
-                label: '待审核',
-                value: 1
-              }, {
-                label: '已审核',
-                value: 2
-              }, {
-                label: '未通过',
-                value: 3
-              }]
-            }, {
-              label: "创建时间",
-              prop: "createTime",
-              searchSpan: 4,
-
-            }, {
               label: "所属街道",
-              // hide: true,
-              // search: true,
-              parent: false,
+              prop: "regionName",
               searchSpan: 4,
-              prop: "streetCode",
-              type: "tree",
-              dicUrl: "/api/blade-system/region/getTownTree",
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请选择所属街道",
-                trigger: "blur",
-              }, ],
-            }, {
+              align: 'center',
+              search: true,
               // hide: true,
-              // search: true,
-              parent: false,
-              searchSpan: 4,
-              label: "所属社区",
-              prop: "neiCode",
-              // search: false,
-              type: "tree",
-              dicUrl: "/api/blade-system/region/tree",
-              props: {
-                label: "name",
-                value: "id",
-              },
-              rules: [{
-                required: true,
-                message: "请选择所属社区",
-                trigger: "blur",
-              }, ],
-            }, {
-              // hide: true,
-              // search: true,
-              parent: false,
-              searchSpan: 4,
-              label: "小区",
-              prop: "aoiCode",
-              // search: false,
-              type: "tree",
-              dicUrl: "/api/blade-district/district/getDistrictTree",
-              props: {
-                label: "name",
-                value: "aoiCode"
-              },
-              rules: [{
-                required: true,
-                message: "请选择小区",
-                trigger: "blur",
-              }, ],
-            }, {
+            },
+            {
               span: 12,
-              label: "地址",
-              prop: "addressName",
+              label: "所属社区",
+              prop: "communityName",
+              align: 'center',
               searchSpan: 4,
-              // search: true,
-              rules: [{
-                required: true,
-                message: "请输入场所名称",
-                trigger: "blur",
-              }, ],
+              search: true,
+              // hide: true,
+            },
+            {
+              span: 12,
+              label: "总数",
+              prop: "numbers",
+              align: 'center',
+              searchSpan: 4,
             },
           ],
         },
@@ -251,9 +131,9 @@
     },
 
     components: {
-      campusReporting,
-      hotelReporting,
-      labelReporting,
+      userHouseList,
+      // hotelReporting,
+      // labelReporting,
     },
 
     watch: {},
@@ -284,27 +164,12 @@
         this.onLoad(this.page)
       },
 
-      lookDetail(row, applyType) {
+      lookDetail(row) {
         this.auditBasePopup = true
         var that = this
-        if (row.reportType == 6) {
-          this.taskType = 6
-          this.$nextTick(() => {
-            that.$refs.campusReporting.init(row, applyType)
-          })
-        }
-        if (row.reportType == 2) {
-          this.taskType = 2
-          this.$nextTick(() => {
-            that.$refs.hotelReporting.init(row, applyType)
-          })
-        }
-        if (row.reportType == 3 || row.reportType == 4 || row.reportType == 5) {
-          this.taskType = 3
-          this.$nextTick(() => {
-            that.$refs.labelReporting.init(row, applyType)
-          })
-        }
+        this.$nextTick(() => {
+          that.$refs.userHouseList.init(row)
+        })
       },
       auditCur(row) {
         this.curAuditRow = row
diff --git a/src/views/publicSecurity/keynotePlaceManage.vue b/src/views/publicSecurity/keynotePlaceManage.vue
index 4221a5b..04af6fc 100644
--- a/src/views/publicSecurity/keynotePlaceManage.vue
+++ b/src/views/publicSecurity/keynotePlaceManage.vue
@@ -1,597 +1,594 @@
 <template>
-    <basic-container>
-        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
-            v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
-            :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
-            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
-            @refresh-change="refreshChange" @on-load="onLoad">
+  <basic-container>
+    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
+      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
+      @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 type="text" :size="size" icon="el-icon-view" plain @click="lookDetail(row, 0)">查 看
-                </el-button>
-                <el-button type="text" :size="size" icon="el-icon-s-check" v-if="row.status == 1" plain
-                    @click="lookDetail(row, 1)">审 核
-                </el-button>
-                <el-button type="text" :size="size" icon="el-icon-delete" plain @click="rowDel(row)">删 除
-                </el-button>
-            </template>
+      <template slot-scope="{row, size}" slot="menu">
+        <el-button type="text" :size="size" icon="el-icon-view" plain @click="lookDetail(row, 0)">查 看
+        </el-button>
+        <el-button type="text" :size="size" icon="el-icon-s-check" v-if="row.status == 1" plain
+          @click="lookDetail(row, 1)">审 核
+        </el-button>
+        <el-button type="text" :size="size" icon="el-icon-delete" plain @click="rowDel(row)">删 除
+        </el-button>
+      </template>
 
-            <template slot="status" slot-scope="{row, size}">
-                <el-tag :size="size" :type="showStatus(row.status).type">
-                    {{ showStatus(row.status).text }}
-                </el-tag>
-            </template>
+      <template slot="status" slot-scope="{row, size}">
+        <el-tag :size="size" :type="showStatus(row.status).type">
+          {{ showStatus(row.status).text }}
+        </el-tag>
+      </template>
 
-        </avue-crud>
+    </avue-crud>
 
 
-        <el-dialog title="" append-to-body :visible.sync="auditBasePopup" width="60%">
-            <campusReporting @colseDetail="colseDetail" v-if="taskType == 6" ref="campusReporting"></campusReporting>
-            <hotelReporting @colseDetail="colseDetail" v-if="taskType == 2" ref="hotelReporting"></hotelReporting>
-            <labelReporting @colseDetail="colseDetail" v-if="taskType == 3" ref="labelReporting"></labelReporting>
-        </el-dialog>
-    </basic-container>
+    <el-dialog title="" append-to-body :visible.sync="auditBasePopup" width="60%">
+      <campusReporting @colseDetail="colseDetail" v-if="taskType == 6" ref="campusReporting"></campusReporting>
+      <hotelReporting @colseDetail="colseDetail" v-if="taskType == 2" ref="hotelReporting"></hotelReporting>
+      <labelReporting @colseDetail="colseDetail" v-if="taskType == 3" ref="labelReporting"></labelReporting>
+    </el-dialog>
+  </basic-container>
 </template>
 
 <script>
-import {
+  import {
     getList,
     removeTask,
     update,
     add,
-} from "@/api/task/task"
+  } from "@/api/task/task"
 
-import {
+  import {
     mapGetters
-} from "vuex"
+  } from "vuex"
 
-import website from '@/config/website'
-import campusReporting from './components/campusReporting'
-import hotelReporting from './components/hotelReporting'
-import labelReporting from './components/labelReporting'
+  import website from '@/config/website'
+  import campusReporting from './components/campusReporting'
+  import hotelReporting from './components/hotelReporting'
+  import labelReporting from './components/labelReporting'
 
-export default {
-    data () {
+  export default {
+    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()
+      }
 
-        return {
-            taskType: 0,
-            curRow: {},
-            roleBox: false,
+      return {
+        taskType: 0,
+        curRow: {},
+        roleBox: false,
 
-            form: {},
-            query: {},
-            loading: true,
+        form: {},
+        query: {},
+        loading: true,
 
-            page: {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0,
+        },
+        datetime: "",
+        selectionList: [],
+        option: {
+          labelWidth: 96,
+          searchLabelWidth: 96,
+          searchShow: true,
+          searchMenuSpan: 3,
+          menuWidth: 210,
+
+          height: "auto",
+          calcHeight: 54,
+          dialogWidth: 950,
+          tip: false,
+          // menu: false,
+          border: true,
+          //stripe:true,
+          index: true,
+          // viewBtn: true,
+          editBtn: false,
+          delBtn: false,
+          selection: true,
+          dialogClickModal: false,
+          column: [{
+              span: 12,
+              label: "社区",
+              prop: "communityName",
+              searchSpan: 4,
+              search: true,
+              hide: true,
             },
-            datetime: "",
-            selectionList: [],
-            option: {
-                labelWidth: 96,
-                searchLabelWidth: 96,
-                searchShow: true,
-                searchMenuSpan: 3,
-                menuWidth: 210,
-
-                height: "auto",
-                calcHeight: 54,
-                dialogWidth: 950,
-                tip: false,
-                // menu: false,
-                border: true,
-                //stripe:true,
-                index: true,
-                // viewBtn: true,
-                editBtn: false,
-                delBtn: false,
-                selection: true,
-                dialogClickModal: false,
-                column: [ {
-                                       span: 12,
-                                       label: "社区",
-                                       prop: "communityName",
-                                       searchSpan: 4,
-                                       search: true,
-                                       hide: true,
-                                     },
-                                     {
-                                       span: 12,
-                                       label: "小区",
-                                       prop: "districtName",
-                                       searchSpan: 4,
-                                       search: true,
-                                       hide: true,
-                                     },
-
-                {
-                    width: 110,
-                    span: 12,
-                    label: "名称",
-                    prop: "realName",
-                    searchSpan: 4,
-                    searchLabelWidth: 66,
-                    search: true,
-                }, {
-                    width: 120,
-                    span: 12,
-                    label: "联系方式",
-                    prop: "phone",
-                    searchSpan: 4,
-                    search: true,
-                    rules: [
-                        {
-                            validator: validatorPhone,
-                            trigger: 'blur'
-                        }
-                    ],
-                }, {
-                    overHidee: true,
-                    span: 12,
-                    label: "地址",
-                    prop: "addressName",
-                    searchSpan: 4,
-                    // search: true,
-                    rules: [{
-                        required: true,
-                        message: "请输入地址",
-                        trigger: "blur",
-                    },],
-                }, {
-                    width: 144,
-                    label: "创建时间",
-                    prop: "createTime",
-                    searchSpan: 4,
-
-                },
-
-                {
-                    width: 100,
-                    addDisplay: false,
-                    editDisplay: false,
-                    viewDisplay: false,
-                    label: '审核状态',
-                    prop: 'status',
-                    type: 'radio',
-                    slot: true,
-                    dicData: [{
-                        label: '待审核',
-                        value: 1
-                    }, {
-                        label: '已审核',
-                        value: 2
-                    }, {
-                        label: '未通过',
-                        value: 3
-                    }]
-                },{
-                                      width: 110,
-                                      label: "所属街道",
-                                      // hide: true,
-                                      search: true,
-                                      parent: false,
-                                      searchSpan: 4,
-                                      prop: "streetCode",
-                                      type: "tree",
-                                      dicUrl: "/api/blade-system/region/getTownTree",
-                                      props: {
-                                          label: "name",
-                                          value: "id"
-                                      },
-                                      rules: [{
-                                          required: true,
-                                          message: "请选择所属街道",
-                                          trigger: "blur",
-                                      },],
-                                  }, {
-                                      width: 156,
-                                      // hide: true,
-                                      search: true,
-                                      parent: false,
-                                      searchSpan: 4,
-                                      label: "所属社区",
-                                      prop: "neiCode",
-                                      // search: false,
-                                      type: "tree",
-                                      dicUrl: "/api/blade-system/region/tree",
-                                      props: {
-                                          label: "name",
-                                          value: "id",
-                                      },
-                                      rules: [{
-                                          required: true,
-                                          message: "请选择所属社区",
-                                          trigger: "blur",
-                                      },],
-                                  }, {
-                                      width: 220,
-                                      overHidee: true,
-                                      // hide: true,
-                                      searchLabelWidth: 66,
-                                      search: true,
-                                      parent: false,
-                                      searchSpan: 4,
-                                      label: "小区",
-                                      prop: "aoiCode",
-                                      // search: false,
-                                      type: "tree",
-                                      dicUrl: "/api/blade-district/district/getDistrictTree",
-                                      props: {
-                                          label: "name",
-                                          value: "aoiCode"
-                                      },
-                                      rules: [{
-                                          required: true,
-                                          message: "请选择小区",
-                                          trigger: "blur",
-                                      },],
-                                  }, {
-                    width: 100,
-                    addDisplay: false,
-                    editDisplay: false,
-                    viewDisplay: false,
-                    label: '类型',
-                    prop: 'reportType',
-                    type: 'radio',
-                    slot: true,
-                    searchSpan: 4,
-                    searchLabelWidth: 66,
-                    search: true,
-                    dicData: [{
-                        label: '旅馆安全',
-                        value: 2
-                    }, {
-                        label: '打金店',
-                        value: 3
-                    }, {
-                        label: '二手手机维修',
-                        value: 4
-                    }, {
-                        label: '二手车交易',
-                        value: 5
-                    }, {
-                        label: '校园安全',
-                        value: 6
-                    }]
-                },
-                ],
+            {
+              span: 12,
+              label: "小区",
+              prop: "districtName",
+              searchSpan: 4,
+              search: true,
+              hide: true,
             },
-            data: [],
 
-            auditBasePopup: false,
-        }
+            {
+              width: 110,
+              span: 12,
+              label: "名称",
+              prop: "realName",
+              searchSpan: 4,
+              searchLabelWidth: 66,
+              search: true,
+            }, {
+              width: 120,
+              span: 12,
+              label: "联系方式",
+              prop: "phone",
+              searchSpan: 4,
+              search: true,
+              rules: [{
+                validator: validatorPhone,
+                trigger: 'blur'
+              }],
+            }, {
+              overHidee: true,
+              span: 12,
+              label: "地址",
+              prop: "addressName",
+              searchSpan: 4,
+              // search: true,
+              rules: [{
+                required: true,
+                message: "请输入地址",
+                trigger: "blur",
+              }, ],
+            }, {
+              width: 144,
+              label: "创建时间",
+              prop: "createTime",
+              searchSpan: 4,
+
+            },
+
+            {
+              width: 100,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              label: '审核状态',
+              prop: 'status',
+              type: 'radio',
+              slot: true,
+              dicData: [{
+                label: '待审核',
+                value: 1
+              }, {
+                label: '已审核',
+                value: 2
+              }, {
+                label: '未通过',
+                value: 3
+              }]
+            }, {
+              width: 110,
+              label: "所属街道",
+              // hide: true,
+              search: true,
+              parent: false,
+              searchSpan: 4,
+              prop: "streetCode",
+              type: "tree",
+              dicUrl: "/api/blade-system/region/getTownTree",
+              props: {
+                label: "name",
+                value: "id"
+              },
+              rules: [{
+                required: true,
+                message: "请选择所属街道",
+                trigger: "blur",
+              }, ],
+            }, {
+              width: 156,
+              // hide: true,
+              search: true,
+              parent: false,
+              searchSpan: 4,
+              label: "所属社区",
+              prop: "neiCode",
+              // search: false,
+              type: "tree",
+              dicUrl: "/api/blade-system/region/tree",
+              props: {
+                label: "name",
+                value: "id",
+              },
+              rules: [{
+                required: true,
+                message: "请选择所属社区",
+                trigger: "blur",
+              }, ],
+            }, {
+              width: 220,
+              overHidee: true,
+              // hide: true,
+              searchLabelWidth: 66,
+              search: true,
+              parent: false,
+              searchSpan: 4,
+              label: "小区",
+              prop: "aoiCode",
+              // search: false,
+              type: "tree",
+              dicUrl: "/api/blade-district/district/getDistrictTree",
+              props: {
+                label: "name",
+                value: "aoiCode"
+              },
+              rules: [{
+                required: true,
+                message: "请选择小区",
+                trigger: "blur",
+              }, ],
+            }, {
+              width: 100,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              label: '类型',
+              prop: 'reportType',
+              type: 'radio',
+              slot: true,
+              searchSpan: 4,
+              searchLabelWidth: 66,
+              search: true,
+              dicData: [{
+                label: '旅馆安全',
+                value: 2
+              }, {
+                label: '打金店',
+                value: 3
+              }, {
+                label: '二手手机维修',
+                value: 4
+              }, {
+                label: '二手车交易',
+                value: 5
+              }, {
+                label: '校园安全',
+                value: 6
+              }]
+            },
+          ],
+        },
+        data: [],
+
+        auditBasePopup: false,
+      }
     },
 
-    provide () {
-        return {
-            placeElement: this,
-        }
+    provide() {
+      return {
+        placeElement: this,
+      }
     },
 
     components: {
-        campusReporting,
-        hotelReporting,
-        labelReporting,
+      campusReporting,
+      hotelReporting,
+      labelReporting,
     },
 
     watch: {},
 
     computed: {
-        ...mapGetters(["permission", "userInfo"]),
-        permissionList () {
-            return {
-                addBtn: this.vaildData(this.permission.place_add, true),
-                viewBtn: this.vaildData(this.permission.place_view, true),
-                delBtn: this.vaildData(this.permission.place_delete, true),
-                editBtn: this.vaildData(this.permission.place_edit, true),
-            }
-        },
-        ids () {
-            let ids = []
-            this.selectionList.forEach((ele) => {
-                ids.push(ele.id)
-            })
-            return ids.join(",")
-        },
-        showStatus () {
-            return (data) => {
-                let tags = {}
-
-                if (data == 1) {
-                    tags = {
-                        type: 'warning',
-                        text: '待审核'
-                    }
-                } else if (data == 2) {
-                    tags = {
-                        type: 'success',
-                        text: '已审核'
-                    }
-                } else if (data == 3) {
-                    tags = {
-                        type: 'danger',
-                        text: '未通过'
-                    }
-                }
-
-                return tags
-            }
+      ...mapGetters(["permission", "userInfo"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.place_add, true),
+          viewBtn: this.vaildData(this.permission.place_view, true),
+          delBtn: this.vaildData(this.permission.place_delete, true),
+          editBtn: this.vaildData(this.permission.place_edit, true),
         }
+      },
+      ids() {
+        let ids = []
+        this.selectionList.forEach((ele) => {
+          ids.push(ele.id)
+        })
+        return ids.join(",")
+      },
+      showStatus() {
+        return (data) => {
+          let tags = {}
+
+          if (data == 1) {
+            tags = {
+              type: 'warning',
+              text: '待审核'
+            }
+          } else if (data == 2) {
+            tags = {
+              type: 'success',
+              text: '已审核'
+            }
+          } else if (data == 3) {
+            tags = {
+              type: 'danger',
+              text: '未通过'
+            }
+          }
+
+          return tags
+        }
+      }
     },
     methods: {
 
-        colseDetail () {
-            this.auditBasePopup = false
-            this.onLoad(this.page)
-        },
+      colseDetail() {
+        this.auditBasePopup = false
+        this.onLoad(this.page)
+      },
 
-        lookDetail (row, applyType) {
-            this.auditBasePopup = true
-            var that = this
-            if (row.reportType == 6) {
-                this.taskType = 6
-                this.$nextTick(() => {
-                    that.$refs.campusReporting.init(row, applyType)
-                })
-            }
-            if (row.reportType == 2) {
-                this.taskType = 2
-                this.$nextTick(() => {
-                    that.$refs.hotelReporting.init(row, applyType)
-                })
-            }
-            if (row.reportType == 3 || row.reportType == 4 || row.reportType == 5) {
-                this.taskType = 3
-                this.$nextTick(() => {
-                    that.$refs.labelReporting.init(row, applyType)
-                })
-            }
-        },
-        auditCur (row) {
-            this.curAuditRow = row
-            this.auditBasePopup = true
-        },
-
-        roleBoxClose () {
-            this.curRow = {}
-        },
-
-        ManageTenants (item) {
-            this.curRow = item
-            this.roleBox = true
-        },
-
-        rowSave (row, done, loading) {
-            if (row.imageUrls.length > 0) {
-                var urls = []
-                var split = row.imageUrls.split(",").filter(item => item != '')
-                split.forEach(url => {
-                    var names = url.split("jczz/")
-                    urls.push(names[1])
-                })
-                row.imageUrls = urls.join(",")
-            }
-
-            let label = row.label
-
-            if (row.smallLabel != '') {
-                label = label + ',' + row.smallLabel
-            }
-
-            delete row.smallLabel
-
-            add({
-                ...row,
-                label
-            }).then(
-                () => {
-                    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(",").filter(item => item != '')
-                split.forEach(url => {
-                    var names = url.split("jczz/")
-                    urls.push(names[1])
-                })
-                row.imageUrls = urls.join(",")
-            }
-
-            let label = row.label
-
-            if (row.smallLabel != '') {
-                label = label + ',' + row.smallLabel
-            }
-
-            delete row.smallLabel
-
-            update({
-                ...row,
-                label
-            }).then(
-                () => {
-                    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(() => {
-                    row.isDeleted = 1
-                    return removeTask(row)
-                })
-                .then(() => {
-                    this.onLoad(this.page)
-
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!",
-                    })
-                })
-        },
-        searchReset () {
-            this.query = {}
-            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.$nextTick(() => {
-                this.$refs.crud && 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()
-                })
-        },
-
-        beforeOpen (done, type) {
-            if (["edit", "view"].includes(type)) {
-                // getPlace(this.form.id).then((res) => {
-                //   this.form = res.data.data
-                //   if (this.form.imageUrls.length) {
-                //     this.form.imageUrls = this.form.imageUrls.split(",").filter(item => item != '').map(item => website
-                //       .minioUrl + item).join(',')
-                //   }
-                //   if (this.form.placePoiLabelVOList.length) {
-                //     let lebelTwo = this.form.placePoiLabelVOList.find(item => {
-                //       return item.type == 2
-                //     })
-                //     if (lebelTwo) this.form.label = String(lebelTwo.poiCode)
-                //     let lebelThree = this.form.placePoiLabelVOList.find(item => {
-                //       return item.type == 3
-                //     })
-                //     if (lebelThree) this.form.smallLabel = String(lebelThree.poiCode)
-                //   }
-                //   done()
-                // })
-            } else {
-                done()
-            }
-        },
-
-        currentChange (currentPage) {
-            this.page.currentPage = currentPage
-        },
-        sizeChange (pageSize) {
-            this.page.pageSize = pageSize
-        },
-        refreshChange () {
-            this.onLoad(this.page, this.query)
-        },
-        onLoad (page, params = {}) {
-            const {
-                dateTime
-            } = this.query
-            let values = {
-                ...params,
-            }
-            // if (dateTime) {
-            //   values = {
-            //     ...params,
-            //     startTime: dateTime[0],
-            //     endTime: dateTime[1],
-            //     ...this.query,
-            //   }
-            //   values.dateTime = null
-            // }
-            values.reportType = 2
-            this.loading = true
-            getList(page.currentPage, page.pageSize, values).then((res) => {
-                const data = res.data.data
-                this.page.total = data.total
-                this.data = data.records
-                this.data.forEach(item => {
-                    if (item.imageUrls && item.imageUrls != '' && item.imageUrls != null && item.imageUrls.length) {
-                        var urls = []
-                        var names = item.imageUrls.split(",").filter(item => item != '')
-                        names.forEach(name => {
-                            urls.push(website.minioUrl + name)
-                        })
-                        item.imageUrls = urls.join(",")
-                    }
-                })
-                this.loading = false
-                this.selectionClear()
-            })
+      lookDetail(row, applyType) {
+        this.auditBasePopup = true
+        var that = this
+        if (row.reportType == 6) {
+          this.taskType = 6
+          this.$nextTick(() => {
+            that.$refs.campusReporting.init(row, applyType)
+          })
         }
+        if (row.reportType == 2) {
+          this.taskType = 2
+          this.$nextTick(() => {
+            that.$refs.hotelReporting.init(row, applyType)
+          })
+        }
+        if (row.reportType == 3 || row.reportType == 4 || row.reportType == 5) {
+          this.taskType = 3
+          this.$nextTick(() => {
+            that.$refs.labelReporting.init(row, applyType)
+          })
+        }
+      },
+      auditCur(row) {
+        this.curAuditRow = row
+        this.auditBasePopup = true
+      },
+
+      roleBoxClose() {
+        this.curRow = {}
+      },
+
+      ManageTenants(item) {
+        this.curRow = item
+        this.roleBox = true
+      },
+
+      rowSave(row, done, loading) {
+        if (row.imageUrls.length > 0) {
+          var urls = []
+          var split = row.imageUrls.split(",").filter(item => item != '')
+          split.forEach(url => {
+            var names = url.split("jczz/")
+            urls.push(names[1])
+          })
+          row.imageUrls = urls.join(",")
+        }
+
+        let label = row.label
+
+        if (row.smallLabel != '') {
+          label = label + ',' + row.smallLabel
+        }
+
+        delete row.smallLabel
+
+        add({
+          ...row,
+          label
+        }).then(
+          () => {
+            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(",").filter(item => item != '')
+          split.forEach(url => {
+            var names = url.split("jczz/")
+            urls.push(names[1])
+          })
+          row.imageUrls = urls.join(",")
+        }
+
+        let label = row.label
+
+        if (row.smallLabel != '') {
+          label = label + ',' + row.smallLabel
+        }
+
+        delete row.smallLabel
+
+        update({
+          ...row,
+          label
+        }).then(
+          () => {
+            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(() => {
+            row.isDeleted = 1
+            return removeTask(row)
+          })
+          .then(() => {
+            this.onLoad(this.page)
+
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            })
+          })
+      },
+      searchReset() {
+        this.query = {}
+        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.$nextTick(() => {
+          this.$refs.crud && 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()
+          })
+      },
+
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          // getPlace(this.form.id).then((res) => {
+          //   this.form = res.data.data
+          //   if (this.form.imageUrls.length) {
+          //     this.form.imageUrls = this.form.imageUrls.split(",").filter(item => item != '').map(item => website
+          //       .minioUrl + item).join(',')
+          //   }
+          //   if (this.form.placePoiLabelVOList.length) {
+          //     let lebelTwo = this.form.placePoiLabelVOList.find(item => {
+          //       return item.type == 2
+          //     })
+          //     if (lebelTwo) this.form.label = String(lebelTwo.poiCode)
+          //     let lebelThree = this.form.placePoiLabelVOList.find(item => {
+          //       return item.type == 3
+          //     })
+          //     if (lebelThree) this.form.smallLabel = String(lebelThree.poiCode)
+          //   }
+          //   done()
+          // })
+        } else {
+          done()
+        }
+      },
+
+      currentChange(currentPage) {
+        this.page.currentPage = currentPage
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query)
+      },
+      onLoad(page, params = {}) {
+        const {
+          dateTime
+        } = this.query
+        let values = {
+          ...params,
+        }
+        // if (dateTime) {
+        //   values = {
+        //     ...params,
+        //     startTime: dateTime[0],
+        //     endTime: dateTime[1],
+        //     ...this.query,
+        //   }
+        //   values.dateTime = null
+        // }
+        values.reportType = 2
+        this.loading = true
+        getList(page.currentPage, page.pageSize, values).then((res) => {
+          const data = res.data.data
+          this.page.total = data.total
+          this.data = data.records
+          this.data.forEach(item => {
+            if (item.imageUrls && item.imageUrls != '' && item.imageUrls != null && item.imageUrls.length) {
+              var urls = []
+              var names = item.imageUrls.split(",").filter(item => item != '')
+              names.forEach(name => {
+                urls.push(website.minioUrl + name)
+              })
+              item.imageUrls = urls.join(",")
+            }
+          })
+          this.loading = false
+          this.selectionClear()
+        })
+      }
     }
-}
+  }
 </script>
 
 <style lang="scss" scoped>
-.avue-upload__icon {
+  .avue-upload__icon {
     line-height: 6;
-}
+  }
 
-.cur-container-box {
+  .cur-container-box {
     display: flex;
     flex-direction: column;
     width: 100%;
@@ -599,18 +596,18 @@
     overflow: hidden;
 
     .content-box {
-        margin: 0 4px;
-        padding: 0 16px;
-        height: 0;
-        flex: 1;
-        overflow: hidden;
-        overflow-y: auto;
+      margin: 0 4px;
+      padding: 0 16px;
+      height: 0;
+      flex: 1;
+      overflow: hidden;
+      overflow-y: auto;
     }
 
     .footer-btn-box {
-        margin-top: 10px;
-        display: flex;
-        justify-content: center;
+      margin-top: 10px;
+      display: flex;
+      justify-content: center;
     }
-}
-</style>
+  }
+</style>
\ No newline at end of file

--
Gitblit v1.9.3