diff --git a/ruoyi-ui/public/demo/jsPlugin-1.2.0.min.js b/ruoyi-ui/public/demo/jsPlugin-1.2.0.min.js index 94ed0df..4383d57 100644 --- a/ruoyi-ui/public/demo/jsPlugin-1.2.0.min.js +++ b/ruoyi-ui/public/demo/jsPlugin-1.2.0.min.js @@ -6238,7 +6238,7 @@ g = w[S].szId } var u = '
'; - for (var f = 0; f < w[_]; f++) { + for (var f = 0; f < 1; f++) { e = r + (f % l === l - 1 ? i : 0); t = o + (f + l >= Math.pow(l, 2) ? n : 0); var h = a + (f % l === l - 1 ? i : 0); diff --git a/ruoyi-ui/src/views/board/index.vue b/ruoyi-ui/src/views/board/index.vue index 02850bf..86927a8 100644 --- a/ruoyi-ui/src/views/board/index.vue +++ b/ruoyi-ui/src/views/board/index.vue @@ -113,9 +113,11 @@ :style="`top: ${i.top}%;left: ${i.left}%;background-color: ${k === 4 ?'#2979e8':'#234271'}`">
- + +
+
+
-
{{ parseTime(new Date(), '{y}.{m}.{d} {h}:{i}:{s} 周{a}') }}
diff --git a/ruoyi-ui/src/views/board/monitor.vue b/ruoyi-ui/src/views/board/monitor.vue index 85cb383..78aee67 100644 --- a/ruoyi-ui/src/views/board/monitor.vue +++ b/ruoyi-ui/src/views/board/monitor.vue @@ -1,6 +1,6 @@ @@ -11,6 +11,7 @@ export default { data() { return {} }, + props:['iChannelID','monitorId'], mounted() { var g_iWndIndex = 0; $(function () { @@ -39,7 +40,7 @@ export default { console.log("关闭远程配置库!"); }, cbInitPluginComplete: function () { - WebVideoCtrl.I_InsertOBJECTPlugin("monitor"); + WebVideoCtrl.I_InsertOBJECTPlugin(this.monitorId); // 检查插件是否最新 if (-1 == WebVideoCtrl.I_CheckPluginVersion()) { alert("检测到新的插件版本"); @@ -162,7 +163,7 @@ export default { var oWndInfo = WebVideoCtrl.I_GetWindowStatus(g_iWndIndex), szDeviceIdentify = '192.168.2.64', iRtspPort = 554, - iChannelID = 2, + iChannelID = this.iChannelID || 1, bZeroChannel = false, szInfo = "";