Merge branch 'codeCheck' of https://git.mesalab.cn/nezha/nezha-fronted into codeCheck

2021-03-12 10:26:24 +08:00
parent 3b999eaa19 891f6bfcf2
commit e20a2b3fca
8 changed files with 102 additions and 36 deletions
--- a/nezha-fronted/src/components/common/js/tools.js
+++ b/nezha-fronted/src/components/common/js/tools.js
@@ -464,7 +464,6 @@ export const tableSet = {
  //是否需要排序
  sortableShow(prop,from){
    switch(prop){
-      case 'id':
      case 'alertRule':
      case 'severity':
      case 'startAt':
@@ -504,7 +503,13 @@ export const tableSet = {
      case 'alertNum':
        return'custom';
      case 'state':
-        if( from === 'operationlog'){
+        if( from === 'operationlog' ){
+          return false
+        }else{
+          return'custom'
+        }
+      case 'id':
+        if( from === 'alertSilence' ){
          return false
        }else{
          return'custom'