From 9d7a06c2b7f536d780e5d7e9ba4d50f09d879ac8 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 24 Aug 2023 10:18:49 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-3070=20fix:software=20asset=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rightBox/software/softwareAssetBox.vue    | 26 +++++++++++++------
 .../table/settings/softwareAssetTable.vue     |  3 +++
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/software/softwareAssetBox.vue b/nezha-fronted/src/components/common/rightBox/software/softwareAssetBox.vue
index 56c63ac36..fe46264d4 100644
--- a/nezha-fronted/src/components/common/rightBox/software/softwareAssetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/software/softwareAssetBox.vue
@@ -21,9 +21,6 @@
             </el-select>
           </el-form-item>
           <el-form-item :label='$t("asset.asset")' label-width="125px" prop="assetId" v-if="!disabled">
-            <!--            <el-select id="module-box-input-asset"  @change="renderEndpoint" v-model="editEndpoint.assetId" :disabled="disabled" class="right-box__select" placeholder="" popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside" size="small" value-key="id">-->
-            <!--              <el-option v-for="item in assetList" :id="'asset-'+item.id" :key="item.id" :label="item.name" :value="item.id"></el-option>-->
-            <!--            </el-select>-->
             <v-selectpage
               :data="assetList"
               :tb-columns="columns"
@@ -260,7 +257,7 @@ export default {
         //     editSoftwareAsset.paramObj.push(editSoftwareAsset.params[key])
         //   })
         // }
-        editSoftwareAsset.assetId = editSoftwareAsset.assetId + ''
+        editSoftwareAsset.assetId = ''
         this.editSoftwareAsset = editSoftwareAsset
       }
     }
@@ -271,13 +268,15 @@ export default {
     this.getSoftwareTypeList()
   },
   mounted () {
+    setTimeout(() => {
+      this.editSoftwareAsset.assetId = this.obj.assetId + ''
+    }, 500)
   },
   methods: {
     clickOutside () {
       this.esc(false)
     },
     iconActive (subItem) {
-      console.log(subItem, this.editSoftwareAsset.icon)
       if (this.editSoftwareAsset.icon === subItem.value) {
         this.editSoftwareAsset.icon = undefined
         this.$set(this.editSoftwareAsset, 'icon', '')
@@ -299,7 +298,13 @@ export default {
           }
           params.params = {}
           params.paramObj.forEach(item => {
-            params.params[item.name] = item.value
+            if (item.type === 'CHECKBOX') {
+              params.params[item.name] = item.value
+            } else if (item.type === 'DATETIME' && JSON.parse(item.param).interval) {
+              params.params[item.name] = item.value
+            } else {
+              params.params[item.name] = item.value[0]
+            }
           })
           params.icon = this.imageUrl
           if (this.editSoftwareAsset.id) {
@@ -367,10 +372,15 @@ export default {
       const findItem = this.softwareTypeArr.find(item => item.id == this.editSoftwareAsset.typeId)
       if (findItem.params) {
         Object.keys(findItem.params).forEach(key => {
-          findItem.params[key].value = this.editSoftwareAsset.params[key] ? this.editSoftwareAsset.params[key].value : findItem.params[key].value
+          if (findItem.params[key].type === 'CHECKBOX') {
+            findItem.params[key].value = this.editSoftwareAsset.params[key] ? this.editSoftwareAsset.params[key] : findItem.params[key].value
+          } else if (findItem.params[key].type === 'DATETIME' && JSON.parse(findItem.params[key].param).interval) {
+            findItem.params[key].value = this.editSoftwareAsset.params[key] ? this.editSoftwareAsset.params[key] : findItem.params[key].value
+          } else {
+            findItem.params[key].value = this.editSoftwareAsset.params[key] ? [this.editSoftwareAsset.params[key]] : findItem.params[key].value
+          }
           this.editSoftwareAsset.paramObj.push(findItem.params[key])
         })
-        console.log(this.editSoftwareAsset.paramObj)
       }
     }
   }
diff --git a/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue b/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue
index 938f77ccc..613f27a71 100644
--- a/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue
@@ -67,6 +67,9 @@
               <i v-if="scope.row[item.prop].name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(scope.row[item.prop].name)" :title="$t('overall.copyText')"></i>
             </div>
           </template>
+          <template v-else-if="item.prop === 'type'">
+            {{scope.row.type ? scope.row.type.name : '-'}}
+          </template>
           <span v-else-if="scope.row[item.prop]" :class="item.prop === 'remark'? 'el-table-remark':''">{{scope.row[item.prop]}}</span>
           <span v-else>-</span>
         </template>