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/screen1/itm.vue | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/views/screen1/itm.vue b/src/views/screen1/itm.vue
index d141d4d..d748dc8 100644
--- a/src/views/screen1/itm.vue
+++ b/src/views/screen1/itm.vue
@@ -44,7 +44,7 @@
<div class="flex1 reg-img-service">
<div class="reg-img-2-1"></div>
<div class="reg-num flex">
- <span class="div1">{{ switchDeviceStatus['1'] && switchDeviceStatus['1'].online || 0 }}</span>
+ <span class="div1">{{ switchDeviceStatus['3'] && switchDeviceStatus['3'].online || 0 }}</span>
<span class="div2">个</span>
</div>
<div class="reg-desc">
@@ -54,7 +54,7 @@
<div class="flex1 reg-img-service">
<div class="reg-img-2-2"></div>
<div class="reg-num flex">
- <span class="div1">{{ switchDeviceStatus['1'] && switchDeviceStatus['1'].offline || 0 }}</span>
+ <span class="div1">{{ switchDeviceStatus['3'] && switchDeviceStatus['3'].offline || 0 }}</span>
<span class="div2">个</span>
</div>
<div class="reg-desc">
@@ -109,7 +109,7 @@
<el-table-column
prop="deviceNameDNS"
- label="device name">
+ label="Device Name">
</el-table-column>
<!-- <el-table-column
prop="deviceNameDNS"
@@ -117,27 +117,29 @@
</el-table-column> -->
<el-table-column
prop="ipAddress"
- label="ip address">
+ label="Ip Address"
+ width="150"
+ >
</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="cabinetName"
- label="Cabinet Name">
+ label="Cabinet Name" width="150">
<template slot-scope="scope">
- <el-select v-model="scope.row.cabinetName" placeholder="请选择机柜" filterable clearable="" >
+ <el-select v-model="scope.row.cabinetName" placeholder="请选择机柜" filterable clearable>
<el-option
v-for="item in cabinetList"
:key="item.id"
@@ -153,7 +155,7 @@
prop="areaCode"
label="Area Code">
<template slot-scope="scope">
- <el-select v-model="scope.row.areaCode" placeholder="请选择区域" filterable clearable="" >
+ <el-select v-model="scope.row.areaCode" placeholder="请选择区域" filterable clearable>
<el-option
v-for="item in areaList"
:key="item.id"
@@ -215,6 +217,11 @@
return;
}
+ // if (!row.cabinetName) {
+ // this.$message.error('交换机柜名不能为空');
+ // return;
+ // }
+
let confirmRes= await this.$confirm('确认提交吗？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
--
Gitblit v1.9.3