From b1953368766aa262f618c3937fac8be5a4ca396d Mon Sep 17 00:00:00 2001 From: dzq Date: Sat, 17 May 2025 09:57:22 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A04=E5=8F=A3=E6=9C=BA?= =?UTF-8?q?=E6=9F=9C=E5=9B=BE=E7=89=87=E5=B9=B6=E6=9B=B4=E6=96=B0=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增4口机柜图片文件 - 在cabinetImgMap.ts中添加4口机柜的映射 - 更新useTag.ts中的路由匹配逻辑,增加对query.id的判断 - 在smart-cabinet-card/index.vue和ab98/index.vue中添加多标签页支持 - 修改goods-edit-modal.vue中的删除逻辑,并调整弹窗为抽屉样式 - 在smart-cabinet-card/detail.vue中添加格口管理功能,支持配置商品、库存和下架操作 --- public/img/cabinet/cabinet_4.jpg | Bin 0 -> 36835 bytes src/layout/components/tag/index.vue | 89 +++------ src/layout/hooks/useTag.ts | 6 +- src/utils/cabinetImgMap.ts | 4 + .../cabinet/smart-cabinet-card/detail.vue | 184 +++++++++++++++++- .../cabinet/smart-cabinet-card/index.vue | 11 ++ src/views/shop/goods/goods-edit-modal.vue | 26 ++- src/views/shop/goods/index.vue | 4 +- src/views/user/ab98/index.vue | 13 +- 9 files changed, 260 insertions(+), 77 deletions(-) create mode 100644 public/img/cabinet/cabinet_4.jpg diff --git a/public/img/cabinet/cabinet_4.jpg b/public/img/cabinet/cabinet_4.jpg new file mode 100644 index 0000000000000000000000000000000000000000..be17c497969adf42822b74d315326b9b3334dfca GIT binary patch literal 36835 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 S&9eUhsP#Jywr~FafB)GdG8c&e literal 0 HcmV?d00001 diff --git a/src/layout/components/tag/index.vue b/src/layout/components/tag/index.vue index 9024b83..d9e3825 100644 --- a/src/layout/components/tag/index.vue +++ b/src/layout/components/tag/index.vue @@ -92,15 +92,15 @@ const moveToView = async (index: number): Promise => { } else if ( tabItemElOffsetLeft > -translateX.value && tabItemElOffsetLeft + tabItemOffsetWidth < - -translateX.value + scrollbarDomWidth + -translateX.value + scrollbarDomWidth ) { // 标签在可视区域 translateX.value = Math.min( 0, scrollbarDomWidth - - tabItemOffsetWidth - - tabItemElOffsetLeft - - tabNavPadding + tabItemOffsetWidth - + tabItemElOffsetLeft - + tabNavPadding ); } else { // 标签在可视区域右侧 @@ -455,7 +455,10 @@ function tagOnClick(item) { router.push({ name }); } } else { - router.push({ path }); + router.push({ + path, + query: item.query + }); } // showMenuModel(item?.path, item?.query); } @@ -516,43 +519,25 @@ onBeforeUnmount(() => {

-
- +
+ {{ item.meta.title }} - + - +
@@ -561,17 +546,8 @@ onBeforeUnmount(() => { -
    -
    +
      +
    • {{ item.text }} @@ -580,23 +556,14 @@ onBeforeUnmount(() => {
    - + @@ -123,15 +286,18 @@ onMounted(() => { .flex-container { display: flex; flex: 1; - gap: 20px; + gap: 12px; min-height: 0; .cabinet-info-card { - width: 30%; + width: 20%; + height: 88vh; } .info-card { - width: 70%; + width: 80%; + height: 88vh; + overflow-y: auto; } } diff --git a/src/views/cabinet/smart-cabinet-card/index.vue b/src/views/cabinet/smart-cabinet-card/index.vue index 6a2be11..ce89f0f 100644 --- a/src/views/cabinet/smart-cabinet-card/index.vue +++ b/src/views/cabinet/smart-cabinet-card/index.vue @@ -12,6 +12,7 @@ import Refresh from "@iconify-icons/ep/refresh"; import View from "@iconify-icons/ep/view"; import AddFill from "@iconify-icons/ri/add-circle-line"; import SmartCabinetCardFormModal from "./smart-cabinet-card-form-modal.vue"; +import { useMultiTagsStoreHook } from "@/store/modules/multiTags"; const { VITE_PUBLIC_IMG_PATH: IMG_PATH } = import.meta.env; defineOptions({ @@ -62,6 +63,16 @@ const resetForm = formEl => { }; const handleViewDetail = (row: SmartCabinetDTO) => { + // 保存信息到标签页 + useMultiTagsStoreHook().handleTags("push", { + path: `/cabinet/card/detail`, + name: "smartCabinetCardDetail", + query: { id: row.cabinetId }, + meta: { + title: `${row.cabinetName}`, + dynamicLevel: 3 + } + }); router.push({ path: '/cabinet/card/detail', query: { diff --git a/src/views/shop/goods/goods-edit-modal.vue b/src/views/shop/goods/goods-edit-modal.vue index 24d4931..29a1536 100644 --- a/src/views/shop/goods/goods-edit-modal.vue +++ b/src/views/shop/goods/goods-edit-modal.vue @@ -2,10 +2,11 @@ import { ref, reactive, watch } from "vue"; import { ElMessage, FormRules } from "element-plus"; import { useRenderIcon } from "@/components/ReIcon/src/hooks"; -import { GoodsDTO, updateGoodsApi, addGoodsApi } from "@/api/shop/goods"; +import { GoodsDTO, updateGoodsApi, addGoodsApi, deleteGoodsApi } from "@/api/shop/goods"; import { CategoryDTO, getCategoryAllApi } from "@/api/shop/category"; import Confirm from "@iconify-icons/ep/check"; import Upload from "@iconify-icons/ep/upload"; +import Delete from "@iconify-icons/ep/delete"; const { VITE_APP_BASE_API } = import.meta.env; const props = defineProps({ @@ -121,10 +122,20 @@ watch( if (val) initForm(); } ); +const handleDelete = async () => { + try { + await deleteGoodsApi(formData.goodsId); + ElMessage.success("删除成功"); + emit("refresh"); + closeDialog(); + } catch (error) { + console.error("删除失败", error); + } +};