From 9701924a0a0c30e54f379ec226acb09f71d6686f Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 29 五月 2025 18:33:14 +0800
Subject: [PATCH] *

---
 src/main/webapp/views/deviceOperate/errorTaskOperate.html |   38 +++++++++++++++++++++++++++++++++++---
 1 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/views/deviceOperate/errorTaskOperate.html b/src/main/webapp/views/deviceOperate/errorTaskOperate.html
index 26f536d..1d01382 100644
--- a/src/main/webapp/views/deviceOperate/errorTaskOperate.html
+++ b/src/main/webapp/views/deviceOperate/errorTaskOperate.html
@@ -19,8 +19,7 @@
 <body>
 	<div id="app" style="display: flex;justify-content: center;flex-wrap: wrap;">
 		<div style="width: 100%;">
-			<el-table border ref="singleTable" :data="tableData" highlight-current-row
-				max-height="350" style="width: 100%">
+			<el-table border ref="singleTable" :data="tableData" style="width: 100%">
 				<el-table-column property="category" label="绫诲埆">
 				</el-table-column>
 				<el-table-column property="equipmentNo" label="璁惧鍙�">
@@ -33,13 +32,28 @@
 				</el-table-column>
 			</el-table>
 		</div>
+		<div style="width: 100%;">
+			<el-table border ref="singleTable" :data="adjacentLocMast" style="width: 100%">
+				<el-table-column property="category" label="褰撳墠搴撲綅">
+				</el-table-column>
+				<el-table-column property="equipmentNo" label="褰撳墠搴撲綅鐘舵��">
+				</el-table-column>
+				<el-table-column property="categoryOther" label="鐩搁偦搴撲綅">
+				</el-table-column>
+				<el-table-column property="equipmentNoOther" label="鐩搁偦搴撲綅鐘舵��">
+				</el-table-column>
+				<el-table-column property="errorM" label="寮傚父鎻忚堪">
+				</el-table-column>
+			</el-table>
+		</div>
 
 	</div>
 	<script>
 		var app = new Vue({
 			el: '#app',
 			data: {
-				tableData: []
+				tableData: [],
+				adjacentLocMast: []
 			},
 			created() {
 				this.init()
@@ -49,9 +63,11 @@
 			methods: {
 				init() {
 					this.getTableData()
+					this.getAdjacentLocMast()
 
 					setInterval(() => {
 						this.getTableData()
+						this.getAdjacentLocMast()
 						// this.demoStatus()
 					}, 1000)
 				},
@@ -74,6 +90,22 @@
 							that.tableData = res.data
 						}
 					});
+				},
+				getAdjacentLocMast() {
+					let that = this;
+					$.ajax({
+						url: baseUrl + "/error/device/locSts/adjacentLocMast",
+						headers: {
+							'token': localStorage.getItem('token')
+						},
+						data: {},
+						dataType: 'json',
+						contentType: 'application/json;charset=UTF-8',
+						method: 'post',
+						success: function (res) {
+							that.adjacentLocMast = res.data
+						}
+					});
 				}
 			}
 		})

--
Gitblit v1.9.1