From af55d475ac20226f1345f98b3cb73d4b0e4317eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=92=8A?= Date: Mon, 31 Jul 2023 16:22:42 +0800 Subject: [PATCH] =?UTF-8?q?lz=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87=E7=9B=B4?= =?UTF-8?q?=E6=92=AD=E7=82=B9=E5=87=BB=E6=92=AD=E6=94=BE1-20230731?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/GMap.vue | 24 +- src/components/livestream-newOthers.vue | 419 ++++++++++++++++++++++++ src/pages/page-web/projects/tsa.vue | 7 + 3 files changed, 449 insertions(+), 1 deletion(-) create mode 100644 src/components/livestream-newOthers.vue diff --git a/src/components/GMap.vue b/src/components/GMap.vue index a57065a..013720e 100644 --- a/src/components/GMap.vue +++ b/src/components/GMap.vue @@ -139,6 +139,14 @@ {{ 10 > (deviceInfo.device.battery.remain_flight_time % 60) ? '0' : ''}}{{deviceInfo.device.battery.remain_flight_time % 60 }} +
+
直播视频
+
+
+ + + +
@@ -445,16 +453,19 @@ import M30 from '/@/assets/icons/m30.png' import { BorderOutlined, LineOutlined, CloseOutlined, ControlOutlined, TrademarkOutlined, ArrowDownOutlined, ThunderboltOutlined, SignalFilled, GlobalOutlined, HistoryOutlined, CloudUploadOutlined, RocketOutlined, - FieldTimeOutlined, CloudOutlined, CloudFilled, FolderOpenOutlined, RobotFilled, ArrowUpOutlined, CarryOutOutlined + FieldTimeOutlined, CloudOutlined, CloudFilled, FolderOpenOutlined, RobotFilled, ArrowUpOutlined, CarryOutOutlined, + EyeInvisibleOutlined } from '@ant-design/icons-vue' import { EDeviceTypeName } from '../types' import DockControlPanel from './g-map/DockControlPanel.vue' import { useDockControl } from './g-map/use-dock-control' import DroneControlPanel from './g-map/DroneControlPanel.vue' import { useConnectMqtt } from './g-map/use-connect-mqtt' +import LiveNewOthers from '/@/components/livestream-newOthers.vue' export default defineComponent({ components: { + LiveNewOthers, BorderOutlined, LineOutlined, CloseOutlined, @@ -484,6 +495,8 @@ export default defineComponent({ const useGMapManageHook = useGMapManage() const deviceTsaUpdateHook = deviceTsaUpdate() const root = getRoot() + // const routeName = ref('LiveOthers') + const showLive = ref(false) const mouseMode = ref(false) const store = useMyStore() @@ -641,6 +654,11 @@ export default defineComponent({ useMouseToolHook.mouseTool(type, getDrawCallback) mouseMode.value = bool } + function play () { + console.log(222) + // routeName.value = 'LiveOthers' + showLive.value = true + } // dock 控制面板 const { @@ -813,8 +831,12 @@ export default defineComponent({ } } } + return { draw, + play, + showLive, + // routeName, mouseMode, drawVisible, osdVisible, diff --git a/src/components/livestream-newOthers.vue b/src/components/livestream-newOthers.vue new file mode 100644 index 0000000..c05834a --- /dev/null +++ b/src/components/livestream-newOthers.vue @@ -0,0 +1,419 @@ + + + + + diff --git a/src/pages/page-web/projects/tsa.vue b/src/pages/page-web/projects/tsa.vue index 9ab2216..0258b24 100644 --- a/src/pages/page-web/projects/tsa.vue +++ b/src/pages/page-web/projects/tsa.vue @@ -139,6 +139,7 @@
+
设备测试
@@ -344,6 +345,12 @@ function readHms (visiable: boolean, sn: string) { }) } } + +function cheshi () { + osdVisible.value.visible = true + store.commit('SET_OSD_VISIBLE_INFO', osdVisible) + console.log(osdVisible.value.visible) +}