admin/zhgdlarge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev

Browse Source
This commit is contained in:
Vce 2024-04-18 18:42:31 +08:00
commit c23af29edf
2 changed files with 69 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.env.development
View File

@ -21,10 +21,17 @@ NODE_ENV = 'development'
# 七参数标准版(测试平台) # 七参数标准版(测试平台)
# VITE_API_URL = 'http://182.90.224.237:15551' # VITE_API_URL = 'http://182.90.224.237:15551'
# agjt # agjt
<<<<<<< HEAD
VITE_API_URL = 'http://47.93.215.234:9809' VITE_API_URL = 'http://47.93.215.234:9809'
# 苏立信 # 苏立信
# VITE_API_URL = 'http://101.43.164.214:11111' # VITE_API_URL = 'http://101.43.164.214:11111'
# VITE_API_URL = 'http://jxj.zhgdyun.com:19812' # 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_API_URL = 'http://101.43.164.214:11111'
>>>>>>> adb597104743c33e779739348f354f57365aa8db
# 上传 # 上传
VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='

90
src/views/sevenLargeScreen/videoManagement/index.vue
View File

@ -65,7 +65,7 @@
import Card from "@/components/card.vue"; import Card from "@/components/card.vue";
import ysyPlayAndPlayback from "@/components/ysyPlayAndPlayback.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 { ElMessage } from "element-plus";
import { GlobalStore } from "@/stores"; import { GlobalStore } from "@/stores";
import { selectProjectVideoListApi, getSafeHatSessionApi } from "@/api/modules/video"; import { selectProjectVideoListApi, getSafeHatSessionApi } from "@/api/modules/video";
@ -122,11 +122,19 @@ const goToSafeHelmet = async () => {
// playMode: 0, // 0 预览 1回放 // playMode: 0, // 0 预览 1回放
// layout: "1x1" //页面展示的模块数【16】 // 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({ let objData = ref({
appkey: "24017757", //海康提供的appkey appkey: "", //海康提供的appkey
ip: "182.101.141.23", //海康提供的ip ip: "", //海康提供的ip
secret: "VJz0FbzmE6drPQ7egsBi", //海康提供的secret secret: "", //海康提供的secret
port: 18443, port: 443,
playMode: 0, // 0 预览 1回放 playMode: 0, // 0 预览 1回放
layout: "1x1" //页面展示的模块数【16】 layout: "1x1" //页面展示的模块数【16】
}); });
@ -152,29 +160,54 @@ const getVideoList = async () => {
// all=1查全部 // all=1查全部
}); });
shipinList.value = res.result.videoList; shipinList.value = res.result.videoList;
objData.value.appkey = res.result.videoList[0].appId; if(res.result.videoList[0].list){
objData.value.ip = res.result.videoList[0].account; objData.value.appkey = res.result.videoList[0].list[0].appId;
objData.value.secret = res.result.videoList[0].appSecret; objData.value.ip = res.result.videoList[0].list[0].account;
objData.value.port = +res.result.videoList[0].password; objData.value.secret = res.result.videoList[0].list[0].appSecret;
cameraIndexCode.value = res.result.videoList[0].serialNumber; objData.value.port = +res.result.videoList[0].list[0].password;
// firstVideoId.value = res.result.videoList[0].serialNumber; cameraIndexCode.value = res.result.videoList[0].list[0].serialNumber;
previewVideo(res.result.videoList[0].serialNumber); // firstVideoId.value = res.result.videoList[0].serialNumber;
console.log(objData.value); // previewVideo(res.result.videoList[0].list[0].serialNumber);
console.log("视频列表", res); console.log(objData.value);
ysyParams.value = res.result.videoList[0]; console.log("视频列表", res);
videoType.value = res.result.videoList[0].videoType; ysyParams.value = res.result.videoList[0].list[0];
if (res.result.videoList[0].videoType === 1) { videoType.value = res.result.videoList[0].list[0].videoType;
oWebControl.JS_HideWnd(); if (res.result.videoList[0].list[0].videoType === 1) {
// 销毁当前播放的视频 oWebControl.JS_HideWnd();
oWebControl.JS_RequestInterface({ funcName: "destroyWnd" }); // 销毁当前播放的视频
// 断开与插件服务连接 oWebControl.JS_RequestInterface({ funcName: "destroyWnd" });
oWebControl.JS_Disconnect(); // 断开与插件服务连接
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 () => { onMounted(async () => {
setTimeout(() => { initPlugin();
getVideoList(); // setTimeout(() => {
}, 2500); // }, 2500);
// 获取页面的实例对象 ee // 获取页面的实例对象 ee
const pageInstance = getCurrentInstance(); const pageInstance = getCurrentInstance();
// 获取dom节点对象 // 获取dom节点对象
@ -205,10 +238,10 @@ onMounted(async () => {
// // setWndCover(); // // setWndCover();
// } // }
}); });
// await initPlugin();
// 初始化播放器插件 // 初始化播放器插件
nextTick(async () => { // nextTick(async () => {
initPlugin(); // });
});
}); });
onBeforeUnmount(() => { onBeforeUnmount(() => {
@ -301,6 +334,7 @@ const initPlugin = () => {
// 初始化 // 初始化
const init = (callback: (() => void) | undefined) => { const init = (callback: (() => void) | undefined) => {
console.log(objData.value,'我的视频服务器')
getPubKey(() => { getPubKey(() => {
let appkey = objData.value.appkey; //综合安防管理平台提供的appkey，必填 let appkey = objData.value.appkey; //综合安防管理平台提供的appkey，必填
let secret = setEncrypt(objData.value.secret); //综合安防管理平台提供的secret，必填 let secret = setEncrypt(objData.value.secret); //综合安防管理平台提供的secret，必填