From 4522ab3fe8bd45ee753ef187448c1e884bbc601f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 18 Apr 2024 11:09:27 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web
---
src/views/publicSecurity/keynotePlaceManage.vue | 768 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 662 insertions(+), 106 deletions(-)
diff --git a/src/views/publicSecurity/keynotePlaceManage.vue b/src/views/publicSecurity/keynotePlaceManage.vue
index f88ee5e..952b112 100644
--- a/src/views/publicSecurity/keynotePlaceManage.vue
+++ b/src/views/publicSecurity/keynotePlaceManage.vue
@@ -5,16 +5,36 @@
@search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
@current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
- <template slot-scope="scope" slot="menu">
- <el-button type="text" size="small" icon="el-icon-view" plain @click="lookDetail(scope.row,0)">查 看
+ <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" plain @click.stop="getDetail(row)">
+ 详情
</el-button>
- <el-button type="text" size="small" icon="el-icon-s-check" v-if="scope.row.status == 1" plain
- @click="lookDetail(scope.row,1)">审 核
+ <el-button type="text" :size="size" icon="el-icon-s-check" v-if="permission.place_check"
+ :disabled="row.status != 1" plain @click=" goAudit(row)">审 核
</el-button>
- <el-button type="text" size="small" icon="el-icon-delete" plain @click="rowDel(scope.row)">删 除
- </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>
+
+ <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="menuLeft">
+ <el-button type="warning" size="small" plain icon="el-icon-download" @click="handleExport">导出
+ </el-button>
+ </template>
</avue-crud>
@@ -23,12 +43,99 @@
<hotelReporting @colseDetail="colseDetail" v-if="taskType == 2" ref="hotelReporting"></hotelReporting>
<labelReporting @colseDetail="colseDetail" v-if="taskType == 3" ref="labelReporting"></labelReporting>
</el-dialog>
+
+ <el-dialog :visible.sync="visible" append-to-body destroy-on-close title="审核" width="30%"
+ custom-class="flow-design-dialog" :before-close="handleClose">
+ <audit-base @handleSubmit="submitAudit"></audit-base>
+ </el-dialog>
+ <el-drawer title="消防自查详情" :visible.sync="isDetail" :append-to-body="true" size="40%" direction="rtl">
+ <div class="title">
+ <div class="icon">{{ refreshNum }}</div>
+ 基础信息
+ </div>
+ <div class="basic-info" v-loading="drawerLoading">
+ <div class="info-item">
+ <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.nineTypeName }}</div>
+ </div> -->
+ <div class="info-item">
+ <div class="info-name">检查人</div>
+ <div class="info-value">{{ rowDetail.name }}</div>
+ </div>
+ <div class="info-item">
+ <div class="info-name">检查时间</div>
+ <div class="info-value">{{ rowDetail.createTime }}</div>
+ </div>
+ </div>
+ <div class="title">
+ <div class="icon"></div>
+ 检查记录
+ </div>
+
+ <div class="question-list" v-for="(tItem, tIndex) in rowDetail.qTypeList" :key='tIndex' v-loading="drawerLoading">
+ <div class="question-type" @click="flodQL(tIndex)">
+ <div class="type-name">
+ {{ CNNum[tIndex] }}、{{ tItem.questionName }}
+ </div>
+ <div class="icon-box"><i class="el-icon-arrow-down" v-show="tItem.isShowQList"></i><i class="el-icon-arrow-up"
+ v-show="!tItem.isShowQList"></i></div>
+ </div>
+ <div class="question-item" v-for="(item, index) in tItem.questionList" :key='index' v-show="tItem.isShowQList">
+ <div class="question-name">
+ <div class="key">{{ index + 1 }}、{{ item.itemsNameTitle }}</div>
+ <div class="value"><el-radio v-model="radio" label="1" disabled>存在</el-radio>
+ <el-radio v-model="radio" label="2" disabled>不存在</el-radio>
+ </div>
+ </div>
+ <div class="yh-pic-box">
+ <div class="yh-pic-name">
+ 隐患图片
+ </div>
+ <div class="yh-pic-list">
+ <div class="pic-item" v-for="pic in item.imageUrlsList">
+ <el-image style="width: 100px; height: 100px" :src="pic" :fit="fit"></el-image>
+ </div>
+ </div>
+ </div>
+ <div class="yh-remark">
+ <div class="yh-remark-name">
+ 隐患描述
+ </div>
+ <div class="yh-remark-value">
+ {{ item.remark }}
+ </div>
+ </div>
+ <div class="yh-pic-box">
+ <div class="yh-pic-name">
+ 整改后图片
+ </div>
+ <div class="yh-pic-list">
+ <div class="pic-item" v-for="pic in item.rectificationImageUrlsList">
+ <el-image style="width: 100px; height: 100px" :src="pic" :fit="fit"></el-image>
+ </div>
+ </div>
+ </div>
+ <div class="yh-remark">
+ <div class="yh-remark-name">
+ 整改后描述
+ </div>
+ <div class="yh-remark-value">
+ {{ item.rectificationRemark }}
+ </div>
+ </div>
+ </div>
+ </div>
+ </el-drawer>
</basic-container>
</template>
<script>
import {
- getList,
+ getTaskPlaceSelfCheckList,
removeTask,
update,
add,
@@ -37,15 +144,63 @@
import {
mapGetters
} from "vuex"
-
+ import {
+ applyTaskExamine,
+ getTaskPlaceSelfCheckInfo
+ } from "@/api/publicSecurity/keynoteManage"
+ import {
+ getPatrolGroupTree,
+ getDictBizTree
+ } from "@/api/publicSecurity/ninePlaceManage"
import website from '@/config/website'
+ import NProgress from 'nprogress'
+ import 'nprogress/nprogress.css'
+ import Qs from "qs"
+ import {
+ exportBlob
+ } from "@/api/common"
+ import {
+ getToken
+ } from '@/util/auth'
+ import {
+ downloadXls
+ } from "@/util/util"
+ import {
+ dateNow
+ } from "@/util/date"
import 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 {
+ isDetail: false,
+ refreshNum: 1,
+ rowDetail: [],
+ auditRules: {
+ status: [{
+ required: true,
+ message: "必填"
+ }],
+ remark: [{
+ required: true,
+ message: "必填"
+ }],
+ },
+ visible: false,
taskType: 0,
curRow: {},
roleBox: false,
@@ -53,111 +208,159 @@
form: {},
query: {},
loading: true,
-
+ drawerLoading: false,
page: {
pageSize: 10,
currentPage: 1,
total: 0,
},
- datetime: "",
selectionList: [],
option: {
+ labelWidth: 120,
+ searchLabelWidth: 96,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menuWidth: 200,
+ // menu: false,
height: "auto",
calcHeight: 54,
dialogWidth: 950,
tip: false,
- searchShow: true,
- searchMenuSpan: 3,
- menuWidth: 280,
- // menu: false,
border: true,
+ addBtn: false,
+ delBtn: false,
//stripe:true,
index: true,
- // viewBtn: true,
editBtn: false,
- delBtn: false,
- selection: true,
+ viewBtn: false,
+ // selection: true,
+ excelBtn: false,
+ refreshBtn: false,
+ searchShowBtn: false,
+ columnBtn: false,
dialogClickModal: false,
column: [{
- span: 12,
label: "场所名称",
- prop: "name",
+ prop: "placeName",
+ span: 24,
+ row: true,
searchSpan: 4,
search: true,
- rules: [{
- required: true,
- message: "请输入场所名称",
- trigger: "blur",
- }, ],
- }, {
- span: 12,
- label: "地址",
- prop: "addressName",
+ align: 'center'
+ },
+ {
+ label: "场所地址",
+ prop: "location",
+ span: 24,
+ row: true,
searchSpan: 4,
- // search: true,
- rules: [{
- required: true,
- message: "请输入场所名称",
- trigger: "blur",
- }, ],
+ searchLabelWidth: 46,
+ overHidden: true,
+ 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,
+ align: 'center'
+ }, {
+ label: "所属街道",
+ prop: "streetName",
+ span: 24,
+ row: true,
+ searchSpan: 4,
+ search: true,
+ align: 'center'
+ },
+ {
+ label: "所属社区",
+ prop: "communityName",
+ span: 24,
+ row: true,
+ searchSpan: 4,
+ search: true,
+ width: 160,
+ overHidden: true,
+ align: 'center'
+ },
+ {
+ label: "所属网格",
+ prop: "gridName",
+ span: 24,
+ row: true,
+ searchSpan: 4,
+ search: true,
+ align: 'center'
+ },
+ {
+ label: "场所隐患",
+ prop: "remark",
+ span: 24,
+ row: true,
+ searchSpan: 4,
+ align: 'center'
+ },
+ {
+ label: "场所负责人",
+ prop: "principal",
+ span: 24,
+ row: true,
+ searchSpan: 4,
+ search: true,
+ align: 'center'
+ },
+ {
+ label: "场所负责人电话",
+ prop: "principalPhone",
+ span: 24,
+ row: true,
+ slot: true,
+ searchSpan: 4,
+ align: 'center'
+ },
+ {
+ width: 110,
+ label: "签名",
+ prop: "signaturePath",
+ type: "upload",
+ listType: "picture-img",
+ span: 24,
+ align: 'center'
+ },
+ {
+ width: 110,
+ label: "审核状态",
+ prop: "status",
+ span: 24,
+ align: 'center',
+ slot: true,
},
{
label: "创建时间",
prop: "createTime",
+ span: 24,
+ row: true,
searchSpan: 4,
-
- },
-
- {
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- label: '审核状态',
- prop: 'status',
- type: 'radio',
- slot: true,
- dicData: [{
- label: '待审核',
- value: 1
- }, {
- label: '已审核',
- value: 2
- }, {
- label: '未通过',
- value: 3
- }]
- },
- {
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- label: '类型',
- prop: 'reportType',
- type: 'radio',
- slot: true,
- search: true,
- dicData: [{
- label: '旅馆安全',
- value: 2
- }, {
- label: '打金店',
- value: 3
- }, {
- label: '二手手机维修',
- value: 4
- }, {
- label: '二手车交易',
- value: 5
- }, {
- label: '校园安全',
- value: 6
- }]
+ searchLabelWidth: 46,
+ align: 'center'
},
],
},
data: [],
auditBasePopup: false,
+ questionTypeList: [],
+ CNNum: ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十', '十一', '十二', '十三', '十四', '十五'],
+ nineTypeList: [],
+ radio: '1',
}
},
@@ -175,14 +378,19 @@
watch: {},
+ created() {
+ this.getPatrolGroupTree()
+ this.getDictBizTree()
+ },
+
computed: {
...mapGetters(["permission", "userInfo"]),
permissionList() {
return {
- addBtn: this.vaildData(this.permission.place_add, true),
+ addBtn: this.vaildData(this.permission.place_add, false),
viewBtn: this.vaildData(this.permission.place_view, true),
- delBtn: this.vaildData(this.permission.place_delete, true),
- editBtn: this.vaildData(this.permission.place_edit, true),
+ delBtn: this.vaildData(this.permission.place_del, true),
+ // editBtn: this.vaildData(this.permission.place_edit, true),
}
},
ids() {
@@ -192,9 +400,206 @@
})
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
+ }
+ },
+
+ 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: {
+ // 点击展开收缩
+ flodQL(index) {
+ this.rowDetail.qTypeList[index].isShowQList = !this.rowDetail.qTypeList[index].isShowQList
+ this.refreshNum += 1
+ },
+
+ // 对数组按属性分组
+ groupBy(arr, key) {
+ return arr.reduce((acc, curr) => {
+ (acc[curr[key]] = acc[curr[key]] || []).push(curr)
+ return acc
+ }, {})
+ },
+
+ // 九小类型字典接口
+ getDictBizTree() {
+ getDictBizTree({
+ code: 'nineType'
+ }).then(res => {
+ this.nineTypeList = res.data.data
+ })
+ },
+
+ // 九小类型转换
+ switchNineType(type) {
+ return this.nineTypeList.find(item => item.key === type) ? this.nineTypeList.find(item => item.key === type)
+ .title : ''
+ },
+
+ // 获取问题类型
+ getPatrolGroupTree() {
+ getPatrolGroupTree({
+ type: 1,
+ childType: 1
+ }).then(res => {
+ this.questionTypeList = res.data.data
+ })
+ },
+
+ getDetail(rowData) {
+ this.drawerLoading = true
+ this.isDetail = true
+ getTaskPlaceSelfCheckInfo({
+ taskId: rowData.taskId
+ }).then(res => {
+ let row = res.data.data
+ if (row.taskPlaceRecordVOList) {
+ row.taskPlaceRecordVOList.forEach(item => {
+ item.imageUrlsList = []
+ item.rectificationImageUrlsList = []
+ if (item.imageUrls) {
+ item.imageUrlsList = item.imageUrls.split(',').map(ele => {
+ return website.minioUrl + ele
+ })
+
+ }
+ if (item.rectificationImageUrls) {
+ item.rectificationImageUrlsList = item.rectificationImageUrls.split(',').map(ele => {
+ return website.minioUrl + ele
+ })
+ }
+ // 查询问题类型
+ this.questionTypeList.forEach(qItem => {
+ qItem.children.forEach(qChild => {
+ if (qChild.id == item.itemId) {
+ item.qType = qItem.title
+ item.itemsNameTitle = qChild.title
+ }
+ })
+ })
+ })
+ }
+ if (row.taskPlaceRecordVOList) {
+ // 把相同类型问题分组
+ let obj = this.groupBy(row.taskPlaceRecordVOList, 'qType')
+ let arr = Object.entries(obj)
+ let newArr = []
+ arr.forEach(part => {
+ newArr.push({
+ questionName: part[0],
+ questionList: part[1],
+ isShowQList: true
+ })
+ })
+ row.qTypeList = newArr
+ }
+ // 九小类型转换
+ row.nineTypeName = this.switchNineType(row.nineType)
+ this.rowDetail = row
+ this.drawerLoading = false
+ })
+
+ },
+
+ handleExport() {
+ this.$confirm("是否导出消防自查数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ NProgress.start()
+ var data = {
+ ...this.query
+ }
+ // data.isNine = 1
+ data = Qs.stringify(data)
+ exportBlob(
+ `/api/blade-taskPlaceSelfCheck/taskPlaceSelfCheck/export-taskPlaceSelfCheck?${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]
+ },
+
+ // 弹窗关闭回调
+ handleClose() {
+ this.cancelAudit()
+ },
+
+ // 取消审核
+ cancelAudit() {
+ this.visible = false
+ },
+
+ // 确认提交审核
+ submitAudit(form) {
+ let auditForm = {
+ status: form.status == '1' ? '2' : '3',
+ remark: form.confirmNotion,
+ reportType: 2
+ }
+
+ applyTaskExamine(Object.assign(this.auditParams, auditForm)).then(res => {
+ if (res.data.code == 200) {
+ this.$message.warning("审核成功")
+ this.onLoad(this.page)
+ this.cancelAudit()
+ }
+ })
+ },
+
+ // 审核按钮
+ goAudit(row) {
+ this.auditParams = {
+ id: row.taskId,
+ reportType: row.reportType
+ }
+ this.visible = true
+ },
colseDetail() {
this.auditBasePopup = false
@@ -238,7 +643,7 @@
},
rowSave(row, done, loading) {
- if (row.imageUrls.length > 0) {
+ if (row.imageUrls && row.imageUrls.length > 0) {
var urls = []
var split = row.imageUrls.split(",").filter(item => item != '')
split.forEach(url => {
@@ -334,6 +739,7 @@
},
searchReset() {
this.query = {}
+ this.page.currentPage = 1
this.onLoad(this.page)
},
searchChange(params, done) {
@@ -401,45 +807,46 @@
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
+ const {} = 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) {
+ getTaskPlaceSelfCheckList(page.currentPage, page.pageSize, values).then((res) => {
+ 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.imageUrls.split(",").filter(item => item != '')
+ var names = item.signaturePath.split(",")
names.forEach(name => {
urls.push(website.minioUrl + name)
})
- item.imageUrls = urls.join(",")
+ item.signaturePath = urls.join(",")
}
})
+ this.page.total = data.total
+ this.data = data.records
this.loading = false
this.selectionClear()
})
@@ -449,6 +856,39 @@
</script>
<style lang="scss" scoped>
+ :deep(.cur-container-box) {
+ padding: 0;
+ }
+
+ :deep(.el-button--text) {
+ border: 0;
+ background: transparent !important;
+ }
+
+ :deep(.el-radio__input.is-disabled+span.el-radio__label) {
+ color: #000;
+ }
+
+ :deep(.el-radio__input.is-checked+.el-radio__label) {
+ color: #409EFF !important;
+ }
+
+ :deep(.el-radio__input.is-checked .el-radio__inner::after) {
+ background-color: #FFF;
+ }
+
+ :deep(.el-radio__input.is-checked .el-radio__inner) {
+ background-color: #409EFF;
+ }
+
+ :deep(.avue-crud__img) {
+ height: 30px !important;
+ }
+
+ :deep(.el-radio) {
+ margin-right: 20px;
+ }
+
.avue-upload__icon {
line-height: 6;
}
@@ -475,4 +915,120 @@
justify-content: center;
}
}
+
+ .title {
+ margin: 10px;
+ height: 40px;
+ background-color: #eee;
+ display: flex;
+ align-items: center;
+
+ .icon {
+ width: 4px;
+ height: 18px;
+ background-color: #409dfe;
+ margin: 0 10px;
+ color: transparent;
+ }
+ }
+
+ .basic-info {
+ padding: 0 20px;
+ font-size: 14px;
+
+ .info-item {
+ display: flex;
+ padding: 10px;
+
+ .info-name {
+ width: 100px;
+ display: flex;
+ align-items: center;
+ }
+
+ .info-value {
+ display: flex;
+ align-items: center;
+ }
+ }
+ }
+
+ .question-list {
+ padding: 0 20px;
+ font-size: 14px;
+
+ .question-type {
+ height: 60px;
+ display: flex;
+ align-items: center;
+ cursor: pointer;
+ justify-content: space-between;
+ padding-right: 20px;
+
+ .type-name {}
+
+ .icon-box {}
+ }
+
+ .question-item {
+ margin-bottom: 20px;
+ padding: 10px;
+ background: #f5f7fa;
+ border-radius: 8px;
+
+ &>div {
+ margin: 14px 0;
+ }
+
+ .question-name {
+ display: flex;
+
+ .key {
+ width: 80%;
+ padding-right: 20px;
+ word-break: break-all;
+ }
+
+ .value {
+ width: 20%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ }
+
+ .yh-pic-box {
+ display: flex;
+ height: 100px;
+
+ .yh-pic-name {
+ width: 100px;
+ display: flex;
+ align-items: center;
+ justify-content: left;
+ }
+
+ .yh-pic-list {
+ width: 0;
+ flex: 1;
+ display: flex;
+ }
+ }
+
+ .yh-remark {
+ display: flex;
+
+ .yh-remark-name {
+ width: 100px;
+ display: flex;
+ align-items: center;
+ justify-content: left;
+ }
+
+ .yh-remark-value {
+ word-break: break-all;
+ }
+ }
+ }
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3