Merge remote-tracking branch 'origin/codeCheck' into codeCheck

nezha-fronted/src/components/charts/chartDataFormat.js

@@ -3,6 +3,8 @@
 * index:yAxis 默认第二个参数 y轴的位置
 * type:自定义参数，用于区分是y轴调用还是tooltip调用,以设置不同精度  type =1 y轴调用 type=2 tooltip调用
 * */
+import {parse} from "echarts/extension-src/dataTool/gexf";
+
 function none(value, index){
   return value;
 }
@@ -255,6 +257,16 @@ function days(value,index,type=1){
 * unitIndex：不需要传递，用于递归获取units中的单位
 * */
 function asciiCompute(num,ascii,units,dot=2,unitIndex=0){
+  num=Number(num)
+  let carry=0;
+  if(num > 0){
+    let log=Math.log(num)/Math.log(ascii)
+    carry = parseInt(log)
+    num = num / Math.pow(ascii,carry)
+  }
+  return num.toFixed(dot) +' '+units[carry];
+}
+function asciiCompute2(num,ascii,units,dot=2,unitIndex=0){
   num=Number(num)
   let quotient=num / ascii;
   if(unitIndex <= units.length-1){

nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue

@@ -57,7 +57,7 @@
         <template slot-scope="scope" :column="item">
           <template v-if="item.prop == 'alertRule'">
             <div class="too-long-split" :id="'view-rule-'+scope.row[item.prop].id"
-                 v-if="scope.row[item.prop].alertName">{{scope.row[item.prop].alertName + ' ' + $t('overall.active')}}</div>
+                 v-if="scope.row[item.prop].alertName">{{scope.row[item.prop].alertName}}</div>
             <template v-else>-</template>
           </template>
           <!--<div v-else-if="item.prop == 'type'" class="content-right-options">

nezha-fronted/src/components/common/header.vue

@@ -739,6 +739,7 @@
   }
   .nz-icon-navmore{
     font-size: 18px;
+    line-height: 51.5px;
   }
 </style>
 

nezha-fronted/src/components/page/config/account.vue

@@ -68,7 +68,6 @@
             :width="item.width"
             :key="`col-${index}`"
             :label="item.label"
-            :sortable="item.prop!='option'&&item.prop!='status'?'custom':false"
             :prop="item.prop"
           >
             <template slot-scope="scope" :column="item">

nezha-fronted/src/components/page/config/model.vue

@@ -380,7 +380,7 @@
         switch(prop){
           case 'id': return'mo.id';
           case 'name': return'mo.name';
-          case 'type': return'dict1.value';
+          case 'type': return'dictt.value';
           case 'vendor': return'dict.value';
           default : return prop;
         }