From 13aff82f6bc1301afa742ac384d9996811db72db Mon Sep 17 00:00:00 2001
From: cjp <3096114695@qq.com>
Date: Wed, 6 Sep 2023 18:13:06 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../historyData/alarmData/index.vue           | 20 ++++--
 .../historyData/realTimeData/index.vue        | 66 +++++++++++++-----
 .../liftSupervision/operatingData/index.vue   |  8 +--
 .../liftSupervision/operatingData/index.vue   | 16 +++--
 .../liftSupervision/equipManagement/index.vue | 21 ++++++
 .../historyData/alarmData/index.vue           | 20 ++++--
 .../historyData/realTimeData/index.vue        | 68 +++++++++++++------
 .../historyData/workCycleData/index.vue       | 17 +++--
 .../liftSupervision/operatingData/index.scss  |  1 +
 .../liftSupervision/operatingData/index.vue   | 26 +++----
 10 files changed, 190 insertions(+), 73 deletions(-)

diff --git a/src/views/enterprise/liftSupervision/historyData/alarmData/index.vue b/src/views/enterprise/liftSupervision/historyData/alarmData/index.vue
index b8a6666..b323997 100644
--- a/src/views/enterprise/liftSupervision/historyData/alarmData/index.vue
+++ b/src/views/enterprise/liftSupervision/historyData/alarmData/index.vue
@@ -14,15 +14,25 @@
 			:onReset="true"
 		>
 			<template #equipInfo="{ row }">
-				<span>设备名称: {{ row.devName }}</span>
+				<div class="table-data">
+					<span>设备名称:{{ row.devName }}</span>
+				</div>
 				<br />
-				<span>设备编号: {{ row.devNumber }}</span>
+				<div class="table-data">
+					<span>设备编号: {{ row.devNumber }}</span>
+				</div>
 				<br />
-				<span>司机姓名: {{ row.driverName }}</span>
+				<div class="table-data">
+					<span>司机姓名: {{ row.driverName }}</span>
+				</div>
 				<br />
-				<span>司机身份证号: {{ row.driverIdCard }}</span>
+				<div class="table-data">
+					<span>司机身份证号: {{ row.driverIdCard }}</span>
+				</div>
 				<br />
-				<span>特种作业号: {{ row.certification }}</span>
+				<div class="table-data">
+					<span>特种作业号: {{ row.certification }}</span>
+				</div>
 			</template>
 			<template #alarmInfo="{ row }">
 				<div class="table-data">
diff --git a/src/views/enterprise/liftSupervision/historyData/realTimeData/index.vue b/src/views/enterprise/liftSupervision/historyData/realTimeData/index.vue
index 692c178..aa0c4fc 100644
--- a/src/views/enterprise/liftSupervision/historyData/realTimeData/index.vue
+++ b/src/views/enterprise/liftSupervision/historyData/realTimeData/index.vue
@@ -14,39 +14,69 @@
 			:onReset="true"
 		>
 			<template #equipInfo="{ row }">
-				<span>设备名称: {{ row.devName }}</span>
+				<div class="table-data">
+					<span>设备名称: {{ row.devName }}</span>
+				</div>
 				<br />
-				<span>设备编号: {{ row.devNumber }}</span>
+				<div class="table-data">
+					<span>设备编号: {{ row.devNumber }}</span>
+				</div>
 				<br />
-				<span>司机姓名: {{ row.driverName }}</span>
+				<div class="table-data">
+					<span>司机姓名: {{ row.driverName }}</span>
+				</div>
 				<br />
-				<span>司机身份证号: {{ row.driverIdCard }}</span>
+				<div class="table-data">
+					<span>司机身份证号: {{ row.driverIdCard }}</span>
+				</div>
 				<br />
-				<span>开始运行高度: {{ row.height ? row.height : 0 }}m</span>
+				<div class="table-data">
+					<span>高度比: {{ row.heightRatio ? row.heightRatio : 0 }}m</span>
+				</div>
 				<br />
-				<span>停止运行高度: {{ row.stopHeight ? row.stopHeight : 0 }}m</span>
+				<div class="table-data">
+					<span>载重: {{ row.loading ? row.loading : 0 }}kg</span>
+				</div>
 				<br />
-				<span>高度比: {{ row.heightRatio ? row.heightRatio : 0 }}m</span>
+				<div class="table-data">
+					<span>最大载重比: {{ row.loadRatio ? row.loadRatio : 0 }}%</span>
+				</div>
 				<br />
-				<span>载重: {{ row.loading ? row.loading : 0 }}kg</span>
+				<div class="table-data">
+					<span>倾斜度: {{ row.biasAngle ? row.biasAngle : 0 }}°</span>
+				</div>
 				<br />
-				<span>最大载重比: {{ row.loadRatio ? row.loadRatio : 0 }}%</span>
+				<div class="table-data">
+					<span>倾角X: {{ row.dipAngleX ? row.dipAngleX : 0 }}°</span>
+				</div>
 				<br />
-				<span>倾斜度: {{ row.biasAngle ? row.angle : 0 }}°</span>
+				<div class="table-data">
+					<span>倾角Y: {{ row.dipAngleY ? row.dipAngleY : 0 }}°</span>
+				</div>
 				<br />
-				<span>倾角X: {{ row.dipAngleX ? row.dipAngleX : 0 }}°</span>
+				<div class="table-data">
+					<span>楼层数: {{ row.floorNum ? row.floorNum : 0 }}</span>
+				</div>
 				<br />
-				<span>倾角Y: {{ row.dipAngleY ? row.dipAngleY : 0 }}°</span>
+				<div class="table-data">
+					<span>人数: {{ row.peopleNumber ? row.peopleNumber : 0 }}</span>
+				</div>
 				<br />
-				<span>楼层数: {{ row.floorNum ? row.floorNum : 0 }}</span>
+				<div class="table-data">
+					<span>风速: {{ row.windSpeed ? row.windSpeed : 0 }}m/s</span>
+				</div>
 				<br />
-				<span>人数: {{ row.peopleNumber ? row.peopleNumber : 0 }}</span>
+				<div class="table-data">
+					<span>前门状态: {{ row.frontDoorState == 1 ? "关" : row.frontDoorState == 2 ? "开" : "" }}</span>
+				</div>
 				<br />
-				<span>风速: {{ row.windSpeed ? row.windSpeed : 0 }}m/s</span>
+				<div class="table-data">
+					<span>运行状态: {{ row.runningState == 1 ? "上升" : row.runningState == 2 ? "下降" : "" }}</span>
+				</div>
 				<br />
-				<span>前门状态: {{ row.frontDoorState == 1 ? "关" : row.frontDoorState == 2 ? "开" : "" }}</span>
-				<br />
-				<span>运行状态: {{ row.runningState == 1 ? "上升" : row.runningState == 2 ? "下降" : "" }}</span>
+				<div class="table-data">
+					<span>数据接受时间: {{ row.createTime ? row.createTime : "" }}</span>
+				</div>
 				<br />
 			</template>
 			<template #alarmInfo="{ row }">
diff --git a/src/views/enterprise/liftSupervision/operatingData/index.vue b/src/views/enterprise/liftSupervision/operatingData/index.vue
index a855f28..026ec2d 100644
--- a/src/views/enterprise/liftSupervision/operatingData/index.vue
+++ b/src/views/enterprise/liftSupervision/operatingData/index.vue
@@ -17,8 +17,8 @@
 						<span>最大载重: {{ equipInfo.maxLoad ? equipInfo.maxLoad : 0 }}kg</span>
 						<span>额定人数: {{ equipInfo.ratedPeopleNum ? equipInfo.ratedPeopleNum : 0 }}人</span>
 						<span>当前楼层数: {{ equipInfo.floorNum ? equipInfo.floorNum : 0 }}</span>
-						<span>最大高度: {{ equipInfo.heightRatio ? equipInfo.heightRatio : 0 }}m</span>
-						<span>高度百分比: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}%</span>
+						<span>最大高度: {{ equipInfo.height ? equipInfo.height : 0 }}m</span>
+						<span>高度百分比: {{ equipInfo.heightRatio ? equipInfo.heightRatio : 0 }}%</span>
 						<!-- <span>额定上行速度: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}m</span>
 						<span>额定下行速度: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}m</span> -->
 					</div>
@@ -113,7 +113,7 @@
 							<div class="info-list-item-aspect">
 								<div class="info-list-item-aspect-item">
 									<span>制动距离</span>
-									<span>{{ item.brakingDistance ? item.brakingDistance : 0 }}°</span>
+									<span>{{ item.brakingDistance ? item.brakingDistance : 0 }}m</span>
 								</div>
 								<div class="info-list-item-aspect-item">
 									<span>倾斜角</span>
@@ -222,7 +222,7 @@ const aspectList = ref([
 		value: 10,
 		unit: "m",
 		img: new URL("@/assets/images/onlineSupervision/高度.png", import.meta.url).href,
-		prop: "maxHeight"
+		prop: "height"
 	},
 	{
 		name: "风速",
diff --git a/src/views/goverment/liftSupervision/operatingData/index.vue b/src/views/goverment/liftSupervision/operatingData/index.vue
index 243523e..761f3bd 100644
--- a/src/views/goverment/liftSupervision/operatingData/index.vue
+++ b/src/views/goverment/liftSupervision/operatingData/index.vue
@@ -56,8 +56,8 @@
 							<span>最大载重: {{ equipInfo.maxLoad ? equipInfo.maxLoad : 0 }}kg</span>
 							<span>额定人数: {{ equipInfo.ratedPeopleNum ? equipInfo.ratedPeopleNum : 0 }}人</span>
 							<span>当前楼层数: {{ equipInfo.floorNum ? equipInfo.floorNum : 0 }}</span>
-							<span>最大高度: {{ equipInfo.heightRatio ? equipInfo.heightRatio : 0 }}m</span>
-							<span>高度百分比: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}%</span>
+							<span>最大高度: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}m</span>
+							<span>高度百分比: {{ equipInfo.heightRatio ? equipInfo.heightRatio : 0 }}%</span>
 							<!-- <span>额定上行速度: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}m</span>
 						<span>额定下行速度: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}m</span> -->
 						</div>
@@ -145,6 +145,10 @@
 									<span>{{ item.createTime }}</span>
 								</div>
 							</div>
+							<div class="no-data" v-if="alarmList.length == 0">
+								<img src="@/assets/images/notData.png" alt="notData" />
+								<div>暂无数据</div>
+							</div>
 						</div>
 						<div class="info-list" v-if="active == 1">
 							<div class="info-list-item" v-for="(item, index) in monitorList" :key="index">
@@ -191,6 +195,10 @@
 								</div>
 								<div>监测时间: {{ item.createTime ? item.createTime : "" }}</div>
 							</div>
+							<div class="no-data" v-if="monitorList.length == 0">
+								<img src="@/assets/images/notData.png" alt="notData" />
+								<div>暂无数据</div>
+							</div>
 						</div>
 					</template>
 				</LeftMenuPlus>
@@ -244,7 +252,7 @@ const aspectList = ref([
 		value: 10,
 		unit: "kg",
 		img: new URL("@/assets/images/onlineSupervision/载重.png", import.meta.url).href,
-		prop: "maxLoad"
+		prop: "loading"
 	},
 	{
 		name: "人数",
@@ -272,7 +280,7 @@ const aspectList = ref([
 		value: 10,
 		unit: "m",
 		img: new URL("@/assets/images/onlineSupervision/高度.png", import.meta.url).href,
-		prop: "maxHeight"
+		prop: "height"
 	},
 	{
 		name: "风速",
diff --git a/src/views/project/liftSupervision/equipManagement/index.vue b/src/views/project/liftSupervision/equipManagement/index.vue
index 9c8e2ed..f850787 100644
--- a/src/views/project/liftSupervision/equipManagement/index.vue
+++ b/src/views/project/liftSupervision/equipManagement/index.vue
@@ -253,6 +253,26 @@ const formData = ref({
 	useRegistrationTime: "",
 	verifyCode: ""
 });
+
+const emptyFormData = ref({
+	id: "",
+	devName: "",
+	devNumber: "",
+	elevatorType: "",
+	installTime: "",
+	installImage: "",
+	registrationCertificate: "",
+	model: "",
+	gearModule: "",
+	maxHeight: "",
+	maxLoad: "",
+	ratedPeopleNum: "",
+	filingNumber: "",
+	totalFloor: "",
+	useRegistrationNumber: "",
+	useRegistrationTime: "",
+	verifyCode: ""
+});
 // 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
 const proTable = ref();
 
@@ -508,6 +528,7 @@ const getTableList = (params: any) => {
 };
 // 新增
 const handleAddItem = () => {
+	formData.value = emptyFormData.value;
 	formRef.value?.resetFields();
 	title.value = "新增设备";
 	newUnitDialog.value = true;
diff --git a/src/views/project/liftSupervision/historyData/alarmData/index.vue b/src/views/project/liftSupervision/historyData/alarmData/index.vue
index cb717d2..ef754cf 100644
--- a/src/views/project/liftSupervision/historyData/alarmData/index.vue
+++ b/src/views/project/liftSupervision/historyData/alarmData/index.vue
@@ -14,15 +14,25 @@
 			:onReset="true"
 		>
 			<template #equipInfo="{ row }">
-				<span>设备名称: {{ row.devName }}</span>
+				<div class="table-data">
+					<span>设备名称:{{ row.devName }}</span>
+				</div>
 				<br />
-				<span>设备编号: {{ row.devNumber }}</span>
+				<div class="table-data">
+					<span>设备编号: {{ row.devNumber }}</span>
+				</div>
 				<br />
-				<span>司机姓名: {{ row.driverName }}</span>
+				<div class="table-data">
+					<span>司机姓名: {{ row.driverName }}</span>
+				</div>
 				<br />
-				<span>司机身份证号: {{ row.driverIdCard }}</span>
+				<div class="table-data">
+					<span>司机身份证号: {{ row.driverIdCard }}</span>
+				</div>
 				<br />
-				<span>特种作业号: {{ row.certification }}</span>
+				<div class="table-data">
+					<span>特种作业号: {{ row.certification }}</span>
+				</div>
 			</template>
 			<template #alarmInfo="{ row }">
 				<div class="table-data">
diff --git a/src/views/project/liftSupervision/historyData/realTimeData/index.vue b/src/views/project/liftSupervision/historyData/realTimeData/index.vue
index 9845f1b..509ea82 100644
--- a/src/views/project/liftSupervision/historyData/realTimeData/index.vue
+++ b/src/views/project/liftSupervision/historyData/realTimeData/index.vue
@@ -14,41 +14,69 @@
 			:onReset="true"
 		>
 			<template #equipInfo="{ row }">
-				<span>设备名称: {{ row.devName }}</span>
+				<div class="table-data">
+					<span>设备名称: {{ row.devName }}</span>
+				</div>
 				<br />
-				<span>设备编号: {{ row.devNumber }}</span>
+				<div class="table-data">
+					<span>设备编号: {{ row.devNumber }}</span>
+				</div>
 				<br />
-				<span>司机姓名: {{ row.driverName }}</span>
+				<div class="table-data">
+					<span>司机姓名: {{ row.driverName }}</span>
+				</div>
 				<br />
-				<span>司机身份证号: {{ row.driverIdCard }}</span>
+				<div class="table-data">
+					<span>司机身份证号: {{ row.driverIdCard }}</span>
+				</div>
 				<br />
-				<span>开始运行高度: {{ row.height ? row.height : 0 }}m</span>
+				<div class="table-data">
+					<span>高度比: {{ row.heightRatio ? row.heightRatio : 0 }}m</span>
+				</div>
 				<br />
-				<span>停止运行高度: {{ row.stopHeight ? row.stopHeight : 0 }}m</span>
+				<div class="table-data">
+					<span>载重: {{ row.loading ? row.loading : 0 }}kg</span>
+				</div>
 				<br />
-				<span>高度比: {{ row.heightRatio ? row.heightRatio : 0 }}m</span>
+				<div class="table-data">
+					<span>最大载重比: {{ row.loadRatio ? row.loadRatio : 0 }}%</span>
+				</div>
 				<br />
-				<span>载重: {{ row.loading ? row.loading : 0 }}kg</span>
+				<div class="table-data">
+					<span>倾斜度: {{ row.biasAngle ? row.biasAngle : 0 }}°</span>
+				</div>
 				<br />
-				<span>最大载重比: {{ row.loadRatio ? row.loadRatio : 0 }}%</span>
+				<div class="table-data">
+					<span>倾角X: {{ row.dipAngleX ? row.dipAngleX : 0 }}°</span>
+				</div>
 				<br />
-				<span>倾斜度: {{ row.biasAngle ? row.angle : 0 }}°</span>
+				<div class="table-data">
+					<span>倾角Y: {{ row.dipAngleY ? row.dipAngleY : 0 }}°</span>
+				</div>
 				<br />
-				<span>倾角X: {{ row.dipAngleX ? row.dipAngleX : 0 }}°</span>
+				<div class="table-data">
+					<span>楼层数: {{ row.floorNum ? row.floorNum : 0 }}</span>
+				</div>
 				<br />
-				<span>倾角Y: {{ row.dipAngleY ? row.dipAngleY : 0 }}°</span>
+				<div class="table-data">
+					<span>人数: {{ row.peopleNumber ? row.peopleNumber : 0 }}</span>
+				</div>
 				<br />
-				<span>楼层数: {{ row.floorNum ? row.floorNum : 0 }}</span>
+				<div class="table-data">
+					<span>风速: {{ row.windSpeed ? row.windSpeed : 0 }}m/s</span>
+				</div>
 				<br />
-				<span>人数: {{ row.peopleNumber ? row.peopleNumber : 0 }}</span>
+				<div class="table-data">
+					<span>前门状态: {{ row.frontDoorState == 1 ? "关" : row.frontDoorState == 2 ? "开" : "" }}</span>
+				</div>
 				<br />
-				<span>风速: {{ row.windSpeed ? row.windSpeed : 0 }}m/s</span>
+				<div class="table-data">
+					<span>运行状态: {{ row.runningState == 1 ? "上升" : row.runningState == 2 ? "下降" : "" }}</span>
+				</div>
 				<br />
-				<span>前门状态: {{ row.frontDoorState == 1 ? "关" : row.frontDoorState == 2 ? "开" : "" }}</span>
-				<br />
-				<span>运行状态: {{ row.runningState == 1 ? "上升" : row.runningState == 2 ? "下降" : "" }}</span>
-				<br />
-				<span>数据接受时间: {{ row.createTime ? row.createTime : "" }}</span>
+				<div class="table-data">
+					<span>数据接受时间: {{ row.createTime ? row.createTime : "" }}</span>
+				</div>
 				<br />
 			</template>
 			<template #alarmInfo="{ row }">
diff --git a/src/views/project/liftSupervision/historyData/workCycleData/index.vue b/src/views/project/liftSupervision/historyData/workCycleData/index.vue
index 39f6e6c..5705eff 100644
--- a/src/views/project/liftSupervision/historyData/workCycleData/index.vue
+++ b/src/views/project/liftSupervision/historyData/workCycleData/index.vue
@@ -14,13 +14,22 @@
 			:onReset="true"
 		>
 			<template #equipDriverInfo="{ row }">
-				<span>设备名称: {{ row.devName }}</span>
+				<div class="table-data">
+					<span>设备名称: {{ row.devName }}</span>
+				</div>
 				<br />
-				<span>设备编号: {{ row.devNumber }}</span>
+				<div class="table-data">
+					<span>设备编号: {{ row.devNumber }}</span>
+				</div>
 				<br />
-				<span>司机姓名: {{ row.driverName }}</span>
+				<div class="table-data">
+					<span>司机姓名: {{ row.driverName }}</span>
+				</div>
+				<br />
+				<div class="table-data">
+					<span>司机身份证号: {{ row.driverIdCard }}</span>
+				</div>
 				<br />
-				<span>司机身份证号: {{ row.driverIdCard }}</span>
 			</template>
 			<template #workCycleInfo="{ row }">
 				<div class="table-data">
diff --git a/src/views/project/liftSupervision/operatingData/index.scss b/src/views/project/liftSupervision/operatingData/index.scss
index 34b4ed3..6934ddf 100644
--- a/src/views/project/liftSupervision/operatingData/index.scss
+++ b/src/views/project/liftSupervision/operatingData/index.scss
@@ -259,6 +259,7 @@
 							font-family: "Source Han Sans CN-Regular", "Source Han Sans CN";
 							font-size: 12px;
 							font-weight: 400;
+							white-space: nowrap;
 						}
 						> span:nth-child(1) {
 							display: inline-block;
diff --git a/src/views/project/liftSupervision/operatingData/index.vue b/src/views/project/liftSupervision/operatingData/index.vue
index f02f2f3..aae413c 100644
--- a/src/views/project/liftSupervision/operatingData/index.vue
+++ b/src/views/project/liftSupervision/operatingData/index.vue
@@ -17,8 +17,8 @@
 						<span>最大载重: {{ equipInfo.maxLoad ? equipInfo.maxLoad : 0 }}kg</span>
 						<span>额定人数: {{ equipInfo.ratedPeopleNum ? equipInfo.ratedPeopleNum : 0 }}人</span>
 						<span>当前楼层数: {{ equipInfo.floorNum ? equipInfo.floorNum : 0 }}</span>
-						<span>最大高度: {{ equipInfo.heightRatio ? equipInfo.heightRatio : 0 }}m</span>
-						<span>高度百分比: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}%</span>
+						<span>最大高度: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}m</span>
+						<span>高度百分比: {{ equipInfo.heightRatio ? equipInfo.heightRatio : 0 }}%</span>
 						<!-- <span>额定上行速度: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}m</span>
 						<span>额定下行速度: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}m</span> -->
 					</div>
@@ -112,12 +112,12 @@
 							<div>{{ item.devName }}</div>
 							<div class="info-list-item-aspect">
 								<div class="info-list-item-aspect-item">
-									<span>角度</span>
-									<span>{{ item.angle ? item.angle : 0 }}°</span>
+									<span>制动距离</span>
+									<span>{{ item.brakingDistance ? item.brakingDistance : 0 }}m</span>
 								</div>
 								<div class="info-list-item-aspect-item">
-									<span>倾角</span>
-									<span>{{ item.obliquity ? item.obliquity : 0 }}°</span>
+									<span>倾斜角</span>
+									<span>{{ item.biasAngle ? item.biasAngle : 0 }}°</span>
 								</div>
 							</div>
 							<div class="info-list-item-aspect">
@@ -127,7 +127,7 @@
 								</div>
 								<div class="info-list-item-aspect-item">
 									<span>倾角X</span>
-									<span>{{ item.obliquityX ? item.obliquityX : 0 }}°</span>
+									<span>{{ item.dipAngleX ? item.dipAngleX : 0 }}°</span>
 								</div>
 							</div>
 							<div class="info-list-item-aspect">
@@ -137,17 +137,17 @@
 								</div>
 								<div class="info-list-item-aspect-item">
 									<span>倾角Y</span>
-									<span>{{ item.obliquityY ? item.obliquityY : 0 }}°</span>
+									<span>{{ item.dipAngleY ? item.dipAngleY : 0 }}°</span>
 								</div>
 							</div>
 							<div class="info-list-item-aspect">
 								<div class="info-list-item-aspect-item">
-									<span>载重</span>
-									<span>{{ item.loading ? item.loading : 0 }}kg</span>
+									<span>准载</span>
+									<span>{{ item.maxLoad ? item.maxLoad : 0 }}kg</span>
 								</div>
 								<div class="info-list-item-aspect-item">
-									<span>幅度</span>
-									<span>{{ item.ranger ? item.ranger : 0 }}m</span>
+									<span>运行速度</span>
+									<span>{{ item.speed ? item.speed : 0 }}m</span>
 								</div>
 							</div>
 							<div>监测时间: {{ item.createTime ? item.createTime : "" }}</div>
@@ -224,7 +224,7 @@ const aspectList = ref([
 		value: 10,
 		unit: "m",
 		img: new URL("@/assets/images/onlineSupervision/高度.png", import.meta.url).href,
-		prop: "maxHeight"
+		prop: "height"
 	},
 	{
 		name: "风速",

From 1154aba38a63e4779f46f3c3a72f71fad4b1fb27 Mon Sep 17 00:00:00 2001
From: cjp <3096114695@qq.com>
Date: Wed, 6 Sep 2023 18:19:59 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enterprise/liftSupervision/operatingData/index.scss | 2 +-
 src/views/goverment/liftSupervision/operatingData/index.scss  | 2 +-
 src/views/project/liftSupervision/operatingData/index.scss    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/enterprise/liftSupervision/operatingData/index.scss b/src/views/enterprise/liftSupervision/operatingData/index.scss
index ab9abf5..53f627a 100644
--- a/src/views/enterprise/liftSupervision/operatingData/index.scss
+++ b/src/views/enterprise/liftSupervision/operatingData/index.scss
@@ -63,7 +63,7 @@
 				}
 				.other-info {
 					position: absolute;
-					top: 200px;
+					top: 28%;
 					right: 0;
 					display: flex;
 					flex-direction: column;
diff --git a/src/views/goverment/liftSupervision/operatingData/index.scss b/src/views/goverment/liftSupervision/operatingData/index.scss
index e315425..ede2d66 100644
--- a/src/views/goverment/liftSupervision/operatingData/index.scss
+++ b/src/views/goverment/liftSupervision/operatingData/index.scss
@@ -121,7 +121,7 @@
 					}
 					.other-info {
 						position: absolute;
-						top: 210px;
+						top: 28%;
 						right: 0;
 						display: flex;
 						flex-direction: column;
diff --git a/src/views/project/liftSupervision/operatingData/index.scss b/src/views/project/liftSupervision/operatingData/index.scss
index 6934ddf..89c3e38 100644
--- a/src/views/project/liftSupervision/operatingData/index.scss
+++ b/src/views/project/liftSupervision/operatingData/index.scss
@@ -64,7 +64,7 @@
 				}
 				.other-info {
 					position: absolute;
-					top: 200px;
+					top: 28%;
 					right: 0;
 					display: flex;
 					flex-direction: column;

From 9b41d0097ffb8bf719d758a162c3d4a74fe490fd Mon Sep 17 00:00:00 2001
From: cjp <3096114695@qq.com>
Date: Wed, 6 Sep 2023 18:53:09 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../historyData/realTimeData/index.vue        | 20 +++++++++----------
 .../historyData/realTimeData/index.vue        | 20 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/views/enterprise/liftSupervision/historyData/realTimeData/index.vue b/src/views/enterprise/liftSupervision/historyData/realTimeData/index.vue
index aa0c4fc..3a68bc8 100644
--- a/src/views/enterprise/liftSupervision/historyData/realTimeData/index.vue
+++ b/src/views/enterprise/liftSupervision/historyData/realTimeData/index.vue
@@ -391,16 +391,16 @@ const columns: ColumnProps[] = [
 		isShow: false,
 		search: { el: "input" }
 	},
-	{
-		prop: "type",
-		label: "报警类型",
-		isShow: false,
-		search: { el: "select" },
-		enum: [
-			{ label: "报警", value: 1 },
-			{ label: "预警", value: 2 }
-		]
-	},
+	// {
+	// 	prop: "type",
+	// 	label: "报警类型",
+	// 	isShow: false,
+	// 	search: { el: "select" },
+	// 	enum: [
+	// 		{ label: "报警", value: 1 },
+	// 		{ label: "预警", value: 2 }
+	// 	]
+	// },
 	{
 		prop: "createTime",
 		label: "数据接受时间",
diff --git a/src/views/project/liftSupervision/historyData/realTimeData/index.vue b/src/views/project/liftSupervision/historyData/realTimeData/index.vue
index 509ea82..dc4857f 100644
--- a/src/views/project/liftSupervision/historyData/realTimeData/index.vue
+++ b/src/views/project/liftSupervision/historyData/realTimeData/index.vue
@@ -394,16 +394,16 @@ const columns: ColumnProps[] = [
 		isShow: false,
 		search: { el: "input" }
 	},
-	{
-		prop: "type",
-		label: "报警类型",
-		isShow: false,
-		search: { el: "select" },
-		enum: [
-			{ label: "报警", value: 1 },
-			{ label: "预警", value: 2 }
-		]
-	},
+	// {
+	// 	prop: "type",
+	// 	label: "报警类型",
+	// 	isShow: false,
+	// 	search: { el: "select" },
+	// 	enum: [
+	// 		{ label: "报警", value: 1 },
+	// 		{ label: "预警", value: 2 }
+	// 	]
+	// },
 	{
 		prop: "createTime",
 		label: "数据接受时间",