From c9b93fd0a360be13ae31293b6412897e64c263b0 Mon Sep 17 00:00:00 2001
From: zhangyu <m13716206235@163.com>
Date: Tue, 28 Jul 2020 11:45:37 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=89=80=E6=9C=89=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=8F=AF=E4=BB=A5=E6=8E=92=E5=BA=8F=E7=9A=84=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=82=B9=E5=87=BB=E8=A1=A8=E5=A4=B4=E5=8F=AA=E5=9C=A8?=
 =?UTF-8?q?=E6=AD=A3=E5=BA=8F=E5=80=92=E5=BA=8F=E5=88=87=E6=8D=A2=20style?=
 =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E6=94=B9=E7=AE=AD=E5=A4=B4=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0assetlabel=E7=9A=84=E6=B0=94=E6=B3=A1?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/stylus/main.scss     |   2 +-
 .../components/common/alert/alertLabel.vue    | 101 +++++++++++++++---
 .../src/components/page/config/account.vue    |   1 +
 .../src/components/page/config/mib.vue        |   3 +-
 .../src/components/page/config/model.vue      |   3 +-
 .../components/page/config/operationlog.vue   |   1 +
 .../src/components/page/config/promServer.vue |   3 +-
 .../components/page/config/terminallog.vue    |   1 +
 .../src/components/page/project/project.vue   |   1 +
 9 files changed, 97 insertions(+), 19 deletions(-)

diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss
index 17d3d3eba..b7a612811 100644
--- a/nezha-fronted/src/assets/stylus/main.scss
+++ b/nezha-fronted/src/assets/stylus/main.scss
@@ -835,7 +835,7 @@ li{
   border-top-color: #ebeef5;
 }
 .el-tooltip__popper.is-light[x-placement^=right] .popper__arrow { /*覆盖tooltip小三角颜色*/
-  border-top-color: #ebeef5;
+  border-right-color: #ebeef5;
 }
 .el-table .el-table__body tr:hover>td {
   background-color: #f0f0f0;
diff --git a/nezha-fronted/src/components/common/alert/alertLabel.vue b/nezha-fronted/src/components/common/alert/alertLabel.vue
index a1e60c96d..ac0ab7a2c 100644
--- a/nezha-fronted/src/components/common/alert/alertLabel.vue
+++ b/nezha-fronted/src/components/common/alert/alertLabel.vue
@@ -1,16 +1,60 @@
 <template>
-  <span v-loading="loading">
-    <div class="alertLabelInfo" v-if="type==='asset'">
-    <div class="alertLabelBox">
-      <div class="alertLabelTitle">ID</div>
-      <div class="alertLabelValue">{{alertLabelData?alertLabelData.id:''}}</div>
-    </div>
-    <div class="alertLabelBox">
-      <div class="alertLabelTitle">SN</div>
-      <div class="alertLabelValue">{{alertLabelData?alertLabelData.sn:''}}</div>
-    </div>
+  <span>
+    <div class="alertLabelInfo" v-if="type==='asset'" v-loading="loading">
+      <div class="alertLabelBox">
+        <div class="alertLabelTitle">ID</div>
+        <div class="alertLabelValue">{{alertLabelData?alertLabelData.id:''}}</div>
+      </div>
+      <div class="alertLabelBox">
+        <div class="alertLabelTitle">SN</div>
+        <div class="alertLabelValue">{{alertLabelData?alertLabelData.sn:''}}</div>
+      </div>
+      <div class="alertLabelBox">
+        <div class="alertLabelTitle">Host</div>
+        <div class="alertLabelValue">{{alertLabelData?alertLabelData.host:''}}</div>
+      </div>
+      <div class="alertLabelBox">
+        <div class="alertLabelTitle">State</div>
+        <div class="alertLabelValue">{{alertLabelData?(alertStateStr(alertLabelData.state)):''}}</div>
+      </div>
+      <div class="alertLabelBox">
+        <div class="alertLabelTitle">Ping</div>
+        <div class="alertLabelValue">
+          <div v-if="alertLabelData" :class="{'active-icon green':alertLabelData.pingState == 1,'active-icon red':alertLabelData.pingState == 0}"></div>
+          <span v-if="alertLabelData">{{alertLabelData.pingRtt?alertLabelData.pingRtt+'ms':''}}</span>
+        </div>
+      </div>
+      <div class="alertLabelBox">
+        <div class="alertLabelTitle">Type</div>
+        <div class="alertLabelValue">{{alertLabelData?alertLabelData.model.type.value:''}}</div>
+      </div>
+      <div class="alertLabelBox">
+        <div class="alertLabelTitle">Vendor</div>
+        <div class="alertLabelValue">{{alertLabelData?alertLabelData.model.vendor.name:''}}</div>
+      </div>
+      <div class="alertLabelBox">
+        <div class="alertLabelTitle">Model</div>
+        <div class="alertLabelValue">{{alertLabelData?alertLabelData.model.name:''}}</div>
+      </div>
+      <div class="alertLabelBox">
+        <div class="alertLabelTitle">PurchaseDate</div>
+        <div class="alertLabelValue">{{alertLabelData?alertLabelData.createAt:''}}</div>
+      </div>
+      <div class="alertLabelBox">
+        <div class="alertLabelTitle">Alert</div>
+        <div class="alertLabelValue"><sapn v-if="alertLabelData" :class="{danger:alertLabelData.alertNum>0,success:alertLabelData.alertNum<=0}">{{alertLabelData.alertNum + alertActiveStr()}}</sapn></div>
+      </div>
+      <div class="alertLabelBox">
+        <div class="alertLabelTitle">Dc</div>
+        <div class="alertLabelValue">{{alertLabelData?alertLabelData.idc.name:''}}</div>
+      </div>
+      <div class="alertLabelBox">
+        <div class="alertLabelTitle">Endpoint</div>
+        <div class="alertLabelValue">{{alertLabelData?alertLabelData.endpointNum:''}}</div>
+      </div>
   </div>
-  <div class="alertLabelInfo" v-if="type==='module'">
+
+  <div class="alertLabelInfo" v-if="type==='module'" v-loading="loading">
     <div class="alertLabelBox">
       <div class="alertLabelTitle">ID</div>
       <div class="alertLabelValue">{{alertLabelData?alertLabelData.id:''}}</div>
@@ -28,7 +72,8 @@
       <div class="alertLabelValue">{{alertLabelData?(alertLabelData.remark?alertLabelData.remark:'-'):''}}</div>
     </div>
   </div>
-  <div class="alertLabelInfo" v-if="type==='project'">
+
+  <div class="alertLabelInfo" v-if="type==='project'" v-loading="loading">
     <div class="alertLabelBox">
       <div class="alertLabelTitle">ID</div>
       <div class="alertLabelValue">{{alertLabelData?alertLabelData.id:''}}</div>
@@ -54,7 +99,8 @@
         type:Array
       },
       type:{},
-      labelLoading:{}
+      labelLoading:{},
+      that:{}
     },
     watch:{
       labelLoading(){
@@ -101,9 +147,19 @@
     },
 
     methods:{
-
+      alertActiveStr(){
+        return vm.$t('overall.active');
+      },
+      alertStateStr(num){
+        if( num == 1){
+          return vm.$t('asset.inStock')
+        } else {
+          return vm.$t('asset.notInStock')
+        }
+      }
     },
     mounted(){
+      // console.log(vm.$t('overall.exportAll'));
     },
   }
 
@@ -123,7 +179,7 @@
   }
   .alertLabelTitle{
     text-align: left;
-    width: 80px;
+    width: 90px;
     border-right: 1px solid #ebeef5;
     color: #666;
     padding: 0 3px 0 13px;
@@ -134,4 +190,19 @@
     color: #1a1a1a;
     padding: 0 3px 0 13px;
   }
+  .danger{
+    background-color: #d64f40;
+    color: white;
+    padding: 2px 5px;
+    border-radius: 4px;
+  }
+  .success{
+    background-color: #50d050;
+    color: white;
+    padding: 2px 5px;
+    border-radius: 4px;
+  }
+  /deep/.active-icon{
+    margin-top: 0;
+  }
 </style>
diff --git a/nezha-fronted/src/components/page/config/account.vue b/nezha-fronted/src/components/page/config/account.vue
index 99129b25b..54d18d875 100644
--- a/nezha-fronted/src/components/page/config/account.vue
+++ b/nezha-fronted/src/components/page/config/account.vue
@@ -70,6 +70,7 @@
             :key="`col-${index}`"
             :label="item.label"
             :prop="item.prop"
+            :sort-orders="['ascending', 'descending']"
           >
             <template slot-scope="scope" :column="item">
               <div v-if="item.prop == 'option'" class="content-right-options">
diff --git a/nezha-fronted/src/components/page/config/mib.vue b/nezha-fronted/src/components/page/config/mib.vue
index c24b92ee3..66ca6a002 100644
--- a/nezha-fronted/src/components/page/config/mib.vue
+++ b/nezha-fronted/src/components/page/config/mib.vue
@@ -57,7 +57,8 @@
         <el-table :data="tableData" border :height="$tableHeight.normal" style="width: 100%;" ref="mibTable" class="nz-table mib-table" v-scrollBar:el-table="'large'" v-loading="tools.loading" @sort-change="tableDataSort">
           <el-table-column :resizable="false" v-for="(item, index) in tools.tablelable" v-if="item.show" :width="item.width" :class-name="item.prop == 'modelsDetail'?'detail-column':''"
                            :key="`col-${index}`" :label="item.label" :sortable="sortableShow(item.prop)"
-                           :prop="propTitle(item.prop)">
+                           :prop="propTitle(item.prop)"
+                           :sort-orders="['ascending', 'descending']">
             <template slot-scope="scope" :column="item">
               <template v-if="item.prop == 'updateUser'" >{{scope.row[item.prop].name}}</template>
               <template v-else-if="item.prop == 'fileName' && scope.row[item.prop]" >
diff --git a/nezha-fronted/src/components/page/config/model.vue b/nezha-fronted/src/components/page/config/model.vue
index 76e385785..713e95977 100644
--- a/nezha-fronted/src/components/page/config/model.vue
+++ b/nezha-fronted/src/components/page/config/model.vue
@@ -67,7 +67,8 @@
                            :key="`col-${index}`"
                            :label="item.label"
                            :sortable="sortableShow(item.prop)"
-                           :prop="propTitle(item.prop)">
+                           :prop="propTitle(item.prop)"
+                           :sort-orders="['ascending', 'descending']">
             <template slot-scope="scope" :column="item">
               <template v-if="item.prop == 'vendor'" >{{scope.row[item.prop].value}}</template>
               <template v-else-if="item.prop == 'type'" >{{scope.row[item.prop].value}}</template>
diff --git a/nezha-fronted/src/components/page/config/operationlog.vue b/nezha-fronted/src/components/page/config/operationlog.vue
index 192b8e518..fb2b94e2e 100644
--- a/nezha-fronted/src/components/page/config/operationlog.vue
+++ b/nezha-fronted/src/components/page/config/operationlog.vue
@@ -65,6 +65,7 @@
           :label="item.label"
           :sortable="sortableShow(item.prop)"
           :prop="propTitle(item.prop)"
+          :sort-orders="['ascending', 'descending']"
         >
           <template slot-scope="scope" :column="item">
             <span v-if="item.prop == 'time'">
diff --git a/nezha-fronted/src/components/page/config/promServer.vue b/nezha-fronted/src/components/page/config/promServer.vue
index b668b5349..de0ef7c79 100644
--- a/nezha-fronted/src/components/page/config/promServer.vue
+++ b/nezha-fronted/src/components/page/config/promServer.vue
@@ -57,7 +57,8 @@
                            :key="`col-${index}`"
                            :label="item.label"
                            :sortable="sortableShow(item.prop)"
-                           :prop="propTitle(item.prop)">
+                           :prop="propTitle(item.prop)"
+                           :sort-orders="['ascending', 'descending']">
             <template slot-scope="scope" :column="item">
               <span v-if="item.prop == 'idc'" >{{scope.row[item.prop]?scope.row[item.prop].name:'-'}}</span>
 
diff --git a/nezha-fronted/src/components/page/config/terminallog.vue b/nezha-fronted/src/components/page/config/terminallog.vue
index c5640535c..9f25d33be 100644
--- a/nezha-fronted/src/components/page/config/terminallog.vue
+++ b/nezha-fronted/src/components/page/config/terminallog.vue
@@ -64,6 +64,7 @@
           :label="item.label"
           :sortable="sortableShow(item.prop)"
           :prop="propTitle(item.prop)"
+          :sort-orders="['ascending', 'descending']"
         >
           <template slot-scope="scope" :column="item">
             <span v-if="item.prop == 'lang'">
diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue
index 04f4371a0..12c089bf2 100644
--- a/nezha-fronted/src/components/page/project/project.vue
+++ b/nezha-fronted/src/components/page/project/project.vue
@@ -107,6 +107,7 @@
             min-width="110px"
             :sortable="sortableShow(item.prop)"
             :prop="propTitle(item.prop)"
+            :sort-orders="['ascending', 'descending']"
           >
             <template slot-scope="scope" :column="item" >
               <span v-if="item.prop == 'asset' && scope.row[item.prop]" class="link" @click="detail(scope.row)">{{scope.row[item.prop].host}}</span>