From 028e2b82578fec4f3d178a0ab1909c146c3b9621 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 19 Feb 2024 16:38:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/publicSecurity/ninePlaceManage/patrolRecord.vue | 28 ++++++++++++++++++++++------
src/views/publicSecurity/ninePlaceManage/archivesManage.vue | 3 +++
src/views/publicSecurity/positionManage/TransactRegist.vue | 10 +++++++++-
src/views/publicSecurity/ninePlaceManage/situationRectification.vue | 3 +++
src/views/publicSecurity/positionManage/fileManage.vue | 3 +++
5 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/src/views/publicSecurity/ninePlaceManage/archivesManage.vue b/src/views/publicSecurity/ninePlaceManage/archivesManage.vue
index cdde3c8..1d2a5ba 100644
--- a/src/views/publicSecurity/ninePlaceManage/archivesManage.vue
+++ b/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: "地区",
diff --git a/src/views/publicSecurity/ninePlaceManage/patrolRecord.vue b/src/views/publicSecurity/ninePlaceManage/patrolRecord.vue
index 6fa4f25..5906e5d 100644
--- a/src/views/publicSecurity/ninePlaceManage/patrolRecord.vue
+++ b/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()
})
})
diff --git a/src/views/publicSecurity/ninePlaceManage/situationRectification.vue b/src/views/publicSecurity/ninePlaceManage/situationRectification.vue
index 997cb64..f400be5 100644
--- a/src/views/publicSecurity/ninePlaceManage/situationRectification.vue
+++ b/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: "场所名称",
diff --git a/src/views/publicSecurity/positionManage/TransactRegist.vue b/src/views/publicSecurity/positionManage/TransactRegist.vue
index 5c5d9f4..b9febcd 100644
--- a/src/views/publicSecurity/positionManage/TransactRegist.vue
+++ b/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,
diff --git a/src/views/publicSecurity/positionManage/fileManage.vue b/src/views/publicSecurity/positionManage/fileManage.vue
index 52650ee..6ca1e6d 100644
--- a/src/views/publicSecurity/positionManage/fileManage.vue
+++ b/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: "地区",
--
Gitblit v1.9.3