diff --git a/src/assets/images/iscImage/codestream1.png b/src/assets/images/iscImage/codestream1.png new file mode 100644 index 00000000..66ef4470 Binary files /dev/null and b/src/assets/images/iscImage/codestream1.png differ diff --git a/src/assets/images/iscImage/codestream2.png b/src/assets/images/iscImage/codestream2.png new file mode 100644 index 00000000..2f356752 Binary files /dev/null and b/src/assets/images/iscImage/codestream2.png differ diff --git a/src/components/videoModule/isc_plugin/isc_plugin_h5.vue b/src/components/videoModule/isc_plugin/isc_plugin_h5.vue index 49e39314..ccbae4d2 100644 --- a/src/components/videoModule/isc_plugin/isc_plugin_h5.vue +++ b/src/components/videoModule/isc_plugin/isc_plugin_h5.vue @@ -19,6 +19,18 @@
+ +
+
3 ? 0 : item.defaultStreamType }, index ); } }); if (a.length > 1) { - this.devH5List = a.map((item, index) => ({ ...item, eIndex: index })); + this.devH5List = a.map((item, index) => ({ ...item, eIndex: index, defaultStreamTypeCut: index > 3 ? 0 : item.defaultStreamType })); } }, randomNumber: { @@ -226,6 +240,7 @@ export default { this.devH5List = this.devList.map((item, index) => ({ ...item, eIndex: index, + defaultStreamTypeCut: index > 3 ? 0 : item.defaultStreamType })); console.log("我进来了", this.devList); // 页面加载初始化` @@ -248,12 +263,18 @@ export default { this.devH5List = dataList.map((item, index) => ({ ...item, eIndex: index, + defaultStreamTypeCut: index > 3 ? 0 : item.defaultStreamType })); this.devH5List.forEach((item) => { this.play(item,item.eIndex); }) console.log("dataList", dataList, this.pageNo); }, + isCodeStream(i){ + console.log("isCodeStream", this.devH5List[i]); + this.devH5List[i - 1].defaultStreamTypeCut = this.devH5List[i - 1].defaultStreamTypeCut == 1 ? 0 : 1; + this.play(this.devH5List[i - 1], i - 1); + }, // 关闭所有视频 stopAllPlay() { // 调用播放器API停止所有实时播放 @@ -641,11 +662,14 @@ export default { let tempCode = row.serialNumber; const param = { cameraIndexCode: tempCode, - streamType: row.defaultStreamType && row.eIndex < 4 ? row.defaultStreamType : "", + streamType: row.defaultStreamType && row.eIndex < 4 ? (row.defaultStreamType == 1 ? "" : 2) : "", type: window.location.protocol.includes("https") ? "wss" : "ws", transmode: 1, itemId: row.itemId, }; + if(row.defaultStreamTypeCut == 0) { + param.streamType = 2; + } // 这里 return getVideoItemInfoApi(param); }, @@ -919,6 +943,12 @@ export default { height: 20px; background-image: url("~@/assets/images/iscImage/transcribe.png"); } +.codestream { + background-image: url("~@/assets/images/iscImage/codestream2.png"); +} +.codestream_active { + background-image: url("~@/assets/images/iscImage/codestream1.png"); +} .talkback { background-image: url("~@/assets/images/iscImage/talkback.png"); } diff --git a/src/components/videoModule/videoModule.vue b/src/components/videoModule/videoModule.vue index 574405a0..3a8e139e 100644 --- a/src/components/videoModule/videoModule.vue +++ b/src/components/videoModule/videoModule.vue @@ -37,7 +37,7 @@ :isIframe="isIframe" :devList="devList" :devListAll="devListAll" - v-if="!isWindows() && $store.state.forceH5Play == 0" + v-if="isWindows() && $store.state.forceH5Play == 0" :class="{ isDockingToWoer: isDockingToWoer, isLongguangIframe: isIframe,