diff --git a/public/config/config.json b/public/config/config.json index 158dfd7..dc4b1b8 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,6 +1,6 @@ { "title": "安全生产智慧监管系统", - "baseUrl": "http://192.168.83.42:6909/safe-server/", + "baseUrl": "http://192.168.83.65:6909/safe-server/", "deployPath": "/alarm", "mediaBaseUrl": "http://192.168.83.42:80", "lat-bd": "39.91459528", @@ -11,7 +11,7 @@ "maxZoom": "18", "zoom": "15", "timeGap": 600000, - "systemType": "sm", + "systemType": "gm", "lineWidth": "3", "lineColor": "#1aa034", "fontSize": "18px", @@ -20,5 +20,9 @@ "gmStopLoinPage": "0", "jessibucaDec": "这是下面jessibuca字段的描述:pro代表使用Pro版本,open代表使用开源版本", "jessibucaVersion": "open", - "useMSE": "false" + "useMSE": "false", + "flvIFrameDec": "这是控制检测I帧的字段,1代表检测首帧,2代表持续监测", + "flvIFrame": "1", + "flvIFrameTimeDec": "这个参数是持续监测视频流I帧的超时时间,单位为s", + "flvIFrameTime": "15" } diff --git a/public/config/config.json b/public/config/config.json index 158dfd7..dc4b1b8 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,6 +1,6 @@ { "title": "安全生产智慧监管系统", - "baseUrl": "http://192.168.83.42:6909/safe-server/", + "baseUrl": "http://192.168.83.65:6909/safe-server/", "deployPath": "/alarm", "mediaBaseUrl": "http://192.168.83.42:80", "lat-bd": "39.91459528", @@ -11,7 +11,7 @@ "maxZoom": "18", "zoom": "15", "timeGap": 600000, - "systemType": "sm", + "systemType": "gm", "lineWidth": "3", "lineColor": "#1aa034", "fontSize": "18px", @@ -20,5 +20,9 @@ "gmStopLoinPage": "0", "jessibucaDec": "这是下面jessibuca字段的描述:pro代表使用Pro版本,open代表使用开源版本", "jessibucaVersion": "open", - "useMSE": "false" + "useMSE": "false", + "flvIFrameDec": "这是控制检测I帧的字段,1代表检测首帧,2代表持续监测", + "flvIFrame": "1", + "flvIFrameTimeDec": "这个参数是持续监测视频流I帧的超时时间,单位为s", + "flvIFrameTime": "15" } diff --git a/public/player/player.html b/public/player/player.html index 19ea25e..de788f0 100644 --- a/public/player/player.html +++ b/public/player/player.html @@ -74,7 +74,7 @@ loadingText: '视频加载中', // 加载过程中文案 useMSE: false, // 是否开启MediaSource硬解码 视频编码只支持H.264视频(Safari on iOS不支持)不支持 forceNoOffscreen 为 false (开启离屏渲染) useWCS: false, // 是否开启Webcodecs硬解码 视频编码只支持H.264视频 (需在chrome 94版本以上,需要https或者localhost环境) 支持 forceNoOffscreen 为 false (开启离屏渲染) - debug: true, // 是否开启控制台调试打 + debug: false, // 是否开启控制台调试打 showBandwidth: false, // 是否显示显示网速 loadingTimeout: 60, // flv地址请求超时时间 operateBtns: { diff --git a/public/config/config.json b/public/config/config.json index 158dfd7..dc4b1b8 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,6 +1,6 @@ { "title": "安全生产智慧监管系统", - "baseUrl": "http://192.168.83.42:6909/safe-server/", + "baseUrl": "http://192.168.83.65:6909/safe-server/", "deployPath": "/alarm", "mediaBaseUrl": "http://192.168.83.42:80", "lat-bd": "39.91459528", @@ -11,7 +11,7 @@ "maxZoom": "18", "zoom": "15", "timeGap": 600000, - "systemType": "sm", + "systemType": "gm", "lineWidth": "3", "lineColor": "#1aa034", "fontSize": "18px", @@ -20,5 +20,9 @@ "gmStopLoinPage": "0", "jessibucaDec": "这是下面jessibuca字段的描述:pro代表使用Pro版本,open代表使用开源版本", "jessibucaVersion": "open", - "useMSE": "false" + "useMSE": "false", + "flvIFrameDec": "这是控制检测I帧的字段,1代表检测首帧,2代表持续监测", + "flvIFrame": "1", + "flvIFrameTimeDec": "这个参数是持续监测视频流I帧的超时时间,单位为s", + "flvIFrameTime": "15" } diff --git a/public/player/player.html b/public/player/player.html index 19ea25e..de788f0 100644 --- a/public/player/player.html +++ b/public/player/player.html @@ -74,7 +74,7 @@ loadingText: '视频加载中', // 加载过程中文案 useMSE: false, // 是否开启MediaSource硬解码 视频编码只支持H.264视频(Safari on iOS不支持)不支持 forceNoOffscreen 为 false (开启离屏渲染) useWCS: false, // 是否开启Webcodecs硬解码 视频编码只支持H.264视频 (需在chrome 94版本以上,需要https或者localhost环境) 支持 forceNoOffscreen 为 false (开启离屏渲染) - debug: true, // 是否开启控制台调试打 + debug: false, // 是否开启控制台调试打 showBandwidth: false, // 是否显示显示网速 loadingTimeout: 60, // flv地址请求超时时间 operateBtns: { diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue index 98009a1..4b74353 100644 --- a/src/layouts/components/Tools/index.vue +++ b/src/layouts/components/Tools/index.vue @@ -7,6 +7,7 @@ import useSettingsStore from '@/store/modules/settings' import useUserStore from '@/store/modules/user' import useRouteStore from '@/store/modules/route' +import { getDictByCode } from '@/api/system/dict' import useWebsocketStore from '@/store/modules/websocket' import { getMultiTenantList, multiTenantConfig } from '@/api/system/multiTenant' const { proxy } = getCurrentInstance() @@ -120,6 +121,23 @@ loading.close() }) } +// --------------------------------------------字典--------------------------------------- +const videoLink = ref('') // 视频会议链接的地址 +// 获取字典值 +async function getDict() { + // 可选决策项 + const response = await getDictByCode('videoLink') + if (response && response.data && response.data.length) { + videoLink.value = `${response.data[0].value}://${response.data[0].name}` + } +} +getDict() +// -------------------------------------------------------------------------------------- +// 点击视频会议 +const clickVideoConference = () => { + console.log('跳转链接', videoLink.value) + window.open(videoLink.value) +} // -------------------------------------租户权限相关------------------------------------------ onMounted(() => { // 连接 websocket @@ -136,6 +154,7 @@