Merge branch 'kun_dev' of http://139.9.66.234:18023/dhp/wisdomisitezwfront into kun_dev

src/views/enterprise/liftSupervision/equipManagement/index.vue

@@ -355,6 +355,13 @@ const rules = ref({
 			trigger: "change"
 		}
 	],
+	elevatorType: [
+		{
+			required: true,
+			message: "请选择",
+			trigger: "change"
+		}
+	],
 	registrationCertificate: [
 		{
 			required: true,
@@ -393,7 +400,7 @@ const rules = ref({
 			trigger: "blur"
 		},
 		{
-			pattern: /^[1-9]\d*$/,
+			pattern: /^[+]{0,1}(\d+)$/,
 			message: "请输入正整数",
 			trigger: "blur"
 		}
@@ -454,6 +461,13 @@ const rules = ref({
 			message: "请输入正整数",
 			trigger: "blur"
 		}
+	],
+	useRegistrationNumber: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
 	]
 });
 

src/views/enterprise/liftSupervision/historyData/alarmData/index.scss

@@ -2,11 +2,18 @@
 	display: flex;
 	align-items: center;
 }
-.table-data {
-	@include flex;
-	> span {
-		display: inline-block;
-		width: 50%;
+.table-box {
+	.table-data {
+		@include flex;
+		> span {
+			display: inline-block;
+			width: 50%;
+		}
+	}
+	:deep() {
+		.el-table__body .el-table__row td:not(:first-child) {
+			vertical-align: top;
+		}
 	}
 }
 :deep() {

src/views/enterprise/liftSupervision/historyData/realTimeData/index.scss

@@ -2,11 +2,18 @@
 	display: flex;
 	align-items: center;
 }
-.table-data {
-	@include flex;
-	> span {
-		display: inline-block;
-		width: 50%;
+.table-box {
+	.table-data {
+		@include flex;
+		> span {
+			display: inline-block;
+			width: 50%;
+		}
+	}
+	:deep() {
+		.el-table__body .el-table__row td:not(:first-child) {
+			vertical-align: top;
+		}
 	}
 }
 :deep() {

src/views/enterprise/liftSupervision/historyData/workCycleData/index.scss

@@ -2,11 +2,18 @@
 	display: flex;
 	align-items: center;
 }
-.table-data {
-	@include flex;
-	> span {
-		display: inline-block;
-		width: 50%;
+.table-box {
+	.table-data {
+		@include flex;
+		> span {
+			display: inline-block;
+			width: 50%;
+		}
+	}
+	:deep() {
+		.el-table__body .el-table__row td:not(:first-child) {
+			vertical-align: top;
+		}
 	}
 }
 :deep() {

src/views/project/liftSupervision/equipManagement/index.vue

@@ -354,6 +354,13 @@ const rules = ref({
 			trigger: "change"
 		}
 	],
+	elevatorType: [
+		{
+			required: true,
+			message: "请选择",
+			trigger: "change"
+		}
+	],
 	registrationCertificate: [
 		{
 			required: true,
@@ -392,7 +399,7 @@ const rules = ref({
 			trigger: "blur"
 		},
 		{
-			pattern: /^[1-9]\d*$/,
+			pattern: /^[+]{0,1}(\d+)$/,
 			message: "请输入正整数",
 			trigger: "blur"
 		}
@@ -453,6 +460,13 @@ const rules = ref({
 			message: "请输入正整数",
 			trigger: "blur"
 		}
+	],
+	useRegistrationNumber: [
+		{
+			required: true,
+			message: "请输入",
+			trigger: "blur"
+		}
 	]
 });
 

src/views/project/liftSupervision/historyData/alarmData/index.scss

@@ -2,10 +2,17 @@
 	display: flex;
 	align-items: center;
 }
-.table-data {
-	@include flex;
-	> span {
-		display: inline-block;
-		width: 50%;
+.table-box {
+	.table-data {
+		@include flex;
+		> span {
+			display: inline-block;
+			width: 50%;
+		}
+	}
+	:deep() {
+		.el-table__body .el-table__row td:not(:first-child) {
+			vertical-align: top;
+		}
 	}
 }

src/views/project/liftSupervision/historyData/realTimeData/index.scss

@@ -2,10 +2,17 @@
 	display: flex;
 	align-items: center;
 }
-.table-data {
-	@include flex;
-	> span {
-		display: inline-block;
-		width: 50%;
+.table-box {
+	.table-data {
+		@include flex;
+		> span {
+			display: inline-block;
+			width: 50%;
+		}
+	}
+	:deep() {
+		.el-table__body .el-table__row td:not(:first-child) {
+			vertical-align: top;
+		}
 	}
 }

src/views/project/liftSupervision/historyData/workCycleData/index.scss

@@ -2,10 +2,17 @@
 	display: flex;
 	align-items: center;
 }
-.table-data {
-	@include flex;
-	> span {
-		display: inline-block;
-		width: 50%;
+.table-box {
+	.table-data {
+		@include flex;
+		> span {
+			display: inline-block;
+			width: 50%;
+		}
+	}
+	:deep() {
+		.el-table__body .el-table__row td:not(:first-child) {
+			vertical-align: top;
+		}
 	}
 }