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 | 19 +++++++++++++------
src/views/area/main-container.vue | 17 +++++++++--------
2 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/src/views/area/main-container.vue b/src/views/area/main-container.vue
index 21765a8..d53a43d 100644
--- a/src/views/area/main-container.vue
+++ b/src/views/area/main-container.vue
@@ -284,7 +284,7 @@
this.totalElements = areaModuleItems.areaConfigNum;
}
- this.areaUrl =areaModuleItems.url
+ this.areaUrl =areaModuleItems.areaBackGroudURL
}
},
@@ -1214,24 +1214,25 @@
.space-text{
background-image: url("@/assets/area/space-text.svg");
background-size: 100% 100%;
- min-width: 3rem;
+ // min-width: 3rem;
+ min-width: 85%;
height: 1.5rem;
transform: translate(-50%);
left: 50%;
- padding-top: 0.2rem;
+ padding-top: 0.5rem;
padding-left: 0.2rem;
padding-right: 0.3rem;
- top: -1.5rem;
+ top: -1.7rem;
position: absolute;
cursor: grabbing;
cursor: move;
word-wrap: break-word;
- white-space: nowrap;
+ // white-space: nowrap;
overflow-wrap: anywhere;
- font-size: 0.6rem;
- font-size: 14;
+ font-size: 0.45rem;
+ // font-size: 14;
font-family: PingFangSC-Semibold, PingFang SC;
- font-weight: 600;
+ font-weight: 700;
color: #3299ff;
z-index: 20;
}
diff --git a/src/views/screen1/itm.vue b/src/views/screen1/itm.vue
index a8fde5d..d748dc8 100644
--- a/src/views/screen1/itm.vue
+++ b/src/views/screen1/itm.vue
@@ -109,7 +109,7 @@
<el-table-column
prop="deviceNameDNS"
- label="device name">
+ label="Device Name">
</el-table-column>
<!-- <el-table-column
prop="deviceNameDNS"
@@ -117,25 +117,27 @@
</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-option
@@ -215,6 +217,11 @@
return;
}
+ // if (!row.cabinetName) {
+ // this.$message.error('交换机柜名不能为空');
+ // return;
+ // }
+
let confirmRes= await this.$confirm('确认提交吗？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
--
Gitblit v1.9.3