From f89867e71936474a1afd1994e49a3f55d937ec33 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 10 Jan 2024 10:08:58 +0800
Subject: [PATCH] 取保候审优化

---
 src/views/publicSecurity/keynotePlaceManage.vue             |  211 ++--
 src/views/publicSecurity/components/labelReporting.vue      |  360 +++---
 src/api/task/task.js                                        |   11 
 src/views/publicSecurity/components/bailReportingDetail.vue |  452 ++++----
 src/views/publicSecurity/bailReporting.vue                  |  181 ++-
 src/api/userHouse/list/userHouseList.js                     |   13 
 src/views/publicSecurity/components/campusReporting.vue     |  454 ++++----
 src/views/publicSecurity/components/hotelReporting.vue      |  530 +++++-----
 src/views/work/process/maintenanceFundApply/handle.vue      |   59 
 src/views/publicSecurity/keynotePersonnelManage.vue         |  551 +++++++++++
 10 files changed, 1,706 insertions(+), 1,116 deletions(-)

diff --git a/src/api/task/task.js b/src/api/task/task.js
index 97fad1b..99d85a7 100644
--- a/src/api/task/task.js
+++ b/src/api/task/task.js
@@ -11,6 +11,17 @@
     }
   })
 }
+export const getBailReportingPage = (current, size, params) => {
+  return request({
+    url: '/api/blade-task/task/getBailReportingPage',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
 
 export const removeTask = (row) => {
   return request({
diff --git a/src/api/userHouse/list/userHouseList.js b/src/api/userHouse/list/userHouseList.js
index 36abaf5..684c277 100644
--- a/src/api/userHouse/list/userHouseList.js
+++ b/src/api/userHouse/list/userHouseList.js
@@ -83,4 +83,17 @@
     method: 'post',
     data: row
   })
+}
+
+
+export const statisticalLabels = (current, size, params) => {
+  return request({
+    url: '/api/blade-houseLabel/userHouseLabel/statisticalLabels',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
 }
\ No newline at end of file
diff --git a/src/views/publicSecurity/bailReporting.vue b/src/views/publicSecurity/bailReporting.vue
index 77390bb..2640a79 100644
--- a/src/views/publicSecurity/bailReporting.vue
+++ b/src/views/publicSecurity/bailReporting.vue
@@ -24,7 +24,7 @@
 
 <script>
   import {
-    getList,
+    getBailReportingPage,
     removeTask,
     update,
     add,
@@ -79,78 +79,36 @@
           selection: true,
           dialogClickModal: false,
           column: [{
-              label: "所属街道",
-              // hide: true,
-              searchSpan: 4,
-              search: true,
-              parent: false,
-              prop: "streetCode",
-              type: "tree",
-              dicUrl: "/api/blade-system/region/getTownTree",
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请选择所属街道",
-                trigger: "blur",
-              }, ],
-            }, {
-              // hide: true,
-              parent: false,
-              searchSpan: 4,
-              label: "所属社区",
-              prop: "neiCode",
-              search: true,
-              type: "tree",
-              dicUrl: "/api/blade-system/region/tree",
-              props: {
-                label: "name",
-                value: "id",
-              },
-              cascader: ["gridId"],
-              rules: [{
-                required: true,
-                message: "请选择所属社区",
-                trigger: "blur",
-              }, ],
-            }, {
-              label: "小区",
-              prop: "aoiCode",
-              searchSpan: 4,
-              type: 'tree',
-              search: true,
-              parent: false,
-              dicUrl: `/api/blade-district/district/getDistrictTree`,
-              props: {
-                label: "name",
-                value: "aoiCode"
-              },
-              // defaultExpandedKeys: ["361102003"],
               span: 12,
-              labelWidth: 120,
-              // width: 220,
-              // overHidden: true,
-              rules: [{
-                required: true,
-                message: "请选择小区",
-                trigger: "blur",
-              }, ],
-              // disabled: true
-              display: true,
-              // hide: true,
+              label: "社区",
+              prop: "communityName",
+              searchSpan: 4,
+              search: true,
+              hide: true,
             },
             {
               span: 12,
+              label: "小区",
+              prop: "districtName",
+              searchSpan: 4,
+              search: true,
+              hide: true,
+            }, {
+              span: 12,
               label: "名称",
-              prop: "name",
+              prop: "realName",
               searchSpan: 4,
               search: true,
             }, {
               span: 12,
               label: "电话",
               prop: "phone",
+              searchSpan: 4,
+              search: true,
+            }, {
+              span: 12,
+              label: "外出事由",
+              prop: "applyName",
               searchSpan: 4,
               search: true,
             },
@@ -179,25 +137,88 @@
               }]
             },
             {
-              addDisplay: false,
-              editDisplay: false,
-              viewDisplay: false,
-              label: '类型',
-              prop: 'reportType',
-              type: 'radio',
-              slot: true,
-              // search: true,
-              dicData: [{
-                label: '取保候审',
-                value: 1
-              }, ]
-            },
-            {
-              span: 12,
-              label: "地址",
-              prop: "addressName",
+              label: "所属街道",
+              // hide: true,
               searchSpan: 4,
+              // search: true,
+              parent: false,
+              prop: "streetCode",
+              type: "tree",
+              dicUrl: "/api/blade-system/region/getTownTree",
+              props: {
+                label: "name",
+                value: "id"
+              },
+              rules: [{
+                required: true,
+                message: "请选择所属街道",
+                trigger: "blur",
+              }, ],
+            }, {
+              // hide: true,
+              parent: false,
+              searchSpan: 4,
+              label: "所属社区",
+              prop: "neiCode",
+              // search: true,
+              type: "tree",
+              dicUrl: "/api/blade-system/region/tree",
+              props: {
+                label: "name",
+                value: "id",
+              },
+              cascader: ["gridId"],
+              rules: [{
+                required: true,
+                message: "请选择所属社区",
+                trigger: "blur",
+              }, ],
+            }, {
+              label: "小区",
+              prop: "aoiCode",
+              searchSpan: 4,
+              type: 'tree',
+              // search: true,
+              parent: false,
+              dicUrl: `/api/blade-district/district/getDistrictTree`,
+              props: {
+                label: "name",
+                value: "aoiCode"
+              },
+              // defaultExpandedKeys: ["361102003"],
+              span: 12,
+              labelWidth: 120,
+              // width: 220,
+              // overHidden: true,
+              rules: [{
+                required: true,
+                message: "请选择小区",
+                trigger: "blur",
+              }, ],
+              // disabled: true
+              display: true,
+              // hide: true,
             },
+            // {
+            //   addDisplay: false,
+            //   editDisplay: false,
+            //   viewDisplay: false,
+            //   label: '类型',
+            //   prop: 'reportType',
+            //   type: 'radio',
+            //   slot: true,
+            //   // search: true,
+            //   dicData: [{
+            //     label: '取保候审',
+            //     value: 1
+            //   }, ]
+            // },
+            // {
+            //   span: 12,
+            //   label: "地址",
+            //   prop: "addressName",
+            //   searchSpan: 4,
+            // },
           ],
         },
         data: [],
@@ -404,7 +425,7 @@
         }
         values.reportType = 1
         this.loading = true
-        getList(page.currentPage, page.pageSize, values).then((res) => {
+        getBailReportingPage(page.currentPage, page.pageSize, values).then((res) => {
           const data = res.data.data
           this.page.total = data.total
           this.data = data.records
diff --git a/src/views/publicSecurity/components/bailReportingDetail.vue b/src/views/publicSecurity/components/bailReportingDetail.vue
index 4fa7efe..a8c77ff 100644
--- a/src/views/publicSecurity/components/bailReportingDetail.vue
+++ b/src/views/publicSecurity/components/bailReportingDetail.vue
@@ -1,248 +1,248 @@
 <template>
-    <div class="cur-container-box">
-        <div v-if="applyType == 1">
-            <div class="content-box">
-                审核当前项
-            </div>
-            <div class="footer-btn-box">
-                <el-button type="primary" size="small" @click="auditPass(2)">通 过</el-button>
-                <el-button size="small" @click="auditPass(3)">驳 回</el-button>
-            </div>
-        </div>
-
-        <avue-form v-else :option="option" v-model="form">
-        </avue-form>
-
+  <div class="cur-container-box">
+    <div v-if="applyType == 1">
+      <div class="content-box">
+        审核当前项
+      </div>
+      <div class="footer-btn-box">
+        <el-button type="primary" size="small" @click="auditPass(2)">通 过</el-button>
+        <el-button size="small" @click="auditPass(3)">驳 回</el-button>
+      </div>
     </div>
+
+    <avue-form v-else :option="option" v-model="form">
+    </avue-form>
+
+  </div>
 </template>
 <script>
-import {
+  import {
     getDetail,
     update
-} from "@/api/task/bailReporting"
-import website from '@/config/website'
-export default {
-    data () {
-        return {
-            form: {},
-            applyType: '',
-            option: {
-                submitBtn: false,
-                emptyBtn: false,
-                column: [
-                    {
-                        // span: 10,
-                        label: '申请人',
-                        prop: 'checkUserName',
-                        disabled: true,
-                        span: 8,
-                    }, {
-                        // span: 12,
-                        label: '申请人手机',
-                        prop: 'checkTelephone',
-                        disabled: true,
-                        span: 8,
-                    }, {
-                        label: '申请位置',
-                        prop: 'location',
-                        disabled: true,
-                        span: 8,
-                    }, {
-                        label: '审核时间',
-                        prop: 'confirmTime',
-                        disabled: true,
-                        span: 8,
-                    }, {
-                        label: '审核人',
-                        prop: 'confirmUserName',
-                        disabled: true,
-                        span: 8,
-                    }, {
-                        label: '审核意见',
-                        prop: 'confirmNotion',
-                        disabled: true,
-                        span: 8,
-                    }, {
-                        label: '审核状态',
-                        prop: 'confirmFlag',
-                        disabled: true,
-                        span: 8,
-                        type: 'select',
-                        dicData: [{
-                            label: '待审核',
-                            value: '1'
-                        }, {
-                            label: '审核通过',
-                            value: '2'
-                        }, {
-                            label: '审核不通过',
-                            value: '3'
-                        }]
-                    }, {
-                        label: '申请时间',
-                        prop: 'applyTime',
-                        disabled: true,
-                        span: 8,
-                    }, {
-                        label: '外出原因',
-                        prop: 'applyName',
-                        disabled: true,
-                        span: 8,
-                    }, {
-                        label: '身份证号',
-                        prop: 'idCard',
-                        disabled: true,
-                        span: 8,
-                    }, {
-                        width: 110,
-                        label: '位置图片',
-                        fileType: 'img',
-                        type: "upload",
-                        listType: "picture-card",
-                        dataType: "string",
-                        prop: 'locationImageUrls',
-                        disabled: true,
-                    }, {
-                        label: '审核人电话',
-                        prop: 'confirmUserTelephone',
-                        disabled: true,
-                        span: 8,
-                    }, {
-                        label: '出发-当前时间',
-                        prop: 'startTime',
-                        disabled: true,
-                        span: 8,
-                        labelWidth: 120,
-                    }, {
-                        label: '出发-报备位置',
-                        prop: 'startLocation',
-                        disabled: true,
-                        span: 8,
-                        labelWidth: 120,
-                    }, {
-                        width: 110,
-                        label: '出发-位置图片',
-                        fileType: 'img',
-                        type: "upload",
-                        listType: "picture-card",
-                        dataType: "string",
-                        prop: 'startImageUrls',
-                        disabled: true,
-                        labelWidth: 120,
-                    }, {
-                        label: '到达-当前时间',
-                        prop: 'reachTime',
-                        disabled: true,
-                        labelWidth: 120,
-                        span: 8,
-                    }, {
-                        label: '到达-报备位置',
-                        prop: 'reachLocation',
-                        disabled: true,
-                        span: 8,
-                        labelWidth: 120,
-                    }, {
-                        width: 110,
-                        label: '到达-位置图片',
-                        fileType: 'img',
-                        type: "upload",
-                        listType: "picture-card",
-                        dataType: "string",
-                        prop: 'reachImageUrls',
-                        disabled: true,
-                        labelWidth: 120,
-                    }, {
-                        label: '返回-当前时间',
-                        prop: 'returnTime',
-                        disabled: true,
-                        labelWidth: 120,
-                        span: 8,
-                    }, {
-                        label: '返回-报备位置',
-                        prop: 'returnLocation',
-                        disabled: true,
-                        span: 8,
-                        labelWidth: 120,
-                    }, {
-                        width: 110,
-                        label: '返回-位置图片',
-                        fileType: 'img',
-                        type: "upload",
-                        listType: "picture-card",
-                        dataType: "string",
-                        prop: 'returnImageUrls',
-                        labelWidth: 120,
-                        disabled: true,
-                    },]
-            }
+  } from "@/api/task/bailReporting"
+  import website from '@/config/website'
+  export default {
+    data() {
+      return {
+        form: {},
+        applyType: '',
+        option: {
+          submitBtn: false,
+          emptyBtn: false,
+          column: [{
+            // span: 10,
+            label: '申请人',
+            prop: 'checkUserName',
+            disabled: true,
+            span: 8,
+          }, {
+            // span: 12,
+            label: '申请人手机',
+            prop: 'checkTelephone',
+            disabled: true,
+            span: 8,
+          }, {
+            label: '申请位置',
+            prop: 'location',
+            disabled: true,
+            span: 8,
+          }, {
+            label: '审核时间',
+            prop: 'confirmTime',
+            disabled: true,
+            span: 8,
+          }, {
+            label: '审核人',
+            prop: 'confirmUserName',
+            disabled: true,
+            span: 8,
+          }, {
+            label: '审核意见',
+            prop: 'confirmNotion',
+            disabled: true,
+            span: 8,
+          }, {
+            label: '审核状态',
+            prop: 'confirmFlag',
+            disabled: true,
+            span: 8,
+            type: 'select',
+            dicData: [{
+              label: '待审核',
+              value: '1'
+            }, {
+              label: '审核通过',
+              value: '2'
+            }, {
+              label: '审核不通过',
+              value: '3'
+            }]
+          }, {
+            label: '申请时间',
+            prop: 'applyTime',
+            disabled: true,
+            span: 8,
+          }, {
+            label: '外出原因',
+            prop: 'applyName',
+            disabled: true,
+            span: 8,
+          }, {
+            label: '身份证号',
+            prop: 'idCard',
+            disabled: true,
+            span: 8,
+          }, {
+            width: 110,
+            label: '位置图片',
+            fileType: 'img',
+            type: "upload",
+            listType: "picture-card",
+            dataType: "string",
+            prop: 'locationImageUrls',
+            disabled: true,
+          }, {
+            label: '审核人电话',
+            prop: 'confirmUserTelephone',
+            disabled: true,
+            span: 8,
+          }, {
+            label: '出发-当前时间',
+            prop: 'startTime',
+            disabled: true,
+            span: 8,
+            labelWidth: 120,
+          }, {
+            label: '出发-报备位置',
+            prop: 'startLocation',
+            disabled: true,
+            span: 8,
+            labelWidth: 120,
+          }, {
+            width: 110,
+            label: '出发-位置图片',
+            fileType: 'img',
+            type: "upload",
+            listType: "picture-card",
+            dataType: "string",
+            prop: 'startImageUrls',
+            disabled: true,
+            labelWidth: 120,
+          }, {
+            label: '到达-当前时间',
+            prop: 'reachTime',
+            disabled: true,
+            labelWidth: 120,
+            span: 8,
+          }, {
+            label: '到达-报备位置',
+            prop: 'reachLocation',
+            disabled: true,
+            span: 8,
+            labelWidth: 120,
+          }, {
+            width: 110,
+            label: '到达-位置图片',
+            fileType: 'img',
+            type: "upload",
+            listType: "picture-card",
+            dataType: "string",
+            prop: 'reachImageUrls',
+            disabled: true,
+            labelWidth: 120,
+          }, {
+            label: '返回-当前时间',
+            prop: 'returnTime',
+            disabled: true,
+            labelWidth: 120,
+            span: 8,
+          }, {
+            label: '返回-报备位置',
+            prop: 'returnLocation',
+            disabled: true,
+            span: 8,
+            labelWidth: 120,
+          }, {
+            width: 110,
+            label: '返回-位置图片',
+            fileType: 'img',
+            type: "upload",
+            listType: "picture-card",
+            dataType: "string",
+            prop: 'returnImageUrls',
+            labelWidth: 120,
+            disabled: true,
+          }, ]
         }
+      }
     },
     methods: {
-        auditPass (type) {
-            update({
-                confirmFlag: type,
-                taskId: this.form.taskId,
-                id: this.form.id
-            }).then(() => {
-                this.$message({
-                    type: "success",
-                    message: "操作成功!",
-                })
-                this.$emit('colseDetail')
-            })
-        },
-        init (data, applyType) {
-            this.applyType = applyType
-            this.form = {}
-            this.getTaskDetail(data.id)
-        },
+      auditPass(type) {
+        update({
+          confirmFlag: type,
+          taskId: this.form.taskId,
+          id: this.form.id
+        }).then(() => {
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          })
+          this.$emit('colseDetail')
+        })
+      },
+      init(data, applyType) {
+        this.applyType = applyType
+        this.form = {}
+        this.getTaskDetail(data.id)
+      },
 
-        getTaskDetail (taskId) {
-            getDetail({
-                taskId: taskId
-            }).then((res) => {
-                this.form = res.data.data
-                if (this.form.reachImageUrls) {
-                    this.form.reachImageUrls = website.minioUrl + this.form.reachImageUrls
-                }
-                if (this.form.returnImageUrls) {
-                    this.form.returnImageUrls = website.minioUrl + this.form.returnImageUrls
-                }
-                if (this.form.startImageUrls) {
-                    this.form.startImageUrls = website.minioUrl + this.form.startImageUrls
-                }
-                if (this.form.locationImageUrls) {
-                    this.form.locationImageUrls = website.minioUrl + this.form.locationImageUrls
-                }
-                // console.table(this.form)
-            })
-        }
+      getTaskDetail(taskId) {
+        getDetail({
+          taskId: taskId
+        }).then((res) => {
+          this.form = res.data.data
+          if (this.form.reachImageUrls) {
+            this.form.reachImageUrls = website.minioUrl + this.form.reachImageUrls
+          }
+          if (this.form.returnImageUrls) {
+            this.form.returnImageUrls = website.minioUrl + this.form.returnImageUrls
+          }
+          if (this.form.startImageUrls) {
+            this.form.startImageUrls = website.minioUrl + this.form.startImageUrls
+          }
+          if (this.form.locationImageUrls) {
+            this.form.locationImageUrls = website.minioUrl + this.form.locationImageUrls
+          }
+          // console.table(this.form)
+        })
+      }
 
     }
-}
+  }
 </script>
 
 <style lang="scss" scoped>
-.cur-container-box {
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
+  .cur-container-box {
+    padding: 50px;
+    // display: flex;
+    // flex-direction: column;
+    // width: 100%;
+    // // height: 100%;
+    // 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>
\ No newline at end of file
diff --git a/src/views/publicSecurity/components/campusReporting.vue b/src/views/publicSecurity/components/campusReporting.vue
index ba18feb..7f67d13 100644
--- a/src/views/publicSecurity/components/campusReporting.vue
+++ b/src/views/publicSecurity/components/campusReporting.vue
@@ -1,251 +1,247 @@
 <template>
-    <div class="cur-container-box">
-        <div v-if="applyType == 1">
-            <div class="content-box">
-                审核当前项
-            </div>
-            <div class="footer-btn-box">
-                <el-button type="primary" size="small" @click="auditPass(2)">通 过</el-button>
-                <el-button size="small" @click="auditPass(3)">驳 回</el-button>
-            </div>
-        </div>
-
-        <avue-form v-else :option="option" v-model="form"></avue-form>
+  <div class="cur-container-box">
+    <div v-if="applyType == 1">
+      <div class="content-box">
+        审核当前项
+      </div>
+      <div class="footer-btn-box">
+        <el-button type="primary" size="small" @click="auditPass(2)">通 过</el-button>
+        <el-button size="small" @click="auditPass(3)">驳 回</el-button>
+      </div>
     </div>
+
+    <avue-form v-else :option="option" v-model="form"></avue-form>
+  </div>
 </template>
 <script>
-import {
+  import {
     getDetail,
     update
-} from "@/api/task/campusReporting"
-import website from '@/config/website'
-export default {
-    data () {
-        return {
-            form: {},
-            applyType: '',
-            option: {
-                submitBtn: false,
-                emptyBtn: false,
-                column: [{
-                    label: '申请人',
-                    prop: 'checkUserName',
-                    disabled: true,
-                }, {
-                    label: '申请人手机',
-                    prop: 'checkTelephone',
-                    disabled: true,
-                }, {
-                    label: '申请位置',
-                    prop: 'location',
-                    disabled: true,
-                }, {
-                    label: '申请时间',
-                    prop: 'checkTime',
-                    disabled: true,
-                }, {
-                    label: '安全通道',
-                    prop: 'scStatus',
-                    disabled: true,
-                }, {
-                    width: 110,
-                    label: '安全通道图片',
-                    prop: 'scImageUrls',
-                    fileType: 'img',
-                    type: "upload",
-                    listType: "picture-card",
-                    dataType: "string",
-                    disabled: true,
-                    labelWidth: 120,
-                }, {
-                    label: '未成年人入住登记本照片',
-                    prop: 'uanImageUrls',
-                    fileType: 'img',
-                    type: "upload",
-                    listType: "picture-card",
-                    dataType: "string",
-                    disabled: true,
-                    labelWidth: 120,
-                }, {
-                    label: '审核时间',
-                    prop: 'confirmTime',
-                    disabled: true,
-                }, {
-                    label: '审核人',
-                    prop: 'confirmUserName',
-                    disabled: true,
-                }, {
-                    label: '审核意见',
-                    prop: 'confirmNotion',
-                    disabled: true,
-                }, {
-                    label: '审核状态',
-                    prop: 'confirmFlag',
-                    type: 'select',
-                    dicData: [{
-                        label: '待审核',
-                        value: '1'
-                    }, {
-                        label: '审核通过',
-                        value: '2'
-                    }, {
-                        label: '审核不通过',
-                        value: '3'
-                    }],
-                    disabled: true,
-                }, {
-                    label: '校园名称',
-                    prop: 'campusName',
-                    disabled: true,
-                }, {
-                    label: '消费器材数量',
-                    prop: 'fireFacsNums',
-                    disabled: true,
-                    labelWidth: 120,
-                }, {
-                    label: '消费器材状态',
-                    prop: 'fireFacsStatus',
-                    disabled: true,
-                    labelWidth: 120,
-                }, {
-                    width: 110,
-                    label: '消费器材图片',
-                    prop: 'fireFacsImageUrls',
-                    fileType: 'img',
-                    type: "upload",
-                    listType: "picture-card",
-                    dataType: "string",
-                    disabled: true,
-                    labelWidth: 120,
-                }, {
-                    label: '消防器材种类',
-                    prop: 'fireFacsType',
-                    disabled: true,
-                    labelWidth: 120,
-                }, {
-                    label: '校园周边安全巡查照片',
-                    prop: 'patrolImageUrls',
-                    disabled: true,
-                    labelWidth: 120,
-                }, {
-                    label: '学校大门是否配备防撞装置',
-                    prop: 'antiCollision',
-                    disabled: true,
-                    labelWidth: 120,
-                }, {
-                    label: '校园防撞装置照片',
-                    prop: 'antiCollisionImageUrls',
-                    fileType: 'img',
-                    type: "upload",
-                    listType: "picture-card",
-                    dataType: "string",
-                    disabled: true,
-                    labelWidth: 120,
-                }, {
-                    label: '专职保安人数',
-                    prop: 'fullSoNums',
-                    labelWidth: 120,
-                    disabled: true,
-                }, {
-                    label: '兼职保安人数',
-                    prop: 'partSoNums',
-                    labelWidth: 120,
-                    disabled: true,
-                }, {
-                    label: '学校监控总数',
-                    prop: 'monitorNums',
-                    disabled: true,
-                    labelWidth: 120,
-                }, {
-                    label: '监控是否全覆盖',
-                    prop: 'monitorOver',
-                    disabled: true,
-                    labelWidth: 120,
-                }, {
-                    label: '高空抛物监控',
-                    prop: 'highAltitudeMonitor',
-                    disabled: true,
-                    labelWidth: 120,
-                }, {
-                    label: '高空抛物监控照片',
-                    prop: 'haImageUrls',
-                    fileType: 'img',
-                    type: "upload",
-                    listType: "picture-card",
-                    dataType: "string",
-                    disabled: true,
-                    labelWidth: 120,
-                },]
-            }
+  } from "@/api/task/campusReporting"
+  import website from '@/config/website'
+  export default {
+    data() {
+      return {
+        form: {},
+        applyType: '',
+        option: {
+          submitBtn: false,
+          emptyBtn: false,
+          column: [{
+            label: '申请人',
+            prop: 'checkUserName',
+            disabled: true,
+          }, {
+            label: '申请人手机',
+            prop: 'checkTelephone',
+            disabled: true,
+          }, {
+            label: '申请位置',
+            prop: 'location',
+            disabled: true,
+          }, {
+            label: '申请时间',
+            prop: 'checkTime',
+            disabled: true,
+          }, {
+            label: '安全通道',
+            prop: 'scStatus',
+            disabled: true,
+          }, {
+            width: 110,
+            label: '安全通道图片',
+            prop: 'scImageUrls',
+            fileType: 'img',
+            type: "upload",
+            listType: "picture-card",
+            dataType: "string",
+            disabled: true,
+            labelWidth: 120,
+          }, {
+            label: '未成年人入住登记本照片',
+            prop: 'uanImageUrls',
+            fileType: 'img',
+            type: "upload",
+            listType: "picture-card",
+            dataType: "string",
+            disabled: true,
+            labelWidth: 120,
+          }, {
+            label: '审核时间',
+            prop: 'confirmTime',
+            disabled: true,
+          }, {
+            label: '审核人',
+            prop: 'confirmUserName',
+            disabled: true,
+          }, {
+            label: '审核意见',
+            prop: 'confirmNotion',
+            disabled: true,
+          }, {
+            label: '审核状态',
+            prop: 'confirmFlag',
+            type: 'select',
+            dicData: [{
+              label: '待审核',
+              value: '1'
+            }, {
+              label: '审核通过',
+              value: '2'
+            }, {
+              label: '审核不通过',
+              value: '3'
+            }],
+            disabled: true,
+          }, {
+            label: '校园名称',
+            prop: 'campusName',
+            disabled: true,
+          }, {
+            label: '消费器材数量',
+            prop: 'fireFacsNums',
+            disabled: true,
+            labelWidth: 120,
+          }, {
+            label: '消费器材状态',
+            prop: 'fireFacsStatus',
+            disabled: true,
+            labelWidth: 120,
+          }, {
+            width: 110,
+            label: '消费器材图片',
+            prop: 'fireFacsImageUrls',
+            fileType: 'img',
+            type: "upload",
+            listType: "picture-card",
+            dataType: "string",
+            disabled: true,
+            labelWidth: 120,
+          }, {
+            label: '消防器材种类',
+            prop: 'fireFacsType',
+            disabled: true,
+            labelWidth: 120,
+          }, {
+            label: '校园周边安全巡查照片',
+            prop: 'patrolImageUrls',
+            disabled: true,
+            labelWidth: 120,
+          }, {
+            label: '学校大门是否配备防撞装置',
+            prop: 'antiCollision',
+            disabled: true,
+            labelWidth: 120,
+          }, {
+            label: '校园防撞装置照片',
+            prop: 'antiCollisionImageUrls',
+            fileType: 'img',
+            type: "upload",
+            listType: "picture-card",
+            dataType: "string",
+            disabled: true,
+            labelWidth: 120,
+          }, {
+            label: '专职保安人数',
+            prop: 'fullSoNums',
+            labelWidth: 120,
+            disabled: true,
+          }, {
+            label: '兼职保安人数',
+            prop: 'partSoNums',
+            labelWidth: 120,
+            disabled: true,
+          }, {
+            label: '学校监控总数',
+            prop: 'monitorNums',
+            disabled: true,
+            labelWidth: 120,
+          }, {
+            label: '监控是否全覆盖',
+            prop: 'monitorOver',
+            disabled: true,
+            labelWidth: 120,
+          }, {
+            label: '高空抛物监控',
+            prop: 'highAltitudeMonitor',
+            disabled: true,
+            labelWidth: 120,
+          }, {
+            label: '高空抛物监控照片',
+            prop: 'haImageUrls',
+            fileType: 'img',
+            type: "upload",
+            listType: "picture-card",
+            dataType: "string",
+            disabled: true,
+            labelWidth: 120,
+          }, ]
         }
+      }
     },
     methods: {
-        auditPass (type) {
-            update({
-                status: type,
-                taskId: this.form.taskId,
-                id: this.form.id
-            }).then(() => {
-                this.$message({
-                    type: "success",
-                    message: "操作成功!",
-                })
-                this.$emit('colseDetail')
-            })
-        },
-        init (data, applyType) {
-            this.applyType = applyType
-            this.getTaskDetail(data.id)
-        },
+      auditPass(type) {
+        update({
+          status: type,
+          taskId: this.form.taskId,
+          id: this.form.id
+        }).then(() => {
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          })
+          this.$emit('colseDetail')
+        })
+      },
+      init(data, applyType) {
+        this.applyType = applyType
+        this.getTaskDetail(data.id)
+      },
 
-        getTaskDetail (taskId) {
-            getDetail({
-                taskId: taskId
-            }).then((res) => {
-                this.form = res.data.data
-                if (this.form.haImageUrls) {
-                    this.form.haImageUrls = website.minioUrl + this.form.haImageUrls
-                }
-                if (this.form.scImageUrls) {
-                    this.form.scImageUrls = website.minioUrl + this.form.scImageUrls
-                }
-                if (this.form.antiCollisionImageUrls) {
-                    this.form.antiCollisionImageUrls = website.minioUrl + this.form.antiCollisionImageUrls
-                }
-                if (this.form.patrolImageUrls) {
-                    this.form.patrolImageUrls = website.minioUrl + this.form.patrolImageUrls
-                }
-                if (this.form.fireFacsImageUrls) {
-                    this.form.fireFacsImageUrls = website.minioUrl + this.form.fireFacsImageUrls
-                }
-            })
-        }
+      getTaskDetail(taskId) {
+        getDetail({
+          taskId: taskId
+        }).then((res) => {
+          this.form = res.data.data
+          if (this.form.haImageUrls) {
+            this.form.haImageUrls = website.minioUrl + this.form.haImageUrls
+          }
+          if (this.form.scImageUrls) {
+            this.form.scImageUrls = website.minioUrl + this.form.scImageUrls
+          }
+          if (this.form.antiCollisionImageUrls) {
+            this.form.antiCollisionImageUrls = website.minioUrl + this.form.antiCollisionImageUrls
+          }
+          if (this.form.patrolImageUrls) {
+            this.form.patrolImageUrls = website.minioUrl + this.form.patrolImageUrls
+          }
+          if (this.form.fireFacsImageUrls) {
+            this.form.fireFacsImageUrls = website.minioUrl + this.form.fireFacsImageUrls
+          }
+        })
+      }
 
     }
-}
+  }
 </script>
 
 <style lang="scss" scoped>
-.cur-container-box {
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
+  .cur-container-box {
+    padding: 50px;
 
     .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>
\ No newline at end of file
diff --git a/src/views/publicSecurity/components/hotelReporting.vue b/src/views/publicSecurity/components/hotelReporting.vue
index d081c84..11519c4 100644
--- a/src/views/publicSecurity/components/hotelReporting.vue
+++ b/src/views/publicSecurity/components/hotelReporting.vue
@@ -1,303 +1,299 @@
 <template>
-    <div class="cur-container-box">
-        <div v-if="applyType == 1">
-            <div class="content-box">
-                审核当前项
-            </div>
-            <div class="footer-btn-box">
-                <el-button type="primary" size="small" @click="auditPass(2)">通 过</el-button>
-                <el-button size="small" @click="auditPass(3)">驳 回</el-button>
-            </div>
-        </div>
-
-        <avue-form v-else :option="option" v-model="form"></avue-form>
+  <div class="cur-container-box">
+    <div v-if="applyType == 1">
+      <div class="content-box">
+        审核当前项
+      </div>
+      <div class="footer-btn-box">
+        <el-button type="primary" size="small" @click="auditPass(2)">通 过</el-button>
+        <el-button size="small" @click="auditPass(3)">驳 回</el-button>
+      </div>
     </div>
+
+    <avue-form v-else :option="option" v-model="form"></avue-form>
+  </div>
 </template>
 <script>
-import {
+  import {
     getDetail,
     update
-} from "@/api/task/hotelReporting"
-import website from '@/config/website'
-export default {
-    data () {
-        return {
-            form: {},
-            applyType: '',
-            option: {
-                submitBtn: false,
-                emptyBtn: false,
-                column: [{
-                    label: '酒店名称',
-                    prop: 'hotelName',
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                }, {
-                    label: '申请时间',
-                    prop: 'checkTime',
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                }, {
-                    label: '申请人',
-                    prop: 'checkUserName',
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                }, {
-                    label: '申请人手机',
-                    prop: 'checkTelephone',
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                }, {
-                    label: '申请位置',
-                    prop: 'location',
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                }, {
-                    label: '灭火器数量',
-                    prop: 'fireNums',
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                }, {
-                    label: '灭火器状态',
-                    prop: 'fireStatus',
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                }, {
-                    width: 110,
-                    label: '灭火器图片',
-                    prop: 'fireImageUrls',
-                    fileType: 'img',
-                    type: "upload",
-                    listType: "picture-card",
-                    dataType: "string",
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                }, {
-                    label: '安全通道状态',
-                    prop: 'scStatus',
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                }, {
-                    width: 110,
-                    label: '安全通道图片',
-                    prop: 'scImageUrls',
-                    fileType: 'img',
-                    type: "upload",
-                    listType: "picture-card",
-                    dataType: "string",
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                }, {
-                    label: '技防设施有无',
-                    prop: 'pfFlag',
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                }, {
-                    label: '技防设施名称',
-                    prop: 'pfName',
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                    type: 'select',
-                    dicData: [{
-                        label: '有',
-                        value: '1'
-                    },
-                    {
-                        label: '无',
-                        value: '2'
-                    }
-                    ]
+  } from "@/api/task/hotelReporting"
+  import website from '@/config/website'
+  export default {
+    data() {
+      return {
+        form: {},
+        applyType: '',
+        option: {
+          submitBtn: false,
+          emptyBtn: false,
+          column: [{
+              label: '酒店名称',
+              prop: 'hotelName',
+              disabled: true,
+              span: 8,
+              labelWidth: 120,
+            }, {
+              label: '申请时间',
+              prop: 'checkTime',
+              disabled: true,
+              span: 8,
+              labelWidth: 120,
+            }, {
+              label: '申请人',
+              prop: 'checkUserName',
+              disabled: true,
+              span: 8,
+              labelWidth: 120,
+            }, {
+              label: '申请人手机',
+              prop: 'checkTelephone',
+              disabled: true,
+              span: 8,
+              labelWidth: 120,
+            }, {
+              label: '申请位置',
+              prop: 'location',
+              disabled: true,
+              span: 8,
+              labelWidth: 120,
+            }, {
+              label: '灭火器数量',
+              prop: 'fireNums',
+              disabled: true,
+              span: 8,
+              labelWidth: 120,
+            }, {
+              label: '灭火器状态',
+              prop: 'fireStatus',
+              disabled: true,
+              span: 8,
+              labelWidth: 120,
+            }, {
+              width: 110,
+              label: '灭火器图片',
+              prop: 'fireImageUrls',
+              fileType: 'img',
+              type: "upload",
+              listType: "picture-card",
+              dataType: "string",
+              disabled: true,
+              span: 8,
+              labelWidth: 120,
+            }, {
+              label: '安全通道状态',
+              prop: 'scStatus',
+              disabled: true,
+              span: 8,
+              labelWidth: 120,
+            }, {
+              width: 110,
+              label: '安全通道图片',
+              prop: 'scImageUrls',
+              fileType: 'img',
+              type: "upload",
+              listType: "picture-card",
+              dataType: "string",
+              disabled: true,
+              span: 8,
+              labelWidth: 120,
+            }, {
+              label: '技防设施有无',
+              prop: 'pfFlag',
+              disabled: true,
+              span: 8,
+              labelWidth: 120,
+            }, {
+              label: '技防设施名称',
+              prop: 'pfName',
+              disabled: true,
+              span: 8,
+              labelWidth: 120,
+              type: 'select',
+              dicData: [{
+                  label: '有',
+                  value: '1'
                 },
                 {
-                    label: '技防设施照片',
-                    prop: 'pfImageUrls',
-                    fileType: 'img',
-                    type: "upload",
-                    listType: "picture-card",
-                    dataType: "string",
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
+                  label: '无',
+                  value: '2'
+                }
+              ]
+            },
+            {
+              label: '技防设施照片',
+              prop: 'pfImageUrls',
+              fileType: 'img',
+              type: "upload",
+              listType: "picture-card",
+              dataType: "string",
+              disabled: true,
+              span: 8,
+              labelWidth: 120,
+            },
+            {
+              label: '接待未成年人需要做到五个必须',
+              prop: 'fiveMust',
+              disabled: true,
+              span: 8,
+              labelWidth: 120,
+              type: 'select',
+              dicData: [{
+                  label: "必须询问同住人员身份关系情况,并记录备查",
+                  value: '1'
                 },
                 {
-                    label: '接待未成年人需要做到五个必须',
-                    prop: 'fiveMust',
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                    type: 'select',
-                    dicData: [{
-                        label: "必须询问同住人员身份关系情况,并记录备查",
-                        value: '1'
-                    },
-                    {
-                        label: "必须立即向公安机关报告可以情况,并及时联系未成年人的父母获取其他监护人,同时采取相应安全保护措施",
-                        value: '2'
-                    },
-                    {
-                        label: "必须查验入住未成年人身份,并如实登记报送相关信息",
-                        value: '3'
-                    },
-                    {
-                        label: "必须询问未成年父母或者其他监护人的联系方式并记录备查",
-                        value: '4'
-                    },
-                    {
-                        label: "必须加强安全巡查和访客管理,预防针对未成年人的不法侵害",
-                        value: '5'
-                    },
-                    {
-                        label: "以上皆未做到",
-                        value: '6'
-                    }
-                    ]
+                  label: "必须立即向公安机关报告可以情况,并及时联系未成年人的父母获取其他监护人,同时采取相应安全保护措施",
+                  value: '2'
                 },
                 {
-                    label: '未成年人入住登记本照片',
-                    prop: 'uanImageUrls',
-                    fileType: 'img',
-                    type: "upload",
-                    listType: "picture-card",
-                    dataType: "string",
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
+                  label: "必须查验入住未成年人身份,并如实登记报送相关信息",
+                  value: '3'
                 },
                 {
-                    label: '是否完全实名制登记',
-                    prop: 'realName',
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
+                  label: "必须询问未成年父母或者其他监护人的联系方式并记录备查",
+                  value: '4'
                 },
                 {
-                    label: '确认时间',
-                    prop: 'confirmTime',
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
+                  label: "必须加强安全巡查和访客管理,预防针对未成年人的不法侵害",
+                  value: '5'
                 },
                 {
-                    label: '确认用户',
-                    prop: 'confirmUserName',
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                },
-                {
-                    label: '安全通道有无',
-                    prop: 'scFlag',
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
+                  label: "以上皆未做到",
+                  value: '6'
+                }
+              ]
+            },
+            {
+              label: '未成年人入住登记本照片',
+              prop: 'uanImageUrls',
+              fileType: 'img',
+              type: "upload",
+              listType: "picture-card",
+              dataType: "string",
+              disabled: true,
+              span: 8,
+              labelWidth: 120,
+            },
+            {
+              label: '是否完全实名制登记',
+              prop: 'realName',
+              disabled: true,
+              span: 8,
+              labelWidth: 120,
+            },
+            {
+              label: '确认时间',
+              prop: 'confirmTime',
+              disabled: true,
+              span: 8,
+              labelWidth: 120,
+            },
+            {
+              label: '确认用户',
+              prop: 'confirmUserName',
+              disabled: true,
+              span: 8,
+              labelWidth: 120,
+            },
+            {
+              label: '安全通道有无',
+              prop: 'scFlag',
+              disabled: true,
+              span: 8,
+              labelWidth: 120,
 
-                },
-                {
-                    label: '审核意见',
-                    prop: 'confirmNotion',
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                },
-                {
-                    label: '审核状态',
-                    prop: 'confirmFlag',
-                    type: 'select',
-                    dicData: [{
-                        label: '待审核',
-                        value: '1'
-                    }, {
-                        label: '审核通过',
-                        value: '2'
-                    }, {
-                        label: '审核不通过',
-                        value: '3'
-                    }],
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                },
-                ]
-            }
+            },
+            {
+              label: '审核意见',
+              prop: 'confirmNotion',
+              disabled: true,
+              span: 8,
+              labelWidth: 120,
+            },
+            {
+              label: '审核状态',
+              prop: 'confirmFlag',
+              type: 'select',
+              dicData: [{
+                label: '待审核',
+                value: '1'
+              }, {
+                label: '审核通过',
+                value: '2'
+              }, {
+                label: '审核不通过',
+                value: '3'
+              }],
+              disabled: true,
+              span: 8,
+              labelWidth: 120,
+            },
+          ]
         }
+      }
     },
     methods: {
-        auditPass (type) {
-            update({
-                status: type,
-                taskId: this.form.taskId,
-                id: this.form.id
-            }).then(() => {
-                this.$message({
-                    type: "success",
-                    message: "操作成功!",
-                })
-                this.$emit('colseDetail')
-            })
-        },
-        init (data, applyType) {
-            this.applyType = applyType
-            this.getTaskDetail(data.id)
-        },
+      auditPass(type) {
+        update({
+          status: type,
+          taskId: this.form.taskId,
+          id: this.form.id
+        }).then(() => {
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          })
+          this.$emit('colseDetail')
+        })
+      },
+      init(data, applyType) {
+        this.applyType = applyType
+        this.getTaskDetail(data.id)
+      },
 
-        getTaskDetail (taskId) {
-            getDetail({
-                taskId: taskId
-            }).then((res) => {
-                this.form = res.data.data
-                if (this.form.uanImageUrls) {
-                    this.form.uanImageUrls = website.minioUrl + this.form.uanImageUrls
-                }
-                if (this.form.pfImageUrls) {
-                    this.form.pfImageUrls = website.minioUrl + this.form.pfImageUrls
-                }
-                if (this.form.scImageUrls) {
-                    this.form.scImageUrls = website.minioUrl + this.form.scImageUrls
-                }
-                if (this.form.fireImageUrls) {
-                    this.form.fireImageUrls = website.minioUrl + this.form.fireImageUrls
-                }
+      getTaskDetail(taskId) {
+        getDetail({
+          taskId: taskId
+        }).then((res) => {
+          this.form = res.data.data
+          if (this.form.uanImageUrls) {
+            this.form.uanImageUrls = website.minioUrl + this.form.uanImageUrls
+          }
+          if (this.form.pfImageUrls) {
+            this.form.pfImageUrls = website.minioUrl + this.form.pfImageUrls
+          }
+          if (this.form.scImageUrls) {
+            this.form.scImageUrls = website.minioUrl + this.form.scImageUrls
+          }
+          if (this.form.fireImageUrls) {
+            this.form.fireImageUrls = website.minioUrl + this.form.fireImageUrls
+          }
 
-            })
-        }
+        })
+      }
 
     }
-}
+  }
 </script>
 
 <style lang="scss" scoped>
-.cur-container-box {
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
+  .cur-container-box {
+    padding: 50px;
 
     .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>
\ No newline at end of file
diff --git a/src/views/publicSecurity/components/labelReporting.vue b/src/views/publicSecurity/components/labelReporting.vue
index 55845f2..5a56179 100644
--- a/src/views/publicSecurity/components/labelReporting.vue
+++ b/src/views/publicSecurity/components/labelReporting.vue
@@ -1,205 +1,201 @@
 <template>
-    <div class="cur-container-box">
-        <div v-if="applyType == 1">
-            <div class="content-box">
-                审核当前项
-            </div>
-            <div class="footer-btn-box">
-                <el-button type="primary" size="small" @click="auditPass(2)">通 过</el-button>
-                <el-button size="small" @click="auditPass(3)">驳 回</el-button>
-            </div>
-        </div>
-
-        <avue-form v-else :option="option" v-model="form"></avue-form>
+  <div class="cur-container-box">
+    <div v-if="applyType == 1">
+      <div class="content-box">
+        审核当前项
+      </div>
+      <div class="footer-btn-box">
+        <el-button type="primary" size="small" @click="auditPass(2)">通 过</el-button>
+        <el-button size="small" @click="auditPass(3)">驳 回</el-button>
+      </div>
     </div>
+
+    <avue-form v-else :option="option" v-model="form"></avue-form>
+  </div>
 </template>
 <script>
-import {
+  import {
     getDetail,
     update
-} from "@/api/task/labelReporting"
-import website from '@/config/website'
-export default {
-    data () {
-        return {
-            form: {},
-            applyType: '',
-            option: {
-                submitBtn: false,
-                emptyBtn: false,
-                column: [{
-                    label: '房屋名称',
-                    prop: 'houseName',
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                }, {
-                    label: '手机号',
-                    prop: 'phoneNumber',
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                }, {
-                    label: '对象电话',
-                    prop: 'transactionObjectTel',
-                    disabled: true,
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                }, {
-                    label: '交易金额',
-                    prop: 'transactionMoney',
-                    disabled: true,
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                }, {
-                    label: '物品数量',
-                    prop: 'goodsNums',
-                    disabled: true,
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                }, {
-                    label: '发生时间',
-                    prop: 'happenTime',
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                }, {
-                    label: '审核时间',
-                    prop: 'confirmTime',
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                }, {
-                    label: '位置',
-                    prop: 'localtion',
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                }, {
-                    label: '审核意见',
-                    prop: 'confirmNotion',
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                }, {
-                    label: '审核状态',
-                    prop: 'confirmFlag',
-                    type: 'select',
-                    dicData: [{
-                        label: '待审核',
-                        value: '1'
-                    }, {
-                        label: '审核通过',
-                        value: '2'
-                    }, {
-                        label: '审核不通过',
-                        value: '3'
-                    }],
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                }, {
-                    label: '交易对象',
-                    prop: 'transactionObject',
-                    disabled: true,
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                }, {
-                    label: '交易过程',
-                    prop: 'transactionProcess',
-                    disabled: true,
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                }, {
-                    label: '物品照片',
-                    prop: 'goodsImageUrls',
-                    fileType: 'img',
-                    type: "upload",
-                    listType: "picture-card",
-                    dataType: "string",
-                    disabled: true,
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                }, {
-                    width: 110,
-                    label: '身份证图片',
-                    prop: 'imageUrls',
-                    fileType: 'img',
-                    type: "upload",
-                    listType: "picture-card",
-                    dataType: "string",
-                    disabled: true,
-                    span: 8,
-                    labelWidth: 120,
-                },]
-            }
+  } from "@/api/task/labelReporting"
+  import website from '@/config/website'
+  export default {
+    data() {
+      return {
+        form: {},
+        applyType: '',
+        option: {
+          submitBtn: false,
+          emptyBtn: false,
+          column: [{
+            label: '房屋名称',
+            prop: 'houseName',
+            disabled: true,
+            span: 8,
+            labelWidth: 120,
+          }, {
+            label: '手机号',
+            prop: 'phoneNumber',
+            disabled: true,
+            span: 8,
+            labelWidth: 120,
+          }, {
+            label: '对象电话',
+            prop: 'transactionObjectTel',
+            disabled: true,
+            disabled: true,
+            span: 8,
+            labelWidth: 120,
+          }, {
+            label: '交易金额',
+            prop: 'transactionMoney',
+            disabled: true,
+            disabled: true,
+            span: 8,
+            labelWidth: 120,
+          }, {
+            label: '物品数量',
+            prop: 'goodsNums',
+            disabled: true,
+            disabled: true,
+            span: 8,
+            labelWidth: 120,
+          }, {
+            label: '发生时间',
+            prop: 'happenTime',
+            disabled: true,
+            span: 8,
+            labelWidth: 120,
+          }, {
+            label: '审核时间',
+            prop: 'confirmTime',
+            disabled: true,
+            span: 8,
+            labelWidth: 120,
+          }, {
+            label: '位置',
+            prop: 'localtion',
+            disabled: true,
+            span: 8,
+            labelWidth: 120,
+          }, {
+            label: '审核意见',
+            prop: 'confirmNotion',
+            disabled: true,
+            span: 8,
+            labelWidth: 120,
+          }, {
+            label: '审核状态',
+            prop: 'confirmFlag',
+            type: 'select',
+            dicData: [{
+              label: '待审核',
+              value: '1'
+            }, {
+              label: '审核通过',
+              value: '2'
+            }, {
+              label: '审核不通过',
+              value: '3'
+            }],
+            disabled: true,
+            span: 8,
+            labelWidth: 120,
+          }, {
+            label: '交易对象',
+            prop: 'transactionObject',
+            disabled: true,
+            disabled: true,
+            span: 8,
+            labelWidth: 120,
+          }, {
+            label: '交易过程',
+            prop: 'transactionProcess',
+            disabled: true,
+            disabled: true,
+            span: 8,
+            labelWidth: 120,
+          }, {
+            label: '物品照片',
+            prop: 'goodsImageUrls',
+            fileType: 'img',
+            type: "upload",
+            listType: "picture-card",
+            dataType: "string",
+            disabled: true,
+            disabled: true,
+            span: 8,
+            labelWidth: 120,
+          }, {
+            width: 110,
+            label: '身份证图片',
+            prop: 'imageUrls',
+            fileType: 'img',
+            type: "upload",
+            listType: "picture-card",
+            dataType: "string",
+            disabled: true,
+            span: 8,
+            labelWidth: 120,
+          }, ]
         }
+      }
     },
     methods: {
-        auditPass (type) {
-            update({
-                status: type,
-                taskId: this.form.taskId,
-                id: this.form.id
-            }).then(() => {
-                this.$message({
-                    type: "success",
-                    message: "操作成功!",
-                })
-                this.$emit('colseDetail')
-            })
-        },
-        init (data, applyType) {
-            this.applyType = applyType
-            this.getTaskDetail(data.id)
-        },
+      auditPass(type) {
+        update({
+          status: type,
+          taskId: this.form.taskId,
+          id: this.form.id
+        }).then(() => {
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          })
+          this.$emit('colseDetail')
+        })
+      },
+      init(data, applyType) {
+        this.applyType = applyType
+        this.getTaskDetail(data.id)
+      },
 
-        getTaskDetail (taskId) {
-            getDetail({
-                taskId: taskId
-            }).then((res) => {
-                this.form = res.data.data
-                if (this.form.imageUrls) {
-                    this.form.imageUrls = website.minioUrl + this.form.imageUrls
-                }
-                if (this.form.goodsImageUrls) {
-                    this.form.goodsImageUrls = website.minioUrl + this.form.goodsImageUrls
-                }
+      getTaskDetail(taskId) {
+        getDetail({
+          taskId: taskId
+        }).then((res) => {
+          this.form = res.data.data
+          if (this.form.imageUrls) {
+            this.form.imageUrls = website.minioUrl + this.form.imageUrls
+          }
+          if (this.form.goodsImageUrls) {
+            this.form.goodsImageUrls = website.minioUrl + this.form.goodsImageUrls
+          }
 
-            })
-        }
+        })
+      }
 
     }
-}
+  }
 </script>
 
 <style lang="scss" scoped>
-.cur-container-box {
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
+  .cur-container-box {
+    padding: 50px;
 
     .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>
\ No newline at end of file
diff --git a/src/views/publicSecurity/keynotePersonnelManage.vue b/src/views/publicSecurity/keynotePersonnelManage.vue
new file mode 100644
index 0000000..30e8fb3
--- /dev/null
+++ b/src/views/publicSecurity/keynotePersonnelManage.vue
@@ -0,0 +1,551 @@
+<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="scope" slot="menu">
+        <el-button type="text" size="small" icon="el-icon-view" plain @click="lookDetail(scope.row,0)">查 看
+        </el-button>
+        <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>
+      </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>
+  </basic-container>
+</template>
+
+<script>
+  import {
+    statisticalLabels
+  } from "/src/api/userHouse/list/userHouseList"
+
+  // import {
+  //   getList,
+  //   removeTask,
+  //   update,
+  //   add,
+  // } from "@/api/task/task"
+
+  import {
+    mapGetters
+  } from "vuex"
+
+  import website from '@/config/website'
+  import campusReporting from './components/campusReporting'
+  import hotelReporting from './components/hotelReporting'
+  import labelReporting from './components/labelReporting'
+
+  export default {
+    data() {
+      return {
+        taskType: 0,
+        curRow: {},
+        roleBox: false,
+
+        form: {},
+        query: {},
+        loading: true,
+
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0,
+        },
+        datetime: "",
+        selectionList: [],
+        option: {
+          height: "auto",
+          calcHeight: 54,
+          dialogWidth: 950,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 3,
+          menuWidth: 280,
+          // menu: false,
+          border: true,
+          //stripe:true,
+          index: true,
+          // viewBtn: true,
+          editBtn: false,
+          delBtn: false,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            // {
+            //   span: 12,
+            //   label: "场所名称",
+            //   prop: "name",
+            //   searchSpan: 4,
+            //   search: true,
+            // },
+            {
+              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,
+              searchSpan: 4,
+              prop: "streetCode",
+              type: "tree",
+              dicUrl: "/api/blade-system/region/getTownTree",
+              props: {
+                label: "name",
+                value: "id"
+              },
+              rules: [{
+                required: true,
+                message: "请选择所属街道",
+                trigger: "blur",
+              }, ],
+            }, {
+              // 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",
+              searchSpan: 4,
+              // search: true,
+              rules: [{
+                required: true,
+                message: "请输入场所名称",
+                trigger: "blur",
+              }, ],
+            },
+          ],
+        },
+        data: [],
+
+        auditBasePopup: false,
+      }
+    },
+
+    provide() {
+      return {
+        placeElement: this,
+      }
+    },
+
+    components: {
+      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(",")
+      },
+
+    },
+    methods: {
+
+      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,
+        }
+        this.loading = true
+        statisticalLabels(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 {
+    line-height: 6;
+  }
+
+  .cur-container-box {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+
+    .content-box {
+      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;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/publicSecurity/keynotePlaceManage.vue b/src/views/publicSecurity/keynotePlaceManage.vue
index 45ca163..3ec10d6 100644
--- a/src/views/publicSecurity/keynotePlaceManage.vue
+++ b/src/views/publicSecurity/keynotePlaceManage.vue
@@ -78,63 +78,7 @@
           delBtn: false,
           selection: true,
           dialogClickModal: false,
-          column: [{
-              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",
-              }, ],
-            }, {
-              // 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",
-              }, ],
-            },
+          column: [
             // {
             //   span: 12,
             //   label: "场所名称",
@@ -142,6 +86,22 @@
             //   searchSpan: 4,
             //   search: true,
             // },
+            {
+              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: "名称",
@@ -154,52 +114,6 @@
               prop: "phone",
               searchSpan: 4,
               search: true,
-            }, {
-              span: 12,
-              label: "地址",
-              prop: "addressName",
-              searchSpan: 4,
-            }, {
-              label: "创建时间",
-              prop: "createTime",
-              searchSpan: 4,
-
-            }, {
-              span: 12,
-              label: "地址",
-              prop: "addressName",
-              searchSpan: 4,
-              // search: true,
-              rules: [{
-                required: true,
-                message: "请输入场所名称",
-                trigger: "blur",
-              }, ],
-            }, {
-              label: "创建时间",
-              prop: "createTime",
-              searchSpan: 4,
-
-            },
-
-            {
-              addDisplay: false,
-              editDisplay: false,
-              viewDisplay: false,
-              label: '审核状态',
-              prop: 'status',
-              type: 'radio',
-              slot: true,
-              dicData: [{
-                label: '待审核',
-                value: 1
-              }, {
-                label: '已审核',
-                value: 2
-              }, {
-                label: '未通过',
-                value: 3
-              }]
             }, {
               addDisplay: false,
               editDisplay: false,
@@ -227,6 +141,97 @@
                 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,
+              searchSpan: 4,
+              prop: "streetCode",
+              type: "tree",
+              dicUrl: "/api/blade-system/region/getTownTree",
+              props: {
+                label: "name",
+                value: "id"
+              },
+              rules: [{
+                required: true,
+                message: "请选择所属街道",
+                trigger: "blur",
+              }, ],
+            }, {
+              // 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",
+              searchSpan: 4,
+              // search: true,
+              rules: [{
+                required: true,
+                message: "请输入场所名称",
+                trigger: "blur",
+              }, ],
+            },
           ],
         },
         data: [],
diff --git a/src/views/work/process/maintenanceFundApply/handle.vue b/src/views/work/process/maintenanceFundApply/handle.vue
index 2ad6dad..d911f4d 100644
--- a/src/views/work/process/maintenanceFundApply/handle.vue
+++ b/src/views/work/process/maintenanceFundApply/handle.vue
@@ -3,44 +3,16 @@
     <el-form ref="form" :model="form" :rules="rules" label-width="80px">
       <el-row type="flex" class="row-bg" justify="end">
         <el-form-item>
-          <el-button type="primary" @click="handleAgree">同意</el-button>
-          <el-button type="danger" @click="handleDisagree">驳回</el-button>
           <el-button @click="handleCancel">关闭</el-button>
         </el-form-item>
       </el-row>
 
-
-
       <el-card shadow="hover">
-
         <div slot="header">
           <span>审批信息</span>
         </div>
-
         <avue-form :option="option" v-model="form"></avue-form>
-        <!-- <el-form-item label="申请人">
-          <el-input :disabled="true" v-model="form.flow.assigneeName" />
-        </el-form-item>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="开始时间">
-              <el-input :disabled="true" v-model="form.startTime" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="结束时间">
-              <el-input :disabled="true" v-model="form.endTime" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-form-item label="请假理由">
-          <el-input :disabled="true" type="textarea" v-model="form.reason" />
-        </el-form-item>
-        <el-form-item label="批复意见">
-          <el-input type="textarea" v-model="form.comment" />
-        </el-form-item> -->
       </el-card>
-
 
       <el-card shadow="hover">
         <div slot="header">
@@ -68,6 +40,21 @@
         </el-row>
       </el-card>
     </el-form>
+
+    <!-- <div style="">
+      <el-button type="primary" @click="handleAgree">同意</el-button>
+      <el-button type="danger" @click="handleDisagree">驳回</el-button>
+    </div> -->
+
+    <div style="text-align: center;
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 10px;">
+      <el-button type="primary" @click="handleAgree">同意</el-button>
+      <el-button type="danger" @click="handleDisagree">驳回</el-button>
+    </div>
+
   </basic-container>
 </template>
 
@@ -409,4 +396,18 @@
       }
     }
   }
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+  .container {
+    position: relative;
+    /* 确保按钮相对于该元素定位 */
+  }
+
+  #myButton {
+    position: fixed;
+    bottom: 0;
+    left: 50%;
+    transform: translateX(-50%);
+  }
+</style>
\ No newline at end of file

--
Gitblit v1.9.3