From ba2d06afaf5bb9992d810d3c5fea38886e89a8f0 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期四, 18 一月 2024 10:10:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/sc/stationConf/index.vue | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/jcdm-ui/src/views/main/sc/stationConf/index.vue b/jcdm-ui/src/views/main/sc/stationConf/index.vue
index 8b1089c..e267c11 100644
--- a/jcdm-ui/src/views/main/sc/stationConf/index.vue
+++ b/jcdm-ui/src/views/main/sc/stationConf/index.vue
@@ -89,6 +89,9 @@
</el-table-column>
<el-table-column label="IP鍦板潃" align="center" prop="ipAddress">
</el-table-column>
+ <el-table-column label="缃戝崱鍦板潃" align="center" prop="macAddress">
+ </el-table-column>
+
<el-table-column label="澶囨敞" align="center" prop="remarks">
</el-table-column>
<el-table-column fixed="right" width="200" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
@@ -147,6 +150,9 @@
<el-form-item label="IP鍦板潃" prop="ipAddress">
<el-input v-model="form.ipAddress" placeholder="璇疯緭鍏P鍦板潃" />
</el-form-item>
+ <el-form-item label="缃戝崱鍦板潃" prop="macAddress">
+ <el-input v-model="form.macAddress" placeholder="璇疯緭鍏ョ綉鍗″湴鍧�" />
+ </el-form-item>
<el-form-item label="澶囨敞" prop="remarks">
<el-input v-model="form.remarks" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
@@ -195,6 +201,7 @@
processesName: null,
processesType: null,
ipAddress: null,
+ macAddress: null,
spareField1: null,
spareField2: null,
spareField3: null,
--
Gitblit v1.9.3