fix：修改底部弹窗 alertMessage 时间错误的问题

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, 'startAt', bus.timeFormate(this.timezoneToUtcTime(bus.formateTimeToTime(this.searchTimeHeader[0])), 'YYYY-MM-DD HH:mm:ss'))
-        this.$set(this.searchLabel, 'endAt', this.timezoneToUtcTimeStr(this.searchTimeHeader[1]))
+        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

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"

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"

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"

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"

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"

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"

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"

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"

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"

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') {

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)
         }
       }
     },

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 = []
         }

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) {

nezha-fronted/src/store/user.js

@@ -11,8 +11,8 @@ const user = {
     buttonList: [],
     roleList: [],
     language: localStorage.getItem('nz-language'),
-    severityData: [],
+    severityData: localStorage.getItem('nz-severityData') ? JSON.parse(localStorage.getItem('nz-severityData')) : [],
-    severityDataWeight: []
+    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) {