From e3f9d874162272f7b2ad64f15ce77fa1a40b28a3 Mon Sep 17 00:00:00 2001
From: ihzero <ihzero@163.com>
Date: Fri, 3 Feb 2023 16:18:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/monitor/components/LiveBroadcast.vue | 23 +++++++-------
 .../main/monitor/components/Playback.vue      | 30 +++++++++++--------
 src/views/main/monitor/index.vue              |  6 ++--
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/src/views/main/monitor/components/LiveBroadcast.vue b/src/views/main/monitor/components/LiveBroadcast.vue
index ee3da624..5cb682a6 100644
--- a/src/views/main/monitor/components/LiveBroadcast.vue
+++ b/src/views/main/monitor/components/LiveBroadcast.vue
@@ -1,16 +1,19 @@
 <template>
   <div>
     <BasicForm @register="registerForm" />
-    <List
-      :grid="{ gutter: 16, xs: 1, sm: 2, md: 2, lg: 3, xl: 4, xxl: 5, column: 8 }"
-      :data-source="list"
-    >
-      <template #renderItem="{ item }">
-        <List-item>
-          <LiveBroadcastItem :url="socketUrl" :item="item" />
-        </List-item>
-      </template>
-    </List>
+    <div class="min-h-400px">
+      <List
+        :grid="{ gutter: 16, xs: 1, sm: 2, md: 2, lg: 3, xl: 4, xxl: 5, column: 8 }"
+        :data-source="list"
+      >
+        <template #renderItem="{ item }">
+          <List-item>
+            <LiveBroadcastItem :url="socketUrl" :item="item" />
+          </List-item>
+        </template>
+      </List>
+    </div>
+
     <div class="text-right">
       <a-pagination
         size="small"
diff --git a/src/views/main/monitor/components/Playback.vue b/src/views/main/monitor/components/Playback.vue
index 385b1213..81fcc42d 100644
--- a/src/views/main/monitor/components/Playback.vue
+++ b/src/views/main/monitor/components/Playback.vue
@@ -1,16 +1,19 @@
 <template>
   <div>
     <BasicForm @register="registerForm" />
-    <List
-      :grid="{ gutter: 16, xs: 1, sm: 2, md: 2, lg: 3, xl: 4, xxl: 5, column: 8 }"
-      :data-source="list"
-    >
-      <template #renderItem="{ item }">
-        <List-item>
-          <LiveBroadcastItem :recommend="false" :url="socketUrl" :item="item" />
-        </List-item>
-      </template>
-    </List>
+    <div class="min-h-400px">
+      <List
+        :grid="{ gutter: 16, xs: 1, sm: 2, md: 2, lg: 3, xl: 4, xxl: 5, column: 8 }"
+        :data-source="list"
+      >
+        <template #renderItem="{ item }">
+          <List-item>
+            <LiveBroadcastItem :recommend="false" :url="socketUrl" :item="item" />
+          </List-item>
+        </template>
+      </List>
+    </div>
+
     <div class="text-right">
       <a-pagination
         size="small"
@@ -111,7 +114,10 @@
       component: 'RangePicker',
       required: true,
       componentProps: {
-        format: 'YYYY-MM-DD',
+        format: 'YYYY-MM-DD HH:mm',
+        showTime: {
+          format: 'HH:mm',
+        },
         placeholder: ['开始时间', '结束时间'],
         disabledDate: (current) => {
           return current && current > dayjs().endOf('day')
@@ -174,7 +180,7 @@
           const { username, password, ip, passage } = cur.extends
           cur.extends.rtsp_url = `rtsp://${username}:${password}@${ip}:9200/cam/playback?channel=${passage}&subtype=0&starttime=${dayjs(
             params.start_time,
-          ).format('YYYY_MM_DD_HH_mm_ss')}&endtime=${dayjs(params.start_time).format(
+          ).format('YYYY_MM_DD_HH_mm_ss')}&endtime=${dayjs(params.end_time).format(
             'YYYY_MM_DD_HH_mm_ss',
           )}`
           console.log(cur.extends.rtsp_url)
diff --git a/src/views/main/monitor/index.vue b/src/views/main/monitor/index.vue
index b3809721..71833f19 100644
--- a/src/views/main/monitor/index.vue
+++ b/src/views/main/monitor/index.vue
@@ -5,11 +5,9 @@
         <template v-for="item in achieveList" :key="item.key">
           <a-tab-pane>
             <template #tab>
-              <span>
-                <component :is="item.iconComponent" />
-                {{ item.name }}</span
-              >
+              <span> {{ item.name }}</span>
             </template>
+
             <component :is="item.component" />
           </a-tab-pane>
         </template>