Merge remote-tracking branch 'origin/master'

linwei

2024-02-19 028e2b82578fec4f3d178a0ab1909c146c3b9621

Merge remote-tracking branch 'origin/master'

 src/views/publicSecurity/ninePlaceManage/archivesManage.vue

@@ -78,6 +78,9 @@
                editBtn: false,
                delBtn: false,
                addBtn: false,
                refreshBtn: false,
                searchShowBtn: false,
                columnBtn: false,
                dialogClickModal: false,
                column: [{
                    label: "地区",

 src/views/publicSecurity/ninePlaceManage/patrolRecord.vue

@@ -124,8 +124,21 @@
} from "@/api/publicSecurity/ninePlaceManage"

import website from '@/config/website'


import NProgress from 'nprogress'
import 'nprogress/nprogress.css'
import Qs from "qs"
import {
    exportBlob
} from "@/api/common"
import {
    getToken
} from '@/util/auth'
import {
    downloadXls
} from "@/util/util"
import {
    dateNow
} from "@/util/date"
import {
    getDistrictTree
} from "@/api/district/index"
@@ -167,7 +180,10 @@
                editBtn: false,
                viewBtn: false,
                // selection: true,
                excelBtn: true,
                excelBtn: false,
                refreshBtn: false,
                searchShowBtn: false,
                columnBtn: false,
                dialogClickModal: false,
                column: [{
                    label: "所属街道",
@@ -334,7 +350,7 @@

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

 src/views/publicSecurity/ninePlaceManage/situationRectification.vue

@@ -203,6 +203,9 @@
                editBtn: false,
                delBtn: false,
                addBtn: false,
                refreshBtn: false,
                searchShowBtn: false,
                columnBtn: false,
                dialogClickModal: false,
                column: [{
                    label: "场所名称",

 src/views/publicSecurity/positionManage/TransactRegist.vue

@@ -23,6 +23,11 @@
                    {{ showStatus(row.status).text }}
                </el-tag>
            </template>

            <template slot="menuLeft">
                <el-button type="warning" size="small" plain icon="el-icon-download" @click="handleExport">导出
                </el-button>
            </template>
        </avue-crud>


@@ -124,10 +129,13 @@
                //stripe:true,
                index: true,
                // viewBtn: true,
                addBtn: false,
                editBtn: false,
                delBtn: false,
                refreshBtn: false,
                searchShowBtn: false,
                columnBtn: false,
                selection: true,
                header: false,
                dialogClickModal: false,
                column: [{
                    span: 12,

 src/views/publicSecurity/positionManage/fileManage.vue

@@ -78,6 +78,9 @@
                editBtn: false,
                delBtn: false,
                addBtn: false,
                refreshBtn: false,
                searchShowBtn: false,
                columnBtn: false,
                dialogClickModal: false,
                column: [{
                    label: "地区",