From ec71a59e4261934ec7a8facc9efb5e08f4b62526 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 1 Mar 2022 16:39:26 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9alertMessage=20la?=
 =?UTF-8?q?bles=20tooltip=20=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8=E4=B8=A4?=
 =?UTF-8?q?=E6=AC=A1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/mixin/dataList.js   |   1 -
 .../common/table/alert/alertMessageTable.vue  | 242 ++++++++++--------
 .../components/page/alert/alertMessage.vue    |  42 +--
 3 files changed, 140 insertions(+), 145 deletions(-)

diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js
index c35790bd0..b7b02279a 100644
--- a/nezha-fronted/src/components/common/mixin/dataList.js
+++ b/nezha-fronted/src/components/common/mixin/dataList.js
@@ -864,7 +864,6 @@ export default {
     if (pageSize && pageSize !== 'undefined') {
       this.pageObj.pageSize = pageSize
     }
-    console.log(this.$refs.dataTable, this.$refs.dataDetail)
     const tableTitle = this.$refs.dataTable ? this.$refs.dataTable.tableTitle : this.$refs.dataDetail.tableTitle
     let localStorageTableTitle = localStorage.getItem('nz-tableTitle-' + localStorage.getItem('nz-username') + '-' + this.tableId)
     localStorageTableTitle = localStorageTableTitle ? JSON.parse(localStorageTableTitle) : tableTitle
diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
index 36e558c21..93a489346 100644
--- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
@@ -1,133 +1,135 @@
 <template>
-  <!--表格-->
-  <el-table
-    id="alertMessageTable"
-    ref="dataTable"
-    :cell-class-name="labelsClassName"
-    :data="tableData"
-    :height="height"
-    border
-    @header-dragend="dragend"
-    @sort-change="tableDataSort"
-    @selection-change="selectionChange"
-    @row-dblclick="(row)=>{rowDblclick(row)}"
-  >
-    <el-table-column
-      :resizable="false"
-      align="center"
-      type="selection"
-      width="55">
-    </el-table-column>
-    <el-table-column
-      v-for="(item, index) in customTableTitle"
-      v-if="item.show"
-      :key="`col-${index}`"
-      :fixed="item.fixed"
-      :label="item.label"
-      :min-width="`${item.minWidth}`"
-      :prop="item.prop"
-      :resizable="true"
-      :sort-orders="['ascending', 'descending']"
-      :sortable="item.sortable"
-      :width="`${item.width}`"
+  <div>
+    <!--表格-->
+    <el-table
+      id="alertMessageTable"
+      ref="dataTable"
+      :cell-class-name="labelsClassName"
+      :data="tableData"
+      :height="height"
+      border
+      @header-dragend="dragend"
+      @sort-change="tableDataSort"
+      @selection-change="selectionChange"
+      @row-dblclick="(row)=>{rowDblclick(row)}"
     >
-      <template slot-scope="scope" :column="item">
-        <template v-if="item.prop === 'alertRule'">
-          <div v-if="scope.row.alertRule&&scope.row.alertRule.name" >
+      <el-table-column
+        :resizable="false"
+        align="center"
+        type="selection"
+        width="55">
+      </el-table-column>
+      <el-table-column
+        v-for="(item, index) in customTableTitle"
+        v-if="item.show"
+        :key="`col-${index}`"
+        :fixed="item.fixed"
+        :label="item.label"
+        :min-width="`${item.minWidth}`"
+        :prop="item.prop"
+        :resizable="true"
+        :sort-orders="['ascending', 'descending']"
+        :sortable="item.sortable"
+        :width="`${item.width}`"
+      >
+        <template slot-scope="scope" :column="item">
+          <template v-if="item.prop === 'alertRule'">
+            <div v-if="scope.row.alertRule&&scope.row.alertRule.name" >
             <span
-              @mouseenter="alertMessageHover(scope.row.alertRule, true, $event)"
-              @mouseleave="alertMessageHover(scope.row.alertRule, false)"
+              @mouseenter="alertMessageHover(scope.row, true, $event)"
+              @mouseleave="alertMessageHover(scope.row, false)"
             >{{scope.row.alertRule?scope.row.alertRule.name : '--'}}</span>
-            <alertRuleInfo v-if="scope.row.alertRule.loading" :id="scope.row.alertRule.id" :severity-data="severityData" :that="scope.row.alertRule" @showText="$emit('showText',scope.row)"></alertRuleInfo>
-          </div>
-          <template v-else>-</template>
-        </template>
-        <template v-else-if="item.prop === 'summary'">
-          <template v-if="scope.row[item.prop]">{{scope.row[item.prop]}}</template>
-          <template v-else>-</template>
-        </template>
-        <template v-else-if="item.prop === 'description'">
-          <template v-if="scope.row[item.prop]">{{scope.row[item.prop]}}</template>
-          <span v-else>-</span>
-        </template>
-        <template v-else-if="item.prop === 'remark'">
-          <template v-if="scope.row[item.prop]">{{scope.row[item.prop]}}</template>
-          <span v-else>-</span>
-        </template>
-        <span v-else-if="item.prop === 'severityId'&&scope.row['severity']" class="severity">
+            </div>
+            <template v-else>-</template>
+          </template>
+          <template v-else-if="item.prop === 'summary'">
+            <template v-if="scope.row[item.prop]">{{scope.row[item.prop]}}</template>
+            <template v-else>-</template>
+          </template>
+          <template v-else-if="item.prop === 'description'">
+            <template v-if="scope.row[item.prop]">{{scope.row[item.prop]}}</template>
+            <span v-else>-</span>
+          </template>
+          <template v-else-if="item.prop === 'remark'">
+            <template v-if="scope.row[item.prop]">{{scope.row[item.prop]}}</template>
+            <span v-else>-</span>
+          </template>
+          <span v-else-if="item.prop === 'severityId'&&scope.row['severity']" class="severity">
           <i :style="{color:scope.row['severity'].color,'font-size':'12px','margin-right':'5px'}" class="nz-icon nz-icon-circle"></i> {{scope.row['severity'].name}}
         </span>
-        <span v-else-if="item.prop === 'startAt'">{{utcTimeToTimezoneStr(scope.row.startAt)}}</span>
-        <template v-else-if="item.prop === 'duration'">
-          <el-tooltip :disabled="!scope.row.endAt" effect="light" placement="right">
-            <div slot="content">
-              {{$t('config.terminallog.endTime')}}<br/>
-              {{utcTimeToTimezoneStr(scope.row.endAt)}}
-            </div>
-            <span>{{getDuration(scope.row)}}</span>
-          </el-tooltip>
-        </template>
-        <template v-else-if="item.prop === 'labels'" class="labels">
+          <span v-else-if="item.prop === 'startAt'">{{utcTimeToTimezoneStr(scope.row.startAt)}}</span>
+          <template v-else-if="item.prop === 'duration'">
+            <el-tooltip :disabled="!scope.row.endAt" effect="light" placement="right">
+              <div slot="content">
+                {{$t('config.terminallog.endTime')}}<br/>
+                {{utcTimeToTimezoneStr(scope.row.endAt)}}
+              </div>
+              <span>{{getDuration(scope.row)}}</span>
+            </el-tooltip>
+          </template>
+          <template v-else-if="item.prop === 'labels'" class="labels">
           <span v-for="(item, i) in labelsSort(scope.row.labels)" :key="i">
             <span
               @mouseenter="labelHover(scope.row, item.label, true, $event)"
               @mouseleave="labelHover(scope.row, item.label, false)">
               <nz-alert-tag
-                 v-if="item.label !== 'alertname' && item.label !== 'severity'" :key="item.label" :cursor-point="tagType(item.label) !== 'info'"
-                 :label="item.label"
-                 :type="tagType(item.label)"
-                 style="margin: 5px 0 5px 5px;"
+                v-if="item.label !== 'alertname' && item.label !== 'severity'" :key="item.label" :cursor-point="tagType(item.label) !== 'info'"
+                :label="item.label"
+                :type="tagType(item.label)"
+                style="margin: 5px 0 5px 5px;"
               >
                {{item.value}}
               </nz-alert-tag>
             </span>
-            <alertLabel
-              v-if="(item.label === 'asset' ||item.label === 'module' || item.label === 'project' || item.label === 'dc' ||item.label === 'endpoint' ||item.label === 'cpu' ||item.label === 'user' ||item.label === 'parent_asset') && scope.row[item.label] && scope.row[item.label].loading"
-              :id="scope.row[item.label].id"
-              :that="scope.row[item.label]"
-              :type="item.label"
-              :alert-table-dialog="chartAlertList"
-            ></alertLabel>
           </span>
-        </template>
-        <span v-else-if="item.prop === 'state'" :class="{'green': scope.row['state'] == 2, 'red': scope.row['state'] == 1}">
+          </template>
+          <span v-else-if="item.prop === 'state'" :class="{'green': scope.row['state'] == 2, 'red': scope.row['state'] == 1}">
             {{scope.row['state'] == 1 ? "Pending" : ""}}
             {{scope.row['state'] == 2 ? "Expired" : ""}}
         </span>
-        <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
-        <template v-else>-</template>
+          <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
+          <template v-else>-</template>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="showOption"
+        :resizable="false"
+        :width="operationWidth"
+        fixed="right">
+        <div slot="header" class="table-operation-title">{{$t('overall.option')}}</div>
+        <div slot-scope="scope" class="table-operation-items">
+          <button v-if="scope.row.alertRule&&scope.row.alertRule.type !== 3" class="table-operation-item" @click="$emit('messageDetail', scope.row)"><i class="nz-icon nz-icon-view1"></i></button>
+          <el-dropdown v-has="['alertMessage_expired', 'alertSilence_add']" size="medium" trigger="click" @command="tableOperation">
+            <div class="table-operation-item table-operation-item--more">
+              <i class="nz-icon nz-icon-more3"></i>
+            </div>
+            <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
+              <!--            <el-dropdown-item :command="['showText', scope.row]"><i class="nz-icon nz-icon-guzhangshuju"></i><span class="operation-dropdown-text">{{$t('alert.config.trbShot')}}</span></el-dropdown-item>-->
+              <el-dropdown-item v-has="'alertMessage_view'" :command="['delete', scope.row]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
+              <el-dropdown-item v-has="'alertSilence_add'" :command="['fastSilence', scope.row, 'alertMessage']"><i class="nz-icon nz-icon-fast-silence"></i><span class="operation-dropdown-text">{{$t('overall.silenceAlert')}}</span></el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </div>
+      </el-table-column>
+      <template slot="empty">
+        <div v-if="!loading" class="table-no-data">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#nz-icon-no-data-list"></use>
+          </svg>
+          <div class="table-no-data__title">No results found</div>
+        </div>
+        <div v-else>&nbsp;</div>
       </template>
-    </el-table-column>
-    <el-table-column
-      v-if="showOption"
-      :resizable="false"
-      :width="operationWidth"
-      fixed="right">
-      <div slot="header" class="table-operation-title">{{$t('overall.option')}}</div>
-      <div slot-scope="scope" class="table-operation-items">
-        <button v-if="scope.row.alertRule&&scope.row.alertRule.type !== 3" class="table-operation-item" @click="$emit('messageDetail', scope.row)"><i class="nz-icon nz-icon-view1"></i></button>
-        <el-dropdown v-has="['alertMessage_expired', 'alertSilence_add']" size="medium" trigger="click" @command="tableOperation">
-          <div class="table-operation-item table-operation-item--more">
-            <i class="nz-icon nz-icon-more3"></i>
-          </div>
-          <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
-<!--            <el-dropdown-item :command="['showText', scope.row]"><i class="nz-icon nz-icon-guzhangshuju"></i><span class="operation-dropdown-text">{{$t('alert.config.trbShot')}}</span></el-dropdown-item>-->
-            <el-dropdown-item v-has="'alertMessage_view'" :command="['delete', scope.row]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
-            <el-dropdown-item v-has="'alertSilence_add'" :command="['fastSilence', scope.row, 'alertMessage']"><i class="nz-icon nz-icon-fast-silence"></i><span class="operation-dropdown-text">{{$t('overall.silenceAlert')}}</span></el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown>
-      </div>
-    </el-table-column>
-    <template slot="empty">
-      <div v-if="!loading" class="table-no-data">
-        <svg class="icon" aria-hidden="true">
-          <use xlink:href="#nz-icon-no-data-list"></use>
-        </svg>
-        <div class="table-no-data__title">No results found</div>
-      </div>
-      <div v-else>&nbsp;</div>
-    </template>
-  </el-table>
+    </el-table>
+    <alertRuleInfo v-if="alertRuleShow" :id="alertRuleId" :severity-data="severityData" :that="alertRuleObj.alertRule" @showText="$emit('showText',alertRuleObj)"></alertRuleInfo>
+    <alertLabel
+      v-if="alertLabelShow"
+      :id="alertLabelId"
+      :that="alertLabelObj"
+      :type="alertLabelType"
+      :alert-table-dialog="chartAlertList"
+    ></alertLabel>
+  </div>
 </template>
 
 <script>
@@ -225,7 +227,14 @@ export default {
         }
       ],
       viewAssetState: false,
-      tableDataInitNum: 0
+      tableDataInitNum: 0,
+      alertLabelShow: false,
+      alertLabelId: '',
+      alertLabelObj: {},
+      alertLabelType: '',
+      alertRuleShow: false,
+      alertRuleId: '',
+      alertRuleObj: ''
     }
   },
   computed: {
@@ -561,9 +570,12 @@ export default {
       if (e) {
         const dom = e.currentTarget
         const position = dom.getBoundingClientRect()
-        this.$set(item, 'position', position)
+        this.$set(item.alertRule, 'position', position)
+        this.alertRuleId = item.alertRule.id
+        this.alertRuleObj = item
       }
-      this.$set(item, 'loading', loading)
+      this.$set(item.alertRule, 'loading', loading)
+      this.alertRuleShow = loading
     },
     // label 鼠标划入
     labelHover (item, type, loading, e) {
@@ -574,8 +586,12 @@ export default {
         const dom = e.currentTarget
         const position = dom.getBoundingClientRect()
         this.$set(item[type], 'position', position)
+        this.alertLabelId = item[type].id
+        this.alertLabelObj = item[type]
+        this.alertLabelType = type
       }
       this.$set(item[type], 'loading', loading)
+      this.alertLabelShow = loading
     },
     // Severity Label
     returnSeverityLabel (key) {
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index fb172396f..216719baa 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -761,41 +761,21 @@ export default {
         this.tools.loading = false
         if (response.code == 200) {
           this.nowTime = this.utcTimeToTimezoneStr(response.time)
+          response.data.list.forEach((item) => {
+            const labels = JSON.parse(item.labels)
+            if (labels) {
+              Object.keys(labels).forEach((key) => {
+                if (item[key] && item[key].id) {
+                  item.position = {}
+                  item.loading = false
+                }
+              })
+            }
+          })
           this.tableData = response.data.list
           if (response.statistics && this.$route.path === '/alertMessage') {
             this.setSearchData(response.statistics)
           }
-          /* const axiosAll = []
-            this.$nextTick(() => {
-              this.tableData.forEach((item) => {
-                item.labels = JSON.parse(item.labels)
-                if (!this.isBuildIn(item.alertRule)) {
-                  const paramStr = JSON.stringify(this.promQueryParamConvert(item))
-                  axiosAll.push(axios.get('/prom/api/v1/query?query=' + paramStr.substring(1, paramStr.length - 1).replace(/\+/g, '%2B').replace(/ /g, '%20').replace(/\\/g, '')))
-                } else {
-                  axiosAll.push('')
-                }
-              })
-              axios.all(axiosAll).then(res => {
-                res.forEach((item, index) => {
-                  let current = []
-                  const response2 = item.data
-                  if (response2.data && response2.data.result && response2.data.result.length > 0) {
-                    current = response2.data.result[0].value.map((item, i) => {
-                      if (i == 0) {
-                        return bus.computeTimezone(item)
-                      } else {
-                        return parseFloat(item).toFixed(2)
-                      }
-                    })
-                  } else {
-                    current = [null, null]
-                  }
-                  this.tableData[index].current = current
-                })
-                this.$set(this.tableData, [...this.tableData])
-              })
-            }) */
           this.deleteBox.ids = ''
           this.pageObj.total = response.data.total
         }