From b610e067cf2c44fdcc99ec3a3190820d1a5b7bcb Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期三, 10 一月 2024 16:55:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld

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

diff --git a/src/main/webapp/views/deviceOperate/devpOperate.html b/src/main/webapp/views/deviceOperate/devpOperate.html
index 8dd7e98..b3a6b63 100644
--- a/src/main/webapp/views/deviceOperate/devpOperate.html
+++ b/src/main/webapp/views/deviceOperate/devpOperate.html
@@ -14,7 +14,7 @@
 <body>
 	<div id="app" style="display: flex;justify-content: center;flex-wrap: wrap;">
 		<div style="width: 100%;">
-			<el-table ref="singleTable" :data="tableData" highlight-current-row @row-click="handleRowClick"
+			<el-table border ref="singleTable" :data="tableData" highlight-current-row @row-click="handleRowClick"
 				max-height="450" style="width: 100%">
 				<el-table-column property="devNo" label="绔欏彿">
 				</el-table-column>
@@ -24,6 +24,8 @@
 				</el-table-column>
 				<el-table-column property="pakMk" label="鍏ュ簱鏍囪">
 				</el-table-column>
+				<el-table-column property="barcode" label="鏉$爜">
+				</el-table-column>
 			</el-table>
 		</div>
 

--
Gitblit v1.9.1