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/ninePlaceManage/patrolRecord.vue | 579 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 487 insertions(+), 92 deletions(-)
diff --git a/src/views/publicSecurity/ninePlaceManage/patrolRecord.vue b/src/views/publicSecurity/ninePlaceManage/patrolRecord.vue
index 6cdee2b..5667986 100644
--- a/src/views/publicSecurity/ninePlaceManage/patrolRecord.vue
+++ b/src/views/publicSecurity/ninePlaceManage/patrolRecord.vue
@@ -4,47 +4,104 @@
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="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)">
详情
</el-button>
</template>
+ <template slot="menuLeft">
+ <el-button type="warning" size="small" plain icon="el-icon-download" @click="handleExport">导出
+ </el-button>
+ </template>
</avue-crud>
- <el-drawer title="巡查详情" :visible.sync="isDetail" :append-to-body="true" size="60%" direction="rtl">
+ <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">
+ <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>
- <el-card class="trackClass" style="overflow-y: auto">
- <el-form :model="form" label-position="right" size="mini" class="taskinfoForm" label-width="70px">
- <el-row>
- <el-col :span="24">
- <el-form-item label="巡检状态">
- <el-input :disabled="true" v-model="form.$status" autocomplete="off"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="24">
- <el-form-item label="巡查内容">
- <el-input :disabled="true" v-model="form.content" autocomplete="off"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="24">
- <el-form-item label="巡查图片">
- <el-upload action="" :disabled="true" list-type="picture-card" :file-list="form.elUploadImageArr">
- </el-upload>
- </el-form-item>
-
- </el-col>
- </el-row>
- </el-form>
- </el-card>
-
- <!-- <DcMap v-if="isDetail" :is-detail="isDetail" :range="form.taskRoute" :patrolRoute="form.patrolRoute">
- </DcMap> -->
-
+ <div class="question-list" v-for="(tItem, tIndex) in rowDetail.qTypeList" :key='tIndex'>
+ <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>
@@ -61,12 +118,26 @@
} from "@/api/patrol/placeChek"
import {
- addPd,
- } from "@/api/discuss/publicDiscuss"
+ 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 {
getDistrictTree
} from "@/api/district/index"
@@ -94,7 +165,7 @@
searchLabelWidth: 96,
searchShow: true,
searchMenuSpan: 3,
- // menuWidth: 450,
+ menuWidth: 100,
// menu: false,
height: "auto",
calcHeight: 54,
@@ -108,63 +179,19 @@
editBtn: false,
viewBtn: false,
// selection: true,
- excelBtn: true,
+ excelBtn: false,
+ refreshBtn: false,
+ searchShowBtn: false,
+ columnBtn: false,
dialogClickModal: false,
column: [{
- label: "所属街道",
- prop: "streetName",
- span: 24,
- row: true,
- searchSpan: 4,
- search: true,
- },
- {
- label: "所属社区",
- prop: "communityName",
- span: 24,
- row: true,
- searchSpan: 4,
- search: true,
- },
- {
- label: "所属网格",
- prop: "gridName",
- span: 24,
- row: true,
- searchSpan: 4,
- search: true,
- },
- {
label: "场所名称",
prop: "placeName",
span: 24,
row: true,
searchSpan: 4,
search: true,
- },
- {
- label: "场所隐患",
- prop: "remark",
- span: 24,
- row: true,
- searchSpan: 4,
- },
-
- {
- label: "场所负责人",
- prop: "principal",
- span: 24,
- row: true,
- searchSpan: 4,
- search: true,
- },
-
- {
- label: "场所负责人电话",
- prop: "principalPhone",
- span: 24,
- row: true,
- searchSpan: 4,
+ align: 'center'
},
{
label: "场所地址",
@@ -173,6 +200,77 @@
row: true,
searchSpan: 4,
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,
@@ -181,6 +279,7 @@
type: "upload",
listType: "picture-img",
span: 24,
+ align: 'center'
},
{
label: "创建时间",
@@ -189,12 +288,19 @@
row: true,
searchSpan: 4,
searchLabelWidth: 46,
+ align: 'center'
},
],
},
data: [],
districtTree: [],
+ rowDetail: [],
+ refreshNum: 1,
+ radio: '1',
+ questionTypeList: [],
+ CNNum: ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十', '十一', '十二', '十三', '十四', '十五'],
+ nineTypeList: []
}
},
watch: {
@@ -232,12 +338,140 @@
}
},
+ 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")
+ }
+ }
+ }
+ }
+
},
+
+ created() {
+ this.getPatrolGroupTree()
+ this.getDictBizTree()
+ },
+
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-placeCheck/placeCheck/export-placeCheck?${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]
+ },
+
+ // 点击展开收缩
+ 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(row) {
+ if (row.patrolRecordVOList) {
+ row.patrolRecordVOList.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.patrolRecordVOList) {
+ // 把相同类型问题分组
+ let obj = this.groupBy(row.patrolRecordVOList, '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.isDetail = true
},
+
searchReset() {
this.query = {}
this.onLoad(this.page)
@@ -309,10 +543,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(",")
@@ -322,8 +563,14 @@
item.signaturePath = urls.join(",")
}
})
+ this.page.total = data.total
+ this.data = data.records
this.loading = false
this.selectionClear()
+ }).catch(err => {
+ setTimeout(() => {
+ this.loading = false
+ }, 300)
})
getDistrictTree({
filterFlag: 1
@@ -333,6 +580,10 @@
const column = this.findObject(this.option.column, "articleList")
column.dicData = res.data.data
this.loading = false
+ }).catch(err => {
+ setTimeout(() => {
+ this.loading = false
+ }, 300)
})
},
updateFb(row) {
@@ -370,8 +621,152 @@
}
</script>
-<style>
+<style lang="scss" scoped>
.avue-upload__icon {
line-height: 6;
}
-</style>
\ No newline at end of file
+
+ :deep(.el-drawer__header) {
+ margin-bottom: 10px;
+ }
+
+ :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;
+ }
+
+ .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>
--
Gitblit v1.9.3