From 81d2b5b05e9ef20796d75db9818dd0a3610f33e1 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 06 Feb 2024 11:59:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/publicSecurity/ninePlaceManage/situationRectification.vue | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 51 insertions(+), 1 deletions(-)
diff --git a/src/views/publicSecurity/ninePlaceManage/situationRectification.vue b/src/views/publicSecurity/ninePlaceManage/situationRectification.vue
index 69e384f..7fb2236 100644
--- a/src/views/publicSecurity/ninePlaceManage/situationRectification.vue
+++ b/src/views/publicSecurity/ninePlaceManage/situationRectification.vue
@@ -61,7 +61,7 @@
<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.itemsName }}</div>
+ <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>
@@ -103,6 +103,16 @@
</div>
</div>
</div>
+ </div>
+ <div class="question-list" v-show="rowDetail.isShowRemarkTitle">
+ <div class="question-type" @click="flodRM()">
+ <div class="type-name">
+ {{ CNNum[rowDetail.remarkNo] }}、其他隐患问题
+ </div>
+ <div class="icon-box"><i class="el-icon-arrow-down" v-show="rowDetail.isShowRemark"></i><i
+ class="el-icon-arrow-up" v-show="!rowDetail.isShowRemark"></i></div>
+ </div>
+ <div class="remark-box" v-show="rowDetail.isShowRemark">{{ rowDetail.remark }}</div>
</div>
</el-drawer>
<!-- 审核弹窗 -->
@@ -272,6 +282,20 @@
search: true,
searchSpan: 4,
searchLabelWidth: 106,
+ }, {
+ 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,
}],
},
data: [],
@@ -345,8 +369,15 @@
this.visible = true
},
+ // 折叠问题列表
flodQL (index) {
this.rowDetail.qTypeList[index].isShowQList = !this.rowDetail.qTypeList[index].isShowQList
+ this.refreshNum += 1
+ },
+
+ // 折叠其他
+ flodRM () {
+ this.rowDetail.isShowRemark = !this.rowDetail.isShowRemark
this.refreshNum += 1
},
@@ -386,6 +417,7 @@
qItem.children.forEach(qChild => {
if (qChild.id == item.itemId) {
item.qType = qItem.title
+ item.itemsNameTitle = qChild.title
}
})
})
@@ -399,12 +431,16 @@
newArr.push({ questionName: part[0], questionList: part[1], isShowQList: true })
})
row.qTypeList = newArr
+ row.remarkNo = newArr.length
+ row.isShowRemarkTitle = row.remark ? true : false
+ row.isShowRemark = true
this.rowDetail = row
this.isDetail = true
},
changeType (type) {
this.typeStatus = type
+ this.page.currentPage = 1
this.onLoad(this.page)
},
@@ -530,6 +566,12 @@
},
searchChange (params, done) {
+ let dateRange = params.dateRange
+ if (params.dateRange) {
+ params.startTime = dateRange[0]
+ params.endTime = dateRange[1]
+ delete params.dateRange
+ }
this.query = params
this.page.currentPage = 1
this.onLoad(this.page, params)
@@ -783,5 +825,13 @@
}
}
}
+
+ .remark-box {
+ padding: 10px;
+ background-color: #f5f7fa;
+ border-radius: 8px;
+ min-height: 40px;
+ margin-bottom: 20px;
+ }
}
</style>
--
Gitblit v1.9.3