From 1467f15a7c2963ebbfecddc4a3ee60b4d859c5ab Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Mon, 17 May 2021 13:31:25 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-613=20fix:=201.asset=20=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2bug=20ssh=20port=20=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E7=AB=AF=E5=8F=A3=EF=BC=9A22=202.asset=20model=20=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=88=86=E9=A1=B5=E5=9B=BD=E9=99=85=E5=8C=96=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/language/cn.js     |  2 ++
 nezha-fronted/src/components/common/language/en.js     |  2 ++
 .../common/rightBox/administration/modelBox.vue        |  9 +++++----
 .../src/components/common/rightBox/asset/assetBox.vue  | 10 ++++------
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index 68667aac3..88f8923be 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -828,6 +828,8 @@ const cn = {
       model: '资产型号',
       name: '资产型号',
       brand: '品牌',
+      titleName: '名称',
+      titleType: '类型',
       ChartTemplate: '图表模板',
       assetNum: '资产',
       editModel: '编辑型号',
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index ded1161f6..9786c24d7 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -759,6 +759,8 @@ const en = {
       model: 'Asset model',
       brand: 'Brand',
       name: 'Name',
+      titleName: 'Name',
+      titleType: 'Type',
       ChartTemplate: 'Chart template',
       assetNum: 'Asset',
       editModel: 'Edit model',
diff --git a/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue b/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue
index d697f4900..d43e523f9 100644
--- a/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue
@@ -28,7 +28,7 @@
               varType: 1, panelId: 0
             }"
             :multiple="true"
-            language="en"
+           :language="language"
             title="ChartSearch"
             key-field="id"
             v-model="editModel.chartIds"
@@ -78,15 +78,16 @@ export default {
   },
   data () {
     return {
+      language: localStorage.getItem('nz-language'),
       editModel: {},
       brandList: [], // brand 列表数据
       editModule: {},
       chartlList: [], // chart 列表数据
       ChartSearchShowFields: [ // ChartSearch 下拉搜索表头
         { title: 'ID', data: 'id' },
-        { title: 'Name', data: 'name' },
-        { title: 'Type', data: 'type' },
-        { title: 'Description', data: 'remark' }
+        { title: this.$t("config.model.titleName"), data: 'name' },
+        { title: this.$t("config.model.titleType"), data: 'type' },
+        { title: this.$t("config.model.remark"), data: 'remark' }
       ],
       url: 'asset/model',
       brandUrl: 'asset/brand',
diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
index e13d06978..4871b000a 100644
--- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
@@ -379,12 +379,10 @@ export default {
       handler (n) {
         if (n) {
           this.vmLock = n.vm === 1 // vm == 1 时，锁定model和location
-          if (!this.editAsset.authProtocolPort) {
-            if (n.authProtocol === this.assetConstants.authProtocolData.ssh) {
-              this.editAsset.authProtocolPort = 22
-            } else if (n.authProtocol === this.assetConstants.authProtocolData.telnet) {
-              this.editAsset.authProtocolPort = 23
-            }
+          if (n.authProtocol === this.assetConstants.authProtocolData.ssh) {
+            this.editAsset.authProtocolPort = 22
+          } else if (n.authProtocol === this.assetConstants.authProtocolData.telnet) {
+            this.editAsset.authProtocolPort = 23
           }
         }
       }