From 6c010905f5e26438ea41a3faa62181975c89c9df Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 10 九月 2024 16:46:10 +0800
Subject: [PATCH] 解决冲突

---
 Web/src/views/wcs/wcsPlc/index.vue |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Web/src/views/wcs/wcsPlc/index.vue b/Web/src/views/wcs/wcsPlc/index.vue
index 1ef2c39..d8df504 100644
--- a/Web/src/views/wcs/wcsPlc/index.vue
+++ b/Web/src/views/wcs/wcsPlc/index.vue
@@ -59,6 +59,7 @@
         @sort-change="sortChange" border="">
         <el-table-column type="index" label="搴忓彿" width="55" align="center" />
         <el-table-column prop="ip" label="PLCIP鍦板潃" show-overflow-tooltip="" />
+        <el-table-column prop="port" label="PLC绔彛" show-overflow-tooltip="" />
         <el-table-column prop="plcType" label="PLC绫诲瀷" show-overflow-tooltip="">
           <template #default="scope">
             <el-tag :type="dv('PLCEnum', scope.row.plcType)?.tagType"> {{ dv('PLCEnum',

--
Gitblit v1.8.0