From b1f418906f7f3b3270d23a80cb5cbc995f399a31 Mon Sep 17 00:00:00 2001
From: JINGYJ <1458671527@qq.com>
Date: Fri, 13 Jun 2025 10:35:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=B1=BB=E5=9E=8B=E4=B8=80=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataView/components/Type1ObjectDetect.vue | 36 +++++++++++--------
 .../components/Type3CigaretteOffer.vue        | 27 ++++++++++----
 2 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/src/views/dataView/components/Type1ObjectDetect.vue b/src/views/dataView/components/Type1ObjectDetect.vue
index 2229f4d..d43c295 100644
--- a/src/views/dataView/components/Type1ObjectDetect.vue
+++ b/src/views/dataView/components/Type1ObjectDetect.vue
@@ -8,16 +8,23 @@
 -->
 <template>
     <div class="type-first">
-        <!-- <div class="type-first-top">
-            <span>←</span> <span>递烟</span>
-        </div> -->
-        <div class="type-first-mid">
-            <div class="type-first-mid-box" v-for="(item, index) in info">
+        <div class="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-4 type-first-mid">
+            <div class="type-first-mid-box" v-for="(item, index) in info" :key="index">
                 <div class="type-first-mid-box-video">
-                    <img src="https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg" class="w-[100%] h-[100%]"/>
+                    <video
+                        class="w-[100%] h-[100%]"
+                        :src="item.video_url"
+                        controls
+                    ></video>
                 </div>
-                <div class="type-first-mid-box-text">
-                    123123
+                <div class="type-first-mid-box-text" v-if="title === '酒精度数'">
+                    <span>酒精度数:</span> <span style="font-weight: normal;">{{ item['酒精度数'] }}</span>
+                </div>
+                <div class="type-first-mid-box-text" v-else-if="title === '语音角色'">
+                    <span>语音角色:</span> <span style="font-weight: normal;">{{ item['语音角色'] }}</span>
+                </div>
+                <div class="type-first-mid-box-text" v-else>
+                    <span>关键帧:</span> <span v-for="item1 in item[`${title}时间`]" style="font-weight: normal;">{{ item1 }}</span>
                 </div>
             </div>
         </div>
@@ -52,13 +59,14 @@ const props = withDefaults(defineProps < Props > (), {
         color: #1D2129;
     }
     .type-first-mid {
-        display: flex;
-        justify-self: start;
-        justify-content: space-between;
-        align-content: space-between;
-        flex-direction: row;
-        flex-wrap: wrap;
+        // display: flex;
+        // justify-self: start;
+        // justify-content: space-between;
+        // align-content: space-between;
+        // flex-direction: row;
+        // flex-wrap: wrap;
         height: 744px;
+        overflow-y: auto;
         .type-first-mid-box {
             box-sizing: border-box;
             width: 348px;
diff --git a/src/views/dataView/components/Type3CigaretteOffer.vue b/src/views/dataView/components/Type3CigaretteOffer.vue
index 5a053fc..65c09f7 100644
--- a/src/views/dataView/components/Type3CigaretteOffer.vue
+++ b/src/views/dataView/components/Type3CigaretteOffer.vue
@@ -8,12 +8,16 @@
 -->
 <template>
     <div class="type-fourth">
-        <div class="type-fourth-top">
+        <!-- <div class="type-fourth-top">
             <span>←</span> <span>车牌识别</span>
-        </div>
+        </div> -->
         <div class="type-fourth-mid">
             <div class="type-fourth-mid-video">
-                <img src="https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg" class="w-[100%] h-[100%]"/>
+                <video
+                    class="w-[720px] h-[100%]"
+                    :src="info[0].video_url"
+                    controls
+                    ></video>
             </div>
             <div class="type-fourth-mid-tab">
                 <el-button  class="w-[76px] h-[32px!important]">全部</el-button>
@@ -21,7 +25,7 @@
                 <el-button  class="w-[76px] h-[32px!important]">车辆</el-button>
                 <el-button  class="w-[76px] h-[32px!important]">路灯</el-button>
             </div>
-            <div class="type-fourth-mid-box">
+            <!-- <div class="type-fourth-mid-box">
                 <div class="type-fourth-mid-crad" v-for="(item, index) in 8">
                     <div class="type-fourth-mid-crad-image">
                         <img src="https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg" class="w-[100%] h-[100%]"/>
@@ -30,15 +34,26 @@
                         123123
                     </div>
                 </div>
-            </div>
+            </div> -->
         </div>
         <div class="type-fourth-bottom"></div>
     </div>
 </template>
-<script setup>
+<script lang="ts" setup>
 defineOptions({
   name: "Type3CigaretteOfferWarp"
 });
+interface Props {
+  typeKey: String;
+  info: Record<string, any>;
+  title: String;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  typeKey: "3",
+  info: {},
+  title: String,
+});
 </script>
 <style lang="scss" scoped>
 .type-fourth {