From 543f6efda8949a9d91d1735d31878c3bd7097e39 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 5 Jul 2022 17:57:15 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/alert/alertMessageInfoTab.vue      |   6 +-
 .../common/alert/alertMessageInfoTimeLine.vue | 216 +++++++++---------
 .../common/globalSearch/globalSearch.vue      |   6 +-
 .../page/config/system/selfApiKeyTable.vue    |   2 +-
 4 files changed, 115 insertions(+), 115 deletions(-)

diff --git a/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue b/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue
index 4b54e2aa3..a47d6b140 100644
--- a/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue
+++ b/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue
@@ -75,13 +75,13 @@ export default {
       }],
       sysArr: [{
         key: 'alertRule',
-        label: this.$t('alert.alertRule')
+        label: this.$t('alert.rule')
       }, {
         key: 'dc',
         label: this.$t('overall.dc')
       }, {
         key: 'asset',
-        label: this.$t('overall.asset')
+        label: this.$t('asset.asset')
       }, {
         key: 'endpoint',
         label: this.$t('asset.endpoint')
@@ -90,7 +90,7 @@ export default {
         label: this.$t('overall.module')
       }, {
         key: 'project',
-        label: this.$t('overall.project')
+        label: this.$t('project.project.projectName')
       }]
     }
   },
diff --git a/nezha-fronted/src/components/common/alert/alertMessageInfoTimeLine.vue b/nezha-fronted/src/components/common/alert/alertMessageInfoTimeLine.vue
index b5f2fb201..dd6420552 100644
--- a/nezha-fronted/src/components/common/alert/alertMessageInfoTimeLine.vue
+++ b/nezha-fronted/src/components/common/alert/alertMessageInfoTimeLine.vue
@@ -110,22 +110,22 @@
 </template>
 
 <script>
-import { alertMessage as alertMessageConstant } from "@/components/common/js/constants";
-import alertMessageLabelMixin from "@/components/common/alert/alertMessageLabelMixin";
-import alertLabelMixin from "@/components/common/mixin/alertLabelMixin";
+import { alertMessage as alertMessageConstant } from '@/components/common/js/constants'
+import alertMessageLabelMixin from '@/components/common/alert/alertMessageLabelMixin'
+import alertLabelMixin from '@/components/common/mixin/alertLabelMixin'
 import { calcDurationByStringTimeB } from '@/components/common/js/tools.js'
 export default {
-  name: "alertMessageInfoTimeLine",
+  name: 'alertMessageInfoTimeLine',
   props: {
     infoData: {
-      type: Object,
+      type: Object
     },
-    time: {},
+    time: {}
   },
   mixins: [alertMessageLabelMixin, alertLabelMixin],
   computed: {
-    severityData() {
-      return this.$store.getters.severityData;
+    severityData () {
+      return this.$store.getters.severityData
     },
     getDuration () {
       return function (record) {
@@ -140,194 +140,194 @@ export default {
     time: {
       immediate: true,
       deep: true,
-      handler(n) {
+      handler (n) {
         if (n && n.length) {
-          this.pageNo = 1;
+          this.pageNo = 1
           this.lastDataTime = ''
-          this.getTimeLineData();
+          this.getTimeLineData()
         }
-      },
-    },
+      }
+    }
   },
-  data() {
+  data () {
     return {
       pageNo: 1,
       pageSize: 20,
       scope: [
-        "asset",
-        "datacenter",
-        "project",
-        "module",
-        "endpoint",
-        "alertrule",
-        "hash",
+        'asset',
+        'datacenter',
+        'project',
+        'module',
+        'endpoint',
+        'alertrule',
+        'hash'
       ],
       timeLineData: [],
-      lastDataTime: "",
+      lastDataTime: '',
       loading: false,
-      dateFormatStr: localStorage.getItem("nz-default-dateFormat")
-        ? localStorage.getItem("nz-default-dateFormat")
-        : "YYYY-MM-DD HH:ss:mm",
+      dateFormatStr: localStorage.getItem('nz-default-dateFormat')
+        ? localStorage.getItem('nz-default-dateFormat')
+        : 'YYYY-MM-DD HH:ss:mm',
       noData: false,
       stateOptions: alertMessageConstant.states,
       scopeList: [
         {
-          key: "asset",
+          key: 'asset',
           isSelect: true,
-          label: this.$t("overall.asset"),
+          label: this.$t('asset.asset')
         },
         {
-          key: "datacenter",
+          key: 'datacenter',
           isSelect: true,
-          label: this.$t("overall.dc"),
+          label: this.$t('overall.dc')
         },
         {
-          key: "project",
+          key: 'project',
           isSelect: true,
-          label: this.$t("overall.project"),
+          label: this.$t('project.project.projectName')
         },
         {
-          key: "module",
+          key: 'module',
           isSelect: true,
-          label: this.$t("overall.module"),
+          label: this.$t('overall.module')
         },
         {
-          key: "endpoint",
+          key: 'endpoint',
           isSelect: true,
-          label: this.$t("asset.endpoint"),
+          label: this.$t('asset.endpoint')
         },
         {
-          key: "alertrule",
+          key: 'alertrule',
           isSelect: true,
-          label: this.$t("alert.alertRule"),
+          label: this.$t('alert.rule')
         },
         {
-          key: "hash",
+          key: 'hash',
           isSelect: true,
-          label: this.$t("overall.hash"),
-        },
+          label: this.$t('overall.hash')
+        }
       ],
       total: 20,
-      scopeChangeTimer: null,
-    };
+      scopeChangeTimer: null
+    }
   },
-  mounted() {
+  mounted () {
     // this.getTimeLineData(1)
-    const dateFormatStr = localStorage.getItem("nz-default-dateFormat");
+    const dateFormatStr = localStorage.getItem('nz-default-dateFormat')
     if (dateFormatStr) {
-      this.dateFormatStr = dateFormatStr.split(" ")[0];
+      this.dateFormatStr = dateFormatStr.split(' ')[0]
     } else {
-      this.dateFormatStr = "YYYY-MM-DD";
+      this.dateFormatStr = 'YYYY-MM-DD'
     }
   },
   methods: {
-    getTimeLineData() {
-      this.noData = false;
-      this.loading = true;
+    getTimeLineData () {
+      this.noData = false
+      this.loading = true
       const params = {
         pageNo: this.pageNo,
         pageSize: this.pageSize,
         scope: this.scopeList
           .filter((item) => item.isSelect)
           .map((item) => item.key)
-          .join(","),
+          .join(','),
         id: this.infoData.id,
-        state: "",
+        state: '',
         startAt: this.timezoneToUtcTimeStr(
           this.time[0] * 1000,
-          "YYYY-MM-DD HH:mm:ss"
+          'YYYY-MM-DD HH:mm:ss'
         ),
         endAt: this.timezoneToUtcTimeStr(
           this.time[1] * 1000,
-          "YYYY-MM-DD HH:mm:ss"
+          'YYYY-MM-DD HH:mm:ss'
         ),
-        orderBy: "-startAt",
-      };
-      this.$get("/alert/message/rel", params)
+        orderBy: '-startAt'
+      }
+      this.$get('/alert/message/rel', params)
         .then((res) => {
-          this.loading = false;
+          this.loading = false
           if (res.code === 200) {
-            this.total = res.data.total;
+            this.total = res.data.total
             if (this.pageNo == 1) {
-              this.timeLineData = res.data.list;
+              this.timeLineData = res.data.list
             } else {
-              this.timeLineData.push(...res.data.list);
+              this.timeLineData.push(...res.data.list)
             }
-            this.disposeTime(this.pageNo);
-            this.noData = false;
-            this.pageNo++;
+            this.disposeTime(this.pageNo)
+            this.noData = false
+            this.pageNo++
           } else {
-            this.noData = true;
+            this.noData = true
           }
         })
         .catch(() => {
-          this.loading = false;
-          this.noData = true;
-        });
+          this.loading = false
+          this.noData = true
+        })
     },
-    disposeTime(pageNo) {
-      let i = (pageNo - 1) * this.pageSize;
+    disposeTime (pageNo) {
+      let i = (pageNo - 1) * this.pageSize
       for (i; i < this.timeLineData.length; i++) {
         const lastDataTime = this.utcTimeToTimezoneStr(
           this.timeLineData[i].startAt,
           this.dateFormatStr
-        );
-        this.timeLineData[i].color = "#fa8";
-        this.timeLineData[i].startTime = this.timeLineData[i].startAt;
+        )
+        this.timeLineData[i].color = '#fa8'
+        this.timeLineData[i].startTime = this.timeLineData[i].startAt
         if (this.lastDataTime !== lastDataTime) {
-          this.lastDataTime = lastDataTime;
-          this.timeLineData[i].startAt = lastDataTime;
+          this.lastDataTime = lastDataTime
+          this.timeLineData[i].startAt = lastDataTime
         } else {
-          this.timeLineData[i].startAt = "";
+          this.timeLineData[i].startAt = ''
         }
       }
     },
-    selectIcon(item) {
+    selectIcon (item) {
       switch (item.key) {
-        case "asset":
-          return "nz-icon-overview-project";
-        case "datacenter":
-          return "nz-icon-Datacenter2";
-        case "project":
-          return "nz-icon-project";
-        case "module":
-          return "nz-icon-overview-module";
-        case "endpoint":
-          return "nz-icon-overview-endpoint";
-        case "alertrule":
-          return "nz-icon-Alertrule";
-        case "hash":
-          return "nz-icon-module5";
+        case 'asset':
+          return 'nz-icon-overview-project'
+        case 'datacenter':
+          return 'nz-icon-Datacenter2'
+        case 'project':
+          return 'nz-icon-project'
+        case 'module':
+          return 'nz-icon-overview-module'
+        case 'endpoint':
+          return 'nz-icon-overview-endpoint'
+        case 'alertrule':
+          return 'nz-icon-Alertrule'
+        case 'hash':
+          return 'nz-icon-module5'
       }
-      return "nz-icon-module5";
+      return 'nz-icon-module5'
     },
-    scopeChange(scope) {
+    scopeChange (scope) {
       if (this.scopeChangeTimer) {
-        clearInterval(this.scopeChangeTimer);
-        this.scopeChangeTimer = null;
+        clearInterval(this.scopeChangeTimer)
+        this.scopeChangeTimer = null
       }
-      this.loading = true;
-      const isSelectArr = this.scopeList.filter((item) => item.isSelect);
+      this.loading = true
+      const isSelectArr = this.scopeList.filter((item) => item.isSelect)
       if (isSelectArr.length === this.scopeList.length) {
         this.scopeList.forEach((item) => {
-          item.isSelect = false;
-        });
-        scope.isSelect = !scope.isSelect;
+          item.isSelect = false
+        })
+        scope.isSelect = !scope.isSelect
       } else if (isSelectArr.length === 1 && isSelectArr[0].key === scope.key) {
         this.scopeList.forEach((item) => {
-          item.isSelect = true;
-        });
+          item.isSelect = true
+        })
       } else {
-        scope.isSelect = !scope.isSelect;
+        scope.isSelect = !scope.isSelect
       }
       this.scopeChangeTimer = setTimeout(() => {
-        this.pageNo = 1;
+        this.pageNo = 1
         this.lastDataTime = ''
-        this.getTimeLineData();
-      }, 100);
-    },
-  },
-};
+        this.getTimeLineData()
+      }, 100)
+    }
+  }
+}
 </script>
 
 <style scoped>
diff --git a/nezha-fronted/src/components/common/globalSearch/globalSearch.vue b/nezha-fronted/src/components/common/globalSearch/globalSearch.vue
index 65ab1000c..7f748438c 100644
--- a/nezha-fronted/src/components/common/globalSearch/globalSearch.vue
+++ b/nezha-fronted/src/components/common/globalSearch/globalSearch.vue
@@ -151,11 +151,11 @@ export default {
         }, {
           type: 'asset',
           isSelect: true,
-          title: this.$t('overall.asset')
+          title: this.$t('asset.asset')
         }, {
           type: 'project',
           isSelect: true,
-          title: this.$t('overall.project')
+          title: this.$t('project.project.projectName')
         }, {
           type: 'module',
           isSelect: true,
@@ -167,7 +167,7 @@ export default {
         }, {
           type: 'alertrule',
           isSelect: true,
-          title: this.$t('alert.alertRule')
+          title: this.$t('alert.rule')
         }
       ],
       skeletonArr: 20,
diff --git a/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue b/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue
index 2d1afe3e2..b1eb8bfb2 100644
--- a/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue
+++ b/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue
@@ -103,7 +103,7 @@ export default {
           minWidth: 100,
           show: true
         }, {
-          label: this.$t('asset.key'),
+          label: this.$t('apiKey.key'),
           prop: 'token',
           minWidth: 180,
           show: true