From 0cbba3073d700ef2a55e6f2fb22811b26e1c104b Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Wed, 28 Apr 2021 14:21:01 +0800
Subject: [PATCH] =?UTF-8?q?asset=20type=E9=A1=B5=E9=9D=A2=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=88=97=E8=A1=A8=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/js/constants.js     |  2 +-
 .../src/components/common/language/en.js      |  3 ++
 .../rightBox/administration/assetTypeBox.vue  | 21 ++++++++++++++
 .../common/rightBox/assetMetaBox.vue          |  3 +-
 .../common/table/settings/assetTypeTable.vue  | 29 +++++++++++++++++--
 .../src/components/page/config/assetMeta.vue  |  7 ++---
 .../src/components/page/config/assetType.vue  |  4 ++-
 7 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/nezha-fronted/src/components/common/js/constants.js b/nezha-fronted/src/components/common/js/constants.js
index b1c28d20f..30062b160 100644
--- a/nezha-fronted/src/components/common/js/constants.js
+++ b/nezha-fronted/src/components/common/js/constants.js
@@ -81,7 +81,7 @@ export const asset = {
   ],
   assetType: {
     authProtocolOptions: [
-      { value: 0, label: '无' },
+      { value: 0, label: 'nothing' },
       { value: 1, label: 'SSH' },
       { value: 2, label: 'TELNET' }
     ],
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index 0209afe2b..e7df133c3 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -977,7 +977,10 @@ const en = {
       vmh:'VMH',
       authProtocol:'AuthProtocol',
       snmpEnable: 'SnmpEnable',
+      snmpCollect:'SnmpCollect',
       createModel:'CreateModel',
+      sshCollect:'SshCollect',
+      sshCollectScript:'SshCollectScript',
       parent: 'Parent',
       pname: 'Parent name',
       editAssetType: 'Edit asset type',
diff --git a/nezha-fronted/src/components/common/rightBox/administration/assetTypeBox.vue b/nezha-fronted/src/components/common/rightBox/administration/assetTypeBox.vue
index b23496702..4bb12c244 100644
--- a/nezha-fronted/src/components/common/rightBox/administration/assetTypeBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/administration/assetTypeBox.vue
@@ -46,6 +46,27 @@
               :inactive-value="0">
             </el-switch>
           </el-form-item>
+          <!--snmpCollect-->
+          <el-form-item :label='$t("config.assetType.snmpCollect")' prop="snmpCollect">
+            <el-switch
+              v-model="editAssetType.snmpCollect"
+              active-color="#ee9d3f"
+              :active-value="1"
+              :inactive-value="0">
+            </el-switch>
+          </el-form-item>
+          <!--sshCollect-->
+          <el-form-item :label='$t("config.assetType.sshCollect")' prop="sshCollect">
+            <el-switch
+              v-model="editAssetType.sshCollect"
+              active-color="#ee9d3f"
+              :active-value="1"
+              :inactive-value="0">
+            </el-switch>
+          </el-form-item>
+          <el-form-item :label='$t("config.assetType.sshCollectScript")' prop="sshCollectScript">
+            <el-input v-model="editAssetType.sshCollectScript" size="small" type="text"></el-input>
+          </el-form-item>
           <!-- ChartTemplate -->
           <!-- <el-form-item :label="$t('config.type.ChartTemplate')" prop="ChartTemplate">
             <v-selectpage 
diff --git a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
index 34630913b..aa46030e5 100644
--- a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
@@ -304,8 +304,7 @@ export default {
     save () {
       if (this.prevent_opt.save) {
         return
-      }
-      ;
+      };
       this.prevent_opt.save = true
       this.$refs.editAssetMetaForm.validate((valid) => {
         if (valid) {
diff --git a/nezha-fronted/src/components/common/table/settings/assetTypeTable.vue b/nezha-fronted/src/components/common/table/settings/assetTypeTable.vue
index 812280b39..dfbc20884 100644
--- a/nezha-fronted/src/components/common/table/settings/assetTypeTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/assetTypeTable.vue
@@ -42,14 +42,25 @@
         </div>
         <div v-else-if=" item.prop === 'authProtocol' ">
           <div v-if="scope.row[item.prop] === 1">SSH</div>
-          <div v-else-if="scope.row[item.prop] === 0">无</div>
+          <div v-else-if="scope.row[item.prop] === 0">nothing</div>
           <div v-else-if="scope.row[item.prop] === 2">telnet</div>
         </div>
         <div v-else-if=" item.prop === 'snmpEnable' ">
           <div v-if="scope.row[item.prop] === 1">Enabled</div>
           <div v-else-if="scope.row[item.prop] === 0">Disabled</div>
         </div>
-        <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop] || '-'}}</span>
+        <div v-else-if=" item.prop === 'snmpCollect' ">
+          <div v-if="scope.row[item.prop] === 1">Enabled</div>
+          <div v-else-if="scope.row[item.prop] === 0">Disabled</div>
+        </div>
+        <div v-else-if=" item.prop === 'sshCollect' ">
+          <div v-if="scope.row[item.prop] === 1">Enabled</div>
+          <div v-else-if="scope.row[item.prop] === 0">Disabled</div>
+        </div>
+        <div v-else-if="item.prop === 'sshCollectScript'">
+          <div>{{ scope.row[item.prop] || '-' }}</div>
+        </div>
+        <span v-else-if="scope.row[item.prop]">{{ scope.row[item.prop] || '-' }}</span>
         <template v-else>-</template>
       </template>
     </el-table-column>
@@ -108,6 +119,20 @@ export default {
           label: this.$t('config.assetType.snmpEnable'),
           prop: 'snmpEnable',
           show: true,
+        },{
+          label: this.$t('config.assetType.snmpCollect'),
+          prop: 'snmpCollect',
+          show: true,
+        },
+        {
+          label: this.$t('config.assetType.sshCollect'),
+          prop: 'sshCollect',
+          show: true,
+        },
+        {
+          label: this.$t('config.assetType.sshCollectScript'),
+          prop: 'sshCollectScript',
+          show: true,
         }
       ]
     }
diff --git a/nezha-fronted/src/components/page/config/assetMeta.vue b/nezha-fronted/src/components/page/config/assetMeta.vue
index 672baa511..4ac612dd9 100644
--- a/nezha-fronted/src/components/page/config/assetMeta.vue
+++ b/nezha-fronted/src/components/page/config/assetMeta.vue
@@ -54,12 +54,11 @@
     </nz-data-list>
     <!--侧滑-->
     <transition name="right-box">
-      <assetMetaBox v-if="rightBox.metaShow" ref="assetMetaBox" :asset-meta="object"
-                    @close="closeRightBox"></assetMetaBox>
+      <asset-meta-box v-if="rightBox.metaShow" ref="assetMetaBox" v-bind:asset-label="object" @close="closeRightBox"></asset-meta-box>
     </transition>
     <transition name="right-box">
-      <assetMetaGroup v-if="rightBox.groupShow" :metaGroup="metaGroup" @close="closeRightBox"
-                      ref="assetMetaBox"></assetMetaGroup>
+      <asset-meta-group v-if="rightBox.groupShow" :metaGroup="metaGroup" @close="closeRightBox"
+                      ref="assetMetaBox"></asset-meta-group>
     </transition>
   </div>
 </template>
diff --git a/nezha-fronted/src/components/page/config/assetType.vue b/nezha-fronted/src/components/page/config/assetType.vue
index 71433a2bc..cb4802a22 100644
--- a/nezha-fronted/src/components/page/config/assetType.vue
+++ b/nezha-fronted/src/components/page/config/assetType.vue
@@ -65,7 +65,9 @@ export default {
         vm: '',
         vmh:'',
         authProtocol:'',
-        snmpEnable:''
+        snmpEnable:'',
+        snmpCollect:'',
+        sshCollect:''
       },
       tableId: 'typeConfTable',
       searchMsg: { // 给搜索框子组件传递的信息