Merge remote-tracking branch 'origin/master'

linwei

2024-02-19 92fab5c1b7693ec22d0e64f907c3161985edbcf1

Merge remote-tracking branch 'origin/master'

 src/views/propertySupervision/houseHoldSupervision.vue

@@ -874,11 +874,11 @@
                })
                option && myCharts.setOption(option)
            }
            myCharts.on('click', (params) => {
                console.log(params)
                this.query.labelId = params.data.id
                this.onLoad(this.page, this.query)
            })
            // myCharts.on('click', (params) => {
            //     console.log(params)
            //     this.query.labelId = params.data.id
            //     this.onLoad(this.page, this.query)
            // })
        },

        setBarEchartsOption (data) {
@@ -984,10 +984,10 @@

            this.myChart.setOption(option)

            this.myChart.on('click', (params) => {
                this.query.neiName = params.data.name
                this.onLoad(this.page, this.query)
            })
            // this.myChart.on('click', (params) => {
            //     this.query.neiName = params.data.name
            //     this.onLoad(this.page, this.query)
            // })
        }
    }
}

 src/views/propertySupervision/residentSupervision.vue

@@ -846,11 +846,11 @@
                option.legend.type = series.length > 4 ? "scroll" : "plain"
                option.series[0].data = series
                option && myCharts.setOption(option)
                myCharts.on('click', (params) => {
                    console.log(params)
                    this.query.labelId = params.data.id
                    this.onLoad(this.page, this.query)
                })
                // myCharts.on('click', (params) => {
                //     console.log(params)
                //     this.query.labelId = params.data.id
                //     this.onLoad(this.page, this.query)
                // })
            }



 src/views/publicSecurity/components/labelReporting.vue

@@ -28,67 +28,67 @@
                submitBtn: false,
                emptyBtn: false,
                column: [{
                    label: '用户姓名',
                    label: '场所负责人',
                    prop: 'owner',
                    disabled: true,
                    span: 8,
                    span: 12,
                    labelWidth: 120,
                }, {
                    label: '场所负责人电话',
                    prop: 'phoneNumber',
                    disabled: true,
                    span: 12,
                    labelWidth: 120,
                }, {
                    label: '身份证号',
                    prop: 'idCard',
                    disabled: true,
                    span: 8,
                    span: 12,
                    labelWidth: 120,
                }, {
                    label: '手机号',
                    prop: 'phoneNumber',
                    disabled: true,
                    span: 8,
                    labelWidth: 120,
                }, {
                    label: '对象电话',
                    label: '交易对象电话',
                    prop: 'transactionObjectTel',
                    disabled: true,
                    disabled: true,
                    span: 8,
                    span: 12,
                    labelWidth: 120,
                }, {
                    label: '交易金额',
                    prop: 'transactionMoney',
                    disabled: true,
                    disabled: true,
                    span: 8,
                    span: 12,
                    labelWidth: 120,
                }, {
                    label: '物品数量',
                    prop: 'goodsNums',
                    disabled: true,
                    disabled: true,
                    span: 8,
                    span: 12,
                    labelWidth: 120,
                }, {
                    label: '发生时间',
                    prop: 'happenTime',
                    disabled: true,
                    span: 8,
                    span: 12,
                    labelWidth: 120,
                }, {
                    label: '审核时间',
                    prop: 'confirmTime',
                    disabled: true,
                    span: 8,
                    span: 12,
                    labelWidth: 120,
                }, {
                    label: '位置',
                    prop: 'localtion',
                    disabled: true,
                    span: 8,
                    span: 12,
                    labelWidth: 120,
                }, {
                    label: '审核意见',
                    prop: 'confirmNotion',
                    disabled: true,
                    span: 8,
                    span: 12,
                    labelWidth: 120,
                }, {
                    label: '审核状态',
@@ -105,21 +105,21 @@
                        value: '3'
                    }],
                    disabled: true,
                    span: 8,
                    span: 12,
                    labelWidth: 120,
                }, {
                    label: '交易对象',
                    prop: 'transactionObject',
                    disabled: true,
                    disabled: true,
                    span: 8,
                    span: 12,
                    labelWidth: 120,
                }, {
                    label: '交易过程',
                    prop: 'transactionProcess',
                    disabled: true,
                    disabled: true,
                    span: 8,
                    span: 24,
                    labelWidth: 120,
                }, {
                    label: '物品照片',
@@ -130,7 +130,7 @@
                    dataType: "string",
                    disabled: true,
                    disabled: true,
                    span: 8,
                    span: 12,
                    labelWidth: 120,
                }, {
                    width: 110,
@@ -141,7 +141,7 @@
                    listType: "picture-card",
                    dataType: "string",
                    disabled: true,
                    span: 8,
                    span: 12,
                    labelWidth: 120,
                },]
            }

 src/views/publicSecurity/ninePlaceManage/hiddenDangerStatistics.vue

@@ -9,7 +9,7 @@
            </div>
            <div class="btn-box">
                <el-button type="primary" icon="el-icon-search" @click="searchChange">搜索</el-button>
                <el-button icon="el-icon-delete" @click="searchReset">清空</el-button>
                <el-button icon="el-icon-refresh" @click="searchReset">重置</el-button>
                <!-- <el-button type="primary" icon="el-icon-download" @click="exportAvue">导出</el-button> -->
            </div>
        </div>
@@ -504,7 +504,7 @@

        searchReset () {
            this.query = {}
            this.dateTime = []
            this.dateTime = this.getLastMouth()
            this.onLoad()
        },

@@ -580,7 +580,7 @@
                }
            }
            if ('startTime' in this.query) {
                this.query.startTime += ' 00:00:01'
                this.query.startTime += ' 00:00:00'
            }
            if ('endTime' in this.query) {
                this.query.endTime += ' 23:59:59'

 src/views/publicSecurity/ninePlaceManage/patrolRecord.vue

@@ -15,6 +15,10 @@
                    详情
                </el-button>
            </template>
            <template slot="menuLeft">
                <el-button type="warning" size="small" plain icon="el-icon-download" @click="handleExport">导出
                </el-button>
            </template>
        </avue-crud>


@@ -329,6 +333,28 @@
    },

    methods: {
        handleExport () {
            this.$confirm("是否导出档案管理数据?", "提示", {
                confirmButtonText: "确定",
                cancelButtonText: "取消",
                type: "warning"
            }).then(() => {
                NProgress.start()
                var data = {
                    ...this.query
                }
                // data.isNine = 1
                data = Qs.stringify(data)
                exportBlob(
                    `/api/blade-place/place/exportNineType?${this.website.tokenHeader}=${getToken()}&` + data
                ).then(res => {
                    console.log('exportBlob', res)
                    downloadXls(res.data, `档案管理${dateNow()}.xlsx`)
                    NProgress.done()
                })
            })
        },

        showStringDispose (row, type) {
            row[type] = !row[type]
        },

 src/views/publicSecurity/ninePlaceManage/situationRectification.vue

@@ -24,7 +24,7 @@
                    详情
                </el-button>
                <el-button icon="el-icon-detail" :size="size" :type="type" @click.stop="goAudit(row)"
                    :disabled="row.status == 1">审核</el-button>
                    :disabled="row.status != 1">审核</el-button>
            </template>
        </avue-crud>
        <el-drawer title="整改情况详情" :visible.sync="isDetail" :append-to-body="true" size="46%" direction="rtl">
@@ -704,7 +704,7 @@
                this.query.status = ''
            }
            if ('startTime' in this.query) {
                this.query.startTime += ' 00:00:01'
                this.query.startTime += ' 00:00:00'
            }
            if ('endTime' in this.query) {
                this.query.endTime += ' 23:59:59'

 src/views/publicSecurity/positionManage/TransactRegist.vue

@@ -13,8 +13,8 @@
                <el-button type="text" :size="size" icon="el-icon-delete" v-if="permission.place_del" plain
                    @click="rowDel(row)">删 除
                </el-button>
                <el-button type="text" :size="size" icon="el-icon-s-check" v-if="permission.place_check" plain
                    @click="goAudit(row)" :disabled="true">审 核
                <el-button type="text" :size="size" icon="el-icon-s-check" v-if="row.status == 1" plain
                    @click="goAudit(row)" :disabled="row.status != 1">审 核
                </el-button>
            </template>