From 2e20334b05e3cb49434ec07aa8d77b30578466ab Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 29 十一月 2024 17:38:37 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/ITM_V2_2DModel
---
src/views/area/server-info.vue | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/views/area/server-info.vue b/src/views/area/server-info.vue
index 3f61aea..45acbf0 100644
--- a/src/views/area/server-info.vue
+++ b/src/views/area/server-info.vue
@@ -89,30 +89,30 @@
:data="switchAllDetialInfos"
border
style="width: 100%;max-height: 650px;overflow-y: scroll;">
- <el-table-column
- prop="deviceName"
- label="device name">
- </el-table-column>
+<!-- <el-table-column-->
+<!-- prop="deviceName"-->
+<!-- label="device name">-->
+<!-- </el-table-column>-->
<el-table-column
prop="deviceNameDNS"
- label="DNS">
+ label="Device Name">
</el-table-column>
<el-table-column
prop="ipAddress"
- label="ip address">
+ label="Ip Address">
</el-table-column>
<el-table-column
width="180"
prop="macAddress"
- label="mac address">
+ label="Mac Address">
</el-table-column>
<el-table-column
prop="nasPort"
- label="nas port">
+ label="Nas Port">
</el-table-column>
<el-table-column
prop="switchType"
- label="switch type">
+ label="Switch Type">
</el-table-column>
<el-table-column
prop="areaCode"
@@ -203,7 +203,9 @@
//弹出框展示全部端口，并且每个端口的情况
//获取一下信息
this.$modal.loading("加载中");
- const res = await getDeviceList(this.code, info.cabinetName);
+ // const res = await getDeviceList(this.code, info.cabinetName);
+ //2024-11-29 改成传空处理
+ const res = await getDeviceList("", info.cabinetName);
this.$modal.closeLoading();
console.log("serveinfo", res);
// this.activateSwitchPorts = res.switchDetialInfos || [];
@@ -234,11 +236,12 @@
this.cabinetName = info.cabinetName;
},
async update_server_info(code,name) {
- debugger;
// name 是交换机
console.log("info",code,name);
this.$modal.loading("加载中");
- const res = await getDeviceList(code, name);
+ //2024-11-29 改成传空处理
+ //const res = await getDeviceList(code, name);
+ const res = await getDeviceList("", name);
this.$modal.closeLoading();
console.log("serveinfo", res);
// this.activateSwitchPorts = res.switchDetialInfos || [];
@@ -264,7 +267,6 @@
});
}
// console.log("this.activateSwitchPorts", this.activateSwitchPorts);
- debugger;
this.dialog_activateSwitchPorts = true;
this.cabinetName = name;
},
--
Gitblit v1.9.3