From 58929f36d249dfa04f465bca7d7c9a1c04134adb Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 18 Mar 2021 11:16:21 +0800
Subject: [PATCH] =?UTF-8?q?docs=EF=BC=9A=E4=BF=AE=E6=94=B9silence=20?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8Aexpression=20temp=E7=9A=84=E6=96=87=E6=A1=88?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/project/topologyL5.vue  | 21 ++++++++++---------
 .../common/rightBox/alertSilenceBox.vue       | 19 +++++------------
 .../src/components/page/config/exprTemp.vue   |  8 +++----
 3 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue
index 8daeb9321..831802bcc 100644
--- a/nezha-fronted/src/components/common/project/topologyL5.vue
+++ b/nezha-fronted/src/components/common/project/topologyL5.vue
@@ -93,6 +93,8 @@
             :toolShow="toolShow">
           </topology-top-tool>
 
+
+
         </span>
         <span class="float-right">
           <button @click="previewTopology" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new"
@@ -679,10 +681,6 @@
     methods:{
       init(){
         canvasOptions.on=this.onMessage;
-        if(getTopology(this.topologyIndex)){
-          getTopology(this.topologyIndex).open({});
-          getTopology(this.topologyIndex).render()
-        }
         this.reload();
       },
 
@@ -942,18 +940,21 @@
         if(maxLevel!==0){
           if(pen.type===0){// 判断valueMapping 给相应的状态
             let selLevel=pen.data.valueMapping.find(item=>item.level===maxLevel);
-            pen.font.color=selLevel.color.text;
+          if(selLevel){
+            pen.fontColor=selLevel.color.text;
             pen.fillStyle=selLevel.color.fill;
             pen.strokeStyle=selLevel.color.line;
             pen.bkType=0;
+          }
             onChangeAnimate(pen,selLevel.animateType,selLevel.color.fill,selLevel.color.line);
           }else if(pen.type===1){// 判断valueMapping 给相应的状态
             let selLevel=pen.data.valueMapping.find(item=>item.level===maxLevel);
-
-            pen.animateColor=selLevel.color.fill;
-            pen.strokeStyle=selLevel.color.line;
-            pen.animateType=selLevel.animateType;
-            pen.font.color=selLevel.color.text;
+            if(selLevel){
+              pen.animateColor=selLevel.color.fill;
+              pen.strokeStyle=selLevel.color.line;
+              pen.animateType=selLevel.animateType;
+              pen.fontColor=selLevel.color.text;
+            }
             onChangeAnimateLine(pen,pen.animateType);
           }
         } else {
diff --git a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue
index 91cd1ea3c..3972f11d5 100644
--- a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue
@@ -46,7 +46,6 @@
               >
               </el-date-picker>
             </div>
-            <div style="width: 50px;text-align: center">{{$t('dashboard.panel.to')}}</div>
             <div class="datepicker-box">
               <span class="datepicker-title">end time</span>
               <el-date-picker prefix-icon=" " class="panel-time-picker-hidden " size="mini" ref="calendar"
@@ -224,16 +223,6 @@
         endpointData:null,
         startAtTamp:'',
         endAtTamp:'',
-        optionsEndAt:{
-          disabledDate(date,val){
-            return date.getTime() <= that.startAtTamp - 24*60*60*1000;
-          },
-        },
-        optionsStartAt:{
-          disabledDate(date){
-            return date.getTime() >= that.endAtTamp - 60*60*1000 ;
-          },
-        }
       }
     },
     mounted(){
@@ -404,7 +393,7 @@
               res.data.list.forEach(asset=>{
                 asset.name=asset.sn;
                 if(linkId===asset.id){
-                  this.editAlertSilence.name=asset.idc.name +'/'+asset.name;
+                  this.editAlertSilence.name=asset.name;
                 }
                 let idcF=arr.find(idc=>idc.id===asset.idc.id);
                 if(idcF){
@@ -443,7 +432,7 @@
               let arr=[];
               res.data.list.forEach(module=>{
                 if(linkId===module.id){
-                  this.editAlertSilence.name=module.project.name +'/'+module.name;
+                  this.editAlertSilence.name=module.name;
                 }
                 let projectF=arr.find(project=>project.id===module.project.id)
                 if(projectF){
@@ -468,7 +457,7 @@
              res.data.list.forEach(item=>{
                item.name=item.host;
                if(linkId===item.id){
-                 this.editAlertSilence.name=item.project.name +'/'+item.module.name+'/'+item.name;
+                 this.editAlertSilence.name=item.name;
                }
                let projectF = arr.find(project=>item.project.id===project.id);
                if(projectF){
@@ -514,7 +503,9 @@
     .datepicker {
       margin-top: 20px;
       display: flex;
+      justify-content: space-between;
       .datepicker-box{
+        width: 48%;
         flex: 1;
         position: relative;
         /deep/ .el-date-editor.el-input, /deep/ .el-date-editor.el-input__inner{
diff --git a/nezha-fronted/src/components/page/config/exprTemp.vue b/nezha-fronted/src/components/page/config/exprTemp.vue
index 073047163..0e5b6949d 100644
--- a/nezha-fronted/src/components/page/config/exprTemp.vue
+++ b/nezha-fronted/src/components/page/config/exprTemp.vue
@@ -228,19 +228,19 @@
             show:true,
             width:80
           },{
-            label:'Name',
+            label:this.$t('config.exprTemp.name'),
             prop:'name',
             show:true,
           },{
-            label:'Group',
+            label:this.$t('config.exprTemp.gname'),
             prop:'gname',
             show:true,
           },{
-            label:'Expression',
+            label:this.$t('config.exprTemp.expression'),
             prop:'expression',
             show:true,
           },{
-            label:'Remark',
+            label:this.$t('config.exprTemp.remark'),
             prop:'remark',
             show:true,
           },{