diff --git a/nezha-fronted/src/components/common/project/addLine.vue b/nezha-fronted/src/components/common/project/addLine.vue index f61d28dae..6b8c8d84a 100644 --- a/nezha-fronted/src/components/common/project/addLine.vue +++ b/nezha-fronted/src/components/common/project/addLine.vue @@ -28,7 +28,9 @@
-
+
+
+
@@ -37,13 +39,43 @@ - +
- {{form.dashes}} +
+
+
+
+ +
+
+
+
+
+
+
+
+
+
@@ -374,6 +406,17 @@ }, colorOut(){ this.showPicker=false; + }, + //返回dashes的第一項 + dashesWidth(item){ + return JSON.parse(item)[0] + }, + // 返回應該遍历的次数 + dashesCount(item){ + if(!item){ + return 0; + } + return Math.floor(190/this.dashesWidth(item)/2); } }, @@ -406,7 +449,7 @@ border-radius: 5px; display: flex; align-items: center; - width: calc(100% - 60px); + width: calc(100% - 32px); height: 30px; } .color-show-left{ @@ -455,7 +498,7 @@ width: 100%; } /deep/ .el-select{ - width: 262px; + width: 100%; } .line-option{ display: flex; @@ -495,7 +538,7 @@ .color-arrows{ color: #C0C4CC; position: absolute; - right: 70px; + right: 42px; } .color-arrows .nz-icon{ font-size: 12px; @@ -525,11 +568,20 @@ line-height: 22px; } .width-option{ - width: 195px; + width: 217px; display: flex; align-items: center; justify-content: center; height: 100%; + overflow: hidden; + } + .dashes-box{ + height:100%; + width:80%; + overflow: hidden; + display: flex; + justify-content: space-between; + align-items: center; } .el-row { margin-bottom: 20px; diff --git a/nezha-fronted/src/components/common/project/addNode.vue b/nezha-fronted/src/components/common/project/addNode.vue index c5a6b0313..88dc93cbc 100644 --- a/nezha-fronted/src/components/common/project/addNode.vue +++ b/nezha-fronted/src/components/common/project/addNode.vue @@ -289,7 +289,6 @@ "legend": this.legends[index], }) }); - console.log(this.form.name,this.unit,model); this.$emit('addModel',model); } }); diff --git a/nezha-fronted/src/components/common/project/topology.vue b/nezha-fronted/src/components/common/project/topology.vue index bb86702d6..564990e17 100644 --- a/nezha-fronted/src/components/common/project/topology.vue +++ b/nezha-fronted/src/components/common/project/topology.vue @@ -1000,7 +1000,7 @@ .nz-icon-shuidi{ position: absolute; font-size: 48px; - color: rgba(132,213,194,0.5); + color: rgba(190,233,222,0.45); border-radius: 50%; height: 60px; width: 38px; @@ -1008,7 +1008,7 @@ .nz-icon-model{ color: #23BF9A; position: absolute; - top: 14px; + top: 17px; left: 15px; font-size: 18px; } diff --git a/nezha-fronted/src/components/common/project/visNetwork.vue b/nezha-fronted/src/components/common/project/visNetwork.vue index 94a29eea1..2b6331f6e 100644 --- a/nezha-fronted/src/components/common/project/visNetwork.vue +++ b/nezha-fronted/src/components/common/project/visNetwork.vue @@ -59,39 +59,33 @@
- Alert : + Alert : {{total}}
- -
{{projectInfo.alertStat[0] || 0}}
+
+ {{returnSeverityLabel('high')}} +
+
+ {{projectInfo.alertStat[0] || 0}} +
- -
{{projectInfo.alertStat[1] || 0}}
+
+ {{returnSeverityLabel('medium')}} +
+
+ {{projectInfo.alertStat[1] || 0}} +
- -
{{projectInfo.alertStat[2] || 0}}
+
+ {{returnSeverityLabel('low')}} +
+
+ {{projectInfo.alertStat[2] || 0}} +
@@ -290,6 +284,10 @@ }) } }, + // Severity Label + returnSeverityLabel(key){ + return this.$CONSTANTS.alertMessage.severityData.find(s => {return s.value == key}).label + }, editVisNetworkChange(flag){ this.editVisNetwork=flag; if(flag){ @@ -374,15 +372,70 @@ margin-left: 30px; } .facade-top .facade-top-right{ - width: 12%; - min-width: 280px; + width: 5%; + min-width: 120px; } .facade-top-right-content{ display: flex; justify-content: space-around; justify-items: center; + flex-direction: column; height: calc(100% - 30px); - align-items:center; + align-items:flex-start; + } + .facade-top-right-content > div{ + width: 80px; + height: 22px; + display: flex; + justify-content: space-between; + color: #fff; + text-align: center; + } + .facade-top-right-content > div > div:last-child{ + text-align: center; + border-radius: 0 4px 4px 0; + flex: 1; + height: calc(100% - 2px); + } + .content-high-title{ + background: #F2866E; + border-radius: 4px 0 0 4px; + width: 44px; + height: 100%; + } + .content-high-title + div{ + border: 1px solid #F4907A; + font-size: 12px; + color: #F4907A; + } + + .content-medium-title{ + background: #F89984; + border-radius: 4px 0 0 4px; + width: 54px; + height: 100%; + } + .content-medium-title + div{ + border: 1px solid #F9A28F; + font-size: 12px; + color: #F9A28F; + } + + .content-low-title{ + background: #F7BA78; + border-radius: 4px 0 0 4px; + width: 44px; + height: 100%; + } + .content-low-title + div{ + border: 1px solid #F7BA78; + font-size: 12px; + color: #F7BA78; + } + + + .right-content-high{ + border: 1px solid ; } .align--center{ text-align: center;