fix ： 修改alertmessage不显示的问题

nezha-fronted/src/components/charts/chart-alert-list.vue

@@ -51,6 +51,7 @@
             @deleteMessage="deleteMessage"
             ref="alertListTable"
             :form="'chartList'"
+            :fromPath="'/alertList'"
           ></alertMessageTable>
           <Pagination :pageObj="pageObj" @pageNo='pageNo'  @pageSize='pageSize' ref="Pagination" :append-to-body="false" pop-class="out-popper-fix"></Pagination>
         </div>
@@ -71,6 +72,7 @@
             @deleteMessage="deleteMessage"
             ref="alertListScreenTable"
             :form="'chartList'"
+            :fromPath="'/alertList'"
           ></alertMessageTable>
           <Pagination :pageObj="screenPageObj"  @pageNo='screenPageNo' @pageSize='screenPageSize' ref="Pagination" ></Pagination>
           <loading  :ref="'localLoadingScreen'+chartIndex"></loading>

nezha-fronted/src/components/common/alert/alertMessageTable.vue

@@ -159,12 +159,13 @@
     <!--<弹窗>-->
     <!--删除弹窗-->
     <element-set
-      v-clickoutside="elementsetHide"
+    v-clickoutside="elementsetHide"
-      :table-title="tableTitle"
+    :table-title="tableTitle"
-      :dropCol="dropCol"
+    :dropCol="dropCol"
-      @tablelable="tablelabelEmit"
+    @tablelable="tablelabelEmit"
-      ref="elementset"
+    ref="elementset"
-    ></element-set>
+    :path="this.fromPath"
+  ></element-set>
     <!--导出-->
     <div class="export-xlsx">
       <el-dialog :visible.sync="importBox.show" :title="importBox.title" :modal-append-to-body='false' :show-close="true" width="300px" @close="closeDialog" class="nz-dialog">
@@ -234,7 +235,8 @@
       tableHeight:{},
       tableId:{},
       projectAlertId:{},
-      from:{}
+      from:{},
+      fromPath:{},
     },
     data() {
       vm = this;
@@ -859,6 +861,9 @@
       showSubList(n) {
         this.$bottomBoxWindow.showSubListWatch(vm, n);
       },
+      from(n){
+        console.log(n)
+      },
     },
     mounted() {
       //是否存在分页缓存
@@ -887,22 +892,25 @@
           });
         }
       });
-      if(this.from=='alertMessage'  || this.from=='chartList'){
+      if(this.from=='alertMessage'){
         this.tablelable = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path)
           ? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path))
           : this.tableTitle;
         this.dropCol = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path)
           ? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path))
           : this.tableTitle;
+        console.log(1);
       }
-      if(this.from=='alertMessageTab'){
+      if(this.from=='alertMessageTab'  || this.from=='chartList'){
         this.tablelable = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-/alertList")
           ? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-/alertList"))
           : this.tableTitle;
         this.dropCol = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-/alertList")
           ? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-/alertList"))
           : this.tableTitle;
+        console.log(2);
       }
+      console.log( this.tableTitle,this.fromPath,this.form,this.tablelable);
     }
   }
 

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

@@ -28,18 +28,19 @@
       @tableDataSort="tableDataSort"
       @deleteMessage="deleteMessage"
       :from="'alertMessageTab'"
+      :fromPath="'/alertList'"
     ></alertMessageTable>
     <Pagination :tableId="tableId" :pageObj="pageObj" @pageNo='pageNo' @pageSize='pageSize' ref="Pagination"></Pagination>
-    <element-set
+    <!--<element-set-->
-      v-if="showElementSet"
+      <!--v-if="showElementSet"-->
-      v-clickoutside="elementsetHide"
+      <!--v-clickoutside="elementsetHide"-->
-      :table-title="tableTitle"
+      <!--:table-title="tableTitle"-->
-      :dropCol="dropCol"
+      <!--:dropCol="dropCol"-->
-      :path="'/alertList'"
+      <!--:path="'/alertList'"-->
-      @close="elementsetHide"
+      <!--@close="elementsetHide"-->
-      @tablelable="tablelabelEmit"
+      <!--@tablelable="tablelabelEmit"-->
-      ref="elementset"
+      <!--ref="elementset"-->
-    ></element-set>
+    <!--&gt;</element-set>-->
     <!--导出-->
     <div class="export-xlsx">
       <el-dialog :visible.sync="importBox.show" :title="importBox.title" :modal-append-to-body='false' :show-close="true" width="300px" @close="importBox.show = false" class="nz-dialog">

nezha-fronted/src/components/page/alert/list.vue

@@ -38,7 +38,7 @@
         :tableId="tableId"
         @tableDataSort="tableDataSort"
         @deleteMessage="deleteMessage"
-        :form="'chartList'"
+        :from="'alertMessage'"
       ></alertMessageTable>
       <div class="pagination-bottom" v-show="!showSubList">
         <Pagination :tableId="tableId" :pageObj="pageObj" @pageNo='pageNo' @pageSize='pageSize' ref="Pagination"></Pagination>

nezha-fronted/src/components/page/asset/asset.vue

@@ -646,7 +646,15 @@
           case 'ID':
           case 'HOST':
           case 'SN':
+          case 'assetType':
           case 'purchaseDate':
+          case 'state':
+          case 'pingStatus':
+          case 'dataCenter':
+          case 'cabinet':
+          case 'Module':
+          case 'vendor':
+          case 'principal':
             return'custom';
           default : return false;
         }
@@ -657,7 +665,15 @@
           case 'ID': return'ass.id';
           case 'HOST': return'ass.host';
           case 'SN': return'ass.sn';
+          case 'assetType': return 'sdtt.value';
           case 'purchaseDate': return'ass.purchase_date';
+          case 'state': return 'ass.state';
+          case 'pingStatus': return 'assp.rtt';
+          case 'dataCenter': return 'idc.name';
+          case 'cabinet': return 'cab.name';
+          case 'Module': return 'mo.name';
+          case 'vendor': return 'sdt.value';
+          case 'principal': return 'su.username';
           default : return prop;
         }
       },