From f2d273827c26e2a4254aca5236e83ce59fc8d5e2 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Thu, 25 Apr 2024 13:52:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/pages/index/indexEcharts.js |  4 +--
 pages/video/video.html         | 59 +++++++++++++++++++++++++++-------
 2 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/js/pages/index/indexEcharts.js b/js/pages/index/indexEcharts.js
index 7a579d5..40d76cb 100644
--- a/js/pages/index/indexEcharts.js
+++ b/js/pages/index/indexEcharts.js
@@ -455,7 +455,7 @@ function initEchartsThree(nameListData,valueListData,proCost) {
         backgroundColor: 'transparent',
         tooltip,
         grid: {
-            left: '5%',
+            left: '10%',
             right: '6%',
             bottom: '15%',
             top: '25%',
@@ -487,7 +487,7 @@ function initEchartsThree(nameListData,valueListData,proCost) {
         yAxis: {
             type: 'value',
             // min: 0,
-            // max: 140,
+            // max: proCost + 10000,
             splitLine: { //分割线配置
                 lineStyle: {
                     color: "#25393B",
diff --git a/pages/video/video.html b/pages/video/video.html
index 97dbac1..1af4b8e 100644
--- a/pages/video/video.html
+++ b/pages/video/video.html
@@ -122,50 +122,87 @@
                 <div id="voi-null"></div>
                 <div id="voi-photo">
                     <div class="voi-item">
-                        <img src="../../img/video/voi_photo.png">
+                        <img src="../../img/testImg/3.jpg">
                         <div class="voi-info layout">
                             <div class="voi-time layout">
                                 <img src="../../img/video/alarm.png" alt="告警">
                                 <p>2024-03-30 12:00:00</p>
                             </div>
                             <div class="voi-content layout">
-                                <p>区域入侵</p>
+                                <p>施工机械</p>
+                            </div>
+                        </div>
+                    </div>
+                    
+                    <div class="voi-item">
+                        <img src="../../img/testImg/2.jpg">
+                        <div class="voi-info layout">
+                            <div class="voi-time layout">
+                                <img src="../../img/video/alarm.png" alt="告警">
+                                <p>2024-04-22 12:40:25</p>
+                            </div>
+                            <div class="voi-content layout">
+                                <p>施工机械</p>
                             </div>
                         </div>
                     </div>
                     <div class="voi-item">
-                        <img src="../../img/video/voi_photo2.png">
+                        <img src="../../img/testImg/1.jpg">
                         <div class="voi-info layout">
                             <div class="voi-time layout">
                                 <img src="../../img/video/alarm.png" alt="告警">
-                                <p>2024-03-30 12:00:00</p>
+                                <p>2024-04-22 12:50:55</p>
                             </div>
                             <div class="voi-content layout">
-                                <p>区域入侵</p>
+                                <p>施工机械-斗臂车</p>
                             </div>
                         </div>
                     </div>
                     <div class="voi-item">
-                        <img src="../../img/video/voi_photo3.png">
+                        <img src="../../img/testImg/6.jpg">
                         <div class="voi-info layout">
                             <div class="voi-time layout">
                                 <img src="../../img/video/alarm.png" alt="告警">
-                                <p>2024-03-30 12:00:00</p>
+                                <p>2024-04-22 13:24:25</p>
                             </div>
                             <div class="voi-content layout">
-                                <p>区域入侵</p>
+                                <p>施工机械</p>
                             </div>
                         </div>
                     </div>
                     <div class="voi-item">
-                        <img src="../../img/video/voi_photo4.png">
+                        <img src="../../img/testImg/7.jpg">
                         <div class="voi-info layout">
                             <div class="voi-time layout">
                                 <img src="../../img/video/alarm.png" alt="告警">
-                                <p>2024-03-30 12:00:00</p>
+                                <p>2024-04-22 13:28:37</p>
                             </div>
                             <div class="voi-content layout">
-                                <p>区域入侵</p>
+                                <p>未戴安全帽</p>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="voi-item">
+                        <img src="../../img/testImg/5.jpg">
+                        <div class="voi-info layout">
+                            <div class="voi-time layout">
+                                <img src="../../img/video/alarm.png" alt="告警">
+                                <p>2024-04-22 13:47:18</p>
+                            </div>
+                            <div class="voi-content layout">
+                                <p>未戴安全帽</p>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="voi-item">
+                        <img src="../../img/testImg/4.jpg">
+                        <div class="voi-info layout">
+                            <div class="voi-time layout">
+                                <img src="../../img/video/alarm.png" alt="告警">
+                                <p>2024-04-22 13:50:42</p>
+                            </div>
+                            <div class="voi-content layout">
+                                <p>未戴安全帽</p>
                             </div>
                         </div>
                     </div>