From ae5a9a5f277960ea9ebec339c6f299db28c59b17 Mon Sep 17 00:00:00 2001 From: 陶杰 <1378534974@qq.com> Date: 星期二, 26 十一月 2024 17:10:45 +0800 Subject: [PATCH] 1.悬浮框大小修改 2.搜索ip跳转过来的匹配的network显示弹框 --- src/views/area/server-info.vue | 70 ++++++++++++++++++++++++++++++++++- 1 files changed, 68 insertions(+), 2 deletions(-) diff --git a/src/views/area/server-info.vue b/src/views/area/server-info.vue index e978738..448faff 100644 --- a/src/views/area/server-info.vue +++ b/src/views/area/server-info.vue @@ -65,6 +65,7 @@ <el-dialog append-to-body :modal="false" :visible.sync="dialog_activateSwitchPorts" title="交换机端口情况" class="dialog_activateSwitchPorts"> + <div><el-button type="primary" @click="click_item_add" style="margin-bottom:6rem" >新增</el-button></div> <div v-for="(infos, index2) of activateSwitchPorts" :key="index2" class="port-items"> <div class="port-item" v-for="(item, index) of infos" :key="index"> <div :key="index" class="space-text" :class="[ @@ -110,10 +111,20 @@ prop="switchType" 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" @update-server-info="update_server_info" ></equ-add-form> </div> </template> <script> @@ -141,6 +152,8 @@ serve_info: {}, serve_select:{}, code:"", + cabinetNameForOpen:"", + switchName:"", }, //根据 //后端存储的是世界坐标,初次时候也是世界坐标,最小单位为0.01吧,这个间距或者大小,不考虑实际像素 @@ -152,6 +165,8 @@ dialog_activateSwitchPorts: false, activateSwitchPorts:{}, switchAllDetialInfos:[], + areas: [], + device_list: [], // serve_info: {}, }; @@ -160,8 +175,14 @@ 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) => { + // console.log('areas',res.switchAreaInfo || []) + this.areas = res.switchAreaInfo || []; + }); }, destroyed() { @@ -169,13 +190,46 @@ }, methods: { async showServeInfo(info) { - debugger; //展示交换机全部端口 console.log("showServeInfo", info); //弹出框展示全部端口,并且每个端口的情况 //获取一下信息 this.$modal.loading("加载中"); const res = await getDeviceList(this.code, 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("加载中"); + const res = await getDeviceList(code, name); this.$modal.closeLoading(); console.log("serveinfo", res); // this.activateSwitchPorts = res.switchDetialInfos || []; @@ -202,6 +256,18 @@ } // console.log("this.activateSwitchPorts", this.activateSwitchPorts); this.dialog_activateSwitchPorts = true; + this.cabinetName = cabinetName; + }, + click_item_add() { + console.log("this.$refs.equAddForm", this.$refs.equAddForm); + console.log("this.areas", this.areas); + 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); }, }, }; -- Gitblit v1.9.3