gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NEZ-3070 fix:software asset列表编辑页面

Browse Source
This commit is contained in:
zhangyu
2023-08-24 10:18:49 +08:00
parent ca55d5d57a
commit 9d7a06c2b7
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
nezha-fronted/src/components/common/rightBox/software/softwareAssetBox.vue
View File

@@ -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 => {
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)
}
}
}

3
nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue
View File

@@ -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>