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 | 128 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 111 insertions(+), 17 deletions(-)
diff --git a/src/views/area/server-info.vue b/src/views/area/server-info.vue
index 7266b40..45acbf0 100644
--- a/src/views/area/server-info.vue
+++ b/src/views/area/server-info.vue
@@ -75,8 +75,11 @@
? 'space-text-red'
: '',
item.info && item.info.statusInt == 1 ? 'space-text-yellow' : '',
- ]" v-if="item.info">
+ ]" v-if="item.info" @click="showDeviceInfo(index,item,$event)">
{{ item.info.networkPort || "-" }}
+ <device-info-delete v-show="selectedIndex === item.info.id " :show_info="show_device_info"
+ :device_info="cur_device_info" @delPort="delPort"
+ ></device-info-delete>
</div>
<div class="port-tip">{{ item.index }}</div>
</div>
@@ -86,42 +89,52 @@
: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"
+ label="Area Code">
+ </el-table-column>
+ <el-table-column
+ prop="networkPort"
+ label="Network Port">
+ </el-table-column>
+
</el-table>
</el-dialog>
<equ-add-form ref="equAddForm" :code="code" :areas="areas" :init_device_list="device_list"
- @update="update_map"></equ-add-form>
+ @update="update_map" @update-server-info="update_server_info" ></equ-add-form>
</div>
</template>
<script>
import equAddForm from "@/components/equ-add-form.vue";
+import deviceInfoDelete from "@/components/device-info-delete";
import {
getAreaServeInfo,
getFaultInfo,
@@ -138,12 +151,13 @@
export default {
- components: {equAddForm},
+ components: {equAddForm,deviceInfoDelete},
props: {
serve_info: {},
serve_select:{},
code:"",
- cabinetName:"",
+ cabinetNameForOpen:"",
+ switchName:"",
},
//根据
//后端存储的是世界坐标，初次时候也是世界坐标，最小单位为0.01吧，这个间距或者大小，不考虑实际像素
@@ -158,13 +172,19 @@
areas: [],
device_list: [],
// serve_info: {},
-
+ isDragging: false,
+ selectedIndex: null,
+ cur_device_info: null, // 当前的设备信息
+ cur_item:null,// 当前的element
+ show_device_info: false, // 展示设备信息
};
},
created() {
console.log("serve_infoserve_infoserve_infoserve_info")
console.log("this.serve_info:",this.serve_info)
console.log("this.serve_select:",this.serve_select)
+ //这里取打开的交换机柜的名称
+ this.cabinetNameForOpen = this.serve_info.cabinetName;
},
mounted() {
getAreaTjData().then((res) => {
@@ -183,7 +203,45 @@
//弹出框展示全部端口，并且每个端口的情况
//获取一下信息
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 || [];
+ this.activateSwitchPorts = {};
+ //分两行，每行24个
+ this.switchAllDetialInfos = res.switchAllDetialInfos || []
+ console.log("switchAllDetialInfos", this.switchAllDetialInfos)
+ var activaePorts = {};
+ if (res.switchDetialInfos) {
+ for (var item of res.switchDetialInfos) {
+ if (item.port) activaePorts[item.port] = item;
+ }
+ }
+ console.log("activaePorts", activaePorts);
+ for (var i = 0; i <= 47; i++) {
+ var level = "" + parseInt(i / 24);
+ if (!this.activateSwitchPorts["" + level]) {
+ this.activateSwitchPorts["" + level] = [];
+ }
+ this.activateSwitchPorts["" + level].push({
+ index: "" + (i + 1),
+ name: "",
+ info: activaePorts["" + (i + 1)] || undefined,
+ });
+ }
+ // console.log("this.activateSwitchPorts", this.activateSwitchPorts);
+ this.dialog_activateSwitchPorts = true;
+ this.cabinetName = info.cabinetName;
+ },
+ async update_server_info(code,name) {
+ // name 是交换机
+ console.log("info",code,name);
+ this.$modal.loading("加载中");
+ //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 || [];
@@ -210,12 +268,48 @@
}
// console.log("this.activateSwitchPorts", this.activateSwitchPorts);
this.dialog_activateSwitchPorts = true;
- this.cabinetName = info.cabinetName;
+ this.cabinetName = name;
},
click_item_add() {
console.log("this.$refs.equAddForm", this.$refs.equAddForm);
console.log("this.areas", this.areas);
- this.$refs.equAddForm && this.$refs.equAddForm.openConfigform(this.code,this.cabinetName);
+ const queryParams = this.$route.query;
+ console.log("queryParams",queryParams)
+ let config = 0;
+ if (queryParams.code) {
+ config = 1;
+ }
+ this.$refs.equAddForm && this.$refs.equAddForm.openConfigform(this.code,this.cabinetName,this.cabinetNameForOpen,config);
+ },
+ showDeviceInfo(index, item, event) {
+ event.stopPropagation(); // 阻止事件冒泡
+ if (item.info) {
+ // 如果点击的是同一个元素，则切换显示状态
+ if (this.selectedIndex === item.info.id) {
+ this.show_device_info = !this.show_device_info;
+ } else {
+ // 切换到新元素，自动关闭之前的
+ this.selectedIndex = item.info.id;
+ this.show_device_info = true;
+ this.cur_device_info = item.info;
+ }
+ }
+ },
+ async delPort(info) {
+ var json = {
+ id: info.id,
+ operateType: 4,
+ networkPort: info.name,
+ };
+ this.$modal.loading("删除中");
+
+ const data = await delport(json);
+ console.log("info", info);
+ this.update_server_info(info.areaCode, info.switchName);
+
+ // this.$modal.closeLoading();
+ // this.initializeElements();
+ // this.handleBindElementsItems()
},
},
};
--
Gitblit v1.9.3