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

fix：页面bug修改

Browse Source
This commit is contained in:
zhangyu
2021-05-13 11:40:22 +08:00
parent 29dc51afd0
commit b60eb36839
12 changed files with 94 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
View File

@@ -164,7 +164,7 @@
:options="options.fieldGroupOptions"
:props="labelCascProp"
class="hide-input"
popper-class="prevent-clickoutside"
popper-class="prevent-clickoutside limit-height"
size="small"
@change="addLabel"
></el-cascader>
@@ -398,28 +398,34 @@ export default {
if (this.options.parentAssetOptions.length === 0) {
this.getParentAsset().then(res => {
const asset = this.options.parentAssetOptions.find(a => a.id === n)
console.log(asset, 1)
if (asset) {
this.editAsset.brandId = asset.brand.id
this.editAsset.modelId = asset.model.id
this.editAsset.dcId = asset.dc.id
this.editAsset.cabinetId = asset.cabinet.id
this.editAsset.brandId = asset.brand ? asset.brand.id : ''
this.editAsset.modelId = asset.model ? asset.model.id : ''
this.editAsset.dcId = asset.dc ? asset.dc.id : ''
this.editAsset.cabinetId = asset.cabinet ? asset.cabinet.id : ''
this.editAsset.cabinetStart = asset.cabinetStart
this.editAsset.cabinetEnd = asset.cabinetEnd
if(!asset.cabinet){
asset.cabinet= {}
}
this.lockModelInputValue = `${asset.brand.name} / ${asset.model.name}`
this.lockLocationInputValue = `${asset.dc.name} / ${asset.cabinet.name} / ${asset.cabinetStart}-${asset.cabinetEnd}`
}
})
} else {
const asset = this.options.parentAssetOptions.find(a => a.id === n)
console.log(asset, 2)
if (asset) {
this.editAsset.brandId = asset.brand.id
this.editAsset.modelId = asset.model.id
this.editAsset.dcId = asset.dc.id
this.editAsset.cabinetId = asset.cabinet.id
this.editAsset.brandId = asset.brand ? asset.brand.id : ''
this.editAsset.modelId = asset.model ? asset.model.id : ''
this.editAsset.dcId = asset.dc ? asset.dc.id : ''
this.editAsset.cabinetId = asset.cabinet ? asset.cabinet.id : ''
this.editAsset.cabinetStart = asset.cabinetStart
this.editAsset.cabinetEnd = asset.cabinetEnd
if(!asset.cabinet){
asset.cabinet= {}
}
this.lockModelInputValue = `${asset.brand.name} / ${asset.model.name}`
this.lockLocationInputValue = `${asset.dc.name} / ${asset.cabinet.name} / ${asset.cabinetStart}-${asset.cabinetEnd}`
}

6
nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
View File

@@ -117,9 +117,9 @@
<el-form-item :label='$t("overall.remark")' prop="remark">
<el-input placeholder="" maxlength="512" type="textarea" show-word-limit v-model="editAssetMeta.remark" size="small" id="editAssetMeta-box-input-remark"></el-input>
</el-form-item>
<el-form-item :label='$t("config.assetLabel.example")'>
<assetTagEx :param="editAssetMeta.param" :type="editAssetMeta.type.toUpperCase()"/>
</el-form-item>
<!-- <el-form-item :label='$t("config.assetLabel.example")'>-->
<!-- <assetTagEx :param="editAssetMeta.param" :type="editAssetMeta.type.toUpperCase()"/>-->
<!-- </el-form-item>-->
</el-form>
</div>
</div>