From d110b1d43045d179c93c5a20da4d6e8b2a01be30 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 23 Mar 2022 16:13:29 +0800
Subject: [PATCH 01/18] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8Dheader=20?=
 =?UTF-8?q?=E5=8F=96=E9=A6=96=E5=AD=97=E6=AF=8D=E6=8A=A5=E9=94=99=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/layout/header.vue | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/layout/header.vue b/nezha-fronted/src/components/layout/header.vue
index d5b3d99a6..fee1e4536 100644
--- a/nezha-fronted/src/components/layout/header.vue
+++ b/nezha-fronted/src/components/layout/header.vue
@@ -50,7 +50,7 @@
         </el-dropdown-menu>
       </el-dropdown>
       <el-dropdown trigger="click">
-        <div class="personal-avatar"><span>{{name.substr(0, 1)}}</span>&nbsp;<i class="nz-icon nz-icon-arrow-down"></i></div>
+        <div class="personal-avatar"><span>{{name ? name.substr(0, 1) : ''}}</span>&nbsp;<i class="nz-icon nz-icon-arrow-down"></i></div>
         <el-dropdown-menu  slot="dropdown" class="right-public-box-select-top right-public-box-dropdown-top" style="width: 142px; line-height: 36px;">
           <div class="personal-dropdown">
             <div class="personal-dropdown__username">{{name}}</div>
@@ -83,9 +83,9 @@ export default {
   },
   data () {
     return {
-      username: localStorage.getItem('nz-username'),
-      name: localStorage.getItem('nz-user-name'),
-      language: localStorage.getItem('nz-language') ? localStorage.getItem('nz-language') : 'en',
+      username: '',
+      name: '',
+      language: 'en',
       // 顶部菜单相关
       createMenu: [ // 新增按钮内容
         {
@@ -119,7 +119,7 @@ export default {
           permission: 'header_add_rule'
         }
       ],
-      showGuide: false,
+      showGuide: false
       // fontData: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ' ', '@', '$', '-']
     }
   },
@@ -212,6 +212,9 @@ export default {
       this.initEvent()
       this.getLinkData()
     }
+    this.name = localStorage.getItem('nz-user-name')
+    this.username = localStorage.getItem('nz-user-name')
+    this.language = localStorage.getItem('nz-language') ? localStorage.getItem('nz-language') : 'en'
     window.addEventListener('visibilitychange', this.testUser)
   },
   computed: {

From bd7c9b0a0a2ec9397f58dde462611a9f4f82c89f Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 23 Mar 2022 16:15:11 +0800
Subject: [PATCH 02/18] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=20?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=A6=96=E9=A1=B5=E6=8E=A5=E5=8F=A3=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/permission.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/permission.js b/nezha-fronted/src/permission.js
index 1d8e7ff58..be7d0270c 100644
--- a/nezha-fronted/src/permission.js
+++ b/nezha-fronted/src/permission.js
@@ -11,7 +11,7 @@ Vue.use(VueResource)
 const loginWhiteList = ['/setup', '/sys/license/upload', '/sys/license/state', '/sys/appearance'] // 免登陆白名单
 const permissionWhiteList = ['/profile', '/menu', ...loginWhiteList] // 权限白名单
 router.beforeEach((to, from, next) => {
-  if (store.getters.getNowPath !== to.path) {
+  if (store.getters.getNowPath !== to.path && store.getters.getNowPath !== '/login') {
     requestsArr.forEach(xhr => xhr.cancel())
   }
   store.commit('setNowPath', to.path)

From 44c76c11b6f538ed25dece281e01abaf669fc41e Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Wed, 23 Mar 2022 16:27:59 +0800
Subject: [PATCH 03/18] =?UTF-8?q?fix:=20asset=20=EF=BC=8Cendpoint=20?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=A1=E6=81=AF=20info=20=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8,=E5=91=8A=E8=AD=A6=E5=88=97=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/chart/chartDetail.vue      | 99 +++++++++++++++++--
 .../common/bottomBox/tabs/logBottomTab.vue    |  8 +-
 .../page/dashboard/explore/logTab.vue         |  2 +-
 3 files changed, 99 insertions(+), 10 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chartDetail.vue b/nezha-fronted/src/components/chart/chartDetail.vue
index 7894929e2..24dee2dec 100644
--- a/nezha-fronted/src/components/chart/chartDetail.vue
+++ b/nezha-fronted/src/components/chart/chartDetail.vue
@@ -65,9 +65,16 @@
           </div>
           <div class="basic-info-table-list">
             <div class="basic-info-table-title">{{ $t('overall.alert') }}</div>
-            <div class="basic-info-table-value">
-              <i :class="chartDetail && chartDetail.alertNum > 0 ? 'red' : 'green'" class="nz-icon nz-icon-overview-alert"></i>&nbsp;
-              <span>{{chartDetail ? chartDetail.alertNum : 0}}</span>
+            <div class="basic-info-table-value" v-if="chartDetailList">
+              <i :class="chartDetailList.alertNum ? 'red' : 'green'" class="nz-icon nz-icon-overview-alert vertical-align-top;"  @mouseenter="tooltipHover('',true, $event)" @mouseleave="tooltipHover('',false, $event)"></i>
+              <div v-if="alertNumtooltipShow" class="alert-days-info-tooltip" :style="{left: position.left + 'px',top:position.top + 'px'}">
+                <div class="tooltip-title">Alert message (active)</div>
+                <div class="severity-info" style='justify-content: space-between'>
+                  <div class="severity-name">{{$t('overall.result.total')}}</div>
+                  <div class="severity-value">{{chartDetail.alertNum}}</div>
+                </div>
+              </div>
+              <alertDaysInfo v-show="!trendLoading" :alertDaysData="alertDaysData"/>
             </div>
           </div>
           <div class="basic-info-table-list">
@@ -108,9 +115,16 @@
           </div>
           <div class="basic-info-table-list">
             <div class="basic-info-table-title">{{$t('overall.alert')}}</div>
-            <div class="basic-info-table-value">
-              <i :class="chartDetail && chartDetail.alertNum > 0 ? 'red' : 'green'" class="nz-icon nz-icon-overview-alert"></i>&nbsp;
-              <span>{{chartDetail && chartDetail.alertNum ? chartDetail.alertNum : 0}}</span>
+            <div class="basic-info-table-value" v-if="chartDetailList">
+              <i :class="chartDetailList.alertNum ? 'red' : 'green'" class="nz-icon nz-icon-overview-alert vertical-align-top;"  @mouseenter="tooltipHover('',true, $event)" @mouseleave="tooltipHover('',false, $event)"></i>
+              <div v-if="alertNumtooltipShow" class="alert-days-info-tooltip" :style="{left: position.left + 'px',top:position.top + 'px'}">
+                <div class="tooltip-title">Alert message (active)</div>
+                <div class="severity-info" style='justify-content: space-between'>
+                  <div class="severity-name">{{$t('overall.result.total')}}</div>
+                  <div class="severity-value">{{chartDetail.alertNum}}</div>
+                </div>
+              </div>
+              <alertDaysInfo v-show="!trendLoading" :alertDaysData="alertDaysData"/>
             </div>
           </div>
           <div class="basic-info-table-list">
@@ -150,6 +164,7 @@
 
 <script>
 import bus from '@/libs/bus'
+import trendMixin from '../common/alert/trendMixins'
 
 export default {
   name: 'chartDetail',
@@ -157,6 +172,7 @@ export default {
     chartDetail: Object,
     chartInfo: Object
   },
+  mixins: [trendMixin],
   watch: {
     chartDetail: {
       immediate: true,
@@ -174,16 +190,85 @@ export default {
           })
         }
       }
+    },
+    'chartDetail.id': {
+      immediate: true,
+      deep: true,
+      handler (n) {
+        this.init()
+      }
     }
   },
   data () {
     return {
-      showBasicInfo: false
+      showBasicInfo: false,
+      chartDetailList: null
     }
   },
   methods: {
     hideElement () {
       this.showBasicInfo = !this.showBasicInfo
+    },
+    init () {
+      this.loading = true
+      if (this.chartInfo.type === 'assetInfo') {
+        this.$get('asset/asset/' + this.chartDetail.id).then((res) => {
+          if (res.msg === 'success') {
+            this.loading = false
+            this.chartDetailList = res.data
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+      }
+      if (this.chartInfo.type === 'endpointInfo') {
+        this.$get('monitor/endpoint/' + this.chartDetail.id).then((res) => {
+          if (res.msg === 'success') {
+            this.loading = false
+            this.chartDetailList = res.data
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+      }
+      const weekDays = this.getWeeksTime()
+      if (this.trendTimer) {
+        clearTimeout(this.trendTimer)
+        this.trendTimer = null
+      }
+      this.trendTimer = setTimeout(() => {
+        this.trendLoading = true
+        const params = {
+          type: 'total',
+          dimension: 'priority',
+          step: 'd'
+        }
+        if (this.chartInfo.type === 'assetInfo') {
+          params.assetId = this.chartDetail.id
+        } else if (this.chartInfo.type === 'endpointInfo') {
+          params.endpointId = this.chartDetail.id
+        }
+        // params[this.chartInfo.type + 'Id'] = this.chartDetail.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 => {
+            item.values.forEach(time => {
+              const findItem = newWeekDays.find(days => days.time == time[0])
+              if (findItem) {
+                findItem[item.metric.priority] = time[1]
+              }
+            })
+          })
+          setTimeout(() => {
+            this.alertDaysData = newWeekDays
+            this.trendLoading = false
+          })
+        })
+      })
     }
   }
 }
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
index b7f658ef4..2c3deb635 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
@@ -120,8 +120,12 @@ export default {
         })
         axios.all(requestArr).then(res => {
           this.logData = res.map(r => r.data)
-          if (this.logData[0].result.length > 0) {
-            this.endpointLoading = false
+          if (this.logData[0]) {
+            if (this.logData[0].result.length > 0) {
+              this.endpointLoading = false
+            } else {
+              this.endpointLoading = true
+            }
           } else {
             this.endpointLoading = true
           }
diff --git a/nezha-fronted/src/components/page/dashboard/explore/logTab.vue b/nezha-fronted/src/components/page/dashboard/explore/logTab.vue
index 2bd5126bb..f69925927 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/logTab.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/logTab.vue
@@ -26,7 +26,7 @@
       </div>
       <div class="log-operation">
         <span class="operation-label">{{$t('overall.limit')}}:</span>
-        <el-select v-model="limit" size="small" style="width: 100px;" popper-class="right-box-select-top ">
+        <el-select v-model="limit" size="small" style="width: 100px;" popper-class="right-box-select-top right-public-box-dropdown-top">
           <el-option v-for="option in limitOptions" :key="option" :value="option"></el-option>
         </el-select>
       </div>

From b63f5f69119a0e577ee4aeb656b8bcb2ffac6656 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Wed, 23 Mar 2022 16:43:20 +0800
Subject: [PATCH 04/18] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/chart/chartDetail.vue      | 25 ++-----------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chartDetail.vue b/nezha-fronted/src/components/chart/chartDetail.vue
index 24dee2dec..61323b8ee 100644
--- a/nezha-fronted/src/components/chart/chartDetail.vue
+++ b/nezha-fronted/src/components/chart/chartDetail.vue
@@ -115,8 +115,8 @@
           </div>
           <div class="basic-info-table-list">
             <div class="basic-info-table-title">{{$t('overall.alert')}}</div>
-            <div class="basic-info-table-value" v-if="chartDetailList">
-              <i :class="chartDetailList.alertNum ? 'red' : 'green'" class="nz-icon nz-icon-overview-alert vertical-align-top;"  @mouseenter="tooltipHover('',true, $event)" @mouseleave="tooltipHover('',false, $event)"></i>
+            <div class="basic-info-table-value" v-if="chartDetail">
+              <i :class="chartDetail.alertNum ? 'red' : 'green'" class="nz-icon nz-icon-overview-alert vertical-align-top;"  @mouseenter="tooltipHover('',true, $event)" @mouseleave="tooltipHover('',false, $event)"></i>
               <div v-if="alertNumtooltipShow" class="alert-days-info-tooltip" :style="{left: position.left + 'px',top:position.top + 'px'}">
                 <div class="tooltip-title">Alert message (active)</div>
                 <div class="severity-info" style='justify-content: space-between'>
@@ -211,26 +211,6 @@ export default {
     },
     init () {
       this.loading = true
-      if (this.chartInfo.type === 'assetInfo') {
-        this.$get('asset/asset/' + this.chartDetail.id).then((res) => {
-          if (res.msg === 'success') {
-            this.loading = false
-            this.chartDetailList = res.data
-          } else {
-            this.$message.error(res.msg)
-          }
-        })
-      }
-      if (this.chartInfo.type === 'endpointInfo') {
-        this.$get('monitor/endpoint/' + this.chartDetail.id).then((res) => {
-          if (res.msg === 'success') {
-            this.loading = false
-            this.chartDetailList = res.data
-          } else {
-            this.$message.error(res.msg)
-          }
-        })
-      }
       const weekDays = this.getWeeksTime()
       if (this.trendTimer) {
         clearTimeout(this.trendTimer)
@@ -248,7 +228,6 @@ export default {
         } else if (this.chartInfo.type === 'endpointInfo') {
           params.endpointId = this.chartDetail.id
         }
-        // params[this.chartInfo.type + 'Id'] = this.chartDetail.id
         this.$get('/stat/alertMessage/trend', params).then((res) => {
           if (!res.data) {
             return

From 88ff2ddb57f906d8806fbc936da77cebf6439b36 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 23 Mar 2022 16:50:18 +0800
Subject: [PATCH 05/18] =?UTF-8?q?fix=EF=BC=9A=E4=B8=8D=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=20js=20css=20=E7=9A=84=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/nezha-fronted/src/http.js b/nezha-fronted/src/http.js
index c2df199c5..d062eeb36 100644
--- a/nezha-fronted/src/http.js
+++ b/nezha-fronted/src/http.js
@@ -5,7 +5,7 @@ export const requestsArr = []
 axios.interceptors.request.use(config => {
   const source = CancelToken.source() // 申明CancelToken,也可new CancelToken.source()实例一个
   config.cancelToken = source.token // 讲实例对象的token赋予该请求
-  requestsArr.push(source) // 将该实例添加到队列中
+  requestsArr.push({ source, config }) // 将该实例添加到队列中
   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 be7d0270c..809eb823f 100644
--- a/nezha-fronted/src/permission.js
+++ b/nezha-fronted/src/permission.js
@@ -10,9 +10,15 @@ Vue.use(VueResource)
 
 const loginWhiteList = ['/setup', '/sys/license/upload', '/sys/license/state', '/sys/appearance'] // 免登陆白名单
 const permissionWhiteList = ['/profile', '/menu', ...loginWhiteList] // 权限白名单
+const requestsWhiteList = ['js', 'css']
 router.beforeEach((to, from, next) => {
   if (store.getters.getNowPath !== to.path && store.getters.getNowPath !== '/login') {
-    requestsArr.forEach(xhr => xhr.cancel())
+    requestsArr.forEach(xhr => {
+      const arr = xhr.config.url.split('.')
+      if (requestsWhiteList.indexOf(arr[arr.length - 1]) === -1) {
+        xhr.source.cancel()
+      }
+    })
   }
   store.commit('setNowPath', to.path)
   const configUrl = 'static/config.json?Timestamp=' + new Date().getTime()

From 2d047adbc18f17e0ab2dc0849bb92696084bb78d Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 23 Mar 2022 16:53:04 +0800
Subject: [PATCH 06/18] =?UTF-8?q?feat=EF=BC=9A=E8=A1=A5=E5=85=85=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E9=9D=99=E6=80=81=E8=B5=84=E6=BA=90=20=E4=B8=8D?=
 =?UTF-8?q?=E8=A2=AB=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/nezha-fronted/src/permission.js b/nezha-fronted/src/permission.js
index 809eb823f..6cb51f123 100644
--- a/nezha-fronted/src/permission.js
+++ b/nezha-fronted/src/permission.js
@@ -10,7 +10,7 @@ Vue.use(VueResource)
 
 const loginWhiteList = ['/setup', '/sys/license/upload', '/sys/license/state', '/sys/appearance'] // 免登陆白名单
 const permissionWhiteList = ['/profile', '/menu', ...loginWhiteList] // 权限白名单
-const requestsWhiteList = ['js', 'css']
+const requestsWhiteList = ['js', 'css', 'png', 'woff', 'ttf', 'woff2', 'gif', '']
 router.beforeEach((to, from, next) => {
   if (store.getters.getNowPath !== to.path && store.getters.getNowPath !== '/login') {
     requestsArr.forEach(xhr => {

From 1cfe975e3e656e6915607252c1d5248c44690d8f Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Wed, 23 Mar 2022 17:25:22 +0800
Subject: [PATCH 07/18] =?UTF-8?q?fix:=20asset=20=E4=BA=8C=E7=BA=A7?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=AF=A6=E6=83=85=E9=94=99=E8=AF=AF=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/nezha-fronted/src/components/chart/chartDetail.vue b/nezha-fronted/src/components/chart/chartDetail.vue
index 61323b8ee..4fac06def 100644
--- a/nezha-fronted/src/components/chart/chartDetail.vue
+++ b/nezha-fronted/src/components/chart/chartDetail.vue
@@ -65,8 +65,8 @@
           </div>
           <div class="basic-info-table-list">
             <div class="basic-info-table-title">{{ $t('overall.alert') }}</div>
-            <div class="basic-info-table-value" v-if="chartDetailList">
-              <i :class="chartDetailList.alertNum ? 'red' : 'green'" class="nz-icon nz-icon-overview-alert vertical-align-top;"  @mouseenter="tooltipHover('',true, $event)" @mouseleave="tooltipHover('',false, $event)"></i>
+            <div class="basic-info-table-value" v-if="chartDetail">
+              <i :class="chartDetail.alertNum ? 'red' : 'green'" class="nz-icon nz-icon-overview-alert vertical-align-top;"  @mouseenter="tooltipHover('',true, $event)" @mouseleave="tooltipHover('',false, $event)"></i>
               <div v-if="alertNumtooltipShow" class="alert-days-info-tooltip" :style="{left: position.left + 'px',top:position.top + 'px'}">
                 <div class="tooltip-title">Alert message (active)</div>
                 <div class="severity-info" style='justify-content: space-between'>

From be54a0d868672b7c46232c7d74c3a6b7dd577971 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 23 Mar 2022 17:33:11 +0800
Subject: [PATCH 08/18] =?UTF-8?q?NEZ-1729=20fix=EF=BC=9A=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?2FA=E7=99=BB=E5=BD=95=E5=90=8E=E5=86=8D=E6=AC=A1=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF=E7=AC=AC=E4=BA=8C=E4=B8=AA=E7=AA=97=E5=8F=A3=E5=90=8E?=
 =?UTF-8?q?=E7=95=8C=E9=9D=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/login.vue         |  5 +++--
 .../components/common/rightBox/chart/publicConfig.js  |  1 -
 .../src/components/page/alert/alertMessage.vue        |  2 --
 nezha-fronted/src/http.js                             |  2 +-
 nezha-fronted/src/permission.js                       | 11 +++--------
 nezha-fronted/src/store/user.js                       |  3 ++-
 6 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/nezha-fronted/src/components/common/login.vue b/nezha-fronted/src/components/common/login.vue
index 637f48604..f4c342272 100644
--- a/nezha-fronted/src/components/common/login.vue
+++ b/nezha-fronted/src/components/common/login.vue
@@ -147,6 +147,7 @@ export default {
       fileShow: false,
       fileContent: '',
       recoveryCode: [],
+      userInfo: {},
       bgImg: '' // 背景图
     }
   },
@@ -165,6 +166,7 @@ export default {
             this.lang = res.data.user.lang || localStorage.getItem('nz-language')
             this.$i18n.locale = this.lang
             this.theme = res.data.user.theme
+            this.userInfo = res.data.user
             // 获取可选语言
             get('/sys/dict/all?type=lang').then(response => {
               if (response.code === 200) {
@@ -221,8 +223,7 @@ export default {
           localStorage.setItem('nz-prometheus-federation-enabled', res.data.prometheusFederationEnabled)
           localStorage.setItem('nz-language', this.lang)
           res.data.user = {
-            lang: this.lang,
-            theme: this.theme
+            ...this.userInfo
           }
           this.loginSuccess(res)
         } else {
diff --git a/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js b/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
index 3a240a8c8..461ca8aca 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
+++ b/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
@@ -435,7 +435,6 @@ export default {
     },
     showError () {
       this.$refs.chartForm.validate((blooen, object) => {
-        console.log(blooen, object)
         Object.keys(object).forEach(item => {
           const keyArr = item.split('.')
           if (keyArr.length >= 4) {
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index 07cdd32a9..eb2d7bdd9 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -556,7 +556,6 @@ export default {
             }
           })
           .catch(response => {
-            console.log(response)
             this.$message.error(response.msg)
           })
       })
@@ -620,7 +619,6 @@ export default {
         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.alertRule.unit
-        console.log(chartInfo.unit)
         this.showFullscreen(true, chartInfo)
       } else if (this.currentMsg.alertRule.type === 2) {
         const chartInfo = lodash.cloneDeep(logData)
diff --git a/nezha-fronted/src/http.js b/nezha-fronted/src/http.js
index d062eeb36..c2df199c5 100644
--- a/nezha-fronted/src/http.js
+++ b/nezha-fronted/src/http.js
@@ -5,7 +5,7 @@ export const requestsArr = []
 axios.interceptors.request.use(config => {
   const source = CancelToken.source() // 申明CancelToken,也可new CancelToken.source()实例一个
   config.cancelToken = source.token // 讲实例对象的token赋予该请求
-  requestsArr.push({ source, config }) // 将该实例添加到队列中
+  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 6cb51f123..c41126090 100644
--- a/nezha-fronted/src/permission.js
+++ b/nezha-fronted/src/permission.js
@@ -10,15 +10,9 @@ Vue.use(VueResource)
 
 const loginWhiteList = ['/setup', '/sys/license/upload', '/sys/license/state', '/sys/appearance'] // 免登陆白名单
 const permissionWhiteList = ['/profile', '/menu', ...loginWhiteList] // 权限白名单
-const requestsWhiteList = ['js', 'css', 'png', 'woff', 'ttf', 'woff2', 'gif', '']
 router.beforeEach((to, from, next) => {
   if (store.getters.getNowPath !== to.path && store.getters.getNowPath !== '/login') {
-    requestsArr.forEach(xhr => {
-      const arr = xhr.config.url.split('.')
-      if (requestsWhiteList.indexOf(arr[arr.length - 1]) === -1) {
-        xhr.source.cancel()
-      }
-    })
+    requestsArr.forEach(xhr => xhr.cancel())
   }
   store.commit('setNowPath', to.path)
   const configUrl = 'static/config.json?Timestamp=' + new Date().getTime()
@@ -140,7 +134,8 @@ router.beforeEach((to, from, next) => {
               returnMenuCode(res.data.menus, arr)
               store.commit('setButtonList', arr)
               store.commit('setRoleList', res.data.roles)
-              document.getElementsByTagName('body')[0].setAttribute('class', 'theme-' + localStorage.getItem(`nz-user-${localStorage.getItem('nz-user-id')}-theme`))
+              const theme = localStorage.getItem(`nz-user-${localStorage.getItem('nz-user-id')}-theme`) || 'light'
+              document.getElementsByTagName('body')[0].setAttribute('class', 'theme-' + theme)
               resolve()
             } else {
               localStorage.removeItem('nz-token')
diff --git a/nezha-fronted/src/store/user.js b/nezha-fronted/src/store/user.js
index 05dc416ed..6e8aadaf4 100644
--- a/nezha-fronted/src/store/user.js
+++ b/nezha-fronted/src/store/user.js
@@ -12,7 +12,7 @@ const user = {
     roleList: [],
     language: localStorage.getItem('nz-language'),
     severityData: localStorage.getItem('nz-severityData') ? JSON.parse(localStorage.getItem('nz-severityData')) : [],
-    severityDataWeight:  localStorage.getItem('nz-severityDataWeight') ? JSON.parse(localStorage.getItem('nz-severityDataWeight')) : []
+    severityDataWeight: localStorage.getItem('nz-severityDataWeight') ? JSON.parse(localStorage.getItem('nz-severityDataWeight')) : []
   },
   mutations: {
     setLanguage (state, language) {
@@ -71,6 +71,7 @@ const user = {
   },
   actions: {
     loginSuccess (store, res) {
+
       const defaultAppearance = {
         system_name: localStorage.getItem('nz-sys-name'),
         system_logo: localStorage.getItem('nz-sys-logo'),

From 34a6a9203103f4abe4ab191c59d5f6e1bbb64e8b Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Wed, 23 Mar 2022 17:47:27 +0800
Subject: [PATCH 09/18] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dprojects=20?=
 =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E5=9B=BE=EF=BC=8C=E5=BC=B9=E6=A1=86Box?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/project/popData/alertTable.vue         | 1 +
 .../src/components/common/project/popData/assetTable.vue         | 1 +
 .../src/components/common/project/popData/endpointTable.vue      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/nezha-fronted/src/components/common/project/popData/alertTable.vue b/nezha-fronted/src/components/common/project/popData/alertTable.vue
index de93a66b4..077c9d365 100644
--- a/nezha-fronted/src/components/common/project/popData/alertTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/alertTable.vue
@@ -21,6 +21,7 @@
           <alert-message-table
             ref="dataTable"
             :api="url"
+            :orderByFa="orderBy"
             :custom-table-title="tableTitle"
             :height="mainTableHeight"
             :now-time="nowTime"
diff --git a/nezha-fronted/src/components/common/project/popData/assetTable.vue b/nezha-fronted/src/components/common/project/popData/assetTable.vue
index 143a29d77..0196b01ab 100644
--- a/nezha-fronted/src/components/common/project/popData/assetTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/assetTable.vue
@@ -15,6 +15,7 @@
         <template v-slot:default="slotProps">
           <asset-table
             ref="dataTable"
+            :orderByFa="orderBy"
             v-loading="tools.loading"
             :loading="tools.loading"
             :api="url"
diff --git a/nezha-fronted/src/components/common/project/popData/endpointTable.vue b/nezha-fronted/src/components/common/project/popData/endpointTable.vue
index 6d2692ef4..d73892af4 100644
--- a/nezha-fronted/src/components/common/project/popData/endpointTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/endpointTable.vue
@@ -16,6 +16,7 @@
           <endpoint-table
             style="height: calc(100% - 200px)"
             ref="dataTable"
+            :orderByFa="orderBy"
             v-loading="tools.loading"
             :loading="tools.loading"
             :api="url"

From bd259fd291bb98ad72a06bd2f5ccd2887b01ab4b Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 23 Mar 2022 18:08:00 +0800
Subject: [PATCH 10/18] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20project?=
 =?UTF-8?q?=20module=20endpoint=20=E7=9A=84=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/popBox/guide.vue   | 10 +++++-----
 nezha-fronted/src/components/common/searchInput.vue    |  2 +-
 .../components/common/table/settings/projectTable.vue  |  4 ++--
 .../components/page/monitor/endpoint/endpointList.vue  |  2 +-
 nezha-fronted/src/router/index.js                      |  8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/nezha-fronted/src/components/common/popBox/guide.vue b/nezha-fronted/src/components/common/popBox/guide.vue
index b52f2e85c..41ee58d58 100644
--- a/nezha-fronted/src/components/common/popBox/guide.vue
+++ b/nezha-fronted/src/components/common/popBox/guide.vue
@@ -100,7 +100,7 @@ export default {
           permissionCode: 'asset_view'
         },
         {
-          route: '/monitor/project',
+          route: '/project',
           title: this.$t('overall.monitor'),
           icon: 'nz-icon nz-icon-menu-project',
           tip: this.$t('guide.monitorTip'),
@@ -238,7 +238,7 @@ export default {
           }
           this.$emit('close')
           this.$router.push({
-            path: '/monitor/project',
+            path: '/project',
             query: {
               t: +new Date(),
               add: 'project'
@@ -252,7 +252,7 @@ export default {
           }
           this.$emit('close')
           this.$router.push({
-            path: '/monitor/module',
+            path: '/module',
             query: {
               t: +new Date(),
               add: 'module'
@@ -266,7 +266,7 @@ export default {
           }
           this.$emit('close')
           this.$router.push({
-            path: '/monitor/endpoint',
+            path: '/endpoint',
             query: {
               t: +new Date(),
               add: 'endpoint'
@@ -280,7 +280,7 @@ export default {
           }
           this.$emit('close')
           this.$router.push({
-            path: '/monitor/endpoint',
+            path: '/endpoint',
             query: {
               t: +new Date(),
               importEndpoint: 'importEndpoint'
diff --git a/nezha-fronted/src/components/common/searchInput.vue b/nezha-fronted/src/components/common/searchInput.vue
index effebc2c2..9b9583bd2 100644
--- a/nezha-fronted/src/components/common/searchInput.vue
+++ b/nezha-fronted/src/components/common/searchInput.vue
@@ -1475,7 +1475,7 @@ export default {
       if (this.$route.path === '/assetLabel') {
         this.getGroupData()
       }
-      if (this.$route.path === '/monitor/module') {
+      if (this.$route.path === '/module') {
         this.getProjectData()
       }
       if (this.$route.path === '/alertRule') {
diff --git a/nezha-fronted/src/components/common/table/settings/projectTable.vue b/nezha-fronted/src/components/common/table/settings/projectTable.vue
index 69255da5a..4608328bd 100644
--- a/nezha-fronted/src/components/common/table/settings/projectTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/projectTable.vue
@@ -160,7 +160,7 @@ export default {
     },
     jumpModule (row) {
       localStorage.setItem('moduleProjectId', JSON.stringify([row.id, row.name]))
-      this.$router.push({ path: '/monitor/module' })
+      this.$router.push({ path: '/module' })
     },
     jumpAlertMessage (row) {
       localStorage.setItem('alertMessageProjectId', row.id)
@@ -168,7 +168,7 @@ export default {
     },
     jumpEndpoint (row) {
       localStorage.setItem('endpointProjectId', row.id)
-      this.$router.push({ path: '/monitor/endpoint' })
+      this.$router.push({ path: '/endpoint' })
     }
   },
   computed: {
diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
index 9e5060c78..ed9c938c9 100644
--- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
+++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
@@ -618,7 +618,7 @@ export default {
       this.$get(this.url, params).then(response => {
         this.tools.loading = false
         if (response.code === 200) {
-          if (response.statistics && this.$route.path === '/monitor/endpoint') {
+          if (response.statistics && this.$route.path === '/endpoint') {
             this.setSearchData(response.statistics)
           }
           for (let i = 0; i < response.data.list.length; i++) {
diff --git a/nezha-fronted/src/router/index.js b/nezha-fronted/src/router/index.js
index 33096d780..eaaaed350 100644
--- a/nezha-fronted/src/router/index.js
+++ b/nezha-fronted/src/router/index.js
@@ -34,16 +34,16 @@ export default new Router({
           component: resolve => require(['../components/page/dashboard/overview/overview.vue'], resolve)
         },
         {
-          path: '/monitor/project',
+          path: '/project',
           component: resolve => require(['../components/page/monitor/project/index.vue'], resolve)
         },
         {
-          path: '/monitor/module',
-          name: '/monitor/module',
+          path: '/module',
+          name: '/module',
           component: resolve => require(['../components/page/monitor/module/moduleList.vue'], resolve)
         },
         {
-          path: '/monitor/endpoint',
+          path: '/endpoint',
           component: resolve => require(['../components/page/monitor/endpoint/endpointList.vue'], resolve)
         },
         {

From 13b52158fd10f878f61ea4ab6a14639f3fc5b215 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 23 Mar 2022 18:10:26 +0800
Subject: [PATCH 11/18] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E7=A8=BF=20endpoint?=
 =?UTF-8?q?=20=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/page/monitor/endpoint/endpointList.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
index ed9c938c9..22ee44952 100644
--- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
+++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
@@ -595,7 +595,7 @@ export default {
       }
       this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
       this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
-      if (this.$route.path === '/monitor/endpoint') {
+      if (this.$route.path === '/endpoint') {
         this.$set(this.searchLabel, 'statistics', 1)
       }
       const params = {

From 7f0eebcd8617815bcf5f14153739893ca741a4ad Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 23 Mar 2022 18:18:43 +0800
Subject: [PATCH 12/18] =?UTF-8?q?fix=EF=BC=9Aasset=20add=20by=20template?=
 =?UTF-8?q?=20=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/rightBox/chartTempBox.vue       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/chartTempBox.vue b/nezha-fronted/src/components/common/rightBox/chartTempBox.vue
index 8a9ac6194..479337ab4 100644
--- a/nezha-fronted/src/components/common/rightBox/chartTempBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chartTempBox.vue
@@ -298,9 +298,9 @@ export default {
       }
     },
     getAssetData () {
-      this.$refs.transfer.startLoading()
+      this.$refs.transfer && this.$refs.transfer.startLoading()
       this.$get('asset/asset', { ...this.transfer.searchLabel, ...this.transfer.pageObj }).then(response => {
-        this.$refs.transfer.endLoading()
+        this.$refs.transfer && this.$refs.transfer.endLoading()
         if (response.code === 200) {
           this.transfer.tableData = response.data.list
           this.transfer.pageObj.total = response.data.total
@@ -309,13 +309,13 @@ export default {
       })
     },
     getEndpointData () {
-      this.$refs.transfer.startLoading()
+      this.$refs.transfer && this.$refs.transfer.startLoading()
       const idFilter = {}
       if (this.from === fromRoute.asset) {
         idFilter.assetIds = this.obj.varIds[0]
       }
       this.$get('monitor/endpoint', { ...this.transfer.searchLabel, ...this.transfer.pageObj, ...idFilter }).then(response => {
-        this.$refs.transfer.endLoading()
+        this.$refs.transfer && this.$refs.transfer.endLoading()
         if (response.code === 200) {
           this.transfer.tableData = response.data.list
           this.transfer.pageObj.total = response.data.total

From e2e7eaec2ab40c0e209f9b8bbb08a54a989f77e4 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Thu, 24 Mar 2022 09:46:14 +0800
Subject: [PATCH 13/18] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20exploreItem?=
 =?UTF-8?q?=20=E5=88=86=E9=A1=B5=E6=8A=A5=E9=94=99=EF=BC=8Cprojects=20?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=88=97=E8=A1=A8=E8=B7=B3=E8=BD=AC=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=20=E5=88=9D=E5=A7=8B=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E4=B8=BAnull=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        | 5 ++++-
 .../src/components/page/dashboard/explore/exploreItem.vue    | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js
index 351498f97..c8f386c61 100644
--- a/nezha-fronted/src/components/common/mixin/dataList.js
+++ b/nezha-fronted/src/components/common/mixin/dataList.js
@@ -336,7 +336,10 @@ export default {
     }
   },
   created () {
-    const path = this.$route.fullPath.match(/\/(\S*)\?/)[1]
+    let path = ''
+    if (this.$route.fullPath.match(/\/(\S*)\?/)) {
+      path = this.$route.fullPath.match(/\/(\S*)\?/)[1]
+    }
     if (this.$route.query.orderBy && !this.isSubList) {
       this.orderBy = this.$route.query.orderBy
     }
diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
index 7f16cd4f2..82f3f9ce4 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
@@ -444,7 +444,7 @@ export default {
       this.tableData = this.filterShowData(this.storedTableData, this.pageObj)
     },
     filterShowData (source, pageObj) {
-      return source.slice((pageObj.pageNo - 1) * pageObj.pageSize, pageObj.pageNo * pageObj.pageSize)
+      if (source) return source.slice((pageObj.pageNo - 1) * pageObj.pageSize, pageObj.pageNo * pageObj.pageSize)
     },
     chartUnitChange (unit) {
       this.chartUnit = unit

From a2cd704d14409236b83861aa5aca8f39c4900f73 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 24 Mar 2022 09:52:47 +0800
Subject: [PATCH 14/18] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=20?=
 =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E8=B7=AF=E7=94=B1=E6=94=B9=E5=8F=98=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=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/chartAutotopology.vue        | 6 +++---
 .../src/components/common/globalSearch/globalSearch.vue     | 2 +-
 nezha-fronted/src/components/common/searchInput.vue         | 2 +-
 .../src/components/page/dashboard/overview/overview.vue     | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartAutotopology.vue b/nezha-fronted/src/components/chart/chart/chartAutotopology.vue
index da7f20fe5..fb47b5912 100644
--- a/nezha-fronted/src/components/chart/chart/chartAutotopology.vue
+++ b/nezha-fronted/src/components/chart/chart/chartAutotopology.vue
@@ -78,9 +78,9 @@ export default {
         bus.$emit('clear-asset-filter') // 清除leftMenu左侧菜单过滤条件
         // if(this.$store.getters.getIdcArr.length===0){return}//如果不存在idc 则不跳转
       }
-      if (data === 'project' || data === 'module' || data === 'endpoint') {
-        data = 'monitor/' + data
-      }
+      // if (data === 'project' || data === 'module' || data === 'endpoint') {
+      //   data = data
+      // }
       if (data === 'alertList') {
         data = 'alertMessage'
       }
diff --git a/nezha-fronted/src/components/common/globalSearch/globalSearch.vue b/nezha-fronted/src/components/common/globalSearch/globalSearch.vue
index 0e3315b05..b0804dd41 100644
--- a/nezha-fronted/src/components/common/globalSearch/globalSearch.vue
+++ b/nezha-fronted/src/components/common/globalSearch/globalSearch.vue
@@ -340,7 +340,7 @@ export default {
         route += 'asset'
       } else {
         tableId = type + 'Table'
-        route += 'monitor/' + type
+        route += type
       }
       let pageSize = localStorage.getItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + tableId)
       if (!(pageSize && pageSize !== 'undefined')) {
diff --git a/nezha-fronted/src/components/common/searchInput.vue b/nezha-fronted/src/components/common/searchInput.vue
index 9b9583bd2..3b8cd252d 100644
--- a/nezha-fronted/src/components/common/searchInput.vue
+++ b/nezha-fronted/src/components/common/searchInput.vue
@@ -664,7 +664,7 @@ export default {
       })
     },
     getModuleData () {
-      this.$get('module', { pageNo: 1, pageSize: -1 }).then(response => {
+      this.$get('monitor/module', { pageNo: 1, pageSize: -1 }).then(response => {
         if (response.code === 200) {
           this.moduleSelect = response.data.list
           this.moduleSelect.forEach((item, index) => {
diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview.vue b/nezha-fronted/src/components/page/dashboard/overview/overview.vue
index 485dfdf42..b7f758e12 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/overview.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/overview.vue
@@ -989,9 +989,9 @@ export default {
         bus.$emit('clear-asset-filter') // 清除leftMenu左侧菜单过滤条件
         // if(this.$store.getters.getIdcArr.length===0){return}//如果不存在idc 则不跳转
       }
-      if (data === 'project' || data === 'module' || data === 'endpoint') {
-        data = 'monitor/' + data
-      }
+      // if (data === 'project' || data === 'module' || data === 'endpoint') {
+      //   data = 'monitor/' + data
+      // }
       if (data === 'alertList') {
         data = 'alertMessage'
       }

From b33b70846da005c492cc3f8d001cb80de1bc9b7a Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 24 Mar 2022 10:09:52 +0800
Subject: [PATCH 15/18] =?UTF-8?q?NEZ-1703=20fix=EF=BC=9A=20=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E5=91=8A=E8=AD=A6=E5=9B=BE=E8=A1=A8=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B9=8B=E5=89=8D=E6=97=B6=E9=97=B4=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=AA=E9=80=89=E6=8B=A9=E4=B9=8B=E5=89=8D=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8E=EF=BC=8C=E6=82=AC=E6=B5=AE=E6=A1=86?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9=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/chart/chart/chartTimeSeries.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
index 00521b6c3..d9c00f2bb 100644
--- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
@@ -188,7 +188,7 @@ export default {
         let flag = true
         params.forEach((item, i) => {
           const seriesName = item.seriesName.split('-')[0]
-          if (i === 0) {
+          if (i === 0 && item.seriesName.indexOf('Previous') === -1) {
             const value = bus.computeTimezone(item.data[0] * 1000)
             const tData = new Date(value)
             str += '<div class="tooltip-title" style="margin-bottom: 5px">'

From 7a78fb5ff4f39e8cd8a471e2b697fcaefaa124a0 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 24 Mar 2022 10:43:18 +0800
Subject: [PATCH 16/18] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20nz-usern?=
 =?UTF-8?q?ame=20=E4=B8=8D=E7=BB=9F=E4=B8=80=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/layout/header.vue | 6 +++---
 nezha-fronted/src/store/user.js                | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/layout/header.vue b/nezha-fronted/src/components/layout/header.vue
index fee1e4536..da2a4e9d8 100644
--- a/nezha-fronted/src/components/layout/header.vue
+++ b/nezha-fronted/src/components/layout/header.vue
@@ -83,7 +83,7 @@ export default {
   },
   data () {
     return {
-      username: '',
+      username:  '',
       name: '',
       language: 'en',
       // 顶部菜单相关
@@ -212,8 +212,8 @@ export default {
       this.initEvent()
       this.getLinkData()
     }
-    this.name = localStorage.getItem('nz-user-name')
-    this.username = localStorage.getItem('nz-user-name')
+    this.name = localStorage.getItem('nz-username')
+    this.username = localStorage.getItem('nz-username')
     this.language = localStorage.getItem('nz-language') ? localStorage.getItem('nz-language') : 'en'
     window.addEventListener('visibilitychange', this.testUser)
   },
diff --git a/nezha-fronted/src/store/user.js b/nezha-fronted/src/store/user.js
index 6e8aadaf4..6dbdd8aae 100644
--- a/nezha-fronted/src/store/user.js
+++ b/nezha-fronted/src/store/user.js
@@ -148,7 +148,7 @@ const user = {
           // 保存当前用户的 userId
           localStorage.setItem('nz-user-id', user.id)
           // 保存当前用户 name
-          localStorage.setItem('nz-user-name', user.name)
+          localStorage.setItem('nz-username', user.name)
         }
       })
       get('alert/severity', { pageNo: 1, pageSize: -1 }).then(response => {

From 15b40afc9a46312dbe52faf29622c0b4adcc6144 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 24 Mar 2022 11:09:36 +0800
Subject: [PATCH 17/18] =?UTF-8?q?NEZ-1731=20fix=EF=BC=9A=E5=9C=A8=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E7=AA=97=E5=8F=A3=E5=88=87=E6=8D=A2=E6=97=B6=E4=BC=9A?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=95=8C=E9=9D=A2=E8=87=AA=E5=8A=A8=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=20=E4=BB=A5=E5=8F=8A=20chart-line=20=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=BA=20nodata=E5=90=8E=20=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=94=B9=E5=8F=98=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.vue           | 10 ++++++++++
 .../src/components/chart/chart/chartTimeSeries.vue     |  8 +++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/chart/chart.vue b/nezha-fronted/src/components/chart/chart.vue
index c7e918173..a98bc87fb 100644
--- a/nezha-fronted/src/components/chart/chart.vue
+++ b/nezha-fronted/src/components/chart/chart.vue
@@ -252,6 +252,16 @@ export default {
       chartChildrenData: false
     }
   },
+  watch: {
+    chartData: {
+      deep: true,
+      handler (n) {
+        if (n) {
+          this.chartChildrenData = false
+        }
+      }
+    }
+  },
   computed: {
     isNoData () {
       return lodash.isEmpty(this.chartData) && ['text', 'url', 'clock'].indexOf(this.chartInfo.type) === -1
diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
index d9c00f2bb..e247619c8 100644
--- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
@@ -28,6 +28,7 @@ import { randomcolor } from '@/components/common/js/radomcolor/randomcolor'
 import { chartLegendPlacement } from '@/components/common/js/constants'
 import { getChart, setChart } from '@/components/common/js/common'
 import { initColor } from '@/components/chart/chart/tools'
+import lodash from 'lodash'
 
 export default {
   name: 'chart-time-series', // x轴是时间的图，包括折线、柱状、堆叠、散点
@@ -69,9 +70,14 @@ export default {
     }
   },
   methods: {
-    initChart (chartOption = this.chartOption) {
+    initChart (chartOptions = this.chartOption) {
+      const chartOption = lodash.cloneDeep(chartOptions)
       this.legends = []
       this.series = chartOption.series = this.handleTimeSeries(this.chartInfo, chartOption.series[0], this.chartData) // 生成series和legends
+      if (!this.series.length) {
+        this.isNoData = true
+        this.$emit('chartIsNoData', this.isNoData)
+      }
       if (this.isNoData) {
         return
       }

From 308f891da4870d7b96137cc286d702c73b724e53 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 24 Mar 2022 11:31:01 +0800
Subject: [PATCH 18/18] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E5=85=A8=E5=B1=8F=20=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA=20nodata=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/chartGauge.vue     | 1 +
 nezha-fronted/src/components/chart/chart/chartHexagonD3.vue | 1 +
 nezha-fronted/src/components/chart/chart/chartPie.vue       | 1 +
 nezha-fronted/src/components/chart/chart/chartStat.vue      | 1 +
 nezha-fronted/src/components/chart/chart/chartTreemap.vue   | 1 +
 nezha-fronted/src/components/chart/chartMixin.js            | 3 +++
 6 files changed, 8 insertions(+)

diff --git a/nezha-fronted/src/components/chart/chart/chartGauge.vue b/nezha-fronted/src/components/chart/chart/chartGauge.vue
index 2236d66e7..ce44b722c 100644
--- a/nezha-fronted/src/components/chart/chart/chartGauge.vue
+++ b/nezha-fronted/src/components/chart/chart/chartGauge.vue
@@ -62,6 +62,7 @@ export default {
     initGaugeData (chartInfo, originalDatas) {
       this.gaugeData = []
       this.isInit = false
+      this.isNoData = true
       return new Promise(resolve => {
         let colorIndex = 0
         originalDatas.forEach((originalData, expressionIndex) => {
diff --git a/nezha-fronted/src/components/chart/chart/chartHexagonD3.vue b/nezha-fronted/src/components/chart/chart/chartHexagonD3.vue
index 06e527c55..66b4bf640 100644
--- a/nezha-fronted/src/components/chart/chart/chartHexagonD3.vue
+++ b/nezha-fronted/src/components/chart/chart/chartHexagonD3.vue
@@ -67,6 +67,7 @@ export default {
     initHexagonData (chartInfo, originalDatas) {
       this.HexagonData = []
       this.isInit = false
+      this.isNoData = true
       return new Promise(resolve => {
         let colorIndex = 0
         originalDatas.forEach((originalData, expressionIndex) => {
diff --git a/nezha-fronted/src/components/chart/chart/chartPie.vue b/nezha-fronted/src/components/chart/chart/chartPie.vue
index d85bc8031..cd1a540f9 100644
--- a/nezha-fronted/src/components/chart/chart/chartPie.vue
+++ b/nezha-fronted/src/components/chart/chart/chartPie.vue
@@ -101,6 +101,7 @@ export default {
       let colorIndex = 0
       const s = lodash.cloneDeep(seriesTemplate)
       s.data = []
+      this.isNoData = true
       originalDatas.forEach((originalData, expressionIndex) => {
         originalData.forEach((data, dataIndex) => {
           this.isNoData = false
diff --git a/nezha-fronted/src/components/chart/chart/chartStat.vue b/nezha-fronted/src/components/chart/chart/chartStat.vue
index c9f0ec99b..ab8306346 100644
--- a/nezha-fronted/src/components/chart/chart/chartStat.vue
+++ b/nezha-fronted/src/components/chart/chart/chartStat.vue
@@ -92,6 +92,7 @@ export default {
       this.statData = []
       return new Promise(resolve => {
         let colorIndex = 0
+        this.isNoData = true
         originalDatas.forEach((originalData, expressionIndex) => {
           originalData.forEach((data, dataIndex) => {
             this.isNoData = false
diff --git a/nezha-fronted/src/components/chart/chart/chartTreemap.vue b/nezha-fronted/src/components/chart/chart/chartTreemap.vue
index f43004259..db4da9d76 100644
--- a/nezha-fronted/src/components/chart/chart/chartTreemap.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTreemap.vue
@@ -99,6 +99,7 @@ export default {
       const self = this
       const s = lodash.cloneDeep(seriesTemplate)
       s.data = []
+      this.isNoData = true
       originalDatas.forEach((originalData, expressionIndex) => {
         originalData.forEach((data, dataIndex) => {
           this.isNoData = false
diff --git a/nezha-fronted/src/components/chart/chartMixin.js b/nezha-fronted/src/components/chart/chartMixin.js
index 52e23910b..cd8a4016f 100644
--- a/nezha-fronted/src/components/chart/chartMixin.js
+++ b/nezha-fronted/src/components/chart/chartMixin.js
@@ -43,6 +43,7 @@ export default {
     handleTimeSeries (chartInfo, seriesTemplate, originalDatas) {
       const series = []
       let colorIndex = 0
+      this.isNoData = true
       originalDatas.forEach((originalData, expressionIndex) => {
         originalData.forEach((data, dataIndex) => {
           if (colorIndex >= 20 && !this.showAllData) {
@@ -266,6 +267,8 @@ export default {
         if (!this.isInit && this.chartOption.color) {
           this.colorList = this.colorList.slice(0, 20)
           this.chartOption.color = this.chartOption.color.slice(0, 20)
+        }
+        if (!this.isInit) {
           this.initChart(this.chartOption)
         }
       }