NEZ-3350 feat:software asset 编辑页面开发

This commit is contained in:
zyh
2023-12-05 09:45:54 +08:00
parent b8aebaae3f
commit e1da04af15
2 changed files with 3 additions and 22 deletions

View File

@@ -20,6 +20,7 @@
<el-option v-for="item in softwareTypeArr" :key="item.id" :value="item.id" :label="item.name"></el-option> <el-option v-for="item in softwareTypeArr" :key="item.id" :value="item.id" :label="item.name"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- asset -->
<el-form-item :label='$t("asset.asset")' label-width="125px" prop="assetId" v-if="!disabled"> <el-form-item :label='$t("asset.asset")' label-width="125px" prop="assetId" v-if="!disabled">
<v-selectpage <v-selectpage
:data="assetList" :data="assetList"
@@ -40,12 +41,6 @@
:result-format="resultFormat" :result-format="resultFormat"
></v-selectpage> ></v-selectpage>
</el-form-item> </el-form-item>
<!--project-->
<el-form-item :label='$t("project.project.projectName")' class="select-warp" prop="projectId">
<el-select id="add-endpoint-project" v-model="editSoftwareAsset.projectId" class="right-box__select" clearable placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="id">
<el-option v-for="item in projectList" :id="'project-'+item.id" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<!--remark--> <!--remark-->
<el-form-item :label="$t('overall.remark')" prop="remark"> <el-form-item :label="$t('overall.remark')" prop="remark">
<el-input maxlength="256" show-word-limit v-model="editSoftwareAsset.remark" size="small" :rows="2" type="textarea"></el-input> <el-input maxlength="256" show-word-limit v-model="editSoftwareAsset.remark" size="small" :rows="2" type="textarea"></el-input>
@@ -190,7 +185,6 @@ export default {
name: '', name: '',
typeId: '', typeId: '',
assetId: '', assetId: '',
projectId: '',
params: {}, params: {},
remark: '' remark: ''
}, },
@@ -209,7 +203,6 @@ export default {
{ required: true, message: this.$t('validate.required'), trigger: 'change' } { required: true, message: this.$t('validate.required'), trigger: 'change' }
] ]
}, },
projectList: [],
softwareTypeArr: [], softwareTypeArr: [],
assetList: [], assetList: [],
columns: [ columns: [
@@ -253,9 +246,6 @@ 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 = '' editSoftwareAsset.assetId = ''
// if (editSoftwareAsset.params) { // if (editSoftwareAsset.params) {
// Object.keys(editSoftwareAsset.params).forEach(key => { // Object.keys(editSoftwareAsset.params).forEach(key => {
@@ -268,7 +258,6 @@ export default {
} }
}, },
created () { created () {
this.getProjectList()
this.getAsset() this.getAsset()
this.getSoftwareTypeList() this.getSoftwareTypeList()
}, },
@@ -342,14 +331,6 @@ export default {
} }
}) })
}, },
/* 获取project列表 */
getProjectList () {
this.$get('monitor/project', { pageSize: -1, pageNo: 1 }).then(response => {
if (response.code === 200) {
this.projectList = response.data.list
}
})
},
/* 获取asset列表 */ /* 获取asset列表 */
getAsset () { getAsset () {
this.$get('asset/asset', { pageSize: -1 }).then(res => { this.$get('asset/asset', { pageSize: -1 }).then(res => {

View File

@@ -70,7 +70,7 @@
<span v-else-if="item.prop === 'dateIssued' || item.prop === 'dateExpires'">{{ scope.row[item.prop] ? momentTz(scope.row[item.prop] ) : '-'}}</span> <span v-else-if="item.prop === 'dateIssued' || item.prop === 'dateExpires'">{{ scope.row[item.prop] ? momentTz(scope.row[item.prop] ) : '-'}}</span>
<!-- status --> <!-- status -->
<template v-else-if="item.prop === 'status'"> <template v-else-if="item.prop === 'status'">
<div v-if="scope.row.status === 1"> <div v-if="scope.row.status == 1">
<i class="nz-icon nz-icon-import-success1" style="color:#8dcb4b;"></i> <i class="nz-icon nz-icon-import-success1" style="color:#8dcb4b;"></i>
<span>{{$t('licenseMange.licensed')}}</span> <span>{{$t('licenseMange.licensed')}}</span>
</div> </div>