diff --git a/src/api/cabinet/smart-cabinet.ts b/src/api/cabinet/smart-cabinet.ts
index b114e33..8de20fe 100644
--- a/src/api/cabinet/smart-cabinet.ts
+++ b/src/api/cabinet/smart-cabinet.ts
@@ -43,6 +43,8 @@ export interface SmartCabinetDTO {
operator?: string;
/** 归属类型(0-借还柜 1-固资通) */
belongType?: number;
+ usedCells?: number;
+ availableCells?: number;
}
/**
diff --git a/src/utils/cabinetImgMap.ts b/src/utils/cabinetImgMap.ts
index 15a34a1..639bfac 100644
--- a/src/utils/cabinetImgMap.ts
+++ b/src/utils/cabinetImgMap.ts
@@ -1,38 +1,38 @@
export const CabinetImgMap = {
1: {
img: "cabinet_16.jpg",
- name: "16口机柜",
+ name: "16格柜",
},
2: {
img: "cabinet_20.jpg",
- name: "20口机柜",
+ name: "20格柜",
},
3: {
img: "cabinet_22.jpg",
- name: "22口机柜",
+ name: "22格柜",
},
4: {
img: "cabinet_24.jpg",
- name: "24口机柜",
+ name: "24格柜",
},
5: {
img: "cabinet_40.jpg",
- name: "40口机柜",
+ name: "40格柜",
},
6: {
img: "cabinet_48.jpg",
- name: "48口机柜",
+ name: "48格柜",
},
7: {
img: "cabinet_60.jpg",
- name: "60口机柜",
+ name: "60格柜",
},
8: {
img: "cabinet_120.jpg",
- name: "120口机柜",
+ name: "120格柜",
},
9: {
img: "cabinet_4.jpg",
- name: "4口机柜",
+ name: "4格柜",
},
}
\ No newline at end of file
diff --git a/src/views/cabinet/shop/index.vue b/src/views/cabinet/shop/index.vue
index c4de39b..f49756c 100644
--- a/src/views/cabinet/shop/index.vue
+++ b/src/views/cabinet/shop/index.vue
@@ -93,7 +93,7 @@ const handleBulkDelete = async () => {
try {
await ElMessageBox.confirm(
- `确认删除选中的${multipleSelection.value.length}家商店吗?`,
+ `确认删除选中的${multipleSelection.value.length}家地址吗?`,
"警告",
{ confirmButtonText: "确定", cancelButtonText: "取消", type: "warning" }
);
@@ -138,7 +138,7 @@ getList();
-
@@ -151,7 +151,7 @@ getList();
- 新增商店
+ 新增地址
@@ -160,8 +160,8 @@ getList();
-
-
+
+
diff --git a/src/views/cabinet/shop/shop-form-modal.vue b/src/views/cabinet/shop/shop-form-modal.vue
index 1d634a3..aad9270 100644
--- a/src/views/cabinet/shop/shop-form-modal.vue
+++ b/src/views/cabinet/shop/shop-form-modal.vue
@@ -23,7 +23,7 @@ const formData = ref({
});
const rules = {
- shopName: [{ required: true, message: "请输入商店名称", trigger: "blur" }]
+ shopName: [{ required: true, message: "请输入地址名称", trigger: "blur" }]
};
watch(
@@ -70,14 +70,14 @@ const handleClose = () => {
-
-
+
-
-
+
+
diff --git a/src/views/cabinet/smart-cabinet-card/index.vue b/src/views/cabinet/smart-cabinet-card/index.vue
index 14488e7..0741ba1 100644
--- a/src/views/cabinet/smart-cabinet-card/index.vue
+++ b/src/views/cabinet/smart-cabinet-card/index.vue
@@ -124,17 +124,23 @@ onMounted(() => {
-
+
![]()
-
- 柜体名称:{{ item.cabinetName }}
+
+ 名称:{{ item.cabinetName }}
+
+ 模式:{{ '支付模式' }}
- 模板:{{ CabinetImgMap[item.templateNo]?.name || '-' }}
+ 格式:{{ CabinetImgMap[item.templateNo]?.name || '-' }}
- 商店:{{ item.shopName || '-' }}
+ 已用:{{ item.usedCells }}
+
+ 未用:{{ item.availableCells }}
+
+ 柜址:{{ item.shopName || '-' }}
@@ -176,7 +182,7 @@ onMounted(() => {
justify-content: space-between;
.cabinet-image {
- width: 100%;
+ width: 55%;
height: 200px;
object-fit: contain;
border-radius: 4px;
@@ -185,10 +191,13 @@ onMounted(() => {
.card-content {
flex: 1;
- margin: 15px 0px;
+ margin: 0px;
+ display: flex;
+ flex-direction: row;
.cabinet-info {
text-align: left;
+ padding: 16px 0px;
.name,
.type,
@@ -198,7 +207,7 @@ onMounted(() => {
width: 100%;
font-size: 14px;
color: #606266;
- margin-bottom: 6px;
+ margin-bottom: 12px;
line-height: 1;
text-align: left;
}