diff --git a/bns/html/compreDisplay/dutyHome.html b/bns/html/compreDisplay/dutyHome.html index 22c1da4..5e9f696 100644 --- a/bns/html/compreDisplay/dutyHome.html +++ b/bns/html/compreDisplay/dutyHome.html @@ -215,9 +215,9 @@

人员统计

- + - +
diff --git a/bns/html/dutyTask/remotePatrol/remotePatrol.html b/bns/html/dutyTask/remotePatrol/remotePatrol.html index 3777148..9151ccc 100644 --- a/bns/html/dutyTask/remotePatrol/remotePatrol.html +++ b/bns/html/dutyTask/remotePatrol/remotePatrol.html @@ -11,12 +11,12 @@ - + @@ -92,13 +92,13 @@

球机当日上线记录

-
+

@@ -445,10 +446,10 @@ - + diff --git a/bns/html/video/video.html b/bns/html/video/video.html index 9d0cd19..c6727c0 100644 --- a/bns/html/video/video.html +++ b/bns/html/video/video.html @@ -4,7 +4,7 @@ 实时视频 - + @@ -21,14 +21,15 @@ - + + - + @@ -139,13 +140,13 @@

球机列表

-
+

@@ -167,27 +168,28 @@ -
-
-
+ +
- + + \ No newline at end of file diff --git a/bns/js/dutyTask/remotePatrol/remotePatrol.js b/bns/js/dutyTask/remotePatrol/remotePatrol.js index b8cc5b3..1622256 100644 --- a/bns/js/dutyTask/remotePatrol/remotePatrol.js +++ b/bns/js/dutyTask/remotePatrol/remotePatrol.js @@ -51,7 +51,8 @@ function setParams(id, puid, tCodeParam, twCodeParam, tdCodeParam, passWayParam, } }); $('#startTime').val(getNowTime()) - video(id, puid, tCodeParam, twCodeParam, tdCodeParam, passWayParam); + // video(id, puid, tCodeParam, twCodeParam, tdCodeParam, passWayParam); + $('#video').attr('src','../../../video/3.mp4'); getZbhWarnAjax(); pages(); getZbhDetailAjax(); diff --git a/bns/js/video/video.js b/bns/js/video/video.js index 7c2f54a..592f364 100644 --- a/bns/js/video/video.js +++ b/bns/js/video/video.js @@ -10,7 +10,7 @@ layui.extend({ dtree = layui.dtree; layer = layui.layer; initTreeCity(""); - initVideo(); + // initVideo(); //按钮点击事件 util.event('lay-active', { city: function () { @@ -170,7 +170,33 @@ function openRemotePatrol(id, puid, tCode, twCode, tdCode, passWay) { * @param keyWord */ function initTreeCity(keyWord) { - Ajax().post({ + let params = { + keyWord: $('#keyWord').val() + }; + let url = dataUrl + 'proteam/pot/video/getMenuListCity'; + ajaxRequest(url, "POST", params, true, function () { + }, function (result) { + if (result.code === 200) { + calleArr(data.data); + let treeData = [{ + id: "top", + title: '球机  (在线:' + num + '  ' + " 不在线:" + '' + noNum + '  ' + " 总数:" + all + ')', + checkArr: "0", + parentId: "-1", + children: data.data, + iconClass: 'iconfont icon-shexiangtou', + spread: true, + }]; + dtree.reload(tree, { + data: treeData, + }); + } else if (result.code === 500) { + layer.alert(result.msg, { icon: 2 }) + } + }, function (xhr, status, error) { + errorFn(xhr, status, error) + }, null); + /* Ajax().post({ headers: { "encrypt": sm3(JSON.stringify({ keyWord: $('#keyWord').val() @@ -195,7 +221,7 @@ function initTreeCity(keyWord) { data: treeData, }); } - }); + }); */ } diff --git a/bns/video/1.mp4 b/bns/video/1.mp4 new file mode 100644 index 0000000..bd230e4 Binary files /dev/null and b/bns/video/1.mp4 differ diff --git a/bns/video/2.mp4 b/bns/video/2.mp4 new file mode 100644 index 0000000..bd230e4 Binary files /dev/null and b/bns/video/2.mp4 differ diff --git a/bns/video/3.mp4 b/bns/video/3.mp4 new file mode 100644 index 0000000..ce66a2e Binary files /dev/null and b/bns/video/3.mp4 differ