From ffb6cb23ea19ab51aae9f64abba2de539fd1bbfa Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 27 Oct 2021 10:49:53 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-1088=20fix=EF=BC=9AProject=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=82=B9=E5=87=BBAlert=E5=AD=97=E6=AE=B5=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E8=B7=B3=E8=BD=AC=E5=88=B0Alert=20message=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/mixin/detailViewMixin.js           | 27 ++++++++++++++++---
 .../common/table/settings/projectTable.vue    |  8 ++++--
 .../components/page/alert/alertMessage.vue    | 16 +++++++++++
 .../page/monitor/module/moduleList.vue        | 22 ++++++++++-----
 4 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/nezha-fronted/src/components/common/mixin/detailViewMixin.js b/nezha-fronted/src/components/common/mixin/detailViewMixin.js
index b67e822bc..53e0c0917 100644
--- a/nezha-fronted/src/components/common/mixin/detailViewMixin.js
+++ b/nezha-fronted/src/components/common/mixin/detailViewMixin.js
@@ -1,3 +1,5 @@
+import project from "@/components/page/monitor/project/project";
+
 export default {
   props: {},
   data () {
@@ -42,12 +44,29 @@ export default {
         this.detailViewLoading = false
         this.$refs.clickSearch && this.$refs.clickSearch.needMore()
         this.$refs[dataList].$refs.searchInput.sreach_num = 0
+        this.$refs[dataList].$refs.searchInput.select_list = []
+        console.log(this.searchMsg.searchLabelList)
         this.searchMsg.searchLabelList.forEach(searchLabel => {
           if (this.searchLabel[searchLabel.label]) {
-            this.$refs[dataList].$refs.searchInput.select_list.push({
-              ...searchLabel,
-              val: this.searchLabel[searchLabel.label]
-            })
+            let val = this.searchLabel[searchLabel.label]
+            console.log(val)
+            if (searchLabel.label === 'projectIds') {
+              const project = this.$refs.dataList.$refs.searchInput.projectSelect.find(project => val == project.id || val == project.name)
+              console.log(project)
+              val = project.name
+              const valnum = project.id
+              this.$refs[dataList].$refs.searchInput.select_list.push({
+                ...searchLabel,
+                val: val,
+                valnum: valnum
+              })
+            } else {
+              this.$refs[dataList].$refs.searchInput.select_list.push({
+                ...searchLabel,
+                val: val
+              })
+            }
+
             this.$refs[dataList].$refs.searchInput.sreach_num++
             this.$refs[dataList].$refs.searchInput.searchLabelList = this.$refs.dataList.$refs.searchInput.searchLabelList.filter(item => searchLabel.label !== item.label)
           }
diff --git a/nezha-fronted/src/components/common/table/settings/projectTable.vue b/nezha-fronted/src/components/common/table/settings/projectTable.vue
index b5d8d4832..4589e7985 100644
--- a/nezha-fronted/src/components/common/table/settings/projectTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/projectTable.vue
@@ -53,7 +53,7 @@
           </span>
         </template>
         <template v-else-if="item.prop === 'alertNum'">
-         <span class="alert-num">
+         <span class="alert-num" @click="jumpAlertMessage(scope.row)">
             <i class="nz-icon nz-icon-overview-alert" :class="scope.row[item.prop]>0?'colorEF7458':'color23BF9A'"/>
             {{scope.row[item.prop]}}
           </span>
@@ -142,9 +142,13 @@ export default {
       this.$store.commit('currentProjectChange', project)
     },
     jumpModule (row) {
-      localStorage.setItem('moduleProjectId', row.id)
+      localStorage.setItem('moduleProjectId', JSON.stringify([row.id, row.name]))
       this.$router.push({ path: '/monitor/module' })
     },
+    jumpAlertMessage (row) {
+      localStorage.setItem('alertMessageProjectId', row.id)
+      this.$router.push({ path: '/alertMessage' })
+    },
     jumpEndpoint (row) {
       localStorage.setItem('endpointProjectId', row.id)
       this.$router.push({ path: '/monitor/endpoint' })
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index f02fe16a7..8fc6d979c 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -352,6 +352,19 @@ export default {
       }
     }
   },
+  created () {
+    if (localStorage.getItem('alertMessageProjectId')) {
+      this.selectValue.projectIds = [Number(localStorage.getItem('alertMessageProjectId'))]
+      this.searchCheckBox.projectIds = this.selectValue.projectIds.join(',')
+    }
+  },
+  mounted () {
+    if (localStorage.getItem('alertMessageProjectId')) {
+      this.selectValue.projectIds = [Number(localStorage.getItem('alertMessageProjectId'))]
+      // this.$refs.clickSearch.selectValueOut.projectIds = [localStorage.getItem('endpointProjectId')]
+    }
+    // this.getTitleSearch()
+  },
   methods: {
     labelsSort (obj) {
       const buildIn = ['asset', 'endpoint', 'module', 'cpu', 'project', 'datacenter', 'parent_asset', 'user']
@@ -990,6 +1003,9 @@ export default {
       }
     },
     deleteMessage () {}
+  },
+  destroyed () {
+    localStorage.removeItem('endpointProjectId')
   }
 }
 </script>
diff --git a/nezha-fronted/src/components/page/monitor/module/moduleList.vue b/nezha-fronted/src/components/page/monitor/module/moduleList.vue
index cb6e01c4f..8335edcb7 100644
--- a/nezha-fronted/src/components/page/monitor/module/moduleList.vue
+++ b/nezha-fronted/src/components/page/monitor/module/moduleList.vue
@@ -275,6 +275,7 @@ export default {
             name: this.$t('overall.projectName'),
             type: 'project',
             label: 'projectIds',
+            id: 11,
             readonly: true,
             disabled: false
           }
@@ -425,19 +426,28 @@ export default {
   },
   created () {
     if (localStorage.getItem('moduleProjectId')) {
-      this.searchLabel.projectIds = localStorage.getItem('moduleProjectId')
+      this.searchLabel.projectIds = JSON.parse(localStorage.getItem('moduleProjectId'))[0]
     }
     if (localStorage.getItem('moduleProjectId')) {
+      const project = JSON.parse(localStorage.getItem('moduleProjectId'))
+      let dataList = ''
+      if (this.detailType !== 'view') {
+        dataList = 'dataList'
+      } else {
+        dataList = 'detailList'
+      }
       setTimeout(() => {
-        this.$refs.dataList.$refs.searchInput.select_list.push({
+        this.$refs[dataList].$refs.searchInput.select_list.push({
           id: 11,
-          name: 'project id',
-          type: 'input',
+          name: this.$t('overall.projectName'),
+          type: 'project',
           label: 'projectIds',
           disabled: false,
-          val: localStorage.getItem('moduleProjectId')
+          val: project[1],
+          valnum: project[0]
         })
-        this.$refs.dataList.$refs.searchInput.sreach_num = 1
+        this.$refs[dataList].$refs.searchInput.sreach_num = 1
+        this.$refs[dataList].$refs.searchInput.searchLabelList = this.$refs[dataList].$refs.searchInput.searchLabelList.filter(item => item.label !== 'projectIds')
       })
     }
   },