From 45ef08137ceb809b5ba21fec4569671be88e1750 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Thu, 18 Apr 2024 14:24:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- .../videoManagement/index.vue | 90 +++++++++++++------ 2 files changed, 64 insertions(+), 30 deletions(-) diff --git a/.env.development b/.env.development index 011d6f6..65cbf35 100644 --- a/.env.development +++ b/.env.development @@ -21,8 +21,8 @@ NODE_ENV = 'development' # 七参数标准版(测试平台) # VITE_API_URL = 'http://182.90.224.237:15551' # agjt -VITE_API_URL = 'http://47.93.215.234:9809' -# VITE_API_URL = 'http://jxj.zhgdyun.com:19812' +# VITE_API_URL = 'http://47.93.215.234:9809' +VITE_API_URL = 'http://jxj.zhgdyun.com:19812' # 上传 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' diff --git a/src/views/sevenLargeScreen/videoManagement/index.vue b/src/views/sevenLargeScreen/videoManagement/index.vue index 3eab0c9..057ff77 100644 --- a/src/views/sevenLargeScreen/videoManagement/index.vue +++ b/src/views/sevenLargeScreen/videoManagement/index.vue @@ -65,7 +65,7 @@ import Card from "@/components/card.vue"; import ysyPlayAndPlayback from "@/components/ysyPlayAndPlayback.vue"; -import { ref, onMounted, onBeforeUnmount, getCurrentInstance, nextTick, Ref } from "vue"; +import { ref, onMounted, onBeforeUnmount, getCurrentInstance, nextTick, Ref, onBeforeMount } from "vue"; import { ElMessage } from "element-plus"; import { GlobalStore } from "@/stores"; import { selectProjectVideoListApi, getSafeHatSessionApi } from "@/api/modules/video"; @@ -122,11 +122,19 @@ const goToSafeHelmet = async () => { // playMode: 0, // 0 预览 1回放 // layout: "1x1" //页面展示的模块数【16】 // }); +// let objData = ref({ +// appkey: "24017757", //海康提供的appkey +// ip: "182.101.141.23", //海康提供的ip +// secret: "VJz0FbzmE6drPQ7egsBi", //海康提供的secret +// port: 18443, +// playMode: 0, // 0 预览 1回放 +// layout: "1x1" //页面展示的模块数【16】 +// }); let objData = ref({ - appkey: "24017757", //海康提供的appkey - ip: "182.101.141.23", //海康提供的ip - secret: "VJz0FbzmE6drPQ7egsBi", //海康提供的secret - port: 18443, + appkey: "", //海康提供的appkey + ip: "", //海康提供的ip + secret: "", //海康提供的secret + port: 443, playMode: 0, // 0 预览 1回放 layout: "1x1" //页面展示的模块数【16】 }); @@ -152,29 +160,54 @@ const getVideoList = async () => { // all=1查全部 }); shipinList.value = res.result.videoList; - objData.value.appkey = res.result.videoList[0].appId; - objData.value.ip = res.result.videoList[0].account; - objData.value.secret = res.result.videoList[0].appSecret; - objData.value.port = +res.result.videoList[0].password; - cameraIndexCode.value = res.result.videoList[0].serialNumber; - // firstVideoId.value = res.result.videoList[0].serialNumber; - previewVideo(res.result.videoList[0].serialNumber); - console.log(objData.value); - console.log("视频列表", res); - ysyParams.value = res.result.videoList[0]; - videoType.value = res.result.videoList[0].videoType; - if (res.result.videoList[0].videoType === 1) { - oWebControl.JS_HideWnd(); - // 销毁当前播放的视频 - oWebControl.JS_RequestInterface({ funcName: "destroyWnd" }); - // 断开与插件服务连接 - oWebControl.JS_Disconnect(); + if(res.result.videoList[0].list){ + objData.value.appkey = res.result.videoList[0].list[0].appId; + objData.value.ip = res.result.videoList[0].list[0].account; + objData.value.secret = res.result.videoList[0].list[0].appSecret; + objData.value.port = +res.result.videoList[0].list[0].password; + cameraIndexCode.value = res.result.videoList[0].list[0].serialNumber; + // firstVideoId.value = res.result.videoList[0].serialNumber; + // previewVideo(res.result.videoList[0].list[0].serialNumber); + console.log(objData.value); + console.log("视频列表", res); + ysyParams.value = res.result.videoList[0].list[0]; + videoType.value = res.result.videoList[0].list[0].videoType; + if (res.result.videoList[0].list[0].videoType === 1) { + oWebControl.JS_HideWnd(); + // 销毁当前播放的视频 + oWebControl.JS_RequestInterface({ funcName: "destroyWnd" }); + // 断开与插件服务连接 + oWebControl.JS_Disconnect(); + } + } else { + objData.value.appkey = res.result.videoList[0].appId; + objData.value.ip = res.result.videoList[0].account; + objData.value.secret = res.result.videoList[0].appSecret; + objData.value.port = +res.result.videoList[0].password; + cameraIndexCode.value = res.result.videoList[0].serialNumber; + // firstVideoId.value = res.result.videoList[0].serialNumber; + // previewVideo(res.result.videoList[0].list[0].serialNumber); + console.log(objData.value); + console.log("视频列表", res); + ysyParams.value = res.result.videoList[0]; + videoType.value = res.result.videoList[0].videoType; + if (res.result.videoList[0].videoType === 1) { + oWebControl.JS_HideWnd(); + // 销毁当前播放的视频 + oWebControl.JS_RequestInterface({ funcName: "destroyWnd" }); + // 断开与插件服务连接 + oWebControl.JS_Disconnect(); + } } + }; +onBeforeMount(() => { + getVideoList(); +}) onMounted(async () => { - setTimeout(() => { - getVideoList(); - }, 2500); + initPlugin(); + // setTimeout(() => { + // }, 2500); // 获取页面的实例对象 ee const pageInstance = getCurrentInstance(); // 获取dom节点对象 @@ -205,10 +238,10 @@ onMounted(async () => { // // setWndCover(); // } }); + // await initPlugin(); // 初始化播放器插件 - nextTick(async () => { - initPlugin(); - }); + // nextTick(async () => { + // }); }); onBeforeUnmount(() => { @@ -301,6 +334,7 @@ const initPlugin = () => { // 初始化 const init = (callback: (() => void) | undefined) => { + console.log(objData.value,'我的视频服务器') getPubKey(() => { let appkey = objData.value.appkey; //综合安防管理平台提供的appkey，必填 let secret = setEncrypt(objData.value.secret); //综合安防管理平台提供的secret，必填 From adb597104743c33e779739348f354f57365aa8db Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Thu, 18 Apr 2024 14:25:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.env.development b/.env.development index 65cbf35..14c3efe 100644 --- a/.env.development +++ b/.env.development @@ -23,6 +23,8 @@ NODE_ENV = 'development' # agjt # VITE_API_URL = 'http://47.93.215.234:9809' VITE_API_URL = 'http://jxj.zhgdyun.com:19812' +# 苏立信 +VITE_API_URL = 'http://101.43.164.214:11111' # 上传 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='