Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

shuishen

2024-02-18 0a8ff255ec6a542688b54b95b3803d7be408ad8d

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

 sh.exe.stackdump

@@ -1,7 +1,7 @@
Stack trace:
Frame        Function    Args
000FFFFB540  00180064365 (00180275F10, 00180266FD1, 000FFFFCA60, 000FFFFBA20)
000FFFFBA70  001800499D2 (00100002000, 0018034EB10, 00000000001, 00000000150)
000FFFFBA70  001800499D2 (00100002000, 0018034EB10, 00000000001, 0000000015C)
000FFFFCA80  00180049A11 (00000000001, 0018034EE20, 000FFFFCA60, 00000000008)
000FFFFCB10  0018005CFCD (00000000000, 000FFFFCC40, 001800DC3EF, 00000000000)
000FFFFCBF0  0018005D12B (000FFFFCDF0, 00000000000, FFFFFFFFFFFFFFD7, 00000000000)

 src/views/propertySupervision/propertyCompanyDistrict.vue

@@ -72,6 +72,7 @@
                viewBtn: true,
                selection: true,
                dialogClickModal: false,
                addBtn:false,
                column: [{
                    overHidden: true,
                    label: '小区名称',

 src/views/propertySupervision/propertyEvaluation.vue

@@ -109,6 +109,7 @@
                delBtn: false,
                selection: true,
                dialogClickModal: false,
                addBtn:false,
                column: [{
                    overHidden: true,
                    label: "物业公司名称",

 src/views/publicSecurity/bailReporting.vue

@@ -88,7 +88,7 @@
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 210,

                header: false,
                height: "auto",
                calcHeight: 54,
                dialogWidth: 950,
@@ -102,6 +102,7 @@
                editBtn: false,
                selection: true,
                dialogClickModal: false,
                header:false,
                column: [{
                    span: 12,
                    label: "社区",
@@ -498,4 +499,5 @@
<style>
.avue-upload__icon {
    line-height: 6;
}</style>
}
</style>

 src/views/publicSecurity/components/labelReporting.vue

@@ -28,8 +28,14 @@
          submitBtn: false,
          emptyBtn: false,
          column: [{
            label: '房屋名称',
            prop: 'houseName',
                    label: '用户姓名',
                    prop: 'owner',
                    disabled: true,
                    span: 8,
                    labelWidth: 120,
                }, {
                    label: '身份证号',
                    prop: 'idCard',
            disabled: true,
            span: 8,
            labelWidth: 120,

 src/views/publicSecurity/keynotePersonnelManage.vue

@@ -1,9 +1,10 @@
<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">
            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)">查 看
@@ -107,6 +108,7 @@
          delBtn: false,
          addBtn: false,
          // selection: true,
                header: false,
          dialogClickModal: false,
          column: [{
              span: 12,

 src/views/publicSecurity/keynotePlaceManage.vue

@@ -126,6 +126,7 @@
                editBtn: false,
                delBtn: false,
                selection: true,
                header: false,
                dialogClickModal: false,
                column: [{
                    span: 12,

 src/views/publicSecurity/ninePlaceManage/archivesManage.vue

@@ -204,6 +204,7 @@
                var data = {
                    ...this.query
                }
                data.isNine = 1
                data = Qs.stringify(data)
                exportBlob(
                    `/api/blade-place/place/exportNineType?${this.website.tokenHeader}=${getToken()}&` + data

 src/views/publicSecurity/ninePlaceManage/hiddenDangerStatistics.vue

@@ -579,6 +579,12 @@
                    endTime: this.getLastMouth()[1],
                }
            }
            if ('startTime' in this.query) {
                this.query.startTime += ' 00:00:00'
            }
            if ('endTime' in this.query) {
                this.query.endTime += ' 23:59:59'
            }
            getYHTJList(this.query).then(res => {
                console.log('getZGQKList', res.data.data)
                const data = res.data.data

 src/views/publicSecurity/ninePlaceManage/patrolRecord.vue

@@ -356,7 +356,7 @@

        // 九小类型转换
        switchNineType (type) {
            return this.nineTypeList.find(item => item.key === type).title
            return this.nineTypeList.find(item => item.key === type) ? this.nineTypeList.find(item => item.key === type).title : ''
        },

        // 获取问题类型

 src/views/publicSecurity/ninePlaceManage/situationRectification.vue

@@ -310,7 +310,7 @@
                            value: 4,
                        }
                    ],
                    search: true,
                    search: false,
                    searchSpan: 4,
                    searchLabelWidth: 106,
                }, {
@@ -636,7 +636,7 @@
            }
            this.query = params
            this.page.currentPage = 1
            this.onLoad(this.page, params)
            this.onLoad(this.page)
            done()
        },

@@ -703,6 +703,12 @@
            } else if (this.typeStatus == 3) {
                this.query.status = ''
            }
            if ('startTime' in this.query) {
                this.query.startTime += ' 00:00:00'
            }
            if ('endTime' in this.query) {
                this.query.endTime += ' 23:59:59'
            }
            getZGQKList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
                console.log('getZGQKList', res.data.data)
                const data = res.data.data

 src/views/publicSecurity/positionManage/TransactRegist.vue

@@ -127,6 +127,7 @@
                editBtn: false,
                delBtn: false,
                selection: true,
                header: false,
                dialogClickModal: false,
                column: [{
                    span: 12,

 src/views/publicSecurity/positionManage/fileManage.vue

@@ -204,6 +204,7 @@
                var data = {
                    ...this.query
                }
                data.isFront = 1
                data = Qs.stringify(data)
                exportBlob(
                    `/api/blade-place/place/exportNineType?${this.website.tokenHeader}=${getToken()}&` + data