From a44195517d8674e7f9563f1a0a3b098593a0df25 Mon Sep 17 00:00:00 2001
From: ihzero <ihzero@163.com>
Date: Fri, 9 Dec 2022 17:16:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=91=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/meteorological/components/AirHumidity.vue   |  7 -------
 .../meteorological/components/AirTemperature.vue     |  7 -------
 src/views/main/meteorological/components/CO2.vue     |  7 -------
 .../meteorological/components/LightIntensity.vue     |  7 -------
 src/views/main/meteorological/components/Noise.vue   |  7 -------
 src/views/main/meteorological/components/PM10.vue    |  7 -------
 src/views/main/meteorological/components/PM25.vue    |  7 -------
 .../main/meteorological/components/Pressure.vue      |  7 -------
 .../main/meteorological/components/Rainfall.vue      |  7 -------
 .../main/meteorological/components/WindDirection.vue |  7 -------
 .../main/meteorological/components/WindSpeed.vue     |  7 -------
 src/views/main/monitor/components/LiveBroadcast.vue  |  5 +++--
 src/views/visualization/components/JK.vue            | 11 +++++++++--
 src/views/visualization/components/VideoFlv.vue      | 12 +++++++-----
 14 files changed, 19 insertions(+), 86 deletions(-)

diff --git a/src/views/main/meteorological/components/AirHumidity.vue b/src/views/main/meteorological/components/AirHumidity.vue
index 7a3697e3..03a11927 100644
--- a/src/views/main/meteorological/components/AirHumidity.vue
+++ b/src/views/main/meteorological/components/AirHumidity.vue
@@ -98,13 +98,6 @@
               },
             },
           ],
-          dataZoom: [
-            {
-              type: 'inside', //slider表示有滑动块的，inside表示内置的
-              show: false,
-              xAxisIndex: 0,
-            },
-          ],
         })
       }
     },
diff --git a/src/views/main/meteorological/components/AirTemperature.vue b/src/views/main/meteorological/components/AirTemperature.vue
index 0dedc657..c81ebd82 100644
--- a/src/views/main/meteorological/components/AirTemperature.vue
+++ b/src/views/main/meteorological/components/AirTemperature.vue
@@ -111,13 +111,6 @@
               },
             },
           ],
-          dataZoom: [
-            {
-              type: 'inside', //slider表示有滑动块的，inside表示内置的
-              show: false,
-              xAxisIndex: 0,
-            },
-          ],
         })
       }
     },
diff --git a/src/views/main/meteorological/components/CO2.vue b/src/views/main/meteorological/components/CO2.vue
index 6b233477..741f25e7 100644
--- a/src/views/main/meteorological/components/CO2.vue
+++ b/src/views/main/meteorological/components/CO2.vue
@@ -97,13 +97,6 @@
               },
             },
           ],
-          dataZoom: [
-            {
-              type: 'inside', //slider表示有滑动块的，inside表示内置的
-              show: false,
-              xAxisIndex: 0,
-            },
-          ],
         })
       }
     },
diff --git a/src/views/main/meteorological/components/LightIntensity.vue b/src/views/main/meteorological/components/LightIntensity.vue
index 63f70b5c..8dcfce8c 100644
--- a/src/views/main/meteorological/components/LightIntensity.vue
+++ b/src/views/main/meteorological/components/LightIntensity.vue
@@ -95,13 +95,6 @@
               data: Object.values(e),
             },
           ],
-          dataZoom: [
-            {
-              type: 'inside', //slider表示有滑动块的，inside表示内置的
-              show: false,
-              xAxisIndex: 0,
-            },
-          ],
         })
       }
     },
diff --git a/src/views/main/meteorological/components/Noise.vue b/src/views/main/meteorological/components/Noise.vue
index 5ad65558..0c6074d8 100644
--- a/src/views/main/meteorological/components/Noise.vue
+++ b/src/views/main/meteorological/components/Noise.vue
@@ -97,13 +97,6 @@
               },
             },
           ],
-          dataZoom: [
-            {
-              type: 'inside', //slider表示有滑动块的，inside表示内置的
-              show: false,
-              xAxisIndex: 0,
-            },
-          ],
         })
       }
     },
diff --git a/src/views/main/meteorological/components/PM10.vue b/src/views/main/meteorological/components/PM10.vue
index 15290813..99f7fb23 100644
--- a/src/views/main/meteorological/components/PM10.vue
+++ b/src/views/main/meteorological/components/PM10.vue
@@ -97,13 +97,6 @@
               },
             },
           ],
-          dataZoom: [
-            {
-              type: 'inside', //slider表示有滑动块的，inside表示内置的
-              show: false,
-              xAxisIndex: 0,
-            },
-          ],
         })
       }
     },
diff --git a/src/views/main/meteorological/components/PM25.vue b/src/views/main/meteorological/components/PM25.vue
index ba49cf4f..da4fa011 100644
--- a/src/views/main/meteorological/components/PM25.vue
+++ b/src/views/main/meteorological/components/PM25.vue
@@ -97,13 +97,6 @@
               },
             },
           ],
-          dataZoom: [
-            {
-              type: 'inside', //slider表示有滑动块的，inside表示内置的
-              show: false,
-              xAxisIndex: 0,
-            },
-          ],
         })
       }
     },
diff --git a/src/views/main/meteorological/components/Pressure.vue b/src/views/main/meteorological/components/Pressure.vue
index 2ac13365..4a8a3407 100644
--- a/src/views/main/meteorological/components/Pressure.vue
+++ b/src/views/main/meteorological/components/Pressure.vue
@@ -97,13 +97,6 @@
               },
             },
           ],
-          dataZoom: [
-            {
-              type: 'inside', //slider表示有滑动块的，inside表示内置的
-              show: false,
-              xAxisIndex: 0,
-            },
-          ],
         })
       }
     },
diff --git a/src/views/main/meteorological/components/Rainfall.vue b/src/views/main/meteorological/components/Rainfall.vue
index 88a8fff1..35d00627 100644
--- a/src/views/main/meteorological/components/Rainfall.vue
+++ b/src/views/main/meteorological/components/Rainfall.vue
@@ -95,13 +95,6 @@
               data: Object.values(e),
             },
           ],
-          dataZoom: [
-            {
-              type: 'inside', //slider表示有滑动块的，inside表示内置的
-              show: false,
-              xAxisIndex: 0,
-            },
-          ],
         })
       }
     },
diff --git a/src/views/main/meteorological/components/WindDirection.vue b/src/views/main/meteorological/components/WindDirection.vue
index f03cb65d..63f4e9e1 100644
--- a/src/views/main/meteorological/components/WindDirection.vue
+++ b/src/views/main/meteorological/components/WindDirection.vue
@@ -118,13 +118,6 @@
               data: Object.values(e),
             },
           ],
-          dataZoom: [
-            {
-              type: 'inside', //slider表示有滑动块的，inside表示内置的
-              show: false,
-              xAxisIndex: 0,
-            },
-          ],
         })
       }
     },
diff --git a/src/views/main/meteorological/components/WindSpeed.vue b/src/views/main/meteorological/components/WindSpeed.vue
index 2557cc10..9c61c426 100644
--- a/src/views/main/meteorological/components/WindSpeed.vue
+++ b/src/views/main/meteorological/components/WindSpeed.vue
@@ -111,13 +111,6 @@
               },
             },
           ],
-          dataZoom: [
-            {
-              type: 'inside', //slider表示有滑动块的，inside表示内置的
-              show: false,
-              xAxisIndex: 0,
-            },
-          ],
         })
       }
     },
diff --git a/src/views/main/monitor/components/LiveBroadcast.vue b/src/views/main/monitor/components/LiveBroadcast.vue
index 35bd030b..ee3da624 100644
--- a/src/views/main/monitor/components/LiveBroadcast.vue
+++ b/src/views/main/monitor/components/LiveBroadcast.vue
@@ -19,6 +19,7 @@
         :total="pageTotal"
         show-less-items
         showSizeChanger
+        :pageSizeOptions="['8']"
         :show-total="(total) => `共 ${total} 条数据`"
         @change="getData"
       />
@@ -129,8 +130,8 @@
     setup() {
       const paginationParams = reactive({
         pageCurrent: 1,
-        pageTotal: 5000,
-        pageSize: 10,
+        pageTotal: 0,
+        pageSize: 8,
       })
 
       const list = ref([])
diff --git a/src/views/visualization/components/JK.vue b/src/views/visualization/components/JK.vue
index a9c8aade..f88f4ce6 100644
--- a/src/views/visualization/components/JK.vue
+++ b/src/views/visualization/components/JK.vue
@@ -33,15 +33,21 @@
       </div>
       <div class="flex-1 px-11px flex flex-col">
         <div class="flex-1">
-          <VideoFlv v-if="currentVido" :url="currentVido.url" :name="currentVido.base_name" />
+          <VideoFlv
+            class="cursor-pointer"
+            v-if="currentVido"
+            :url="currentVido.url"
+            :name="currentVido.base_name"
+          />
         </div>
         <div class="grid grid-cols-3 gap-x-6px my-10px">
           <div class="h-66px" v-for="item in list" :key="item.id">
             <VideoFlv
+              class="cursor-pointer"
               :url="item.url"
               :name="item.base_name"
               :screen="false"
-              @click.prevent.stop="onChangeVideo(item)"
+              @onClick="onChangeVideo(item)"
             />
             <!-- <img
               :src="item.img"
@@ -131,6 +137,7 @@
       }
 
       function onChangeVideo(e) {
+        if (currentVido.value.url == e.url) return
         currentVido.value = e
       }
 
diff --git a/src/views/visualization/components/VideoFlv.vue b/src/views/visualization/components/VideoFlv.vue
index 062677f9..83b3f555 100644
--- a/src/views/visualization/components/VideoFlv.vue
+++ b/src/views/visualization/components/VideoFlv.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="w-full h-full relative">
-    <SvgIcon
+    <!-- <SvgIcon
       v-if="isScreen && false"
       name="full-screen"
       class="text-white absolute left-15px top-15px z-20 cursor-pointer"
       size="20"
       @click="visibleModal = true"
-    />
+    /> -->
 
     <video class="w-full h-full" autoplay controls ref="videoRef" muted></video>
     <div class="absolute left-0 w-full top-0 h-full" @click.prevent.stop="onScreen"></div>
@@ -24,12 +24,12 @@
 <script lang="ts">
   import flvjs from 'flv.js'
   import { defineComponent, ref, unref, onMounted, watch, onBeforeUnmount, computed } from 'vue'
-  import { SvgIcon } from '/@/components/Icon'
+  // import { SvgIcon } from '/@/components/Icon'
   import LinkModal from '../LinkModal.vue'
   export default defineComponent({
     name: 'VideoFlv',
     components: {
-      SvgIcon,
+      // SvgIcon,
       LinkModal,
     },
     props: {
@@ -46,7 +46,7 @@
         default: '',
       },
     },
-    setup(props) {
+    setup(props, { emit }) {
       const videoRef = ref<HTMLDivElement | null>(null)
       let player: any | null = null
       const pUrl = ref(props.url)
@@ -80,6 +80,8 @@
       function onScreen() {
         if (isScreen.value) {
           visibleModal.value = true
+        } else {
+          emit('onClick')
         }
       }