From d647dc0448ded5d750d325a8deaaf7ed3547b433 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Wed, 20 Dec 2023 17:01:40 +0800
Subject: [PATCH 1/3] update

---
 src/views/specialEquipment/maintain/Record.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/views/specialEquipment/maintain/Record.vue b/src/views/specialEquipment/maintain/Record.vue
index bf33d9a0..be4d1309 100644
--- a/src/views/specialEquipment/maintain/Record.vue
+++ b/src/views/specialEquipment/maintain/Record.vue
@@ -195,18 +195,21 @@ export default {
 						{ id: 3, name: '特种设备' },
 					],
 					filterable: true,
+					defaultSelect: null
 				},
 				{
 					type: 'select',
 					label: '设备',
 					placeholder: '请选择设备',
 					param: 'equipmentId',
+					defaultSelect: null
 				},
 				{
 					type: 'select',
 					label: '计划名称',
 					placeholder: '请选择计划名称',
 					param: 'maintainPlanId',
+					defaultSelect: null
 				},
 				// 开始结束时间
 				{
@@ -220,6 +223,7 @@ export default {
 					endPlaceholder: '结束日期',
 					defaultTime: ['00:00:00', '23:59:59'],
 					param: 'startTime',
+					defaultSelect: null
 					// width: 350,
 				},
 				{
@@ -229,6 +233,7 @@ export default {
 						{ name: '是', id: 1 },
 						{ name: '否', id: 2 },
 					],
+					defaultSelect: null,
 					param: 'relatePlan',
 				},
 				{
@@ -434,12 +439,16 @@ export default {
 	created() {
 		this.initSearchBar();
 		if (this.$route.query) {
+			this.queryParams.specialType =
+				this.$route.query?.specialType ?? undefined;
 			this.queryParams.equipmentId =
 				this.$route.query?.equipmentId ?? undefined;
 			this.queryParams.maintainPlanId =
 				this.$route.query?.maintainPlanId ?? undefined;
 			this.queryParams.relatePlan = this.$route.query?.relatePlan ?? undefined;
 			this.queryParams.startTime = this.$route.query?.createTime ?? undefined;
+			this.searchBarFormConfig[0].defaultSelect =
+				this.$route.query.specialType ?? undefined;
 			this.searchBarFormConfig[1].defaultSelect =
 				this.$route.query.equipmentId ?? undefined;
 			this.searchBarFormConfig[2].defaultSelect =

From 5974e7026e7dc872a0b26be0ec60940ed7499ff9 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Thu, 21 Dec 2023 10:26:56 +0800
Subject: [PATCH 2/3] update kiln databorad

---
 src/views/databoard/kiln/index.vue | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/views/databoard/kiln/index.vue b/src/views/databoard/kiln/index.vue
index 6d005504..12eef32c 100644
--- a/src/views/databoard/kiln/index.vue
+++ b/src/views/databoard/kiln/index.vue
@@ -6,18 +6,7 @@
 -->
 
 <template>
-	<div
-		class="KilnDataBoard"
-		style="
-			position: absolute;
-			top: -8px;
-			left: -16px;
-			width: calc(100% + 28px);
-			height: calc(100% + 38px);
-			display: flex;
-			flex-direction: column;
-			gap: 16px;
-		">
+	<div class="KilnDataBoard" style="">
 		<KHeader />
 		<div
 			class="main-body"
@@ -66,5 +55,20 @@ export default {
 	background: url(../assets/bg.png) no-repeat;
 	background-size: cover;
 	background-position: 0 0;
+	;
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	// top: -8px;
+	// left: -16px;
+	// width: calc(100% + 28px);
+	// height: calc(100% + 38px);
+	// width: 100vw;
+	// height: 100vh;
+	display: flex;
+	flex-direction: column;
+	gap: 16px;
 }
 </style>

From e848be2a35ab8dc3ca2384e68c18732ba06376aa Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Wed, 3 Jan 2024 09:10:29 +0800
Subject: [PATCH 3/3] update

---
 src/views/specialEquipment/basic/FireFighthing.vue | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/views/specialEquipment/basic/FireFighthing.vue b/src/views/specialEquipment/basic/FireFighthing.vue
index 9f925444..2bd3409e 100644
--- a/src/views/specialEquipment/basic/FireFighthing.vue
+++ b/src/views/specialEquipment/basic/FireFighthing.vue
@@ -170,7 +170,12 @@ export default {
 				{ width: 256, prop: 'code', label: '设备编码' },
 				{ prop: 'location', label: '位置' },
 				{ prop: 'responsiblePeopleName', label: '负责人' },
-				{ prop: 'dueTime', label: '有效期至' },
+				{
+					prop: 'dueDate',
+					label: '有效期至',
+					filter: (val) =>
+						val != null ? moment(val).format('yyyy-MM-DD HH:mm:ss') : '--',
+				},
 				{ prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
@@ -250,8 +255,8 @@ export default {
 				[
 					{
 						datetime: true,
-						label: '有效期至',
-						prop: 'dueTime',
+						label: '有效期',
+						prop: 'dueDate',
 						bind: { clearable: true },
 					},
 					{},