diff --git a/js/pages/accessMge/accessMge.js b/js/pages/accessMge/accessMge.js index 7578a7d..7a24c45 100644 --- a/js/pages/accessMge/accessMge.js +++ b/js/pages/accessMge/accessMge.js @@ -314,20 +314,20 @@ function getPerStatisticsPhoto(accessType, timeType) { if (result.data.warnList && result.data.warnList.length > 0) { let html = ''; let list = result.data.warnList; - let zs = Math.floor(list.length / 15); - let xs = Math.floor(list.length % 15); + let zs = Math.floor(list.length / 10); + let xs = Math.floor(list.length % 10); if (zs > 0) { for (let i = 1; i <= zs; i++) { html += '
' + '
' - + handleData(15, i, list) + + handleData(10, i, list) + '
' + '
' } if (xs > 0) { html += '
' + '
' - + handleData2(15, zs, xs, list) + + handleData2(10, zs, xs, list) + '
' + '
' } diff --git a/js/pages/index/indexAjax.js b/js/pages/index/indexAjax.js index 0c63280..a4ef14f 100644 --- a/js/pages/index/indexAjax.js +++ b/js/pages/index/indexAjax.js @@ -222,7 +222,12 @@ function loadProRisk2(montageParam) { $('#fourClassNum').html(data.fourClassNum); $('#fiveClassNum').html(data.fiveClassNum); $('#totalClassNum').html(data.twoClassNum + data.threeClassNum + data.fourClassNum + data.fiveClassNum); - $('#weekDate').html("周风险("+data.weekDate + ")"); + $('#weekDates').html("("+data.weekDate + ")"); + let today = new Date(); + let formatter = new Intl.DateTimeFormat('zh-CN', { year: 'numeric', month: '2-digit', day: '2-digit' }); + let formattedDate = formatter.format(today); + console.log(formattedDate); + $("#today").html("("+formattedDate.replaceAll("/","-")+ ")"); } } } \ No newline at end of file diff --git a/js/pages/video/video.js b/js/pages/video/video.js index e61a7c9..a783275 100644 --- a/js/pages/video/video.js +++ b/js/pages/video/video.js @@ -42,12 +42,8 @@ layui.config({ playList.push(newobj); playVideList(); } - console.log("4444"); console.log(playList); - - // QXPlayVideo(puid, '0', winDom) - // playControl(); videoObject.devCode = puid; } else { return parent.layer.msg('请选择球机', { icon: 7 }); diff --git a/js/pages/video/videoAjax.js b/js/pages/video/videoAjax.js index b1a3fa9..3ac2c34 100644 --- a/js/pages/video/videoAjax.js +++ b/js/pages/video/videoAjax.js @@ -122,7 +122,7 @@ function fourVideo(that){ playVideList(); // for (let i = 0; i { // if (flvPlayer) { diff --git a/pages/index/index.html b/pages/index/index.html index 31ad739..f19d0ca 100644 --- a/pages/index/index.html +++ b/pages/index/index.html @@ -79,8 +79,8 @@ 总数 -          本周风险            - (2024-06-17~2024-06-23) +

本周风险

+

0 0 @@ -89,8 +89,9 @@ 0 -         当日站班会            - (2024-06-18) + +

当日站班会

+

(2024-06-18)

0 0