From b3664b7d7150ed6a7cb5a99d6fe178dc4291fe6a Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 1 Mar 2022 15:19:43 +0800
Subject: [PATCH 01/65] =?UTF-8?q?fix=EF=BC=9A=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/bottomBox/tabs/assetTab.vue        |  3 +++
 .../common/bottomBox/tabs/cabinetTab.vue      |  3 +++
 .../common/bottomBox/tabs/endpointTabNew.vue  |  3 +++
 .../common/detailView/nzDetailView.vue        |  4 ++--
 .../src/components/common/mixin/dataList.js   | 23 +++++++++++++------
 .../common/mixin/detailViewMixin.js           |  4 ++--
 .../common/project/popData/assetTable.vue     |  3 +++
 .../common/project/popData/endpointTable.vue  |  3 +++
 .../src/components/page/alert/alertRule.vue   |  3 +++
 .../src/components/page/asset/asset.vue       | 12 ++++++----
 .../src/components/page/config/dc.vue         |  2 +-
 .../components/page/config/terminalLog.vue    |  2 +-
 .../src/components/page/config/user.vue       |  2 +-
 .../page/monitor/endpoint/endpointList.vue    |  5 +++-
 .../page/monitor/module/moduleList.vue        |  5 +++-
 .../page/monitor/project/projectList.vue      |  3 +++
 16 files changed, 60 insertions(+), 20 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue
index 276a35fb4..0e62cb17b 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue
@@ -244,6 +244,9 @@ export default {
           if (this.needAlertDaysData) {
             response.data.list.forEach(item => {
               item.trendLoading = true
+              item.left= 0
+              item.top= 0
+              item.alertNumtooltipShow= false
               item.alertDaysData = [
                 {
                   metric: { priority: 'P1' },
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
index 4ad53a11a..bfe0a5a90 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
@@ -151,6 +151,9 @@ export default {
           if (this.needAlertDaysData) {
             response.data.list.forEach(item => {
               item.trendLoading = true
+              item.left= 0
+              item.top= 0
+              item.alertNumtooltipShow= false
               item.alertDaysData = [
                 {
                   metric: { priority: 'P1' },
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue
index 16ed248b0..94127793a 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue
@@ -141,6 +141,9 @@ export default {
           if (this.needAlertDaysData) {
             response.data.list.forEach(item => {
               item.trendLoading = true
+              item.left= 0
+              item.top= 0
+              item.alertNumtooltipShow= false
               item.alertDaysData = [
                 {
                   metric: { priority: 'P1' },
diff --git a/nezha-fronted/src/components/common/detailView/nzDetailView.vue b/nezha-fronted/src/components/common/detailView/nzDetailView.vue
index 2397a881c..41c30e8bd 100644
--- a/nezha-fronted/src/components/common/detailView/nzDetailView.vue
+++ b/nezha-fronted/src/components/common/detailView/nzDetailView.vue
@@ -33,13 +33,13 @@
           <!-- <div v-if="showLayout.indexOf('pagination') > -1" class="pagination-top pagination-top-hide display-none"></div>-->
         </div>
         <div :style="{ height: nzTableHeight }" class="nz-detail-view" :class="dataLength?'':'nz-detail-view-no-data'">
-          <div class="nz-detail-view-left" v-if="dataLength">
+          <div class="nz-detail-view-left" v-show="dataLength">
             <slot name="nz-detail-view-list"></slot>
             <div v-if="showLayout.indexOf('pagination') > -1" class="nz-detail-view-pagination">
               <slot name="pagination"></slot>
             </div>
           </div>
-          <div v-else class="no-data">
+          <div v-if="!dataLength" class="no-data">
             <svg class="icon" aria-hidden="true">
               <use xlink:href="#nz-icon-no-data-list"></use>
             </svg>
diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js
index 942645b84..c35790bd0 100644
--- a/nezha-fronted/src/components/common/mixin/dataList.js
+++ b/nezha-fronted/src/components/common/mixin/dataList.js
@@ -105,6 +105,9 @@ export default {
           if (this.needAlertDaysData) {
             response.data.list.forEach(item => {
               item.trendLoading = true
+              item.left= 0
+              item.top= 0
+              item.alertNumtooltipShow= false
               item.alertDaysData = [
                 {
                   metric: { priority: 'P1' },
@@ -132,7 +135,7 @@ export default {
           this.detailViewRightObj = detailViewRightObj
           this.pageObj.total = response.data.total
           this.pageObj.pages = response.data.pages
-          if (!this.scrollbarWrap && this.$refs.dataTable.$refs.dataTable) {
+          if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) {
             this.$nextTick(() => {
               this.scrollbarWrap = this.$refs.dataTable.$refs.dataTable.bodyWrapper
               this.toTopBtnHandler(this.scrollbarWrap)
@@ -214,7 +217,9 @@ export default {
     },
     dragend () {
       this.$nextTick(() => {
-        this.$refs.dataTable.$refs.dataTable && this.$refs.dataTable.$refs.dataTable.doLayout()
+        if (this.$refs.dataTable) {
+          this.$refs.dataTable.$refs.dataTable && this.$refs.dataTable.$refs.dataTable.doLayout()
+        }
       })
     },
     search (searchObj) {
@@ -859,14 +864,16 @@ 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) : this.$refs.dataTable.tableTitle
-    this.tools.customTableTitle = this.$refs.dataTable.tableTitle.map((item, index) => { // 修复切换中英文的问题
+    localStorageTableTitle = localStorageTableTitle ? JSON.parse(localStorageTableTitle) : tableTitle
+    this.tools.customTableTitle = tableTitle.map((item, index) => { // 修复切换中英文的问题
       item.show = localStorageTableTitle[index].show
       return item
     })
-    if (localStorageTableTitle && (localStorageTableTitle.length > this.$refs.dataTable.tableTitle.length)) {
-      const arr = localStorageTableTitle.splice(this.$refs.dataTable.tableTitle.length, localStorageTableTitle.length)
+    if (localStorageTableTitle && (localStorageTableTitle.length > tableTitle.length)) {
+      const arr = localStorageTableTitle.splice(tableTitle.length, localStorageTableTitle.length)
       arr.forEach(item => {
         item.minWidth = item.label.length * 16 + 20
       })
@@ -875,7 +882,9 @@ export default {
     if (!this.fromBottom) {
       this.getTableData()
       this.$nextTick(() => {
-        this.$refs.dataTable.$refs.dataTable && this.$refs.dataTable.$refs.dataTable.doLayout()
+        if (this.$refs.dataTable) {
+          this.$refs.dataTable.$refs.dataTable && this.$refs.dataTable.$refs.dataTable.doLayout()
+        }
       })
     }
   },
diff --git a/nezha-fronted/src/components/common/mixin/detailViewMixin.js b/nezha-fronted/src/components/common/mixin/detailViewMixin.js
index 8862b68b5..2f039f6e9 100644
--- a/nezha-fronted/src/components/common/mixin/detailViewMixin.js
+++ b/nezha-fronted/src/components/common/mixin/detailViewMixin.js
@@ -2,7 +2,7 @@ export default {
   props: {},
   data () {
     return {
-      detailType: 'list',
+      detailType: localStorage.getItem('detail-view-' + this.tableId) || 'list',
       detailViewRightObj: '',
       detailViewLoading: false,
       detailTimer: ''
@@ -16,7 +16,7 @@ export default {
       if (this.detailType === flag) {
         return
       }
-      this.$refs.dataList.bottomBox.showSubList = false
+      // this.$refs.dataList.bottomBox.showSubList = false
       if (this.orderBy) {
         this.detailViewRightObj = ''
       }
diff --git a/nezha-fronted/src/components/common/project/popData/assetTable.vue b/nezha-fronted/src/components/common/project/popData/assetTable.vue
index 8ba22d364..9973e1cd8 100644
--- a/nezha-fronted/src/components/common/project/popData/assetTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/assetTable.vue
@@ -170,6 +170,9 @@ export default {
           if (this.needAlertDaysData) {
             response.data.list.forEach(item => {
               item.trendLoading = true
+              item.left= 0
+              item.top= 0
+              item.alertNumtooltipShow= false
               item.alertDaysData = [
                 {
                   metric: { priority: 'P1' },
diff --git a/nezha-fronted/src/components/common/project/popData/endpointTable.vue b/nezha-fronted/src/components/common/project/popData/endpointTable.vue
index afc5bfc0a..8139df580 100644
--- a/nezha-fronted/src/components/common/project/popData/endpointTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/endpointTable.vue
@@ -176,6 +176,9 @@ export default {
           if (this.needAlertDaysData) {
             response.data.list.forEach(item => {
               item.trendLoading = true
+              item.left= 0
+              item.top= 0
+              item.alertNumtooltipShow= false
               item.alertDaysData = [
                 {
                   metric: { priority: 'P1' },
diff --git a/nezha-fronted/src/components/page/alert/alertRule.vue b/nezha-fronted/src/components/page/alert/alertRule.vue
index 41c8da975..c6027a563 100644
--- a/nezha-fronted/src/components/page/alert/alertRule.vue
+++ b/nezha-fronted/src/components/page/alert/alertRule.vue
@@ -287,6 +287,9 @@ export default {
           if (this.needAlertDaysData) {
             response.data.list.forEach(item => {
               item.trendLoading = true
+              item.left= 0
+              item.top= 0
+              item.alertNumtooltipShow= false
               item.alertDaysData = [
                 {
                   metric: { priority: 'P1' },
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index c81d18d2d..85900e029 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -73,7 +73,7 @@
     </nzDetailView>
     <nz-data-list
       v-loading="detailViewLoading"
-      v-show="detailType === 'list'"
+      v-if="detailType === 'list'"
       ref="dataList"
       :api="url"
       :custom-table-title.sync="tools.customTableTitle"
@@ -612,8 +612,9 @@ export default {
             resolve(data)
             setTimeout(() => {
               const title = this.tools.customTableTitle
-              const originalTitle = title.slice(0, this.$refs.dataTable.tableTitle.length) // 原title
-              const oldLabelTitle = title.slice(this.$refs.dataTable.tableTitle.length, title.length) // 旧labelTitle
+              const tableTitle = this.$refs.dataTable ? this.$refs.dataTable.tableTitle : this.$refs.dataDetail.tableTitle
+              const originalTitle = title.slice(0, tableTitle.length) // 原title
+              const oldLabelTitle = title.slice(tableTitle.length, title.length) // 旧labelTitle
 
               const newLabel = showData.filter(item => { return !oldLabelTitle.find(t => { return item.label === t.label }) })
               const keepLabel = oldLabelTitle.filter(item => showData.find(t => item.label === t.label))
@@ -718,6 +719,9 @@ export default {
           if (this.needAlertDaysData) {
             response.data.list.forEach(item => {
               item.trendLoading = true
+              item.left= 0
+              item.top= 0
+              item.alertNumtooltipShow= false
               item.alertDaysData = [
                 {
                   metric: { priority: 'P1' },
@@ -745,7 +749,7 @@ export default {
           this.detailViewRightObj = detailViewRightObj
           this.pageObj.total = response.data.total
           this.pageObj.pages = response.data.pages
-          if (!this.scrollbarWrap && this.$refs.dataTable.$refs.dataTable) {
+          if (!this.scrollbarWrap && this.$refs.dataTable&& this.$refs.dataTable.$refs.dataTable) {
             this.$nextTick(() => {
               this.scrollbarWrap = this.$refs.dataTable.$refs.dataTable.bodyWrapper
               this.toTopBtnHandler(this.scrollbarWrap)
diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue
index da51d20f0..b6692a894 100644
--- a/nezha-fronted/src/components/page/config/dc.vue
+++ b/nezha-fronted/src/components/page/config/dc.vue
@@ -73,7 +73,7 @@
     <nz-data-list
       ref="dataList"
       :api="url"
-      v-show="detailType === 'list'"
+      v-if="detailType === 'list'"
       :layout="['searchInput', 'elementSet', 'pagination','detailViewSet']"
       :custom-table-title.sync="tools.customTableTitle"
       :from="fromRoute.dc"
diff --git a/nezha-fronted/src/components/page/config/terminalLog.vue b/nezha-fronted/src/components/page/config/terminalLog.vue
index 1f71671dc..4e06f3c4a 100644
--- a/nezha-fronted/src/components/page/config/terminalLog.vue
+++ b/nezha-fronted/src/components/page/config/terminalLog.vue
@@ -54,7 +54,7 @@
     <nz-data-list
       ref="dataList"
       :api="url"
-      v-show="detailType === 'list'"
+      v-if="detailType === 'list'"
       :layout="['searchInput', 'elementSet', 'pagination','detailViewSet']"
       :custom-table-title.sync="tools.customTableTitle"
       :from="fromRoute.terminalLog"
diff --git a/nezha-fronted/src/components/page/config/user.vue b/nezha-fronted/src/components/page/config/user.vue
index 6af7e165c..bbb228a7e 100644
--- a/nezha-fronted/src/components/page/config/user.vue
+++ b/nezha-fronted/src/components/page/config/user.vue
@@ -53,7 +53,7 @@
     <nz-data-list
       ref="dataList"
       :api="url"
-      v-show="detailType === 'list'"
+      v-if="detailType === 'list'"
       :custom-table-title.sync="tools.customTableTitle"
       :from="fromRoute.user"
       :layout="['searchInput', 'elementSet', 'pagination','detailViewSet']"
diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
index 8cd1a2abf..c49a474f5 100644
--- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
+++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
@@ -70,7 +70,7 @@
     <nz-data-list
       v-loading="detailViewLoading"
       ref="dataList"
-      v-show="detailType === 'list'"
+      v-if="detailType === 'list'"
       :api="url"
       :custom-table-title.sync="tools.customTableTitle"
       :from="fromRoute.endpoint"
@@ -628,6 +628,9 @@ export default {
           if (this.needAlertDaysData) {
             response.data.list.forEach(item => {
               item.trendLoading = true
+              item.left= 0
+              item.top= 0
+              item.alertNumtooltipShow= false
               item.alertDaysData = [
                 {
                   metric: { priority: 'P1' },
diff --git a/nezha-fronted/src/components/page/monitor/module/moduleList.vue b/nezha-fronted/src/components/page/monitor/module/moduleList.vue
index 54e704184..0367dc179 100644
--- a/nezha-fronted/src/components/page/monitor/module/moduleList.vue
+++ b/nezha-fronted/src/components/page/monitor/module/moduleList.vue
@@ -71,7 +71,7 @@
       ref="dataList"
       :api="url"
       :tableId="tableId"
-      v-show="detailType === 'list'"
+      v-if="detailType === 'list'"
       :custom-table-title.sync="tools.customTableTitle"
       :from="fromRoute.module"
       :layout="['searchInput', 'elementSet', 'pagination','detailViewSet']"
@@ -409,6 +409,9 @@ export default {
           if (this.needAlertDaysData) {
             response.data.list.forEach(item => {
               item.trendLoading = true
+              item.left= 0
+              item.top= 0
+              item.alertNumtooltipShow= false
               item.alertDaysData = [
                 {
                   metric: { priority: 'P1' },
diff --git a/nezha-fronted/src/components/page/monitor/project/projectList.vue b/nezha-fronted/src/components/page/monitor/project/projectList.vue
index f66856bb8..0bb29ef11 100644
--- a/nezha-fronted/src/components/page/monitor/project/projectList.vue
+++ b/nezha-fronted/src/components/page/monitor/project/projectList.vue
@@ -147,6 +147,9 @@ export default {
           if (this.needAlertDaysData) {
             response.data.list.forEach(item => {
               item.trendLoading = true
+              item.left= 0
+              item.top= 0
+              item.alertNumtooltipShow= false
               item.alertDaysData = [
                 {
                   metric: { priority: 'P1' },

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 02/65] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9alertMessag?=
 =?UTF-8?q?e=20lables=20tooltip=20=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E4=B8=A4=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
         }

From ff32ea7dc1fb910635e4bb679e20d3fe30f8a74d Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 2 Mar 2022 10:46:57 +0800
Subject: [PATCH 03/65] =?UTF-8?q?fix=EF=BC=9A=E6=8E=A5=E5=8F=A3=20visual/p?=
 =?UTF-8?q?anel/chart/id=20=E7=9A=84=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/charts/chart-list.vue              | 2 +-
 .../src/components/common/bottomBox/tabs/panelTabNew.vue        | 2 +-
 nezha-fronted/src/components/page/config/template/chartTemp.vue | 2 +-
 nezha-fronted/src/components/page/dashboard/panel.vue           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue
index a8063ae1e..9334695b5 100644
--- a/nezha-fronted/src/components/charts/chart-list.vue
+++ b/nezha-fronted/src/components/charts/chart-list.vue
@@ -849,7 +849,7 @@ export default {
         if (this.$refs['editChart' + chartItem.id] && this.$refs['editChart' + chartItem.id].length > 0) {
           if (filterType === 'refresh') {
             this.$get('visual/panel/chart/' + chartItem.id).then(res => {
-              const data = res.data.data
+              const data = res.data
               data.param = JSON.parse(data.param)
               this.$refs['editChart' + chartItem.id][0].setData(data, null,
                 this.filter.panelId, null, '')
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
index f09da0cc6..b9a63543a 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
@@ -377,7 +377,7 @@ export default {
         this.$get('visual/panel/chart/' + data.id).then(res => {
           this.rightBox.loading = false
           if (res.code === 200) {
-            const chartData = res.data.data
+            const chartData = res.data
             this.chart = JSON.parse(JSON.stringify(chartData))
             this.chart.panelId = this.showPanel.id
             this.chart.panelName = this.showPanel.name
diff --git a/nezha-fronted/src/components/page/config/template/chartTemp.vue b/nezha-fronted/src/components/page/config/template/chartTemp.vue
index 97f1fe328..8f80ede8f 100644
--- a/nezha-fronted/src/components/page/config/template/chartTemp.vue
+++ b/nezha-fronted/src/components/page/config/template/chartTemp.vue
@@ -234,7 +234,7 @@ export default {
         this.$get('visual/panel/chart/' + data.id).then(res => {
           this.rightBox.loading = false
           if (res.code === 200) {
-            const chartData = res.data.data
+            const chartData = res.data
             this.object = JSON.parse(JSON.stringify(chartData))
             this.object.panelId = this.showPanel.id
             this.object.panelName = this.showPanel.name
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 217503faa..c7c268377 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -438,7 +438,7 @@ export default {
         this.$get('visual/panel/chart/' + data.id).then(res => {
           this.rightBox.loading = false
           if (res.code === 200) {
-            const chartData = res.data.data
+            const chartData = res.data
             this.chart = JSON.parse(JSON.stringify(chartData))
             this.chart.panelId = this.showPanel.id
             this.chart.panelName = this.showPanel.name

From 94cf807332026edc0c674714da1c6796b148b2ad Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 2 Mar 2022 11:32:42 +0800
Subject: [PATCH 04/65] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9alertMessag?=
 =?UTF-8?q?e=20=E6=B2=A1=E6=9C=89=E6=BB=9A=E5=8A=A8=E6=9D=A1=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/table/alert/alertMessageTable.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
index 93a489346..14ba44e12 100644
--- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="height: 100%;">
     <!--表格-->
     <el-table
       id="alertMessageTable"

From 677e14a7a9e305d859cb7b9c38256ced9163b25b Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 2 Mar 2022 16:05:27 +0800
Subject: [PATCH 05/65] =?UTF-8?q?=20NEZ-1618=20feat=EF=BC=9A=20alert=20mes?=
 =?UTF-8?q?sage=20=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/css/common.scss      |  3 +++
 .../common/table/alert/alertMessageTable.scss |  5 ++++
 .../src/assets/css/themes/theme-dark.scss     |  2 ++
 .../src/assets/css/themes/theme-light.scss    |  2 ++
 .../bottomBox/tabs/alertMessageTabNew.vue     | 27 ++++++++++++++-----
 .../src/components/common/js/constants.js     |  1 +
 .../common/table/alert/alertMessageTable.vue  | 19 +++++++++----
 .../src/components/common/timePicker.vue      |  1 +
 .../components/page/alert/alertMessage.vue    | 27 ++++++++++++++-----
 9 files changed, 68 insertions(+), 19 deletions(-)

diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss
index b66e76bf4..2bd0c8f84 100644
--- a/nezha-fronted/src/assets/css/common.scss
+++ b/nezha-fronted/src/assets/css/common.scss
@@ -73,6 +73,9 @@
 .green-bg {
   background-color:$--color-success !important;
 }
+.yellow-bg {
+  background-color:$--color-silence !important;
+}
 .gray-bg {
   background-color: $--color-suspended !important;
 }
diff --git a/nezha-fronted/src/assets/css/components/common/table/alert/alertMessageTable.scss b/nezha-fronted/src/assets/css/components/common/table/alert/alertMessageTable.scss
index e79e19333..5c380bfa0 100644
--- a/nezha-fronted/src/assets/css/components/common/table/alert/alertMessageTable.scss
+++ b/nezha-fronted/src/assets/css/components/common/table/alert/alertMessageTable.scss
@@ -101,3 +101,8 @@
 .nz-message .el-textarea textarea{
   height: 108px !important;
 }
+.alert-message-state{
+  padding: 3px 5px;
+  border-radius: 4px;
+  color: $--color-text-primary;
+}
diff --git a/nezha-fronted/src/assets/css/themes/theme-dark.scss b/nezha-fronted/src/assets/css/themes/theme-dark.scss
index 95bdc1a69..11ef03a7e 100644
--- a/nezha-fronted/src/assets/css/themes/theme-dark.scss
+++ b/nezha-fronted/src/assets/css/themes/theme-dark.scss
@@ -69,6 +69,8 @@ $--color-info: #999998;
 $--color-suspended: #9e9c98;
 // 监控色
 $--color-monitor: #98AEC5;
+// silence
+$--color-silence: #FFC107;
 
 /* 6.table */
 // 表头字色
diff --git a/nezha-fronted/src/assets/css/themes/theme-light.scss b/nezha-fronted/src/assets/css/themes/theme-light.scss
index 413cd8ff3..8ceb5e38a 100644
--- a/nezha-fronted/src/assets/css/themes/theme-light.scss
+++ b/nezha-fronted/src/assets/css/themes/theme-light.scss
@@ -69,6 +69,8 @@ $--color-info: #999998;
 $--color-suspended: #9e9c98;
 // 监控色
 $--color-monitor: #98AEC5;
+// sliences
+$--color-silence: #FFC107;
 
 /* 6.table */
 // 表头字色
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index 611c9ea88..ecfedb583 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -19,7 +19,7 @@
         <el-select v-model="state" class="margin-r-10" size="small" value-key="value" @change="getTableData" popper-class="right-box-select-top right-public-box-dropdown-top" style="width: 100px">
           <el-option v-for="item in stateOptions" :key="item.value" :label="$t(item.label)" :value="item.value"></el-option>
         </el-select>
-        <pick-time v-model="searchTimeHeader" :default-pick="12" :refresh-data-func="getTableData" :show-empty="true" :use-chart-unit="false" :use-refresh="false"></pick-time>
+        <pick-time v-model="searchTimeHeader" :default-pick="8" :refresh-data-func="getTableData" :show-empty="true" :use-chart-unit="false" :use-refresh="false"></pick-time>
       </template>
       <template v-slot>
         <alertMessageTable
@@ -230,7 +230,7 @@ export default {
       sameLabels: ['instance', 'module', 'project', 'asset', 'endpoint', 'datacenter'],
       legend: [],
       searchTime: [],
-      searchTimeHeader: [],
+      searchTimeHeader: [bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - 24)), bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())))],
       searchTimeSelect: bus.getTimezontDateRange(),
       currentMsg: {},
       chartUnit: 5,
@@ -296,7 +296,11 @@ export default {
       }
       this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
       this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
-      this.$set(this.searchLabel, 'state', this.state)
+      if (this.state) {
+        this.$set(this.searchLabel, 'state', this.state)
+      } else {
+        delete this.searchLabel.state
+      }
       if (this.searchTimeHeader && this.searchTimeHeader.length > 1) {
         this.$set(this.searchLabel, 'startAt', this.timezoneToUtcTimeStr(this.searchTimeHeader[0]))
         this.$set(this.searchLabel, 'endAt', this.timezoneToUtcTimeStr(this.searchTimeHeader[1]))
@@ -305,10 +309,10 @@ export default {
         delete this.searchLabel.endAt
       }
       this.tools.loading = true
-      if (state) {
-        delete this.searchLabel.startAt
-        delete this.searchLabel.endAt
-      }
+      // if (state) {
+      //   delete this.searchLabel.startAt
+      //   delete this.searchLabel.endAt
+      // }
       if (this.from === fromRoute.module) {
         this.searchLabel.moduleIds = this.obj.id
       } else if (this.from === fromRoute.endpoint) {
@@ -401,6 +405,15 @@ export default {
         this.currentMsg = { ...row, alertRule: { ...res.data } }
         this.$nextTick(() => {
           this.searchTime = [bus.computeTimezoneTime(new Date().getTime() - 1 * 60 * 60 * 1000), bus.computeTimezoneTime(new Date().getTime())]
+          this.$store.dispatch('dispatchPanelTime', {
+            time: this.searchTime ,
+            nowTimeType: {
+              id: 4,
+              text: this.$t('dashboard.panel.lastOneHour'),
+              type: 'hour',
+              value: 1
+            }
+          })
           this.queryDate()
         })
       })
diff --git a/nezha-fronted/src/components/common/js/constants.js b/nezha-fronted/src/components/common/js/constants.js
index 7538d06fc..7601557a2 100644
--- a/nezha-fronted/src/components/common/js/constants.js
+++ b/nezha-fronted/src/components/common/js/constants.js
@@ -202,6 +202,7 @@ export const alertMessage = {
     { value: 'P3', label: i18n.t('alert.config.P3') }
   ],
   states: [
+    { value: '', label: i18n.t('overall.all') },
     { value: '1', label: i18n.t('overall.active') },
     { value: '2', label: i18n.t('overall.silence') },
     { value: '3', label: i18n.t('alert.list.expired') }
diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
index 14ba44e12..a95329d85 100644
--- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
@@ -83,10 +83,11 @@
             </span>
           </span>
           </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="item.prop === 'state'">
+            <span class="alert-message-state" :class="{'green-bg': scope.row['state'] == 3, 'red-bg': scope.row['state'] == 1,'yellow-bg': scope.row['state'] == 2}">
+              {{$t(stateOptions.find(state=>state.value == scope.row['state']).label)}}
+            </span>
+          </span>
           <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
           <template v-else>-</template>
         </template>
@@ -141,6 +142,7 @@ import chartDataFormat from '../../../charts/chartDataFormat'
 import alertRuleInfo from '../../alert/alertRuleInfo'
 import alertLabel from '../../alert/alertLabel'
 import { calcDurationByStringTimeB } from '../../js/tools'
+import {alertMessage as alertMessageConstant} from "@/components/common/js/constants";
 export default {
   name: 'alertMessageTable',
   components: {
@@ -166,7 +168,7 @@ export default {
       /* 二级列表相关 */
       tabList: [], // 二级列表的标签
       tabDetailList: [], // 多个详情
-
+      stateOptions: alertMessageConstant.states,
       // 详情相关
       graphShow: false,
       chartDatas: [],
@@ -178,6 +180,7 @@ export default {
       chartUnit: 5,
       severityData: [],
       tableTitle: [
+
         {
           label: 'ID',
           prop: 'id',
@@ -213,6 +216,12 @@ export default {
           prop: 'description',
           show: true,
           minWidth: 200
+        }, {
+          label: this.$t('alert.list.state'),
+          prop: 'state',
+          show: true,
+          width: 100,
+          sortable: 'custom'
         }, {
           label: this.$t('alert.startAt'),
           prop: 'startAt',
diff --git a/nezha-fronted/src/components/common/timePicker.vue b/nezha-fronted/src/components/common/timePicker.vue
index 15a2c5ee3..88d10e969 100644
--- a/nezha-fronted/src/components/common/timePicker.vue
+++ b/nezha-fronted/src/components/common/timePicker.vue
@@ -305,6 +305,7 @@ export default {
           const showTime = this.timeData.find(item => item.id == n)
           if (showTime) {
             this.showTime = Object.assign({}, showTime)
+            this.searchTime = this.$parent.searchTime
           }
           if (this.showEmpty && this.defaultPick === 12) {
             this.searchTime = []
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index 216719baa..d8c8165e8 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -18,7 +18,7 @@
         <button id="asset-filter" :class="[dataListLayout.indexOf('clickSearch') > -1?'is-focus':'' ]" class="top-tool-btn margin-r-10" @click.stop="showClickSearch">
           <i class="nz-icon nz-icon-funnel"></i>
         </button>
-        <pick-time v-model="searchTime" :default-pick="12" :refresh-data-func="getTableData" :show-empty="true" :use-chart-unit="false" :use-refresh="false"></pick-time>
+        <pick-time v-model="searchTime" :default-pick="8" :refresh-data-func="getTableData" :show-empty="true" :use-chart-unit="false" :use-refresh="false"></pick-time>
         <button id="roles-add" v-has="'alertMessage_view'" :title="$t('overall.exportExcelLower')" class="top-tool-btn margin-r-10"
                 type="button" @click="showExportDialog">
           <i class="nz-icon-download1 nz-icon"></i>
@@ -192,7 +192,7 @@ export default {
       chartDatas: [],
       sameLabels: ['instance', 'module', 'project', 'asset', 'endpoint', 'datacenter'],
       legend: [],
-      searchTime: [],
+      searchTime: [bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - 24)), bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())))],
       searchTimeDialog: [],
       searchTimeSelect: bus.getTimezontDateRange(),
       currentMsg: {},
@@ -560,6 +560,15 @@ export default {
         this.currentMsg = { ...row, alertRule: { ...res.data } }
         this.$nextTick(() => {
           this.searchTimeDialog = [bus.computeTimezoneTime(new Date().getTime() - 1 * 60 * 60 * 1000), bus.computeTimezoneTime(new Date().getTime())]
+          this.$store.dispatch('dispatchPanelTime', {
+            time: this.searchTimeDialog,
+            nowTimeType: {
+              id: 4,
+              text: this.$t('dashboard.panel.lastOneHour'),
+              type: 'hour',
+              value: 1
+            }
+          })
           this.queryDate()
         })
       })
@@ -731,7 +740,11 @@ export default {
       }
       this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
       this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
-      this.$set(this.searchLabel, 'state', this.state)
+      if (this.state) {
+        this.$set(this.searchLabel, 'state', this.state)
+      } else {
+        delete this.searchLabel.state
+      }
       if (this.searchTime && this.searchTime.length > 1) {
         this.$set(this.searchLabel, 'startAt', bus.timeFormate(this.timezoneToUtcTime(bus.formateTimeToTime(this.searchTime[0])), 'YYYY-MM-DD HH:mm:ss'))
         this.$set(this.searchLabel, 'endAt', bus.timeFormate(this.timezoneToUtcTime(bus.formateTimeToTime(this.searchTime[1])), 'YYYY-MM-DD HH:mm:ss'))
@@ -745,10 +758,10 @@ export default {
         delete this.searchLabel.statistics
       } */
       this.tools.loading = true
-      if (state) {
-        delete this.searchLabel.startAt
-        delete this.searchLabel.endAt
-      }
+      // if (state) {
+      //   delete this.searchLabel.startAt
+      //   delete this.searchLabel.endAt
+      // }
       const param = {
         ...this.searchLabel,
         ...this.searchCheckBox

From 9c5d3c848d7cb7cba5a2c37bdec05269c9dffe79 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 2 Mar 2022 17:26:08 +0800
Subject: [PATCH 06/65] =?UTF-8?q?NEZ-1605=20fix=EF=BC=9A=20=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=B1=95=E7=A4=BA=E8=BF=87=E9=95=BF=EF=BC=8C=E9=81=AE?=
 =?UTF-8?q?=E6=8C=A1=E9=83=A8=E5=88=86=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/css/components/common/searchInput.scss       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nezha-fronted/src/assets/css/components/common/searchInput.scss b/nezha-fronted/src/assets/css/components/common/searchInput.scss
index 88e6d085a..f8ae74d46 100644
--- a/nezha-fronted/src/assets/css/components/common/searchInput.scss
+++ b/nezha-fronted/src/assets/css/components/common/searchInput.scss
@@ -46,6 +46,12 @@
   display: flex;
   position: relative;
 }
+@media screen and (max-width:2000px){
+ .bottom-data-list .new-search .search-input-all{
+    width: 176px !important;
+    min-width: 176px;
+  }
+}
 .search-input-all .btn-retract{
   padding: 0 4px;
   text-align: center;

From 0a5209971d5994a392567c3b64fe4b51d4e6d999 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 2 Mar 2022 17:26:40 +0800
Subject: [PATCH 07/65] =?UTF-8?q?fix=EF=BC=9AalertMessage=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=20lastAt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/bottomBox/tabs/alertMessageTabNew.vue           | 4 +++-
 .../components/common/table/alert/alertMessageTable.vue    | 7 +++++++
 nezha-fronted/src/components/page/alert/alertMessage.vue   | 4 +++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index ecfedb583..5a4795fea 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -162,7 +162,7 @@ export default {
       stateOptions: alertMessageConstant.states,
       url: 'alert/message',
       tableId: 'alertMessageModule', // 需要分页的table的id，用于记录每页数量
-      state: '1',
+      state: '',
       blankSilenceObject: {
         id: '',
         startAt: '',
@@ -331,6 +331,8 @@ export default {
           this.tableData = response.data.list
           this.deleteBox.ids = ''
           this.pageObj.total = response.data.total
+        } else {
+          this.$message.error(response.msg)
         }
       })
     },
diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
index a95329d85..eaba524bd 100644
--- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
@@ -58,6 +58,7 @@
           <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>
+          <span v-else-if="item.prop === 'lastAt'">{{utcTimeToTimezoneStr(scope.row.lastAt)}}</span>
           <template v-else-if="item.prop === 'duration'">
             <el-tooltip :disabled="!scope.row.endAt" effect="light" placement="right">
               <div slot="content">
@@ -225,6 +226,12 @@ export default {
         }, {
           label: this.$t('alert.startAt'),
           prop: 'startAt',
+          show: false,
+          width: 150,
+          sortable: 'custom'
+        }, {
+          label: this.$t('alert.lastAt'),
+          prop: 'lastAt',
           show: true,
           width: 150,
           sortable: 'custom'
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index d8c8165e8..51983fc38 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -180,7 +180,7 @@ export default {
       alertMessageNzTableHeightOffset: 242,
       stateOptions: alertMessageConstant.states,
       dataListLayout: localStorage.getItem('dataList-layout' + 'alertMessageTable') ? JSON.parse(localStorage.getItem('dataList-layout' + 'alertMessageTable')) : ['searchInput', 'elementSet', 'clickSearch', 'pagination'],
-      state: '1',
+      state: '',
       dialogShowText: false,
       dialogText: '',
       url: 'alert/message',
@@ -791,6 +791,8 @@ export default {
           }
           this.deleteBox.ids = ''
           this.pageObj.total = response.data.total
+        } else {
+          this.$message.error(response.msg)
         }
       })
     },

From 7428575686c96966e1e2d4ea29db57fe9bded1d1 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 2 Mar 2022 18:23:42 +0800
Subject: [PATCH 08/65] =?UTF-8?q?NEZ-1618=20fix=EF=BC=9Aalert=20message=20?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/bottomBox/tabs/alertMessageTabNew.vue | 6 +-----
 nezha-fronted/src/components/page/alert/alertMessage.vue    | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index 5a4795fea..9286bc6bc 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -296,11 +296,7 @@ export default {
       }
       this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
       this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
-      if (this.state) {
-        this.$set(this.searchLabel, 'state', this.state)
-      } else {
-        delete this.searchLabel.state
-      }
+      this.$set(this.searchLabel, 'state', this.state)
       if (this.searchTimeHeader && this.searchTimeHeader.length > 1) {
         this.$set(this.searchLabel, 'startAt', this.timezoneToUtcTimeStr(this.searchTimeHeader[0]))
         this.$set(this.searchLabel, 'endAt', this.timezoneToUtcTimeStr(this.searchTimeHeader[1]))
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index 51983fc38..257f64f09 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -740,11 +740,7 @@ export default {
       }
       this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
       this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
-      if (this.state) {
-        this.$set(this.searchLabel, 'state', this.state)
-      } else {
-        delete this.searchLabel.state
-      }
+      this.$set(this.searchLabel, 'state', this.state)
       if (this.searchTime && this.searchTime.length > 1) {
         this.$set(this.searchLabel, 'startAt', bus.timeFormate(this.timezoneToUtcTime(bus.formateTimeToTime(this.searchTime[0])), 'YYYY-MM-DD HH:mm:ss'))
         this.$set(this.searchLabel, 'endAt', bus.timeFormate(this.timezoneToUtcTime(bus.formateTimeToTime(this.searchTime[1])), 'YYYY-MM-DD HH:mm:ss'))

From c45397d407b3956b397285a5ee2308c76724e220 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 2 Mar 2022 18:27:11 +0800
Subject: [PATCH 09/65] =?UTF-8?q?fix=EF=BC=9A=E5=8E=BB=E9=99=A4alertMessag?=
 =?UTF-8?q?e=20state=20=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/table/alert/alertMessageTable.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
index eaba524bd..b9cd9caeb 100644
--- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
@@ -228,7 +228,7 @@ export default {
           prop: 'startAt',
           show: false,
           width: 150,
-          sortable: 'custom'
+          // sortable: 'custom'
         }, {
           label: this.$t('alert.lastAt'),
           prop: 'lastAt',

From c0921fd8507ed68ec3f5d1d9b1a95ed11a3c8c92 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 2 Mar 2022 18:27:54 +0800
Subject: [PATCH 10/65] =?UTF-8?q?fix=EF=BC=9A=E5=8E=BB=E9=99=A4=20alertmes?=
 =?UTF-8?q?sage=20state=E7=9A=84=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/table/alert/alertMessageTable.vue   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
index b9cd9caeb..94c1bb53b 100644
--- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
@@ -222,13 +222,13 @@ export default {
           prop: 'state',
           show: true,
           width: 100,
-          sortable: 'custom'
+          // sortable: 'custom'
         }, {
           label: this.$t('alert.startAt'),
           prop: 'startAt',
           show: false,
           width: 150,
-          // sortable: 'custom'
+          sortable: 'custom'
         }, {
           label: this.$t('alert.lastAt'),
           prop: 'lastAt',

From 0ae42c50fd900ed4485c0d20e47ce2a46901af4e Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 2 Mar 2022 18:29:02 +0800
Subject: [PATCH 11/65] =?UTF-8?q?fix=EF=BC=9A=E5=8E=BB=E9=99=A4=20alertMes?=
 =?UTF-8?q?sage=20lastAt=E7=9A=84=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/table/alert/alertMessageTable.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
index 94c1bb53b..5cf3cbe9d 100644
--- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
@@ -234,7 +234,7 @@ export default {
           prop: 'lastAt',
           show: true,
           width: 150,
-          sortable: 'custom'
+          // sortable: 'custom'
         }, {
           label: this.$t('config.terminallog.duration'),
           prop: 'duration',

From c429a830f2d3367e07e61931b2bcf83346735675 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 3 Mar 2022 09:54:59 +0800
Subject: [PATCH 12/65] =?UTF-8?q?fix=EF=BC=9AalertMessage=20=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=88=9D=E5=A7=8B=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/bottomBox/tabs/alertMessageTabNew.vue   | 4 ++--
 .../src/components/common/table/alert/alertMessageTable.vue   | 2 +-
 nezha-fronted/src/components/page/alert/alertMessage.vue      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index 9286bc6bc..7ec3cc780 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -16,7 +16,7 @@
     >
       <template v-slot:title><span :title="obj.name">{{obj.name}}</span></template>
       <template v-slot:top-tool-right>
-        <el-select v-model="state" class="margin-r-10" size="small" value-key="value" @change="getTableData" popper-class="right-box-select-top right-public-box-dropdown-top" style="width: 100px">
+        <el-select v-model="state" class="margin-r-10" size="small" value-key="value" @change="getTableData" popper-class="right-box-select-top right-public-box-dropdown-top" style="width: 110px">
           <el-option v-for="item in stateOptions" :key="item.value" :label="$t(item.label)" :value="item.value"></el-option>
         </el-select>
         <pick-time v-model="searchTimeHeader" :default-pick="8" :refresh-data-func="getTableData" :show-empty="true" :use-chart-unit="false" :use-refresh="false"></pick-time>
@@ -162,7 +162,7 @@ export default {
       stateOptions: alertMessageConstant.states,
       url: 'alert/message',
       tableId: 'alertMessageModule', // 需要分页的table的id，用于记录每页数量
-      state: '',
+      state: '1',
       blankSilenceObject: {
         id: '',
         startAt: '',
diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
index 5cf3cbe9d..94c1bb53b 100644
--- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
@@ -234,7 +234,7 @@ export default {
           prop: 'lastAt',
           show: true,
           width: 150,
-          // sortable: 'custom'
+          sortable: 'custom'
         }, {
           label: this.$t('config.terminallog.duration'),
           prop: 'duration',
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index 257f64f09..d4b523183 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -12,7 +12,7 @@
       v-loading="tools.loading"
     >
       <template v-slot:top-tool-right>
-        <el-select v-model="state" class="margin-r-10" size="small" value-key="value" @change="getTableData" popper-class="right-box-select-top right-public-box-dropdown-top">
+        <el-select v-model="state" class="margin-r-10" size="small" value-key="value" @change="getTableData" popper-class="right-box-select-top right-public-box-dropdown-top" style="width: 100px">
           <el-option v-for="item in stateOptions" :key="item.value" :label="$t(item.label)" :value="item.value"></el-option>
         </el-select>
         <button id="asset-filter" :class="[dataListLayout.indexOf('clickSearch') > -1?'is-focus':'' ]" class="top-tool-btn margin-r-10" @click.stop="showClickSearch">
@@ -180,7 +180,7 @@ export default {
       alertMessageNzTableHeightOffset: 242,
       stateOptions: alertMessageConstant.states,
       dataListLayout: localStorage.getItem('dataList-layout' + 'alertMessageTable') ? JSON.parse(localStorage.getItem('dataList-layout' + 'alertMessageTable')) : ['searchInput', 'elementSet', 'clickSearch', 'pagination'],
-      state: '',
+      state: '1',
       dialogShowText: false,
       dialogText: '',
       url: 'alert/message',

From b207be0d3bdf02a1ca9d7f40508ff47b6bf4bac6 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 3 Mar 2022 14:06:35 +0800
Subject: [PATCH 13/65] =?UTF-8?q?NEZ-1625=20fix=EF=BC=9AProjects=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=97=B6=E4=BF=9D=E5=AD=98=E6=8A=A5=E9=94=99=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=8C=85=E5=90=AB=E7=89=B9=E6=AE=8A=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/js/validate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/js/validate.js b/nezha-fronted/src/components/common/js/validate.js
index 7c97e78f6..d4a977ae5 100644
--- a/nezha-fronted/src/components/common/js/validate.js
+++ b/nezha-fronted/src/components/common/js/validate.js
@@ -77,7 +77,7 @@ export function nzNumber (rule, value, callback) {
 
 export function noSpecialChar (rule, value, callback) {
   // eslint-disable-next-line no-control-regex
-  const charReg = /^\w[\u0000-\uFFFF]*$/
+  const charReg = /^\S[\u0000-\uFFFF]*$/
   /// ^\S[\u0000-\uFFFF]*$/
   setTimeout(() => {
     if (!value) {

From 6211b305a82c261128f5f0fa41a712bcc5a4a817 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 3 Mar 2022 14:41:53 +0800
Subject: [PATCH 14/65] =?UTF-8?q?NEZ-1627=20fix=EF=BC=9AAPM=20setting=20se?=
 =?UTF-8?q?cret=20key=20=E8=BE=93=E5=85=A5=E6=A1=86=E6=94=B9=E4=B8=BA=20pa?=
 =?UTF-8?q?ssword?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/page/config/monitor.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/page/config/monitor.vue b/nezha-fronted/src/components/page/config/monitor.vue
index 05cd681dc..b92b6e76c 100644
--- a/nezha-fronted/src/components/page/config/monitor.vue
+++ b/nezha-fronted/src/components/page/config/monitor.vue
@@ -55,7 +55,7 @@
               </el-input>
             </el-form-item>
             <el-form-item :label="$t('config.system.monitor.metrics_storage_s3_secret_access_key')" prop="metrics_storage_s3_secret_access_key" :rules=" [ { required: monitor.metrics_storage_type == 2, message: this.$t('validate.required'), trigger: 'blur' }]" class="monitorLastEle">
-              <el-input v-model="monitor.metrics_storage_s3_secret_access_key" id="monitor-metrics_storage_s3_secret_access_key">
+              <el-input v-model="monitor.metrics_storage_s3_secret_access_key" id="monitor-metrics_storage_s3_secret_access_key" type="password">
               </el-input>
             </el-form-item>
           </div>
@@ -91,7 +91,7 @@
               </el-input>
             </el-form-item>
             <el-form-item :label="$t('config.system.monitor.logs_storage_s3_secret_access_key')" prop="logs_storage_s3_secret_access_key" :rules=" [ { required: monitor.logs_storage_type == 2, message: this.$t('validate.required'), trigger: 'blur' }]" class="monitorLastEle">
-              <el-input v-model="monitor.logs_storage_s3_secret_access_key" id="monitor-logs_storage_s3_secret_access_key">
+              <el-input v-model="monitor.logs_storage_s3_secret_access_key" id="monitor-logs_storage_s3_secret_access_key" type="password">
               </el-input>
             </el-form-item>
           </div>

From eb9f84dda73b334218a1bb710897081edfea9049 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 3 Mar 2022 15:01:32 +0800
Subject: [PATCH 15/65] =?UTF-8?q?NEZ-1626=20fix=EF=BC=9A=20Projects?=
 =?UTF-8?q?=E5=86=85=E6=89=A9=E5=B1=95=E5=9B=BE=E6=8E=92=E7=89=88=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E6=98=BE=E7=A4=BA=E4=BD=8D=E7=BD=AE=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/css/components/common/project/L5/CanvasProps.scss    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/assets/css/components/common/project/L5/CanvasProps.scss b/nezha-fronted/src/assets/css/components/common/project/L5/CanvasProps.scss
index 30c04b673..d8833a65d 100644
--- a/nezha-fronted/src/assets/css/components/common/project/L5/CanvasProps.scss
+++ b/nezha-fronted/src/assets/css/components/common/project/L5/CanvasProps.scss
@@ -1,6 +1,6 @@
 .props-box label {
   line-height: 32px;
-  width: 100px;
+  width: 120px;
   font-size: 14px;
   text-align: right;
 }

From 5e8964932ff518c471be30b5a1e25424e03114b7 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 3 Mar 2022 17:35:42 +0800
Subject: [PATCH 16/65] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=8E=92=E5=BA=8F=20=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=80=89=E4=B8=AD=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/bottomBox/tabs/alertMessageTabNew.vue | 2 ++
 .../src/components/common/bottomBox/tabs/alertRuleEvalLog.vue   | 2 ++
 .../src/components/common/bottomBox/tabs/assetSubTab.vue        | 2 ++
 nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue | 2 ++
 .../src/components/common/bottomBox/tabs/cabinetTab.vue         | 2 ++
 .../src/components/common/bottomBox/tabs/endpointTabNew.vue     | 2 ++
 .../src/components/common/bottomBox/tabs/operationLogTab.vue    | 2 ++
 .../src/components/common/bottomBox/tabs/terminalLogTab.vue     | 2 ++
 nezha-fronted/src/components/page/alert/alertMessage.vue        | 2 ++
 nezha-fronted/src/components/page/alert/alertRule.vue           | 2 ++
 nezha-fronted/src/components/page/alert/alertSilence.vue        | 2 ++
 nezha-fronted/src/components/page/config/assetMeta.vue          | 2 ++
 nezha-fronted/src/components/page/config/assetState.vue         | 2 ++
 nezha-fronted/src/components/page/config/operationRecord.vue    | 2 ++
 nezha-fronted/src/components/page/config/template/chartTemp.vue | 2 ++
 nezha-fronted/src/components/page/config/terminalLog.vue        | 2 ++
 nezha-fronted/src/components/page/monitor/module/moduleList.vue | 2 ++
 .../src/components/page/monitor/project/projectList.vue         | 2 ++
 18 files changed, 36 insertions(+)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index 7ec3cc780..2f92405b1 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -293,6 +293,8 @@ export default {
       }
       if (this.orderBy) {
         this.$set(this.searchLabel, 'orderBy', this.orderBy)
+      } else {
+        delete this.searchLabel.orderBy
       }
       this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
       this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertRuleEvalLog.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertRuleEvalLog.vue
index 0e9c6fac7..1d62ec17c 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertRuleEvalLog.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertRuleEvalLog.vue
@@ -92,6 +92,8 @@ export default {
       }
       if (this.orderBy) {
         this.$set(this.searchLabel, 'orderBy', this.orderBy)
+      } else {
+        delete this.searchLabel.orderBy
       }
       this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
       this.$set(this.searchLabel, 'pageSize', -1)
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue
index a984ca413..597061fbf 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue
@@ -223,6 +223,8 @@ export default {
       }
       if (this.orderBy) {
         this.$set(this.searchLabel, 'orderBy', this.orderBy)
+      } else {
+        delete this.searchLabel.orderBy
       }
       this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
       this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue
index 0e62cb17b..e7068ba4c 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue
@@ -226,6 +226,8 @@ export default {
       }
       if (this.orderBy) {
         this.$set(this.searchLabel, 'orderBy', this.orderBy)
+      } else {
+        delete this.searchLabel.orderBy
       }
       this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
       this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
index bfe0a5a90..78276c433 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
@@ -135,6 +135,8 @@ export default {
       }
       if (this.orderBy) {
         this.$set(this.searchLabel, 'orderBy', this.orderBy)
+      } else {
+        delete this.searchLabel.orderBy
       }
       this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
       this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue
index 94127793a..1df5e606a 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue
@@ -119,6 +119,8 @@ export default {
     getTableData () {
       if (this.orderBy) {
         this.$set(this.searchLabel, 'orderBy', this.orderBy)
+      } else {
+        delete this.searchLabel.orderBy
       }
       const params = {
         ...this.searchLabel,
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/operationLogTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/operationLogTab.vue
index 24a3c8634..a509dc76f 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/operationLogTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/operationLogTab.vue
@@ -125,6 +125,8 @@ export default {
       }
       if (this.orderBy) {
         this.$set(this.searchLabel, 'orderBy', this.orderBy)
+      } else {
+        delete this.searchLabel.orderBy
       }
       this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
       this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue
index 5425f4a13..f8102618a 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue
@@ -129,6 +129,8 @@ export default {
       }
       if (this.orderBy) {
         this.$set(this.searchLabel, 'orderBy', this.orderBy)
+      } else {
+        delete this.searchLabel.orderBy
       }
       this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
       this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index d4b523183..08722bf22 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -737,6 +737,8 @@ export default {
       }
       if (this.orderBy) {
         this.$set(this.searchLabel, 'orderBy', this.orderBy)
+      } else {
+        delete this.searchLabel.orderBy
       }
       this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
       this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
diff --git a/nezha-fronted/src/components/page/alert/alertRule.vue b/nezha-fronted/src/components/page/alert/alertRule.vue
index c6027a563..95b3a2b95 100644
--- a/nezha-fronted/src/components/page/alert/alertRule.vue
+++ b/nezha-fronted/src/components/page/alert/alertRule.vue
@@ -263,6 +263,8 @@ export default {
     getTableData () {
       if (this.orderBy) {
         this.$set(this.searchLabel, 'orderBy', this.orderBy)
+      } else {
+        delete this.searchLabel.orderBy
       }
       this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
       this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
diff --git a/nezha-fronted/src/components/page/alert/alertSilence.vue b/nezha-fronted/src/components/page/alert/alertSilence.vue
index 23a4ee30c..b27f88845 100644
--- a/nezha-fronted/src/components/page/alert/alertSilence.vue
+++ b/nezha-fronted/src/components/page/alert/alertSilence.vue
@@ -168,6 +168,8 @@ export default {
       }
       if (this.orderBy) {
         this.$set(this.searchLabel, 'orderBy', this.orderBy)
+      } else {
+        delete this.searchLabel.orderBy
       }
       this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
       this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
diff --git a/nezha-fronted/src/components/page/config/assetMeta.vue b/nezha-fronted/src/components/page/config/assetMeta.vue
index 30098f3b1..4edd0f974 100644
--- a/nezha-fronted/src/components/page/config/assetMeta.vue
+++ b/nezha-fronted/src/components/page/config/assetMeta.vue
@@ -185,6 +185,8 @@ export default {
     getTableData () {
       if (this.orderBy) {
         this.$set(this.searchLabel, 'orderBy', this.orderBy)
+      } else {
+        delete this.searchLabel.orderBy
       }
       this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
       this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
diff --git a/nezha-fronted/src/components/page/config/assetState.vue b/nezha-fronted/src/components/page/config/assetState.vue
index 73f9557d7..d843f3fba 100644
--- a/nezha-fronted/src/components/page/config/assetState.vue
+++ b/nezha-fronted/src/components/page/config/assetState.vue
@@ -197,6 +197,8 @@ export default {
     getTableData () {
       if (this.orderBy) {
         this.$set(this.searchLabel, 'orderBy', this.orderBy)
+      } else {
+        delete this.searchLabel.orderBy
       }
       this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
       this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
diff --git a/nezha-fronted/src/components/page/config/operationRecord.vue b/nezha-fronted/src/components/page/config/operationRecord.vue
index e7773b73a..a68c3874e 100644
--- a/nezha-fronted/src/components/page/config/operationRecord.vue
+++ b/nezha-fronted/src/components/page/config/operationRecord.vue
@@ -116,6 +116,8 @@ export default {
     getTableData () {
       if (this.orderBy) {
         this.$set(this.searchLabel, 'orderBy', this.orderBy)
+      } else {
+        delete this.searchLabel.orderBy
       }
       this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
       this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
diff --git a/nezha-fronted/src/components/page/config/template/chartTemp.vue b/nezha-fronted/src/components/page/config/template/chartTemp.vue
index 8f80ede8f..0317e4b58 100644
--- a/nezha-fronted/src/components/page/config/template/chartTemp.vue
+++ b/nezha-fronted/src/components/page/config/template/chartTemp.vue
@@ -275,6 +275,8 @@ export default {
       }
       if (this.orderBy) {
         this.$set(this.searchLabel, 'orderBy', this.orderBy)
+      } else {
+        delete this.searchLabel.orderBy
       }
       this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
       this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
diff --git a/nezha-fronted/src/components/page/config/terminalLog.vue b/nezha-fronted/src/components/page/config/terminalLog.vue
index 4e06f3c4a..a5d734e4b 100644
--- a/nezha-fronted/src/components/page/config/terminalLog.vue
+++ b/nezha-fronted/src/components/page/config/terminalLog.vue
@@ -170,6 +170,8 @@ export default {
     getTableData () {
       if (this.orderBy) {
         this.$set(this.searchLabel, 'orderBy', this.orderBy)
+      } else {
+        delete this.searchLabel.orderBy
       }
       const params = {
         ...this.searchLabel,
diff --git a/nezha-fronted/src/components/page/monitor/module/moduleList.vue b/nezha-fronted/src/components/page/monitor/module/moduleList.vue
index 0367dc179..e1082e84a 100644
--- a/nezha-fronted/src/components/page/monitor/module/moduleList.vue
+++ b/nezha-fronted/src/components/page/monitor/module/moduleList.vue
@@ -385,6 +385,8 @@ export default {
     getTableData () {
       if (this.orderBy) {
         this.$set(this.searchLabel, 'orderBy', this.orderBy)
+      } else {
+        delete this.searchLabel.orderBy
       }
       this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
       this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
diff --git a/nezha-fronted/src/components/page/monitor/project/projectList.vue b/nezha-fronted/src/components/page/monitor/project/projectList.vue
index 0bb29ef11..e53c347de 100644
--- a/nezha-fronted/src/components/page/monitor/project/projectList.vue
+++ b/nezha-fronted/src/components/page/monitor/project/projectList.vue
@@ -128,6 +128,8 @@ export default {
       }
       if (this.orderBy) {
         this.$set(this.searchLabel, 'orderBy', this.orderBy)
+      } else {
+        delete this.searchLabel.orderBy
       }
       this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
       this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)

From be959ad26bbbea99edacda4cfebc78eb29e526f1 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 4 Mar 2022 13:59:25 +0800
Subject: [PATCH 17/65] =?UTF-8?q?NEZ-1631=20fix=EF=BC=9A=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E9=BB=98=E8=AE=A4=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E5=88=9D=E5=A7=8B=E5=8C=96=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/App.vue                              |  7 ++++---
 nezha-fronted/src/components/common/mixin/dataList.js  | 10 +++++++---
 nezha-fronted/src/components/common/mixin/table.js     |  8 +++++---
 .../common/table/alert/alertMessageTable.vue           |  1 +
 .../components/common/table/alert/alertRuleTable.vue   |  1 +
 .../common/table/alert/alertSilenceTable.vue           |  1 +
 .../components/common/table/asset/assetMetaTable.vue   |  1 +
 .../components/common/table/settings/agentTable.vue    |  1 +
 .../common/table/settings/chartTmplTable.vue           |  1 +
 .../src/components/common/table/settings/dcTable.vue   |  1 +
 .../components/common/table/settings/endpointTable.vue |  1 +
 .../components/common/table/settings/exprTmplTable.vue |  1 +
 .../components/common/table/settings/modelTable.vue    |  1 +
 .../components/common/table/settings/moduleTable.vue   |  1 +
 .../common/table/settings/operationLogTable.vue        |  1 +
 .../components/common/table/settings/projectTable.vue  |  1 +
 .../src/components/common/table/settings/roleTable.vue |  1 +
 .../common/table/settings/terminalLogTable.vue         |  1 +
 .../src/components/common/table/settings/userTable.vue |  1 +
 .../src/components/page/alert/alertMessage.vue         |  1 +
 nezha-fronted/src/components/page/alert/alertRule.vue  |  1 +
 .../src/components/page/alert/alertSilence.vue         |  1 +
 nezha-fronted/src/components/page/asset/asset.vue      |  9 +++++----
 nezha-fronted/src/components/page/config/agent.vue     |  1 +
 nezha-fronted/src/components/page/config/assetMeta.vue |  1 +
 nezha-fronted/src/components/page/config/assetType.vue |  1 +
 nezha-fronted/src/components/page/config/dc.vue        |  1 +
 nezha-fronted/src/components/page/config/model.vue     |  1 +
 .../src/components/page/config/operationLog.vue        |  1 +
 nezha-fronted/src/components/page/config/roles.vue     |  1 +
 .../src/components/page/config/template/chartTemp.vue  |  1 +
 .../src/components/page/config/template/exprTemp.vue   |  1 +
 .../src/components/page/config/terminalLog.vue         |  1 +
 nezha-fronted/src/components/page/config/user.vue      |  1 +
 .../components/page/monitor/endpoint/endpointList.vue  |  1 +
 .../src/components/page/monitor/module/moduleList.vue  |  1 +
 .../components/page/monitor/project/projectList.vue    |  1 +
 37 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/nezha-fronted/src/App.vue b/nezha-fronted/src/App.vue
index 10330bb29..13caa42e9 100644
--- a/nezha-fronted/src/App.vue
+++ b/nezha-fronted/src/App.vue
@@ -15,9 +15,6 @@ export default {
     browserWindowZoom
   },
   async created () {
-    if (window.outerWidth <= 1024) { // outerWidth 获取设备宽度
-      document.querySelector('meta[name=viewport]').setAttribute('content', `width=device-width, initial-scale=${window.outerWidth / (1024 * window.devicePixelRatio)}, maximum-scale=1.0, user-scalable=0`)
-    }
     const herfSpiltArr = window.location.href.split('/')
     if (herfSpiltArr[3] !== '#') {
       herfSpiltArr[3] = '#'
@@ -28,6 +25,7 @@ export default {
     const result = await this.$http.get(url)
     this.$axios.defaults.baseURL = result.body.baseUrl
     const version = result.body.version
+    const defaultWindowWidth = result.body.width || 1024
     if (version !== localStorage.getItem('nz-version')) {
       localStorage.clear()
       localStorage.clear()
@@ -35,6 +33,9 @@ export default {
       herfSpiltArr[2] = herfSpiltArr[2] + '?t=' + new Date().getTime()
       window.location.href = herfSpiltArr[0] + '//' + herfSpiltArr[2]
     }
+    if (window.outerWidth <= defaultWindowWidth) { // outerWidth 获取设备宽度
+      document.querySelector('meta[name=viewport]').setAttribute('content', `width=device-width, initial-scale=${window.outerWidth / (defaultWindowWidth * window.devicePixelRatio)}, maximum-scale=1.0, user-scalable=0`)
+    }
   }
 }
 </script>
diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js
index b7b02279a..4f1732faa 100644
--- a/nezha-fronted/src/components/common/mixin/dataList.js
+++ b/nezha-fronted/src/components/common/mixin/dataList.js
@@ -105,9 +105,9 @@ export default {
           if (this.needAlertDaysData) {
             response.data.list.forEach(item => {
               item.trendLoading = true
-              item.left= 0
-              item.top= 0
-              item.alertNumtooltipShow= false
+              item.left = 0
+              item.top = 0
+              item.alertNumtooltipShow = false
               item.alertDaysData = [
                 {
                   metric: { priority: 'P1' },
@@ -337,6 +337,10 @@ export default {
   },
   created () {
     const path = this.$route.fullPath.match(/\/(\S*)\?/)[1]
+    if (this.$route.query.orderBy) {
+      this.orderBy = this.$route.query.orderBy
+      console.log('asdasdadsadsa')
+    }
     let searchKeys = {}
     if (path === 'dc') {
       searchKeys = {
diff --git a/nezha-fronted/src/components/common/mixin/table.js b/nezha-fronted/src/components/common/mixin/table.js
index 5be856c43..cfc5a597c 100644
--- a/nezha-fronted/src/components/common/mixin/table.js
+++ b/nezha-fronted/src/components/common/mixin/table.js
@@ -26,7 +26,7 @@ export default {
   data () {
     return {
       operationWidth: '165', // 操作列宽
-      orderBy: {},
+      orderBy: null,
       severityDataWeight: this.$store.getters.severityDataWeight
     }
   },
@@ -131,10 +131,12 @@ export default {
         if (n) {
           const index = n.indexOf('-')
           if (index !== -1) {
-            this.orderBy[n.slice(index + 1)] = 'descending'
+            this.orderBy = { prop: n.slice(index + 1), order: 'descending' }
           } else {
-            this.orderBy[n] = 'descending'
+            this.orderBy = { prop: n, order: 'ascending' }
           }
+          // this.orderBy = JSON.parse(JSON.stringify(this.orderBy))
+          console.log(n, this.orderBy)
         }
       }
     },
diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
index 94c1bb53b..de6a974c6 100644
--- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
@@ -8,6 +8,7 @@
       :data="tableData"
       :height="height"
       border
+      :default-sort="orderBy"
       @header-dragend="dragend"
       @sort-change="tableDataSort"
       @selection-change="selectionChange"
diff --git a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
index 338f5ba95..131ff72dc 100644
--- a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
@@ -6,6 +6,7 @@
     :height="height"
     tooltip-effect="light"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"
diff --git a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
index 831084023..505b924ba 100644
--- a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"
diff --git a/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue b/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue
index f6af0510a..31554b87d 100644
--- a/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue
@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"
diff --git a/nezha-fronted/src/components/common/table/settings/agentTable.vue b/nezha-fronted/src/components/common/table/settings/agentTable.vue
index 526f7d71a..760e6e41f 100644
--- a/nezha-fronted/src/components/common/table/settings/agentTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/agentTable.vue
@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"
diff --git a/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue b/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue
index d81f3f347..db05f5a38 100644
--- a/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue
@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"
diff --git a/nezha-fronted/src/components/common/table/settings/dcTable.vue b/nezha-fronted/src/components/common/table/settings/dcTable.vue
index 18bcc102d..1669840b1 100644
--- a/nezha-fronted/src/components/common/table/settings/dcTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/dcTable.vue
@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"
diff --git a/nezha-fronted/src/components/common/table/settings/endpointTable.vue b/nezha-fronted/src/components/common/table/settings/endpointTable.vue
index 9437c3910..45c252000 100644
--- a/nezha-fronted/src/components/common/table/settings/endpointTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/endpointTable.vue
@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"
diff --git a/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue b/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue
index bc909bee4..a5503fae5 100644
--- a/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue
@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"
diff --git a/nezha-fronted/src/components/common/table/settings/modelTable.vue b/nezha-fronted/src/components/common/table/settings/modelTable.vue
index 8f8952b1c..86afd065b 100644
--- a/nezha-fronted/src/components/common/table/settings/modelTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/modelTable.vue
@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"
diff --git a/nezha-fronted/src/components/common/table/settings/moduleTable.vue b/nezha-fronted/src/components/common/table/settings/moduleTable.vue
index 61d83bde5..693d21aa1 100644
--- a/nezha-fronted/src/components/common/table/settings/moduleTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/moduleTable.vue
@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"
diff --git a/nezha-fronted/src/components/common/table/settings/operationLogTable.vue b/nezha-fronted/src/components/common/table/settings/operationLogTable.vue
index 6c0d8b42c..54a39f284 100644
--- a/nezha-fronted/src/components/common/table/settings/operationLogTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/operationLogTable.vue
@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     class="no-operation"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
diff --git a/nezha-fronted/src/components/common/table/settings/projectTable.vue b/nezha-fronted/src/components/common/table/settings/projectTable.vue
index a43350c32..69255da5a 100644
--- a/nezha-fronted/src/components/common/table/settings/projectTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/projectTable.vue
@@ -6,6 +6,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"
diff --git a/nezha-fronted/src/components/common/table/settings/roleTable.vue b/nezha-fronted/src/components/common/table/settings/roleTable.vue
index 4eafe72ff..5d685c702 100644
--- a/nezha-fronted/src/components/common/table/settings/roleTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/roleTable.vue
@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"
diff --git a/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue b/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue
index baaf935f4..abcbab9c5 100644
--- a/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue
@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"
diff --git a/nezha-fronted/src/components/common/table/settings/userTable.vue b/nezha-fronted/src/components/common/table/settings/userTable.vue
index 96fff508a..59abdb306 100644
--- a/nezha-fronted/src/components/common/table/settings/userTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/userTable.vue
@@ -6,6 +6,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index 08722bf22..fbbee775f 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -31,6 +31,7 @@
       <template v-slot:default="slotProps">
         <alert-message-table
           ref="dataTable"
+          :orderByFa="orderBy"
           :api="url"
           :custom-table-title="tools.customTableTitle"
           :height="mainTableHeight"
diff --git a/nezha-fronted/src/components/page/alert/alertRule.vue b/nezha-fronted/src/components/page/alert/alertRule.vue
index 95b3a2b95..da5cd19eb 100644
--- a/nezha-fronted/src/components/page/alert/alertRule.vue
+++ b/nezha-fronted/src/components/page/alert/alertRule.vue
@@ -109,6 +109,7 @@
       <template v-slot:default="slotProps">
         <alert-rule-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"
diff --git a/nezha-fronted/src/components/page/alert/alertSilence.vue b/nezha-fronted/src/components/page/alert/alertSilence.vue
index b27f88845..7c7facbf7 100644
--- a/nezha-fronted/src/components/page/alert/alertSilence.vue
+++ b/nezha-fronted/src/components/page/alert/alertSilence.vue
@@ -19,6 +19,7 @@
       <template v-slot:default="slotProps">
         <alert-silence-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 85900e029..ddcac1ff9 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -719,9 +719,9 @@ export default {
           if (this.needAlertDaysData) {
             response.data.list.forEach(item => {
               item.trendLoading = true
-              item.left= 0
-              item.top= 0
-              item.alertNumtooltipShow= false
+              item.left = 0
+              item.top = 0
+              item.alertNumtooltipShow = false
               item.alertDaysData = [
                 {
                   metric: { priority: 'P1' },
@@ -739,6 +739,7 @@ export default {
             })
           }
           this.tableData = response.data.list
+          console.log(this.$refs.dataTable.$refs.dataTable)
           const globalSearchId = this.$store.getters.getGlobalSearchId
           let detailViewRightObj = ''
           if (globalSearchId) {
@@ -749,7 +750,7 @@ export default {
           this.detailViewRightObj = detailViewRightObj
           this.pageObj.total = response.data.total
           this.pageObj.pages = response.data.pages
-          if (!this.scrollbarWrap && this.$refs.dataTable&& this.$refs.dataTable.$refs.dataTable) {
+          if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) {
             this.$nextTick(() => {
               this.scrollbarWrap = this.$refs.dataTable.$refs.dataTable.bodyWrapper
               this.toTopBtnHandler(this.scrollbarWrap)
diff --git a/nezha-fronted/src/components/page/config/agent.vue b/nezha-fronted/src/components/page/config/agent.vue
index daede046a..a554dc845 100644
--- a/nezha-fronted/src/components/page/config/agent.vue
+++ b/nezha-fronted/src/components/page/config/agent.vue
@@ -22,6 +22,7 @@
       <template v-slot:default="slotProps">
         <agent-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"
diff --git a/nezha-fronted/src/components/page/config/assetMeta.vue b/nezha-fronted/src/components/page/config/assetMeta.vue
index 4edd0f974..a97adf187 100644
--- a/nezha-fronted/src/components/page/config/assetMeta.vue
+++ b/nezha-fronted/src/components/page/config/assetMeta.vue
@@ -40,6 +40,7 @@
       <template v-slot:default="slotProps">
         <asset-meta-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"
diff --git a/nezha-fronted/src/components/page/config/assetType.vue b/nezha-fronted/src/components/page/config/assetType.vue
index 06e1f3f78..407eae086 100644
--- a/nezha-fronted/src/components/page/config/assetType.vue
+++ b/nezha-fronted/src/components/page/config/assetType.vue
@@ -19,6 +19,7 @@
       <template v-slot="slotProps">
         <asset-type-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"
diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue
index b6692a894..ff392b5d5 100644
--- a/nezha-fronted/src/components/page/config/dc.vue
+++ b/nezha-fronted/src/components/page/config/dc.vue
@@ -115,6 +115,7 @@
       <template v-slot:default="slotProps">
         <dc-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"
diff --git a/nezha-fronted/src/components/page/config/model.vue b/nezha-fronted/src/components/page/config/model.vue
index 79020bbda..dc540e2a6 100644
--- a/nezha-fronted/src/components/page/config/model.vue
+++ b/nezha-fronted/src/components/page/config/model.vue
@@ -41,6 +41,7 @@
       <template v-slot="slotProps">
         <model-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"
diff --git a/nezha-fronted/src/components/page/config/operationLog.vue b/nezha-fronted/src/components/page/config/operationLog.vue
index dc67c4d9b..b7c91a0b9 100644
--- a/nezha-fronted/src/components/page/config/operationLog.vue
+++ b/nezha-fronted/src/components/page/config/operationLog.vue
@@ -11,6 +11,7 @@
       <template v-slot:default="slotProps">
         <operation-log-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"
diff --git a/nezha-fronted/src/components/page/config/roles.vue b/nezha-fronted/src/components/page/config/roles.vue
index 60405825f..fa29cb664 100644
--- a/nezha-fronted/src/components/page/config/roles.vue
+++ b/nezha-fronted/src/components/page/config/roles.vue
@@ -19,6 +19,7 @@
       <template v-slot:default="slotProps">
         <role-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"
diff --git a/nezha-fronted/src/components/page/config/template/chartTemp.vue b/nezha-fronted/src/components/page/config/template/chartTemp.vue
index 0317e4b58..601038d42 100644
--- a/nezha-fronted/src/components/page/config/template/chartTemp.vue
+++ b/nezha-fronted/src/components/page/config/template/chartTemp.vue
@@ -46,6 +46,7 @@
       <template  v-slot="slotProps">
         <chartTmplTable
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"
diff --git a/nezha-fronted/src/components/page/config/template/exprTemp.vue b/nezha-fronted/src/components/page/config/template/exprTemp.vue
index 113c4d5c8..e302a7c4e 100644
--- a/nezha-fronted/src/components/page/config/template/exprTemp.vue
+++ b/nezha-fronted/src/components/page/config/template/exprTemp.vue
@@ -38,6 +38,7 @@
       <template v-slot:default="slotProps">
         <expr-tmpl-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"
diff --git a/nezha-fronted/src/components/page/config/terminalLog.vue b/nezha-fronted/src/components/page/config/terminalLog.vue
index a5d734e4b..464e0025a 100644
--- a/nezha-fronted/src/components/page/config/terminalLog.vue
+++ b/nezha-fronted/src/components/page/config/terminalLog.vue
@@ -67,6 +67,7 @@
       <template v-slot:default="slotProps">
         <terminal-log-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"
diff --git a/nezha-fronted/src/components/page/config/user.vue b/nezha-fronted/src/components/page/config/user.vue
index bbb228a7e..240b51e86 100644
--- a/nezha-fronted/src/components/page/config/user.vue
+++ b/nezha-fronted/src/components/page/config/user.vue
@@ -73,6 +73,7 @@
       <template v-slot="slotProps">
         <user-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"
diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
index c49a474f5..34484ec54 100644
--- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
+++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
@@ -127,6 +127,7 @@
         <endpoint-table
           ref="dataTable"
            v-loading="tools.loading"
+          :orderByFa="orderBy"
           :loading="tools.loading"
           :api="url"
           :custom-table-title="tools.customTableTitle"
diff --git a/nezha-fronted/src/components/page/monitor/module/moduleList.vue b/nezha-fronted/src/components/page/monitor/module/moduleList.vue
index e1082e84a..f79ede9c3 100644
--- a/nezha-fronted/src/components/page/monitor/module/moduleList.vue
+++ b/nezha-fronted/src/components/page/monitor/module/moduleList.vue
@@ -112,6 +112,7 @@
         <module-table
           ref="dataTable"
           v-loading="tools.loading"
+          :orderByFa="orderBy"
           :loading="tools.loading"
           :api="url"
           :tableId="tableId"
diff --git a/nezha-fronted/src/components/page/monitor/project/projectList.vue b/nezha-fronted/src/components/page/monitor/project/projectList.vue
index e53c347de..4cc6e8f1b 100644
--- a/nezha-fronted/src/components/page/monitor/project/projectList.vue
+++ b/nezha-fronted/src/components/page/monitor/project/projectList.vue
@@ -20,6 +20,7 @@
       <template v-slot="slotProps">
         <project-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"

From 804d67b74fce20bd6912acfc2c4553fc2d6b34ee Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 4 Mar 2022 14:03:49 +0800
Subject: [PATCH 18/65] =?UTF-8?q?fix=EF=BC=9A=E9=BB=98=E8=AE=A4=E9=AB=98?=
 =?UTF-8?q?=E4=BA=AEid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/mixin/dataList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js
index 4f1732faa..208f5f19c 100644
--- a/nezha-fronted/src/components/common/mixin/dataList.js
+++ b/nezha-fronted/src/components/common/mixin/dataList.js
@@ -23,7 +23,7 @@ export default {
         pages: 1,
         total: 0
       },
-      orderBy: '',
+      orderBy: 'id',
       /* 工具参数 */
       tools: {
         loading: true, // 是否显示table加载动画

From 82808b36e3efccb15e967dcbc05d2f40ddc0ba77 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Fri, 4 Mar 2022 14:50:11 +0800
Subject: [PATCH 19/65] =?UTF-8?q?style:=20project=20topology=20=E4=BE=A7?=
 =?UTF-8?q?=E6=BB=91=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../css/components/common/project/L5/popData/common.scss      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/common/project/L5/popData/common.scss b/nezha-fronted/src/assets/css/components/common/project/L5/popData/common.scss
index bfe83e5cc..e8251c934 100644
--- a/nezha-fronted/src/assets/css/components/common/project/L5/popData/common.scss
+++ b/nezha-fronted/src/assets/css/components/common/project/L5/popData/common.scss
@@ -3,11 +3,11 @@
     background: $--background-color-empty;
   }
   .right-box-project-endpoint,.right-box-project-asset {
-    padding-right: 30px;
+    padding-right: 10px;
   }
   .right-box-project-alert {
     width: 850px;
-    padding-right: 30px;
+    padding-right: 10px;
   }
 
   .right-box-title {

From 367a95b78ba14e5847b49e50194d316ffb4175bb Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 7 Mar 2022 09:29:32 +0800
Subject: [PATCH 20/65] =?UTF-8?q?fix=EF=BC=9A=E8=A7=86=E5=9B=BE=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/mixin/detailViewMixin.js   | 12 +++++++-----
 nezha-fronted/src/components/page/asset/asset.vue    |  1 -
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/common/mixin/detailViewMixin.js b/nezha-fronted/src/components/common/mixin/detailViewMixin.js
index 2f039f6e9..df2cc285b 100644
--- a/nezha-fronted/src/components/common/mixin/detailViewMixin.js
+++ b/nezha-fronted/src/components/common/mixin/detailViewMixin.js
@@ -17,9 +17,9 @@ export default {
         return
       }
       // this.$refs.dataList.bottomBox.showSubList = false
-      if (this.orderBy) {
-        this.detailViewRightObj = ''
-      }
+      // if (this.orderBy) {
+      //   this.detailViewRightObj = ''
+      // }
       this.detailType = flag
       let dataList = ''
       localStorage.setItem('detail-view-' + this.tableId, this.detailType)
@@ -66,7 +66,7 @@ export default {
             this.$refs[dataList].$refs.searchInput.searchLabelList = this.$refs.dataList.$refs.searchInput.searchLabelList.filter(item => searchLabel.label !== item.label)
           }
         })
-        if (this.orderBy && this.$refs.dataTable.$refs.dataTable) {
+        if (this.orderBy) {
           const index = this.orderBy.indexOf('-')
           let orderBy = ''
           let orderType = ''
@@ -78,7 +78,9 @@ export default {
             orderBy = this.orderBy
             orderType = 'ascending'
           }
-          this.$refs.dataTable.$refs.dataTable.sort(orderBy, orderType)
+          if (this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) {
+            this.$refs.dataTable.$refs.dataTable.sort(orderBy, orderType)
+          }
         }
       }, 100)
     },
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index ddcac1ff9..0d4e6335f 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -739,7 +739,6 @@ export default {
             })
           }
           this.tableData = response.data.list
-          console.log(this.$refs.dataTable.$refs.dataTable)
           const globalSearchId = this.$store.getters.getGlobalSearchId
           let detailViewRightObj = ''
           if (globalSearchId) {

From 24ed2891354e526e4d84b5d05e4b94e1cb33fbbc Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 7 Mar 2022 09:37:27 +0800
Subject: [PATCH 21/65] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/chart/ChartScreenHeader.vue    |   2 +-
 nezha-fronted/src/components/chart/chart.vue  |   2 +-
 .../src/components/chart/chart/chartPie.vue   |   2 +-
 .../chart/chart/chartTimeSeries.vue           |   4 +-
 .../chart/chart/grid/TestElement.vue          |  32 +++---
 .../chart/chart/grid/aspectRatio.js           | 106 +++++++++---------
 .../chart/chart/options/chartTreemap.js       |   2 +-
 .../components/charts/chart-list-group.vue    |   2 +-
 .../components/common/alert/alertLabel.vue    |   2 +-
 .../src/components/common/alert/nzTooltip.vue |   1 -
 .../bottomBox/tabs/alertMessageTabNew.vue     |   2 +-
 .../bottomBox/tabs/alertRuleEvalLog.vue       |   2 +-
 .../common/bottomBox/tabs/assetSubTab.vue     |   2 +-
 .../common/bottomBox/tabs/assetTab.vue        |   8 +-
 .../common/bottomBox/tabs/cabinetTab.vue      |   8 +-
 .../common/bottomBox/tabs/endpointQuery.vue   |   2 +-
 .../bottomBox/tabs/endpointQueryTab.vue       |   2 +-
 .../common/bottomBox/tabs/endpointTabNew.vue  |   8 +-
 .../common/bottomBox/tabs/operationLogTab.vue |   2 +-
 .../common/bottomBox/tabs/terminalLogTab.vue  |   2 +-
 .../common/filterSearch/filterSearch.vue      |   2 +-
 .../common/globalSearch/searchItemInfo.vue    |   2 +-
 .../common/project/popData/assetTable.vue     |   6 +-
 .../common/project/popData/endpointTable.vue  |   6 +-
 .../common/rightBox/chart/publicConfig.js     |   6 +-
 .../common/table/alert/alertMessageTable.vue  |   4 +-
 .../common/table/special/endpointQueryTab.vue |   4 +-
 .../src/components/page/alert/alertRule.vue   |  10 +-
 .../components/page/alert/alertSilence.vue    |   2 +-
 .../src/components/page/config/assetMeta.vue  |   2 +-
 .../page/config/operationRecord.vue           |   2 +-
 .../page/config/system/systemCommon.js        |   2 +-
 .../page/config/template/chartTemp.vue        |   4 +-
 .../components/page/config/terminalLog.vue    |   2 +-
 .../page/monitor/endpoint/endpointList.vue    |   8 +-
 .../page/monitor/module/moduleList.vue        |   8 +-
 .../page/monitor/project/projectList.vue      |   8 +-
 37 files changed, 135 insertions(+), 136 deletions(-)

diff --git a/nezha-fronted/src/components/chart/ChartScreenHeader.vue b/nezha-fronted/src/components/chart/ChartScreenHeader.vue
index d9a2ca165..682ee7946 100644
--- a/nezha-fronted/src/components/chart/ChartScreenHeader.vue
+++ b/nezha-fronted/src/components/chart/ChartScreenHeader.vue
@@ -58,7 +58,7 @@
 <script>
 import bus from '@/libs/bus'
 import lodash from 'lodash'
-import chartHeaderMixin from "@/components/chart/chartHeaderMixin";
+import chartHeaderMixin from '@/components/chart/chartHeaderMixin'
 export default {
   name: 'ChartScreenHeader',
   mixins: [chartHeaderMixin],
diff --git a/nezha-fronted/src/components/chart/chart.vue b/nezha-fronted/src/components/chart/chart.vue
index 34023cd21..6c678cc05 100644
--- a/nezha-fronted/src/components/chart/chart.vue
+++ b/nezha-fronted/src/components/chart/chart.vue
@@ -261,7 +261,7 @@ export default {
       } else {
         return getOption(this.chartInfo.type)
       }
-    },
+    }
   },
   methods: {
     isTimeSeries,
diff --git a/nezha-fronted/src/components/chart/chart/chartPie.vue b/nezha-fronted/src/components/chart/chart/chartPie.vue
index 20267b9e6..3b8fd0fab 100644
--- a/nezha-fronted/src/components/chart/chart/chartPie.vue
+++ b/nezha-fronted/src/components/chart/chart/chartPie.vue
@@ -157,7 +157,7 @@ export default {
     try {
       this.isStack = this.chartInfo.param.stack
     } catch (e) {}
-    this.chartInfo.loaded &&  this.initChart(this.chartOption)
+    this.chartInfo.loaded && this.initChart(this.chartOption)
   }
 }
 </script>
diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
index de5c081bd..d2b2ad3e1 100644
--- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
@@ -42,7 +42,7 @@ export default {
   data () {
     return {
       stackTotalColor: null,
-      isStack: false,
+      isStack: false
     }
   },
   computed: {
@@ -108,7 +108,7 @@ export default {
       let seriesIndex = 0
       originalDatas.forEach((originalData, expressionIndex) => {
         originalData.forEach((data, dataIndex) => {
-          if (seriesIndex >= this.series.length) {// 只取跟series 一样长度作比较
+          if (seriesIndex >= this.series.length) { // 只取跟series 一样长度作比较
             return
           }
           seriesIndex++
diff --git a/nezha-fronted/src/components/chart/chart/grid/TestElement.vue b/nezha-fronted/src/components/chart/chart/grid/TestElement.vue
index 2868a4b02..f04198a61 100644
--- a/nezha-fronted/src/components/chart/chart/grid/TestElement.vue
+++ b/nezha-fronted/src/components/chart/chart/grid/TestElement.vue
@@ -6,20 +6,20 @@
 <style>
 </style>
 <script>
-    export default {
-        name: "TestElement",
-        props: {
-            text : {
-                type: String,
-                default: "x",
-            },
-        },
-        data: function() {
-            return {
-            }
-        },
-        mounted: function() {
-            console.log("### " + this.text + " ready!");
-        },
+export default {
+  name: 'TestElement',
+  props: {
+    text: {
+      type: String,
+      default: 'x'
     }
-</script>
\ No newline at end of file
+  },
+  data: function () {
+    return {
+    }
+  },
+  mounted: function () {
+    console.log('### ' + this.text + ' ready!')
+  }
+}
+</script>
diff --git a/nezha-fronted/src/components/chart/chart/grid/aspectRatio.js b/nezha-fronted/src/components/chart/chart/grid/aspectRatio.js
index 56db68ee5..1fb5f42fd 100644
--- a/nezha-fronted/src/components/chart/chart/grid/aspectRatio.js
+++ b/nezha-fronted/src/components/chart/chart/grid/aspectRatio.js
@@ -15,97 +15,97 @@
  * });
  * ```
  */
-import extend from "../utils/extend.js";
-import { addEdges } from "../utils/rect.js";
-import Modification from "./Modification.js";
-import { makeModifier } from "./base.js";
+import extend from '../utils/extend.js'
+import { addEdges } from '../utils/rect.js'
+import Modification from './Modification.js'
+import { makeModifier } from './base.js'
 const aspectRatio = {
-  start(arg) {
+  start (arg) {
     const {
       state,
       rect,
       edges: originalEdges,
       pageCoords: coords
-    } = arg;
+    } = arg
     let {
       ratio
-    } = state.options;
+    } = state.options
     const {
       equalDelta,
       modifiers
-    } = state.options;
+    } = state.options
 
     if (ratio === 'preserve') {
-      ratio = rect.width / rect.height;
+      ratio = rect.width / rect.height
     }
 
-    state.startCoords = extend({}, coords);
-    state.startRect = extend({}, rect);
-    state.ratio = ratio;
-    state.equalDelta = equalDelta;
+    state.startCoords = extend({}, coords)
+    state.startRect = extend({}, rect)
+    state.ratio = ratio
+    state.equalDelta = equalDelta
     const linkedEdges = state.linkedEdges = {
       top: originalEdges.top || originalEdges.left && !originalEdges.bottom,
       left: originalEdges.left || originalEdges.top && !originalEdges.right,
       bottom: originalEdges.bottom || originalEdges.right && !originalEdges.top,
       right: originalEdges.right || originalEdges.bottom && !originalEdges.left
-    };
-    state.xIsPrimaryAxis = !!(originalEdges.left || originalEdges.right);
+    }
+    state.xIsPrimaryAxis = !!(originalEdges.left || originalEdges.right)
 
     if (state.equalDelta) {
-      state.edgeSign = (linkedEdges.left ? 1 : -1) * (linkedEdges.top ? 1 : -1);
+      state.edgeSign = (linkedEdges.left ? 1 : -1) * (linkedEdges.top ? 1 : -1)
     } else {
-      const negativeSecondaryEdge = state.xIsPrimaryAxis ? linkedEdges.top : linkedEdges.left;
-      state.edgeSign = negativeSecondaryEdge ? -1 : 1;
+      const negativeSecondaryEdge = state.xIsPrimaryAxis ? linkedEdges.top : linkedEdges.left
+      state.edgeSign = negativeSecondaryEdge ? -1 : 1
     }
 
-    extend(arg.edges, linkedEdges);
-    if (!modifiers || !modifiers.length) return;
-    const subModification = new Modification(arg.interaction);
-    subModification.copyFrom(arg.interaction.modification);
-    subModification.prepareStates(modifiers);
-    state.subModification = subModification;
-    subModification.startAll({ ...arg
-    });
+    extend(arg.edges, linkedEdges)
+    if (!modifiers || !modifiers.length) return
+    const subModification = new Modification(arg.interaction)
+    subModification.copyFrom(arg.interaction.modification)
+    subModification.prepareStates(modifiers)
+    state.subModification = subModification
+    subModification.startAll({ ...arg })
   },
 
-  set(arg) {
+  set (arg) {
     const {
       state,
       rect,
       coords
-    } = arg;
-    const initialCoords = extend({}, coords);
-    const aspectMethod = state.equalDelta ? setEqualDelta : setRatio;
-    aspectMethod(state, state.xIsPrimaryAxis, coords, rect);
+    } = arg
+    const initialCoords = extend({}, coords)
+    const aspectMethod = state.equalDelta ? setEqualDelta : setRatio
+    aspectMethod(state, state.xIsPrimaryAxis, coords, rect)
 
     if (!state.subModification) {
-      return null;
+      return null
     }
 
-    const correctedRect = extend({}, rect);
+    const correctedRect = extend({}, rect)
     addEdges(state.linkedEdges, correctedRect, {
       x: coords.x - initialCoords.x,
       y: coords.y - initialCoords.y
-    });
-    const result = state.subModification.setAll({ ...arg,
+    })
+    const result = state.subModification.setAll({
+      ...arg,
       rect: correctedRect,
       edges: state.linkedEdges,
       pageCoords: coords,
       prevCoords: coords,
       prevRect: correctedRect
-    });
+    })
     const {
       delta
-    } = result;
+    } = result
 
     if (result.changed) {
-      const xIsCriticalAxis = Math.abs(delta.x) > Math.abs(delta.y); // do aspect modification again with critical edge axis as primary
+      const xIsCriticalAxis = Math.abs(delta.x) > Math.abs(delta.y) // do aspect modification again with critical edge axis as primary
 
-      aspectMethod(state, xIsCriticalAxis, result.coords, result.rect);
-      extend(coords, result.coords);
+      aspectMethod(state, xIsCriticalAxis, result.coords, result.rect)
+      extend(coords, result.coords)
     }
 
-    return result.eventProps;
+    return result.eventProps
   },
 
   defaults: {
@@ -114,34 +114,34 @@ const aspectRatio = {
     modifiers: [],
     enabled: false
   }
-};
+}
 
-function setEqualDelta({
+function setEqualDelta ({
   startCoords,
   edgeSign
 }, xIsPrimaryAxis, coords) {
   if (xIsPrimaryAxis) {
-    coords.y = startCoords.y + (coords.x - startCoords.x) * edgeSign;
+    coords.y = startCoords.y + (coords.x - startCoords.x) * edgeSign
   } else {
-    coords.x = startCoords.x + (coords.y - startCoords.y) * edgeSign;
+    coords.x = startCoords.x + (coords.y - startCoords.y) * edgeSign
   }
 }
 
-function setRatio({
+function setRatio ({
   startRect,
   startCoords,
   ratio,
   edgeSign
 }, xIsPrimaryAxis, coords, rect) {
   if (xIsPrimaryAxis) {
-    const newHeight = rect.width / ratio;
-    coords.y = startCoords.y + (newHeight - startRect.height) * edgeSign;
+    const newHeight = rect.width / ratio
+    coords.y = startCoords.y + (newHeight - startRect.height) * edgeSign
   } else {
-    const newWidth = rect.height * ratio;
-    coords.x = startCoords.x + (newWidth - startRect.width) * edgeSign;
+    const newWidth = rect.height * ratio
+    coords.x = startCoords.x + (newWidth - startRect.width) * edgeSign
   }
 }
 
-export default makeModifier(aspectRatio, 'aspectRatio');
-export { aspectRatio };
-//# sourceMappingURL=aspectRatio.js.map
\ No newline at end of file
+export default makeModifier(aspectRatio, 'aspectRatio')
+export { aspectRatio }
+// # sourceMappingURL=aspectRatio.js.map
diff --git a/nezha-fronted/src/components/chart/chart/options/chartTreemap.js b/nezha-fronted/src/components/chart/chart/options/chartTreemap.js
index 06abb88d7..900e5533f 100644
--- a/nezha-fronted/src/components/chart/chart/options/chartTreemap.js
+++ b/nezha-fronted/src/components/chart/chart/options/chartTreemap.js
@@ -19,7 +19,7 @@ const chartTreemapOption = {
       return [
         '<div class="tooltip-title">' +
         formatUtil.encodeHTML(treePath.join('/')) +
-        '</div>',
+        '</div>'
       ].join('')
     }
   },
diff --git a/nezha-fronted/src/components/charts/chart-list-group.vue b/nezha-fronted/src/components/charts/chart-list-group.vue
index 7cb49eb21..01f93bd0d 100644
--- a/nezha-fronted/src/components/charts/chart-list-group.vue
+++ b/nezha-fronted/src/components/charts/chart-list-group.vue
@@ -512,7 +512,7 @@ export default {
         // this.getChartData(item, index, this.filter)
         this.setChartSize(item, index)
         const chartBox = document.getElementById('chart-' + item.id)// this.$refs['editChart'+item.id][0];
-        this.handleElementInViewport(chartBox,  this.childrenScrollTop, item, index, true)
+        this.handleElementInViewport(chartBox, this.childrenScrollTop, item, index, true)
       })
     },
     loadChartData (scrollTop) {
diff --git a/nezha-fronted/src/components/common/alert/alertLabel.vue b/nezha-fronted/src/components/common/alert/alertLabel.vue
index 1143df75e..b373bebef 100644
--- a/nezha-fronted/src/components/common/alert/alertLabel.vue
+++ b/nezha-fronted/src/components/common/alert/alertLabel.vue
@@ -318,7 +318,7 @@ export default {
     return {
       alertLabelData: null,
       loading: true,
-      heightList: 0,
+      heightList: 0
     }
   },
   watch: {
diff --git a/nezha-fronted/src/components/common/alert/nzTooltip.vue b/nezha-fronted/src/components/common/alert/nzTooltip.vue
index 82c27f1b2..b80ee029f 100644
--- a/nezha-fronted/src/components/common/alert/nzTooltip.vue
+++ b/nezha-fronted/src/components/common/alert/nzTooltip.vue
@@ -81,4 +81,3 @@ export default {
   }
 }
 </script>
-
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index 2f92405b1..028cee1bc 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -406,7 +406,7 @@ export default {
         this.$nextTick(() => {
           this.searchTime = [bus.computeTimezoneTime(new Date().getTime() - 1 * 60 * 60 * 1000), bus.computeTimezoneTime(new Date().getTime())]
           this.$store.dispatch('dispatchPanelTime', {
-            time: this.searchTime ,
+            time: this.searchTime,
             nowTimeType: {
               id: 4,
               text: this.$t('dashboard.panel.lastOneHour'),
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertRuleEvalLog.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertRuleEvalLog.vue
index 1d62ec17c..af9343f8b 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertRuleEvalLog.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertRuleEvalLog.vue
@@ -106,7 +106,7 @@ export default {
         this.nowTime = this.utcTimeToTimezoneStr(response.time)
         if (response.code === 200) {
           this.tableData = response.data
-          if (!this.scrollbarWrap) {
+          if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) {
             this.$nextTick(() => {
               this.scrollbarWrap = this.$refs.dataTable.$refs.dataTable.bodyWrapper
               this.toTopBtnHandler(this.scrollbarWrap)
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue
index 597061fbf..14bc72684 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue
@@ -238,7 +238,7 @@ export default {
           }
           this.tableData = response.data.list
           this.pageObj.total = response.data.total
-          if (!this.scrollbarWrap) {
+          if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) {
             this.$nextTick(() => {
               this.scrollbarWrap = this.$refs.dataTable.$refs.dataTable.bodyWrapper
               this.toTopBtnHandler(this.scrollbarWrap)
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue
index e7068ba4c..bbce2dc04 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue
@@ -246,9 +246,9 @@ export default {
           if (this.needAlertDaysData) {
             response.data.list.forEach(item => {
               item.trendLoading = true
-              item.left= 0
-              item.top= 0
-              item.alertNumtooltipShow= false
+              item.left = 0
+              item.top = 0
+              item.alertNumtooltipShow = false
               item.alertDaysData = [
                 {
                   metric: { priority: 'P1' },
@@ -267,7 +267,7 @@ export default {
           }
           this.tableData = response.data.list
           this.pageObj.total = response.data.total
-          if (!this.scrollbarWrap) {
+          if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) {
             this.$nextTick(() => {
               this.scrollbarWrap = this.$refs.dataTable.$refs.dataTable.bodyWrapper
               this.toTopBtnHandler(this.scrollbarWrap)
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
index 78276c433..799ad1427 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
@@ -153,9 +153,9 @@ export default {
           if (this.needAlertDaysData) {
             response.data.list.forEach(item => {
               item.trendLoading = true
-              item.left= 0
-              item.top= 0
-              item.alertNumtooltipShow= false
+              item.left = 0
+              item.top = 0
+              item.alertNumtooltipShow = false
               item.alertDaysData = [
                 {
                   metric: { priority: 'P1' },
@@ -174,7 +174,7 @@ export default {
           }
           this.tableData = response.data.list
           this.pageObj.total = response.data.total
-          if (!this.scrollbarWrap) {
+          if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) {
             this.$nextTick(() => {
               this.scrollbarWrap = this.$refs.dataTable.$refs.dataTable.bodyWrapper
               this.toTopBtnHandler(this.scrollbarWrap)
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
index f677ee254..c9409201f 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
@@ -128,7 +128,7 @@ export default {
       dropdownShow: false,
       timeout: null,
       formatTime: '',
-      hideSameLabels: true,
+      hideSameLabels: true
     }
   },
   methods: {
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
index a307b93d2..a3e8f782b 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
@@ -176,7 +176,7 @@ export default {
       plTableSHow: true,
       scrollTop: 0,
       scrollbarWrap: null,
-      minusTime: 0,
+      minusTime: 0
     }
   },
   methods: {
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue
index 1df5e606a..feecafb0b 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue
@@ -143,9 +143,9 @@ export default {
           if (this.needAlertDaysData) {
             response.data.list.forEach(item => {
               item.trendLoading = true
-              item.left= 0
-              item.top= 0
-              item.alertNumtooltipShow= false
+              item.left = 0
+              item.top = 0
+              item.alertNumtooltipShow = false
               item.alertDaysData = [
                 {
                   metric: { priority: 'P1' },
@@ -165,7 +165,7 @@ export default {
           this.tableData = response.data.list
           this.nowTime = this.utcTimeToTimezoneStr(response.time)
           this.pageObj.total = response.data.total
-          if (!this.scrollbarWrap) {
+          if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) {
             this.$nextTick(() => {
               this.scrollbarWrap = this.$refs.dataTable.$refs.dataTable.bodyWrapper
               this.toTopBtnHandler(this.scrollbarWrap)
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/operationLogTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/operationLogTab.vue
index a509dc76f..bd9d39de6 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/operationLogTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/operationLogTab.vue
@@ -142,7 +142,7 @@ export default {
           }
           this.tableData = response.data.list
           this.pageObj.total = response.data.total
-          if (!this.scrollbarWrap) {
+          if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) {
             this.$nextTick(() => {
               this.scrollbarWrap = this.$refs.dataTable.$refs.dataTable.bodyWrapper
               this.toTopBtnHandler(this.scrollbarWrap)
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue
index f8102618a..fd8ca9311 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue
@@ -146,7 +146,7 @@ export default {
           }
           this.tableData = response.data.list
           this.pageObj.total = response.data.total
-          if (!this.scrollbarWrap) {
+          if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) {
             this.$nextTick(() => {
               this.scrollbarWrap = this.$refs.dataTable.$refs.dataTable.bodyWrapper
               this.toTopBtnHandler(this.scrollbarWrap)
diff --git a/nezha-fronted/src/components/common/filterSearch/filterSearch.vue b/nezha-fronted/src/components/common/filterSearch/filterSearch.vue
index c98be7b00..7d93e7241 100644
--- a/nezha-fronted/src/components/common/filterSearch/filterSearch.vue
+++ b/nezha-fronted/src/components/common/filterSearch/filterSearch.vue
@@ -118,7 +118,7 @@ export default {
         this.metaList.push(meta)
         this.$emit('metaList')
       } else {
-        let self = this
+        const self = this
         const newCondition = Object.assign({}, self.meta)
         newCondition.nameIsEditing = true
         this.metaList.push(newCondition)
diff --git a/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue b/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue
index b2945836d..6b335d496 100644
--- a/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue
+++ b/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue
@@ -552,7 +552,7 @@ export default {
         arr.unshift(obj)
       }
       return arr
-    },
+    }
   }
 }
 </script>
diff --git a/nezha-fronted/src/components/common/project/popData/assetTable.vue b/nezha-fronted/src/components/common/project/popData/assetTable.vue
index 9973e1cd8..143a29d77 100644
--- a/nezha-fronted/src/components/common/project/popData/assetTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/assetTable.vue
@@ -170,9 +170,9 @@ export default {
           if (this.needAlertDaysData) {
             response.data.list.forEach(item => {
               item.trendLoading = true
-              item.left= 0
-              item.top= 0
-              item.alertNumtooltipShow= false
+              item.left = 0
+              item.top = 0
+              item.alertNumtooltipShow = false
               item.alertDaysData = [
                 {
                   metric: { priority: 'P1' },
diff --git a/nezha-fronted/src/components/common/project/popData/endpointTable.vue b/nezha-fronted/src/components/common/project/popData/endpointTable.vue
index 8139df580..6d2692ef4 100644
--- a/nezha-fronted/src/components/common/project/popData/endpointTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/endpointTable.vue
@@ -176,9 +176,9 @@ export default {
           if (this.needAlertDaysData) {
             response.data.list.forEach(item => {
               item.trendLoading = true
-              item.left= 0
-              item.top= 0
-              item.alertNumtooltipShow= false
+              item.left = 0
+              item.top = 0
+              item.alertNumtooltipShow = false
               item.alertDaysData = [
                 {
                   metric: { priority: 'P1' },
diff --git a/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js b/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
index 2c8da83c3..d619b341c 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
+++ b/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
@@ -422,11 +422,11 @@ export default {
     enableChange (type) {
       switch (type) {
         case 'valueMapping':
-          break;
+          break
         case 'legend':
-          break;
+          break
         case '':
-          break;
+          break
       }
       this.change()
     }
diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
index de6a974c6..63ce564d1 100644
--- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
@@ -144,7 +144,7 @@ import chartDataFormat from '../../../charts/chartDataFormat'
 import alertRuleInfo from '../../alert/alertRuleInfo'
 import alertLabel from '../../alert/alertLabel'
 import { calcDurationByStringTimeB } from '../../js/tools'
-import {alertMessage as alertMessageConstant} from "@/components/common/js/constants";
+import { alertMessage as alertMessageConstant } from '@/components/common/js/constants'
 export default {
   name: 'alertMessageTable',
   components: {
@@ -222,7 +222,7 @@ export default {
           label: this.$t('alert.list.state'),
           prop: 'state',
           show: true,
-          width: 100,
+          width: 100
           // sortable: 'custom'
         }, {
           label: this.$t('alert.startAt'),
diff --git a/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue b/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue
index 7a4c1c2d8..cbd78ec09 100644
--- a/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue
+++ b/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue
@@ -464,12 +464,12 @@ export default {
       /* if (refresh) {
          this.getData(this.filter)
       } */
-    },
+    }
   },
   computed: {
     chartRightBoxShow () {
       return this.$store.getters.getShowRightBox
-    },
+    }
   },
   created () {
     // this.getPanelData()
diff --git a/nezha-fronted/src/components/page/alert/alertRule.vue b/nezha-fronted/src/components/page/alert/alertRule.vue
index da5cd19eb..4f5ed9d71 100644
--- a/nezha-fronted/src/components/page/alert/alertRule.vue
+++ b/nezha-fronted/src/components/page/alert/alertRule.vue
@@ -251,7 +251,7 @@ export default {
       },
       searchTime: bus.getTimezontDateRange(),
       needAlertDaysData: true,
-      trendKey: 'ruleId',
+      trendKey: 'ruleId'
     }
   },
   methods: {
@@ -290,9 +290,9 @@ export default {
           if (this.needAlertDaysData) {
             response.data.list.forEach(item => {
               item.trendLoading = true
-              item.left= 0
-              item.top= 0
-              item.alertNumtooltipShow= false
+              item.left = 0
+              item.top = 0
+              item.alertNumtooltipShow = false
               item.alertDaysData = [
                 {
                   metric: { priority: 'P1' },
@@ -320,7 +320,7 @@ export default {
           this.detailViewRightObj = detailViewRightObj
           this.pageObj.total = response.data.total
           this.pageObj.pages = response.data.pages
-          if (!this.scrollbarWrap) {
+          if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) {
             this.$nextTick(() => {
               this.scrollbarWrap = this.$refs.dataTable.$refs.dataTable.bodyWrapper
               this.toTopBtnHandler(this.scrollbarWrap)
diff --git a/nezha-fronted/src/components/page/alert/alertSilence.vue b/nezha-fronted/src/components/page/alert/alertSilence.vue
index 7c7facbf7..81a02ff06 100644
--- a/nezha-fronted/src/components/page/alert/alertSilence.vue
+++ b/nezha-fronted/src/components/page/alert/alertSilence.vue
@@ -192,7 +192,7 @@ export default {
           }
           this.tableData = response.data.list
           this.pageObj.total = response.data.total
-          if (!this.scrollbarWrap) {
+          if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) {
             this.$nextTick(() => {
               this.scrollbarWrap = this.$refs.dataTable.$refs.dataTable.bodyWrapper
               this.toTopBtnHandler(this.scrollbarWrap)
diff --git a/nezha-fronted/src/components/page/config/assetMeta.vue b/nezha-fronted/src/components/page/config/assetMeta.vue
index a97adf187..ee5ec0e2c 100644
--- a/nezha-fronted/src/components/page/config/assetMeta.vue
+++ b/nezha-fronted/src/components/page/config/assetMeta.vue
@@ -210,7 +210,7 @@ export default {
           this.tableData = response.data.list
           this.pageObj.total = response.data.total
           this.nowTime = this.utcTimeToTimezoneStr(response.time)
-          if (!this.scrollbarWrap) {
+          if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) {
             this.$nextTick(() => {
               this.scrollbarWrap = this.$refs.dataTable.$refs.dataTable.bodyWrapper
               this.toTopBtnHandler(this.scrollbarWrap)
diff --git a/nezha-fronted/src/components/page/config/operationRecord.vue b/nezha-fronted/src/components/page/config/operationRecord.vue
index a68c3874e..fb730a00d 100644
--- a/nezha-fronted/src/components/page/config/operationRecord.vue
+++ b/nezha-fronted/src/components/page/config/operationRecord.vue
@@ -132,7 +132,7 @@ export default {
           }
           this.tableData = response.data.list
           this.pageObj.total = response.data.total
-          if (!this.scrollbarWrap) {
+          if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) {
             this.$nextTick(() => {
               this.scrollbarWrap = this.$refs.dataTable.$refs.dataTable.bodyWrapper
               this.toTopBtnHandler(this.scrollbarWrap)
diff --git a/nezha-fronted/src/components/page/config/system/systemCommon.js b/nezha-fronted/src/components/page/config/system/systemCommon.js
index d5b1b080e..b6cd507df 100644
--- a/nezha-fronted/src/components/page/config/system/systemCommon.js
+++ b/nezha-fronted/src/components/page/config/system/systemCommon.js
@@ -118,7 +118,7 @@ export const parentTableCommon = {
         if (response.code === 200) {
           this.tableData = []
           this.tableData = response.data.list
-          if (!this.scrollbarWrap) {
+          if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) {
             this.$nextTick(() => {
               this.scrollbarWrap = this.$refs.dataTable.$refs.dataTable.bodyWrapper
               this.toTopBtnHandler(this.scrollbarWrap)
diff --git a/nezha-fronted/src/components/page/config/template/chartTemp.vue b/nezha-fronted/src/components/page/config/template/chartTemp.vue
index 601038d42..bdcfaab87 100644
--- a/nezha-fronted/src/components/page/config/template/chartTemp.vue
+++ b/nezha-fronted/src/components/page/config/template/chartTemp.vue
@@ -107,7 +107,7 @@ import chartTmplTable from '@/components/common/table/settings/chartTmplTable'
 import topToolMoreOptions from '@/components/common/popBox/topToolMoreOptions'
 import routerPathParams from '@/components/common/mixin/routerPathParams'
 import chartRightBox from '@/components/common/rightBox/chart/chartRightBox'
-import {randomcolor} from "@/components/common/js/radomcolor/randomcolor";
+import { randomcolor } from '@/components/common/js/radomcolor/randomcolor'
 
 export default {
   name: 'chartTemp',
@@ -294,7 +294,7 @@ export default {
           }
           this.tableData = response.data.list
           this.pageObj.total = response.data.total
-          if (!this.scrollbarWrap) {
+          if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) {
             this.$nextTick(() => {
               this.scrollbarWrap = this.$refs.dataTable.$refs.dataTable.bodyWrapper
               this.toTopBtnHandler(this.scrollbarWrap)
diff --git a/nezha-fronted/src/components/page/config/terminalLog.vue b/nezha-fronted/src/components/page/config/terminalLog.vue
index 464e0025a..778e1c782 100644
--- a/nezha-fronted/src/components/page/config/terminalLog.vue
+++ b/nezha-fronted/src/components/page/config/terminalLog.vue
@@ -197,7 +197,7 @@ export default {
           this.detailViewRightObj = detailViewRightObj
           this.pageObj.total = response.data.total
           this.pageObj.pages = response.data.pages
-          if (!this.scrollbarWrap) {
+          if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) {
             this.$nextTick(() => {
               this.scrollbarWrap = this.$refs.dataTable.$refs.dataTable.bodyWrapper
               this.toTopBtnHandler(this.scrollbarWrap)
diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
index 34484ec54..9e5060c78 100644
--- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
+++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
@@ -629,9 +629,9 @@ export default {
           if (this.needAlertDaysData) {
             response.data.list.forEach(item => {
               item.trendLoading = true
-              item.left= 0
-              item.top= 0
-              item.alertNumtooltipShow= false
+              item.left = 0
+              item.top = 0
+              item.alertNumtooltipShow = false
               item.alertDaysData = [
                 {
                   metric: { priority: 'P1' },
@@ -659,7 +659,7 @@ export default {
           this.detailViewRightObj = detailViewRightObj
           this.pageObj.total = response.data.total
           this.pageObj.pages = response.data.pages
-          if (!this.scrollbarWrap) {
+          if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) {
             this.$nextTick(() => {
               this.scrollbarWrap = this.$refs.dataTable.$refs.dataTable.bodyWrapper
               this.toTopBtnHandler(this.scrollbarWrap)
diff --git a/nezha-fronted/src/components/page/monitor/module/moduleList.vue b/nezha-fronted/src/components/page/monitor/module/moduleList.vue
index f79ede9c3..1ed07276c 100644
--- a/nezha-fronted/src/components/page/monitor/module/moduleList.vue
+++ b/nezha-fronted/src/components/page/monitor/module/moduleList.vue
@@ -412,9 +412,9 @@ export default {
           if (this.needAlertDaysData) {
             response.data.list.forEach(item => {
               item.trendLoading = true
-              item.left= 0
-              item.top= 0
-              item.alertNumtooltipShow= false
+              item.left = 0
+              item.top = 0
+              item.alertNumtooltipShow = false
               item.alertDaysData = [
                 {
                   metric: { priority: 'P1' },
@@ -442,7 +442,7 @@ export default {
           this.detailViewRightObj = detailViewRightObj
           this.pageObj.total = response.data.total
           this.pageObj.pages = response.data.pages
-          if (!this.scrollbarWrap) {
+          if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) {
             this.$nextTick(() => {
               this.scrollbarWrap = this.$refs.dataTable.$refs.dataTable.bodyWrapper
               this.toTopBtnHandler(this.scrollbarWrap)
diff --git a/nezha-fronted/src/components/page/monitor/project/projectList.vue b/nezha-fronted/src/components/page/monitor/project/projectList.vue
index 4cc6e8f1b..d0e576baf 100644
--- a/nezha-fronted/src/components/page/monitor/project/projectList.vue
+++ b/nezha-fronted/src/components/page/monitor/project/projectList.vue
@@ -150,9 +150,9 @@ export default {
           if (this.needAlertDaysData) {
             response.data.list.forEach(item => {
               item.trendLoading = true
-              item.left= 0
-              item.top= 0
-              item.alertNumtooltipShow= false
+              item.left = 0
+              item.top = 0
+              item.alertNumtooltipShow = false
               item.alertDaysData = [
                 {
                   metric: { priority: 'P1' },
@@ -174,7 +174,7 @@ export default {
           }
           this.tableData = response.data.list
           this.pageObj.total = response.data.total
-          if (!this.scrollbarWrap) {
+          if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) {
             this.$nextTick(() => {
               this.scrollbarWrap = this.$refs.dataTable.$refs.dataTable.bodyWrapper
               this.toTopBtnHandler(this.scrollbarWrap)

From ed6339a0623dc407ee3b985bbe35c0f057381aaf Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 7 Mar 2022 10:09:45 +0800
Subject: [PATCH 22/65] =?UTF-8?q?feat=EF=BC=9A=E9=9A=90=E8=97=8F=E4=B8=BB?=
 =?UTF-8?q?=E9=A2=98=E7=9A=84=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/rightBox/profileBox.vue | 4 ++--
 nezha-fronted/src/components/page/config/basic.vue          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/profileBox.vue b/nezha-fronted/src/components/common/rightBox/profileBox.vue
index e6bb131d5..ef571a4f6 100644
--- a/nezha-fronted/src/components/common/rightBox/profileBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/profileBox.vue
@@ -37,7 +37,7 @@
               <el-option v-for="item in langList" :key="item.value" :label="item.name" :value="item.value"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="Theme" prop="theme">
+          <el-form-item label="Theme" prop="theme" style="display: none">
             <el-select id="account-input-language"
                        class="right-box__select"
                        v-model="editProfile.theme"
@@ -68,7 +68,7 @@ import editRigthBox from '@/components/common/mixin/editRigthBox'
 import { theme } from '@/components/common/js/constants'
 
 export default {
-  name: 'modelbox',
+  name: 'profilebox',
   components: {
   },
   props: {
diff --git a/nezha-fronted/src/components/page/config/basic.vue b/nezha-fronted/src/components/page/config/basic.vue
index 8ed020596..0aa61b70b 100644
--- a/nezha-fronted/src/components/page/config/basic.vue
+++ b/nezha-fronted/src/components/page/config/basic.vue
@@ -28,7 +28,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('config.system.basic.defTheme')" prop="defTheme">
+        <el-form-item :label="$t('config.system.basic.defTheme')" prop="defTheme" style="display: none">
           <el-select id="account-input-language"
                      class="right-box__select"
                      v-model="basic.theme"

From 4f95bf5e1888bcd6e96093969d05c43c0cda3dd3 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 7 Mar 2022 10:37:29 +0800
Subject: [PATCH 23/65] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20chart=20?=
 =?UTF-8?q?=E6=9C=AA=E4=BA=8C=E6=AC=A1=E7=BC=96=E7=A0=81=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/panelChart.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue
index 8ad1370ba..7a4b8fd00 100644
--- a/nezha-fronted/src/components/chart/panelChart.vue
+++ b/nezha-fronted/src/components/chart/panelChart.vue
@@ -196,7 +196,7 @@ export default {
               // if (isChartPie(this.chartInfo.type)) {
               //   query += `&statistics=${this.chartInfo.param.statistics || 'last'}`
               // }
-              query += `&query=${element.expression}`
+              query += `&query=${encodeURIComponent(element.expression)}`
               return this.$get(query)
             })
             if (this.multipleTime) {
@@ -217,7 +217,7 @@ export default {
                 // if (isChartPie(this.chartInfo.type)) {
                 //   query += `&statistics=${this.chartInfo.param.statistics || 'last'}`
                 // }
-                query += `&query=${element.expression}`
+                query += `&query=${encodeURIComponent(element.expression)}`
                 return this.$get(query)
               })
               requests = requests.concat(multipleRequests)

From 01128f11e4c659ea6f5f214b99063577636f0f88 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Mon, 7 Mar 2022 11:56:42 +0800
Subject: [PATCH 24/65] =?UTF-8?q?NEZ-1630=20style:=E4=BF=AE=E5=A4=8DEndpoi?=
 =?UTF-8?q?nts=E6=9F=A5=E7=9C=8B=E6=95=B0=E6=8D=AEMetrics=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E6=97=B6=EF=BC=8C=E5=88=B7=E6=96=B0=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=A4=84=E6=B2=A1=E6=9C=89=E9=97=B4=E9=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/css/components/chart/chart.scss     | 5 +++++
 .../src/assets/css/components/common/chartUnit.scss          | 1 +
 .../src/components/common/table/special/endpointQueryTab.vue | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/assets/css/components/chart/chart.scss b/nezha-fronted/src/assets/css/components/chart/chart.scss
index c2a202a7d..ffdfcd502 100644
--- a/nezha-fronted/src/assets/css/components/chart/chart.scss
+++ b/nezha-fronted/src/assets/css/components/chart/chart.scss
@@ -401,6 +401,11 @@
     }
   }
 }
+.endpoint-query-metrics.chart-fullscreen.nz-dialog {
+  .chart-screen-header .chart-header__tools #browser-go {
+    margin-left: 5px;
+  }
+}
 .chart-fullscreen.nz-dialog {
   .el-dialog__header{
     display: none;
diff --git a/nezha-fronted/src/assets/css/components/common/chartUnit.scss b/nezha-fronted/src/assets/css/components/common/chartUnit.scss
index 53c65715a..fed06acfb 100644
--- a/nezha-fronted/src/assets/css/components/common/chartUnit.scss
+++ b/nezha-fronted/src/assets/css/components/common/chartUnit.scss
@@ -20,5 +20,6 @@
 }
 .chart-unit .el-input__inner {
   border-top-left-radius: 0 !important;
+  border-color: $--border-color-base;
   border-bottom-left-radius: 0 !important;
 }
diff --git a/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue b/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue
index cbd78ec09..4da9874e0 100644
--- a/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue
+++ b/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue
@@ -56,7 +56,7 @@
       v-if="graphShow"
       :visible.sync="graphShow"
       :show-close="false"
-      class="nz-dialog chart-fullscreen"
+      class="nz-dialog chart-fullscreen endpoint-query-metrics"
       destroy-on-close
       fullscreen
       :modal-append-to-body="false"

From 306fcce9901d01087fb7eb5a0e9b6d9781c35a72 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 7 Mar 2022 18:06:41 +0800
Subject: [PATCH 25/65] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20guage?=
 =?UTF-8?q?=E6=9C=AAgauge?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/chart/ChartScreenHeader.vue       |  2 +-
 .../src/components/chart/chart/chartGauge.vue        |  2 +-
 nezha-fronted/src/components/chart/chart/tools.js    |  4 ++--
 nezha-fronted/src/components/common/js/constants.js  |  2 +-
 .../components/common/rightBox/chart/chartConfig.vue |  8 ++++----
 .../common/rightBox/chart/chartRightBox.vue          |  2 +-
 .../common/rightBox/chart/chartTypeShow.js           | 12 ++++++------
 .../components/common/rightBox/chart/publicConfig.js |  8 ++++----
 .../common/rightBox/chart/systemChartConfig.vue      |  8 ++++----
 9 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/nezha-fronted/src/components/chart/ChartScreenHeader.vue b/nezha-fronted/src/components/chart/ChartScreenHeader.vue
index 682ee7946..8521239a7 100644
--- a/nezha-fronted/src/components/chart/ChartScreenHeader.vue
+++ b/nezha-fronted/src/components/chart/ChartScreenHeader.vue
@@ -124,7 +124,7 @@ export default {
         case 'bar' :
         case 'table' :
         case 'stat' :
-        case 'guage' :
+        case 'gauge' :
         case 'pie' :
         case 'treemap' :
         case 'log' :
diff --git a/nezha-fronted/src/components/chart/chart/chartGauge.vue b/nezha-fronted/src/components/chart/chart/chartGauge.vue
index f6e802ff1..2236d66e7 100644
--- a/nezha-fronted/src/components/chart/chart/chartGauge.vue
+++ b/nezha-fronted/src/components/chart/chart/chartGauge.vue
@@ -31,7 +31,7 @@ import { initColor } from '@/components/chart/chart/tools'
 import { randomcolor } from '@/components/common/js/radomcolor/randomcolor'
 
 export default {
-  name: 'chart-guage',
+  name: 'chart-gauge',
   mixins: [chartMixin, chartFormat],
   data () {
     return {
diff --git a/nezha-fronted/src/components/chart/chart/tools.js b/nezha-fronted/src/components/chart/chart/tools.js
index fe94b5efd..46f374ce2 100644
--- a/nezha-fronted/src/components/chart/chart/tools.js
+++ b/nezha-fronted/src/components/chart/chart/tools.js
@@ -43,7 +43,7 @@ export function getOption (type) {
       chartOption = lodash.cloneDeep(chartTreemapOption)
       break
     }
-    case chartType.guage: {
+    case chartType.gauge: {
       chartOption = lodash.cloneDeep(chartGaugeOption)
       break
     }
@@ -109,7 +109,7 @@ export function isTable (type) {
   return type === chartType.table
 }
 export function isGauge (type) {
-  return type === chartType.guage
+  return type === chartType.gauge
 }
 export function isClock (type) {
   return type === chartType.clock
diff --git a/nezha-fronted/src/components/common/js/constants.js b/nezha-fronted/src/components/common/js/constants.js
index 7601557a2..dbf2632ee 100644
--- a/nezha-fronted/src/components/common/js/constants.js
+++ b/nezha-fronted/src/components/common/js/constants.js
@@ -395,7 +395,7 @@ export const chartType = {
   bar: 'bar',
   table: 'table',
   stat: 'stat',
-  guage: 'guage',
+  gauge: 'gauge',
   pie: 'pie',
   treemap: 'treemap',
   log: 'log',
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
index 289992d0e..cf0b28d96 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
@@ -737,8 +737,8 @@ export default {
           name: this.$t('dashboard.panel.chartForm.typeVal.bar.label')
         },
         {
-          id: 'guage',
-          name: this.$t('dashboard.panel.chartForm.typeVal.guage.label')
+          id: 'gauge',
+          name: this.$t('dashboard.panel.chartForm.typeVal.gauge.label')
         },
         {
           id: 'treemap',
@@ -809,8 +809,8 @@ export default {
           break
         case 'stat':
         case 'hexagon':
-        case 'guage':
-          if (this.oldType === 'stat' || this.oldType === 'guage' || this.oldType === 'hexagon') {
+        case 'gauge':
+          if (this.oldType === 'stat' || this.oldType === 'gauge' || this.oldType === 'hexagon') {
             break
           }
           this.chartConfig.param = {
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
index 81f1005d5..6da9c3bf8 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
@@ -218,7 +218,7 @@ export default {
         if (!params.groupId) {
           params.groupId = 0
         }
-        if (params.type !== 'guage') {
+        if (params.type !== 'gauge') {
           delete params.param.min
           delete params.param.max
         }
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartTypeShow.js b/nezha-fronted/src/components/common/rightBox/chart/chartTypeShow.js
index 193b6549b..c380c1c49 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartTypeShow.js
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartTypeShow.js
@@ -53,7 +53,7 @@ export default {
         case 'hexagon':
         case 'bar':
         case 'treemap':
-        case 'guage':
+        case 'gauge':
         case 'pie':
           return false
         default: return false
@@ -70,7 +70,7 @@ export default {
         case 'hexagon':
         case 'bar':
         case 'treemap':
-        case 'guage':
+        case 'gauge':
         case 'pie':
           return true
         default: return false
@@ -88,7 +88,7 @@ export default {
         case 'table':
         case 'stat':
         case 'hexagon':
-        case 'guage':
+        case 'gauge':
           return false
         default: return false
       }
@@ -112,7 +112,7 @@ export default {
         case 'stat':
         case 'hexagon':
         case 'bar':
-        case 'guage':
+        case 'gauge':
         case 'treemap':
         case 'pie':
           return true
@@ -127,7 +127,7 @@ export default {
         case 'pie':
         case 'stat':
         case 'hexagon':
-        case 'guage':
+        case 'gauge':
           return false
         case 'line':
         case 'area':
@@ -144,7 +144,7 @@ export default {
         case 'pie':
         case 'stat':
         case 'hexagon':
-        case 'guage':
+        case 'gauge':
           return true
         case 'line':
         case 'area':
diff --git a/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js b/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
index d619b341c..1fb702d7e 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
+++ b/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
@@ -90,8 +90,8 @@ export default {
           name: this.$t('dashboard.panel.chartForm.typeVal.bar.label')
         },
         {
-          id: 'guage',
-          name: this.$t('dashboard.panel.chartForm.typeVal.guage.label')
+          id: 'gauge',
+          name: this.$t('dashboard.panel.chartForm.typeVal.gauge.label')
         },
         {
           id: 'treemap',
@@ -133,8 +133,8 @@ export default {
           name: this.$t('dashboard.panel.chartForm.typeVal.bar.label')
         },
         {
-          id: 'guage',
-          name: this.$t('dashboard.panel.chartForm.typeVal.guage.label')
+          id: 'gauge',
+          name: this.$t('dashboard.panel.chartForm.typeVal.gauge.label')
         },
         {
           id: 'treemap',
diff --git a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
index 442e289f9..af5c6086c 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
@@ -635,8 +635,8 @@ export default {
           name: this.$t('dashboard.panel.chartForm.typeVal.pie.label')
         },
         {
-          id: 'guage',
-          name: this.$t('dashboard.panel.chartForm.typeVal.guage.label')
+          id: 'gauge',
+          name: this.$t('dashboard.panel.chartForm.typeVal.gauge.label')
         },
         {
           id: 'treemap',
@@ -698,8 +698,8 @@ export default {
       switch (type) {
         case 'stat':
         case 'hexagon':
-        case 'guage':
-          if (this.oldType === 'stat' || this.oldType === 'guage' || this.oldType === 'hexagon') {
+        case 'gauge':
+          if (this.oldType === 'stat' || this.oldType === 'gauge' || this.oldType === 'hexagon') {
             break
           }
           this.chartConfig.param = {

From 19b89fe2bdb1ba3ad9abcbe48f11e17a604ebe29 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 8 Mar 2022 10:01:10 +0800
Subject: [PATCH 26/65] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9panel?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AF=BC=E5=85=A5=E4=B9=8B=E5=90=8E=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=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/chart/chart/chartTable.vue          |  2 +-
 nezha-fronted/src/components/chart/chartMixin.js       |  2 +-
 .../components/common/rightBox/chart/chartRightBox.vue | 10 +++++++++-
 nezha-fronted/src/components/page/dashboard/panel.vue  |  6 +++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartTable.vue b/nezha-fronted/src/components/chart/chart/chartTable.vue
index dde2bf9f3..4603288bc 100644
--- a/nezha-fronted/src/components/chart/chart/chartTable.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTable.vue
@@ -67,7 +67,7 @@ export default {
       }
       this.tableTimer = setTimeout(() => {
         this.columns = this.chartInfo.param.columns
-        this.chartInfo.param.valueMapping.forEach((item) => {
+        this.chartInfo.param.valueMapping && this.chartInfo.param.valueMapping.forEach((item) => {
           if (this.valueMapping[item.column]) {
             this.valueMapping[item.column].push(item)
           } else {
diff --git a/nezha-fronted/src/components/chart/chartMixin.js b/nezha-fronted/src/components/chart/chartMixin.js
index 1571af507..675b0be90 100644
--- a/nezha-fronted/src/components/chart/chartMixin.js
+++ b/nezha-fronted/src/components/chart/chartMixin.js
@@ -163,7 +163,7 @@ export default {
     },
     selectMapping (value, valueMapping, show) {
       let mapping = ''
-      if (show) {
+      if (show && valueMapping) {
         valueMapping.forEach(item => {
           if (item.type === 'value') {
             if (value == item.value) {
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
index 6da9c3bf8..7e4bbd45f 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
@@ -445,7 +445,15 @@ export default {
       deep: true,
       immediate: true,
       handler (n) {
-        this.editChart = JSON.parse(JSON.stringify(n))
+        const obj = JSON.parse(JSON.stringify(n))
+        console.log(obj)
+        if (obj.param && !obj.param.valueMapping) {
+          obj.param.valueMapping = []
+        }
+        if (obj.param && !obj.param.thresholds) {
+          obj.param.thresholds = []
+        }
+        this.editChart = obj
         if (this.editChart.groupId === -1) {
           this.editChart.groupId = ''
         }
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index c7c268377..3f74917f0 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -60,7 +60,7 @@
                 export-file-name="chart"
                 export-url="/visual/panel/export"
                 import-url="/visual/panel/import"
-                @afterImport="dateChange"
+                @afterImport="afterImport"
               >
                 <template v-slot:before>
                   <el-dropdown-item>
@@ -812,6 +812,10 @@ export default {
       if (type === 'duplicate') {
         this.editChart(chartInfo, true)
       }
+    },
+    afterImport () {
+      this.dateChange()
+      this.panelReloadOnlyPanel()
     }
   },
   created () {

From 334f41299fb2621fd029d0fc8eefa155131607a9 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 8 Mar 2022 11:03:12 +0800
Subject: [PATCH 27/65] =?UTF-8?q?NEZ-1641=20fix=EF=BC=9A=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E6=A0=BC=E5=BC=8F=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E7=BD=AE=E8=87=AA=E5=AE=9A=E4=B9=89=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/mixin/system/systemMixin.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nezha-fronted/src/components/common/mixin/system/systemMixin.js b/nezha-fronted/src/components/common/mixin/system/systemMixin.js
index b61375c77..326896696 100644
--- a/nezha-fronted/src/components/common/mixin/system/systemMixin.js
+++ b/nezha-fronted/src/components/common/mixin/system/systemMixin.js
@@ -77,6 +77,7 @@ export default {
                 localStorage.setItem('nz-sys-timezone', param.timezone)
                 localStorage.setItem('timezoneOffset', moment.tz(param.timezone).format('Z'))
                 localStorage.setItem('nz-default-dateFormat', param.date_format)
+                this.$store.commit('setTimeFormatMain', param.date_format)
               }
               this.dateFormatTimer()
               setTimeout(() => {

From 5adbed0719ac9538cc250ee6df5506b2dd20fa3e Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 8 Mar 2022 11:10:05 +0800
Subject: [PATCH 28/65] =?UTF-8?q?NEZ-1636=20=20fix=EF=BC=9AAsset=E5=A4=8D?=
 =?UTF-8?q?=E5=88=B6cURL=E4=B8=8EWget=E6=97=B6=E9=BC=A0=E6=A0=87=E6=82=AC?=
 =?UTF-8?q?=E6=B5=AE=E6=8F=90=E7=A4=BA=E5=BB=BA=E8=AE=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/page/config/agent.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/page/config/agent.vue b/nezha-fronted/src/components/page/config/agent.vue
index a554dc845..106187581 100644
--- a/nezha-fronted/src/components/page/config/agent.vue
+++ b/nezha-fronted/src/components/page/config/agent.vue
@@ -79,14 +79,14 @@
           </el-form-item>
           <el-form-item label="cURL"  v-if="loadFinish" class="download-url">
             <el-input id="download-url-curl" :disabled="true" v-model="curlUrl">
-              <el-popover :content="$t('tip.copySuccess')" placement="top" trigger="manual" v-model="curlVisible" popper-class="small-pop" slot="suffix" @after-enter="popShow('curl')">
+              <el-popover :content="$t('tip.copySuccess')" placement="top" trigger="manual" v-model="curlVisible" popper-class="small-pop" slot="suffix" @after-enter="popShow('curl')"  style="cursor: pointer">
                 <i slot="reference" class="nz-icon nz-icon-override" @click="copyUrl('download-url-curl')"></i>
               </el-popover>
             </el-input>
           </el-form-item>
           <el-form-item label="Wget"  v-if="loadFinish" class="download-url">
-            <el-input id="download-url-wget" :disabled="true" v-model="wgetUrl">
-              <el-popover :content="$t('tip.copySuccess')" placement="top" trigger="manual" v-model="wgetVisible" popper-class="small-pop" slot="suffix" @after-enter="popShow('wget')">
+            <el-input id="download-url-wget" :disabled="true" v-model="wgetUrl" >
+              <el-popover :content="$t('tip.copySuccess')" placement="top" trigger="manual" v-model="wgetVisible" popper-class="small-pop" slot="suffix" @after-enter="popShow('wget')" style="cursor: pointer">
                 <i slot="reference" class="nz-icon nz-icon-override" @click="copyUrl('download-url-wget')"></i>
               </el-popover>
             </el-input>

From d0726092c369d12b342650381fd663ea773c6076 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 8 Mar 2022 11:22:26 +0800
Subject: [PATCH 29/65] =?UTF-8?q?NEZ-1633=20fix=EF=BC=9AMessages=E5=86=85?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=91=8A=E8=AD=A6=E5=9B=BE=E8=A1=A8=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E8=87=AA=E5=AE=9A=E4=B9=89=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=B2=A1=E6=9C=89=E5=BC=B9=E5=87=BA=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chartList.vue           | 1 +
 nezha-fronted/src/components/charts/chart-alert-list.vue   | 4 ++--
 .../src/components/charts/chart-bar-statistics.vue         | 2 +-
 nezha-fronted/src/components/charts/chart-pie.vue          | 2 +-
 nezha-fronted/src/components/charts/chart-single-stat.vue  | 2 +-
 nezha-fronted/src/components/charts/chart-table.vue        | 2 +-
 nezha-fronted/src/components/charts/chart-url.vue          | 2 +-
 nezha-fronted/src/components/charts/chartPreview.vue       | 2 +-
 nezha-fronted/src/components/charts/diagram-chart.vue      | 2 +-
 nezha-fronted/src/components/charts/line-chart-block.vue   | 2 +-
 nezha-fronted/src/components/charts/logs.vue               | 2 +-
 nezha-fronted/src/components/charts/text-chart.vue         | 2 +-
 .../src/components/common/ChartDiagram/diagram.vue         | 1 +
 .../common/bottomBox/tabs/alertMessageTabNew.vue           | 2 +-
 .../components/common/bottomBox/tabs/endpointQueryTab.vue  | 3 +--
 .../common/detailView/list/alertRule/alertRuleDetail.vue   | 2 +-
 nezha-fronted/src/components/common/exportXLSX.vue         | 2 +-
 nezha-fronted/src/components/common/latlngPicker.vue       | 2 +-
 nezha-fronted/src/components/common/login.vue              | 4 ++--
 nezha-fronted/src/components/common/popBox/guide.vue       | 1 +
 .../src/components/common/popBox/topToolMoreOptions.vue    | 2 +-
 nezha-fronted/src/components/common/project/topologyL5.vue | 1 +
 .../src/components/common/rightBox/chart/chartRightBox.vue | 1 +
 nezha-fronted/src/components/page/alert/alertMessage.vue   | 7 ++++---
 nezha-fronted/src/components/page/alert/alertSilence.vue   | 2 +-
 nezha-fronted/src/components/page/config/agent.vue         | 2 +-
 nezha-fronted/src/components/page/config/profile.vue       | 4 ++--
 .../src/components/page/config/template/exprTemp.vue       | 2 +-
 .../src/components/page/dashboard/explore/promqlInput.vue  | 1 +
 .../src/components/page/monitor/endpoint/endpointList.vue  | 2 +-
 30 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue
index 7112ffa7f..e39b61f8e 100644
--- a/nezha-fronted/src/components/chart/chartList.vue
+++ b/nezha-fronted/src/components/chart/chartList.vue
@@ -61,6 +61,7 @@
     </div>
     <!-- 全屏查看 -->
     <el-dialog
+      id="viewGraphDialog"
       v-if="fullscreen.visible"
       :visible.sync="fullscreen.visible"
       :show-close="false"
diff --git a/nezha-fronted/src/components/charts/chart-alert-list.vue b/nezha-fronted/src/components/charts/chart-alert-list.vue
index 316002fc9..2677a2f79 100644
--- a/nezha-fronted/src/components/charts/chart-alert-list.vue
+++ b/nezha-fronted/src/components/charts/chart-alert-list.vue
@@ -77,7 +77,7 @@
           <Pagination :pageObj="pageObj" @pageNo='pageNo'  @pageSize='pageSize' ref="Pagination" :append-to-body="false" pop-class="out-popper-fix" style="margin-top: 15px;"></Pagination>
         </div>
         <!--全屏-->
-        <el-dialog class="nz-dialog table-chart-dialog" id="dialog-alert-massage" :title="$t('dashboard.panel.view')"  :visible.sync="screenModal" width="96%"  @close="screenDialogClose" :modal-append-to-body="false">
+        <el-dialog class="nz-dialog table-chart-dialog" id="dialog-alert-massage viewGraphDialog" :title="$t('dashboard.panel.view')"  :visible.sync="screenModal" width="96%"  @close="screenDialogClose" :modal-append-to-body="false">
           <div slot="title">
             <span class="nz-dialog-title">{{data.name}}</span>
             <div class="float-right panel-calendar dialog-tool">
@@ -140,7 +140,7 @@
           </div>
         </el-dialog>
         <!--全屏-->
-        <el-dialog class="nz-dialog table-chart-dialog" :title="$t('alert.config.trbShot')"
+        <el-dialog id="viewGraphDialog" class="nz-dialog table-chart-dialog" :title="$t('alert.config.trbShot')"
                    :visible.sync="dialogShowText"
                    width="96%"  @close="dialogShowText = false" :modal-append-to-body="false">
           <div slot="title">
diff --git a/nezha-fronted/src/components/charts/chart-bar-statistics.vue b/nezha-fronted/src/components/charts/chart-bar-statistics.vue
index 7cd6ffe2c..8fe305ef9 100644
--- a/nezha-fronted/src/components/charts/chart-bar-statistics.vue
+++ b/nezha-fronted/src/components/charts/chart-bar-statistics.vue
@@ -60,7 +60,7 @@
           </div>
         </div>
         <!--全屏-->
-        <el-dialog class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')" @opened="initChart('screen')"
+        <el-dialog id="viewGraphDialog" class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')" @opened="initChart('screen')"
                    :visible.sync="screenModal"
                    width="96%"  @close="screenModal = false" :modal-append-to-body="false">
           <div slot="title">
diff --git a/nezha-fronted/src/components/charts/chart-pie.vue b/nezha-fronted/src/components/charts/chart-pie.vue
index 36e0796fd..08efca815 100644
--- a/nezha-fronted/src/components/charts/chart-pie.vue
+++ b/nezha-fronted/src/components/charts/chart-pie.vue
@@ -60,7 +60,7 @@
           </div>
         </div>
         <!--全屏-->
-        <el-dialog class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')" @opened="initChart('screen')"
+        <el-dialog id="viewGraphDialog" class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')" @opened="initChart('screen')"
                    :visible.sync="screenModal"
                    width="96%"  @close="screenModal = false" :modal-append-to-body="false">
           <div slot="title">
diff --git a/nezha-fronted/src/components/charts/chart-single-stat.vue b/nezha-fronted/src/components/charts/chart-single-stat.vue
index e0621a00e..5d3e7a2ab 100644
--- a/nezha-fronted/src/components/charts/chart-single-stat.vue
+++ b/nezha-fronted/src/components/charts/chart-single-stat.vue
@@ -58,7 +58,7 @@
           </div>
         </div>
         <!--全屏-->
-        <el-dialog class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')"
+        <el-dialog id="viewGraphDialog" class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')"
                    :visible.sync="screenModal"
                    width="96%"  @close="screenModal = false" :modal-append-to-body="false">
           <div slot="title">
diff --git a/nezha-fronted/src/components/charts/chart-table.vue b/nezha-fronted/src/components/charts/chart-table.vue
index a7ff38b7f..713d40eed 100644
--- a/nezha-fronted/src/components/charts/chart-table.vue
+++ b/nezha-fronted/src/components/charts/chart-table.vue
@@ -79,7 +79,7 @@
                       ref="Pagination" :append-to-body="false" pop-class="out-popper-fix"></Pagination>
         </div>
         <!--全屏-->
-        <el-dialog class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')" :visible.sync="screenModal"
+        <el-dialog id="viewGraphDialog" class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')" :visible.sync="screenModal"
                    width="96%" @close="screenModal = false" :modal-append-to-body="false">
           <div slot="title">
             <span class="nz-dialog-title">{{data.name}}</span>
diff --git a/nezha-fronted/src/components/charts/chart-url.vue b/nezha-fronted/src/components/charts/chart-url.vue
index 76f29e076..a18d0d256 100644
--- a/nezha-fronted/src/components/charts/chart-url.vue
+++ b/nezha-fronted/src/components/charts/chart-url.vue
@@ -50,7 +50,7 @@
           <div  :id="'staticContainer'+chartIndex" class="center-content"></div>
         </div>
         <!--全屏-->
-        <el-dialog class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')"  :visible.sync="screenModal" width="96%" @opened="initDialog"  @close="screenModal = false" >
+        <el-dialog  id="viewGraphDialog"class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')"  :visible.sync="screenModal" width="96%" @opened="initDialog"  @close="screenModal = false" >
           <div slot="title">
             <span class="nz-dialog-title">{{chartData.name}}</span>
           </div>
diff --git a/nezha-fronted/src/components/charts/chartPreview.vue b/nezha-fronted/src/components/charts/chartPreview.vue
index c98efa7d4..bfb090ba0 100644
--- a/nezha-fronted/src/components/charts/chartPreview.vue
+++ b/nezha-fronted/src/components/charts/chartPreview.vue
@@ -12,7 +12,7 @@
   }
 </style>
 <template>
-    <el-dialog class="chart-preview-dialog nz-dialog" id="chartPreviewDailog"
+    <el-dialog class="chart-preview-dialog nz-dialog" id="chartPreviewDailog viewGraphDialog"
                :visible.sync="screenModal"
                :width="dailogWidth"
                :modal-append-to-body='false'
diff --git a/nezha-fronted/src/components/charts/diagram-chart.vue b/nezha-fronted/src/components/charts/diagram-chart.vue
index ba60a4f44..468260f1d 100644
--- a/nezha-fronted/src/components/charts/diagram-chart.vue
+++ b/nezha-fronted/src/components/charts/diagram-chart.vue
@@ -46,7 +46,7 @@
           </div>
         </div>
         <!--全屏-->
-        <el-dialog class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')"
+        <el-dialog id="viewGraphDialog" class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')"
                    :visible.sync="screenModal"
                    width="96%"  @close="screenModal = false" :modal-append-to-body="false">
           <div slot="title">
diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue
index 6f97eede6..7673da968 100644
--- a/nezha-fronted/src/components/charts/line-chart-block.vue
+++ b/nezha-fronted/src/components/charts/line-chart-block.vue
@@ -109,7 +109,7 @@
         </template>
         <!--
         <Modal title="查看" v-model="screenModal" width="96%" class="line-chart-block-modal">-->
-        <el-dialog class="line-chart-block-modal nz-dialog"
+        <el-dialog id="viewGraphDialog" class="line-chart-block-modal nz-dialog"
                    :title="$t('dashboard.panel.view')"
                    :visible.sync="screenModal"
                    width="90%"
diff --git a/nezha-fronted/src/components/charts/logs.vue b/nezha-fronted/src/components/charts/logs.vue
index bb598dd13..158c9ba94 100644
--- a/nezha-fronted/src/components/charts/logs.vue
+++ b/nezha-fronted/src/components/charts/logs.vue
@@ -66,7 +66,7 @@
           </div>
         </div>
         <!--全屏-->
-        <el-dialog class="nz-dialog table-chart-dialog"
+        <el-dialog id="viewGraphDialog" class="nz-dialog table-chart-dialog"
                    :title="$t('dashboard.panel.view')"
                    :visible.sync="screenModal"
                    width="90%"
diff --git a/nezha-fronted/src/components/charts/text-chart.vue b/nezha-fronted/src/components/charts/text-chart.vue
index 9524f850e..a154a5b9c 100644
--- a/nezha-fronted/src/components/charts/text-chart.vue
+++ b/nezha-fronted/src/components/charts/text-chart.vue
@@ -48,7 +48,7 @@
           </div>
         </div>
         <!--全屏-->
-        <el-dialog class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')"
+        <el-dialog id="viewGraphDialog" class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')"
                    :visible.sync="screenModal"
                    width="96%"  @close="screenModal = false" :modal-append-to-body="false">
           <div slot="title">
diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
index 196a5da18..ce8c9a62c 100644
--- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
+++ b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
@@ -245,6 +245,7 @@
     </transition>
     <!--Custom picture-->
     <el-dialog
+      id="viewGraphDialog"
       :title="title"
       :visible.sync="uploadPicShow"
       width="auto"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index 028cee1bc..2cefdc1a0 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -98,7 +98,7 @@
         @showFullscreen="showFullscreen"
       ></panel-chart>
     </el-dialog>
-    <el-dialog class="nz-dialog table-chart-dialog" :title="$t('alert.config.trbShot')"
+    <el-dialog id="viewGraphDialog" class="nz-dialog table-chart-dialog" :title="$t('alert.config.trbShot')"
                :visible.sync="dialogShowText"
                width="96%"  @close="dialogShowText = false" :modal-append-to-body="false">
       <div slot="title">
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
index a3e8f782b..184775dc6 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
@@ -106,12 +106,11 @@
     </pl-table>
     <button :class="{'to-top-is-hover': tools.tableHover}" @click="toTop(scrollbarWrap)" class="to-top" v-show="tools.showTopBtn" id="endpoint-list-totop"><i class="nz-icon nz-icon-top"></i></button>
 
-    <el-dialog class="line-chart-block-modal nz-dialog endpoint-dialog"
+    <el-dialog id="viewGraphDialog" class="line-chart-block-modal nz-dialog endpoint-dialog"
                :title="$t('project.endpoint.dialogTitle')"
                :visible.sync="graphShow"
                width="90%"
                :modal-append-to-body="false"
-               id="viewGraphDialog"
                @close="dialogClose">
       <div slot="title">
         {{$t("project.endpoint.dialogTitle")}}
diff --git a/nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue b/nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue
index 13b9fbe66..b40dc56fb 100644
--- a/nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue
+++ b/nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue
@@ -44,7 +44,7 @@
         </div>
       </li>
     </ul>
-    <el-dialog class="nz-dialog table-chart-dialog" :title="$t('alert.config.trbShot')"
+    <el-dialog id="viewGraphDialog" class="nz-dialog table-chart-dialog" :title="$t('alert.config.trbShot')"
                :visible.sync="dialogShowText"
                width="96%"  @close="dialogShowText = false" :modal-append-to-body="false">
       <div slot="title">
diff --git a/nezha-fronted/src/components/common/exportXLSX.vue b/nezha-fronted/src/components/common/exportXLSX.vue
index 3b4e59423..9990c98cf 100644
--- a/nezha-fronted/src/components/common/exportXLSX.vue
+++ b/nezha-fronted/src/components/common/exportXLSX.vue
@@ -13,7 +13,7 @@
       </button>
     </div>
 
-    <el-dialog :close-on-click-modal="importBox.type!=3" :show-close="true" :title="importBox.title" :visible.sync="importBox.show" :width="importBox.width" append-to-body class="nz-dialog" @close="closeDialog">
+    <el-dialog id="viewGraphDialog" :close-on-click-modal="importBox.type!=3" :show-close="true" :title="importBox.title" :visible.sync="importBox.show" :width="importBox.width" append-to-body class="nz-dialog" @close="closeDialog">
       <div v-if="importBox.type == 1">
         <div class="upload-body">
           <el-upload drag class="upload-demo" ref="uploadExcel"  action="" :file-list="importFileList" :on-change="importChange"  :auto-upload="false" accept=".xlsx,.xls" :id="id+'-xlsx-input-file'">
diff --git a/nezha-fronted/src/components/common/latlngPicker.vue b/nezha-fronted/src/components/common/latlngPicker.vue
index 846bae9c7..a4106e5c1 100644
--- a/nezha-fronted/src/components/common/latlngPicker.vue
+++ b/nezha-fronted/src/components/common/latlngPicker.vue
@@ -13,7 +13,7 @@
       </div>
       <div class="input-box-item" style="margin-right: unset !important;width: 30px !important;flex:unset;" @click="mapConfigVisible = true"><i class="nz-icon nz-icon-weizhi" style="color:rgb(238, 157, 63)"></i></div>
     </div>
-    <el-dialog :visible.sync="mapConfigVisible" :title="$t('config.system.basic.mapTitle')" width="calc(50% - 10px)"  @close="mapClose" @opened="initMap" class=" nz-dialog map-config-dialog" :modal-append-to-body="appendToBody">
+    <el-dialog id="viewGraphDialog" :visible.sync="mapConfigVisible" :title="$t('config.system.basic.mapTitle')" width="calc(50% - 10px)"  @close="mapClose" @opened="initMap" class=" nz-dialog map-config-dialog" :modal-append-to-body="appendToBody">
       <div id="map" style="height: 100%; width: 100%"></div>
     </el-dialog>
   </div>
diff --git a/nezha-fronted/src/components/common/login.vue b/nezha-fronted/src/components/common/login.vue
index 34e0407d5..5152b7268 100644
--- a/nezha-fronted/src/components/common/login.vue
+++ b/nezha-fronted/src/components/common/login.vue
@@ -51,7 +51,7 @@
     <div class="login-foot-buildOn">
       <span><a target="_blank" rel="noopener noreferrer" href='https://prometheus.io'>Build on Prometheus</a></span>
     </div>
-    <el-dialog :visible.sync="authBindShow" :title="$t('login.verifyDialogTitle')" :modal-append-to-body='false'
+    <el-dialog id="viewGraphDialog" :visible.sync="authBindShow" :title="$t('login.verifyDialogTitle')" :modal-append-to-body='false'
                :show-close="true" width="620px" class="nz-dialog" >
 
       <div v-loading="dialogLoading">
@@ -85,7 +85,7 @@
         </button>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="fileShow" :title="$t('login.verifyDialogTitle')" :modal-append-to-body='false'
+    <el-dialog id="viewGraphDialog" :visible.sync="fileShow" :title="$t('login.verifyDialogTitle')" :modal-append-to-body='false'
                :show-close="true" width="620px" class="nz-dialog" >
 
       <div>
diff --git a/nezha-fronted/src/components/common/popBox/guide.vue b/nezha-fronted/src/components/common/popBox/guide.vue
index 3e7616c07..e2cc14da0 100644
--- a/nezha-fronted/src/components/common/popBox/guide.vue
+++ b/nezha-fronted/src/components/common/popBox/guide.vue
@@ -1,5 +1,6 @@
 <template>
   <el-dialog
+    id="viewGraphDialog"
     :title="$t('guide.title')"
     :visible.sync="visible"
     custom-class="guild-pop"
diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
index 84829587e..dab8cfebd 100644
--- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
+++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
@@ -19,7 +19,7 @@
       <slot name="after"></slot>
     </el-dropdown-menu>
 
-    <el-dialog :close-on-click-modal="importBox.type!=3" destroy-on-close :show-close="true" :title="importBox.title" :visible.sync="importBox.show" :width="importBox.width" append-to-body class="nz-dialog" @close="closeDialog">
+    <el-dialog id="viewGraphDialog" :close-on-click-modal="importBox.type!=3" destroy-on-close :show-close="true" :title="importBox.title" :visible.sync="importBox.show" :width="importBox.width" append-to-body class="nz-dialog" @close="closeDialog">
       <div v-if="importBox.type == 1">
         <div class="upload-body">
           <el-upload :id="id+'-xlsx-input-file'" ref="uploadExcel" :auto-upload="false"  :file-list="importFileList" :on-change="importChange" accept=".xlsx,.xls"  action="" class="upload-demo" drag>
diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue
index d9d46af89..36f371277 100644
--- a/nezha-fronted/src/components/common/project/topologyL5.vue
+++ b/nezha-fronted/src/components/common/project/topologyL5.vue
@@ -271,6 +271,7 @@
     </transition>
     <!--Custom picture-->
     <el-dialog
+      id="viewGraphDialog"
       :title="title"
       :visible.sync="uploadPicShow"
       width="auto"
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
index 7e4bbd45f..fc7d6407a 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
@@ -101,6 +101,7 @@
     </div>
 <!--    预览-->
     <el-dialog
+      id="viewGraphDialog"
       v-if="previewShow"
       :visible.sync="previewShow"
       :show-close="false"
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index fbbee775f..6c7136fd2 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -56,7 +56,7 @@
     </nz-data-list>
     <!--导出-->
     <div class="export-xlsx">
-      <el-dialog :modal-append-to-body='false' :show-close="true" :title="importBox.title" :visible.sync="importBox.show" class="nz-dialog" width="600px" @close="closeDialog">
+      <el-dialog id="viewGraphDialog" :modal-append-to-body='false' :show-close="true" :title="importBox.title" :visible.sync="importBox.show" class="nz-dialog" width="600px" @close="closeDialog">
         <div class="upload-body" style="height: 170px">
           <div class="export-box">
             <span class="export-title">Records</span>
@@ -85,7 +85,7 @@
     </div>
     <!--删除弹窗-->
     <div class="export-xlsx">
-      <el-dialog :modal-append-to-body='false' :show-close="true" :title="$t('overall.remark')" :visible.sync="deleteBox.show" class="nz-message"  width="450px" @close="closeDialog" @opened="openedDialog">
+      <el-dialog id="viewGraphDialog" :modal-append-to-body='false' :show-close="true" :title="$t('overall.remark')" :visible.sync="deleteBox.show" class="nz-message"  width="450px" @close="closeDialog" @opened="openedDialog">
         <div class="upload-body">
           <el-form ref="remarkForm" :model="deleteBox">
             <el-form-item :rules="[{required:true,message: $t('validate.required'), trigger: 'change'}]" prop="remark">
@@ -104,6 +104,7 @@
       </el-dialog>
     </div>
     <el-dialog
+      id="viewGraphDialog"
       v-if="graphShow"
       :visible.sync="graphShow"
       :show-close="false"
@@ -123,7 +124,7 @@
       ></panel-chart>
     </el-dialog>
     <!--全屏-->
-    <el-dialog class="nz-dialog table-chart-dialog" :title="$t('alert.config.trbShot')"
+    <el-dialog id="viewGraphDialog" class="nz-dialog table-chart-dialog" :title="$t('alert.config.trbShot')"
                :visible.sync="dialogShowText"
                width="96%"  @close="dialogShowText = false" :modal-append-to-body="false">
       <div slot="title">
diff --git a/nezha-fronted/src/components/page/alert/alertSilence.vue b/nezha-fronted/src/components/page/alert/alertSilence.vue
index 81a02ff06..d3f7e4444 100644
--- a/nezha-fronted/src/components/page/alert/alertSilence.vue
+++ b/nezha-fronted/src/components/page/alert/alertSilence.vue
@@ -45,7 +45,7 @@
     </transition>
     <!--导出-->
     <div class="export-xlsx">
-      <el-dialog :modal-append-to-body='false' :show-close="true" :title="importBox.title"
+      <el-dialog id="viewGraphDialog" :modal-append-to-body='false' :show-close="true" :title="importBox.title"
                  :visible.sync="importBox.show" class="nz-dialog" width="300px" @close="closeDialog">
         <div class="upload-body">
           <button id="alert-msg-exportcur" class="el-button el-button--default el-button--small" @click="exportCur">
diff --git a/nezha-fronted/src/components/page/config/agent.vue b/nezha-fronted/src/components/page/config/agent.vue
index 106187581..336215725 100644
--- a/nezha-fronted/src/components/page/config/agent.vue
+++ b/nezha-fronted/src/components/page/config/agent.vue
@@ -45,7 +45,7 @@
     <transition name="right-box">
       <agent-box v-if="rightBox.show" :agent="object" @close="closeRightBox"></agent-box>
     </transition>
-    <el-dialog :title="$t('config.agent.agent.title')" :visible.sync="showAgentDownload" append-to-body class="nz-dialog agent-dialog" width="800px" @close="closeDialog">
+    <el-dialog id="viewGraphDialog" :title="$t('config.agent.agent.title')" :visible.sync="showAgentDownload" append-to-body class="nz-dialog agent-dialog" width="800px" @close="closeDialog">
       <div v-if="showAgentDownload" class="agent-box">
         <el-form v-model="agentParam" class="right-box-form right-box-form-left" label-position = "top" label-width="120px" size="small" style="width: 100%">
           <div class="right-box-sub-title">{{$t('config.agent.agent.download')}}</div>
diff --git a/nezha-fronted/src/components/page/config/profile.vue b/nezha-fronted/src/components/page/config/profile.vue
index 3d2575f45..aa18dab5a 100644
--- a/nezha-fronted/src/components/page/config/profile.vue
+++ b/nezha-fronted/src/components/page/config/profile.vue
@@ -72,7 +72,7 @@
       </div>
     </div>
     <operation-record class="profile-right"/>
-    <el-dialog :visible.sync="authBindShow" :title="$t('login.verifyDialogTitle')" :modal-append-to-body='false'
+    <el-dialog id="viewGraphDialog" :visible.sync="authBindShow" :title="$t('login.verifyDialogTitle')" :modal-append-to-body='false'
                :show-close="true" width="620px" class="nz-dialog" @closed="closeDialog">
 
       <div v-loading="dialogLoading">
@@ -106,7 +106,7 @@
         </button>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="fileShow" :title="$t('login.verifyDialogTitle')" :modal-append-to-body='false'
+    <el-dialog id="viewGraphDialog" :visible.sync="fileShow" :title="$t('login.verifyDialogTitle')" :modal-append-to-body='false'
                :show-close="true" width="620px" class="nz-dialog" @closed="fileClosed">
 
       <div>
diff --git a/nezha-fronted/src/components/page/config/template/exprTemp.vue b/nezha-fronted/src/components/page/config/template/exprTemp.vue
index e302a7c4e..2e462d244 100644
--- a/nezha-fronted/src/components/page/config/template/exprTemp.vue
+++ b/nezha-fronted/src/components/page/config/template/exprTemp.vue
@@ -63,7 +63,7 @@
     </transition>
     <!--导出-->
     <div class="export-xlsx">
-      <el-dialog :visible.sync="importBox.show" :title="importBox.title" :modal-append-to-body='false'
+      <el-dialog id="viewGraphDialog" :visible.sync="importBox.show" :title="importBox.title" :modal-append-to-body='false'
                  :show-close="true" width="300px" @close="closeDialog" class="nz-dialog">
         <div class="upload-body">
           <button @click="exportCur" class="el-button el-button--default el-button--small" id="alert-msg-exportcur">
diff --git a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
index ae8ad6164..21b946a15 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
@@ -103,6 +103,7 @@
     </div>
 
     <el-dialog
+      id="viewGraphDialog"
       :visible.sync="tempBoxShow"
       :append-to-body="true"
       :width="'auto'"
diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
index 9e5060c78..8102e11bf 100644
--- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
+++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
@@ -164,7 +164,7 @@
     </transition>
     <transition name="right-box"><alert-silence-box v-if='silenceBoxShow' :alert-silence="objectSilence" @close="closeSilenceBox"></alert-silence-box>
 </transition>
-    <el-dialog :close-on-click-modal="false" :show-close="true" destroy-on-close :title='$t("overall.batchAddEndpoint")' :visible.sync="importBoxShow" :width="'600px'" append-to-body class="nz-dialog" @close="closeDialog">
+    <el-dialog id="viewGraphDialog" :close-on-click-modal="false" :show-close="true" destroy-on-close :title='$t("overall.batchAddEndpoint")' :visible.sync="importBoxShow" :width="'600px'" append-to-body class="nz-dialog" @close="closeDialog">
       <div class="upload-body result-body">
         <div v-if="importResult&&importResult.failNum">
           <div class="result-title-top">

From 253bfcf883b83511e7a03fdd4a9977ea19599d57 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 8 Mar 2022 11:35:22 +0800
Subject: [PATCH 30/65] =?UTF-8?q?NEZ-1629=20fix=EF=BC=9A=20Explore?=
 =?UTF-8?q?=E5=86=85=E7=94=9F=E6=88=90=E8=A1=A8=E8=BE=BE=E5=BC=8F=E5=90=8E?=
 =?UTF-8?q?=E7=82=B9=E5=87=BBSave=20chart=E6=8C=89=E9=92=AE=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=9B=BE=E8=A1=A8=E6=97=B6=E5=BC=B9=E5=87=BA=E4=BE=A7?=
 =?UTF-8?q?=E6=BB=91=E6=A1=86=E5=86=85=E6=B2=A1=E6=9C=89=E8=A1=A8=E8=BE=BE?=
 =?UTF-8?q?=E5=BC=8F=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/table/settings/mibTable.vue     | 4 ++--
 .../src/components/page/dashboard/explore/exploreItem.vue | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/common/table/settings/mibTable.vue b/nezha-fronted/src/components/common/table/settings/mibTable.vue
index a773f1a03..c8e3fe541 100644
--- a/nezha-fronted/src/components/common/table/settings/mibTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/mibTable.vue
@@ -40,8 +40,8 @@
         </template>
         <template v-else-if="item.prop === 'modelsDetail' && scope.row['modelsDetail'] && scope.row['modelsDetail'].length >0" >
           <div style="height: 100%">
-            <div style="height: 100%; overflow: auto;">
-              <div v-for="(n,i) in scope.row['modelsDetail']" :key="n.name+'-'+n.id+'-'+i" class="detail-item-content">
+            <div style="height: 100%; overflow: auto;" v-if="scope.row['modelsDetail']">
+              <div v-for="(n,i) in scope.row['modelsDetail']" :key="n.name+'-'+n.id+'-'+i" class="detail-item-content" v-if="n">
                 <el-popover placement="top" trigger="hover" >
                   <div>
                     <div>
diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
index 025c40c49..6a0476302 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
@@ -320,7 +320,7 @@ instance_cpu_time_ns{app="fox", proc="widget", rev="4d3a513", env="prod", job="c
       </div>
     </div>
     <transition name="right-box">
-      <chartRightBox v-if="rightBox.show" ref="addChartModal" :chart="chart" :from="$CONSTANTS.fromRoute.explore" :panel-data="panelData" :show-panel="{id: -1, name: '', type: 'explore'}" @close="handleBox(false)" @on-create-success="createSuccess"></chartRightBox>
+      <chartRightBox v-if="rightBox.show" ref="addChartModal" :chart="chartData" :from="$CONSTANTS.fromRoute.explore" :panel-data="panelData" :show-panel="{id: -1, name: '', type: 'explore'}" @close="handleBox(false)" @on-create-success="createSuccess"></chartRightBox>
     </transition>
   </div>
 </template>
@@ -406,7 +406,7 @@ export default {
       panelData: [],
       chartUnit: 0,
       historyParam: { useHistory: true, key: 'expore-history' },
-      chart: {},
+      chartData: {},
       collapseValue: ['1', '2'],
       showTab: ['1', '2'],
       logData: []
@@ -960,7 +960,7 @@ export default {
         panelName: '',
         type: 'line',
         span: 4,
-        datasource: '1',
+        datasource: 'metrics',
         height: 4,
         unit: 2,
         param: {
@@ -979,7 +979,7 @@ export default {
       this.expressions.forEach((exp, index) => {
         chart.elements.push({ expression: exp, legend: '', type: 'expert', id: '', name: 'A' })
       })
-      this.chart = chart
+      this.chartData = chart
       this.rightBox.show = true
     },
     createSuccess (type, response, param, panel) { // 添加chart成功

From 4f053ae3b63146492855d5f7abf0adacdb8b01d1 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 8 Mar 2022 18:06:23 +0800
Subject: [PATCH 31/65] =?UTF-8?q?NEZ-1643=20=20fix=EF=BC=9A=20Asset=20?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=20=E4=B8=80=E6=AC=A1=E6=80=A7=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E6=89=80=E6=9C=89=E5=9B=BE=E8=A1=A8,=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=8C=89=E6=BB=9A=E5=8A=A8=E6=9D=A1=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=8A=A0=E8=BD=BD=E9=80=A0=E6=88=90=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=8D=A1=E9=A1=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/chart/chart/chartGroup.vue |  2 +-
 .../src/components/chart/chart/chartTable.vue |  2 +-
 .../src/components/chart/chartList.vue        | 20 ++++++++++++-------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartGroup.vue b/nezha-fronted/src/components/chart/chart/chartGroup.vue
index 52cd914cb..7265d10a1 100644
--- a/nezha-fronted/src/components/chart/chart/chartGroup.vue
+++ b/nezha-fronted/src/components/chart/chart/chartGroup.vue
@@ -56,7 +56,7 @@ export default {
           return {
             ...item,
             // hide: item.name.indexOf(this.filter.searchName) === -1, // 搜索条件
-            loaded: true
+            loaded: false
           }
         })
       }, 100)
diff --git a/nezha-fronted/src/components/chart/chart/chartTable.vue b/nezha-fronted/src/components/chart/chart/chartTable.vue
index 4603288bc..3dcb4ec23 100644
--- a/nezha-fronted/src/components/chart/chart/chartTable.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTable.vue
@@ -94,7 +94,7 @@ export default {
     initTableData (chartInfo, originalDatas) {
       let colorIndex = 0
       const returnData = {}
-      const arr = chartInfo.param.indexs.split(',')
+      const arr = chartInfo.param.indexs?chartInfo.param.indexs.split(',') : []
       const tableInitialData = lodash.cloneDeep(originalDatas)
       tableInitialData.forEach((originalData, expressionIndex) => {
         let key = expressionIndex
diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue
index e39b61f8e..096b70c67 100644
--- a/nezha-fronted/src/components/chart/chartList.vue
+++ b/nezha-fronted/src/components/chart/chartList.vue
@@ -285,9 +285,9 @@ export default {
           const position = getLayoutPosition(this.copyDataList)
           this.$store.commit('setChartLastPosition', position)
         })
-      }, 300)
+      }, 1000)
     },
-    onScroll (scrollTop = 0) {
+    onScroll (scrollTop = 0, groupTop = 0) {
       const self = this
       if (this.scrollTopTimer) {
         clearTimeout(this.scrollTopTimer)
@@ -295,19 +295,25 @@ export default {
       }
       this.scrollTopTimer = setTimeout(() => {
         this.copyDataList.forEach(item => {
-          if (item.loaded) {
-            return
+          if (!this.$refs['grid-item' + item.id][0]) {
+            return;
           }
           const dom = this.$refs['grid-item' + item.id][0].$el
           if (dom) {
+            let top = dom.style.top
+            top = Number(top.substring(0, top.length - 2)) + groupTop
+            if (item.type === 'group') {
+              this.$refs['chart' + item.id][0] && this.$refs['chart' + item.id][0].$refs.chart.$refs['chart' + item.id] && this.$refs['chart' + item.id][0].$refs.chart.$refs['chart' + item.id].$refs.chartList.onScroll(scrollTop, top)
+            }
+            if (item.loaded) {
+              return
+            }
             const itemHeight = dom.offsetHeight
             // 1.元素距离页面顶部的距离
             // console.log(dom.style.transform)
 
             // let top = dom.style.transform.split(',')[1]
             // top = top.substring(0, top.length - 2)
-            let top = dom.style.top
-            top = top.substring(0, top.length - 2)
             const mainOffsetTop = top - this.stepWidth + 14// transform: grid组件 通过 tranfrom 控制位置 中间的为y的值 通过截取获得 - 父元素 marginTop的 值。
             // 2.元素的高度
             const mainHeight = itemHeight // ele.offsetHeight;//itemHeight;
@@ -317,7 +323,7 @@ export default {
             // 4.浏览器可见区域的高度
             const windowHeight = (window.innerHeight || document.documentElement.clientHeight) - 50 - 70
             // console.log(this.$refs['chart' + item.id][0].$el.offsetHeight, scrollTop,'scrollTop',windowHeight,mainOffsetTop + mainHeight / 4,(windowScrollTop + windowHeight))
-            if ((mainOffsetTop + mainHeight / 4) < (windowScrollTop + windowHeight) || self.isGroup) {
+            if ((mainOffsetTop + mainHeight / 4) < (windowScrollTop + windowHeight)) {
               item.loaded = true
               this.$refs['chart' + item.id][0].getChartData()
             }

From 712ceb94c78f22b5d535549ff523eafca97946d9 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 8 Mar 2022 18:13:25 +0800
Subject: [PATCH 32/65] =?UTF-8?q?fix=EF=BC=9A=E5=87=8F=E5=B0=91=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=8A=A5=E9=94=99=20=E4=BB=A5=E5=8F=8A=20group?=
 =?UTF-8?q?=E7=9A=84loading=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chartList.vue  | 2 +-
 nezha-fronted/src/components/chart/panelChart.vue | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue
index 096b70c67..9116969b9 100644
--- a/nezha-fronted/src/components/chart/chartList.vue
+++ b/nezha-fronted/src/components/chart/chartList.vue
@@ -303,7 +303,7 @@ export default {
             let top = dom.style.top
             top = Number(top.substring(0, top.length - 2)) + groupTop
             if (item.type === 'group') {
-              this.$refs['chart' + item.id][0] && this.$refs['chart' + item.id][0].$refs.chart.$refs['chart' + item.id] && this.$refs['chart' + item.id][0].$refs.chart.$refs['chart' + item.id].$refs.chartList.onScroll(scrollTop, top)
+              this.$refs['chart' + item.id][0] && this.$refs['chart' + item.id][0].$refs.chart && this.$refs['chart' + item.id][0].$refs.chart.$refs['chart' + item.id] && this.$refs['chart' + item.id][0].$refs.chart.$refs['chart' + item.id].$refs.chartList.onScroll(scrollTop, top)
             }
             if (item.loaded) {
               return
diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue
index 7a4b8fd00..f6273a8ae 100644
--- a/nezha-fronted/src/components/chart/panelChart.vue
+++ b/nezha-fronted/src/components/chart/panelChart.vue
@@ -334,6 +334,7 @@ export default {
             }
             if (this.chartInfo.type === 'group') {
               this.chartData = lodash.get(this, 'chartInfo.children', [])
+              this.loading = false
               this.groupInit()
             }
             if (this.chartInfo.type === 'topology') {

From 384154c99fe6ba5aa96da2b0920a5099191c7f6a Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 9 Mar 2022 10:16:56 +0800
Subject: [PATCH 33/65] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9alertMessage=20?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8Bchart=20=E5=A4=9AencodeURI=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=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/bottomBox/tabs/alertMessageTabNew.vue | 2 +-
 nezha-fronted/src/components/page/alert/alertMessage.vue        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index 2cefdc1a0..440f1bca4 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -610,7 +610,7 @@ export default {
             color: '#d64f40'
           }]
         }
-        chartInfo.elements[0].expression = encodeURIComponent(this.currentMsg.alertRule.expr.replace(/\"/g, '\'').replace(/\r|\n+/g, ''))
+        chartInfo.elements[0].expression = this.currentMsg.alertRule.expr.replace(/\"/g, '\'').replace(/\r|\n+/g, '')
         chartInfo.elements[0].filter = encodeURIComponent(decodeURIComponent(this.promQueryParamLabels(this.currentMsg.labels)))
         chartInfo.unit = this.currentMsg.unit
         this.showFullscreen(true, chartInfo)
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index 6c7136fd2..596fb83b3 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -593,7 +593,7 @@ export default {
             color: '#d64f40'
           }]
         }
-        chartInfo.elements[0].expression = encodeURIComponent(this.currentMsg.alertRule.expr.replace(/\"/g, '\'').replace(/\r|\n+/g, ''))
+        chartInfo.elements[0].expression = this.currentMsg.alertRule.expr.replace(/\"/g, '\'').replace(/\r|\n+/g, '')
         chartInfo.elements[0].filter = encodeURIComponent(decodeURIComponent(this.promQueryParamLabels(this.currentMsg.labels)))
         chartInfo.unit = this.currentMsg.unit
         this.showFullscreen(true, chartInfo)

From b44ceec0ca4c8defac0cadc680e881a121613ad6 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 9 Mar 2022 11:01:17 +0800
Subject: [PATCH 34/65] =?UTF-8?q?NEZ-1621=20=20fix=EF=BC=9A=20Data=20Cente?=
 =?UTF-8?q?rs=E9=93=BE=E6=8E=A5Open=20terminal=E6=97=B6=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=A4=8D=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chartList.vue            | 1 -
 nezha-fronted/src/components/charts/chart-alert-list.vue    | 3 +--
 .../src/components/charts/chart-bar-statistics.vue          | 2 +-
 nezha-fronted/src/components/charts/chart-pie.vue           | 2 +-
 nezha-fronted/src/components/charts/chart-single-stat.vue   | 2 +-
 nezha-fronted/src/components/charts/chart-table.vue         | 2 +-
 nezha-fronted/src/components/charts/chart-url.vue           | 2 +-
 nezha-fronted/src/components/charts/chartPreview.vue        | 2 +-
 nezha-fronted/src/components/charts/diagram-chart.vue       | 2 +-
 nezha-fronted/src/components/charts/line-chart-block.vue    | 2 +-
 nezha-fronted/src/components/charts/logs.vue                | 2 +-
 nezha-fronted/src/components/charts/text-chart.vue          | 2 +-
 .../src/components/common/ChartDiagram/diagram.vue          | 1 -
 nezha-fronted/src/components/common/bottomBox/bottomBox.vue | 2 +-
 .../components/common/bottomBox/tabs/alertMessageTabNew.vue | 2 +-
 .../components/common/bottomBox/tabs/endpointQueryTab.vue   | 2 +-
 .../common/detailView/list/alertRule/alertRuleDetail.vue    | 2 +-
 nezha-fronted/src/components/common/exportXLSX.vue          | 2 +-
 nezha-fronted/src/components/common/latlngPicker.vue        | 2 +-
 nezha-fronted/src/components/common/login.vue               | 4 ++--
 nezha-fronted/src/components/common/popBox/guide.vue        | 1 -
 .../src/components/common/popBox/topToolMoreOptions.vue     | 2 +-
 nezha-fronted/src/components/common/project/topologyL5.vue  | 1 -
 .../src/components/common/rightBox/chart/chartRightBox.vue  | 1 -
 .../components/common/table/special/endpointQueryTab.vue    | 1 -
 nezha-fronted/src/components/page/alert/alertMessage.vue    | 6 +++---
 nezha-fronted/src/components/page/alert/alertSilence.vue    | 2 +-
 nezha-fronted/src/components/page/config/agent.vue          | 2 +-
 nezha-fronted/src/components/page/config/profile.vue        | 4 ++--
 .../src/components/page/config/template/exprTemp.vue        | 2 +-
 .../src/components/page/dashboard/explore/promqlInput.vue   | 1 -
 .../src/components/page/monitor/endpoint/endpointList.vue   | 2 +-
 32 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue
index 9116969b9..9cfce4b6c 100644
--- a/nezha-fronted/src/components/chart/chartList.vue
+++ b/nezha-fronted/src/components/chart/chartList.vue
@@ -61,7 +61,6 @@
     </div>
     <!-- 全屏查看 -->
     <el-dialog
-      id="viewGraphDialog"
       v-if="fullscreen.visible"
       :visible.sync="fullscreen.visible"
       :show-close="false"
diff --git a/nezha-fronted/src/components/charts/chart-alert-list.vue b/nezha-fronted/src/components/charts/chart-alert-list.vue
index 2677a2f79..f9246417c 100644
--- a/nezha-fronted/src/components/charts/chart-alert-list.vue
+++ b/nezha-fronted/src/components/charts/chart-alert-list.vue
@@ -126,7 +126,6 @@
                    :visible.sync="graphShow"
                    width="90%"
                    :append-to-body="true"
-                   id="viewGraphDialog"
                    @close="dialogClose" :modal-append-to-body="false">
           <div slot="title">
             {{$t("project.endpoint.dialogTitle")}}
@@ -140,7 +139,7 @@
           </div>
         </el-dialog>
         <!--全屏-->
-        <el-dialog id="viewGraphDialog" class="nz-dialog table-chart-dialog" :title="$t('alert.config.trbShot')"
+        <el-dialog class="nz-dialog table-chart-dialog" :title="$t('alert.config.trbShot')"
                    :visible.sync="dialogShowText"
                    width="96%"  @close="dialogShowText = false" :modal-append-to-body="false">
           <div slot="title">
diff --git a/nezha-fronted/src/components/charts/chart-bar-statistics.vue b/nezha-fronted/src/components/charts/chart-bar-statistics.vue
index 8fe305ef9..7cd6ffe2c 100644
--- a/nezha-fronted/src/components/charts/chart-bar-statistics.vue
+++ b/nezha-fronted/src/components/charts/chart-bar-statistics.vue
@@ -60,7 +60,7 @@
           </div>
         </div>
         <!--全屏-->
-        <el-dialog id="viewGraphDialog" class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')" @opened="initChart('screen')"
+        <el-dialog class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')" @opened="initChart('screen')"
                    :visible.sync="screenModal"
                    width="96%"  @close="screenModal = false" :modal-append-to-body="false">
           <div slot="title">
diff --git a/nezha-fronted/src/components/charts/chart-pie.vue b/nezha-fronted/src/components/charts/chart-pie.vue
index 08efca815..36e0796fd 100644
--- a/nezha-fronted/src/components/charts/chart-pie.vue
+++ b/nezha-fronted/src/components/charts/chart-pie.vue
@@ -60,7 +60,7 @@
           </div>
         </div>
         <!--全屏-->
-        <el-dialog id="viewGraphDialog" class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')" @opened="initChart('screen')"
+        <el-dialog class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')" @opened="initChart('screen')"
                    :visible.sync="screenModal"
                    width="96%"  @close="screenModal = false" :modal-append-to-body="false">
           <div slot="title">
diff --git a/nezha-fronted/src/components/charts/chart-single-stat.vue b/nezha-fronted/src/components/charts/chart-single-stat.vue
index 5d3e7a2ab..e0621a00e 100644
--- a/nezha-fronted/src/components/charts/chart-single-stat.vue
+++ b/nezha-fronted/src/components/charts/chart-single-stat.vue
@@ -58,7 +58,7 @@
           </div>
         </div>
         <!--全屏-->
-        <el-dialog id="viewGraphDialog" class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')"
+        <el-dialog class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')"
                    :visible.sync="screenModal"
                    width="96%"  @close="screenModal = false" :modal-append-to-body="false">
           <div slot="title">
diff --git a/nezha-fronted/src/components/charts/chart-table.vue b/nezha-fronted/src/components/charts/chart-table.vue
index 713d40eed..a7ff38b7f 100644
--- a/nezha-fronted/src/components/charts/chart-table.vue
+++ b/nezha-fronted/src/components/charts/chart-table.vue
@@ -79,7 +79,7 @@
                       ref="Pagination" :append-to-body="false" pop-class="out-popper-fix"></Pagination>
         </div>
         <!--全屏-->
-        <el-dialog id="viewGraphDialog" class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')" :visible.sync="screenModal"
+        <el-dialog class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')" :visible.sync="screenModal"
                    width="96%" @close="screenModal = false" :modal-append-to-body="false">
           <div slot="title">
             <span class="nz-dialog-title">{{data.name}}</span>
diff --git a/nezha-fronted/src/components/charts/chart-url.vue b/nezha-fronted/src/components/charts/chart-url.vue
index a18d0d256..76f29e076 100644
--- a/nezha-fronted/src/components/charts/chart-url.vue
+++ b/nezha-fronted/src/components/charts/chart-url.vue
@@ -50,7 +50,7 @@
           <div  :id="'staticContainer'+chartIndex" class="center-content"></div>
         </div>
         <!--全屏-->
-        <el-dialog  id="viewGraphDialog"class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')"  :visible.sync="screenModal" width="96%" @opened="initDialog"  @close="screenModal = false" >
+        <el-dialog class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')"  :visible.sync="screenModal" width="96%" @opened="initDialog"  @close="screenModal = false" >
           <div slot="title">
             <span class="nz-dialog-title">{{chartData.name}}</span>
           </div>
diff --git a/nezha-fronted/src/components/charts/chartPreview.vue b/nezha-fronted/src/components/charts/chartPreview.vue
index bfb090ba0..c98efa7d4 100644
--- a/nezha-fronted/src/components/charts/chartPreview.vue
+++ b/nezha-fronted/src/components/charts/chartPreview.vue
@@ -12,7 +12,7 @@
   }
 </style>
 <template>
-    <el-dialog class="chart-preview-dialog nz-dialog" id="chartPreviewDailog viewGraphDialog"
+    <el-dialog class="chart-preview-dialog nz-dialog" id="chartPreviewDailog"
                :visible.sync="screenModal"
                :width="dailogWidth"
                :modal-append-to-body='false'
diff --git a/nezha-fronted/src/components/charts/diagram-chart.vue b/nezha-fronted/src/components/charts/diagram-chart.vue
index 468260f1d..ba60a4f44 100644
--- a/nezha-fronted/src/components/charts/diagram-chart.vue
+++ b/nezha-fronted/src/components/charts/diagram-chart.vue
@@ -46,7 +46,7 @@
           </div>
         </div>
         <!--全屏-->
-        <el-dialog id="viewGraphDialog" class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')"
+        <el-dialog class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')"
                    :visible.sync="screenModal"
                    width="96%"  @close="screenModal = false" :modal-append-to-body="false">
           <div slot="title">
diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue
index 7673da968..6f97eede6 100644
--- a/nezha-fronted/src/components/charts/line-chart-block.vue
+++ b/nezha-fronted/src/components/charts/line-chart-block.vue
@@ -109,7 +109,7 @@
         </template>
         <!--
         <Modal title="查看" v-model="screenModal" width="96%" class="line-chart-block-modal">-->
-        <el-dialog id="viewGraphDialog" class="line-chart-block-modal nz-dialog"
+        <el-dialog class="line-chart-block-modal nz-dialog"
                    :title="$t('dashboard.panel.view')"
                    :visible.sync="screenModal"
                    width="90%"
diff --git a/nezha-fronted/src/components/charts/logs.vue b/nezha-fronted/src/components/charts/logs.vue
index 158c9ba94..bb598dd13 100644
--- a/nezha-fronted/src/components/charts/logs.vue
+++ b/nezha-fronted/src/components/charts/logs.vue
@@ -66,7 +66,7 @@
           </div>
         </div>
         <!--全屏-->
-        <el-dialog id="viewGraphDialog" class="nz-dialog table-chart-dialog"
+        <el-dialog class="nz-dialog table-chart-dialog"
                    :title="$t('dashboard.panel.view')"
                    :visible.sync="screenModal"
                    width="90%"
diff --git a/nezha-fronted/src/components/charts/text-chart.vue b/nezha-fronted/src/components/charts/text-chart.vue
index a154a5b9c..9524f850e 100644
--- a/nezha-fronted/src/components/charts/text-chart.vue
+++ b/nezha-fronted/src/components/charts/text-chart.vue
@@ -48,7 +48,7 @@
           </div>
         </div>
         <!--全屏-->
-        <el-dialog id="viewGraphDialog" class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')"
+        <el-dialog class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')"
                    :visible.sync="screenModal"
                    width="96%"  @close="screenModal = false" :modal-append-to-body="false">
           <div slot="title">
diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
index ce8c9a62c..196a5da18 100644
--- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
+++ b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
@@ -245,7 +245,6 @@
     </transition>
     <!--Custom picture-->
     <el-dialog
-      id="viewGraphDialog"
       :title="title"
       :visible.sync="uploadPicShow"
       width="auto"
diff --git a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
index dd91d2519..be962ab13 100644
--- a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
+++ b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="sub-box bottom-box">
+  <div class="sub-box bottom-box" :style="{height: isFullScreen ? '100%' : ''}">
     <div class="resize-modal">
       <div class="sub-list-resize-copy">一</div>
     </div>
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index 440f1bca4..7e41117a7 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -98,7 +98,7 @@
         @showFullscreen="showFullscreen"
       ></panel-chart>
     </el-dialog>
-    <el-dialog id="viewGraphDialog" class="nz-dialog table-chart-dialog" :title="$t('alert.config.trbShot')"
+    <el-dialog class="nz-dialog table-chart-dialog" :title="$t('alert.config.trbShot')"
                :visible.sync="dialogShowText"
                width="96%"  @close="dialogShowText = false" :modal-append-to-body="false">
       <div slot="title">
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
index 184775dc6..95473dad9 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
@@ -106,7 +106,7 @@
     </pl-table>
     <button :class="{'to-top-is-hover': tools.tableHover}" @click="toTop(scrollbarWrap)" class="to-top" v-show="tools.showTopBtn" id="endpoint-list-totop"><i class="nz-icon nz-icon-top"></i></button>
 
-    <el-dialog id="viewGraphDialog" class="line-chart-block-modal nz-dialog endpoint-dialog"
+    <el-dialog class="line-chart-block-modal nz-dialog endpoint-dialog"
                :title="$t('project.endpoint.dialogTitle')"
                :visible.sync="graphShow"
                width="90%"
diff --git a/nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue b/nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue
index b40dc56fb..13b9fbe66 100644
--- a/nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue
+++ b/nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue
@@ -44,7 +44,7 @@
         </div>
       </li>
     </ul>
-    <el-dialog id="viewGraphDialog" class="nz-dialog table-chart-dialog" :title="$t('alert.config.trbShot')"
+    <el-dialog class="nz-dialog table-chart-dialog" :title="$t('alert.config.trbShot')"
                :visible.sync="dialogShowText"
                width="96%"  @close="dialogShowText = false" :modal-append-to-body="false">
       <div slot="title">
diff --git a/nezha-fronted/src/components/common/exportXLSX.vue b/nezha-fronted/src/components/common/exportXLSX.vue
index 9990c98cf..3b4e59423 100644
--- a/nezha-fronted/src/components/common/exportXLSX.vue
+++ b/nezha-fronted/src/components/common/exportXLSX.vue
@@ -13,7 +13,7 @@
       </button>
     </div>
 
-    <el-dialog id="viewGraphDialog" :close-on-click-modal="importBox.type!=3" :show-close="true" :title="importBox.title" :visible.sync="importBox.show" :width="importBox.width" append-to-body class="nz-dialog" @close="closeDialog">
+    <el-dialog :close-on-click-modal="importBox.type!=3" :show-close="true" :title="importBox.title" :visible.sync="importBox.show" :width="importBox.width" append-to-body class="nz-dialog" @close="closeDialog">
       <div v-if="importBox.type == 1">
         <div class="upload-body">
           <el-upload drag class="upload-demo" ref="uploadExcel"  action="" :file-list="importFileList" :on-change="importChange"  :auto-upload="false" accept=".xlsx,.xls" :id="id+'-xlsx-input-file'">
diff --git a/nezha-fronted/src/components/common/latlngPicker.vue b/nezha-fronted/src/components/common/latlngPicker.vue
index a4106e5c1..846bae9c7 100644
--- a/nezha-fronted/src/components/common/latlngPicker.vue
+++ b/nezha-fronted/src/components/common/latlngPicker.vue
@@ -13,7 +13,7 @@
       </div>
       <div class="input-box-item" style="margin-right: unset !important;width: 30px !important;flex:unset;" @click="mapConfigVisible = true"><i class="nz-icon nz-icon-weizhi" style="color:rgb(238, 157, 63)"></i></div>
     </div>
-    <el-dialog id="viewGraphDialog" :visible.sync="mapConfigVisible" :title="$t('config.system.basic.mapTitle')" width="calc(50% - 10px)"  @close="mapClose" @opened="initMap" class=" nz-dialog map-config-dialog" :modal-append-to-body="appendToBody">
+    <el-dialog :visible.sync="mapConfigVisible" :title="$t('config.system.basic.mapTitle')" width="calc(50% - 10px)"  @close="mapClose" @opened="initMap" class=" nz-dialog map-config-dialog" :modal-append-to-body="appendToBody">
       <div id="map" style="height: 100%; width: 100%"></div>
     </el-dialog>
   </div>
diff --git a/nezha-fronted/src/components/common/login.vue b/nezha-fronted/src/components/common/login.vue
index 5152b7268..34e0407d5 100644
--- a/nezha-fronted/src/components/common/login.vue
+++ b/nezha-fronted/src/components/common/login.vue
@@ -51,7 +51,7 @@
     <div class="login-foot-buildOn">
       <span><a target="_blank" rel="noopener noreferrer" href='https://prometheus.io'>Build on Prometheus</a></span>
     </div>
-    <el-dialog id="viewGraphDialog" :visible.sync="authBindShow" :title="$t('login.verifyDialogTitle')" :modal-append-to-body='false'
+    <el-dialog :visible.sync="authBindShow" :title="$t('login.verifyDialogTitle')" :modal-append-to-body='false'
                :show-close="true" width="620px" class="nz-dialog" >
 
       <div v-loading="dialogLoading">
@@ -85,7 +85,7 @@
         </button>
       </div>
     </el-dialog>
-    <el-dialog id="viewGraphDialog" :visible.sync="fileShow" :title="$t('login.verifyDialogTitle')" :modal-append-to-body='false'
+    <el-dialog :visible.sync="fileShow" :title="$t('login.verifyDialogTitle')" :modal-append-to-body='false'
                :show-close="true" width="620px" class="nz-dialog" >
 
       <div>
diff --git a/nezha-fronted/src/components/common/popBox/guide.vue b/nezha-fronted/src/components/common/popBox/guide.vue
index e2cc14da0..3e7616c07 100644
--- a/nezha-fronted/src/components/common/popBox/guide.vue
+++ b/nezha-fronted/src/components/common/popBox/guide.vue
@@ -1,6 +1,5 @@
 <template>
   <el-dialog
-    id="viewGraphDialog"
     :title="$t('guide.title')"
     :visible.sync="visible"
     custom-class="guild-pop"
diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
index dab8cfebd..84829587e 100644
--- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
+++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
@@ -19,7 +19,7 @@
       <slot name="after"></slot>
     </el-dropdown-menu>
 
-    <el-dialog id="viewGraphDialog" :close-on-click-modal="importBox.type!=3" destroy-on-close :show-close="true" :title="importBox.title" :visible.sync="importBox.show" :width="importBox.width" append-to-body class="nz-dialog" @close="closeDialog">
+    <el-dialog :close-on-click-modal="importBox.type!=3" destroy-on-close :show-close="true" :title="importBox.title" :visible.sync="importBox.show" :width="importBox.width" append-to-body class="nz-dialog" @close="closeDialog">
       <div v-if="importBox.type == 1">
         <div class="upload-body">
           <el-upload :id="id+'-xlsx-input-file'" ref="uploadExcel" :auto-upload="false"  :file-list="importFileList" :on-change="importChange" accept=".xlsx,.xls"  action="" class="upload-demo" drag>
diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue
index 36f371277..d9d46af89 100644
--- a/nezha-fronted/src/components/common/project/topologyL5.vue
+++ b/nezha-fronted/src/components/common/project/topologyL5.vue
@@ -271,7 +271,6 @@
     </transition>
     <!--Custom picture-->
     <el-dialog
-      id="viewGraphDialog"
       :title="title"
       :visible.sync="uploadPicShow"
       width="auto"
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
index fc7d6407a..7e4bbd45f 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
@@ -101,7 +101,6 @@
     </div>
 <!--    预览-->
     <el-dialog
-      id="viewGraphDialog"
       v-if="previewShow"
       :visible.sync="previewShow"
       :show-close="false"
diff --git a/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue b/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue
index 4da9874e0..4713796a0 100644
--- a/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue
+++ b/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue
@@ -52,7 +52,6 @@
       <Pagination ref="Pagination" :pageObj="pageObj" :tableId="tableId" @pageNo='pageNo' @pageSize='pageSize'></Pagination>
     </div>
     <el-dialog
-      id="viewGraphDialog"
       v-if="graphShow"
       :visible.sync="graphShow"
       :show-close="false"
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index 596fb83b3..3d9769996 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -56,7 +56,7 @@
     </nz-data-list>
     <!--导出-->
     <div class="export-xlsx">
-      <el-dialog id="viewGraphDialog" :modal-append-to-body='false' :show-close="true" :title="importBox.title" :visible.sync="importBox.show" class="nz-dialog" width="600px" @close="closeDialog">
+      <el-dialog :modal-append-to-body='false' :show-close="true" :title="importBox.title" :visible.sync="importBox.show" class="nz-dialog" width="600px" @close="closeDialog">
         <div class="upload-body" style="height: 170px">
           <div class="export-box">
             <span class="export-title">Records</span>
@@ -85,7 +85,7 @@
     </div>
     <!--删除弹窗-->
     <div class="export-xlsx">
-      <el-dialog id="viewGraphDialog" :modal-append-to-body='false' :show-close="true" :title="$t('overall.remark')" :visible.sync="deleteBox.show" class="nz-message"  width="450px" @close="closeDialog" @opened="openedDialog">
+      <el-dialog :modal-append-to-body='false' :show-close="true" :title="$t('overall.remark')" :visible.sync="deleteBox.show" class="nz-message"  width="450px" @close="closeDialog" @opened="openedDialog">
         <div class="upload-body">
           <el-form ref="remarkForm" :model="deleteBox">
             <el-form-item :rules="[{required:true,message: $t('validate.required'), trigger: 'change'}]" prop="remark">
@@ -124,7 +124,7 @@
       ></panel-chart>
     </el-dialog>
     <!--全屏-->
-    <el-dialog id="viewGraphDialog" class="nz-dialog table-chart-dialog" :title="$t('alert.config.trbShot')"
+    <el-dialog class="nz-dialog table-chart-dialog" :title="$t('alert.config.trbShot')"
                :visible.sync="dialogShowText"
                width="96%"  @close="dialogShowText = false" :modal-append-to-body="false">
       <div slot="title">
diff --git a/nezha-fronted/src/components/page/alert/alertSilence.vue b/nezha-fronted/src/components/page/alert/alertSilence.vue
index d3f7e4444..81a02ff06 100644
--- a/nezha-fronted/src/components/page/alert/alertSilence.vue
+++ b/nezha-fronted/src/components/page/alert/alertSilence.vue
@@ -45,7 +45,7 @@
     </transition>
     <!--导出-->
     <div class="export-xlsx">
-      <el-dialog id="viewGraphDialog" :modal-append-to-body='false' :show-close="true" :title="importBox.title"
+      <el-dialog :modal-append-to-body='false' :show-close="true" :title="importBox.title"
                  :visible.sync="importBox.show" class="nz-dialog" width="300px" @close="closeDialog">
         <div class="upload-body">
           <button id="alert-msg-exportcur" class="el-button el-button--default el-button--small" @click="exportCur">
diff --git a/nezha-fronted/src/components/page/config/agent.vue b/nezha-fronted/src/components/page/config/agent.vue
index 336215725..106187581 100644
--- a/nezha-fronted/src/components/page/config/agent.vue
+++ b/nezha-fronted/src/components/page/config/agent.vue
@@ -45,7 +45,7 @@
     <transition name="right-box">
       <agent-box v-if="rightBox.show" :agent="object" @close="closeRightBox"></agent-box>
     </transition>
-    <el-dialog id="viewGraphDialog" :title="$t('config.agent.agent.title')" :visible.sync="showAgentDownload" append-to-body class="nz-dialog agent-dialog" width="800px" @close="closeDialog">
+    <el-dialog :title="$t('config.agent.agent.title')" :visible.sync="showAgentDownload" append-to-body class="nz-dialog agent-dialog" width="800px" @close="closeDialog">
       <div v-if="showAgentDownload" class="agent-box">
         <el-form v-model="agentParam" class="right-box-form right-box-form-left" label-position = "top" label-width="120px" size="small" style="width: 100%">
           <div class="right-box-sub-title">{{$t('config.agent.agent.download')}}</div>
diff --git a/nezha-fronted/src/components/page/config/profile.vue b/nezha-fronted/src/components/page/config/profile.vue
index aa18dab5a..3d2575f45 100644
--- a/nezha-fronted/src/components/page/config/profile.vue
+++ b/nezha-fronted/src/components/page/config/profile.vue
@@ -72,7 +72,7 @@
       </div>
     </div>
     <operation-record class="profile-right"/>
-    <el-dialog id="viewGraphDialog" :visible.sync="authBindShow" :title="$t('login.verifyDialogTitle')" :modal-append-to-body='false'
+    <el-dialog :visible.sync="authBindShow" :title="$t('login.verifyDialogTitle')" :modal-append-to-body='false'
                :show-close="true" width="620px" class="nz-dialog" @closed="closeDialog">
 
       <div v-loading="dialogLoading">
@@ -106,7 +106,7 @@
         </button>
       </div>
     </el-dialog>
-    <el-dialog id="viewGraphDialog" :visible.sync="fileShow" :title="$t('login.verifyDialogTitle')" :modal-append-to-body='false'
+    <el-dialog :visible.sync="fileShow" :title="$t('login.verifyDialogTitle')" :modal-append-to-body='false'
                :show-close="true" width="620px" class="nz-dialog" @closed="fileClosed">
 
       <div>
diff --git a/nezha-fronted/src/components/page/config/template/exprTemp.vue b/nezha-fronted/src/components/page/config/template/exprTemp.vue
index 2e462d244..e302a7c4e 100644
--- a/nezha-fronted/src/components/page/config/template/exprTemp.vue
+++ b/nezha-fronted/src/components/page/config/template/exprTemp.vue
@@ -63,7 +63,7 @@
     </transition>
     <!--导出-->
     <div class="export-xlsx">
-      <el-dialog id="viewGraphDialog" :visible.sync="importBox.show" :title="importBox.title" :modal-append-to-body='false'
+      <el-dialog :visible.sync="importBox.show" :title="importBox.title" :modal-append-to-body='false'
                  :show-close="true" width="300px" @close="closeDialog" class="nz-dialog">
         <div class="upload-body">
           <button @click="exportCur" class="el-button el-button--default el-button--small" id="alert-msg-exportcur">
diff --git a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
index 21b946a15..ae8ad6164 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
@@ -103,7 +103,6 @@
     </div>
 
     <el-dialog
-      id="viewGraphDialog"
       :visible.sync="tempBoxShow"
       :append-to-body="true"
       :width="'auto'"
diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
index 8102e11bf..9e5060c78 100644
--- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
+++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
@@ -164,7 +164,7 @@
     </transition>
     <transition name="right-box"><alert-silence-box v-if='silenceBoxShow' :alert-silence="objectSilence" @close="closeSilenceBox"></alert-silence-box>
 </transition>
-    <el-dialog id="viewGraphDialog" :close-on-click-modal="false" :show-close="true" destroy-on-close :title='$t("overall.batchAddEndpoint")' :visible.sync="importBoxShow" :width="'600px'" append-to-body class="nz-dialog" @close="closeDialog">
+    <el-dialog :close-on-click-modal="false" :show-close="true" destroy-on-close :title='$t("overall.batchAddEndpoint")' :visible.sync="importBoxShow" :width="'600px'" append-to-body class="nz-dialog" @close="closeDialog">
       <div class="upload-body result-body">
         <div v-if="importResult&&importResult.failNum">
           <div class="result-title-top">

From 36cd9af819344f111b09a8a8edd1c2df8e1fbc77 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 9 Mar 2022 14:26:11 +0800
Subject: [PATCH 35/65] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=BA=95?=
 =?UTF-8?q?=E9=83=A8=E5=BC=B9=E7=AA=97=20alertMessage=20=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/bottomBox/tabs/alertMessageTabNew.vue       |  5 +++--
 .../common/bottomBox/tabs/alertRuleEvalLog.vue         |  1 +
 .../components/common/bottomBox/tabs/assetSubTab.vue   |  1 +
 .../src/components/common/bottomBox/tabs/assetTab.vue  |  1 +
 .../components/common/bottomBox/tabs/cabinetTab.vue    |  1 +
 .../components/common/bottomBox/tabs/endpointQuery.vue |  1 +
 .../common/bottomBox/tabs/endpointTabNew.vue           |  1 +
 .../common/bottomBox/tabs/operationLogTab.vue          |  1 +
 .../common/bottomBox/tabs/scrapeEndpoint.vue           |  1 +
 .../common/bottomBox/tabs/terminalLogTab.vue           |  1 +
 nezha-fronted/src/components/common/mixin/dataList.js  |  1 -
 nezha-fronted/src/components/common/mixin/table.js     |  1 -
 .../components/common/rightBox/chart/chartRightBox.vue |  1 -
 nezha-fronted/src/permission.js                        | 10 +++-------
 nezha-fronted/src/store/user.js                        |  6 ++++--
 15 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index 7e41117a7..c8ec43a1f 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -25,6 +25,7 @@
         <alertMessageTable
           ref="dataTable"
           :api="url"
+          :orderByFa="'id'"
           :loading="tools.loading"
           :custom-table-title="tools.customTableTitle"
           :height="subTableHeight"
@@ -300,8 +301,8 @@ export default {
       this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
       this.$set(this.searchLabel, 'state', this.state)
       if (this.searchTimeHeader && this.searchTimeHeader.length > 1) {
-        this.$set(this.searchLabel, 'startAt', this.timezoneToUtcTimeStr(this.searchTimeHeader[0]))
-        this.$set(this.searchLabel, 'endAt', this.timezoneToUtcTimeStr(this.searchTimeHeader[1]))
+        this.$set(this.searchLabel, 'startAt', bus.timeFormate(this.timezoneToUtcTime(bus.formateTimeToTime(this.searchTimeHeader[0])), 'YYYY-MM-DD HH:mm:ss'))
+        this.$set(this.searchLabel, 'endAt', bus.timeFormate(this.timezoneToUtcTime(bus.formateTimeToTime(this.searchTimeHeader[1])), 'YYYY-MM-DD HH:mm:ss'))
       } else {
         delete this.searchLabel.startAt
         delete this.searchLabel.endAt
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertRuleEvalLog.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertRuleEvalLog.vue
index af9343f8b..7fe9e0c44 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertRuleEvalLog.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertRuleEvalLog.vue
@@ -16,6 +16,7 @@
     <template v-slot>
       <alertRuleEvalLogTable
         ref="dataTable"
+        :orderByFa="'id'"
         v-loading="tools.loading"
         :loading="tools.loading"
         :api="url"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue
index 14bc72684..40b12b56f 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue
@@ -18,6 +18,7 @@
         <asset-table
           ref="dataTable"
           :api="url"
+          :orderByFa="'id'"
           v-loading="tools.loading"
           :loading="tools.loading"
           :custom-table-title="tools.customTableTitle"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue
index bbce2dc04..3bb4a6c11 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue
@@ -18,6 +18,7 @@
         <asset-table
           ref="dataTable"
           :api="url"
+          :orderByFa="'id'"
           v-loading="tools.loading"
           :loading="tools.loading"
           :custom-table-title="tools.customTableTitle"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
index 799ad1427..0733409a7 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
@@ -18,6 +18,7 @@
       <template v-slot>
         <cabinet-table
           ref="dataTable"
+          :orderByFa="'id'"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
index c9409201f..adecef518 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
@@ -56,6 +56,7 @@
       <template v-slot>
         <endpointQueryTab
           ref="endpointQueryTab"
+          :orderByFa="'id'"
           :from="from"
           :obj="obj"
           :formatTime="formatTime"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue
index feecafb0b..2776e7b4b 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue
@@ -17,6 +17,7 @@
       <template v-slot>
         <endpoint-table
           ref="dataTable"
+          :orderByFa="'id'"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/operationLogTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/operationLogTab.vue
index bd9d39de6..9caadf8d0 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/operationLogTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/operationLogTab.vue
@@ -15,6 +15,7 @@
     <template v-slot>
       <operation-log-table
         ref="dataTable"
+        :orderByFa="'id'"
         v-loading="tools.loading"
         :loading="tools.loading"
         :api="url"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/scrapeEndpoint.vue b/nezha-fronted/src/components/common/bottomBox/tabs/scrapeEndpoint.vue
index 60c4d2f01..302556c35 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/scrapeEndpoint.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/scrapeEndpoint.vue
@@ -24,6 +24,7 @@
       <template v-slot>
         <scrape-endpoint-table
           ref="dataTable"
+          :orderByFa="'id'"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue
index fd8ca9311..cc014c259 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue
@@ -15,6 +15,7 @@
     <template v-slot>
       <terminal-log-table
         ref="dataTable"
+        :orderByFa="'id'"
         v-loading="tools.loading"
         :loading="tools.loading"
         :api="url"
diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js
index 208f5f19c..87d709da8 100644
--- a/nezha-fronted/src/components/common/mixin/dataList.js
+++ b/nezha-fronted/src/components/common/mixin/dataList.js
@@ -339,7 +339,6 @@ export default {
     const path = this.$route.fullPath.match(/\/(\S*)\?/)[1]
     if (this.$route.query.orderBy) {
       this.orderBy = this.$route.query.orderBy
-      console.log('asdasdadsadsa')
     }
     let searchKeys = {}
     if (path === 'dc') {
diff --git a/nezha-fronted/src/components/common/mixin/table.js b/nezha-fronted/src/components/common/mixin/table.js
index cfc5a597c..99e7c74fd 100644
--- a/nezha-fronted/src/components/common/mixin/table.js
+++ b/nezha-fronted/src/components/common/mixin/table.js
@@ -136,7 +136,6 @@ export default {
             this.orderBy = { prop: n, order: 'ascending' }
           }
           // this.orderBy = JSON.parse(JSON.stringify(this.orderBy))
-          console.log(n, this.orderBy)
         }
       }
     },
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
index 7e4bbd45f..cdf294693 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
@@ -446,7 +446,6 @@ export default {
       immediate: true,
       handler (n) {
         const obj = JSON.parse(JSON.stringify(n))
-        console.log(obj)
         if (obj.param && !obj.param.valueMapping) {
           obj.param.valueMapping = []
         }
diff --git a/nezha-fronted/src/permission.js b/nezha-fronted/src/permission.js
index 373dd7853..4337f9d09 100644
--- a/nezha-fronted/src/permission.js
+++ b/nezha-fronted/src/permission.js
@@ -16,6 +16,7 @@ router.beforeEach((to, from, next) => {
   const configUrl = 'static/config.json?Timestamp=' + new Date().getTime()
   if (to.path === '/login') { // 拦截登录页面，现货区外观设置 再系统初始化检查
     Vue.http.get(configUrl).then(config => {
+      console.log(1)
       const appearance = new Promise(resolve => {
         get(config.body.baseUrl + 'sys/appearance').then(res => {
           if (res.code === 200) {
@@ -110,6 +111,7 @@ router.beforeEach((to, from, next) => {
           store.commit('setLangList', JSON.parse(langList))
         }
         Vue.http.get(configUrl).then(config => {
+          console.log(2)
           get(config.body.baseUrl + 'sys/i18n/lang').then(response => {
             if (response.code === 200) {
               loadI18n(response.data)
@@ -125,6 +127,7 @@ router.beforeEach((to, from, next) => {
     const permissionRequest = new Promise(resolve => {
       if (store.getters.menuList.length === 0) {
         Vue.http.get(configUrl).then(config => {
+          console.log(3)
           post(config.body.baseUrl + 'sys/user/permissions', { token: localStorage.getItem('nz-token') }).then(res => {
             if (res.code === 200) {
               store.commit('setMenuList', sortByOrderNum(res.data.menus))
@@ -144,13 +147,6 @@ router.beforeEach((to, from, next) => {
         resolve()
       }
     })
-    Vue.http.get(configUrl).then(config => {
-      get(config.body.baseUrl + 'alert/severity', { pageNo: 1, pageSize: -1 }).then(response => {
-        if (response.code == 200) {
-          store.commit('setSeverityData', response.data.list)
-        }
-      })
-    })
     Promise.all([i18nRequest, permissionRequest]).then(response => {
       if (to.path) {
         if (permissionWhiteList.indexOf(to.path) !== -1) {
diff --git a/nezha-fronted/src/store/user.js b/nezha-fronted/src/store/user.js
index 947c03443..05dc416ed 100644
--- a/nezha-fronted/src/store/user.js
+++ b/nezha-fronted/src/store/user.js
@@ -11,8 +11,8 @@ const user = {
     buttonList: [],
     roleList: [],
     language: localStorage.getItem('nz-language'),
-    severityData: [],
-    severityDataWeight: []
+    severityData: localStorage.getItem('nz-severityData') ? JSON.parse(localStorage.getItem('nz-severityData')) : [],
+    severityDataWeight:  localStorage.getItem('nz-severityDataWeight') ? JSON.parse(localStorage.getItem('nz-severityDataWeight')) : []
   },
   mutations: {
     setLanguage (state, language) {
@@ -28,6 +28,7 @@ const user = {
       state.roleList = [...roleList]
     },
     setSeverityData (state, severityData) {
+      localStorage.setItem('nz-severityData', JSON.stringify(severityData))
       state.severityData = [...severityData]
       const arr = JSON.parse(JSON.stringify(severityData.reverse()))
       for (let i = 0; i < arr.length; i++) {
@@ -39,6 +40,7 @@ const user = {
           }
         }
       }
+      localStorage.setItem('nz-severityDataWeight', JSON.stringify(arr))
       state.severityDataWeight = arr
     },
     clean (state) {

From faff633722ec9e9bf05368a43a9c613a2d1c2561 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Wed, 9 Mar 2022 15:53:22 +0800
Subject: [PATCH 36/65] =?UTF-8?q?fix:=20cahrtHeader=20title=E8=BF=87?=
 =?UTF-8?q?=E9=95=BF=E9=9A=90=E8=97=8F=E6=97=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=BC=A0=E6=A0=87=E7=A7=BB=E5=85=A5=E5=B1=95=E7=A4=BA=E5=AE=8C?=
 =?UTF-8?q?=E6=95=B4title?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/ChartScreenHeader.vue | 2 +-
 nezha-fronted/src/components/chart/chartHeader.vue       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/chart/ChartScreenHeader.vue b/nezha-fronted/src/components/chart/ChartScreenHeader.vue
index 8521239a7..ca288671b 100644
--- a/nezha-fronted/src/components/chart/ChartScreenHeader.vue
+++ b/nezha-fronted/src/components/chart/ChartScreenHeader.vue
@@ -26,7 +26,7 @@
           </span>
      </el-popover>
     </span>
-    <div class="chart-header__title">{{chartInfo.name}}</div>
+    <div class="chart-header__title" :title="chartInfo.name">{{chartInfo.name}}</div>
     <div class="chart-header__tools">
       <span v-if="chartInfo.remark" class="chart-header__tool top-tool-btn-group">
         <el-tooltip :content="chartInfo.remark" effect="light" placement="top">
diff --git a/nezha-fronted/src/components/chart/chartHeader.vue b/nezha-fronted/src/components/chart/chartHeader.vue
index 08b01a160..44a2dd8b1 100644
--- a/nezha-fronted/src/components/chart/chartHeader.vue
+++ b/nezha-fronted/src/components/chart/chartHeader.vue
@@ -26,7 +26,7 @@
           </span>
      </el-popover>
     </span>
-    <div class="chart-header__title" v-if="!isGroup">{{chartInfo.name}}</div>
+    <div class="chart-header__title" v-if="!isGroup" :title="chartInfo.name">{{chartInfo.name}}</div>
     <div class="chart-header__title" v-else >
       <span @click="groupShow"> <i class="nz-icon" :class="chartInfo.param.collapse ? 'nz-icon-arrow-right': 'nz-icon-arrow-down'"></i></span>
       {{chartInfo.name}}

From 324c3b2e63a61193743c89724aed2a52bf4e7d42 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 9 Mar 2022 16:25:51 +0800
Subject: [PATCH 37/65] =?UTF-8?q?fix=EF=BC=9Arightbox=20=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/rightBox/chartRightBox/chartRightBox.scss         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss
index 543dd6808..de815de3c 100644
--- a/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss
+++ b/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss
@@ -61,6 +61,7 @@
     .chart-title-config {
       border: 1px solid $--border-color-light;
       border-radius: 2px;
+      position: relative;
       display: flex;
       padding: 0;
       padding-left: 5px;
@@ -159,9 +160,11 @@
       height: 25px;
       line-height: 25px;
       border-radius: 5px;
-      margin-left: 120px;
       padding: 0 3px;
       text-align: center;
+      position: absolute;
+      top: 0;
+      left: 200px;
     }
     .element-item {
       padding: 0;

From fb75cca09f0040beeef05955d9667e8284524e74 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Wed, 9 Mar 2022 17:20:07 +0800
Subject: [PATCH 38/65] =?UTF-8?q?style:=20Dashboards=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=A9=BF=E6=A2=AD=E6=A1=86=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../css/components/page/dashboard/panel.scss  | 51 +++++++++++--------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss b/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss
index dc99c629b..e70dee7a6 100644
--- a/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss
+++ b/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss
@@ -39,31 +39,40 @@
 }
 
 .panel  {
-  .el-table {
-    border-radius: 5px;
-    border-left: 1px solid $--border-color-light;
-    border-top: 1px solid $--border-color-light;
-    .el-table__body-wrapper {
-      height: calc(100% - 65px) !important;
+  .right-box.right-box-chart-temp {
+    .el-table {
+      border-radius: 5px;
+      .el-table__body-wrapper {
+        height: calc(100% - 40px) !important;
+      }
+      th.is-center {
+        border-right: none;
+      }
+      th {
+        border-right: 1px solid $--border-color-light;
+      }
+      th:nth-of-type(2) {
+        border-left: 1px solid $--border-color-light;
+      }
+      tr {
+        background-color: $--background-color-empty;
+      }
+      td {
+        border-bottom: 1px solid $--border-color-light;
+      }
+      th.is-leaf {
+        border-bottom: 1px solid $--border-color-light;
+      }
     }
-    th {
-      border-right: 1px solid $--border-color-light;
-    }
-    tr {
-      background-color: $--background-color-empty;
-    }
-    td {
+    .el-table--border th.gutter:last-of-type {
       border-bottom: 1px solid $--border-color-light;
     }
-    th.is-leaf {
-      border-bottom: 1px solid $--border-color-light;
+    .el-table--border::after  {
+      background-color: $--border-color-light;
+    }
+    .el-table::before  {
+      display: none;
     }
-  }
-  .el-table--border th.gutter:last-of-type {
-    border-bottom: 1px solid $--border-color-light;
-  }
-  .el-table--border::after  {
-    background-color: $--border-color-light;
   }
 }
 /* begin-chart list*/

From ed415bb65ce64233108696700afeff3a924e7e22 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 9 Mar 2022 18:41:22 +0800
Subject: [PATCH 39/65] =?UTF-8?q?fix=EF=BC=9A=E5=88=87=E6=8D=A2=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=20=E5=81=9C=E6=AD=A2=E6=AD=A3=E5=9C=A8=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E8=80=8C=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/http.js       | 5 +++++
 nezha-fronted/src/permission.js | 5 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/http.js b/nezha-fronted/src/http.js
index b9bf40742..55321bb5e 100644
--- a/nezha-fronted/src/http.js
+++ b/nezha-fronted/src/http.js
@@ -1,6 +1,11 @@
 import axios from 'axios'
+const CancelToken = axios.CancelToken // 申明CancelToken
 
+export const requestsArr = []
 axios.interceptors.request.use(config => {
+  const source = CancelToken.source() // 申明CancelToken,也可new CancelToken.source()实例一个
+  config.cancelToken = source.token // 讲实例对象的token赋予该请求
+  requestsArr.push(source) // 将该实例添加到队列中
   const token = localStorage.getItem('nz-token')
   if (token) {
     config.headers.Authorization = token // 请求头token
diff --git a/nezha-fronted/src/permission.js b/nezha-fronted/src/permission.js
index 4337f9d09..1972d3f0e 100644
--- a/nezha-fronted/src/permission.js
+++ b/nezha-fronted/src/permission.js
@@ -1,18 +1,17 @@
 import router from './router'
 import store from './store'
-import { get, post } from './http'
+import { get, post, requestsArr } from './http'
 import ElementUI from 'element-ui'
 import Vue from 'vue'
 import i18n, { loadI18n } from './components/common/i18n'
 import VueResource from 'vue-resource'
 import bus from '@/libs/bus'
-
 Vue.use(VueResource)
 
 const loginWhiteList = ['/setup', '/sys/license/upload', '/sys/license/state', '/sys/appearance'] // 免登陆白名单
 const permissionWhiteList = ['/profile', '/menu', ...loginWhiteList] // 权限白名单
-
 router.beforeEach((to, from, next) => {
+  requestsArr.forEach(xhr => xhr.cancel())
   const configUrl = 'static/config.json?Timestamp=' + new Date().getTime()
   if (to.path === '/login') { // 拦截登录页面，现货区外观设置 再系统初始化检查
     Vue.http.get(configUrl).then(config => {

From 6dff393cdee6d00c027ee12d617f640446fdee49 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 9 Mar 2022 18:55:28 +0800
Subject: [PATCH 40/65] =?UTF-8?q?fix=EF=BC=9A=20=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=20favicon.ico?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nezha-fronted/index.html b/nezha-fronted/index.html
index 182b1c1b6..4c7d00a6f 100644
--- a/nezha-fronted/index.html
+++ b/nezha-fronted/index.html
@@ -4,6 +4,7 @@
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
+  <link rel="icon" href="data:;base64,=">
   <link href="./static/explore-tab-logo.png" rel="icon" type="image/x-icon"/>
 
   <title>Nezha</title>

From 2e7d217f0e50a85799942abbda9688b5ce65364b Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 9 Mar 2022 18:59:29 +0800
Subject: [PATCH 41/65] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20alertMes?=
 =?UTF-8?q?sage=20=E9=BB=98=E8=AE=A4=E6=97=B6=E9=97=B4=E4=B8=BA7=E5=A4=A9?=
 =?UTF-8?q?=20=E9=9A=90=E8=97=8FlastAt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/bottomBox/tabs/alertMessageTabNew.vue |  4 ++--
 .../common/table/alert/alertMessageTable.vue     | 16 +++++++++-------
 .../src/components/page/alert/alertMessage.vue   |  4 ++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index c8ec43a1f..fcdddf73c 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -19,7 +19,7 @@
         <el-select v-model="state" class="margin-r-10" size="small" value-key="value" @change="getTableData" popper-class="right-box-select-top right-public-box-dropdown-top" style="width: 110px">
           <el-option v-for="item in stateOptions" :key="item.value" :label="$t(item.label)" :value="item.value"></el-option>
         </el-select>
-        <pick-time v-model="searchTimeHeader" :default-pick="8" :refresh-data-func="getTableData" :show-empty="true" :use-chart-unit="false" :use-refresh="false"></pick-time>
+        <pick-time v-model="searchTimeHeader" :default-pick="10" :refresh-data-func="getTableData" :show-empty="true" :use-chart-unit="false" :use-refresh="false"></pick-time>
       </template>
       <template v-slot>
         <alertMessageTable
@@ -231,7 +231,7 @@ export default {
       sameLabels: ['instance', 'module', 'project', 'asset', 'endpoint', 'datacenter'],
       legend: [],
       searchTime: [],
-      searchTimeHeader: [bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - 24)), bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())))],
+      searchTimeHeader: [bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - 24 * 7)), bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())))],
       searchTimeSelect: bus.getTimezontDateRange(),
       currentMsg: {},
       chartUnit: 5,
diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
index 63ce564d1..2ce76ef2e 100644
--- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
@@ -227,16 +227,18 @@ export default {
         }, {
           label: this.$t('alert.startAt'),
           prop: 'startAt',
-          show: false,
-          width: 150,
-          sortable: 'custom'
-        }, {
-          label: this.$t('alert.lastAt'),
-          prop: 'lastAt',
           show: true,
           width: 150,
           sortable: 'custom'
-        }, {
+        },
+        // {
+        //   label: this.$t('alert.lastAt'),
+        //   prop: 'lastAt',
+        //   show: true,
+        //   width: 150,
+        //   sortable: 'custom'
+        // },
+        {
           label: this.$t('config.terminallog.duration'),
           prop: 'duration',
           show: true,
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index 3d9769996..0793ceee0 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -18,7 +18,7 @@
         <button id="asset-filter" :class="[dataListLayout.indexOf('clickSearch') > -1?'is-focus':'' ]" class="top-tool-btn margin-r-10" @click.stop="showClickSearch">
           <i class="nz-icon nz-icon-funnel"></i>
         </button>
-        <pick-time v-model="searchTime" :default-pick="8" :refresh-data-func="getTableData" :show-empty="true" :use-chart-unit="false" :use-refresh="false"></pick-time>
+        <pick-time v-model="searchTime" :default-pick="10" :refresh-data-func="getTableData" :show-empty="true" :use-chart-unit="false" :use-refresh="false"></pick-time>
         <button id="roles-add" v-has="'alertMessage_view'" :title="$t('overall.exportExcelLower')" class="top-tool-btn margin-r-10"
                 type="button" @click="showExportDialog">
           <i class="nz-icon-download1 nz-icon"></i>
@@ -194,7 +194,7 @@ export default {
       chartDatas: [],
       sameLabels: ['instance', 'module', 'project', 'asset', 'endpoint', 'datacenter'],
       legend: [],
-      searchTime: [bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - 24)), bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())))],
+      searchTime: [bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - 24 * 7)), bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())))],
       searchTimeDialog: [],
       searchTimeSelect: bus.getTimezontDateRange(),
       currentMsg: {},

From bb3e330d97f1e41dee878f6f9b8ce56d53a425e8 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 9 Mar 2022 19:32:04 +0800
Subject: [PATCH 42/65] =?UTF-8?q?fix=EF=BC=9A=E5=A4=84=E7=90=86=20?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BCtooltip=20=E8=B0=83=E7=94=A8=E4=B8=A4?=
 =?UTF-8?q?=E6=AC=A1=E6=8E=A5=E5=8F=A3=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/chart/chartMixin.js        |   3 +-
 .../common/mixin/alertLabelMixin.js           |  52 ++++
 .../common/table/alert/alertMessageTable.vue  |  39 +--
 .../common/table/asset/assetTable.vue         | 287 +++++++++---------
 .../common/table/settings/endpointTable.vue   | 281 +++++++++--------
 5 files changed, 334 insertions(+), 328 deletions(-)
 create mode 100644 nezha-fronted/src/components/common/mixin/alertLabelMixin.js

diff --git a/nezha-fronted/src/components/chart/chartMixin.js b/nezha-fronted/src/components/chart/chartMixin.js
index 675b0be90..fcc3a700e 100644
--- a/nezha-fronted/src/components/chart/chartMixin.js
+++ b/nezha-fronted/src/components/chart/chartMixin.js
@@ -263,7 +263,8 @@ export default {
     chartData: {
       deep: true,
       handler (n) {
-        if (!this.isInit) {
+        if (!this.isInit && this.chartOption.color) {
+          console.log(this.chartOption)
           this.colorList = this.colorList.slice(0, 20)
           this.chartOption.color = this.chartOption.color.slice(0, 20)
           this.initChart(this.chartOption)
diff --git a/nezha-fronted/src/components/common/mixin/alertLabelMixin.js b/nezha-fronted/src/components/common/mixin/alertLabelMixin.js
new file mode 100644
index 000000000..fa35bbac2
--- /dev/null
+++ b/nezha-fronted/src/components/common/mixin/alertLabelMixin.js
@@ -0,0 +1,52 @@
+export default {
+  data () {
+    return {
+      alertLabelShow: false,
+      alertLabelId: '',
+      alertLabelObj: {},
+      alertLabelType: ''
+    }
+  },
+  methods: {
+    // label 鼠标划入
+    labelHover (item, type, loading, isUseType = true, e) {
+      if (this.labelToolTipDis(type)) {
+        return
+      }
+      if (isUseType) {
+        if (e) {
+          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)
+      } else {
+        if (e) {
+          const dom = e.currentTarget
+          const position = dom.getBoundingClientRect()
+          this.$set(item, 'position', position)
+          this.alertLabelId = item.id
+          this.alertLabelObj = item
+          this.alertLabelType = type
+        }
+        this.$set(item, 'loading', loading)
+      }
+      this.alertLabelShow = loading
+    },
+    // label tooltip是否显示
+    labelToolTipDis (labelType) {
+      switch (labelType) {
+        case 'asset':
+        case 'module':
+        case 'endpoint':
+        case 'project':
+        case 'dc':
+          return false
+        default: return true
+      }
+    }
+  }
+}
diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
index 2ce76ef2e..3fe1a97b6 100644
--- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
@@ -72,8 +72,8 @@
           <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)">
+              @mouseenter="labelHover(scope.row, item.label, true, true, $event)"
+              @mouseleave="labelHover(scope.row, item.label, false, true,)">
               <nz-alert-tag
                 v-if="item.label !== 'alertname' && item.label !== 'severity'" :key="item.label" :cursor-point="tagType(item.label) !== 'info'"
                 :label="item.label"
@@ -145,6 +145,7 @@ import alertRuleInfo from '../../alert/alertRuleInfo'
 import alertLabel from '../../alert/alertLabel'
 import { calcDurationByStringTimeB } from '../../js/tools'
 import { alertMessage as alertMessageConstant } from '@/components/common/js/constants'
+import alertLabelMixin from '@/components/common/mixin/alertLabelMixin'
 export default {
   name: 'alertMessageTable',
   components: {
@@ -164,7 +165,7 @@ export default {
     loading: Boolean,
     chartAlertList: Boolean
   },
-  mixins: [table, bus],
+  mixins: [table, bus, alertLabelMixin],
   data () {
     return {
       /* 二级列表相关 */
@@ -247,10 +248,6 @@ export default {
       ],
       viewAssetState: false,
       tableDataInitNum: 0,
-      alertLabelShow: false,
-      alertLabelId: '',
-      alertLabelObj: {},
-      alertLabelType: '',
       alertRuleShow: false,
       alertRuleId: '',
       alertRuleObj: ''
@@ -572,18 +569,6 @@ export default {
       this.$refs.moduleBox.show(false, false)
       this.viewAssetState = false
     },
-    // label tooltip是否显示
-    labelToolTipDis (labelType) {
-      switch (labelType) {
-        case 'asset':
-        case 'module':
-        case 'endpoint':
-        case 'project':
-        case 'dc':
-          return false
-        default: return true
-      }
-    },
     // alertName鼠标划入
     alertMessageHover (item, loading, e) {
       if (e) {
@@ -596,22 +581,6 @@ export default {
       this.$set(item.alertRule, 'loading', loading)
       this.alertRuleShow = loading
     },
-    // label 鼠标划入
-    labelHover (item, type, loading, e) {
-      if (this.labelToolTipDis(type)) {
-        return
-      }
-      if (e) {
-        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) {
       return this.$t(this.$CONSTANTS.alertMessage.severityData.find(s => { return s.value == key }).label)
diff --git a/nezha-fronted/src/components/common/table/asset/assetTable.vue b/nezha-fronted/src/components/common/table/asset/assetTable.vue
index eddb9ff04..52d27c820 100644
--- a/nezha-fronted/src/components/common/table/asset/assetTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetTable.vue
@@ -1,50 +1,51 @@
 <template>
-  <el-table
-    id="roleTable"
-    ref="dataTable"
-    class="asset-table2"
-    :data="tableData"
-    :height="height"
-    :default-sort="orderBy"
-    border
-    @header-dragend="dragend"
-    @sort-change="tableDataSort"
-    @selection-change="selectionChange"
-    @row-dblclick="(row)=>{$emit('showBottomBox', 'panelTab', 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}`"
-      class="data-column"
+  <div style="height: 100%">
+    <el-table
+      id="roleTable"
+      ref="dataTable"
+      class="asset-table2"
+      :data="tableData"
+      :height="height"
+      :default-sort="orderBy"
+      border
+      @header-dragend="dragend"
+      @sort-change="tableDataSort"
+      @selection-change="selectionChange"
+      @row-dblclick="(row)=>{$emit('showBottomBox', 'panelTab', row)}"
     >
-      <template slot="header">
-        <span class="data-column__span">{{item.label}} <i class="nz-icon nz-icon-label" v-if="item.type==='label'" style="color: #fa901c"/></span>
-        <div class="col-resize-area"></div>
-      </template>
-      <template slot-scope="scope" :column="item">
-        <template v-if="item.prop === 'type'">{{scope.row.type ? scope.row.type.name : '-'}}</template>
-        <template v-else-if="item.prop === 'state'">{{scope.row.state ? scope.row.state.name : '-'}}</template>
-        <template v-else-if="item.prop === 'endpointNum'">
-          <span style="cursor: pointer" @click="$emit('showBottomBox', 'endpointTab', scope.row)"><i class="nz-icon nz-icon-overview-endpoint monitorColor"></i> <span>{{scope.row.endpointNum ? scope.row.endpointNum : 0}}</span></span>
+      <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}`"
+        class="data-column"
+      >
+        <template slot="header">
+          <span class="data-column__span">{{item.label}} <i class="nz-icon nz-icon-label" v-if="item.type==='label'" style="color: #fa901c"/></span>
+          <div class="col-resize-area"></div>
         </template>
-        <template v-else-if="item.prop === 'alertNum'">
-<!--          v-my-loading:ldsFacebook="scope.row.trendLoading"-->
-          <span style="cursor: pointer" @click="$emit('showBottomBox', 'alertMessageTab', scope.row)">
+        <template slot-scope="scope" :column="item">
+          <template v-if="item.prop === 'type'">{{scope.row.type ? scope.row.type.name : '-'}}</template>
+          <template v-else-if="item.prop === 'state'">{{scope.row.state ? scope.row.state.name : '-'}}</template>
+          <template v-else-if="item.prop === 'endpointNum'">
+            <span style="cursor: pointer" @click="$emit('showBottomBox', 'endpointTab', scope.row)"><i class="nz-icon nz-icon-overview-endpoint monitorColor"></i> <span>{{scope.row.endpointNum ? scope.row.endpointNum : 0}}</span></span>
+          </template>
+          <template v-else-if="item.prop === 'alertNum'">
+            <!--          v-my-loading:ldsFacebook="scope.row.trendLoading"-->
+            <span style="cursor: pointer" @click="$emit('showBottomBox', 'alertMessageTab', scope.row)">
             <i :class="scope.row.alertNum ? 'red' : 'green'" class="nz-icon nz-icon-overview-alert vertical-align-top;"  @mouseenter="tooltipHover(scope.row,true, $event)" @mouseleave="tooltipHover(scope.row,false, $event)"></i>
             <div v-if="scope.row.alertNumtooltipShow" class="alert-days-info-tooltip" :style="{left: scope.row.left + 'px',top:scope.row.top + 'px'}">
               <div class="tooltip-title">Alert message (active)</div>
@@ -54,113 +55,114 @@
               </div>
             </div>
             <alertDaysInfo
-                v-show="!scope.row.trendLoading"
-                :alertDaysData="scope.row.alertDaysData"
+              v-show="!scope.row.trendLoading"
+              :alertDaysData="scope.row.alertDaysData"
             />
           </span>
-        </template>
-        <template v-else-if="item.prop === 'dc'">{{scope.row.dc ? scope.row.dc.name : '-'}}</template>
-        <template v-else-if="item.prop === 'cabinet'">
-          <span v-if="scope.row.cabinet && scope.row.cabinet !== '--'">{{scope.row.cabinet.name}}&nbsp;{{returnCabinet( scope.row.cabinetStart, scope.row.cabinetEnd)}}</span>
-          <span v-else >-</span>
-        </template>
-        <template v-else-if="item.prop === 'pingInfo'">
-          <div class="ping-info" v-if="scope.row.pingInfo">
-            <div :class="{'active-icon green-bg':scope.row.pingInfo.status == 1,'active-icon red-bg':scope.row.pingInfo.status == 0}" style="position: relative">
+          </template>
+          <template v-else-if="item.prop === 'dc'">{{scope.row.dc ? scope.row.dc.name : '-'}}</template>
+          <template v-else-if="item.prop === 'cabinet'">
+            <span v-if="scope.row.cabinet && scope.row.cabinet !== '--'">{{scope.row.cabinet.name}}&nbsp;{{returnCabinet( scope.row.cabinetStart, scope.row.cabinetEnd)}}</span>
+            <span v-else >-</span>
+          </template>
+          <template v-else-if="item.prop === 'pingInfo'">
+            <div class="ping-info" v-if="scope.row.pingInfo">
+              <div :class="{'active-icon green-bg':scope.row.pingInfo.status == 1,'active-icon red-bg':scope.row.pingInfo.status == 0}" style="position: relative">
+              </div>
+              <div class="active-icon-content">{{$t('asset.assetStatPre')+(scope.row.pingInfo.lastUpdate?utcTimeToTimezoneStr(scope.row.pingInfo.lastUpdate):$t('asset.assetStatDown'))}}</div>
+              {{scope.row.pingInfo.rtt?scope.row.pingInfo.rtt+'ms':''}}
             </div>
-            <div class="active-icon-content">{{$t('asset.assetStatPre')+(scope.row.pingInfo.lastUpdate?utcTimeToTimezoneStr(scope.row.pingInfo.lastUpdate):$t('asset.assetStatDown'))}}</div>
-            {{scope.row.pingInfo.rtt?scope.row.pingInfo.rtt+'ms':''}}
-          </div>
-        </template>
-        <template v-else-if="item.prop === 'model'">{{scope.row.model ? scope.row.model.name : '-'}}</template>
-        <template v-else-if="item.prop === 'parent'">
+          </template>
+          <template v-else-if="item.prop === 'model'">{{scope.row.model ? scope.row.model.name : '-'}}</template>
+          <template v-else-if="item.prop === 'parent'">
           <span
             v-if="scope.row.parent"
             style="cursor: pointer"
-            @mouseenter="labelHover(scope.row, 'asset', true, $event)"
-            @mouseleave="labelHover(scope.row, 'asset', false)">
+            @mouseenter="labelHover(scope.row, 'asset', true, false, $event)"
+            @mouseleave="labelHover(scope.row, 'asset', false, false)">
             {{scope.row.parent.name}}
-                <alertLabel
-                  v-if="scope.row.loading"
-                  :id="scope.row.pid"
-                  :that="scope.row"
-                  :type="'asset'"
-                ></alertLabel>
               </span>
-          <span v-else> - </span>
-        </template>
-        <template v-else-if="item.prop === 'children'">
-          <div  @click="$emit('showBottomBox', 'assetSubTab', scope.row)" v-if="scope.row.childrenNum" style="cursor: pointer">
-            <i class="nz-icon nz-icon-overview-project monitorColor color23BF9A"></i>
-            {{scope.row.childrenNum}}</div>
-<!--          <span v-else-if="scope.row.pid == -1">  <i class="nz-icon nz-icon-overview-project monitorColor color23BF9A"></i> 0 </span>-->
-          <span v-else> - </span>
-        </template>
-        <template v-else-if="item.prop === 'clientState'">
-          <div v-if="scope.row[item.prop]===1">
-            <div class="active-icon green-bg inline-block"></div>
-            OK
-          </div>
-          <div v-else-if="scope.row[item.prop]===0">
-            <div class="active-icon gray-bg inline-block"></div> {{ $t('config.user.disable') }}
-          </div>
-          <div v-else-if="scope.row[item.prop]===2">
-            <div class="active-icon red-bg inline-block"></div> {{ $t('asset.connectionTimedOut') }}
-          </div>
-          <div v-else-if="scope.row[item.prop]===3">
-            <div class="active-icon red-bg inline-block"></div> {{ $t('overall.AuthenticationFailed') }}
-          </div>
-          <div v-else-if="scope.row[item.prop]===4">
-            <div class="active-icon red-bg inline-block"></div> {{ $t('config.terminallog.statusItem.unknownError') }}
-          </div>
-          <template v-else>-</template>
-        </template>
-        <template v-else-if="item.prop === 'brand'">{{scope.row.brand ? scope.row.brand.name : '-'}}</template>
-        <template v-else-if="item.prop === 'purchaseDate'">{{scope.row.purchaseDate ? scope.row.purchaseDate : '-'}}</template>
-        <span v-else-if="item.prop === 'id'" :id="'globalSearch' + scope.row.id">{{scope.row[item.prop]}}</span>
-        <template v-else>
+            <span v-else> - </span>
+          </template>
+          <template v-else-if="item.prop === 'children'">
+            <div  @click="$emit('showBottomBox', 'assetSubTab', scope.row)" v-if="scope.row.childrenNum" style="cursor: pointer">
+              <i class="nz-icon nz-icon-overview-project monitorColor color23BF9A"></i>
+              {{scope.row.childrenNum}}</div>
+            <!--          <span v-else-if="scope.row.pid == -1">  <i class="nz-icon nz-icon-overview-project monitorColor color23BF9A"></i> 0 </span>-->
+            <span v-else> - </span>
+          </template>
+          <template v-else-if="item.prop === 'clientState'">
+            <div v-if="scope.row[item.prop]===1">
+              <div class="active-icon green-bg inline-block"></div>
+              OK
+            </div>
+            <div v-else-if="scope.row[item.prop]===0">
+              <div class="active-icon gray-bg inline-block"></div> {{ $t('config.user.disable') }}
+            </div>
+            <div v-else-if="scope.row[item.prop]===2">
+              <div class="active-icon red-bg inline-block"></div> {{ $t('asset.connectionTimedOut') }}
+            </div>
+            <div v-else-if="scope.row[item.prop]===3">
+              <div class="active-icon red-bg inline-block"></div> {{ $t('overall.AuthenticationFailed') }}
+            </div>
+            <div v-else-if="scope.row[item.prop]===4">
+              <div class="active-icon red-bg inline-block"></div> {{ $t('config.terminallog.statusItem.unknownError') }}
+            </div>
+            <template v-else>-</template>
+          </template>
+          <template v-else-if="item.prop === 'brand'">{{scope.row.brand ? scope.row.brand.name : '-'}}</template>
+          <template v-else-if="item.prop === 'purchaseDate'">{{scope.row.purchaseDate ? scope.row.purchaseDate : '-'}}</template>
+          <span v-else-if="item.prop === 'id'" :id="'globalSearch' + scope.row.id">{{scope.row[item.prop]}}</span>
+          <template v-else>
           <span v-if="scope.row.fields&&scope.row.fields.find(field => field.name === item.prop)">
             {{scope.row.fields.find(field => field.name === item.prop).value.join(',')}}
           </span>
-          <span v-else>
+            <span v-else>
              {{scope.row[item.prop]}}
           </span>
+          </template>
         </template>
+      </el-table-column>
+      <el-table-column
+        :resizable="false"
+        v-if="showOption"
+        :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="assetTab"  class="table-operation-item" v-has="'model_edit'" @click="$emit('edit', scope.row)"><i class="nz-icon nz-icon-edit"></i></button>
+          <button v-else class="table-operation-item" @click="$emit('showBottomBox', 'panelTab', scope.row)"><i class="nz-icon nz-icon-view1"></i></button>
+          <el-dropdown size="medium" v-has="['asset_edit','asset_connect','asset_add','asset_delete', 'alertSilence_add']" 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 v-if="!assetTab" v-has="'asset_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
+              <el-dropdown-item v-has="'asset_connect'" :command="['cli', scope.row]" :disabled="!scope.row.authUsername"><i class="nz-icon nz-icon-cli"></i><span class="operation-dropdown-text">{{$t('dashboard.connect')}}</span></el-dropdown-item>
+              <el-dropdown-item v-has="'asset_add'" :command="['duplicate', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('dashboard.duplicate')}}</span></el-dropdown-item>
+              <el-dropdown-item v-has="'asset_delete'" :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, 'asset']"><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
-      :resizable="false"
-      v-if="showOption"
-      :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="assetTab"  class="table-operation-item" v-has="'model_edit'" @click="$emit('edit', scope.row)"><i class="nz-icon nz-icon-edit"></i></button>
-        <button v-else class="table-operation-item" @click="$emit('showBottomBox', 'panelTab', scope.row)"><i class="nz-icon nz-icon-view1"></i></button>
-        <el-dropdown size="medium" v-has="['asset_edit','asset_connect','asset_add','asset_delete', 'alertSilence_add']" 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 v-if="!assetTab" v-has="'asset_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
-            <el-dropdown-item v-has="'asset_connect'" :command="['cli', scope.row]" :disabled="!scope.row.authUsername"><i class="nz-icon nz-icon-cli"></i><span class="operation-dropdown-text">{{$t('dashboard.connect')}}</span></el-dropdown-item>
-            <el-dropdown-item v-has="'asset_add'" :command="['duplicate', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('dashboard.duplicate')}}</span></el-dropdown-item>
-            <el-dropdown-item v-has="'asset_delete'" :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, 'asset']"><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>
+    <alertLabel
+      v-if="alertLabelShow"
+      :id="alertLabelId"
+      :that="alertLabelObj"
+      :type="alertLabelType"
+    ></alertLabel>
+  </div>
 </template>
 
 <script>
@@ -169,9 +171,10 @@ import { showTableTooltip, hideTableTooltip } from '@/components/common/js/tools
 // import bus from '@/libs/bus'
 import alertLabel from '@/components/common/alert/alertLabel'
 import alertDaysInfo from '@/components/common/alert/alertDaysInfo'
+import alertLabelMixin from '@/components/common/mixin/alertLabelMixin'
 export default {
   name: 'assetTable',
-  mixins: [table],
+  mixins: [table, alertLabelMixin],
   components: {
     alertLabel: alertLabel,
     alertDaysInfo
@@ -337,16 +340,6 @@ export default {
       this.bottomBox.targetTab = 'endpoint'
       this.bottomBox.showSubList = true
     },
-    // label 鼠标划入
-    labelHover (item, type, loading, e) {
-      if (e) {
-        const dom = e.currentTarget
-        const position = dom.getBoundingClientRect()
-        this.$set(item, 'position', position)
-      }
-      this.$set(item, 'loading', loading)
-      // this.$set(this.tableData,index,item);// 调用父组件
-    },
     returnCabinet (start, end) { // 返回机柜u位信息
       if (!start || !end) {
         return ''
diff --git a/nezha-fronted/src/components/common/table/settings/endpointTable.vue b/nezha-fronted/src/components/common/table/settings/endpointTable.vue
index 45c252000..76e52c4e5 100644
--- a/nezha-fronted/src/components/common/table/settings/endpointTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/endpointTable.vue
@@ -1,95 +1,78 @@
 <template>
-  <el-table
-    id="endpointTable"
-    ref="dataTable"
-    :data="tableData"
-    :height="height"
-    border
-    :default-sort="orderBy"
-    @header-dragend="dragend"
-    @sort-change="tableDataSort"
-    @selection-change="selectionChange"
-    @row-dblclick="(row)=>{$emit('showBottomBox', 'panelTab', 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}`"
-      class="data-column"
+  <div style="height: 100%">
+    <el-table
+      id="endpointTable"
+      ref="dataTable"
+      :data="tableData"
+      :height="height"
+      border
+      :default-sort="orderBy"
+      @header-dragend="dragend"
+      @sort-change="tableDataSort"
+      @selection-change="selectionChange"
+      @row-dblclick="(row)=>{$emit('showBottomBox', 'panelTab', row)}"
     >
-      <template slot="header">
-        <span class="data-column__span">{{item.label}}</span>
-        <div class="col-resize-area"></div>
-      </template>
-      <template slot-scope="scope" :column="item">
-        <template v-if="item.prop === 'name'">
-          {{scope.row[item.prop]}}
+      <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}`"
+        class="data-column"
+      >
+        <template slot="header">
+          <span class="data-column__span">{{item.label}}</span>
+          <div class="col-resize-area"></div>
         </template>
-        <template v-else-if="item.prop === 'type'">
-          {{scope.row.module.type}}
-        </template>
-        <template v-else-if="item.prop === 'project'">
+        <template slot-scope="scope" :column="item">
+          <template v-if="item.prop === 'name'">
+            {{scope.row[item.prop]}}
+          </template>
+          <template v-else-if="item.prop === 'type'">
+            {{scope.row.module.type}}
+          </template>
+          <template v-else-if="item.prop === 'project'">
           <span
             class="pointer"
-            @mouseenter="labelHover(scope.row, item.prop, true, $event)"
-            @mouseleave="labelHover(scope.row, item.prop, false)"
+            @mouseenter="labelHover(scope.row, item.prop, true,true, $event)"
+            @mouseleave="labelHover(scope.row, item.prop, false,true)"
           >
             {{scope.row[item.prop].name}}
           </span>
-          <alertLabel
-            v-if="scope.row[item.prop] && scope.row[item.prop].loading"
-            :id="scope.row[item.prop].id"
-            :that="scope.row[item.prop]"
-            :type="'project'"
-          ></alertLabel>
-        </template>
-        <template v-else-if="item.prop === 'module'">
+          </template>
+          <template v-else-if="item.prop === 'module'">
           <span
             class="pointer"
-            @mouseenter="labelHover(scope.row, item.prop, true, $event)"
-            @mouseleave="labelHover(scope.row, item.prop, false)"
+            @mouseenter="labelHover(scope.row, item.prop, true,true, $event)"
+            @mouseleave="labelHover(scope.row, item.prop, false,true)"
           >
             <i style="cursor: pointer" class="nz-icon nz-icon-overview-module monitorColor"/>
           {{scope.row[item.prop].name}}
           </span>
-          <alertLabel
-            v-if="scope.row[item.prop] && scope.row[item.prop].loading"
-            :id="scope.row[item.prop].id"
-            :that="scope.row[item.prop]"
-            :type="'module'"
-          ></alertLabel>
-        </template>
-        <template v-else-if="item.prop === 'asset'">
+          </template>
+          <template v-else-if="item.prop === 'asset'">
           <span
             class="pointer"
-            @mouseenter="labelHover(scope.row, item.prop, true, $event)"
-            @mouseleave="labelHover(scope.row, item.prop, false)"
+            @mouseenter="labelHover(scope.row, item.prop, true,true, $event)"
+            @mouseleave="labelHover(scope.row, item.prop, false,true)"
           >
             <i class="nz-icon nz-icon-overview-project monitorColor color23BF9A"></i>
             {{scope.row.asset.name}}
           </span>
-          <alertLabel
-            v-if="scope.row[item.prop] && scope.row[item.prop].loading"
-            :id="scope.row[item.prop].id"
-            :that="scope.row[item.prop]"
-            :type="'asset'"
-          ></alertLabel>
-        </template>
-        <template v-else-if="item.prop === 'alerts'">
+          </template>
+          <template v-else-if="item.prop === 'alerts'">
           <span style="cursor: pointer"  @click="showBottomBox('endpointAlertMessage', scope.row)">
             <i :class="scope.row.alertNum ? 'red' : 'green'" class="nz-icon nz-icon-overview-alert vertical-align-top;"  @mouseenter="tooltipHover(scope.row,true, $event)" @mouseleave="tooltipHover(scope.row,false, $event)"></i>
             <div v-if="scope.row.alertNumtooltipShow" class="alert-days-info-tooltip" :style="{left: scope.row.left + 'px',top:scope.row.top + 'px'}">
@@ -104,27 +87,27 @@
               :alertDaysData="scope.row.alertDaysData"
             />
           </span>
-        </template>
-        <template v-else-if="item.prop === 'configs'">
+          </template>
+          <template v-else-if="item.prop === 'configs'">
           <span class="configs-endpoint metrics"
-                @mouseenter="labelHover(scope.row, item.prop, true, $event)"
-                @mouseleave="labelHover(scope.row, item.prop, false, $event, true)">
+                @mouseenter="labelHover1(scope.row, item.prop, true, $event)"
+                @mouseleave="labelHover1(scope.row, item.prop, false, $event, true)">
             [{{scope.row.configs[0].enable ?  'Metrics':''}}{{scope.row.configs[0].enable&&scope.row.configs[1].enable?',':''}}{{scope.row.configs[1].enable ?  'logs' : ''}}]
           </span>
-          <nz-tooltip :that="scope.row[item.prop]" class="data-column__" v-if="scope.row[item.prop] && scope.row[item.prop].loading" :type="item.prop">
-            <div name="default">
-              <span class="copy-value-content"> <i class="nz-icon nz-icon-override" @click="copyValue(clConfigs(scope.row))"></i></span>
-              <pre class="copy-value-content__pre">{{JSON.stringify(clConfigs(scope.row),null,2)}}</pre>
-            </div>
-          </nz-tooltip>
-        </template>
+            <nz-tooltip :that="scope.row[item.prop]" class="data-column__" v-if="scope.row[item.prop] && scope.row[item.prop].loading" :type="item.prop">
+              <div name="default">
+                <span class="copy-value-content"> <i class="nz-icon nz-icon-override" @click="copyValue(clConfigs(scope.row))"></i></span>
+                <pre class="copy-value-content__pre">{{JSON.stringify(clConfigs(scope.row),null,2)}}</pre>
+              </div>
+            </nz-tooltip>
+          </template>
 
-        <template v-else-if="item.prop === 'state'">
-          <!--          metrics-->
-          <span style="width: auto;display: inline-block;cursor: pointer"
-                @mouseenter="labelHoverConfigs(scope.row, 0, true, $event)"
-                @mouseleave="labelHoverConfigs(scope.row, 0, false, $event)"
-          >
+          <template v-else-if="item.prop === 'state'">
+            <!--          metrics-->
+            <span style="width: auto;display: inline-block;cursor: pointer"
+                  @mouseenter="labelHoverConfigs(scope.row, 0, true, $event)"
+                  @mouseleave="labelHoverConfigs(scope.row, 0, false, $event)"
+            >
             <span class="endpoint-cell-left"><i class="nz-icon nz-icon-Metrics colorFA901C" /> {{$t('project.endpoint.metrics')}} </span>
             <span v-if="scope.row.configs[0].state===0 || !scope.row.configs[0].state">
               <span class="active-icon red-bg inline-block"></span>
@@ -136,15 +119,15 @@
               <span class="active-icon gray-bg inline-block"></span>
             </span>
           </span>
-          <nz-tooltip :that="scope.row.configs[0]"  v-if="scope.row.configs[0] && scope.row.configs[0].loading && scope.row.configs[0].state  > 1" :type="'configs[0]'">
-            <div name="default">
-              <div v-html="suspendedStr(scope.row.configs[0].state)"></div>
-            </div>
-          </nz-tooltip>
-          <!--          logs-->
-         <span style="width: auto;display: inline-block;cursor: pointer"
-               @mouseenter="labelHoverConfigs(scope.row, 1, true, $event)"
-               @mouseleave="labelHoverConfigs(scope.row, 1, false, $event)">
+            <nz-tooltip :that="scope.row.configs[0]"  v-if="scope.row.configs[0] && scope.row.configs[0].loading && scope.row.configs[0].state  > 1" :type="'configs[0]'">
+              <div name="default">
+                <div v-html="suspendedStr(scope.row.configs[0].state)"></div>
+              </div>
+            </nz-tooltip>
+            <!--          logs-->
+            <span style="width: auto;display: inline-block;cursor: pointer"
+                  @mouseenter="labelHoverConfigs(scope.row, 1, true, $event)"
+                  @mouseleave="labelHoverConfigs(scope.row, 1, false, $event)">
            <span class="endpoint-cell-left" style="margin-left: 10px"><i class="nz-icon nz-icon-logs colorFA901C" /> {{$t('project.endpoint.logs')}} </span>
            <span v-if="scope.row.configs[1].state===0 || !scope.row.configs[1].state">
              <span class="active-icon red-bg inline-block"></span>
@@ -156,66 +139,74 @@
              <span class="active-icon gray-bg inline-block"></span>
            </span>
          </span>
-          <nz-tooltip :that="scope.row.configs[1]"  v-if="scope.row.configs[1] && scope.row.configs[1].loading && scope.row.configs[1].state > 1" :type="'configs[1]'">
-            <div name="default">
-              <div v-html="suspendedStr(scope.row.configs[1].state)"></div>
+            <nz-tooltip :that="scope.row.configs[1]"  v-if="scope.row.configs[1] && scope.row.configs[1].loading && scope.row.configs[1].state > 1" :type="'configs[1]'">
+              <div name="default">
+                <div v-html="suspendedStr(scope.row.configs[1].state)"></div>
+              </div>
+            </nz-tooltip>
+          </template>
+          <template v-else-if="item.prop === 'enabled'">
+            <span v-if="scope.row[item.prop] === 1">{{$t('project.endpoint.enable')}}</span>
+            <span v-else>{{$t('project.endpoint.disable')}}</span>
+          </template>
+          <span v-else-if="item.prop === 'id'" :id="'globalSearch' + scope.row.id">{{scope.row[item.prop]}}</span>
+          <span v-else>{{scope.row[item.prop] ? scope.row[item.prop] : ''}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :resizable="false"
+        :width="operationWidth"
+        v-if="showOption"
+        fixed="right">
+        <div slot="header" class="table-operation-title">{{$t('overall.option')}}</div>
+        <div slot-scope="scope" class="table-operation-items">
+          <button v-if="endpointTab"  class="table-operation-item" v-has="'monitor_endpoint_edit'" @click="$emit('edit', scope.row)"><i class="nz-icon nz-icon-edit"></i></button>
+          <button v-else class="table-operation-item"  @click="$emit('showBottomBox', 'panelTab', scope.row)"><i class="nz-icon nz-icon-view1"></i></button>
+          <el-dropdown size="medium" v-has="['monitor_endpoint_edit','monitor_endpoint_delete','alertSilence_add']" trigger="click" @command="tableOperation">
+            <div class="table-operation-item table-operation-item--more">
+              <i class="nz-icon nz-icon-more3"></i>
             </div>
-          </nz-tooltip>
-        </template>
-        <template v-else-if="item.prop === 'enabled'">
-          <span v-if="scope.row[item.prop] === 1">{{$t('project.endpoint.enable')}}</span>
-          <span v-else>{{$t('project.endpoint.disable')}}</span>
-        </template>
-        <span v-else-if="item.prop === 'id'" :id="'globalSearch' + scope.row.id">{{scope.row[item.prop]}}</span>
-        <span v-else>{{scope.row[item.prop] ? scope.row[item.prop] : ''}}</span>
+            <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
+              <!--            <el-dropdown-item v-if="!endpointTab" :command="['endpointQuery', scope.row]"><i class="nz-icon nz-icon-search"></i><span class="operation-dropdown-text">{{$t('overall.query')}}</span></el-dropdown-item>-->
+              <el-dropdown-item v-if="!endpointTab" v-has="'monitor_endpoint_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
+              <el-dropdown-item v-has="'monitor_endpoint_delete'" :command="['delete', scope.row, `sys/endpoint?ids=${scope.row.id}`]"><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="'monitor_endpoint_edit'" :command="['copy', scope.row, 'project']"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
+              <el-dropdown-item v-has="'alertSilence_add'" :command="['fastSilence', scope.row, 'endpoint']"><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
-      :resizable="false"
-      :width="operationWidth"
-      v-if="showOption"
-      fixed="right">
-      <div slot="header" class="table-operation-title">{{$t('overall.option')}}</div>
-      <div slot-scope="scope" class="table-operation-items">
-        <button v-if="endpointTab"  class="table-operation-item" v-has="'monitor_endpoint_edit'" @click="$emit('edit', scope.row)"><i class="nz-icon nz-icon-edit"></i></button>
-        <button v-else class="table-operation-item"  @click="$emit('showBottomBox', 'panelTab', scope.row)"><i class="nz-icon nz-icon-view1"></i></button>
-        <el-dropdown size="medium" v-has="['monitor_endpoint_edit','monitor_endpoint_delete','alertSilence_add']" 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 v-if="!endpointTab" :command="['endpointQuery', scope.row]"><i class="nz-icon nz-icon-search"></i><span class="operation-dropdown-text">{{$t('overall.query')}}</span></el-dropdown-item>-->
-            <el-dropdown-item v-if="!endpointTab" v-has="'monitor_endpoint_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
-            <el-dropdown-item v-has="'monitor_endpoint_delete'" :command="['delete', scope.row, `sys/endpoint?ids=${scope.row.id}`]"><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="'monitor_endpoint_edit'" :command="['copy', scope.row, 'project']"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
-            <el-dropdown-item v-has="'alertSilence_add'" :command="['fastSilence', scope.row, 'endpoint']"><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>
+    <alertLabel
+      v-if="alertLabelShow"
+      :id="alertLabelId"
+      :that="alertLabelObj"
+      :type="alertLabelType"
+    ></alertLabel>
+  </div>
 </template>
 
 <script>
 import table from '@/components/common/mixin/table'
 import alertLabel from '../../alert/alertLabel'
 import nzTooltip from '../../alert/nzTooltip'
+import alertLabelMixin from '@/components/common/mixin/alertLabelMixin'
 export default {
   name: 'endpointTable',
   components: {
     alertLabel,
     nzTooltip
   },
-  mixins: [table],
+  mixins: [table, alertLabelMixin],
   props: {
     showOption: {
       type: Boolean,
@@ -325,7 +316,7 @@ export default {
       return str
     },
     // label 鼠标划入
-    labelHover (item, type, loading, e, slow) {
+    labelHover1 (item, type, loading, e, slow) {
       if (e) {
         const dom = e.currentTarget
         const position = dom.getBoundingClientRect()

From 1eee63ff8dfac41702690da1de8ba2e9f144c7b2 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 9 Mar 2022 20:04:54 +0800
Subject: [PATCH 43/65] =?UTF-8?q?NEZ-1654=20fix=EF=BC=9A=20dashboard=20tab?=
 =?UTF-8?q?le=20=E7=BB=84=E4=BB=B6=E6=B8=B2=E6=9F=93=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=8C=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chart/chartTable.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartTable.vue b/nezha-fronted/src/components/chart/chart/chartTable.vue
index 3dcb4ec23..dd492c34f 100644
--- a/nezha-fronted/src/components/chart/chart/chartTable.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTable.vue
@@ -94,7 +94,7 @@ export default {
     initTableData (chartInfo, originalDatas) {
       let colorIndex = 0
       const returnData = {}
-      const arr = chartInfo.param.indexs?chartInfo.param.indexs.split(',') : []
+      const arr = chartInfo.param.indexs ? chartInfo.param.indexs.split(',') : []
       const tableInitialData = lodash.cloneDeep(originalDatas)
       tableInitialData.forEach((originalData, expressionIndex) => {
         let key = expressionIndex
@@ -107,7 +107,7 @@ export default {
         originalData.forEach((data, dataIndex) => {
           this.isNoData = false
           data.$labels = data.metric
-          const value = getMetricTypeValue(data.values, chartInfo.param.statistics || 'last')
+          const value = getMetricTypeValue(data.values, chartInfo.param.statistics || 'last') + ''
           const showValue = chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(value, null, -1, 2)
           // const mapping = this.selectTableMapping(value, chartInfo.param.valueMapping)
           data.$value = value

From 5fa7adf285a959c032291cc54be6ddf9b3cb0f87 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 10 Mar 2022 10:19:24 +0800
Subject: [PATCH 44/65] =?UTF-8?q?NEZ-1648=20fix=EF=BC=9AStat=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E5=88=B7=E6=96=B0=E5=90=8E=EF=BC=8C=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=B8=B2=E6=9F=93=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/mixin/subDataList.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/mixin/subDataList.js b/nezha-fronted/src/components/common/mixin/subDataList.js
index 57be8db76..22641b1b8 100644
--- a/nezha-fronted/src/components/common/mixin/subDataList.js
+++ b/nezha-fronted/src/components/common/mixin/subDataList.js
@@ -5,11 +5,12 @@ export default {
       type: Array
     },
     targetTab: String,
-    from: String
+    from: String,
   },
   data () {
     return {
-      subTableHeight: this.$tableHeight.openSubList.subList
+      subTableHeight: this.$tableHeight.openSubList.subList,
+      isSubList: true
     }
   },
   methods: {

From 41975687082ae15c0c15acb76985c6683682a4c1 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Thu, 10 Mar 2022 10:19:57 +0800
Subject: [PATCH 45/65] =?UTF-8?q?NEZ-1653=20fix:=20password=20policy=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E9=9A=94=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/page/config/basic.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/page/config/basic.vue b/nezha-fronted/src/components/page/config/basic.vue
index 0aa61b70b..9e220261a 100644
--- a/nezha-fronted/src/components/page/config/basic.vue
+++ b/nezha-fronted/src/components/page/config/basic.vue
@@ -80,7 +80,7 @@
           <el-switch v-model="basic.unsaved_change" active-value='on' inactive-value='off' id="system-baisc-unsaved_change">
           </el-switch>
         </el-form-item>
-        <div class="system-title">{{$t('config.system.basic.pinPolicy')}}</div>
+        <div class="system-title system-title-border">{{$t('config.system.basic.pinPolicy')}}</div>
         <el-form-item :label="$t('config.system.basic.gloEnable')" prop="mfa_auth_enable">
           <el-switch v-model="basic.mfa_auth_enable" :active-value='"1"' :inactive-value='"0"' id="system-basic-mfs_change">
           </el-switch>

From 72b16c9b5ee7a988b477420607a97450348d869d Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 10 Mar 2022 10:20:08 +0800
Subject: [PATCH 46/65] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E5=BA=95=E9=83=A8=E5=BC=B9=E7=AA=97=E6=8E=A5=E5=8F=A3=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E8=B7=AF=E7=94=B1=E5=8F=82=E6=95=B0=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/bottomBox/tabs/alertMessageTabNew.vue       | 10 +++++++++-
 nezha-fronted/src/components/common/mixin/dataList.js  |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index fcdddf73c..912ffa325 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -25,7 +25,7 @@
         <alertMessageTable
           ref="dataTable"
           :api="url"
-          :orderByFa="'id'"
+          :orderByFa="orderBy"
           :loading="tools.loading"
           :custom-table-title="tools.customTableTitle"
           :height="subTableHeight"
@@ -156,6 +156,14 @@ export default {
           this.getTableData()
         }
       }
+    },
+    orderBy: {
+      immediate: true,
+      handler (n) {
+        if (n) {
+         console.log(n)
+        }
+      }
     }
   },
   data () {
diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js
index 87d709da8..446161370 100644
--- a/nezha-fronted/src/components/common/mixin/dataList.js
+++ b/nezha-fronted/src/components/common/mixin/dataList.js
@@ -337,7 +337,7 @@ export default {
   },
   created () {
     const path = this.$route.fullPath.match(/\/(\S*)\?/)[1]
-    if (this.$route.query.orderBy) {
+    if (this.$route.query.orderBy && !this.isSubList) {
       this.orderBy = this.$route.query.orderBy
     }
     let searchKeys = {}

From 9df259455f194e50a8ce256bb0199785611751ad Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Thu, 10 Mar 2022 10:20:53 +0800
Subject: [PATCH 47/65] =?UTF-8?q?NEZ-1652=20fix:=20=E4=BF=AE=E5=A4=8Dagent?=
 =?UTF-8?q?=20=E4=BA=8C=E7=BA=A7=E9=A1=B5=E9=9D=A2=20last=20scrape=20?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=8C=96=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/table/settings/scrapeEndpointTable.vue      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/table/settings/scrapeEndpointTable.vue b/nezha-fronted/src/components/common/table/settings/scrapeEndpointTable.vue
index 051b19b35..f9e0d2122 100644
--- a/nezha-fronted/src/components/common/table/settings/scrapeEndpointTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/scrapeEndpointTable.vue
@@ -35,7 +35,7 @@
     </template>
     <template slot-scope="scope" :column="item">
       <template v-if="item.prop === 'endpoint'">{{scope.row.discoveredLabels.endpoint ? scope.row.discoveredLabels.endpoint : '-'}}</template>
-      <template v-else-if="item.prop === 'lastScrape'">{{scope.row.lastScrape}}</template>
+      <template v-else-if="item.prop === 'lastScrape'">{{time}}</template>
       <template v-else-if="item.prop === 'labels'" class="labels">
           <span v-for="(item, i) in labelsSort(scope.row.labels)" :key="i">
             <span>
@@ -137,7 +137,8 @@ export default {
           show: true
         }
       ],
-      exclusiveLabels: ['_id', 'severity', '__name__']
+      exclusiveLabels: ['_id', 'severity', '__name__'],
+      time: ''
     }
   },
   computed: {
@@ -156,8 +157,9 @@ export default {
       immediate: true,
       deep: true,
       handler (n) {
-        n.map(e => {
-          e.lastScrape = bus.timeFormate(e.lastScrape, this.timeFormatMain)
+        n.forEach(e => {
+          const lastScrape = new Date(e.lastScrape).getTime()
+          this.time = bus.timeFormate(lastScrape, this.timeFormatMain)
         })
       }
     }

From 94d621b3f701a9bff4945ea29c497907ab824ec2 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 10 Mar 2022 10:28:36 +0800
Subject: [PATCH 48/65] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20assetSub?=
 =?UTF-8?q?List=20alert=E5=88=97=20=E6=9C=AA=E6=AD=A3=E5=B8=B8=E6=B8=B2?=
 =?UTF-8?q?=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/bottomBox/tabs/assetSubTab.vue     | 26 ++++++++++++++++++-
 .../src/components/common/mixin/table.js      | 26 -------------------
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue
index 40b12b56f..31547572d 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue
@@ -122,7 +122,9 @@ export default {
       typeData: [],
       dcData: [],
       snmpCredentialData: [],
-      fieldGroupData: []
+      fieldGroupData: [],
+      needAlertDaysData: true,
+      trendKey: 'assetId'
     }
   },
   methods: {
@@ -237,6 +239,28 @@ export default {
           for (let i = 0; i < response.data.list.length; i++) {
             response.data.list[i].status = response.data.list[i].status + ''
           }
+          if (this.needAlertDaysData) {
+            response.data.list.forEach(item => {
+              item.trendLoading = true
+              item.left = 0
+              item.top = 0
+              item.alertNumtooltipShow = false
+              item.alertDaysData = [
+                {
+                  metric: { priority: 'P1' },
+                  values: [[0, 0]]
+                },
+                {
+                  metric: { priority: 'P2' },
+                  values: [[0, 0]]
+                },
+                {
+                  metric: { priority: 'P3' },
+                  values: [[0, 0]]
+                }
+              ]
+            })
+          }
           this.tableData = response.data.list
           this.pageObj.total = response.data.total
           if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) {
diff --git a/nezha-fronted/src/components/common/mixin/table.js b/nezha-fronted/src/components/common/mixin/table.js
index 99e7c74fd..4ecea5ab7 100644
--- a/nezha-fronted/src/components/common/mixin/table.js
+++ b/nezha-fronted/src/components/common/mixin/table.js
@@ -163,32 +163,6 @@ export default {
               params[this.trendKey] = item.id
               setTimeout(() => {
                 this.$get('/stat/alertMessage/trend', params).then((res) => {
-                  // res = {
-                  //   msg: 'success',
-                  //   code: 200,
-                  //   data: {
-                  //     result: [
-                  //       {
-                  //         values: [
-                  //           {
-                  //             metric: { priority: 'P1' },
-                  //             values: []
-                  //           }, {
-                  //             metric: { priority: 'P2' },
-                  //             values: [
-                  //               [1645142400000, 0], [1645228800000, 3], [1645315200000, 20], [1645401600000, 0], [1645488000000, 0], [1645574400000, 3], [1645660800000, 20]
-                  //             ]
-                  //           }, {
-                  //             metric: { priority: 'P3' },
-                  //             values: [
-                  //               [1645142400000, 1], [1645228800000, 3], [1645315200000, 20], [1645401600000, 0], [1645488000000, 0], [1645574400000, 3], [1645660800000, 20]
-                  //             ]
-                  //           }]
-                  //       }],
-                  //     resultType: 'matrix'
-                  //   },
-                  //   time: '2022-02-24 08:41:35'
-                  // }
                   const alertDaysData = res.data.result ? res.data.result[0].values : []
                   const newWeekDays = JSON.parse(JSON.stringify(weekDays))
                   alertDaysData.forEach(item => {

From fed995571b669d2f720ac5445280dfbf4efb63fa Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 10 Mar 2022 11:08:40 +0800
Subject: [PATCH 49/65] =?UTF-8?q?fix=EF=BC=9A=E9=A1=B5=E9=9D=A2=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/chart/chart/chartBar.vue         |  3 +++
 .../src/components/chart/chart/chartHexagonD3.vue   | 13 ++++++++++---
 .../src/components/chart/chart/chartPie.vue         |  3 +++
 .../src/components/chart/chart/chartTimeSeries.vue  |  3 +++
 .../src/components/chart/chart/chartTreemap.vue     |  3 +++
 .../src/components/common/ChartDiagram/diagram.vue  |  3 +++
 .../src/components/common/project/topologyL5.vue    |  6 ++++++
 nezha-fronted/src/components/layout/home.vue        |  8 +-------
 nezha-fronted/src/components/layout/leftMenu.vue    |  1 +
 .../src/components/page/dashboard/panel.vue         | 11 +++++++++--
 10 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartBar.vue b/nezha-fronted/src/components/chart/chart/chartBar.vue
index 402d618a4..5d45d057f 100644
--- a/nezha-fronted/src/components/chart/chart/chartBar.vue
+++ b/nezha-fronted/src/components/chart/chart/chartBar.vue
@@ -112,6 +112,9 @@ export default {
       /* 使用setTimeout延迟渲染图表，避免样式错乱 */
       setTimeout(() => {
         const myChart = this.isInit ? echarts.init(document.getElementById(`chart-canvas-${this.chartId}`)) : getChart(this.chartId)
+        if (!myChart) {
+          return
+        }
         myChart.setOption(chartOption)
         this.isInit && setChart(this.chartId, myChart) // 缓存；不使用vue的data是为避免整个chart被监听导致卡顿
         this.isInit = false
diff --git a/nezha-fronted/src/components/chart/chart/chartHexagonD3.vue b/nezha-fronted/src/components/chart/chart/chartHexagonD3.vue
index 5ca786d99..06e527c55 100644
--- a/nezha-fronted/src/components/chart/chart/chartHexagonD3.vue
+++ b/nezha-fronted/src/components/chart/chart/chartHexagonD3.vue
@@ -57,6 +57,8 @@ export default {
           this.initHexagonData(this.chartInfo, this.chartData).then(() => {
             this.getLayout().then(layout => {
               this.initHexagon(layout)
+            }).catch(() => {
+
             })
           })
         }, 200)
@@ -331,9 +333,12 @@ export default {
         : '#FFFFFF'
     },
     getLayout () {
-      this.boxWidth = this.$refs[`chart-canvas-${this.chartId}`].offsetWidth - 2 * this.boxPadding
-      this.boxHeight = this.$refs[`chart-canvas-${this.chartId}`].offsetHeight - 2 * this.boxPadding
-      return new Promise(resolve => {
+      return new Promise((resolve, reject) => {
+        if (!this.$refs[`chart-canvas-${this.chartId}`]) {
+          reject()
+        }
+        this.boxWidth = this.$refs[`chart-canvas-${this.chartId}`].offsetWidth - 2 * this.boxPadding
+        this.boxHeight = this.$refs[`chart-canvas-${this.chartId}`].offsetHeight - 2 * this.boxPadding
         let radius = 0
         let col = 0
         let row = 0
@@ -384,6 +389,8 @@ export default {
       this.hexagonTimer = setTimeout(() => {
         this.getLayout().then(layout => {
           this.initHexagon(layout)
+        }).catch(() => {
+
         })
       }, 50)
     }
diff --git a/nezha-fronted/src/components/chart/chart/chartPie.vue b/nezha-fronted/src/components/chart/chart/chartPie.vue
index 3b8fd0fab..f3a2d7057 100644
--- a/nezha-fronted/src/components/chart/chart/chartPie.vue
+++ b/nezha-fronted/src/components/chart/chart/chartPie.vue
@@ -89,6 +89,9 @@ export default {
       /* 使用setTimeout延迟渲染图表，避免样式错乱 */
       setTimeout(() => {
         const myChart = this.isInit ? echarts.init(document.getElementById(`chart-canvas-${this.chartId}`)) : getChart(this.chartId)
+        if (!myChart) {
+          return
+        }
         myChart.setOption(chartOption)
         this.isInit && setChart(this.chartId, myChart) // 缓存；不使用vue的data是为避免整个chart被监听导致卡顿
         this.isInit = false
diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
index d2b2ad3e1..77d408b6f 100644
--- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
@@ -93,6 +93,9 @@ export default {
       /* 使用setTimeout延迟渲染图表，避免样式错乱 */
       setTimeout(() => {
         const myChart = this.isInit ? echarts.init(document.getElementById(`chart-canvas-${this.chartId}`)) : getChart(this.chartId)
+        if (!myChart) {
+          return
+        }
         myChart.setOption(chartOption)
         this.isInit && setChart(this.chartId, myChart) // 缓存；不使用vue的data是为避免整个chart被监听导致卡顿
         this.isInit = false
diff --git a/nezha-fronted/src/components/chart/chart/chartTreemap.vue b/nezha-fronted/src/components/chart/chart/chartTreemap.vue
index 3137d16cb..f43004259 100644
--- a/nezha-fronted/src/components/chart/chart/chartTreemap.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTreemap.vue
@@ -86,6 +86,9 @@ export default {
       /* 使用setTimeout延迟渲染图表，避免样式错乱 */
       setTimeout(() => {
         const myChart = this.isInit ? echarts.init(document.getElementById(`chart-canvas-${this.chartId}`)) : getChart(this.chartId)
+        if (!myChart) {
+          return
+        }
         myChart.setOption(chartOption)
         this.isInit && setChart(this.chartId, myChart) // 缓存；不使用vue的data是为避免整个chart被监听导致卡顿
         this.isInit = false
diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
index 196a5da18..d748acfa2 100644
--- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
+++ b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
@@ -1796,6 +1796,9 @@ export default {
         this.imgageLoading = true
         this.$get('monitor/project/topo/icon').then((imageAllId) => {
           const promiseArr = []
+          if (!imageAllId || !imageAllId.data) {
+            return
+          }
           imgidList.forEach((item, index) => {
             if (item.data.imageId && imageAllId.data.list.find(image => item.data.imageId === image.id)) {
               promiseArr.push(this.dealImg(`monitor/project/topo/icon/${item.data.imageId}/1`))
diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue
index d9d46af89..da74ed855 100644
--- a/nezha-fronted/src/components/common/project/topologyL5.vue
+++ b/nezha-fronted/src/components/common/project/topologyL5.vue
@@ -798,6 +798,9 @@ export default {
           resolve(this.topoPrevDataS)
         }
         this.$get('monitor/project/topo', { projectId: this.obj.id }).then(res => {
+          if (!res.data) {
+            return
+          }
           let data = res.data.topo
           if (!res.data.topo || !res.data.topo.pens.length) {
             this.showNoData = true
@@ -1772,6 +1775,9 @@ export default {
         this.imgageLoading = true
         this.$get('monitor/project/topo/icon').then((imageAllId) => {
           const promiseArr = []
+          if (!imageAllId || !imageAllId.data) {
+            return
+          }
           imgidList.forEach((item, index) => {
             if (item.data.imageId && imageAllId.data.list.find(image => item.data.imageId === image.id)) {
               promiseArr.push(this.dealImg(`monitor/project/topo/icon/${item.data.imageId}/1`))
diff --git a/nezha-fronted/src/components/layout/home.vue b/nezha-fronted/src/components/layout/home.vue
index 1a2dbb474..557ed36dc 100644
--- a/nezha-fronted/src/components/layout/home.vue
+++ b/nezha-fronted/src/components/layout/home.vue
@@ -40,13 +40,7 @@ export default {
   },
   methods: {
     refresh () {
-      this.containerShow = false
-      new Promise(resolve => {
-        this.$router.replace({ path: this.$route.path, query: {} })
-        resolve()
-      }).then(() => {
-        this.$nextTick(() => { this.containerShow = true })
-      })
+      this.$store.commit('setIsRouteLive')
     }
   },
   destroyed () {
diff --git a/nezha-fronted/src/components/layout/leftMenu.vue b/nezha-fronted/src/components/layout/leftMenu.vue
index c68b4bb6a..c2332acf0 100644
--- a/nezha-fronted/src/components/layout/leftMenu.vue
+++ b/nezha-fronted/src/components/layout/leftMenu.vue
@@ -82,6 +82,7 @@ export default {
   },
   methods: {
     jump (route) {
+      console.log(route, this.route)
       if (route === this.route) {
         this.refresh()
       }
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 3f74917f0..693a39eab 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -442,7 +442,12 @@ export default {
             this.chart = JSON.parse(JSON.stringify(chartData))
             this.chart.panelId = this.showPanel.id
             this.chart.panelName = this.showPanel.name
-            this.chart.param = JSON.parse(this.chart.param)
+            if (this.chart.param) {
+              this.chart.param = JSON.parse(this.chart.param)
+            } else {
+              this.chart.param = {}
+            }
+
             if (!this.chart.groupId || this.chart.groupId == -1) {
               this.chart.groupId = ''
             }
@@ -856,7 +861,9 @@ export default {
       this.nowTimeType.start_time = this.searchTime[0]
       this.nowTimeType.end_time = this.searchTime[1]
       setTimeout(() => {
-        this.$refs.pickTime.$refs.timePicker.setCustomTime(this.nowTimeType)
+        if (this.$refs.pickTime && this.$refs.pickTime.$refs.timePicker) {
+          this.$refs.pickTime.$refs.timePicker.setCustomTime(this.nowTimeType)
+        }
       }, 100)
     }
   },

From c503d90326f9d107ec3c653c1f2081142ed74dac Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 10 Mar 2022 11:31:48 +0800
Subject: [PATCH 50/65] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=8A=9F=E8=83=BD=E7=9A=84=E6=97=A0=E6=95=88?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chartList.vue     | 11 +++++++----
 nezha-fronted/src/components/chart/panelChart.vue    | 12 ++++++++++++
 .../components/common/bottomBox/tabs/panelTabNew.vue |  4 ++++
 .../src/components/page/dashboard/panel.vue          |  8 +++-----
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue
index 9cfce4b6c..db038a7f5 100644
--- a/nezha-fronted/src/components/chart/chartList.vue
+++ b/nezha-fronted/src/components/chart/chartList.vue
@@ -48,6 +48,7 @@
           :from="from"
           :time-range="timeRange"
           :chart-detail-info="chartDetailInfo"
+          @refreshPanel="$emit('refreshPanel')"
           @showFullscreen="showFullscreen"
         ></panel-chart>
       </grid-item>
@@ -280,10 +281,12 @@ export default {
           panelId: this.panelId,
           charts: charts
         }
-        this.$put('/visual/panel/chart/weights', params).then(() => {
-          const position = getLayoutPosition(this.copyDataList)
-          this.$store.commit('setChartLastPosition', position)
-        })
+        if (charts && charts.length) {
+          this.$put('/visual/panel/chart/weights', params).then(() => {
+            const position = getLayoutPosition(this.copyDataList)
+            this.$store.commit('setChartLastPosition', position)
+          })
+        }
       }, 1000)
     },
     onScroll (scrollTop = 0, groupTop = 0) {
diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue
index f6273a8ae..a4a29d459 100644
--- a/nezha-fronted/src/components/chart/panelChart.vue
+++ b/nezha-fronted/src/components/chart/panelChart.vue
@@ -14,6 +14,7 @@
       @loadMore="loadMore"
       @edit-chart="$emit('edit-chart', chartInfo)"
       @refresh="refresh"
+      @sync="chartSync"
       @groupShow="groupShow"
       @showFullscreen="showFullscreen"
     ></chart-header>
@@ -440,6 +441,17 @@ export default {
     },
     saveChart () {
       this.$emit('saveChart', this.chartInfo)
+    },
+    chartSync () {
+      this.loading = true
+      this.$post('visual/panel/chart/syncTmpl', { ids: [this.chartInfo.id] }).then(res => {
+        if (res.code === 200) {
+          this.$message.success(this.$t('tip.syncSuccess'))
+          this.$emit('refreshPanel')
+        } else {
+          this.$message.error(res.msg)
+        }
+      })
     }
   },
   watch: {
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
index b9a63543a..c772ba6e0 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
@@ -102,6 +102,7 @@
               @on-refresh-time="refreshTime"
               @on-remove-chart="delChart"
               @on-add-group-item-chart="addGroupItem"
+              @refreshPanel="refreshPanel"
               :loading="chartListLoading"
               :chart-detail-info="chartDetailInfo"
             ></chart-list>
@@ -274,6 +275,9 @@ export default {
     refresh () {
       this.getTableData(this.obj.id)
     },
+    refreshPanel () {
+      this.getData(this.filter)
+    },
     refreshTime (st, et) {
       const startTime = bus.timeFormate(st, 'yyyy-MM-dd hh:mm')
       const endTime = bus.timeFormate(et, 'yyyy-MM-dd hh:mm')
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 693a39eab..0b360689a 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -95,6 +95,7 @@
                 @on-refresh-time="refreshTime"
                 @on-remove-chart="delChart"
                 @on-add-group-item-chart="addGroupItem"
+                @refreshPanel="refreshPanel"
                 :loading="chartListLoading"
               ></chart-list>
             </div>
@@ -299,11 +300,8 @@ export default {
   },
   methods: {
     // 刷新
-    Refresh () {
-      const curTime = this.$refs.calendarPanel.getCurrentTime()
-      this.filter.start_time = bus.timeFormate(curTime[0], this.panelDateFormatTime)
-      this.filter.end_time = bus.timeFormate(curTime[1], this.panelDateFormatTime)
-      this.getTableData()
+    refreshPanel () {
+      this.getData(this.filter)
     },
     // 面板相关操作
     panelChange (val) {

From 1d051483604edd60744c75ec02b873556fd27fc1 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Thu, 10 Mar 2022 11:35:37 +0800
Subject: [PATCH 51/65] =?UTF-8?q?NEZ-1647=20fix:=20Roles=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=97=B6Dashboards=E5=86=85=E7=9A=84View?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E9=80=89=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/popBox/guide.vue            | 2 +-
 .../src/components/common/rightBox/administration/roleBox.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/popBox/guide.vue b/nezha-fronted/src/components/common/popBox/guide.vue
index 3e7616c07..b52f2e85c 100644
--- a/nezha-fronted/src/components/common/popBox/guide.vue
+++ b/nezha-fronted/src/components/common/popBox/guide.vue
@@ -101,7 +101,7 @@ export default {
         },
         {
           route: '/monitor/project',
-          title: this.$t('guide.monitor'),
+          title: this.$t('overall.monitor'),
           icon: 'nz-icon nz-icon-menu-project',
           tip: this.$t('guide.monitorTip'),
           permissionCode: 'project_view'
diff --git a/nezha-fronted/src/components/common/rightBox/administration/roleBox.vue b/nezha-fronted/src/components/common/rightBox/administration/roleBox.vue
index 61b6b63b1..d9fb16ed1 100644
--- a/nezha-fronted/src/components/common/rightBox/administration/roleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/administration/roleBox.vue
@@ -23,7 +23,7 @@
               <button type="button" class="nz-btn nz-btn-size-small-new nz-btn-style-light option-btn" style="margin-left: 0px;" @click="expandAllOrNone" :class="{'btn-active':expandAllFlag}">展开/收缩</button>
               <button type="button" class="nz-btn nz-btn-size-small-new nz-btn-style-light option-btn" @click="selectAllOrNone" :class="{'btn-active':selectAllFlag}"><span ><i class="nz-icon nz-icon-delete"></i></span></button>
             </div>-->
-            <el-tree :data="menus" :default-expand-all="expandAllFlag" :props="{label:labelFormatter}" :default-checked-keys="[2]" class="tree-border" node-key="id" ref="menuTree" show-checkbox id="role-box-input-menus">
+            <el-tree :data="menus" :default-expand-all="expandAllFlag" :props="{label:labelFormatter}" :default-checked-keys="[312]" class="tree-border" node-key="id" ref="menuTree" show-checkbox id="role-box-input-menus">
               <div slot-scope="{ node, data }">
               <span>
                 <i v-if="data.type == '1'" class="el-icon-menu"></i>

From 4e48a1f6b2739d4d772beb5596089d1063f00f07 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Thu, 10 Mar 2022 11:55:14 +0800
Subject: [PATCH 52/65] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20log=20?=
 =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E9=A1=B5=E9=9D=A2=E8=AF=B7=E6=B1=82=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/bottomBox/tabs/logBottomTab.vue    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
index 66e0e143c..cd38bb4d6 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
@@ -58,8 +58,8 @@ export default {
     return {
       logData: null,
       filterTime: [
-        bus.timeFormate(bus.getOffsetTimezoneData(-1), 'YYYY-MM-DD HH:mm:ss'),
-        bus.timeFormate(bus.getOffsetTimezoneData(), 'YYYY-MM-DD HH:mm:ss')
+        bus.timeFormate(bus.getOffsetTimezoneData(-1), this.timeFormatMain),
+        bus.timeFormate(bus.getOffsetTimezoneData(), this.timeFormatMain)
       ],
       expressions: [''],
       matchSymbol: '|=',
@@ -115,6 +115,7 @@ export default {
           if (item != '') {
             let expr = item
             this.matchContent && (expr = `${item} ${this.matchSymbol} "${this.matchContent}"`)
+            console.log(this.filterTime)
             requestArr.push(this.$get('/logs/loki/api/v1/query_range?format=1&query=' + encodeURIComponent(expr) + '&start=' + this.$stringTimeParseToUnix(this.filterTime[0]) + '&end=' + this.$stringTimeParseToUnix(this.filterTime[1]) + '&limit=' + limit))
           }
         })

From ff48f86654d01c359ad218a709fec039a785280e Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 10 Mar 2022 13:34:24 +0800
Subject: [PATCH 53/65] =?UTF-8?q?fix=EF=BC=9A=E6=8E=A7=E5=88=B6=E5=8F=B0?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/alert/alertLabel.vue       | 3 +++
 nezha-fronted/src/components/common/alert/alertLabel2.vue      | 3 +++
 nezha-fronted/src/components/common/alert/alertRuleInfo.vue    | 3 +++
 .../src/components/common/globalSearch/searchItemInfo.vue      | 3 +++
 nezha-fronted/src/components/common/mixin/table.js             | 3 +++
 5 files changed, 15 insertions(+)

diff --git a/nezha-fronted/src/components/common/alert/alertLabel.vue b/nezha-fronted/src/components/common/alert/alertLabel.vue
index b373bebef..e4d9ca8b4 100644
--- a/nezha-fronted/src/components/common/alert/alertLabel.vue
+++ b/nezha-fronted/src/components/common/alert/alertLabel.vue
@@ -452,6 +452,9 @@ export default {
         }
         params[this.type + 'Id'] = this.id
         this.$get('/stat/alertMessage/trend', params).then((res) => {
+          if (!res.data) {
+            return
+          }
           const alertDaysData = res.data.result ? res.data.result[0].values : []
           const newWeekDays = JSON.parse(JSON.stringify(weekDays))
           alertDaysData.forEach(item => {
diff --git a/nezha-fronted/src/components/common/alert/alertLabel2.vue b/nezha-fronted/src/components/common/alert/alertLabel2.vue
index 8e3bb6711..07feb41bd 100644
--- a/nezha-fronted/src/components/common/alert/alertLabel2.vue
+++ b/nezha-fronted/src/components/common/alert/alertLabel2.vue
@@ -443,6 +443,9 @@ export default {
         }
         params[this.type + 'Id'] = this.id
         this.$get('/stat/alertMessage/trend', params).then((res) => {
+          if (!res.data) {
+            return
+          }
           const alertDaysData = res.data.result ? res.data.result[0].values : []
           const newWeekDays = JSON.parse(JSON.stringify(weekDays))
           alertDaysData.forEach(item => {
diff --git a/nezha-fronted/src/components/common/alert/alertRuleInfo.vue b/nezha-fronted/src/components/common/alert/alertRuleInfo.vue
index 6067e3f53..ddb945eaf 100644
--- a/nezha-fronted/src/components/common/alert/alertRuleInfo.vue
+++ b/nezha-fronted/src/components/common/alert/alertRuleInfo.vue
@@ -157,6 +157,9 @@ export default {
           }
           params['rule' + 'Id'] = this.id
           this.$get('/stat/alertMessage/trend', params).then((res) => {
+            if (!res.data) {
+              return
+            }
             const alertDaysData = res.data.result ? res.data.result[0].values : []
             const newWeekDays = JSON.parse(JSON.stringify(weekDays))
             alertDaysData.forEach(item => {
diff --git a/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue b/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue
index 6b335d496..2003fe2d0 100644
--- a/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue
+++ b/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue
@@ -406,6 +406,9 @@ export default {
         }
         params[trendKey] = this.obj.id
         this.$get('/stat/alertMessage/trend', params).then((res) => {
+          if (!res.data) {
+            return
+          }
           const alertDaysData = res.data.result ? res.data.result[0].values : []
           const newWeekDays = JSON.parse(JSON.stringify(weekDays))
           alertDaysData.forEach(item => {
diff --git a/nezha-fronted/src/components/common/mixin/table.js b/nezha-fronted/src/components/common/mixin/table.js
index 4ecea5ab7..b0216a1f7 100644
--- a/nezha-fronted/src/components/common/mixin/table.js
+++ b/nezha-fronted/src/components/common/mixin/table.js
@@ -163,6 +163,9 @@ export default {
               params[this.trendKey] = item.id
               setTimeout(() => {
                 this.$get('/stat/alertMessage/trend', params).then((res) => {
+                  if (!res.data) {
+                    return
+                  }
                   const alertDaysData = res.data.result ? res.data.result[0].values : []
                   const newWeekDays = JSON.parse(JSON.stringify(weekDays))
                   alertDaysData.forEach(item => {

From b2cf271a40b6547ca7d934a0721e365bb4e5c8a9 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Thu, 10 Mar 2022 13:50:29 +0800
Subject: [PATCH 54/65] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=20console.log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chartMixin.js               | 1 -
 nezha-fronted/src/components/chart/panelChart.vue              | 1 -
 .../components/common/bottomBox/tabs/alertMessageTabNew.vue    | 2 +-
 .../src/components/common/bottomBox/tabs/logBottomTab.vue      | 1 -
 nezha-fronted/src/components/layout/leftMenu.vue               | 1 -
 nezha-fronted/src/permission.js                                | 3 ---
 6 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chartMixin.js b/nezha-fronted/src/components/chart/chartMixin.js
index fcc3a700e..52e23910b 100644
--- a/nezha-fronted/src/components/chart/chartMixin.js
+++ b/nezha-fronted/src/components/chart/chartMixin.js
@@ -264,7 +264,6 @@ export default {
       deep: true,
       handler (n) {
         if (!this.isInit && this.chartOption.color) {
-          console.log(this.chartOption)
           this.colorList = this.colorList.slice(0, 20)
           this.chartOption.color = this.chartOption.color.slice(0, 20)
           this.initChart(this.chartOption)
diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue
index a4a29d459..1eaf85c1d 100644
--- a/nezha-fronted/src/components/chart/panelChart.vue
+++ b/nezha-fronted/src/components/chart/panelChart.vue
@@ -348,7 +348,6 @@ export default {
           }
         }
       } catch (e) {
-        console.info(e)
         this.loading = false
       }
     },
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index 912ffa325..0edfa4fb6 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -161,7 +161,7 @@ export default {
       immediate: true,
       handler (n) {
         if (n) {
-         console.log(n)
+         // console.log(n)
         }
       }
     }
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
index cd38bb4d6..b7f658ef4 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
@@ -115,7 +115,6 @@ export default {
           if (item != '') {
             let expr = item
             this.matchContent && (expr = `${item} ${this.matchSymbol} "${this.matchContent}"`)
-            console.log(this.filterTime)
             requestArr.push(this.$get('/logs/loki/api/v1/query_range?format=1&query=' + encodeURIComponent(expr) + '&start=' + this.$stringTimeParseToUnix(this.filterTime[0]) + '&end=' + this.$stringTimeParseToUnix(this.filterTime[1]) + '&limit=' + limit))
           }
         })
diff --git a/nezha-fronted/src/components/layout/leftMenu.vue b/nezha-fronted/src/components/layout/leftMenu.vue
index c2332acf0..c68b4bb6a 100644
--- a/nezha-fronted/src/components/layout/leftMenu.vue
+++ b/nezha-fronted/src/components/layout/leftMenu.vue
@@ -82,7 +82,6 @@ export default {
   },
   methods: {
     jump (route) {
-      console.log(route, this.route)
       if (route === this.route) {
         this.refresh()
       }
diff --git a/nezha-fronted/src/permission.js b/nezha-fronted/src/permission.js
index 1972d3f0e..cc3ee03c3 100644
--- a/nezha-fronted/src/permission.js
+++ b/nezha-fronted/src/permission.js
@@ -15,7 +15,6 @@ router.beforeEach((to, from, next) => {
   const configUrl = 'static/config.json?Timestamp=' + new Date().getTime()
   if (to.path === '/login') { // 拦截登录页面，现货区外观设置 再系统初始化检查
     Vue.http.get(configUrl).then(config => {
-      console.log(1)
       const appearance = new Promise(resolve => {
         get(config.body.baseUrl + 'sys/appearance').then(res => {
           if (res.code === 200) {
@@ -110,7 +109,6 @@ router.beforeEach((to, from, next) => {
           store.commit('setLangList', JSON.parse(langList))
         }
         Vue.http.get(configUrl).then(config => {
-          console.log(2)
           get(config.body.baseUrl + 'sys/i18n/lang').then(response => {
             if (response.code === 200) {
               loadI18n(response.data)
@@ -126,7 +124,6 @@ router.beforeEach((to, from, next) => {
     const permissionRequest = new Promise(resolve => {
       if (store.getters.menuList.length === 0) {
         Vue.http.get(configUrl).then(config => {
-          console.log(3)
           post(config.body.baseUrl + 'sys/user/permissions', { token: localStorage.getItem('nz-token') }).then(res => {
             if (res.code === 200) {
               store.commit('setMenuList', sortByOrderNum(res.data.menus))

From 49042f83fd6759a823c5377f810c47b1b68b713d Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 10 Mar 2022 15:27:01 +0800
Subject: [PATCH 55/65] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20chartTem?=
 =?UTF-8?q?p=20=E5=90=8C=E6=AD=A5=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chartList.vue          | 2 +-
 .../src/components/common/bottomBox/tabs/panelTabNew.vue  | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue
index db038a7f5..906759e83 100644
--- a/nezha-fronted/src/components/chart/chartList.vue
+++ b/nezha-fronted/src/components/chart/chartList.vue
@@ -297,7 +297,7 @@ export default {
       }
       this.scrollTopTimer = setTimeout(() => {
         this.copyDataList.forEach(item => {
-          if (!this.$refs['grid-item' + item.id][0]) {
+          if (!this.$refs['grid-item' + item.id] || !this.$refs['grid-item' + item.id][0]) {
             return;
           }
           const dom = this.$refs['grid-item' + item.id][0].$el
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
index c772ba6e0..da97c5da6 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
@@ -686,7 +686,13 @@ export default {
     },
     chartBySync () {
       this.panelTabLoading = true
-      this.$post('visual/panel/chart/syncTmpl', { panelId: this.showPanel.id }).then(res => {
+      const params = {}
+      if (this.from === 'chartTemp') {
+        params.pid = this.obj.id
+      } else {
+        params.panelId = this.showPanel.id
+      }
+      this.$post('visual/panel/chart/syncTmpl', params).then(res => {
         this.panelTabLoading = false
         if (res.code === 200) {
           this.getTableData(this.obj.id)

From a8767f08bcf518b63b57a3e21eae5df1338fb07e Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 10 Mar 2022 16:08:25 +0800
Subject: [PATCH 56/65] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0=20group?=
 =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0chart=E7=9A=84=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chartHeader.vue | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/nezha-fronted/src/components/chart/chartHeader.vue b/nezha-fronted/src/components/chart/chartHeader.vue
index 44a2dd8b1..6ffa94932 100644
--- a/nezha-fronted/src/components/chart/chartHeader.vue
+++ b/nezha-fronted/src/components/chart/chartHeader.vue
@@ -41,6 +41,11 @@
            <i class="nz-icon nz-icon-info-normal tool__icon"></i>
         </el-tooltip>
       </span>
+      <span  v-if="chartInfo.type=='group'" class="chart-header__tool" @click="addChartGroup">
+        <el-tooltip :content="$t('overall.add')" effect="light" placement="top">
+           <i class="nz-icon nz-icon-plus tool__icon"></i>
+        </el-tooltip>
+      </span>
       <span class="chart-header__tool" @click="refreshChart">
         <el-tooltip :content="$t('dashboard.refresh')" effect="light" placement="top">
            <i class="nz-icon nz-icon-replay tool__icon"></i>
@@ -87,6 +92,13 @@ export default {
   methods: {
     openUrl () {
       window.open(this.chartInfo.param.link)
+    },
+    addChartGroup () {
+      this.$store.commit('setGroupId', this.chartInfo.id)
+      this.$store.dispatch('dispatchEditChart', {
+        chart: '',
+        type: 'addGroupItem'
+      })
     }
   }
 }

From dfec693d0fd3277b4f2b26fb1772149093d39057 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 10 Mar 2022 16:51:51 +0800
Subject: [PATCH 57/65] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=20group=E5=86=85=E7=9A=84=E5=9B=BE=E8=A1=A8?=
 =?UTF-8?q?=20=E6=9C=AA=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chartList.vue             | 5 ++++-
 .../src/components/common/bottomBox/tabs/panelTabNew.vue     | 1 +
 nezha-fronted/src/components/page/dashboard/panel.vue        | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue
index 906759e83..b2907d223 100644
--- a/nezha-fronted/src/components/chart/chartList.vue
+++ b/nezha-fronted/src/components/chart/chartList.vue
@@ -48,7 +48,7 @@
           :from="from"
           :time-range="timeRange"
           :chart-detail-info="chartDetailInfo"
-          @refreshPanel="$emit('refreshPanel')"
+          @refreshPanel="refreshPanel"
           @showFullscreen="showFullscreen"
         ></panel-chart>
       </grid-item>
@@ -332,6 +332,9 @@ export default {
           }
         })
       }, 200)
+    },
+    refreshPanel () {
+      bus.$emit('refreshPanel')
     }
   },
   created () {
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
index da97c5da6..a1e586b8d 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
@@ -724,6 +724,7 @@ export default {
     }
   },
   mounted () {
+    bus.$on('refreshPanel', this.refreshPanel)
     this.scrollbarWrap = this.$refs.dashboardScrollbar
     this.onScroll()
     document.querySelector('#tableList').addEventListener('mouseenter', this.tableListEnter)
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 0b360689a..001721812 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -848,6 +848,7 @@ export default {
     })
   },
   mounted () {
+    bus.$on('refreshPanel', this.refreshPanel)
     this.scrollbarWrap = this.$refs.dashboardScrollbar
     this.onScroll()
     document.querySelector('#tableList').addEventListener('mouseenter', this.tableListEnter)

From b0c23d1f0384b17354fa39e122b3ff3c5a42f52e Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 10 Mar 2022 16:55:49 +0800
Subject: [PATCH 58/65] =?UTF-8?q?fix=EF=BC=9A=E5=A4=84=E7=90=86=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8F=B0=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/mixin/dataList.js | 3 +++
 nezha-fronted/src/components/page/asset/asset.vue     | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js
index 446161370..351498f97 100644
--- a/nezha-fronted/src/components/common/mixin/dataList.js
+++ b/nezha-fronted/src/components/common/mixin/dataList.js
@@ -867,6 +867,9 @@ export default {
     if (pageSize && pageSize !== 'undefined') {
       this.pageObj.pageSize = pageSize
     }
+    if (!this.$refs.dataTable && !this.$refs.dataDetail) {
+      return
+    }
     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/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 0d4e6335f..51c6278a6 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -612,6 +612,9 @@ export default {
             resolve(data)
             setTimeout(() => {
               const title = this.tools.customTableTitle
+              if (!this.$refs.dataTable && !this.$refs.dataDetail) {
+                return
+              }
               const tableTitle = this.$refs.dataTable ? this.$refs.dataTable.tableTitle : this.$refs.dataDetail.tableTitle
               const originalTitle = title.slice(0, tableTitle.length) // 原title
               const oldLabelTitle = title.slice(tableTitle.length, title.length) // 旧labelTitle

From 5a478fbffe3b872249ac86daf7dd71bd0cb92c25 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 11 Mar 2022 10:45:19 +0800
Subject: [PATCH 59/65] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9panel=20=20?=
 =?UTF-8?q?lock=20=20=E5=88=B7=E6=96=B0=E5=B0=B1panel=20=E5=B0=B1=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chart/chartStat.vue        | 4 ++--
 nezha-fronted/src/components/chart/chartList.vue              | 3 ---
 .../src/components/common/bottomBox/tabs/panelTabNew.vue      | 1 +
 nezha-fronted/src/components/page/dashboard/panel.vue         | 4 ++++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartStat.vue b/nezha-fronted/src/components/chart/chart/chartStat.vue
index f6c30f835..52cbaa08d 100644
--- a/nezha-fronted/src/components/chart/chart/chartStat.vue
+++ b/nezha-fronted/src/components/chart/chart/chartStat.vue
@@ -151,8 +151,8 @@ export default {
       this.tooltip.show = false
     },
     getLayout () {
-      this.boxWidth = this.$refs['chart-stat-box'].offsetWidth - 2 * this.boxPadding
-      this.boxHeight = this.$refs['chart-stat-box'].offsetHeight - 2 * this.boxPadding
+      this.boxWidth = this.$refs['chart-stat-box'].offsetWidth - 3 * this.boxPadding
+      this.boxHeight = this.$refs['chart-stat-box'].offsetHeight - 3 * this.boxPadding
       return new Promise(resolve => {
         let rateMax = 0
         let col = 0
diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue
index b2907d223..4be18f26b 100644
--- a/nezha-fronted/src/components/chart/chartList.vue
+++ b/nezha-fronted/src/components/chart/chartList.vue
@@ -347,9 +347,6 @@ export default {
       this.$store.commit('setChartListId', `chartList${this.timestamp}`)
     }
   },
-  beforeDestroy () {
-    this.$store.dispatch('dispatchPanelLock', { flag: true })
-  },
   watch: {
     dataList: {
       deep: true,
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
index a1e586b8d..d726ba560 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
@@ -778,6 +778,7 @@ export default {
     document.querySelector('#tableList') && document.querySelector('#tableList').removeEventListener('mouseenter', this.tableListEnter)
     document.querySelector('#tableList') && document.querySelector('#tableList').removeEventListener('mouseleave', this.tableListLeave)
     this.scrollbarWrap && this.scrollbarWrap.removeEventListener('scroll', bus.debounce)
+    this.$store.dispatch('dispatchPanelLock', { flag: true })
   }
 }
 </script>
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 001721812..6c09d0c50 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -527,6 +527,7 @@ export default {
     createSuccess (msg, data, params, panel) {
       this.filter.panelId = this.showPanel.id
       this.getData(this.filter)
+      this.$store.dispatch('clearPanel')
     },
     // 获取数据,用在子页面
     getData (params) {
@@ -866,6 +867,9 @@ export default {
       }, 100)
     }
   },
+  beforeDestroy () {
+    this.$store.dispatch('dispatchPanelLock', { flag: true })
+  },
   watch: {
     'filter.searchName': function (n, o) {
       const temp = this

From 7b356b26035f9d267e7208cdc7d7e28c0303d7d1 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 11 Mar 2022 11:05:30 +0800
Subject: [PATCH 60/65] =?UTF-8?q?NEZ-1666=20=20fix=EF=BC=9A=20=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA=E5=9B=BE=E8=A1=A8=E6=97=B6System=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E4=B8=8B=E8=BE=93=E5=85=A5=E6=A1=86=E6=95=88=E9=AA=8C=E6=9C=89?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/rightBox/chart/systemChartConfig.vue           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
index af5c6086c..a7e0c73ff 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
@@ -804,12 +804,12 @@ export default {
     },
     systemNameChange (index) {
       if (this.systemNameShow[index].error) {
-        this.expressionName[index] = this.systemNameShow[index].oldName
+        this.chartConfig.param.datasource[index].name = this.systemNameShow[index].oldName
         this.systemNameShow[index].error = ''
-      } else if (!this.expressionName[index]) {
-        this.expressionName[index] = this.systemNameShow[index].oldName
+      } else if (!this.chartConfig.param.datasource[index].name) {
+        this.chartConfig.param.datasource[index].name = this.systemNameShow[index].oldName
       } else {
-        this.systemNameShow[index].oldName = this.expressionName[index]
+        this.systemNameShow[index].oldName = this.chartConfig.param.datasource[index].name
       }
       this.change()
     },

From 370158176c1e3b6720beb884771a33d5bfe5602e Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 11 Mar 2022 14:51:59 +0800
Subject: [PATCH 61/65] =?UTF-8?q?NEZ-1658=20fix=EF=BC=9AExplore=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BAlogs=E6=97=A5=E5=BF=97=E6=97=B6=EF=BC=8C=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E4=B8=8D=E5=90=8C=E6=9D=A1=E6=95=B0=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=98=AF=E4=B8=80=E6=A0=B7=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/page/dashboard/explore/logTab.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/page/dashboard/explore/logTab.vue b/nezha-fronted/src/components/page/dashboard/explore/logTab.vue
index 1b76a9b55..2bd5126bb 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/logTab.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/logTab.vue
@@ -187,7 +187,7 @@ export default {
       }
     },
     exportLog () {
-      this.$emit('exportLog', this.operations)
+      this.$emit('exportLog', { limit: this.limit, ...this.operations })
     },
     cellClassName ({ row, column, rowIndex, columnIndex }) {
       const className = []

From 33b63e88ea61427d7c576ee9a74d8e1051aac8cf Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 11 Mar 2022 17:07:08 +0800
Subject: [PATCH 62/65] =?UTF-8?q?NEZ-1671=20fix=EF=BC=9A=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9A=84=E5=87=A0=E7=A7=8D=E5=9B=BE=E8=A1=A8?=
 =?UTF-8?q?=E6=9C=80=E5=A4=A7=E5=8C=96=E5=90=8E=E6=9F=A5=E7=9C=8B=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E6=95=88=E6=9E=9C=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/ChartScreenHeader.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/chart/ChartScreenHeader.vue b/nezha-fronted/src/components/chart/ChartScreenHeader.vue
index ca288671b..28ba0ebbd 100644
--- a/nezha-fronted/src/components/chart/ChartScreenHeader.vue
+++ b/nezha-fronted/src/components/chart/ChartScreenHeader.vue
@@ -88,7 +88,8 @@ export default {
       this.filter.value = this.searchTime[2]
       this.filter.id = this.$refs.pickTime.$refs.timePicker.showTime.id
       setTimeout(() => {
-        this.$emit('dateChange', this.filter, this.$refs.pickTime.$refs.multipleTime.searchTime)
+        const multipleTime = this.$refs.pickTime.$refs.multipleTime ? this.$refs.pickTime.$refs.multipleTime.searchTime : ''
+        this.$emit('dateChange', this.filter, multipleTime)
       }, 100)
     },
     closeDialog () {
@@ -128,6 +129,10 @@ export default {
         case 'pie' :
         case 'treemap' :
         case 'log' :
+        case 'hexagon' :
+        case 'diagram' :
+        case 'url':
+        case 'clock':
           return true
         default: return false
       }

From 3898a140d3f8f0155b824b655f98f0d329f9f49c Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 11 Mar 2022 17:18:26 +0800
Subject: [PATCH 63/65] =?UTF-8?q?NEZ-1672=20fix=EF=BC=9Alogs=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E7=82=B9=E5=87=BBDescending=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chart.vue    |  4 ++++
 .../src/components/chart/chart/chartLog.vue     |  8 ++++++++
 .../src/components/chart/panelChart.vue         | 17 ++++++++++++++---
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chart.vue b/nezha-fronted/src/components/chart/chart.vue
index 6c678cc05..c7e918173 100644
--- a/nezha-fronted/src/components/chart/chart.vue
+++ b/nezha-fronted/src/components/chart/chart.vue
@@ -76,6 +76,7 @@
         :chart-info="chartInfo"
         :chart-option="chartOption"
         :is-fullscreen="isFullscreen"
+        @refreshLogs="refreshLogs"
         @chartIsNoData="chartIsNoData"
       ></chart-log>
       <chart-stat
@@ -287,6 +288,9 @@ export default {
     },
     resize () {
       this.$refs['chart' + this.chartInfo.id] && this.$refs['chart' + this.chartInfo.id].resize()
+    },
+    refreshLogs (params) {
+      this.$emit('refreshLogs', params)
     }
   },
   mounted () {
diff --git a/nezha-fronted/src/components/chart/chart/chartLog.vue b/nezha-fronted/src/components/chart/chart/chartLog.vue
index fdb0cabbd..6002e47b9 100644
--- a/nezha-fronted/src/components/chart/chart/chartLog.vue
+++ b/nezha-fronted/src/components/chart/chart/chartLog.vue
@@ -164,6 +164,7 @@ export default {
     initChart () {
       this.tableData = []
       this.isInit = false
+      this.operations.descending = this.chartInfo.descending
       this.chartData.forEach(item => {
         item.forEach(row => {
           this.tableData.push({
@@ -286,6 +287,13 @@ export default {
       handler (n) {
         this.initChart(this.chartOption)
       }
+    },
+    operations: {
+      deep: true,
+      handler (n) {
+        // this.tableData = this.tableData.reverse()
+        this.$emit('refreshLogs', this.operations)
+      }
     }
   }
 }
diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue
index 1eaf85c1d..2fb8152c6 100644
--- a/nezha-fronted/src/components/chart/panelChart.vue
+++ b/nezha-fronted/src/components/chart/panelChart.vue
@@ -44,6 +44,7 @@
       :panelLock="panelLock"
       :filter="filter"
       :from="from"
+      @refreshLogs="refreshLogs"
       :show-header="showHeader"
       :isError="isError"
       :loading="loading"
@@ -129,7 +130,7 @@ export default {
       this.chartInfo.loaded && this.query(elements, startTime, endTime, step)
     },
     // 参数 isRefresh 标识是否是刷新操作
-    getChartData (isRefresh) {
+    getChartData (isRefresh, params) {
       this.loading = true
       // TODO assetInfo、endpointInfo、echarts等进行不同的处理
       let startTime = ''
@@ -153,9 +154,9 @@ export default {
       startTime = this.$stringTimeParseToUnix(startTime)
       endTime = this.$stringTimeParseToUnix(endTime)
       const elements = this.chartInfo.elements || []
-      this.chartInfo.loaded && this.query(elements, startTime, endTime, step)
+      this.chartInfo.loaded && this.query(elements, startTime, endTime, step, params)
     },
-    query (elements, startTime, endTime, step) {
+    query (elements, startTime, endTime, step, params) {
       this.isError = false
       this.allDataLength = 0
       try {
@@ -193,6 +194,13 @@ export default {
               }
               if (this.chartInfo.datasource === 'logs') {
                 query += '&format=1'
+                if (!params || params.descending) {
+                  this.chartInfo.descending = true
+                  query += '&direction=forward'
+                } else {
+                  this.chartInfo.descending = false
+                  query += '&direction=backward'
+                }
               }
               // if (isChartPie(this.chartInfo.type)) {
               //   query += `&statistics=${this.chartInfo.param.statistics || 'last'}`
@@ -383,6 +391,9 @@ export default {
     refresh () {
       this.getChartData(true)
     },
+    refreshLogs (params) {
+      this.getChartData(true, params)
+    },
     logChartDataFormat () {
       this.chartData.forEach((item, index) => {
         const elements = this.chartInfo.elements[index]

From 06e34313373fbd3ebed39b8345fcd40ff4f24b83 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 11 Mar 2022 17:27:26 +0800
Subject: [PATCH 64/65] =?UTF-8?q?NEZ-1673=20=20=20=20fix=EF=BC=9A=20logs?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E5=AF=BC=E5=87=BA=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chart/chartLog.vue | 2 +-
 nezha-fronted/src/components/chart/panelChart.vue     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartLog.vue b/nezha-fronted/src/components/chart/chart/chartLog.vue
index 6002e47b9..b1d35d644 100644
--- a/nezha-fronted/src/components/chart/chart/chartLog.vue
+++ b/nezha-fronted/src/components/chart/chart/chartLog.vue
@@ -216,7 +216,7 @@ export default {
       const limit = this.operations.limit
       const descending = this.operations.descending
       const params = {
-        logql: this.expressions,
+        logql: this.chartInfo.elements.map(item => item.expression),
         start: this.$stringTimeParseToUnix(this.filterTime[0]),
         end: this.$stringTimeParseToUnix(this.filterTime[1]),
         direction: descending ? 'backward' : 'forward',
diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue
index 2fb8152c6..16ba3e590 100644
--- a/nezha-fronted/src/components/chart/panelChart.vue
+++ b/nezha-fronted/src/components/chart/panelChart.vue
@@ -196,10 +196,10 @@ export default {
                 query += '&format=1'
                 if (!params || params.descending) {
                   this.chartInfo.descending = true
-                  query += '&direction=forward'
+                  query += '&direction=backward'
                 } else {
                   this.chartInfo.descending = false
-                  query += '&direction=backward'
+                  query += '&direction=forward'
                 }
               }
               // if (isChartPie(this.chartInfo.type)) {

From 26a1999bf53f0a57504f734455b9ae05af45169b Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 14 Mar 2022 13:47:37 +0800
Subject: [PATCH 65/65] =?UTF-8?q?fix=EF=BC=9A=E7=99=BB=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=EF=BC=8C=20?=
 =?UTF-8?q?=E2=80=98sys/license/token=E2=80=99=20=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=9A=84=E6=96=87=E4=BB=B6=E5=90=8D=20?=
 =?UTF-8?q?=E4=BB=8E=E8=BF=94=E5=9B=9E=E5=A4=B4=E9=83=A8=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/css/components/common/login.scss      |  2 +-
 nezha-fronted/src/components/common/login.vue        | 12 ++++++++----
 .../src/components/page/config/system/license.vue    | 10 +++++++---
 nezha-fronted/src/http.js                            |  6 ++++++
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/common/login.scss b/nezha-fronted/src/assets/css/components/common/login.scss
index ba983f320..d915a9f64 100644
--- a/nezha-fronted/src/assets/css/components/common/login.scss
+++ b/nezha-fronted/src/assets/css/components/common/login.scss
@@ -164,7 +164,7 @@
     text-align: center;
     line-height: 30px;
     display: flex;
-    justify-content: space-around;
+    justify-content: space-between;
     .license-info {
       margin-bottom: 10px;
       color: white;
diff --git a/nezha-fronted/src/components/common/login.vue b/nezha-fronted/src/components/common/login.vue
index 34e0407d5..7588803e6 100644
--- a/nezha-fronted/src/components/common/login.vue
+++ b/nezha-fronted/src/components/common/login.vue
@@ -31,7 +31,7 @@
 <!--          <div v-if="!license.valid" class="license-info">INSTALLATION ID:&nbsp;{{license.token}}</div>-->
           <div v-if="!license.valid" class="license-upload">
 <!--            <button type="button" class="login-btn" @click="downloadMib"><span style="margin-right: 5px"><i class="nz-icon nz-icon-download1"></i></span>{{$t('license.dowLicense')}}</button>-->
-            <button type="button" class="login-btn download-btn" @click="downloadLogin"><span style="margin-right: 5px"><i class="nz-icon nz-icon-download1"></i></span>{{$t('login.download')}}</button>
+            <button type="button" class="login-btn download-btn" @click="downloadLogin"><span style="margin-right: 5px"><i class="nz-icon nz-icon-download1"></i></span>{{$t('license.downloadID')}}</button>
           </div>
           <div class="license-upload" v-if="!license.valid">
             <el-upload
@@ -270,13 +270,17 @@ export default {
     },
     downloadLogin () {
       this.$get('/sys/license/token').then(res => {
-        const fileName = 'Login' + '-' + this.getTimeString() + '.xml'
+        let fileName = this.licenseList.id + '-' + this.getTimeString() + '.xml'
+        const resFileName = res.headers['content-disposition'].split('=')[1]
+        if (resFileName) {
+          fileName = resFileName
+        }
         if (window.navigator.msSaveOrOpenBlob) {
           // 兼容ie11
-          const blobObject = new Blob([res])
+          const blobObject = new Blob([res.data])
           window.navigator.msSaveOrOpenBlob(blobObject, fileName)
         } else {
-          const url = URL.createObjectURL(new Blob([res]))
+          const url = URL.createObjectURL(new Blob([res.data]))
           const a = document.createElement('a')
           document.body.appendChild(a) // 此处增加了将创建的添加到body当中
           a.href = url
diff --git a/nezha-fronted/src/components/page/config/system/license.vue b/nezha-fronted/src/components/page/config/system/license.vue
index 44a9b1d76..2b80d6aa0 100644
--- a/nezha-fronted/src/components/page/config/system/license.vue
+++ b/nezha-fronted/src/components/page/config/system/license.vue
@@ -194,13 +194,17 @@ export default {
     },
     downloadLicense () {
       this.$get('/sys/license/token').then(res => {
-        const fileName = this.licenseList.id + '-' + this.getTimeString() + '.xml'
+        let fileName = this.licenseList.id + '-' + this.getTimeString() + '.xml'
+        const resFileName = res.headers['content-disposition'].split('=')[1]
+        if (resFileName) {
+          fileName = resFileName
+        }
         if (window.navigator.msSaveOrOpenBlob) {
           // 兼容ie11
-          const blobObject = new Blob([res])
+          const blobObject = new Blob([res.data])
           window.navigator.msSaveOrOpenBlob(blobObject, fileName)
         } else {
-          const url = URL.createObjectURL(new Blob([res]))
+          const url = URL.createObjectURL(new Blob([res.data]))
           const a = document.createElement('a')
           document.body.appendChild(a) // 此处增加了将创建的添加到body当中
           a.href = url
diff --git a/nezha-fronted/src/http.js b/nezha-fronted/src/http.js
index 55321bb5e..c2df199c5 100644
--- a/nezha-fronted/src/http.js
+++ b/nezha-fronted/src/http.js
@@ -77,6 +77,12 @@ export function get (url, params) {
     axios.get(url, {
       params: params
     }).then(response => {
+      if (url.indexOf('/sys/license/token') !== -1) {
+        resolve({
+          data: response.data,
+          headers: response.headers
+        })
+      }
       resolve(response.data)
     }).catch(err => {
       if (err.response) {