From 3801c8f5643890c8777adc74a89c7bbab81be389 Mon Sep 17 00:00:00 2001
From: cjp <3096114695@qq.com>
Date: Tue, 5 Sep 2023 18:27:05 +0800
Subject: [PATCH] =?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

---
 .../liftSupervision/equipManagement/index.vue | 212 ++++++----------
 .../liftSupervision/equipManagement/index.vue | 228 +++++++-----------
 .../historyData/realTimeData/index.vue        |   6 +-
 .../liftSupervision/operatingData/index.vue   |  11 +
 4 files changed, 165 insertions(+), 292 deletions(-)

diff --git a/src/views/enterprise/liftSupervision/equipManagement/index.vue b/src/views/enterprise/liftSupervision/equipManagement/index.vue
index d5dddaa..3130075 100644
--- a/src/views/enterprise/liftSupervision/equipManagement/index.vue
+++ b/src/views/enterprise/liftSupervision/equipManagement/index.vue
@@ -315,6 +315,13 @@ const rules = ref({
 			trigger: "blur"
 		}
 	],
+	devNumber: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
 	installTime: [
 		{
 			required: true,
@@ -322,18 +329,23 @@ const rules = ref({
 			trigger: "blur"
 		}
 	],
-	blackBox: [
+	model: [
 		{
 			required: true,
 			message: "请输入",
 			trigger: "blur"
 		}
 	],
-	structureType: [
+	gearModule: [
 		{
 			required: true,
 			message: "请输入",
 			trigger: "blur"
+		},
+		{
+			pattern: /^\d+(\.\d{0,2})?$/,
+			message: "请输入整数或小数点后两位小数",
+			trigger: "blur"
 		}
 	],
 	installImage: [
@@ -343,42 +355,76 @@ const rules = ref({
 			trigger: "change"
 		}
 	],
-	isForeignDev: [
+	registrationCertificate: [
 		{
 			required: true,
-			message: "请选择",
+			message: "请上传",
 			trigger: "change"
 		}
 	],
-	isNewDev: [
+	maxHeight: [
 		{
 			required: true,
-			message: "请选择",
-			trigger: "change"
+			message: "请输入",
+			trigger: "blur"
+		},
+		{
+			pattern: /^\d+(\.\d{0,2})?$/,
+			message: "请输入整数或小数点后两位小数",
+			trigger: "blur"
 		}
 	],
-	model: [
+	maxLoad: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		},
+		{
+			pattern: /^\d+(\.\d{0,2})?$/,
+			message: "请输入整数或小数点后两位小数",
+			trigger: "blur"
+		}
+	],
+	ratedPeopleNum: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		},
+		{
+			pattern: /^[1-9]\d*$/,
+			message: "请输入正整数",
+			trigger: "blur"
+		}
+	],
+	filingNumber: [
 		{
 			required: true,
 			message: "请输入",
 			trigger: "blur"
 		}
 	],
-	factoryCertificate: [
+	totalFloor: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		},
+		{
+			pattern: /^-?\d+$/,
+			message: "请输入整数",
+			trigger: "blur"
+		}
+	],
+	useRegistrationTime: [
 		{
 			required: true,
 			message: "请输入",
 			trigger: "blur"
 		}
 	],
-	workingRange: [
-		{
-			required: true,
-			message: "请输入",
-			trigger: "blur"
-		}
-	],
-	maxLiftingCapacity: [
+	verifyCode: [
 		{
 			required: true,
 			message: "请输入",
@@ -390,26 +436,10 @@ const rules = ref({
 			required: true,
 			message: "请输入",
 			trigger: "blur"
-		}
-	],
-	acquisitionDate: [
+		},
 		{
-			required: true,
-			message: "请选择",
-			trigger: "change"
-		}
-	],
-	numberValidityPeriod: [
-		{
-			required: true,
-			message: "请选择",
-			trigger: "change"
-		}
-	],
-	originalValue: [
-		{
-			required: true,
-			message: "请输入",
+			pattern: /^\d+(\.\d{0,2})?$/,
+			message: "请输入整数或小数点后两位小数",
 			trigger: "blur"
 		}
 	],
@@ -418,114 +448,10 @@ const rules = ref({
 			required: true,
 			message: "请输入",
 			trigger: "blur"
-		}
-	],
-
-	invoiceCode: [
+		},
 		{
-			required: true,
-			message: "请输入",
-			trigger: "blur"
-		}
-	],
-
-	verifyCode: [
-		{
-			required: true,
-			message: "请输入",
-			trigger: "blur"
-		}
-	],
-
-	productionDate: [
-		{
-			required: true,
-			message: "请选择",
-			trigger: "change"
-		}
-	],
-
-	manufacturerLicense: [
-		{
-			required: true,
-			message: "请输入",
-			trigger: "blur"
-		}
-	],
-	isOriginalProduct: [
-		{
-			required: true,
-			message: "请选择",
-			trigger: "change"
-		}
-	],
-	useTo: [
-		{
-			required: true,
-			message: "请输入",
-			trigger: "blur"
-		}
-	],
-	forearmLength: [
-		{
-			required: true,
-			message: "请输入",
-			trigger: "blur"
-		}
-	],
-	posteriorArmLength: [
-		{
-			required: true,
-			message: "请输入",
-			trigger: "blur"
-		}
-	],
-	towerHeight: [
-		{
-			required: true,
-			message: "请输入",
-			trigger: "blur"
-		}
-	],
-	forearmFlag: [
-		{
-			required: true,
-			message: "请输入",
-			trigger: "blur"
-		}
-	],
-	rearArmFlag: [
-		{
-			required: true,
-			message: "请输入",
-			trigger: "blur"
-		}
-	],
-	towerCapFlag: [
-		{
-			required: true,
-			message: "请输入",
-			trigger: "blur"
-		}
-	],
-	upwardTurntableFlag: [
-		{
-			required: true,
-			message: "请输入",
-			trigger: "blur"
-		}
-	],
-	lowerTurntableFlag: [
-		{
-			required: true,
-			message: "请输入",
-			trigger: "blur"
-		}
-	],
-	mastSectionFlag: [
-		{
-			required: true,
-			message: "请输入",
+			pattern: /^[1-9]\d*$/,
+			message: "请输入正整数",
 			trigger: "blur"
 		}
 	]
diff --git a/src/views/project/liftSupervision/equipManagement/index.vue b/src/views/project/liftSupervision/equipManagement/index.vue
index 4067589..9c8e2ed 100644
--- a/src/views/project/liftSupervision/equipManagement/index.vue
+++ b/src/views/project/liftSupervision/equipManagement/index.vue
@@ -129,7 +129,7 @@
 				</el-row>
 				<el-row :gutter="120">
 					<el-col :span="12">
-						<el-form-item label="额定人数:" prop="ratedPeopleNum	">
+						<el-form-item label="额定人数:" prop="ratedPeopleNum">
 							<el-input v-model.number="formData.ratedPeopleNum" placeholder="请输入" :disabled="title == '查看设备'" />
 						</el-form-item>
 					</el-col>
@@ -286,7 +286,6 @@ const columns: ColumnProps[] = [
 	// { prop: "blackBox", label: "黑匣子信息" },
 	{ prop: "operation", label: "操作", fixed: "right", width: 260 }
 ];
-
 const rules = ref({
 	devName: [
 		{
@@ -295,6 +294,13 @@ const rules = ref({
 			trigger: "blur"
 		}
 	],
+	devNumber: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
+	],
 	installTime: [
 		{
 			required: true,
@@ -302,18 +308,23 @@ const rules = ref({
 			trigger: "blur"
 		}
 	],
-	blackBox: [
+	model: [
 		{
 			required: true,
 			message: "请输入",
 			trigger: "blur"
 		}
 	],
-	structureType: [
+	gearModule: [
 		{
 			required: true,
 			message: "请输入",
 			trigger: "blur"
+		},
+		{
+			pattern: /^\d+(\.\d{0,2})?$/,
+			message: "请输入整数或小数点后两位小数",
+			trigger: "blur"
 		}
 	],
 	installImage: [
@@ -323,42 +334,76 @@ const rules = ref({
 			trigger: "change"
 		}
 	],
-	isForeignDev: [
+	registrationCertificate: [
 		{
 			required: true,
-			message: "请选择",
+			message: "请上传",
 			trigger: "change"
 		}
 	],
-	isNewDev: [
+	maxHeight: [
 		{
 			required: true,
-			message: "请选择",
-			trigger: "change"
+			message: "请输入",
+			trigger: "blur"
+		},
+		{
+			pattern: /^\d+(\.\d{0,2})?$/,
+			message: "请输入整数或小数点后两位小数",
+			trigger: "blur"
 		}
 	],
-	model: [
+	maxLoad: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		},
+		{
+			pattern: /^\d+(\.\d{0,2})?$/,
+			message: "请输入整数或小数点后两位小数",
+			trigger: "blur"
+		}
+	],
+	ratedPeopleNum: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		},
+		{
+			pattern: /^[1-9]\d*$/,
+			message: "请输入正整数",
+			trigger: "blur"
+		}
+	],
+	filingNumber: [
 		{
 			required: true,
 			message: "请输入",
 			trigger: "blur"
 		}
 	],
-	factoryCertificate: [
+	totalFloor: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		},
+		{
+			pattern: /^-?\d+$/,
+			message: "请输入整数",
+			trigger: "blur"
+		}
+	],
+	useRegistrationTime: [
 		{
 			required: true,
 			message: "请输入",
 			trigger: "blur"
 		}
 	],
-	workingRange: [
-		{
-			required: true,
-			message: "请输入",
-			trigger: "blur"
-		}
-	],
-	maxLiftingCapacity: [
+	verifyCode: [
 		{
 			required: true,
 			message: "请输入",
@@ -370,26 +415,10 @@ const rules = ref({
 			required: true,
 			message: "请输入",
 			trigger: "blur"
-		}
-	],
-	acquisitionDate: [
+		},
 		{
-			required: true,
-			message: "请选择",
-			trigger: "change"
-		}
-	],
-	numberValidityPeriod: [
-		{
-			required: true,
-			message: "请选择",
-			trigger: "change"
-		}
-	],
-	originalValue: [
-		{
-			required: true,
-			message: "请输入",
+			pattern: /^\d+(\.\d{0,2})?$/,
+			message: "请输入整数或小数点后两位小数",
 			trigger: "blur"
 		}
 	],
@@ -398,114 +427,10 @@ const rules = ref({
 			required: true,
 			message: "请输入",
 			trigger: "blur"
-		}
-	],
-
-	invoiceCode: [
+		},
 		{
-			required: true,
-			message: "请输入",
-			trigger: "blur"
-		}
-	],
-
-	manufacturer: [
-		{
-			required: true,
-			message: "请输入",
-			trigger: "blur"
-		}
-	],
-
-	productionDate: [
-		{
-			required: true,
-			message: "请选择",
-			trigger: "change"
-		}
-	],
-
-	manufacturerLicense: [
-		{
-			required: true,
-			message: "请输入",
-			trigger: "blur"
-		}
-	],
-	isOriginalProduct: [
-		{
-			required: true,
-			message: "请选择",
-			trigger: "change"
-		}
-	],
-	useTo: [
-		{
-			required: true,
-			message: "请输入",
-			trigger: "blur"
-		}
-	],
-	forearmLength: [
-		{
-			required: true,
-			message: "请输入",
-			trigger: "blur"
-		}
-	],
-	posteriorArmLength: [
-		{
-			required: true,
-			message: "请输入",
-			trigger: "blur"
-		}
-	],
-	towerHeight: [
-		{
-			required: true,
-			message: "请输入",
-			trigger: "blur"
-		}
-	],
-	forearmFlag: [
-		{
-			required: true,
-			message: "请输入",
-			trigger: "blur"
-		}
-	],
-	rearArmFlag: [
-		{
-			required: true,
-			message: "请输入",
-			trigger: "blur"
-		}
-	],
-	towerCapFlag: [
-		{
-			required: true,
-			message: "请输入",
-			trigger: "blur"
-		}
-	],
-	upwardTurntableFlag: [
-		{
-			required: true,
-			message: "请输入",
-			trigger: "blur"
-		}
-	],
-	lowerTurntableFlag: [
-		{
-			required: true,
-			message: "请输入",
-			trigger: "blur"
-		}
-	],
-	mastSectionFlag: [
-		{
-			required: true,
-			message: "请输入",
+			pattern: /^[1-9]\d*$/,
+			message: "请输入正整数",
 			trigger: "blur"
 		}
 	]
@@ -513,11 +438,20 @@ const rules = ref({
 
 // 图片上传成功后的钩子
 const handleAvatarSuccess: UploadProps["onSuccess"] = (response, uploadFile) => {
-	console.log(response.result.url);
-	console.log(response, uploadFile);
+	// console.log(response.result.url);
+	// console.log(response, uploadFile);
 	formData.value.installImage = response.result.url;
 	formRef.value?.validateField("image");
 };
+
+// 图片上传成功后的钩子
+const handleRegistSuccess: UploadProps["onSuccess"] = (response, uploadFile) => {
+	// console.log(response.result.url);
+	// console.log(response, uploadFile);
+	formData.value.registrationCertificate = response.result.url;
+	formRef.value?.validateField("image");
+};
+
 // 删除设备
 const handleDeleteItem = async (params: jxj_User.ResUserList) => {
 	await useHandleData(lifterEquipDel, { id: params.id }, `删除【${params.devName}】`);
diff --git a/src/views/project/liftSupervision/historyData/realTimeData/index.vue b/src/views/project/liftSupervision/historyData/realTimeData/index.vue
index b1bcf2e..9845f1b 100644
--- a/src/views/project/liftSupervision/historyData/realTimeData/index.vue
+++ b/src/views/project/liftSupervision/historyData/realTimeData/index.vue
@@ -48,6 +48,8 @@
 				<br />
 				<span>运行状态: {{ row.runningState == 1 ? "上升" : row.runningState == 2 ? "下降" : "" }}</span>
 				<br />
+				<span>数据接受时间: {{ row.createTime ? row.createTime : "" }}</span>
+				<br />
 			</template>
 			<template #alarmInfo="{ row }">
 				<div class="table-data">
@@ -295,8 +297,8 @@
 				<div class="table-data">
 					<span
 						>人数识别装置故障:
-						<span :style="{ color: row.multiAntiCollisionRightAlarm == 0 ? '#333' : '#E70000' }">{{
-							row.multiAntiCollisionRightAlarm == 0 ? "无故障" : "有故障"
+						<span :style="{ color: row.peopleCntError == 0 ? '#333' : '#E70000' }">{{
+							row.peopleCntError == 0 ? "无故障" : "有故障"
 						}}</span></span
 					>
 				</div>
diff --git a/src/views/project/liftSupervision/operatingData/index.vue b/src/views/project/liftSupervision/operatingData/index.vue
index 4f47e4d..f02f2f3 100644
--- a/src/views/project/liftSupervision/operatingData/index.vue
+++ b/src/views/project/liftSupervision/operatingData/index.vue
@@ -331,6 +331,7 @@ const getEquipList = async () => {
 		equipList.value = [];
 	}
 };
+
 // 获取设备信息
 const getEquipInfo = async (obj: any) => {
 	equipActive.value = equipList.value.findIndex(item => item.id == obj.id);
@@ -344,6 +345,11 @@ const getEquipInfo = async (obj: any) => {
 	} else {
 		equipInfo.value = { ...obj };
 	}
+	if (active.value === 0) {
+		getAlarmList();
+	} else {
+		getMonitorList();
+	}
 };
 // 右侧报警数据搜索
 const search = () => {
@@ -386,6 +392,11 @@ const getProject = async () => {
 		searchSn.value = res.result.projectSn;
 	}
 	getEquipList();
+	if (active.value === 0) {
+		getAlarmList();
+	} else {
+		getMonitorList();
+	}
 	console.log(res);
 };
 const getengineering = async () => {