diff --git a/src/assets/images/iscImage/text-to-image.png b/src/assets/images/iscImage/text-to-image.png index 23c8746..54d2920 100644 Binary files a/src/assets/images/iscImage/text-to-image.png and b/src/assets/images/iscImage/text-to-image.png differ diff --git a/src/views/sevenLargeScreen/homeworkControlProcess/index.vue b/src/views/sevenLargeScreen/homeworkControlProcess/index.vue index 8078863..4368085 100644 --- a/src/views/sevenLargeScreen/homeworkControlProcess/index.vue +++ b/src/views/sevenLargeScreen/homeworkControlProcess/index.vue @@ -34,7 +34,7 @@ label: 'typeName' }" > - + {{ workTicketDetail.workTicketNumber }}
-
施工场站
+
施工区域
{{ workTicketDetail.constructionAreaNames }}
diff --git a/src/views/sevenLargeScreen/videoManagement/isc_plugin_h5.vue b/src/views/sevenLargeScreen/videoManagement/isc_plugin_h5.vue index 1f477c0..61c1ebe 100644 --- a/src/views/sevenLargeScreen/videoManagement/isc_plugin_h5.vue +++ b/src/views/sevenLargeScreen/videoManagement/isc_plugin_h5.vue @@ -306,8 +306,12 @@ const initPlayer = () => { } } if (controls) { - if (iWndIndex > videoInfo.devH5List.length - 1) return; - controls.classList.add("video-controls_flex"); + // if (iWndIndex > videoInfo.devH5List.length - 1) return; + // controls.classList.add("video-controls_flex"); + const player_playVideo = wnd.querySelector(`#player_playVideo${iWndIndex}`); + if (player_playVideo.src) { + controls.classList.add("video-controls_flex"); + } } } }, @@ -380,7 +384,7 @@ const getPreviewUrl = row => { * 播放 */ const play = (row, index) => { - stopPlay(index + 1, 'delete'); + stopPlay(index + 1, "delete"); getPreviewUrl({ ...row }).then(res => { @@ -440,6 +444,16 @@ const play = (row, index) => { im.style.marginTop = positionNum + "px"; } ); + videoInfo.player.JS_SetConnectTimeOut(index, 60).then( + () => { + console.info("JS_SetConnectTimeOut success"); + // do you want... + }, + err => { + console.info("JS_SetConnectTimeOut failed", err); + // do you want... + } + ); }); }; /**