From e81eae6c8446bbd91c162b5ef3e42051b5523bf1 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 11 七月 2025 09:39:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 manager/src/views/kitchen/kitchenVideo.vue |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/manager/src/views/kitchen/kitchenVideo.vue b/manager/src/views/kitchen/kitchenVideo.vue
index 7af33c0..c6b2b7f 100644
--- a/manager/src/views/kitchen/kitchenVideo.vue
+++ b/manager/src/views/kitchen/kitchenVideo.vue
@@ -252,9 +252,12 @@
         @on-selection-change="showSelect"
       >
         <template slot-scope="{ row, index }" slot="typeList">
-          <div v-for="(tag, index) in row.typeList" :key="'tag' + index" style="margin-top: 5px">
-            <Tag color="red">{{ tag.typeName }}</Tag>
+          <div style="display: flex;flex-wrap: wrap">
+            <div v-for="(tag, index) in row.typeList" :key="'tag' + index" style="margin-top: 5px">
+              <Tag color="red">{{ tag.typeName }}</Tag>
+            </div>
           </div>
+
         </template>
         <template slot-scope="{ row, index }" slot="videoFileKey">
           <div class="play-text" @click="playVideo(row.videoFileKey, row.title)">鐐瑰嚮鎾斁</div>
@@ -462,7 +465,7 @@
         {
           title: "瑙嗛鍒嗙被",
           key: "typeList",
-          width: 180,
+          width: 310,
           slot: "typeList",
         },
         {
@@ -521,6 +524,7 @@
           slot: "action",
           align: "center",
           width: 200,
+          fixed: "right",
         },
       ],
       data: [], // 琛ㄥ崟鏁版嵁

--
Gitblit v1.8.0