From dae2ccae8efacabe026424c86bde21ddcb36bb8c Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 08 Jul 2024 10:55:56 +0800
Subject: [PATCH] 公安模块添加时间查询
---
src/views/publicSecurity/campusExclusion.vue | 22
src/views/publicSecurity/disputeExclusion.vue | 22
src/views/publicSecurity/place.vue | 19
src/views/publicSecurity/nursingSchool.vue | 20
src/views/publicSecurity/keynotePlaceManage.vue | 20
src/views/publicSecurity/ninePlaceManage/patrolRecord.vue | 20
src/views/publicSecurity/components/auditBase.vue | 2
src/views/place/residencePermitApply.vue | 20
src/views/publicSecurity/ninePlaceManage/archivesManage.vue | 854 +++++++++++-----------
src/views/publicSecurity/positionManage/TransactRegist.vue | 20
src/views/publicSecurity/bailReporting.vue | 999 +++++++++++++-------------
src/views/backblask/BackblastArticle.vue | 39
src/views/backblask/BackblastWarnHanRec.vue | 24
src/views/cGovernance/taskECallTwo/index.vue | 2
src/views/publicSecurity/noExplosionManage.vue | 32
src/views/publicSecurity/policeAlarmRecords.vue | 20
src/views/backblask/BackblastPubRecord.vue | 9
src/views/publicSecurity/SchoolCheckManage.vue | 20
18 files changed, 1,228 insertions(+), 936 deletions(-)
diff --git a/src/views/backblask/BackblastArticle.vue b/src/views/backblask/BackblastArticle.vue
index 60b7560..c1e4db9 100644
--- a/src/views/backblask/BackblastArticle.vue
+++ b/src/views/backblask/BackblastArticle.vue
@@ -12,15 +12,18 @@
<template slot-scope="{type,size,row }" slot="menu">
- <el-button icon="el-icon-user" :size="size" :type="type" @click.stop="openUserPopup(row, 1)" v-if="permission.article_backblast_user">
+ <el-button icon="el-icon-user" :size="size" :type="type" @click.stop="openUserPopup(row, 1)"
+ v-if="permission.article_backblast_user">
浏览人员
</el-button>
- <el-button v-if="row.publish == '1' && permission.article_backblast_addOrDel" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
+ <el-button v-if="row.publish == '1' && permission.article_backblast_addOrDel" icon="el-icon-close" :size="size"
+ :type="type" @click.stop="updateFb(row)">
撤销
</el-button>
- <el-button v-if="row.publish == '0' && permission.article_backblast_addOrDel" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
+ <el-button v-if="row.publish == '0' && permission.article_backblast_addOrDel" icon="el-icon-check" :size="size"
+ :type="type" @click.stop="updateFb(row)">
发布
</el-button>
</template>
@@ -111,6 +114,20 @@
excelBtn: true,
dialogClickModal: false,
column: [{
+ label: "发布时间",
+ prop: "dateRange",
+ type: "daterange",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchRange: true,
+ startPlaceholder: '开始日期',
+ endPlaceholder: '结束日期',
+ align: 'center',
+ search: true,
+ hide: true,
+ searchSpan: 5,
+ searchLabelWidth: 76,
+ }, {
overHidden: true,
label: "宣传标题",
prop: "title",
@@ -133,8 +150,8 @@
tags: true,
type: "tree",
multiple: true,
- dicUrl:"/api/blade-district/district/getDistrictTree?filterFlag=1",
- dataType:"string",
+ dicUrl: "/api/blade-district/district/getDistrictTree?filterFlag=1",
+ dataType: "string",
rules: [{
required: true,
message: "请选择范围",
@@ -188,8 +205,8 @@
label: "观看得分",
prop: "score",
type: "number",
- align:"center",
- value:2,
+ align: "center",
+ value: 2,
rules: [{
required: true,
message: "请输入观看得分",
@@ -203,7 +220,7 @@
type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd HH:mm:ss",
- search: true,
+ // search: true,
addDisplay: false,
editDisplay: false,
viewDisplay: false,
@@ -577,6 +594,12 @@
searchChange(params, done) {
this.query = params
this.page.currentPage = 1
+ let dateRange = params.dateRange
+ if (params.dateRange) {
+ params.startTime = dateRange[0] + " 00:00:00"
+ params.endTime = dateRange[1] + " 23:59:59"
+ delete params.dateRange
+ }
this.onLoad(this.page, params)
done()
},
diff --git a/src/views/backblask/BackblastPubRecord.vue b/src/views/backblask/BackblastPubRecord.vue
index 231d5f7..ca1d34d 100644
--- a/src/views/backblask/BackblastPubRecord.vue
+++ b/src/views/backblask/BackblastPubRecord.vue
@@ -108,6 +108,15 @@
row: true,
span: 24,
}, {
+ label: "社区",
+ prop: "communityName",
+ align: 'center',
+ labelWidth: 120,
+ search: true,
+ searchSpan: 4,
+ searchLabelWidth: 96,
+ width: 160,
+ }, {
label: "小区名称",
prop: "aoiName",
labelWidth: 120,
diff --git a/src/views/backblask/BackblastWarnHanRec.vue b/src/views/backblask/BackblastWarnHanRec.vue
index f64e029..bca1988 100644
--- a/src/views/backblask/BackblastWarnHanRec.vue
+++ b/src/views/backblask/BackblastWarnHanRec.vue
@@ -78,6 +78,20 @@
columnBtn: false,
dialogClickModal: false,
column: [{
+ label: "创建时间",
+ prop: "dateRange",
+ type: "daterange",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchRange: true,
+ startPlaceholder: '开始日期',
+ endPlaceholder: '结束日期',
+ align: 'center',
+ search: true,
+ hide: true,
+ searchSpan: 5,
+ searchLabelWidth: 76,
+ }, {
label: "地址",
prop: "address",
// align: 'center',
@@ -112,7 +126,7 @@
dataType: "string",
width: 110,
}, {
- label: "时间",
+ label: "创建时间",
prop: "createTime",
labelWidth: 120,
align: 'center',
@@ -337,6 +351,12 @@
searchChange(params, done) {
this.query = params
this.page.currentPage = 1
+ let dateRange = params.dateRange
+ if (params.dateRange) {
+ params.startTime = dateRange[0]
+ params.endTime = dateRange[1]
+ delete params.dateRange
+ }
this.onLoad(this.page, params)
done()
},
@@ -427,4 +447,4 @@
.avue-upload__icon {
line-height: 6;
}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/cGovernance/taskECallTwo/index.vue b/src/views/cGovernance/taskECallTwo/index.vue
index c63b542..7ffdda6 100644
--- a/src/views/cGovernance/taskECallTwo/index.vue
+++ b/src/views/cGovernance/taskECallTwo/index.vue
@@ -672,7 +672,7 @@
type: "warning",
})
.then(() => {
- return remove(row.orderId)
+ return remove(row.id)
})
.then(() => {
this.onLoad(this.page)
diff --git a/src/views/place/residencePermitApply.vue b/src/views/place/residencePermitApply.vue
index dc5e1cc..29cfd95 100644
--- a/src/views/place/residencePermitApply.vue
+++ b/src/views/place/residencePermitApply.vue
@@ -151,6 +151,20 @@
selection: true,
dialogClickModal: false,
column: [{
+ label: "申请时间",
+ prop: "dateRange",
+ type: "daterange",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchRange: true,
+ startPlaceholder: '开始日期',
+ endPlaceholder: '结束日期',
+ align: 'center',
+ search: true,
+ hide: true,
+ searchSpan: 5,
+ searchLabelWidth: 76,
+ }, {
width: 110,
span: 12,
label: "姓名",
@@ -553,6 +567,12 @@
searchChange(params, done) {
this.query = params
this.page.currentPage = 1
+ let dateRange = params.dateRange
+ if (params.dateRange) {
+ params.startTime = dateRange[0] + " 00:00:00"
+ params.endTime = dateRange[1] + " 23:59:59"
+ delete params.dateRange
+ }
this.onLoad(this.page, params)
done()
},
diff --git a/src/views/publicSecurity/SchoolCheckManage.vue b/src/views/publicSecurity/SchoolCheckManage.vue
index bcfecd8..d9f07d5 100644
--- a/src/views/publicSecurity/SchoolCheckManage.vue
+++ b/src/views/publicSecurity/SchoolCheckManage.vue
@@ -223,6 +223,20 @@
columnBtn: false,
dialogClickModal: false,
column: [{
+ label: "检查时间",
+ prop: "dateRange",
+ type: "daterange",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchRange: true,
+ startPlaceholder: '开始日期',
+ endPlaceholder: '结束日期',
+ align: 'center',
+ search: true,
+ hide: true,
+ searchSpan: 5,
+ searchLabelWidth: 76,
+ }, {
label: "校园名称",
prop: "placeName",
span: 24,
@@ -715,6 +729,12 @@
searchChange(params, done) {
this.query = params
this.page.currentPage = 1
+ let dateRange = params.dateRange
+ if (params.dateRange) {
+ params.startTime = dateRange[0]
+ params.endTime = dateRange[1]
+ delete params.dateRange
+ }
this.onLoad(this.page, params)
done()
},
diff --git a/src/views/publicSecurity/bailReporting.vue b/src/views/publicSecurity/bailReporting.vue
index 437ecff..ab41b5a 100644
--- a/src/views/publicSecurity/bailReporting.vue
+++ b/src/views/publicSecurity/bailReporting.vue
@@ -1,540 +1,565 @@
<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, index}" slot="menu">
- <el-button :size="size" type="text" icon="el-icon-view" v-if="permission.bail_view" plain
- @click="lookDetail(row, 0)">查 看
- </el-button>
- <el-button :size="size" type="text" icon="el-icon-s-check" v-if="row.status == 1 && permission.bail_check"
- plain @click="lookDetail(row, 1)">审 核
- </el-button>
- <el-button :size="size" type="text" icon="el-icon-delete" v-if="permission.bail_del" plain
- @click="rowDel(row)">删 除
- </el-button>
- </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, index}" slot="menu">
+ <el-button :size="size" type="text" icon="el-icon-view" v-if="permission.bail_view" plain
+ @click="lookDetail(row, 0)">查 看
+ </el-button>
+ <el-button :size="size" type="text" icon="el-icon-s-check" v-if="row.status == 1 && permission.bail_check" plain
+ @click="lookDetail(row, 1)">审 核
+ </el-button>
+ <el-button :size="size" type="text" icon="el-icon-delete" v-if="permission.bail_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>
- <template slot-scope="{row, size}" slot="phone">
- <el-button :size="size" type="text" @click="showStringDispose(row, 'phoneflag')"
- v-text="textDispose(row, 'phoneflag', 'phone')">
- </el-button>
- </template>
- </avue-crud>
+ <template slot="status" slot-scope="{row, size}">
+ <el-tag :size="size" :type="showStatus(row.status).type">
+ {{ showStatus(row.status).text }}
+ </el-tag>
+ </template>
+ <template slot-scope="{row, size}" slot="phone">
+ <el-button :size="size" type="text" @click="showStringDispose(row, 'phoneflag')"
+ v-text="textDispose(row, 'phoneflag', 'phone')">
+ </el-button>
+ </template>
+ </avue-crud>
- <el-dialog class="place-info-box audit-info-box" title="" append-to-body :visible.sync="auditBasePopup" width="60%">
- <bailReportingDetail @colseDetail="colseDetail" ref="bailReportingDetail"></bailReportingDetail>
- </el-dialog>
- </basic-container>
+ <el-dialog class="place-info-box audit-info-box" title="" append-to-body :visible.sync="auditBasePopup" width="60%">
+ <bailReportingDetail @colseDetail="colseDetail" ref="bailReportingDetail"></bailReportingDetail>
+ </el-dialog>
+ </basic-container>
</template>
<script>
-import {
+ import {
getBailReportingPage,
removeTask,
update,
add,
-} from "@/api/task/task"
+ } from "@/api/task/task"
-import {
+ import {
update as bailReportingUpdate,
getList as bailReportingGetList
-} from "@/api/task/bailReporting"
+ } from "@/api/task/bailReporting"
-import {
+ import {
mapGetters
-} from "vuex"
+ } from "vuex"
-import website from '@/config/website'
+ import website from '@/config/website'
-import bailReportingDetail from './components/bailReportingDetail'
-// import baseAllInfo from './components/baseAllInfo'
+ import bailReportingDetail from './components/bailReportingDetail'
+ // import baseAllInfo from './components/baseAllInfo'
-export default {
- data () {
+ export default {
+ data() {
- //手机号格式校验
- let validatorPhone = function (rule, value, callback) {
- if (value) {
- if (!/^1[3456789]\d{9}$/.test(value)) {
- callback(new Error('手机号格式有误！'))
- } else {
- callback()
- }
- }
+ //手机号格式校验
+ let validatorPhone = function(rule, value, callback) {
+ if (value) {
+ if (!/^1[3456789]\d{9}$/.test(value)) {
+ callback(new Error('手机号格式有误！'))
+ } else {
callback()
+ }
}
+ callback()
+ }
- return {
- curRow: {},
- roleBox: false,
+ return {
+ curRow: {},
+ roleBox: false,
- form: {},
- query: {},
- loading: true,
+ form: {},
+ query: {},
+ loading: true,
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ datetime: "",
+ selectionList: [],
+ option: {
+ labelWidth: 96,
+ searchLabelWidth: 96,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menuWidth: 210,
+ header: false,
+ height: "auto",
+ calcHeight: 54,
+ dialogWidth: 950,
+ tip: false,
+ border: true,
+ // menu: false,
+ //stripe:true,
+ index: true,
+ // viewBtn: true,
+ delBtn: false,
+ editBtn: false,
+ selection: true,
+ dialogClickModal: false,
+ header: false,
+ column: [{
+ label: "申请时间",
+ prop: "dateRange",
+ type: "daterange",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchRange: true,
+ startPlaceholder: '开始日期',
+ endPlaceholder: '结束日期',
+ align: 'center',
+ search: true,
+ hide: true,
+ searchSpan: 5,
+ searchLabelWidth: 76,
+ }, {
+ span: 12,
+ label: "社区",
+ prop: "communityName",
+ searchSpan: 4,
+ searchLabelWidth: 46,
+ search: true,
+ hide: true,
},
- datetime: "",
- selectionList: [],
- option: {
- labelWidth: 96,
- searchLabelWidth: 96,
- searchShow: true,
- searchMenuSpan: 3,
- menuWidth: 210,
- header: false,
- height: "auto",
- calcHeight: 54,
- dialogWidth: 950,
- tip: false,
- border: true,
- // menu: false,
- //stripe:true,
- index: true,
- // viewBtn: true,
- delBtn: false,
- editBtn: false,
- selection: true,
- dialogClickModal: false,
- header: false,
- column: [{
- span: 12,
- label: "社区",
- prop: "communityName",
- searchSpan: 4,
- searchLabelWidth: 46,
- search: true,
- hide: true,
- },
- {
- span: 12,
- label: "小区",
- prop: "districtName",
- searchSpan: 4,
- searchLabelWidth: 66,
- search: true,
- hide: true,
- },
- {
- width: 100,
- span: 12,
- label: "姓名",
- prop: "realName",
- searchSpan: 3,
- searchLabelWidth: 66,
- search: true,
- }, {
- width: 120,
- span: 12,
- label: "联系方式",
- prop: "phone",
- searchSpan: 4,
- search: true,
- slot: true,
- rules: [{
- validator: validatorPhone,
- trigger: 'blur'
- }],
- }, {
- span: 12,
- label: "外出事由",
- prop: "applyName",
- searchSpan: 4,
- search: true,
- },
- {
- width: 110,
- label: "所属街道",
- // hide: true,
- searchSpan: 4,
- // search: true,
- parent: false,
- prop: "streetCode",
- type: "tree",
- dicUrl: "/api/blade-system/region/getTownTree",
- props: {
- label: "name",
- value: "id"
- },
- rules: [{
- required: true,
- message: "请选择所属街道",
- trigger: "blur",
- },],
- }, {
- width: 156,
- // hide: true,
- parent: false,
- searchSpan: 4,
- label: "所属社区",
- prop: "neiCode",
- // search: true,
- type: "tree",
- dicUrl: "/api/blade-system/region/tree",
- props: {
- label: "name",
- value: "id",
- },
- cascader: ["gridId"],
- rules: [{
- required: true,
- message: "请选择所属社区",
- trigger: "blur",
- },],
- }, {
- width: 220,
- overHidden: true,
- label: "小区",
- prop: "aoiCode",
- searchSpan: 4,
- type: 'tree',
- searchLabelWidth: 66,
- // search: true,
- parent: false,
- dicUrl: `/api/blade-district/district/getDistrictTree`,
- props: {
- label: "name",
- value: "aoiCode"
- },
- // defaultExpandedKeys: ["361102003"],
- span: 12,
- rules: [{
- required: true,
- message: "请选择小区",
- trigger: "blur",
- },],
- // disabled: true
- display: true,
- // hide: true,
- },
- {
- width: 144,
- label: "出发时间",
- prop: "startTimes",
- searchSpan: 4,
- },
- {
- width: 144,
- label: "到达时间",
- prop: "reachTime",
- searchSpan: 4,
- },
- {
- width: 144,
- label: "返程时间",
- prop: "returnTime",
- searchSpan: 4,
- },
- {
- 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
- }]
- },
-
-
- ],
+ {
+ span: 12,
+ label: "小区",
+ prop: "districtName",
+ searchSpan: 4,
+ searchLabelWidth: 66,
+ search: true,
+ hide: true,
},
- data: [],
+ {
+ width: 100,
+ span: 12,
+ label: "姓名",
+ prop: "realName",
+ searchSpan: 3,
+ searchLabelWidth: 66,
+ search: true,
+ }, {
+ width: 120,
+ span: 12,
+ label: "联系方式",
+ prop: "phone",
+ searchSpan: 4,
+ search: true,
+ slot: true,
+ rules: [{
+ validator: validatorPhone,
+ trigger: 'blur'
+ }],
+ }, {
+ span: 12,
+ label: "外出事由",
+ prop: "applyName",
+ searchSpan: 4,
+ search: true,
+ },
+ {
+ width: 110,
+ label: "所属街道",
+ // hide: true,
+ searchSpan: 4,
+ // search: true,
+ parent: false,
+ prop: "streetCode",
+ type: "tree",
+ dicUrl: "/api/blade-system/region/getTownTree",
+ props: {
+ label: "name",
+ value: "id"
+ },
+ rules: [{
+ required: true,
+ message: "请选择所属街道",
+ trigger: "blur",
+ }, ],
+ }, {
+ width: 156,
+ // hide: true,
+ parent: false,
+ searchSpan: 4,
+ label: "所属社区",
+ prop: "neiCode",
+ // search: true,
+ type: "tree",
+ dicUrl: "/api/blade-system/region/tree",
+ props: {
+ label: "name",
+ value: "id",
+ },
+ cascader: ["gridId"],
+ rules: [{
+ required: true,
+ message: "请选择所属社区",
+ trigger: "blur",
+ }, ],
+ }, {
+ width: 220,
+ overHidden: true,
+ label: "小区",
+ prop: "aoiCode",
+ searchSpan: 4,
+ type: 'tree',
+ searchLabelWidth: 66,
+ // search: true,
+ parent: false,
+ dicUrl: `/api/blade-district/district/getDistrictTree`,
+ props: {
+ label: "name",
+ value: "aoiCode"
+ },
+ // defaultExpandedKeys: ["361102003"],
+ span: 12,
+ rules: [{
+ required: true,
+ message: "请选择小区",
+ trigger: "blur",
+ }, ],
+ // disabled: true
+ display: true,
+ // hide: true,
+ },
+ {
+ width: 144,
+ label: "出发时间",
+ prop: "startTimes",
+ searchSpan: 4,
+ },
+ {
+ width: 144,
+ label: "到达时间",
+ prop: "reachTime",
+ searchSpan: 4,
+ },
+ {
+ width: 144,
+ label: "返程时间",
+ prop: "returnTime",
+ searchSpan: 4,
+ },
+ {
+ width: 144,
+ label: "申请时间",
+ prop: "createTime",
+ searchSpan: 4,
+ },
+ {
+ 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
+ }]
+ },
- auditBasePopup: false,
- }
+
+ ],
+ },
+ data: [],
+
+ auditBasePopup: false,
+ }
},
- provide () {
- return {
- placeElement: this,
- }
+ provide() {
+ return {
+ placeElement: this,
+ }
},
components: {
- bailReportingDetail,
+ bailReportingDetail,
},
watch: {},
computed: {
- ...mapGetters(["permission", "userInfo"]),
- permissionList () {
+ ...mapGetters(["permission", "userInfo"]),
+ permissionList() {
- console.log("permission===>", this.permission)
+ console.log("permission===>", this.permission)
- return {
- addBtn: this.vaildData(this.permission.bail_add, false),
- viewBtn: this.vaildData(this.permission.bail_view, true),
- delBtn: this.vaildData(this.permission.bail_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: '未通过'
- }
- }
-
- return tags
- }
- },
-
- 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")
- }
- }
- }
+ return {
+ addBtn: this.vaildData(this.permission.bail_add, false),
+ viewBtn: this.vaildData(this.permission.bail_view, true),
+ delBtn: this.vaildData(this.permission.bail_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: '未通过'
+ }
+ }
+
+ return tags
+ }
+ },
+
+ 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: {
- showStringDispose (row, type) {
- row[type] = !row[type]
- },
+ showStringDispose(row, type) {
+ row[type] = !row[type]
+ },
- colseDetail () {
- this.auditBasePopup = false
- this.onLoad(this.page)
- },
- lookDetail (row, applyType) {
- this.auditBasePopup = true
- var that = this
- this.$nextTick(() => {
- that.$refs.bailReportingDetail.init(row, applyType)
- })
- },
- auditCur (row) {
- this.curAuditRow = row
- this.auditBasePopup = true
- },
+ colseDetail() {
+ this.auditBasePopup = false
+ this.onLoad(this.page)
+ },
+ lookDetail(row, applyType) {
+ this.auditBasePopup = true
+ var that = this
+ this.$nextTick(() => {
+ that.$refs.bailReportingDetail.init(row, applyType)
+ })
+ },
+ auditCur(row) {
+ this.curAuditRow = row
+ this.auditBasePopup = true
+ },
- roleBoxClose () {
- this.curRow = {}
- },
+ roleBoxClose() {
+ this.curRow = {}
+ },
- ManageTenants (item) {
- this.curRow = item
- this.roleBox = true
- },
+ 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) {
- bailReportingUpdate({
- ...row
- }).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 = {}) {
- const {
- dateTime
- } = this.query
- let values = {
- ...params,
- }
- values.reportType = 1
- this.loading = true
- getBailReportingPage(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 => {
- this.$set(item, 'phoneflag', false)
- 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()
- })
+ 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) {
+ bailReportingUpdate({
+ ...row
+ }).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
+ let dateRange = params.dateRange
+ if (params.dateRange) {
+ params.startTime = dateRange[0] + " 00:00:00"
+ params.endTime = dateRange[1] + " 23:59:59"
+ delete params.dateRange
+ }
+ 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 = {}) {
+ const {
+ dateTime
+ } = this.query
+ let values = {
+ ...params,
+ }
+ values.reportType = 1
+ this.loading = true
+ getBailReportingPage(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 => {
+ this.$set(item, 'phoneflag', false)
+ 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>
-.avue-upload__icon {
+ .avue-upload__icon {
line-height: 6;
-}
+ }
</style>
\ No newline at end of file
diff --git a/src/views/publicSecurity/campusExclusion.vue b/src/views/publicSecurity/campusExclusion.vue
index 0ad9144..9cda003 100644
--- a/src/views/publicSecurity/campusExclusion.vue
+++ b/src/views/publicSecurity/campusExclusion.vue
@@ -143,6 +143,20 @@
selection: true,
dialogClickModal: false,
column: [{
+ label: "上报时间",
+ prop: "dateRange",
+ type: "daterange",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchRange: true,
+ startPlaceholder: '开始日期',
+ endPlaceholder: '结束日期',
+ align: 'center',
+ search: true,
+ hide: true,
+ searchSpan: 5,
+ searchLabelWidth: 76,
+ }, {
width: 130,
span: 12,
label: "姓名",
@@ -275,7 +289,7 @@
{
width: 140,
span: 12,
- label: "创建时间",
+ label: "上报时间",
prop: "createTime",
align: 'center',
labelWidth: 110,
@@ -599,6 +613,12 @@
searchChange(params, done) {
this.query = params
this.page.currentPage = 1
+ let dateRange = params.dateRange
+ if (params.dateRange) {
+ params.startTime = dateRange[0]
+ params.endTime = dateRange[1]
+ delete params.dateRange
+ }
this.onLoad(this.page, params)
done()
},
diff --git a/src/views/publicSecurity/components/auditBase.vue b/src/views/publicSecurity/components/auditBase.vue
index ce9027e..2afc27f 100644
--- a/src/views/publicSecurity/components/auditBase.vue
+++ b/src/views/publicSecurity/components/auditBase.vue
@@ -7,7 +7,7 @@
<el-button :size="size" @click="handleSubmit(3)">驳 回</el-button>
</template>
- <template slot-scope="{ row, size, index }" slot="houseCode">
+ <template slot-scope="{ row, size, index }" slot="houseCode" v-if="this.type == 2">
<el-select v-model="form.houseCode" filterable remote :remote-method="onRemoteMethod" @change="onSelectChange"
placeholder="请选择标准地址" reserve-keyword>
<el-option v-for="item in standardAddressList" :key="item.houseCode"
diff --git a/src/views/publicSecurity/disputeExclusion.vue b/src/views/publicSecurity/disputeExclusion.vue
index 40b9a72..99ca775 100644
--- a/src/views/publicSecurity/disputeExclusion.vue
+++ b/src/views/publicSecurity/disputeExclusion.vue
@@ -143,6 +143,20 @@
selection: true,
dialogClickModal: false,
column: [{
+ label: "上报时间",
+ prop: "dateRange",
+ type: "daterange",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchRange: true,
+ startPlaceholder: '开始日期',
+ endPlaceholder: '结束日期',
+ align: 'center',
+ search: true,
+ hide: true,
+ searchSpan: 5,
+ searchLabelWidth: 76,
+ }, {
width: 130,
span: 12,
label: "姓名",
@@ -275,7 +289,7 @@
{
width: 140,
span: 12,
- label: "创建时间",
+ label: "上报时间",
prop: "createTime",
align: 'center',
labelWidth: 110,
@@ -599,6 +613,12 @@
searchChange(params, done) {
this.query = params
this.page.currentPage = 1
+ let dateRange = params.dateRange
+ if (params.dateRange) {
+ params.startTime = dateRange[0]
+ params.endTime = dateRange[1]
+ delete params.dateRange
+ }
this.onLoad(this.page, params)
done()
},
diff --git a/src/views/publicSecurity/keynotePlaceManage.vue b/src/views/publicSecurity/keynotePlaceManage.vue
index ff77f74..b0000a2 100644
--- a/src/views/publicSecurity/keynotePlaceManage.vue
+++ b/src/views/publicSecurity/keynotePlaceManage.vue
@@ -240,6 +240,20 @@
columnBtn: false,
dialogClickModal: false,
column: [{
+ label: "自查时间",
+ prop: "dateRange",
+ type: "daterange",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchRange: true,
+ startPlaceholder: '开始日期',
+ endPlaceholder: '结束日期',
+ align: 'center',
+ search: true,
+ hide: true,
+ searchSpan: 5,
+ searchLabelWidth: 76,
+ }, {
label: "场所名称",
prop: "placeName",
span: 24,
@@ -745,6 +759,12 @@
searchChange(params, done) {
this.query = params
this.page.currentPage = 1
+ let dateRange = params.dateRange
+ if (params.dateRange) {
+ params.startTime = dateRange[0]
+ params.endTime = dateRange[1]
+ delete params.dateRange
+ }
this.onLoad(this.page, params)
done()
},
diff --git a/src/views/publicSecurity/ninePlaceManage/archivesManage.vue b/src/views/publicSecurity/ninePlaceManage/archivesManage.vue
index 6a7ab45..dfffd75 100644
--- a/src/views/publicSecurity/ninePlaceManage/archivesManage.vue
+++ b/src/views/publicSecurity/ninePlaceManage/archivesManage.vue
@@ -1,442 +1,472 @@
<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>
+ <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 {
+ import {
mapGetters
-} from "vuex"
-import {
+ } from "vuex"
+ import {
getDAGLList
-} from "@/api/publicSecurity/ninePlaceManage"
-import NProgress from 'nprogress'
-import 'nprogress/nprogress.css'
-import Qs from "qs"
-import {
+ } from "@/api/publicSecurity/ninePlaceManage"
+ import NProgress from 'nprogress'
+ import 'nprogress/nprogress.css'
+ import Qs from "qs"
+ import {
exportBlob
-} from "@/api/common"
-import {
+ } from "@/api/common"
+ import {
getToken
-} from '@/util/auth'
-import {
+ } from '@/util/auth'
+ import {
downloadXls
-} from "@/util/util"
-import {
+ } from "@/util/util"
+ import {
dateNow
-} from "@/util/date"
+ } from "@/util/date"
-export default {
- data () {
- return {
- form: {},
- query: {},
- loading: true,
+ export default {
+ data() {
+ return {
+ form: {},
+ query: {},
+ loading: true,
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0,
+ 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,
+ refreshBtn: false,
+ searchShowBtn: false,
+ columnBtn: false,
+ dialogClickModal: false,
+ column: [{
+ label: "创建时间",
+ prop: "dateRange",
+ type: "daterange",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchRange: true,
+ startPlaceholder: '开始日期',
+ endPlaceholder: '结束日期',
+ align: 'center',
+ search: true,
+ hide: true,
+ searchSpan: 5,
+ searchLabelWidth: 76,
+ }, {
+ label: "场所名称",
+ prop: "placeName",
+ align: 'center',
+ search: true,
+ searchSpan: 4,
+ // searchLabelWidth: 96,
+ width: 156,
+ searchPlaceholder: '请输入'
+ }, {
+ label: "场所地址",
+ prop: "location",
+ align: 'center',
},
- 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,
- refreshBtn: false,
- searchShowBtn: false,
- columnBtn: false,
- dialogClickModal: false,
- column: [{
- label: "场所名称",
- prop: "placeName",
- align: 'center',
- search: true,
- searchSpan: 4,
- // searchLabelWidth: 96,
- width: 156,
- searchPlaceholder: '请输入'
- }, {
- 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: 4,
- // searchLabelWidth: 96,
- searchPlaceholder: '请选择'
- }, {
- label: "场所负责人",
- prop: "principal",
- align: 'center',
- search: true,
- searchSpan: 4,
- searchLabelWidth: 96,
- width: 110,
- searchPlaceholder: '请输入负责人'
- }, {
- label: "身份证信息",
- prop: "principalIdCard",
- align: 'center',
- slot: true,
- width: 160
- }, {
- label: "联系方式",
- prop: "principalPhone",
- align: 'center',
- slot: true,
- width: 120
- }, {
- label: "地区",
- prop: "townStreetName",
- align: 'center',
- search: true,
- searchSpan: 3,
- searchLabelWidth: 60,
- labelWidth: 120,
- width: 120,
- searchPlaceholder: '请输入地区'
- }, {
- label: "所属社区",
- prop: "neiName",
- align: 'center',
- search: true,
- searchSpan: 4,
- searchLabelWidth: 84,
- labelWidth: 120,
- width: 156,
- searchPlaceholder: '请输入所属社区'
- }, {
- label: "辖区派出所",
- prop: "deptName",
- align: 'center',
- search: true,
- searchSpan: 4,
- searchLabelWidth: 96,
- width: 120,
- searchPlaceholder: '请输入辖区派出所'
- }, {
- label: "责任民警",
- prop: "policeName",
- align: 'center',
- search: true,
- searchSpan: 4,
- // searchLabelWidth: 96,
- width: 110,
- searchPlaceholder: '请输入责任民警'
- }, {
- label: "责任民警联系方式",
- prop: "policePhone",
- align: 'center',
- slot: true,
- width: 120
- }],
+ {
+ label: "场所类别",
+ prop: "nineType",
+ align: 'center',
+ dicUrl: "/api/blade-system/dict-biz/tree?code=nineType",
+ props: {
+ label: "title",
+ value: "key",
+ },
+ type: 'select',
+ search: true,
+ searchSpan: 4,
+ // searchLabelWidth: 96,
+ searchPlaceholder: '请选择'
+ }, {
+ label: "场所负责人",
+ prop: "principal",
+ align: 'center',
+ search: true,
+ searchSpan: 4,
+ searchLabelWidth: 96,
+ width: 110,
+ searchPlaceholder: '请输入负责人'
+ }, {
+ label: "身份证信息",
+ prop: "principalIdCard",
+ align: 'center',
+ slot: true,
+ width: 160
+ }, {
+ label: "联系方式",
+ prop: "principalPhone",
+ align: 'center',
+ slot: true,
+ width: 120
+ }, {
+ label: "地区",
+ prop: "townStreetName",
+ align: 'center',
+ search: true,
+ searchSpan: 3,
+ searchLabelWidth: 60,
+ labelWidth: 120,
+ width: 120,
+ searchPlaceholder: '请输入地区'
+ }, {
+ label: "所属社区",
+ prop: "neiName",
+ align: 'center',
+ search: true,
+ searchSpan: 4,
+ searchLabelWidth: 84,
+ labelWidth: 120,
+ width: 156,
+ searchPlaceholder: '请输入所属社区'
+ }, {
+ label: "辖区派出所",
+ prop: "deptName",
+ align: 'center',
+ search: true,
+ searchSpan: 4,
+ searchLabelWidth: 96,
+ width: 120,
+ searchPlaceholder: '请输入辖区派出所'
+ }, {
+ label: "责任民警",
+ prop: "policeName",
+ align: 'center',
+ search: true,
+ searchSpan: 4,
+ // searchLabelWidth: 96,
+ width: 110,
+ searchPlaceholder: '请输入责任民警'
+ }, {
+ label: "责任民警联系方式",
+ prop: "policePhone",
+ align: 'center',
+ slot: true,
+ width: 120
+ }, {
+ label: "创建时间",
+ prop: "createTime",
+ span: 24,
+ searchSpan: 4,
+ searchLabelWidth: 46,
+ align: 'center'
},
- data: []
- }
+ ],
+ },
+ 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")
- }
- }
- }
+ ...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.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()
- })
- })
- },
+ 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]
- },
+ 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), isNine: 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()
- })
+ 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
+ let dateRange = params.dateRange
+ if (params.dateRange) {
+ params.startTime = dateRange[0] + " 00:00:00"
+ params.endTime = dateRange[1] + " 23:59:59"
+ delete params.dateRange
+ }
+ 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),
+ isNine: 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 {
+ .avue-upload__icon {
line-height: 6;
-}
+ }
-// :deep(.el-form-item__content) {
-// text-align: left !important;
-// }
+ // :deep(.el-form-item__content) {
+ // text-align: left !important;
+ // }
-// :deep(.avue-form__menu--center .el-button) {
-// margin: 0 5px 0 0;
-// }
-</style>
+ // :deep(.avue-form__menu--center .el-button) {
+ // margin: 0 5px 0 0;
+ // }
+</style>
\ No newline at end of file
diff --git a/src/views/publicSecurity/ninePlaceManage/patrolRecord.vue b/src/views/publicSecurity/ninePlaceManage/patrolRecord.vue
index 05e657f..048374e 100644
--- a/src/views/publicSecurity/ninePlaceManage/patrolRecord.vue
+++ b/src/views/publicSecurity/ninePlaceManage/patrolRecord.vue
@@ -185,6 +185,20 @@
columnBtn: false,
dialogClickModal: false,
column: [{
+ label: "检查时间",
+ prop: "dateRange",
+ type: "daterange",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchRange: true,
+ startPlaceholder: '开始日期',
+ endPlaceholder: '结束日期',
+ align: 'center',
+ search: true,
+ hide: true,
+ searchSpan: 5,
+ searchLabelWidth: 76,
+ }, {
label: "场所名称",
prop: "placeName",
span: 24,
@@ -479,6 +493,12 @@
searchChange(params, done) {
this.query = params
this.page.currentPage = 1
+ let dateRange = params.dateRange
+ if (params.dateRange) {
+ params.startTime = dateRange[0]
+ params.endTime = dateRange[1]
+ delete params.dateRange
+ }
this.onLoad(this.page, params)
done()
},
diff --git a/src/views/publicSecurity/noExplosionManage.vue b/src/views/publicSecurity/noExplosionManage.vue
index 911e00e..4537628 100644
--- a/src/views/publicSecurity/noExplosionManage.vue
+++ b/src/views/publicSecurity/noExplosionManage.vue
@@ -54,10 +54,10 @@
<div class="info-name">场所名称</div>
<div class="info-value">{{ rowDetail.placeName }}</div>
</div>
- <!-- <div class="info-item">
- <div class="info-name">场所类别</div>
- <div class="info-value">{{ rowDetail.noExplosionCategoryName }}</div>
- </div> -->
+ <div class="info-item">
+ <div class="info-name">场所标准地址</div>
+ <div class="info-value">{{ rowDetail.addressName }}</div>
+ </div>
<div class="info-item">
<div class="info-name">上报人</div>
<div class="info-value">{{ rowDetail.name }}</div>
@@ -65,6 +65,10 @@
<div class="info-item">
<div class="info-name">上报时间</div>
<div class="info-value">{{ rowDetail.createTime }}</div>
+ </div>
+ <div class="info-item">
+ <div class="info-name">门牌二维码</div>
+ <div class="info-value"><img style="width: 60px;height: 60px;" :src="rowDetail.qrImg" alt="" /></div>
</div>
</div>
<div class="title">
@@ -218,6 +222,20 @@
columnBtn: false,
dialogClickModal: false,
column: [{
+ label: "创建时间",
+ prop: "dateRange",
+ type: "daterange",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchRange: true,
+ startPlaceholder: '开始日期',
+ endPlaceholder: '结束日期',
+ align: 'center',
+ search: true,
+ hide: true,
+ searchSpan: 5,
+ searchLabelWidth: 76,
+ }, {
label: "场所名称",
prop: "placeName",
span: 24,
@@ -736,6 +754,12 @@
searchChange(params, done) {
this.query = params
this.page.currentPage = 1
+ let dateRange = params.dateRange
+ if (params.dateRange) {
+ params.startTime = dateRange[0] + " 00:00:00"
+ params.endTime = dateRange[1] + " 23:59:59"
+ delete params.dateRange
+ }
this.onLoad(this.page, params)
done()
},
diff --git a/src/views/publicSecurity/nursingSchool.vue b/src/views/publicSecurity/nursingSchool.vue
index 090a475..bbc9030 100644
--- a/src/views/publicSecurity/nursingSchool.vue
+++ b/src/views/publicSecurity/nursingSchool.vue
@@ -53,6 +53,20 @@
dialogClickModal: false,
header: false,
column: [{
+ label: "护学时间",
+ prop: "dateRange",
+ type: "daterange",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchRange: true,
+ startPlaceholder: '开始日期',
+ endPlaceholder: '结束日期',
+ align: 'center',
+ search: true,
+ hide: true,
+ searchSpan: 5,
+ searchLabelWidth: 76,
+ }, {
overHidden: true,
label: "学校名称",
prop: "placeName",
@@ -189,6 +203,12 @@
searchChange(params, done) {
this.query = params
this.page.currentPage = 1
+ let dateRange = params.dateRange
+ if (params.dateRange) {
+ params.startTime = dateRange[0] + " 00:00:00"
+ params.endTime = dateRange[1] + " 23:59:59"
+ delete params.dateRange
+ }
this.onLoad(this.page, params)
done()
},
diff --git a/src/views/publicSecurity/place.vue b/src/views/publicSecurity/place.vue
index 2b1f668..261f60d 100644
--- a/src/views/publicSecurity/place.vue
+++ b/src/views/publicSecurity/place.vue
@@ -4,22 +4,6 @@
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="menuLeft">
- <el-button type="danger" size="small" plain icon="el-icon-delete" v-if="permission.place_delete"
- @click="handleDelete">删 除
- </el-button>
- <el-button type="success" size="small" plain v-if="permission.place_import" icon="el-icon-upload2"
- @click="handleImport">导入
- </el-button>
- <el-button type="warning" size="small" plain v-if="permission.place_export" icon="el-icon-download"
- @click="handleExport">导出
- </el-button>
-
- <el-button type="success" size="small" plain v-if="permission.place_import" icon="el-icon-upload2"
- @click="handlePractitionerImport">从业人员导入
- </el-button>
- </template> -->
<template slot-scope="{row}" slot="location">
<span v-text="showLocation(row.location)"></span>
</template>
@@ -44,9 +28,6 @@
</template>
<template slot-scope="{row, size}" slot="menu">
- <!-- <el-button :size="size" type="text" icon="el-icon-s-check" v-if="permission.place_audit_cur"
- @click="auditCur({ ...row, confirmFlag: 1 })">审核
- </el-button> -->
<el-button :size="size" type="text" icon="el-icon-edit" v-if="permission.place_manage_tenants"
@click="ManageTenants(row)">场所维护
diff --git a/src/views/publicSecurity/policeAlarmRecords.vue b/src/views/publicSecurity/policeAlarmRecords.vue
index 73bb494..73c8014 100644
--- a/src/views/publicSecurity/policeAlarmRecords.vue
+++ b/src/views/publicSecurity/policeAlarmRecords.vue
@@ -221,6 +221,20 @@
columnBtn: false,
dialogClickModal: false,
column: [{
+ label: "报警时间",
+ prop: "dateRange",
+ type: "daterange",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchRange: true,
+ startPlaceholder: '开始日期',
+ endPlaceholder: '结束日期',
+ align: 'center',
+ search: true,
+ hide: true,
+ searchSpan: 5,
+ searchLabelWidth: 76,
+ }, {
label: "报警地址",
prop: "address",
span: 24,
@@ -666,6 +680,12 @@
searchChange(params, done) {
this.query = params
this.page.currentPage = 1
+ let dateRange = params.dateRange
+ if (params.dateRange) {
+ params.startTime = dateRange[0]
+ params.endTime = dateRange[1]
+ delete params.dateRange
+ }
this.onLoad(this.page, params)
done()
},
diff --git a/src/views/publicSecurity/positionManage/TransactRegist.vue b/src/views/publicSecurity/positionManage/TransactRegist.vue
index 10a0364..3d8f6b7 100644
--- a/src/views/publicSecurity/positionManage/TransactRegist.vue
+++ b/src/views/publicSecurity/positionManage/TransactRegist.vue
@@ -159,6 +159,20 @@
selection: true,
dialogClickModal: false,
column: [{
+ label: "发生时间",
+ prop: "dateRange",
+ type: "daterange",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchRange: true,
+ startPlaceholder: '开始日期',
+ endPlaceholder: '结束日期',
+ align: 'center',
+ search: true,
+ hide: true,
+ searchSpan: 5,
+ searchLabelWidth: 76,
+ }, {
width: 110,
span: 12,
label: "街道名称",
@@ -669,6 +683,12 @@
searchChange(params, done) {
this.query = params
this.page.currentPage = 1
+ let dateRange = params.dateRange
+ if (params.dateRange) {
+ params.startTime = dateRange[0] + " 00:00:00"
+ params.endTime = dateRange[1] + " 23:59:59"
+ delete params.dateRange
+ }
this.onLoad(this.page, params)
done()
},
--
Gitblit v1.9.3