From 3f7667a44b1c6ace085a824a66e406214f8732fd Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 07 Feb 2024 10:00:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/publicSecurity/keynotePlaceManage.vue | 64 --
src/views/publicSecurity/ninePlaceManage/patrolRecord.vue | 62 ++
vue.config.js | 84 +-
src/views/publicSecurity/ninePlaceManage/archivesManage.vue | 12
src/views/publicSecurity/positionManage/TransactRegist.vue | 568 +++++++++++++++++++++++++
src/views/publicSecurity/ninePlaceManage/situationRectification.vue | 70 +++
src/views/place/index.vue | 23
src/views/publicSecurity/positionManage/fileManage.vue | 421 +++++++++++++++++++
8 files changed, 1,193 insertions(+), 111 deletions(-)
diff --git a/src/views/place/index.vue b/src/views/place/index.vue
index e92a8c4..f543cbf 100644
--- a/src/views/place/index.vue
+++ b/src/views/place/index.vue
@@ -22,11 +22,6 @@
}}</el-tag>
</template>
- <template slot-scope="{row, size}" slot="confirmFlag">
- <el-tag :size="size" :type="showConfirmFlag(row.confirmFlag).type">{{ showConfirmFlag(row.confirmFlag).text
- }}</el-tag>
- </template>
-
<template slot-scope="{row, size}" slot="source">
<el-tag :size="size" :type="showSource(row.source).type">{{ showSource(row.source).text
}}</el-tag>
@@ -138,7 +133,7 @@
},],
},
-
+
{
width: 110,
@@ -355,7 +350,7 @@
label: "九小分类",
prop: "nineType",
type: "select",
- display:false,
+ display: false,
dicUrl: "/api/blade-system/dict-biz/dictionary?code=nineType",
dataType: "number",
hide: true,
@@ -386,7 +381,7 @@
label: "阵地类型",
prop: "frontType",
type: "select",
- display:false,
+ display: false,
row: true,
dicUrl: "/api/blade-system/dict-biz/dictionary?code=frontType",
dataType: "number",
@@ -421,7 +416,7 @@
prop: "location",
type: 'map',
dataType: "string",
- minWidth:250,
+ minWidth: 250,
span: 12,
value: [117.966460, 28.431002, ""],
rules: [
@@ -436,7 +431,7 @@
label: "备注",
prop: "remark",
type: 'textarea',
- hide:true,
+ hide: true,
span: 24,
rules: [
{
@@ -453,7 +448,7 @@
editDisplay: false,
viewDisplay: false,
label: "经度",
- hide:true,
+ hide: true,
prop: "lng",
},
@@ -464,7 +459,7 @@
editDisplay: false,
viewDisplay: false,
label: "纬度",
- hide:true,
+ hide: true,
prop: "lat",
},
@@ -528,7 +523,7 @@
watch: {
'form.isNine': {
- handler(newData) {
+ handler (newData) {
if (newData) {
let nineTypeColumn = this.findObject(
this.option.column,
@@ -544,7 +539,7 @@
},
},
'form.isFront': {
- handler(newData) {
+ handler (newData) {
if (newData) {
let frontTypeColumn = this.findObject(
this.option.column,
diff --git a/src/views/publicSecurity/keynotePlaceManage.vue b/src/views/publicSecurity/keynotePlaceManage.vue
index 891f8e4..5908448 100644
--- a/src/views/publicSecurity/keynotePlaceManage.vue
+++ b/src/views/publicSecurity/keynotePlaceManage.vue
@@ -23,7 +23,6 @@
{{ showStatus(row.status).text }}
</el-tag>
</template>
-
</avue-crud>
@@ -54,7 +53,6 @@
export default {
data () {
-
//手机号格式校验
let validatorPhone = function (rule, value, callback) {
if (value) {
@@ -88,8 +86,7 @@
searchLabelWidth: 96,
searchShow: true,
searchMenuSpan: 3,
- menuWidth: 210,
-
+ menuWidth: 160,
height: "auto",
calcHeight: 54,
dialogWidth: 950,
@@ -111,6 +108,7 @@
searchLabelWidth: 46,
search: true,
hide: true,
+ align: 'center'
},
{
width: 110,
@@ -120,6 +118,7 @@
searchSpan: 4,
searchLabelWidth: 100,
search: true,
+ align: 'center'
}, {
width: 120,
span: 12,
@@ -131,6 +130,7 @@
validator: validatorPhone,
trigger: 'blur'
}],
+ align: 'center'
}, {
overHidee: true,
span: 12,
@@ -143,6 +143,7 @@
message: "请输入地址",
trigger: "blur",
},],
+ align: 'center'
}, {
width: 110,
label: "所属街道",
@@ -162,6 +163,7 @@
message: "请选择所属街道",
trigger: "blur",
},],
+ align: 'center'
}, {
width: 156,
// hide: true,
@@ -181,15 +183,8 @@
message: "请选择所属社区",
trigger: "blur",
},],
+ align: 'center'
},
- // {
- // width: 144,
- // label: "创建时间",
- // prop: "createTime",
- // searchSpan: 4,
-
- // },
-
{
width: 100,
addDisplay: false,
@@ -211,37 +206,9 @@
}, {
label: '待接收',
value: 4
- }]
- }, {
- width: 100,
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- label: '类型',
- prop: 'reportType',
- type: 'radio',
- slot: true,
- searchSpan: 4,
- searchLabelWidth: 66,
- search: true,
- dicData: [{
- label: '旅馆安全',
- value: 2
- }, {
- label: '打金店',
- value: 3
- }, {
- label: '二手手机维修',
- value: 4
- }, {
- label: '二手车交易',
- value: 5
- }, {
- label: '校园安全',
- value: 6
- }]
- },
- ],
+ }],
+ align: 'center'
+ }],
},
data: [],
@@ -283,7 +250,6 @@
showStatus () {
return (data) => {
let tags = {}
-
if (data == 1) {
tags = {
type: 'warning',
@@ -450,6 +416,7 @@
},
searchReset () {
this.query = {}
+ this.page.currentPage = 1
this.onLoad(this.page)
},
searchChange (params, done) {
@@ -517,11 +484,14 @@
currentChange (currentPage) {
this.page.currentPage = currentPage
+ this.onLoad(this.page, this.query)
},
sizeChange (pageSize) {
this.page.pageSize = pageSize
+ this.onLoad(this.page, this.query)
},
refreshChange () {
+ this.page.currentPage = 1
this.onLoad(this.page, this.query)
},
onLoad (page, params = {}) {
@@ -540,7 +510,7 @@
// }
// values.dateTime = null
// }
- values.reportType = 2
+ values.reportType = 8
this.loading = true
getList(page.currentPage, page.pageSize, values).then((res) => {
const data = res.data.data
@@ -565,6 +535,10 @@
</script>
<style lang="scss" scoped>
+:deep(.cur-container-box) {
+ padding: 0;
+}
+
.avue-upload__icon {
line-height: 6;
}
diff --git a/src/views/publicSecurity/ninePlaceManage/archivesManage.vue b/src/views/publicSecurity/ninePlaceManage/archivesManage.vue
index 354334e..c167ba9 100644
--- a/src/views/publicSecurity/ninePlaceManage/archivesManage.vue
+++ b/src/views/publicSecurity/ninePlaceManage/archivesManage.vue
@@ -12,7 +12,13 @@
</template>
<template slot-scope="{row, size}" slot="principalPhone">
<el-button :size="size" type="text" @click="showStringDispose(row, 'principalPhoneflag')"
- v-text="textDispose(row, 'principalPhoneflag', 'principalPhone')"></el-button>
+ v-text="textDispose(row, 'principalPhoneflag', 'principalPhone')">
+ </el-button>
+ </template>
+ <template slot-scope="{row, size}" slot="policePhone">
+ <el-button :size="size" type="text" @click="showStringDispose(row, 'policePhoneflag')"
+ v-text="textDispose(row, 'policePhoneflag', 'policePhone')">
+ </el-button>
</template>
<template slot="menuLeft">
<el-button type="warning" size="small" plain icon="el-icon-download" @click="handleExport">导出
@@ -147,6 +153,7 @@
label: "责任民警联系方式",
prop: "policePhone",
align: 'center',
+ slot: true,
width: 120
}],
},
@@ -384,7 +391,8 @@
return {
...item,
'principalIdCardflag': false,
- 'principalPhoneflag': false
+ 'principalPhoneflag': false,
+ 'policePhoneflag': false
}
})
}
diff --git a/src/views/publicSecurity/ninePlaceManage/patrolRecord.vue b/src/views/publicSecurity/ninePlaceManage/patrolRecord.vue
index 92c1d1e..f27a68e 100644
--- a/src/views/publicSecurity/ninePlaceManage/patrolRecord.vue
+++ b/src/views/publicSecurity/ninePlaceManage/patrolRecord.vue
@@ -5,6 +5,11 @@
: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="{row, size}" slot="principalPhone">
+ <el-button :size="size" type="text" @click="showStringDispose(row, 'principalPhoneflag')"
+ v-text="textDispose(row, 'principalPhoneflag', 'principalPhone')">
+ </el-button>
+ </template>
<template slot-scope="{type,size,row }" slot="menu">
<el-button icon="el-icon-detail" :size="size" :type="type" @click.stop="getDetail(row)">
详情
@@ -144,7 +149,7 @@
searchLabelWidth: 96,
searchShow: true,
searchMenuSpan: 3,
- // menuWidth: 450,
+ menuWidth: 100,
// menu: false,
height: "auto",
calcHeight: 54,
@@ -167,6 +172,7 @@
row: true,
searchSpan: 4,
search: true,
+ align: 'center'
},
{
label: "所属社区",
@@ -175,6 +181,9 @@
row: true,
searchSpan: 4,
search: true,
+ width: 160,
+ overHidden: true,
+ align: 'center'
},
{
label: "所属网格",
@@ -183,6 +192,7 @@
row: true,
searchSpan: 4,
search: true,
+ align: 'center'
},
{
label: "场所名称",
@@ -191,6 +201,7 @@
row: true,
searchSpan: 4,
search: true,
+ align: 'center'
},
{
label: "场所隐患",
@@ -198,6 +209,7 @@
span: 24,
row: true,
searchSpan: 4,
+ align: 'center'
},
{
@@ -207,6 +219,7 @@
row: true,
searchSpan: 4,
search: true,
+ align: 'center'
},
{
@@ -214,7 +227,9 @@
prop: "principalPhone",
span: 24,
row: true,
+ slot: true,
searchSpan: 4,
+ align: 'center'
},
{
label: "场所地址",
@@ -223,6 +238,8 @@
row: true,
searchSpan: 4,
searchLabelWidth: 46,
+ overHidden: true,
+ align: 'center'
},
{
width: 110,
@@ -231,6 +248,7 @@
type: "upload",
listType: "picture-img",
span: 24,
+ align: 'center'
},
{
label: "创建时间",
@@ -239,6 +257,7 @@
row: true,
searchSpan: 4,
searchLabelWidth: 46,
+ align: 'center'
},
],
},
@@ -288,6 +307,21 @@
}
},
+ textDispose () {
+ return (row, flag, type) => {
+ console.log('row', row, flag, type)
+ if (row[flag] || row[type] == null) {
+ return row[type]
+ } else {
+ if (type == 'principalIdCard') {
+ return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
+ } else {
+ return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
+ }
+ }
+ }
+ }
+
},
created () {
@@ -296,6 +330,11 @@
},
methods: {
+ showStringDispose (row, type) {
+ console.log(row, type)
+ row[type] = !row[type]
+ },
+
// 点击展开收缩
flodQL (index) {
this.rowDetail.qTypeList[index].isShowQList = !this.rowDetail.qTypeList[index].isShowQList
@@ -441,10 +480,17 @@
onLoad (page, params = {}) {
this.loading = true
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then((res) => {
- const data = res.data.data
- this.page.total = data.total
- this.data = data.records
- this.data.forEach(item => {
+ const data = {
+ ...res.data.data,
+ records: res.data.data.records.map(item => {
+ return {
+ ...item,
+ 'createTime': item.createTime.slice(0, 16),
+ 'principalPhoneflag': false,
+ }
+ })
+ }
+ data.records.forEach(item => {
if (item.signaturePath.length > 0) {
var urls = []
var names = item.signaturePath.split(",")
@@ -454,6 +500,8 @@
item.signaturePath = urls.join(",")
}
})
+ this.page.total = data.total
+ this.data = data.records
this.loading = false
this.selectionClear()
}).catch(err => {
@@ -535,6 +583,10 @@
background-color: #409EFF;
}
+:deep(.avue-crud__img) {
+ height: 30px !important;
+}
+
.title {
margin: 10px;
height: 40px;
diff --git a/src/views/publicSecurity/ninePlaceManage/situationRectification.vue b/src/views/publicSecurity/ninePlaceManage/situationRectification.vue
index 7fb2236..fc77f47 100644
--- a/src/views/publicSecurity/ninePlaceManage/situationRectification.vue
+++ b/src/views/publicSecurity/ninePlaceManage/situationRectification.vue
@@ -14,6 +14,11 @@
<el-button type="warning" size="small" plain icon="el-icon-download" @click="handleExport">导出
</el-button>
</template>
+
+ <template slot-scope="{row, size}" slot="status">
+ <el-tag :size="size" :type="showConfirmFlag(row.status).type">{{ showConfirmFlag(row.status).text
+ }}</el-tag>
+ </template>
<template slot-scope="{type,size,row }" slot="menu">
<el-button icon="el-icon-detail" :size="size" :type="type" @click.stop="getDetail(row)">
详情
@@ -192,6 +197,7 @@
searchShow: true,
searchMenuSpan: 3,
menu: true,
+ menuWidth: 120,
border: true,
index: true,
editBtn: false,
@@ -283,6 +289,31 @@
searchSpan: 4,
searchLabelWidth: 106,
}, {
+ label: "审核状态",
+ prop: "status",
+ align: 'center',
+ dicData: [
+ {
+ label: "待审核",
+ value: 1,
+ },
+ {
+ label: "审核通过",
+ value: 2,
+ },
+ {
+ label: "审核不通过",
+ value: 3,
+ },
+ {
+ label: "待上报",
+ value: 4,
+ }
+ ],
+ search: true,
+ searchSpan: 4,
+ searchLabelWidth: 106,
+ }, {
label: "检查时间",
prop: "dateRange",
type: "daterange",
@@ -324,6 +355,37 @@
return ids.join(",")
},
+ showConfirmFlag () {
+ return (data) => {
+ let tags = {
+ text: '',
+ type: ''
+ }
+ if (data == 1) {
+ tags = {
+ text: '待审核',
+ type: 'warning'
+ }
+ } else if (data == 2) {
+ tags = {
+ text: '审核通过',
+ type: 'success'
+ }
+ } else if (data == 3) {
+ tags = {
+ text: '审核不通过',
+ type: 'danger'
+ }
+ } else if (data == 4) {
+ tags = {
+ text: '待上报',
+ type: 'info'
+ }
+ }
+
+ return tags
+ }
+ }
},
created () {
@@ -634,10 +696,12 @@
onLoad (page, params = {}) {
this.loading = true
- if (this.typeStatus == 3) {
+ if (this.typeStatus == 1) {
+ this.query.status = '1'
+ } else if (this.typeStatus == 2) {
+ this.query.status = '2'
+ } else if (this.typeStatus == 3) {
this.query.status = ''
- } else {
- this.query.status = this.typeStatus
}
getZGQKList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
console.log('getZGQKList', res.data.data)
diff --git a/src/views/publicSecurity/positionManage/TransactRegist.vue b/src/views/publicSecurity/positionManage/TransactRegist.vue
new file mode 100644
index 0000000..8aaa932
--- /dev/null
+++ b/src/views/publicSecurity/positionManage/TransactRegist.vue
@@ -0,0 +1,568 @@
+<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">
+
+ <template slot-scope="{row, size}" slot="menu">
+ <el-button type="text" :size="size" icon="el-icon-view" v-if="permission.place_view" plain
+ @click="lookDetail(row, 0)">查 看
+ </el-button>
+ <el-button type="text" :size="size" icon="el-icon-s-check" v-if="permission.place_check && row.status == 1"
+ plain @click="lookDetail(row, 1)">审 核
+ </el-button>
+ <el-button type="text" :size="size" icon="el-icon-delete" v-if="permission.place_del" plain
+ @click="rowDel(row)">删 除
+ </el-button>
+ </template>
+
+ <template slot="status" slot-scope="{row, size}">
+ <el-tag :size="size" :type="showStatus(row.status).type">
+ {{ showStatus(row.status).text }}
+ </el-tag>
+ </template>
+ </avue-crud>
+
+
+ <el-dialog title="" append-to-body :visible.sync="auditBasePopup" width="60%">
+ <campusReporting @colseDetail="colseDetail" v-if="taskType == 6" ref="campusReporting"></campusReporting>
+ <hotelReporting @colseDetail="colseDetail" v-if="taskType == 2" ref="hotelReporting"></hotelReporting>
+ <labelReporting @colseDetail="colseDetail" v-if="taskType == 3" ref="labelReporting"></labelReporting>
+ </el-dialog>
+ </basic-container>
+</template>
+
+<script>
+import {
+ getList,
+ removeTask,
+ update,
+ add,
+} from "@/api/task/task"
+
+import {
+ mapGetters
+} from "vuex"
+
+import website from '@/config/website'
+import campusReporting from '../components/campusReporting'
+import hotelReporting from '../components/hotelReporting'
+import labelReporting from '../components/labelReporting'
+
+export default {
+ data () {
+ //手机号格式校验
+ let validatorPhone = function (rule, value, callback) {
+ if (value) {
+ if (!/^1[3456789]\d{9}$/.test(value)) {
+ callback(new Error('手机号格式有误！'))
+ } else {
+ callback()
+ }
+ }
+ callback()
+ }
+
+ return {
+ taskType: 0,
+ curRow: {},
+ roleBox: false,
+
+ form: {},
+ query: {},
+ loading: true,
+
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ datetime: "",
+ selectionList: [],
+ option: {
+ labelWidth: 96,
+ searchLabelWidth: 96,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menuWidth: 160,
+ height: "auto",
+ calcHeight: 54,
+ dialogWidth: 950,
+ tip: false,
+ // menu: false,
+ border: true,
+ //stripe:true,
+ index: true,
+ // viewBtn: true,
+ editBtn: false,
+ delBtn: false,
+ selection: true,
+ dialogClickModal: false,
+ column: [{
+ span: 12,
+ label: "社区",
+ prop: "communityName",
+ searchSpan: 4,
+ searchLabelWidth: 46,
+ search: true,
+ hide: true,
+ align: 'center'
+ },
+ {
+ width: 110,
+ span: 12,
+ label: "场所负责人",
+ prop: "realName",
+ searchSpan: 4,
+ searchLabelWidth: 100,
+ search: true,
+ align: 'center'
+ }, {
+ width: 120,
+ span: 12,
+ label: "联系方式",
+ prop: "phone",
+ searchSpan: 4,
+ search: true,
+ rules: [{
+ validator: validatorPhone,
+ trigger: 'blur'
+ }],
+ align: 'center'
+ }, {
+ overHidee: true,
+ span: 12,
+ label: "地址",
+ prop: "addressName",
+ searchSpan: 4,
+ // search: true,
+ rules: [{
+ required: true,
+ message: "请输入地址",
+ trigger: "blur",
+ },],
+ align: 'center'
+ }, {
+ width: 110,
+ label: "所属街道",
+ // hide: true,
+ // search: true,
+ parent: false,
+ searchSpan: 4,
+ prop: "streetCode",
+ type: "tree",
+ dicUrl: "/api/blade-system/region/getTownTree",
+ props: {
+ label: "name",
+ value: "id"
+ },
+ rules: [{
+ required: true,
+ message: "请选择所属街道",
+ trigger: "blur",
+ },],
+ align: 'center'
+ }, {
+ width: 156,
+ // hide: true,
+ parent: false,
+ searchSpan: 4,
+ label: "所属社区",
+ prop: "neiCode",
+ // search: false,
+ type: "tree",
+ dicUrl: "/api/blade-system/region/tree",
+ props: {
+ label: "name",
+ value: "id",
+ },
+ rules: [{
+ required: true,
+ message: "请选择所属社区",
+ trigger: "blur",
+ },],
+ align: 'center'
+ },
+ {
+ width: 100,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ label: '审核状态',
+ prop: 'status',
+ type: 'radio',
+ slot: true,
+ dicData: [{
+ label: '待审核',
+ value: 1
+ }, {
+ label: '已审核',
+ value: 2
+ }, {
+ label: '未通过',
+ value: 3
+ }, {
+ label: '待接收',
+ value: 4
+ }],
+ align: 'center'
+ }],
+ },
+ data: [],
+
+ auditBasePopup: false,
+ }
+ },
+
+ provide () {
+ return {
+ placeElement: this,
+ }
+ },
+
+ components: {
+ campusReporting,
+ hotelReporting,
+ labelReporting,
+ },
+
+ watch: {},
+
+ computed: {
+ ...mapGetters(["permission", "userInfo"]),
+ permissionList () {
+ return {
+ addBtn: this.vaildData(this.permission.place_add, false),
+ viewBtn: this.vaildData(this.permission.place_view, true),
+ delBtn: this.vaildData(this.permission.place_del, true),
+ // editBtn: this.vaildData(this.permission.place_edit, true),
+ }
+ },
+ ids () {
+ let ids = []
+ this.selectionList.forEach((ele) => {
+ ids.push(ele.id)
+ })
+ return ids.join(",")
+ },
+ showStatus () {
+ return (data) => {
+ let tags = {}
+ if (data == 1) {
+ tags = {
+ type: 'warning',
+ text: '待审核'
+ }
+ } else if (data == 2) {
+ tags = {
+ type: 'success',
+ text: '已审核'
+ }
+ } else if (data == 3) {
+ tags = {
+ type: 'danger',
+ text: '未通过'
+ }
+ } else if (data == 4) {
+ tags = {
+ type: 'warning',
+ text: '待接收'
+ }
+ }
+
+ return tags
+ }
+ }
+ },
+ methods: {
+
+ colseDetail () {
+ this.auditBasePopup = false
+ this.onLoad(this.page)
+ },
+
+ lookDetail (row, applyType) {
+ this.auditBasePopup = true
+ var that = this
+ if (row.reportType == 6) {
+ this.taskType = 6
+ this.$nextTick(() => {
+ that.$refs.campusReporting.init(row, applyType)
+ })
+ }
+ if (row.reportType == 2) {
+ this.taskType = 2
+ this.$nextTick(() => {
+ that.$refs.hotelReporting.init(row, applyType)
+ })
+ }
+ if (row.reportType == 3 || row.reportType == 4 || row.reportType == 5) {
+ this.taskType = 3
+ this.$nextTick(() => {
+ that.$refs.labelReporting.init(row, applyType)
+ })
+ }
+ },
+ auditCur (row) {
+ this.curAuditRow = row
+ this.auditBasePopup = true
+ },
+
+ roleBoxClose () {
+ this.curRow = {}
+ },
+
+ ManageTenants (item) {
+ this.curRow = item
+ this.roleBox = true
+ },
+
+ rowSave (row, done, loading) {
+ if (row.imageUrls.length > 0) {
+ var urls = []
+ var split = row.imageUrls.split(",").filter(item => item != '')
+ split.forEach(url => {
+ var names = url.split("jczz/")
+ urls.push(names[1])
+ })
+ row.imageUrls = urls.join(",")
+ }
+
+ let label = row.label
+
+ if (row.smallLabel != '') {
+ label = label + ',' + row.smallLabel
+ }
+
+ delete row.smallLabel
+
+ add({
+ ...row,
+ label
+ }).then(
+ () => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ done()
+ },
+ (error) => {
+ window.console.log(error)
+ loading()
+ }
+ )
+ },
+
+ rowUpdate (row, index, done, loading) {
+ if (row.imageUrls.length > 0) {
+ var urls = []
+ var split = row.imageUrls.split(",").filter(item => item != '')
+ split.forEach(url => {
+ var names = url.split("jczz/")
+ urls.push(names[1])
+ })
+ row.imageUrls = urls.join(",")
+ }
+
+ let label = row.label
+
+ if (row.smallLabel != '') {
+ label = label + ',' + row.smallLabel
+ }
+
+ delete row.smallLabel
+
+ update({
+ ...row,
+ label
+ }).then(
+ () => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ done()
+ },
+ (error) => {
+ window.console.log(error)
+ loading()
+ }
+ )
+ },
+
+ rowDel (row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ row.isDeleted = 1
+ return removeTask(row)
+ })
+ .then(() => {
+ this.onLoad(this.page)
+
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ })
+ },
+ searchReset () {
+ this.query = {}
+ this.page.currentPage = 1
+ this.onLoad(this.page)
+ },
+ searchChange (params, done) {
+ this.query = params
+ this.page.currentPage = 1
+ this.onLoad(this.page, params)
+ done()
+ },
+ selectionChange (list) {
+ this.selectionList = list
+ },
+ selectionClear () {
+ this.selectionList = []
+ this.$nextTick(() => {
+ this.$refs.crud && this.$refs.crud.toggleSelection()
+ })
+ },
+ handleDelete () {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据")
+ return
+ }
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(this.ids)
+ })
+ .then(() => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ this.$refs.crud.toggleSelection()
+ })
+ },
+
+ beforeOpen (done, type) {
+ if (["edit", "view"].includes(type)) {
+ // getPlace(this.form.id).then((res) => {
+ // this.form = res.data.data
+ // if (this.form.imageUrls.length) {
+ // this.form.imageUrls = this.form.imageUrls.split(",").filter(item => item != '').map(item => website
+ // .minioUrl + item).join(',')
+ // }
+ // if (this.form.placePoiLabelVOList.length) {
+ // let lebelTwo = this.form.placePoiLabelVOList.find(item => {
+ // return item.type == 2
+ // })
+ // if (lebelTwo) this.form.label = String(lebelTwo.poiCode)
+ // let lebelThree = this.form.placePoiLabelVOList.find(item => {
+ // return item.type == 3
+ // })
+ // if (lebelThree) this.form.smallLabel = String(lebelThree.poiCode)
+ // }
+ // done()
+ // })
+ } else {
+ done()
+ }
+ },
+
+ currentChange (currentPage) {
+ this.page.currentPage = currentPage
+ this.onLoad(this.page, this.query)
+ },
+ sizeChange (pageSize) {
+ this.page.pageSize = pageSize
+ this.onLoad(this.page, this.query)
+ },
+ refreshChange () {
+ this.page.currentPage = 1
+ this.onLoad(this.page, this.query)
+ },
+ onLoad (page, params = {}) {
+ const {
+ dateTime
+ } = this.query
+ let values = {
+ ...params,
+ }
+ // if (dateTime) {
+ // values = {
+ // ...params,
+ // startTime: dateTime[0],
+ // endTime: dateTime[1],
+ // ...this.query,
+ // }
+ // values.dateTime = null
+ // }
+ values.reportType = 2
+ this.loading = true
+ getList(page.currentPage, page.pageSize, values).then((res) => {
+ const data = res.data.data
+ this.page.total = data.total
+ this.data = data.records
+ this.data.forEach(item => {
+ if (item.imageUrls && item.imageUrls != '' && item.imageUrls != null && item.imageUrls.length) {
+ var urls = []
+ var names = item.imageUrls.split(",").filter(item => item != '')
+ names.forEach(name => {
+ urls.push(website.minioUrl + name)
+ })
+ item.imageUrls = urls.join(",")
+ }
+ })
+ this.loading = false
+ this.selectionClear()
+ })
+ }
+ }
+}
+</script>
+
+<style lang="scss" scoped>
+:deep(.cur-container-box) {
+ padding: 0;
+}
+
+.avue-upload__icon {
+ line-height: 6;
+}
+
+.cur-container-box {
+ display: flex;
+ flex-direction: column;
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+
+ .content-box {
+ margin: 0 4px;
+ padding: 0 16px;
+ height: 0;
+ flex: 1;
+ overflow: hidden;
+ overflow-y: auto;
+ }
+
+ .footer-btn-box {
+ margin-top: 10px;
+ display: flex;
+ justify-content: center;
+ }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/publicSecurity/positionManage/fileManage.vue b/src/views/publicSecurity/positionManage/fileManage.vue
new file mode 100644
index 0000000..39ef602
--- /dev/null
+++ b/src/views/publicSecurity/positionManage/fileManage.vue
@@ -0,0 +1,421 @@
+<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">
+ <template slot-scope="{row, size}" slot="principalIdCard">
+ <el-button :size="size" type="text" @click="showStringDispose(row, 'principalIdCardflag')">
+ {{ textDispose(row, 'principalIdCardflag', 'principalIdCard') }}
+ </el-button>
+ </template>
+ <template slot-scope="{row, size}" slot="principalPhone">
+ <el-button :size="size" type="text" @click="showStringDispose(row, 'principalPhoneflag')"
+ v-text="textDispose(row, 'principalPhoneflag', 'principalPhone')">
+ </el-button>
+ </template>
+ <template slot-scope="{row, size}" slot="policePhone">
+ <el-button :size="size" type="text" @click="showStringDispose(row, 'policePhoneflag')"
+ v-text="textDispose(row, 'policePhoneflag', 'policePhone')">
+ </el-button>
+ </template>
+ <template slot="menuLeft">
+ <el-button type="warning" size="small" plain icon="el-icon-download" @click="handleExport">导出
+ </el-button>
+ </template>
+ </avue-crud>
+ </basic-container>
+</template>
+
+<script>
+import {
+ mapGetters
+} from "vuex"
+import {
+ getDAGLList
+} from "@/api/publicSecurity/ninePlaceManage"
+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"
+
+export default {
+ data () {
+ return {
+ form: {},
+ query: {},
+ loading: true,
+
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ datetime: "",
+ selectionList: [],
+ option: {
+ height: "auto",
+ calcHeight: 54,
+ dialogWidth: 950,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menu: false,
+ border: true,
+ index: true,
+ editBtn: false,
+ delBtn: false,
+ addBtn: false,
+ dialogClickModal: false,
+ column: [{
+ label: "地区",
+ prop: "townStreetName",
+ align: 'center',
+ search: true,
+ searchSpan: 3,
+ searchLabelWidth: 46,
+ labelWidth: 120,
+ width: 156
+ }, {
+ label: "场所名称",
+ prop: "placeName",
+ align: 'center',
+ search: true,
+ searchSpan: 3,
+ // searchLabelWidth: 96,
+ width: 156
+ }, {
+ label: "场所地址",
+ prop: "location",
+ align: 'center',
+ },
+ {
+ label: "场所类别",
+ prop: "nineType",
+ align: 'center',
+ dicUrl: "/api/blade-system/dict-biz/tree?code=nineType",
+ props: {
+ label: "title",
+ value: "key",
+ },
+ type: 'select',
+ search: true,
+ searchSpan: 3,
+ // searchLabelWidth: 96
+ }, {
+ label: "场所负责人",
+ prop: "principal",
+ align: 'center',
+ search: true,
+ searchSpan: 4,
+ searchLabelWidth: 96,
+ width: 110
+ }, {
+ label: "身份证信息",
+ prop: "principalIdCard",
+ align: 'center',
+ slot: true,
+ width: 160
+ }, {
+ label: "联系方式",
+ prop: "principalPhone",
+ align: 'center',
+ slot: true,
+ width: 120
+ }, {
+ label: "辖区派出所",
+ prop: "deptName",
+ align: 'center',
+ search: true,
+ searchSpan: 4,
+ searchLabelWidth: 96
+ }, {
+ label: "责任民警",
+ prop: "policeName",
+ align: 'center',
+ search: true,
+ searchSpan: 4,
+ // searchLabelWidth: 96,
+ width: 110
+ }, {
+ label: "责任民警联系方式",
+ prop: "policePhone",
+ align: 'center',
+ slot: true,
+ width: 120
+ }],
+ },
+ data: []
+ }
+ },
+
+ computed: {
+ ...mapGetters(["permission", "userInfo"]),
+ permissionList () {
+ return {
+ addBtn: this.vaildData(this.permission.place_add, true),
+ viewBtn: this.vaildData(this.permission.place_view, true),
+ delBtn: this.vaildData(this.permission.place_delete, true),
+ editBtn: this.vaildData(this.permission.place_edit, true),
+ }
+ },
+ ids () {
+ let ids = []
+ this.selectionList.forEach((ele) => {
+ ids.push(ele.id)
+ })
+ return ids.join(",")
+ },
+
+ textDispose () {
+ return (row, flag, type) => {
+ if (row[flag] || row[type] == null) {
+ return row[type]
+ } else {
+ if (type == 'principalIdCard') {
+ return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
+ } else {
+ return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
+ }
+ }
+ }
+ }
+ },
+ methods: {
+ handleExport () {
+ this.$confirm("是否导出档案管理数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ NProgress.start()
+ var data = {
+ ...this.query
+ }
+ 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]
+ },
+
+ rowSave (row, done, loading) {
+ if (row.imageUrls.length > 0) {
+ var urls = []
+ var split = row.imageUrls.split(",").filter(item => item != '')
+ split.forEach(url => {
+ var names = url.split("jczz/")
+ urls.push(names[1])
+ })
+ row.imageUrls = urls.join(",")
+ }
+
+ let label = row.label
+
+ if (row.smallLabel != '') {
+ label = label + ',' + row.smallLabel
+ }
+
+ delete row.smallLabel
+
+ add({
+ ...row,
+ label
+ }).then(
+ () => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ done()
+ },
+ (error) => {
+ window.console.log(error)
+ loading()
+ }
+ )
+ },
+
+ rowUpdate (row, index, done, loading) {
+ if (row.imageUrls.length > 0) {
+ var urls = []
+ var split = row.imageUrls.split(",").filter(item => item != '')
+ split.forEach(url => {
+ var names = url.split("jczz/")
+ urls.push(names[1])
+ })
+ row.imageUrls = urls.join(",")
+ }
+
+ let label = row.label
+
+ if (row.smallLabel != '') {
+ label = label + ',' + row.smallLabel
+ }
+
+ delete row.smallLabel
+
+ update({
+ ...row,
+ label
+ }).then(
+ () => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ done()
+ },
+ (error) => {
+ window.console.log(error)
+ loading()
+ }
+ )
+ },
+
+ rowDel (row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ row.isDeleted = 1
+ return removeTask(row)
+ })
+ .then(() => {
+ this.onLoad(this.page)
+
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ })
+ },
+
+ searchReset () {
+ this.query = {}
+ this.onLoad(this.page)
+ },
+
+ searchChange (params, done) {
+ this.query = params
+ this.page.currentPage = 1
+ this.onLoad(this.page, params)
+ done()
+ },
+
+ selectionChange (list) {
+ this.selectionList = list
+ },
+
+ selectionClear () {
+ this.selectionList = []
+ this.$nextTick(() => {
+ this.$refs.crud && this.$refs.crud.toggleSelection()
+ })
+ },
+
+ handleDelete () {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据")
+ return
+ }
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(this.ids)
+ })
+ .then(() => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ this.$refs.crud.toggleSelection()
+ })
+ },
+
+ beforeOpen (done, type) {
+ // if (["edit", "view"].includes(type)) {
+
+ // } else {
+ // done()
+ // }
+ },
+
+ currentChange (currentPage) {
+ this.page.currentPage = currentPage
+ },
+
+ sizeChange (pageSize) {
+ this.page.pageSize = pageSize
+ },
+
+ refreshChange () {
+ // this.onLoad(this.page, this.query)
+ },
+
+ onLoad (page, params = {}) {
+ this.loading = true
+ getDAGLList(page.currentPage, page.pageSize, { ...Object.assign(params, this.query), isFront: 1 }).then(res => {
+ console.log('getDAGLList', res.data.data.records)
+ const data = {
+ ...res.data.data,
+ records: res.data.data.records.map(item => {
+ return {
+ ...item,
+ 'principalIdCardflag': false,
+ 'principalPhoneflag': false,
+ 'policePhoneflag': false
+ }
+ })
+ }
+ this.page.total = data.total
+ this.data = data.records
+ this.loading = false
+ this.selectionClear()
+ })
+ }
+ }
+}
+</script>
+
+<style lang="scss" scoped>
+.avue-upload__icon {
+ line-height: 6;
+}
+
+// :deep(.el-form-item__content) {
+// text-align: left !important;
+// }
+
+// :deep(.avue-form__menu--center .el-button) {
+// margin: 0 5px 0 0;
+// }
+</style>
diff --git a/vue.config.js b/vue.config.js
index f5a51ed..ad95f39 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -9,48 +9,48 @@
* Copyright (c) 2024 by shuishen, All Rights Reserved.
*/
module.exports = {
- //路径前缀
- publicPath: "/",
- lintOnSave: true,
- productionSourceMap: false,
- chainWebpack: (config) => {
- //忽略的打包文件
- config.externals({
- vue: "Vue",
- "vue-router": "VueRouter",
- vuex: "Vuex",
- axios: "axios",
- "element-ui": "ELEMENT",
- });
- const entry = config.entry("app");
- entry.add("babel-polyfill").end();
- entry.add("classlist-polyfill").end();
- entry.add("@/mock").end();
- },
- css: {
- extract: {
- ignoreOrder: true,
+ //路径前缀
+ publicPath: "/",
+ lintOnSave: true,
+ productionSourceMap: false,
+ chainWebpack: (config) => {
+ //忽略的打包文件
+ config.externals({
+ vue: "Vue",
+ "vue-router": "VueRouter",
+ vuex: "Vuex",
+ axios: "axios",
+ "element-ui": "ELEMENT",
+ })
+ const entry = config.entry("app")
+ entry.add("babel-polyfill").end()
+ entry.add("classlist-polyfill").end()
+ entry.add("@/mock").end()
},
- },
- //开发模式反向代理配置，生产模式请使用Nginx部署并配置反向代理
- devServer: {
- port: 1888,
- proxy: {
- "/api": {
- //本地服务接口地址
- target: "https://srgdjczzxtpt.com:2080/api",
- // target: "https://kt39592615.goho.co",
- // target: "http://z4042833u6.wicp.vip",
- // target: "http://localhost:9528",
- // target:"http://192.168.0.109:9528",
- //远程演示服务地址,可用于直接启动项目
- //target: 'https://saber.bladex.cn/api',
- changeOrigin: true,
- ws: true,
- pathRewrite: {
- "^/api": "/",
+ css: {
+ extract: {
+ ignoreOrder: true,
},
- },
},
- },
-};
+ //开发模式反向代理配置，生产模式请使用Nginx部署并配置反向代理
+ devServer: {
+ port: 1888,
+ proxy: {
+ "/api": {
+ //本地服务接口地址
+ target: "https://srgdjczzxtpt.com:2080/api",
+ // target: "https://kt39592615.goho.co",
+ // target: "http://z4042833u6.wicp.vip",
+ // target: "http://localhost:9528",
+ // target: "http://192.168.2.109:9528",
+ //远程演示服务地址,可用于直接启动项目
+ //target: 'https://saber.bladex.cn/api',
+ changeOrigin: true,
+ ws: true,
+ pathRewrite: {
+ "^/api": "/",
+ },
+ },
+ },
+ },
+}
--
Gitblit v1.9.3