fix: dc列表、侧滑相关
1.列表增加assetStat 2.列表中asset、机柜放后,area放前 3.侧滑area弹框去掉复选框,去掉ok按钮
This commit is contained in:
@@ -2,6 +2,31 @@
|
||||
.dc {
|
||||
height: 100%;
|
||||
}
|
||||
.dc-asset-states {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
height: 100%;
|
||||
}
|
||||
.dc-asset-state {
|
||||
display: inline-block;
|
||||
min-width: 25px;
|
||||
height: 20px;
|
||||
color: white;
|
||||
text-align: center;
|
||||
line-height: 20px;
|
||||
margin-right: 6px;
|
||||
border-radius: 3px;
|
||||
}
|
||||
.dc-asset-state.dc-asset-state-total {
|
||||
background-color: #1166bb;
|
||||
margin-right: 15px
|
||||
}
|
||||
.dc-asset-state-in {
|
||||
background-color: #90ee90;
|
||||
}
|
||||
.dc-asset-state-out {
|
||||
background-color: orange;
|
||||
}
|
||||
</style>
|
||||
<template>
|
||||
<div class="dc">
|
||||
@@ -66,6 +91,19 @@
|
||||
<template v-if="scope.row.area">{{scope.row.area.name}}</template>
|
||||
<template v-else>-</template>
|
||||
</template>
|
||||
<template v-else-if="item.prop == 'assetStat'">
|
||||
<el-popover
|
||||
placement="top"
|
||||
trigger="hover"
|
||||
:content="$t('overall.result.total') + ':' + scope.row.assetStat.total + ',' + $t('asset.createAssetTab.inStock') + ':' + scope.row.assetStat.inStock + ',' + $t('asset.createAssetTab.notInStock') + ':' + scope.row.assetStat.outStock">
|
||||
<div slot="reference" class="dc-asset-states">
|
||||
<span class="dc-asset-state dc-asset-state-total">{{scope.row.assetStat.total}}</span>
|
||||
<span class="dc-asset-state dc-asset-state-in">{{scope.row.assetStat.inStock}}</span>
|
||||
<span class="dc-asset-state dc-asset-state-out">{{scope.row.assetStat.outStock}}</span>
|
||||
</div>
|
||||
</el-popover>
|
||||
|
||||
</template>
|
||||
<template v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</template>
|
||||
<template v-else>-</template>
|
||||
</template>
|
||||
@@ -123,13 +161,21 @@
|
||||
label: this.$t("overall.name"),
|
||||
prop: 'name',
|
||||
show: true,
|
||||
}, {
|
||||
label: this.$t('config.dc.area'),
|
||||
prop: 'area',
|
||||
show: true
|
||||
}, {
|
||||
label: this.$t("asset.createAssetTab.location"),
|
||||
prop: 'location',
|
||||
show: true,
|
||||
}, {
|
||||
label: this.$t("config.dc.cabinetNum"),
|
||||
prop: 'cabinetNum',
|
||||
show: true,
|
||||
}, {
|
||||
label: this.$t("asset.createAssetTab.location"),
|
||||
prop: 'location',
|
||||
label: this.$t("config.dc.assets"),
|
||||
prop: 'assetStat',
|
||||
show: true,
|
||||
}, {
|
||||
label: this.$t('asset.createAssetTab.tel'),
|
||||
@@ -139,10 +185,6 @@
|
||||
label: this.$t('asset.createAssetTab.principal'),
|
||||
prop: 'principal',
|
||||
show: true
|
||||
}, {
|
||||
label: this.$t('config.dc.area'),
|
||||
prop: 'area',
|
||||
show: true
|
||||
}, {
|
||||
label: this.$t('config.account.option'),
|
||||
prop: 'option',
|
||||
|
||||
Reference in New Issue
Block a user