From 6ec63ff6f3694408f0b48717653671bb2433c34a Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 25 May 2021 14:21:14 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9asset=20connect?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=8A=A5=E9=94=99=20=EF=BC=8Cpanel-addByTemp?=
 =?UTF-8?q?late=E7=A9=BF=E6=A2=AD=E6=A1=86,varIds=E4=BC=A0=E5=8F=82?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE,=E4=BB=A5=E5=8F=8Aassetmodel?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=A1=86=E4=B8=ADchart-template=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=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/cli/webSSH.vue      |  2 +-
 .../common/rightBox/administration/modelBox.vue  | 16 ++++++++--------
 .../components/common/rightBox/chartTempBox.vue  |  2 +-
 .../src/components/common/rightBox/moduleBox.vue |  6 +++---
 .../src/components/page/alert/alertMessage.vue   |  1 +
 .../src/components/page/asset/asset.vue          |  9 ++++-----
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/nezha-fronted/src/components/cli/webSSH.vue b/nezha-fronted/src/components/cli/webSSH.vue
index 10122b0fc..744869aad 100644
--- a/nezha-fronted/src/components/cli/webSSH.vue
+++ b/nezha-fronted/src/components/cli/webSSH.vue
@@ -515,7 +515,7 @@ export default {
       // this.$store.commit('addConsole');
     },
     show (id, host, accountId, port) {
-      this.addConsole(id, host, accountId, port)
+      this.addConsole(id, host, accountId, port,'asset')
       this.consoleShow = true
     },
     initDialog () {
diff --git a/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue b/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue
index f95df463b..d66e40eed 100644
--- a/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue
@@ -22,7 +22,7 @@
           <!-- ChartTemplate -->
           <el-form-item :label="$t('config.model.ChartTemplate')" prop="ChartTemplate">
             <v-selectpage
-            :data="'visual/panel/chart'"
+            :data="chartlList"
             :tb-columns="ChartSearchShowFields"
             :params="{
               varType: 1, panelId: 0,
@@ -115,7 +115,7 @@ export default {
   },
   created () {
     this.getBrandList()
-    // this.ChartTemplateList()
+    this.ChartTemplateList()
   },
   methods: {
     clickOutside () {
@@ -198,13 +198,13 @@ export default {
         assetData.totalRow = resp.data.total
         return assetData
       }
-    }
+    },
     /* 获取chart列表数据 */
-    // ChartTemplateList () {
-    //   this.$get('visual/panel/chart', { pageSize: -1, varType: 1, panelId: 0 }).then(res => {
-    //     this.chartlList = res.data.list
-    //   })
-    // }
+    ChartTemplateList () {
+      this.$get('visual/panel/chart', { pageSize: -1, varType: 1, panelId: 0, groupId: 0 }).then(res => {
+        this.chartlList = res.data.list
+      })
+    }
   }
 }
 </script>
diff --git a/nezha-fronted/src/components/common/rightBox/chartTempBox.vue b/nezha-fronted/src/components/common/rightBox/chartTempBox.vue
index f8dd74a70..e00f55266 100644
--- a/nezha-fronted/src/components/common/rightBox/chartTempBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chartTempBox.vue
@@ -228,7 +228,7 @@ export default {
       } else if (this.from === fromRoute.endpoint) { // 来自endpoint时取endpointId
         this.editChartTemp.varIds = this.obj.varIds
       } else {
-        this.editChartTemp.varIds = this.transfer.selectedData.map(item => item.id)
+        this.editChartTemp.varIds = this.$refs.transfer.selectedData.map(item => item.id)
       }
       this.$refs.userForm.validate((valid) => {
         if (valid) {
diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
index dd2fb0ae8..f3dcba1c9 100644
--- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
@@ -88,7 +88,7 @@
           <el-form-item :label="$t('config.model.ChartTemplate')" prop="ChartTemplate">
             <v-selectpage
               v-model="editModule.chartIds"
-              :data="'visual/panel/chart'"
+              :data="chartlList"
               :language="language"
               :multiple="true"
               :params="{
@@ -648,14 +648,14 @@ export default {
     },
     /* 获取chart列表数据 */
     ChartTemplateList () {
-      this.$get('visual/panel/chart', { pageSize: -1, varType: 2, panelId: 0 }).then(res => {
+      this.$get('visual/panel/chart', { pageSize: -1, varType: 2, panelId: 0, returnChildren: 0, groupId: 0 }).then(res => {
         this.chartlList = res.data.list
       })
     }
   },
   mounted () {
     this.getWalkData()
-    // this.ChartTemplateList()
+    this.ChartTemplateList()
   },
   created () {
     this.getProjectList()
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index 57a8de893..0c22ec58d 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -609,6 +609,7 @@ export default {
         }
       }
     },
+    deleteMessage () {}
   }
 }
 </script>
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 967e278da..f839cd7b5 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -251,12 +251,11 @@ export default {
     }
   },
   methods: {
-    cli ([id, host, account]) {
+    cli (row) {
       const consoleParam = {
-        id: id,
-        host: host,
-        accountId: account.id,
-        port: account.port
+        id: row.id,
+        host: row.manageIp,
+        port: row.authProtocolPort
       }
       this.$store.commit('addConsole', consoleParam)
     },