修改默认条数

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 += '<div>'
 							+ '<div class="pageCapacity">'
-							+ handleData(15, i, list)
+							+ handleData(10, i, list)
 							+ '</div>'
 							+ '</div>'
 					}
 					if (xs > 0) {
 						html += '<div>'
 							+ '<div class="pageCapacity">'
-							+ handleData2(15, zs, xs, list)
+							+ handleData2(10, zs, xs, list)
 							+ '</div>'
 							+ '</div>'
 					}

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("/","-")+ "）");
         }
     }
 }

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 });

js/pages/video/videoAjax.js

@@ -122,7 +122,7 @@ function fourVideo(that){
     playVideList();
     // for (let i = 0; i <playList.length ; i++) {
     //     QXPlayVideo(playList[i].puid, '0', playList[i].windBox);
-    //     playControl();
+        playControl();
     // }
     for (var i = 5; i <= 9; i++) {
         document.getElementById("windowbox" + i).style.display = "none";
@@ -142,6 +142,7 @@ function playVideList(){
     for (let i = 0; i <playList.length ; i++) {
         if( playList[i].state!=1){
             flvPlayer= QXPlayVideo(playList[i].puid, '0', playList[i].windBox);
+            playControl();
             playList[i].flvPlayer=flvPlayer;
             playList[i].state=1;
         }

js/pages/video/videoConnect.js

@@ -101,10 +101,11 @@ function QXPlayVideo(puId, idx, dom) {
                     videoObject.playState = false;
                 }
             });
-
+            videoObject.playState = true;
 
             setTimeout(function () {
                 myPlayer.play();
+                return myPlayer;
             }, 200);
             // flvPlayer.on(flvjs.Events.SCRIPTDATA_ARRIVED, (errorType, errorDetail, errorInfo) => {
             //     if (flvPlayer) {

pages/index/index.html

@@ -79,8 +79,8 @@
                         <td>总数</td>
                     </tr>
                     <tr>
-                        <td> &nbsp;&nbsp; &nbsp;&nbsp; &nbsp;&nbsp; 本周风险  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                            （2024-06-17~2024-06-23）
+                        <td> <p>本周风险 </p>
+                            <p id="weekDates"> </p>
                         </td>
                         <td id="twoRiskNum">0</td>
                         <td id="threeRiskNum">0</td>
@@ -89,8 +89,9 @@
                         <td id="totalRiskNum">0</td>
                     </tr>
                     <tr>
-                        <td> &nbsp;&nbsp; &nbsp;&nbsp; &nbsp;&nbsp;当日站班会  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                            (2024-06-18)
+                        <td>
+                            <p>当日站班会 </p>
+                            <p id="today"> (2024-06-18) </p>
                         </td>
                         <td id="twoClassNum">0</td>
                         <td id="threeClassNum">0</td>