diff --git a/src/components/videoModule/isc_plugin/isc_plugin.vue b/src/components/videoModule/isc_plugin/isc_plugin.vue
index 2b5a207d..fb0a2fce 100644
--- a/src/components/videoModule/isc_plugin/isc_plugin.vue
+++ b/src/components/videoModule/isc_plugin/isc_plugin.vue
@@ -5,7 +5,7 @@
-
@@ -16,15 +16,20 @@ let closeVideo=null
import {
OpenVideo,
unInitObjPlugin,
- InitObjPlugin, hidePluginWindow,getCurrentLayout, showPluginWindow, closeAllVideo, cuttingPartWindow, resizeFn, isLoadPlugin, setWidthAndHeight, setOffset
+ InitObjPlugin, hidePluginWindow,getCurrentLayout, setCurrentLayout, showPluginWindow, closeAllVideo, cuttingPartWindow, resizeFn, isLoadPlugin, setWidthAndHeight, setOffset
} from "./video_isc_plugin.js";
export default {
props: ["devList", "type", 'isIframe', "devListAll"],
watch: {
//监听value的变化,进行相应的操作即可
devList: function (a, b) {
- console.log('isc_plugin.vue获取到设备列表')
+ console.log('isc_plugin.vue获取到设备列表', a)
//a是value的新值,b是旧值
+ closeAllVideo();
+ if(a.length > 4) {
+ this.layout = '4x4';
+ setCurrentLayout(this.layout)
+ }
if (a.length > 0) {
isLoadPlugin(a, this.layout)
} else {
@@ -82,10 +87,10 @@ export default {
// }
var layout = '2x2'
- if (this.type == 'company') {
- // layout='6x10'
- layout = '4x6'
- }
+ // if (this.type == 'company') {
+ // // layout='6x10'
+ // layout = '4x6'
+ // }
if (this.type.indexOf('x') != -1) {
layout = this.type
}
@@ -134,7 +139,10 @@ export default {
this.pageNo -= 1;
} else if(type == "next") {
console.log("pageNo", this.pageSizeFlag);
- if(this.pageNo >= this.pageSizeFlag) return;
+ if(this.pageNo >= this.pageSizeFlag) {
+ if(this.pageNo <= 1) return;
+ this.pageNo = 0;
+ };
this.pageNo += 1;
}
const dataList = this.pageList;
diff --git a/src/components/videoModule/isc_plugin/isc_plugin_h5.vue b/src/components/videoModule/isc_plugin/isc_plugin_h5.vue
index db4ba1b6..49e39314 100644
--- a/src/components/videoModule/isc_plugin/isc_plugin_h5.vue
+++ b/src/components/videoModule/isc_plugin/isc_plugin_h5.vue
@@ -238,7 +238,10 @@ export default {
this.pageNo -= 1;
} else if(type == "next") {
console.log("pageNo", this.pageSizeFlag);
- if(this.pageNo >= this.pageSizeFlag) return;
+ if(this.pageNo >= this.pageSizeFlag) {
+ if(this.pageNo == 1) return;
+ this.pageNo = 0;
+ };
this.pageNo += 1;
}
const dataList = this.pageList;
diff --git a/src/components/videoModule/isc_plugin/video_isc_plugin.js b/src/components/videoModule/isc_plugin/video_isc_plugin.js
index 741e8cd1..056dd01b 100644
--- a/src/components/videoModule/isc_plugin/video_isc_plugin.js
+++ b/src/components/videoModule/isc_plugin/video_isc_plugin.js
@@ -523,4 +523,13 @@ export const getCurrentLayout = async () => {
funcName: "getLayout"
});
return data;
+}
+// 设置当前布局
+export const setCurrentLayout = async (layout) => {
+ await oWebControl.JS_RequestInterface({
+ funcName: "setLayout",
+ argument: {
+ layout: layout
+ }
+ });
}
\ No newline at end of file
diff --git a/src/components/videoModule/videoModule.vue b/src/components/videoModule/videoModule.vue
index 3a8e139e..574405a0 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,