NEZ-3178 fix:software asset 列表页面无法正常显示数据 以及样式调整

This commit is contained in:
zhangyu
2023-09-06 18:36:37 +08:00
parent 1864d66e01
commit e3d908b684
4 changed files with 30 additions and 8 deletions

View File

@@ -41,3 +41,10 @@
font-size: 12px; font-size: 12px;
} }
} }
.right-box-editSoftwareAsset .right-box__container {
.el-form .form__dotted-item {
padding: 0;
border: none;
margin-bottom: 15px;
}
}

View File

@@ -1,5 +1,5 @@
<template> <template>
<div v-clickoutside="{obj: editSoftwareAsset, func: esc}" class="right-box right-box-editSoftwareAsset right-box-edit-endpoint "> <div v-clickoutside="{obj: editSoftwareAsset,oldData:oldData, func: esc}" class="right-box right-box-editSoftwareAsset right-box-edit-endpoint ">
<div class="right-box__header"> <div class="right-box__header">
<div class="header__title">{{editSoftwareAsset.id ? $t('softwareAsset.edit') : $t('softwareAsset.create')}}</div> <div class="header__title">{{editSoftwareAsset.id ? $t('softwareAsset.edit') : $t('softwareAsset.create')}}</div>
<div class="header__operation"> <div class="header__operation">
@@ -184,6 +184,7 @@ export default {
return { return {
assetConstants, assetConstants,
disabled: false, disabled: false,
oldData: {},
editSoftwareAsset: { editSoftwareAsset: {
id: '', id: '',
name: '', name: '',
@@ -252,13 +253,17 @@ export default {
this.isEdit = true this.isEdit = true
const editSoftwareAsset = JSON.parse(JSON.stringify(n)) const editSoftwareAsset = JSON.parse(JSON.stringify(n))
editSoftwareAsset.paramObj = [] editSoftwareAsset.paramObj = []
if (editSoftwareAsset.projectId === -1) {
editSoftwareAsset.projectId = ''
}
editSoftwareAsset.assetId = ''
// if (editSoftwareAsset.params) { // if (editSoftwareAsset.params) {
// Object.keys(editSoftwareAsset.params).forEach(key => { // Object.keys(editSoftwareAsset.params).forEach(key => {
// editSoftwareAsset.paramObj.push(editSoftwareAsset.params[key]) // editSoftwareAsset.paramObj.push(editSoftwareAsset.params[key])
// }) // })
// } // }
editSoftwareAsset.assetId = ''
this.editSoftwareAsset = editSoftwareAsset this.editSoftwareAsset = editSoftwareAsset
this.oldData = this.$lodash.cloneDeep(this.editSoftwareAsset)
} }
} }
}, },
@@ -269,7 +274,10 @@ export default {
}, },
mounted () { mounted () {
setTimeout(() => { setTimeout(() => {
this.editSoftwareAsset.assetId = this.obj.assetId + '' if (this.obj.assetId && this.obj.assetId !== -1) {
this.editSoftwareAsset.assetId = this.obj.assetId + ''
this.oldData = this.$lodash.cloneDeep(this.editSoftwareAsset)
}
}, 500) }, 500)
}, },
methods: { methods: {
@@ -381,6 +389,7 @@ export default {
} }
this.editSoftwareAsset.paramObj.push(findItem.params[key]) this.editSoftwareAsset.paramObj.push(findItem.params[key])
}) })
this.oldData = this.$lodash.cloneDeep(this.editSoftwareAsset)
} }
} }
} }

View File

@@ -46,7 +46,7 @@
</div> </div>
<el-form-item prop="paramObj"> <el-form-item prop="paramObj">
<div v-for="(label, i) in editSoftwareType.paramObj" :key="i" class="form__dotted-item form__dotted-item-required"> <div v-for="(label, i) in editSoftwareType.paramObj" :key="i" class="form__dotted-item form__dotted-item-required">
<el-form-item :prop="'paramObj.' + i + '.value.0'" :rules="[ { required: JSON.parse(label.param).required === '1', message: $t('validate.required'), trigger: 'blur' }]"> <el-form-item :prop="'paramObj.' + i + '.value.0'" :rules="[]">
<template v-slot:label> <template v-slot:label>
<div class="form__labels-label"> <div class="form__labels-label">
<span>{{label.name}}</span> <span>{{label.name}}</span>

View File

@@ -44,7 +44,8 @@
</copy> </copy>
</template> </template>
<template v-else-if="item.prop === 'asset'"> <template v-else-if="item.prop === 'asset'">
<div class="document-copy-block"> <div>
<div class="document-copy-block" v-if="scope.row.asset">
<span <span
class="document-copy-text" class="document-copy-text"
:title="scope.row.asset&&scope.row.asset.name" :title="scope.row.asset&&scope.row.asset.name"
@@ -53,7 +54,9 @@
<i class="nz-icon nz-icon-overview-project monitorColor color23BF9A"></i> <i class="nz-icon nz-icon-overview-project monitorColor color23BF9A"></i>
{{scope.row.asset&&scope.row.asset.name}} {{scope.row.asset&&scope.row.asset.name}}
</span> </span>
<i v-if="scope.row.asset&&scope.row.asset.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(scope.row.asset.name)" :title="$t('overall.copyText')"></i> <i v-if="scope.row.asset&&scope.row.asset.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(scope.row.asset.name)" :title="$t('overall.copyText')"></i>
</div>
<span v-else>--</span>
</div> </div>
</template> </template>
<template v-else-if="item.prop === 'category'"> <template v-else-if="item.prop === 'category'">
@@ -62,14 +65,17 @@
</div> </div>
</template> </template>
<template v-else-if="item.prop === 'project'"> <template v-else-if="item.prop === 'project'">
<div class="document-copy-block"> <div>
<div class="document-copy-block" v-if="scope.row.project">
<span class="document-copy-text" <span class="document-copy-text"
:title="scope.row[item.prop].name" :title="scope.row[item.prop].name"
@mouseenter="labelHover(scope.row, item.prop, true,true, $event)" @mouseenter="labelHover(scope.row, item.prop, true,true, $event)"
@mouseleave="labelHover(scope.row, item.prop, false,true)"> @mouseleave="labelHover(scope.row, item.prop, false,true)">
{{scope.row[item.prop].name}} {{scope.row[item.prop].name}}
</span> </span>
<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> <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>
<span v-else>--</span>
</div> </div>
</template> </template>
<template v-else-if="item.prop === 'type'"> <template v-else-if="item.prop === 'type'">