diff --git a/.env.dev b/.env.dev
index ec8ac65b..79cf5d64 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,8 +1,8 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-03-25 15:59:53
- # @LastEditors: zhp
+ # @LastEditTime: 2024-03-27 16:24:02
+ # @LastEditors: DY
  # @Description:
 ###
 # 开发环境配置
diff --git a/src/views/base/coreProduct/add-or-updata.vue b/src/views/base/coreProduct/add-or-updata.vue
index 0ec802ba..43df9f16 100644
--- a/src/views/base/coreProduct/add-or-updata.vue
+++ b/src/views/base/coreProduct/add-or-updata.vue
@@ -2,15 +2,17 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-03-13 13:54:01
+ * @LastEditTime: 2024-03-27 13:47:24
  * @Description:
 -->
 <template>
 	<el-drawer
 		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="isdetail"
+		:wrapper-closable="true"
 		class="drawer"
+		:before-close="beforeClose"
+		@closed="$emit('destroy')"
 		size="60%">
 		<small-title slot="title" :no-padding="true">
 			{{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
@@ -262,6 +264,15 @@ export default {
 	},
 	mounted() {},
 	methods: {
+		beforeClose(done) {
+			if (!this.isdetail) {
+				this.$confirm('确认关闭？')
+					.then(_ => {
+						done();
+					})
+					.catch(_ => {});
+			}
+		},
 		clearArea() {
 			this.$set(this.dataForm, 'area', 0)
 			this.$set(this.dataForm, 'weight', 0)
diff --git a/src/views/base/coreProduct/index.vue b/src/views/base/coreProduct/index.vue
index 087cde3d..9cd5452e 100644
--- a/src/views/base/coreProduct/index.vue
+++ b/src/views/base/coreProduct/index.vue
@@ -26,7 +26,8 @@
 		<add-or-update
 			v-if="addOrUpdateVisible"
 			ref="addOrUpdate"
-			@refreshDataList="getDataList" />
+			@refreshDataList="getDataList"
+			@destroy="addOrUpdateVisible = false" />
 	</div>
 </template>
 
diff --git a/src/views/core/monitoring/data24/index.vue b/src/views/core/monitoring/data24/index.vue
index 2d0d0623..16d23c2a 100644
--- a/src/views/core/monitoring/data24/index.vue
+++ b/src/views/core/monitoring/data24/index.vue
@@ -115,7 +115,7 @@ export default {
 		/** 把 list 里的数据转换成 tableProps 对应的格式 */
 		convertList(list) {
 			// let sectionArr= []
-			let temp = Object.values(list.datamap)                             
+			let temp = list.datamap ? Object.values(list?.datamap) : []
 			console.log('111', temp)
 
 			temp.forEach(item => {
diff --git a/src/views/equipment/base/maintain/Confirm/WaitingListTable.vue b/src/views/equipment/base/maintain/Confirm/WaitingListTable.vue
index 697fbd8e..8e5dcaa5 100644
--- a/src/views/equipment/base/maintain/Confirm/WaitingListTable.vue
+++ b/src/views/equipment/base/maintain/Confirm/WaitingListTable.vue
@@ -15,6 +15,7 @@
 			background: '#f2f4f9',
 			color: '#606266',
 		}"
+		:max-height="tableH"
 		class="waiting-list-table">
 		<el-table-column
 			type="selection"
@@ -38,6 +39,7 @@
 			v-if="selectedBox[0]"
 			width="128"
 			label="设备保养单号"
+			:show-overflow-tooltip="true"
 			prop="maintainOrderNumber"></el-table-column>
 		<el-table-column v-if="selectedBox[1]" width="128" label="保养计划名称" prop="planName">
 			<template slot-scope="scope">
@@ -224,6 +226,7 @@ export default {
 				true,
 			],
 			selectedPlan: [],
+			tableH: this.tableHeight(260),
 		};
 	},
 	computed: {
@@ -234,6 +237,11 @@ export default {
 			}));
 		},
 	},
+	created() {
+		window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
+	},
 	methods: {
 		checkSelectable(row, index) {
 			return (
diff --git a/src/views/equipment/base/maintain/Confirm/index.vue b/src/views/equipment/base/maintain/Confirm/index.vue
index 28c9db73..385f50bc 100644
--- a/src/views/equipment/base/maintain/Confirm/index.vue
+++ b/src/views/equipment/base/maintain/Confirm/index.vue
@@ -197,7 +197,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 10,
+				pageSize: 20,
 				maintainPlanId: null,
 				startTime: null,
 				special: false,