From 5e2aafeede13d337380f736567caf74f49713be7 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:38:32 +0800
Subject: [PATCH] 代码优化
---
src/views/publicSecurity/SchoolCheckManage.vue | 126 +++++++++++++++++++++++++-----------------
1 files changed, 75 insertions(+), 51 deletions(-)
diff --git a/src/views/publicSecurity/SchoolCheckManage.vue b/src/views/publicSecurity/SchoolCheckManage.vue
index 974d07c..253bea5 100644
--- a/src/views/publicSecurity/SchoolCheckManage.vue
+++ b/src/views/publicSecurity/SchoolCheckManage.vue
@@ -48,18 +48,18 @@
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">
+ <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-name">校园名称</div>
<div class="info-value">{{ rowDetail.placeName }}</div>
</div>
<!-- <div class="info-item">
- <div class="info-name">场所类别</div>
+ <div class="info-name">校园类别</div>
<div class="info-value">{{ rowDetail.nineTypeName }}</div>
</div> -->
<div class="info-item">
@@ -91,30 +91,13 @@
<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">
+ <div class="pic-item" v-for="(pic, index) in item.rectificationImageUrlsList" :key='index'>
<el-image style="width: 100px; height: 100px" :src="pic" :fit="fit"></el-image>
</div>
</div>
@@ -240,7 +223,21 @@
columnBtn: false,
dialogClickModal: false,
column: [{
- label: "场所名称",
+ 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,
row: true,
@@ -249,7 +246,7 @@
align: 'center'
},
{
- label: "场所地址",
+ label: "校园地址",
prop: "location",
span: 24,
row: true,
@@ -257,26 +254,47 @@
searchLabelWidth: 46,
overHidden: true,
align: 'center'
- }, {
- label: "所属街道",
- prop: "streetName",
- span: 24,
- row: true,
- searchSpan: 4,
- search: true,
- align: 'center'
},
{
+ label: "所属街道",
+ parent: false,
+ search: true,
+ searchSpan: 4,
+ prop: "streetName",
+ type: "tree",
+ dicUrl: "/api/blade-system/region/getTownTree",
+ props: {
+ label: "name",
+ value: "name"
+ },
+ rules: [{
+ required: true,
+ message: "请选择所属街道",
+ trigger: "blur",
+ }, ],
+ },
+
+ {
+ parent: false,
label: "所属社区",
prop: "communityName",
- span: 24,
- row: true,
- searchSpan: 4,
search: true,
- width: 160,
- overHidden: true,
- align: 'center'
+ searchSpan: 4,
+ width: 150,
+ type: "tree",
+ dicUrl: "/api/blade-system/region/treeToCommunity",
+ props: {
+ label: "name",
+ value: "name",
+ },
+ cascader: ["gridCode"],
+ rules: [{
+ required: true,
+ message: "请选择所属社区",
+ trigger: "blur",
+ }, ],
},
+
{
label: "所属网格",
prop: "gridName",
@@ -286,17 +304,17 @@
search: true,
align: 'center'
},
+ // {
+ // label: "校园隐患",
+ // prop: "remark",
+ // span: 24,
+ // row: true,
+ // searchSpan: 4,
+ // align: 'center',
+ // width: 90,
+ // },
{
- label: "场所隐患",
- prop: "remark",
- span: 24,
- row: true,
- searchSpan: 4,
- align: 'center',
- width: 90,
- },
- {
- label: "场所负责人",
+ label: "校园负责人",
prop: "principal",
span: 24,
row: true,
@@ -305,7 +323,7 @@
align: 'center'
},
{
- label: "场所负责人电话",
+ label: "校园负责人电话",
prop: "principalPhone",
span: 24,
row: true,
@@ -732,6 +750,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()
},
@@ -755,7 +779,7 @@
type: "warning",
})
.then(() => {
- return remove(this.ids)
+ // return remove(this.ids)
})
.then(() => {
this.onLoad(this.page)
@@ -805,7 +829,7 @@
this.onLoad(this.page, this.query)
},
onLoad(page, params = {}) {
- const {} = this.query
+ // const {} = this.query
let values = {
...params,
}
--
Gitblit v1.9.3