From 05ff718a99b7aeb5715636b1bcbaa97bca6d806e Mon Sep 17 00:00:00 2001 From: Rain_ <904416525@qq.com> Date: Mon, 10 Nov 2025 17:43:01 +0800 Subject: [PATCH] =?UTF-8?q?flx:=20=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/config.js | 4 +- .../videoModule/isc_plugin/isc_plugin_h5.vue | 1257 ++----- .../components/iscPlayer.vue | 17 +- .../homeworkControlProcess.vue | 37 +- .../components/playBack/isc_plugin_h5.vue | 776 ++-- .../homeworkControlProcess.vue | 3254 +++++++++-------- 6 files changed, 2384 insertions(+), 2961 deletions(-) diff --git a/public/js/config.js b/public/js/config.js index 9537806b..bfb1b349 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -49,8 +49,8 @@ var LOGINTYPE = 1; // 1.通用 2.只支持企业账号登录 3.只支持项目 var showNotBuyMoudle = false; //是否展示未解锁产品 var isDockingToWoer = false; //是否是和沃尔平台对接 // var mqttUrl = 'mqtt://jxj.zhgdyun.com:1883/ws' -// var mqttUrl = "ws://jxj.zhgdyun.com:8083/mqtt"; -var mqttUrl = "wss://gszhdz.crpower.com.cn:8084/mqtt"; +var mqttUrl = "ws://jxj.zhgdyun.com:8083/mqtt"; +// var mqttUrl = "wss://gszhdz.crpower.com.cn:8084/mqtt"; // var mqttUrl = 'ws://10.139.72.12:8083/mqtt' //longguang if (COMPANY == "longguang") { // mqttUrl = 'ws://182.90.224.147:8083/mqtt' diff --git a/src/components/videoModule/isc_plugin/isc_plugin_h5.vue b/src/components/videoModule/isc_plugin/isc_plugin_h5.vue index b7c29e40..626638ff 100644 --- a/src/components/videoModule/isc_plugin/isc_plugin_h5.vue +++ b/src/components/videoModule/isc_plugin/isc_plugin_h5.vue @@ -1,840 +1,259 @@ - + - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/companyAdmin/companyBigScreen/terminalOperation/components/iscPlayer.vue b/src/views/companyAdmin/companyBigScreen/terminalOperation/components/iscPlayer.vue index af044b17..f10a2f5f 100644 --- a/src/views/companyAdmin/companyBigScreen/terminalOperation/components/iscPlayer.vue +++ b/src/views/companyAdmin/companyBigScreen/terminalOperation/components/iscPlayer.vue @@ -85,7 +85,7 @@ const props = defineProps({ }, playerId: { type: String, - default: () => "player-" + Math.random().toString(36).substr(2, 9), + default: () => Math.random().toString(36).substr(2, 9), }, }); const emit = defineEmits(["selectPlayVideo"]); @@ -285,7 +285,7 @@ const capture = (imageType, currentWindowIndex) => { * 初始化播放器 */ const initPlayer = () => { - videoInfo.player = new JSPlugin({ + videoInfo.player = new H5Player.JSPlugin({ // 需要英文字母开头 必填 szId: "player-" + props.playerId, // 使用唯一ID // 必填,引用H5player.min.js的js相对路径 @@ -357,7 +357,7 @@ const getPreviewUrl = (row) => { * 播放 */ const play = (row, index) => { - stopPlay(index + 1, "delete"); + // stopPlay(index + 1, "delete"); getPreviewUrl({ ...row, }).then((res) => { @@ -464,16 +464,6 @@ const play = (row, index) => { } } ); - 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... - } - ); }); }; const onReload = (id) => { @@ -635,6 +625,7 @@ onBeforeUnmount(() => { } :deep(.sub-wnd) { height: 100% !important; + // width: 100% !important; } .bgImage { width: 18px; diff --git a/src/views/companyAdmin/companyBigScreen/terminalOperation/homeworkControlProcess.vue b/src/views/companyAdmin/companyBigScreen/terminalOperation/homeworkControlProcess.vue index f98dde8a..b9bf9899 100644 --- a/src/views/companyAdmin/companyBigScreen/terminalOperation/homeworkControlProcess.vue +++ b/src/views/companyAdmin/companyBigScreen/terminalOperation/homeworkControlProcess.vue @@ -296,7 +296,7 @@ status: workTicketDetail.status, }]" :key="'player-' + item.itemId" - :playerId="'player-' + item.itemId" + :playerId="item.itemId" />
-
-
-
-
- 关闭 - -
-
-
-
-
- -
- - -
- - - - -
- - -
- -
-
+
+
+ +
+
+
+
+ 关闭 +
- + +
+ + +
+ +
+
+
+ -
- -
-
- -
-
-
-
-
-
-
-
- {{ item }} -
- -
-
-
-
- {{ item }} -
- -
-
- {{ videoInfo.minuteTime }} -
-
-
-
-
-
- -
-
- +
+ +
+
+
+
+
+
+
+
+
+
+ {{ item }} +
+ +
+
+
+
+ {{ item }} +
+ +
+
+ {{ videoInfo.minuteTime }} +
+
+
+
+
+
+ +
+
+
+
@@ -907,309 +897,309 @@ export default { } } .ant-radio-group3 { - width: 100%; + width: 100%; + display: flex; + align-items: center; + position: relative; + + .Progress_timeline { + background: #19233a; + border: 1px solid #2b344c; + border-radius: 4px; display: flex; - align-items: center; - position: relative; + height: 44px; + // width: 431px; + width: 100%; + // margin-right: 10px; - .Progress_timeline { - background: #19233a; - border: 1px solid #2b344c; - border-radius: 4px; - display: flex; - height: 44px; - // width: 431px; + .Progress_timelineRight, + .Progress_timelineLeft { + align-items: center; + background: #202a43; + border-left: 1px solid #2b344c; + border-radius: 0 4px 4px 0; + color: #7a8bb5; + display: flex; + justify-content: center; + width: 50px; + cursor: pointer; + } + + .Progress_timelineCenterWrap { + margin-top: -50px; + overflow: hidden; + padding-top: 50px; + // width: 391px; + width: calc(92% - 60px); + display: flex; + + > div:first-child { + width: 20px; + } + + .Progress_timelineCenter1 { + position: relative; + // width: 371px; width: 100%; - // margin-right: 10px; + // padding-left: 20px; - .Progress_timelineRight, - .Progress_timelineLeft { - align-items: center; - background: #202a43; - border-left: 1px solid #2b344c; - border-radius: 0 4px 4px 0; - color: #7a8bb5; - display: flex; - justify-content: center; - width: 50px; - cursor: pointer; - } - - .Progress_timelineCenterWrap { - margin-top: -50px; - overflow: hidden; - padding-top: 50px; - // width: 391px; - width: calc(92% - 60px); - display: flex; - - > div:first-child { - width: 20px; - } - - .Progress_timelineCenter1 { - position: relative; - // width: 371px; - width: 100%; - // padding-left: 20px; - - .Progress_timelineCenter { - // width: 960px; - width: 1500px; - - &:hover .Progress_arrowTime, - &:hover .Progress_arrow { - display: block; - } - - .Progress_cover { - width: 100%; - height: 100%; - cursor: pointer; - left: 0; - position: absolute; - top: 0; - z-index: 1; - } - - .Progress_time { - display: flex; - - .Progress_timeItem { - min-width: 100px; - color: #99a0b4; - font-size: 12px; - font-weight: 700; - left: 0px; - line-height: 14px; - padding: 3px 0; - position: relative; - text-align: left; - } - } - - .Progress_line { - bottom: 0; - display: flex; - height: 24px; - position: absolute; - // left: 20px; - } - - .Progress_area { - align-items: center; - border-top: 1px solid #2b344c; - display: flex; - height: 24px; - opacity: 0.5; - // margin-left: 20px; - - .Progress_areaItem { - min-width: 100px; - border-left: 1px solid #fff; - height: 10px; - opacity: 0.1; - } - } - - .Progress_arrowTime { - background: linear-gradient(180deg, #89a3f8, #516aee); - border-radius: 10px; - color: #fff; - font-size: 12px; - font-weight: 700; - height: 19px; - line-height: 19px; - margin-left: -60px; - position: absolute; - text-align: center; - // top: -45px; - top: -20px; - width: 120px; - // display: none; - } - - .Progress_arrow { - background: linear-gradient(180deg, #89a3f8, #516aee); - box-shadow: 0 0 6px 0 #5363f2; - height: 44px; - position: absolute; - top: 0; - width: 2px; - // display: none; - } - } - } - } - } - - :deep() { - .date-picker { - width: initial; + .Progress_timelineCenter { + // width: 960px; + width: 1500px; + + &:hover .Progress_arrowTime, + &:hover .Progress_arrow { + display: block; + } + + .Progress_cover { + width: 100%; + height: 100%; cursor: pointer; + left: 0; position: absolute; - right: 40px; - width: 20px; - height: 20px; - .el-input__icon { - line-height: 0; + top: 0; + z-index: 1; + } + + .Progress_time { + display: flex; + + .Progress_timeItem { + min-width: 100px; + color: #99a0b4; + font-size: 12px; + font-weight: 700; + left: 0px; + line-height: 14px; + padding: 3px 0; + position: relative; + text-align: left; } - } + } - .date-picker .el-input__wrapper { - padding-right: 0; - padding-left: 8px; - cursor: pointer; - background-color: #19233a; - border: 1px solid #2b344c; - box-shadow: none; - } + .Progress_line { + bottom: 0; + display: flex; + height: 24px; + position: absolute; + // left: 20px; + } - .date-picker .el-input__inner { - display: none; + .Progress_area { + align-items: center; + border-top: 1px solid #2b344c; + display: flex; + height: 24px; + opacity: 0.5; + // margin-left: 20px; + + .Progress_areaItem { + min-width: 100px; + border-left: 1px solid #fff; + height: 10px; + opacity: 0.1; + } + } + + .Progress_arrowTime { + background: linear-gradient(180deg, #89a3f8, #516aee); + border-radius: 10px; + color: #fff; + font-size: 12px; + font-weight: 700; + height: 19px; + line-height: 19px; + margin-left: -60px; + position: absolute; + text-align: center; + // top: -45px; + top: -20px; + width: 120px; + // display: none; + } + + .Progress_arrow { + background: linear-gradient(180deg, #89a3f8, #516aee); + box-shadow: 0 0 6px 0 #5363f2; + height: 44px; + position: absolute; + top: 0; + width: 2px; + // display: none; + } } + } } + } + + :deep() { + .date-picker { + width: initial; + cursor: pointer; + position: absolute; + right: 40px; + width: 20px; + height: 20px; + .el-input__icon { + line-height: 0; + } + } + + .date-picker .el-input__wrapper { + padding-right: 0; + padding-left: 8px; + cursor: pointer; + background-color: #19233a; + border: 1px solid #2b344c; + box-shadow: none; + } + + .date-picker .el-input__inner { + display: none; + } + } } .bgImage { - width: 18px; - height: 18px; - background-repeat: no-repeat; - background-size: 100% 100%; - cursor: pointer; + width: 18px; + height: 18px; + background-repeat: no-repeat; + background-size: 100% 100%; + cursor: pointer; } .transcribe { - width: 20px; - height: 20px; - background-image: url("~@/assets/images/iscImage/transcribe.png"); + width: 20px; + height: 20px; + background-image: url("~@/assets/images/iscImage/transcribe.png"); } .screenshot { - background-image: url("~@/assets/images/iscImage/screenshot.png"); + background-image: url("~@/assets/images/iscImage/screenshot.png"); } .disableVolume { - background-image: url("~@/assets/images/iscImage/disableVolume.png"); + background-image: url("~@/assets/images/iscImage/disableVolume.png"); } .fullScreen { - background-image: url("~@/assets/images/iscImage/fullScreen.png"); + background-image: url("~@/assets/images/iscImage/fullScreen.png"); } .openVolume { - background-image: url("~@/assets/images/iscImage/openVolume.png"); + background-image: url("~@/assets/images/iscImage/openVolume.png"); } .exitFullScreen { - background-image: url("~@/assets/images/iscImage/exitFullScreen.png"); + background-image: url("~@/assets/images/iscImage/exitFullScreen.png"); } .splitscreen1 { - background-image: url("~@/assets/images/iscImage/splitscreen1.png"); + background-image: url("~@/assets/images/iscImage/splitscreen1.png"); } .splitscreen2 { - background-image: url("~@/assets/images/iscImage/splitscreen2.png"); + background-image: url("~@/assets/images/iscImage/splitscreen2.png"); } .splitscreen3 { - background-image: url("~@/assets/images/iscImage/splitscreen3.png"); + background-image: url("~@/assets/images/iscImage/splitscreen3.png"); } .stopAll { - background-image: url("~@/assets/images/iscImage/stopAll.png"); + background-image: url("~@/assets/images/iscImage/stopAll.png"); } .video-controls_flex { - display: flex !important; + display: flex !important; } /* 添加控制按钮样式 */ .video-controls { - width: 100%; - height: 100%; - position: absolute; - z-index: 100; - // background: rgba(0, 0, 0, 0.7); - display: none; - flex-direction: column; + width: 100%; + height: 100%; + position: absolute; + z-index: 100; + // background: rgba(0, 0, 0, 0.7); + display: none; + flex-direction: column; + justify-content: space-between; + .controls-bottom { + height: 35px; + display: flex; justify-content: space-between; - .controls-bottom { - height: 35px; - display: flex; - justify-content: space-between; - align-items: center; - background: rgba(0, 0, 0, 0.7); - color: white; - padding: 0 16px; - > div { - display: flex; - justify-content: space-between; - align-items: center; - > div:not(:first-child) { - margin-left: 15px; - } - } + align-items: center; + background: rgba(0, 0, 0, 0.7); + color: white; + padding: 0 16px; + > div { + display: flex; + justify-content: space-between; + align-items: center; + > div:not(:first-child) { + margin-left: 15px; + } } - .controls-top { - padding: 16px; - display: flex; - justify-content: space-between; - align-items: center; - .top-close { - width: 84px; - height: 27px; - background: rgba(0, 0, 0, 0.7); - border-radius: 41px; - font-size: 15px; - color: #ffffff; - display: flex; - justify-content: center; - align-items: center; - > i { - margin-left: 5px; - } - } + } + .controls-top { + padding: 16px; + display: flex; + justify-content: space-between; + align-items: center; + .top-close { + width: 84px; + height: 27px; + background: rgba(0, 0, 0, 0.7); + border-radius: 41px; + font-size: 15px; + color: #ffffff; + display: flex; + justify-content: center; + align-items: center; + > i { + margin-left: 5px; + } } + } } #player-main { - width: 100%; - height: 100%; + width: 100%; + height: 100%; } #player { - width: 100%; - height: calc(100% - 46px); + width: 100%; + height: calc(100% - 46px); } .player-tool { - display: flex; - align-items: center; - justify-content: flex-end; - background-color: #3d3d3d; - height: 40px; - padding: 0 16px; - > div:not(:first-child) { - margin-left: 16px; - } + display: flex; + align-items: center; + justify-content: flex-end; + background-color: #3d3d3d; + height: 40px; + padding: 0 16px; + > div:not(:first-child) { + margin-left: 16px; + } } .hikvision-player { - width: 100%; - height: 100%; - display: flex; - flex-direction: column; + width: 100%; + height: 100%; + display: flex; + flex-direction: column; } #video-container { - width: 100%; - height: 500px; - background-color: #000; + width: 100%; + height: 500px; + background-color: #000; } .control-bar { - padding: 10px; - background: #f5f5f5; - display: flex; - align-items: center; - gap: 10px; + padding: 10px; + background: #f5f5f5; + display: flex; + align-items: center; + gap: 10px; } .video-source { - padding: 10px; - background: #f5f5f5; - display: flex; - gap: 10px; + padding: 10px; + background: #f5f5f5; + display: flex; + gap: 10px; } .volume-control { - display: flex; - align-items: center; - gap: 10px; + display: flex; + align-items: center; + gap: 10px; } \ No newline at end of file diff --git a/src/views/projectFront/workTicketManage/homeworkControlProcess.vue b/src/views/projectFront/workTicketManage/homeworkControlProcess.vue index f14d6c14..3cf3afb3 100644 --- a/src/views/projectFront/workTicketManage/homeworkControlProcess.vue +++ b/src/views/projectFront/workTicketManage/homeworkControlProcess.vue @@ -988,8 +988,16 @@ :controls="true" /> --> +
+ +
@@ -1234,1742 +1242,1740 @@