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

shuishen

2024-02-18 0a8ff255ec6a542688b54b95b3803d7be408ad8d

 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