diff --git a/templates/admin/resources/queue.tmpl b/templates/admin/resources/queue.tmpl
index 3f2d83b99..13c30690a 100644
--- a/templates/admin/resources/queue.tmpl
+++ b/templates/admin/resources/queue.tmpl
@@ -4,7 +4,7 @@
{{template "admin/navbar" .}}
-
+
@@ -49,6 +52,14 @@
{{ scope.row.UnitPrice }}
+
+
+ {{
+ scope.row.IsAvailableStr
+ }}
+
+
@@ -60,7 +71,10 @@
- {{
+ {{
+ $t('resourcesManagement.toSetPriceAndOnShelf')
+ }}
+ {{
$t('resourcesManagement.toSetPriceAndOnShelf')
}}
@@ -71,9 +85,12 @@
}}
- {{
+ {{
$t('resourcesManagement.toOnShelf')
}}
+ {{
+ $t('resourcesManagement.toSetPriceAndOnShelf')
+ }}
@@ -132,6 +149,8 @@ export default {
queueList: [{ k: '', v: this.$t('resourcesManagement.allResQueue') }],
selStatus: '',
statusList: [{ k: '', v: this.$t('resourcesManagement.allStatus') }, ...SPECIFICATION_STATUS],
+ selAvailable: '',
+ availableList: [{ k: '', v: this.$t('resourcesManagement.resourceSpecificationIsAvailableAll') }, { k: '1', v: this.$t('resourcesManagement.available') }, { k: '2', v: this.$t('resourcesManagement.notAvailable') }],
clusterList: [...CLUSTERS],
accCardTypeList: [...ACC_CARD_TYPE],
syncLoading: false,
@@ -178,6 +197,7 @@ export default {
const params = {
queue: this.selQueue,
status: this.selStatus,
+ available: this.selAvailable,
page: this.pageInfo.curpage,
pagesize: this.pageInfo.pageSize,
};
@@ -201,6 +221,8 @@ export default {
UpdatedTimeStr: formatDate(new Date(Spec.UpdatedTime * 1000), 'yyyy-MM-dd HH:mm:ss'),
Status: Spec.Status.toString(),
StatusStr: getListValueWithKey(this.statusList, Spec.Status.toString()),
+ IsAvailable: Spec.IsAvailable,
+ IsAvailableStr: Spec.IsAvailable ? this.$t('resourcesManagement.available') : this.$t('resourcesManagement.notAvailable'),
}
});
this.tableData = data;
@@ -280,6 +302,11 @@ export default {
type: 'info',
message: this.$t('resourcesManagement.onShelfCode1001')
});
+ } else if (type === 'on-shelf' && res.Code === 1003) {
+ this.$message({
+ type: 'info',
+ message: this.$t('resourcesManagement.onShelfCode1003')
+ });
} else {
this.$message({
type: 'error',