From 7f1dbf4296013a4b15fbc2748de072f7c7ad4388 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期一, 15 一月 2024 16:42:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/sc/stationConf/index.vue | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/jcdm-ui/src/views/main/sc/stationConf/index.vue b/jcdm-ui/src/views/main/sc/stationConf/index.vue
index 202325f..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">
@@ -135,8 +138,8 @@
<el-select style="width: 100%" @change="handleSelectChangeprocessesCode(form.processesCode)" v-model="form.processesCode" placeholder="璇烽�夋嫨宸ュ簭缂栧彿">
<el-option
v-for="item in options"
- :key="item.index"
- :label="item.processesName"
+ :key="item.processesCode"
+ :label="item.processesCode"
:value="item.processesCode">
</el-option>
</el-select>
@@ -146,6 +149,9 @@
</el-form-item>
<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="璇疯緭鍏ュ娉�" />
@@ -195,6 +201,7 @@
processesName: null,
processesType: null,
ipAddress: null,
+ macAddress: null,
spareField1: null,
spareField2: null,
spareField3: null,
@@ -206,7 +213,17 @@
processesCodeQueryParams:{
pageNum: 1,
pageSize: 10,
- processesCodes: null,
+ processesCode: null,
+ processesName: null,
+ processesType: null,
+ ipAddress: null,
+ spareField1: null,
+ spareField2: null,
+ spareField3: null,
+ spareField4: null,
+ createUser: null,
+ updateUser: null,
+ remarks: null
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -225,8 +242,8 @@
methods: {
handleSelectChangeprocessesCode(selectedOption) {
- this.processesCodeQueryParams.processesCodes = selectedOption;
- listProcesses(this.queryParams).then(response => {
+ this.processesCodeQueryParams.processesCode = selectedOption;
+ listProcesses(this.processesCodeQueryParams).then(response => {
this.form.processesName = response.rows[0].processesName;
});
},
--
Gitblit v1.9.3