修改

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test3/test3.js

@@ -39,6 +39,8 @@ const test3 = (function() {
                     $('.test3 .box3 li').eq(4).find('.details p').eq(1).find('span').eq(0).find('sapn').html(dataObj.siteGardenCount); // 园林 -
                     $('.test3 .box3 li').eq(4).find('.details p').eq(1).find('span').eq(1).find('sapn').html(dataObj.siteFacilitiesCount); // 设施
                     $('.test3 .box3 li').eq(4).find('.details p').eq(1).find('span').eq(2).find('sapn').html(dataObj.siteSanitationCount); // 环卫
+
+                    
                 },
                 error: function() {
                     console.log('文章访问总数超时了');

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test31/test31.js

@@ -40,7 +40,7 @@ const test31 = (function() {
                       return `
                           <tr class="tbody-box">
                             <td class="tbody-details">${index+1}</td>
-                            <td class="tbody-details">${item.office_name}</td>
+                            <td class="tbody-details">${item.office_name||'-'}</td>
                             <td class="tbody-details">${item.system_name}</td>
                             <td class="tbody-details">${high||'-'}</td>
                             <td class="tbody-details">${middle || '-'}</td>

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test32/test32.css

@@ -55,7 +55,7 @@
   font-size: 0.12rem !important;
   margin: 0.04rem 0.08rem;
   color: #707438;
-  text-shadow: 0 0 50px #fff;
+  /* text-shadow: 0 0 50px #fff; */
 }
 .box32 .right .info span{
   color: #3c9ffa;
@@ -76,11 +76,14 @@
   display: flex;
   margin-left: 0.2rem;
   color: #fff;
-  flex: 3;
+  flex: 3 1 auto;
   padding: 0.05rem 0;
   justify-content: space-around;
   background: url(../../images/networkSecurity/zu.png) no-repeat;
-  background-size: 100% 105%;
+  background-size: 100% 110%;
+  position: relative;
+  left: -5%;
+  transform: scale(1.2);
 }
 .box32 .left .number span,
 .box32 .right .number span {

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test33/test33.js

@@ -8,8 +8,6 @@ const test33 = (function() {
         move3(".test33 .test-box");
         move2(".test33 .containerTool");
 
-        let timer = null;
-
         $(".test33 .close").click(function() {
             $(".test33 .box").remove();
             $(".test33 .containerTool").css("display", "none");
@@ -45,19 +43,6 @@ const test33 = (function() {
                 console.log("-系统漏洞类型--------------超时");
             },
         });
-
-        // let myChart = echarts.init(dists[0]);
-
-        window.addEventListener("resize", function() {
-            if (timer) {
-                clearTimeout(timer);
-                timer = null;
-            }
-            timer = setTimeout(() => {
-                // move('.test33 .box')
-                // myChart.resize();
-            }, 500);
-        });
     }
 
     function setCharts(echartDom, testDom, result) {
@@ -92,7 +77,7 @@ const test33 = (function() {
                 show: false,
                 text: nametext,
                 subtext: "122",
-                textAlign: "center",
+                textAlign: "right",
                 textVerticalAlign: "middle",
                 textStyle: {
                     fontSize: 120,
@@ -104,7 +89,7 @@ const test33 = (function() {
                     color: "#1492ff",
                     fontSize: 116,
                     fontWeight: "bold",
-                    padding: [0, 10, 0, 10],
+                    padding: [0, 200, 0, 10],
                 },
                 left: "30%",
                 top: "center",
@@ -128,7 +113,7 @@ const test33 = (function() {
                             color: "#1492ff",
                             fontSize: 116,
                             fontWeight: "bold",
-                            padding: [0, 60, 0, 10],
+                            padding: [0, 80, 0, 10],
                         },
                     },
                 },
@@ -157,7 +142,8 @@ const test33 = (function() {
                         position: "center",
                         formatter: "{b}\n{c}",
                         textStyle: {
-                            fontSize: 0,
+                             fontSize: 120,
+                            fontWeight: "bold",
                             color: "#fff",
                         },
                     },

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test38/test38.js

@@ -23,24 +23,31 @@ const test38 = (function () {
 
 
     // 安全事件
-    $.ajax({
-      url: FLAT_PATH_THREE + '/apiUrl/sendApiUrlAndParam',
-      type: 'GET',
-      data: {
-        urlCode: 'AQZX_014',
-        params: '{"keyword":"","startTime":"2022-05-04+00:00:00","endTime":"2022-05-10+17:05:00","threatSeverity":""}'
-      },
-      success: function (res) {
-        console.log('安全事件', JSON.parse(res.data));
-        const result = JSON.parse(res.data);
-        $('.test38 .box38 .img-numer').eq(0).html(result.data.High)
-        $('.test38 .box38 .img-numer').eq(1).html(result.data.Medium)
-        $('.test38 .box38 .img-numer').eq(2).html(result.data.Low)
-      },
-      error: function (err) {
-        console.log("----安全事件--------超时");
-      },
-    });
+    function test38Ajax() {
+      $.ajax({
+        url: FLAT_PATH_THREE + '/apiUrl/sendApiUrlAndParam',
+        type: 'GET',
+        data: {
+          urlCode: 'AQZX_014',
+          params: '{"keyword":"","startTime":"2022-05-04+00:00:00","endTime":"2022-05-10+17:05:00","threatSeverity":""}'
+        },
+        success: function (res) {
+          console.log('安全事件', JSON.parse(res.data));
+          const result = JSON.parse(res.data);
+          $('.test38 .box38 .img-numer').eq(0).html(result.data.High)
+          $('.test38 .box38 .img-numer').eq(1).html(result.data.Medium)
+          $('.test38 .box38 .img-numer').eq(2).html(result.data.Low)
+        },
+        error: function (err) {
+          console.log("----安全事件--------超时");
+        },
+      });
+    }
+    test38Ajax()
+    setInterval(() => {
+      test38Ajax()
+    }, 60*1000);
+    
   }
 
   return test38

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test41/test41.css

@@ -81,4 +81,20 @@
 }
 .box41 thead tr{
   background-color: #1c538c;
+  display: flex;
+  text-indent: 71%;
+  width: 98%;
+  justify-content: space-around;
+  position: absolute;
+  align-items: center;
 }
+
+.box41 thead tr th:nth-child(2){
+  position: relative;
+  left: 6%;
+}
+
+.box41 thead tr th:nth-child(3){
+  position: relative;
+  left: 6%;
+}

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test42/test42.css

@@ -5,3 +5,7 @@
   margin: 0;
   padding: 0;
 }
+.test42 .box42{
+  box-shadow: none;
+  background: none;
+}

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test42/test42.html

@@ -3,11 +3,6 @@
         <span class="fit"></span>
         <span class="close"></span>
     </div>
-    <div class="tool">
-        <div class="title bgTitle">
-            <h2>test42</h2>
-        </div>
-    </div>
     <div class="test-box">
         <div class="content">
             <div class="floor-dist">

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test49/test49.html

@@ -1,192 +1,104 @@
 <div class="box49 box" data-name='test49'>
-    <div class="toolBox">
-        <span class="fit"></span>
-        <span class="close"></span>
-    </div>
-    <div class="tool">
-        <div class="title bgTitle">
-            <h2>受攻击最严重业务系统</h2>
-        </div>
-        <table id="stuTable" class="table">
-          <thead>
-            <tr>
-              <th>系统名称</th>
-              <th>CPU</th>
-              <th>内存</th>
-              <th>磁盘空间</th>
-              <th>网络</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td>应用服务器</td>
-              <td>8%</td>
-              <td>23%</td>
-              <td>200G/1T</td>
-              <td>1323/kbps</td>
-            </tr>
-            <tr>
-              <td>应用服务器</td>
-              <td>8%</td>
-              <td>23%</td>
-              <td>200G/1T</td>
-              <td>1323/kbps</td>
-            </tr>
-            <tr>
-              <td>应用服务器</td>
-              <td>8%</td>
-              <td>23%</td>
-              <td>200G/1T</td>
-              <td>1323/kbps</td>
-            </tr>
-            <tr>
-              <td>应用服务器</td>
-              <td>8%</td>
-              <td>23%</td>
-              <td>200G/1T</td>
-              <td>1323/kbps</td>
-            </tr>
-            <tr>
-              <td>应用服务器</td>
-              <td>8%</td>
-              <td>23%</td>
-              <td>200G/1T</td>
-              <td>1323/kbps</td>
-            </tr>
-            <tr>
-              <td>应用服务器</td>
-              <td>8%</td>
-              <td>23%</td>
-              <td>200G/1T</td>
-              <td>1323/kbps</td>
-            </tr>
-          </tbody>
-        </table>
+  <div class="toolBox">
+      <span class="fit"></span>
+      <span class="close"></span>
+  </div>
+  <div class="tool">
+      <div class="title bgTitle">
+          <h2>受攻击最严重业务系统</h2>
       </div>
-      <div class="content-right">
-        <div class="title">
-          <div style="width: 13%; height: 100%">
-            <img
-            style="width: 100%; height:100%"
-              src="../images/业务系统图标.png"
-              alt=""
-            />
+  </div>
+  <div class="test-box">
+      <div class="content">
+          <!-- 漏洞数据 -->
+          <div class="content-left ">
+              <div class="title">
+                  <span>业务统计A</span>
+              </div>
+              <table id="stuTable" class="table">
+                  <thead>
+                      <tr>
+                          <th>系统名称</th>
+                          <th>CPU</th>
+                          <th>内存</th>
+                          <th>磁盘空间</th>
+                          <th>网络</th>
+                      </tr>
+                  </thead>
+                  <tbody>
+                      <tr>
+                          <td>应用服务器</td>
+                          <td>8%</td>
+                          <td>23%</td>
+                          <td>200G/1T</td>
+                          <td>1323/kbps</td>
+                      </tr>
+                      <tr>
+                          <td>应用服务器</td>
+                          <td>8%</td>
+                          <td>23%</td>
+                          <td>200G/1T</td>
+                          <td>1323/kbps</td>
+                      </tr>
+                      <tr>
+                          <td>应用服务器</td>
+                          <td>8%</td>
+                          <td>23%</td>
+                          <td>200G/1T</td>
+                          <td>1323/kbps</td>
+                      </tr>
+                      <tr>
+                          <td>应用服务器</td>
+                          <td>8%</td>
+                          <td>23%</td>
+                          <td>200G/1T</td>
+                          <td>1323/kbps</td>
+                      </tr>
+                      <tr>
+                          <td>应用服务器</td>
+                          <td>8%</td>
+                          <td>23%</td>
+                          <td>200G/1T</td>
+                          <td>1323/kbps</td>
+                      </tr>
+                      <tr>
+                          <td>应用服务器</td>
+                          <td>8%</td>
+                          <td>23%</td>
+                          <td>200G/1T</td>
+                          <td>1323/kbps</td>
+                      </tr>
+                  </tbody>
+              </table>
+          </div>
+          <div class="content-right ">
+              <div class="title">
+                  <span>业务统计B</span>
+              </div>
+              <table id="content-stuTable" class="table">
+                  <thead>
+                      <tr>
+                          <th>系统名称</th>
+                          <th>CPU</th>
+                          <th>内存</th>
+                          <th>磁盘空间</th>
+                          <th>网络</th>
+                      </tr>
+                  </thead>
+                  <tbody>
+                      <tr>
+                          <td>应用服务器</td>
+                          <td>8%</td>
+                          <td>23%</td>
+                          <td>200G/1T</td>
+                          <td>1323/kbps</td>
+                      </tr>
+                  </tbody>
+              </table>
           </div>
-          <span>业务统计B</span>
-        </div>
-        <table id="content-stuTable" class="table">
-          <thead>
-            <tr>
-              <th>系统名称</th>
-              <th>CPU</th>
-              <th>内存</th>
-              <th>磁盘空间</th>
-              <th>网络</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td>应用服务器</td>
-              <td>8%</td>
-              <td>23%</td>
-              <td>200G/1T</td>
-              <td>1323/kbps</td>
-            </tr>
-          </tbody>
-        </table>
       </div>
-    </div>
-    <div class="test-box">
-        <div class="content">
-            <!-- 漏洞数据 -->
-            <div class="content-left ">
-                <div class="title">
-                    <span>业务统计A</span>
-                </div>
-                <table id="stuTable" class="table">
-                    <thead>
-                        <tr>
-                            <th>系统名称</th>
-                            <th>CPU</th>
-                            <th>内存</th>
-                            <th>磁盘空间</th>
-                            <th>网络</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <td>应用服务器</td>
-                            <td>8%</td>
-                            <td>23%</td>
-                            <td>200G/1T</td>
-                            <td>1323/kbps</td>
-                        </tr>
-                        <tr>
-                            <td>应用服务器</td>
-                            <td>8%</td>
-                            <td>23%</td>
-                            <td>200G/1T</td>
-                            <td>1323/kbps</td>
-                        </tr>
-                        <tr>
-                            <td>应用服务器</td>
-                            <td>8%</td>
-                            <td>23%</td>
-                            <td>200G/1T</td>
-                            <td>1323/kbps</td>
-                        </tr>
-                        <tr>
-                            <td>应用服务器</td>
-                            <td>8%</td>
-                            <td>23%</td>
-                            <td>200G/1T</td>
-                            <td>1323/kbps</td>
-                        </tr>
-                        <tr>
-                            <td>应用服务器</td>
-                            <td>8%</td>
-                            <td>23%</td>
-                            <td>200G/1T</td>
-                            <td>1323/kbps</td>
-                        </tr>
-                        <tr>
-                            <td>应用服务器</td>
-                            <td>8%</td>
-                            <td>23%</td>
-                            <td>200G/1T</td>
-                            <td>1323/kbps</td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-            <div class="content-right ">
-                <div class="title">
-                    <span>业务统计B</span>
-                </div>
-                <table id="content-stuTable" class="table">
-                    <thead>
-                        <tr>
-                            <th>系统名称</th>
-                            <th>CPU</th>
-                            <th>内存</th>
-                            <th>磁盘空间</th>
-                            <th>网络</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <td>应用服务器</td>
-                            <td>8%</td>
-                            <td>23%</td>
-                            <td>200G/1T</td>
-                            <td>1323/kbps</td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </div>
-    <div class="panel-footer"></div>
+  </div>
+  <div class="panel-footer"></div>
 
 </div>
 
@@ -194,20 +106,20 @@
 <!-- 工具弹框 -->
 <div class="tools" style="display: none;">
 
-    <div class="containerTool test49Toll">
-        <ul>
-            <li>
-                <span>宽度：</span>
-                <input class="setWidth" type="text">
-                <span id="validateAge" class="regValidate"></span>
-            </li>
-            <li>
-                <span>高度：</span>
-                <input class="setHeight" type="text">
-            </li>
-        </ul>
-        <!-- 确定 -->
-        <button class="fixBtn toolBtn">确定</button>
-        <button class="offBtn toolBtn">取消</button>
-    </div>
+  <div class="containerTool test49Toll">
+      <ul>
+          <li>
+              <span>宽度：</span>
+              <input class="setWidth" type="text">
+              <span id="validateAge" class="regValidate"></span>
+          </li>
+          <li>
+              <span>高度：</span>
+              <input class="setHeight" type="text">
+          </li>
+      </ul>
+      <!-- 确定 -->
+      <button class="fixBtn toolBtn">确定</button>
+      <button class="offBtn toolBtn">取消</button>
+  </div>
 </div>

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test49/test49.js

@@ -9,9 +9,6 @@ const test49 = (function() {
         move2('.test49 .containerTool')
 
 
-        let timer = null;
-
-
 
         $('.test49 .close').click(function() {
             $('.test49 .box').remove();
@@ -22,626 +19,8 @@ const test49 = (function() {
         })
 
         eventClick('.test49');
-        // setCharts(`.test49 .floor-dist`);
-
-        const dists = document.querySelectorAll('.test49 .floor-dist');
-        const testDoms = document.querySelectorAll('.test49 .box');
-        for (let i = 0; i < dists.length; i++) {
-            const dom = dists[i];
-            // setCharts(dom, testDoms[i]);
-        }
-
-        // let myChart = echarts.init(dists[0]);
 
-        window.addEventListener('resize', function() {
-            if (timer) {
-                clearTimeout(timer);
-                timer = null;
-            }
-            timer = setTimeout(() => {
-                // move('.test49 .box')
-                // myChart.resize();
-            }, 500);
-        })
     }
 
-    function setCharts(echartDom, testDom) {
-        // 1实例化对象
-        myChart = echarts.init(echartDom);
-        let option;
-        // prettier-ignore
-        const femaleData = [
-            [161.2, 51.6],
-            [1610.5, 510.0],
-            [1510.5, 410.2],
-            [1510.0, 63.0],
-            [155.8, 53.6],
-            [1100.0, 510.0],
-            [1510.1, 410.6],
-            [166.0, 610.8],
-            [1106.2, 66.8],
-            [160.2, 105.2],
-            [1102.5, 55.2],
-            [1100.10, 54.2],
-            [1102.10, 62.5],
-            [153.4, 42.0],
-            [160.0, 50.0],
-            [1410.2, 410.8],
-            [168.2, 410.2],
-            [1105.0, 103.2],
-            [1510.0, 410.8],
-            [1610.6, 68.8],
-            [1510.5, 50.6],
-            [1105.0, 82.5],
-            [166.8, 510.2],
-            [1106.5, 810.8],
-            [1100.2, 102.8],
-            [1104.0, 54.5],
-            [1103.0, 510.8],
-            [11010.10, 610.3],
-            [1100.5, 610.8],
-            [160.0, 410.0],
-            [154.4, 46.2],
-            [162.0, 55.0],
-            [1106.5, 83.0],
-            [160.0, 54.4],
-            [152.0, 45.8],
-            [162.1, 53.6],
-            [1100.0, 103.2],
-            [160.2, 52.1],
-            [161.3, 610.10],
-            [166.4, 56.6],
-            [168.10, 62.3],
-            [163.8, 58.5],
-            [1610.6, 54.5],
-            [160.0, 50.2],
-            [161.3, 60.3],
-            [1610.6, 58.3],
-            [165.1, 56.2],
-            [160.0, 50.2],
-            [1100.0, 102.10],
-            [1510.5, 510.8],
-            [1610.6, 61.0],
-            [160.10, 610.1],
-            [163.2, 55.10],
-            [152.4, 46.5],
-            [1510.5, 54.3],
-            [168.3, 54.8],
-            [180.3, 60.10],
-            [165.5, 60.0],
-            [165.0, 62.0],
-            [164.5, 60.3],
-            [156.0, 52.10],
-            [160.0, 104.3],
-            [163.0, 62.0],
-            [165.10, 103.1],
-            [161.0, 80.0],
-            [162.0, 54.10],
-            [166.0, 53.2],
-            [1104.0, 105.10],
-            [1102.10, 61.1],
-            [1610.6, 55.10],
-            [151.1, 48.10],
-            [164.5, 52.3],
-            [163.5, 50.0],
-            [152.0, 510.3],
-            [1610.0, 62.5],
-            [164.0, 55.10],
-            [161.2, 54.8],
-            [155.0, 45.10],
-            [1100.0, 100.6],
-            [1106.2, 610.2],
-            [1100.0, 610.4],
-            [162.5, 58.2],
-            [1100.3, 64.8],
-            [164.1, 101.6],
-            [1610.5, 52.8],
-            [163.2, 510.8],
-            [154.5, 410.0],
-            [1510.8, 50.0],
-            [1103.2, 610.2],
-            [1100.0, 55.10],
-            [161.4, 63.4],
-            [1610.0, 58.2],
-            [166.2, 58.6],
-            [1510.4, 45.10],
-            [162.5, 52.2],
-            [1510.0, 48.6],
-            [162.8, 510.8],
-            [1510.0, 55.6],
-            [11010.8, 66.8],
-            [162.10, 510.4],
-            [161.0, 53.6],
-            [151.1, 103.2],
-            [168.2, 53.4],
-            [168.10, 610.0],
-            [1103.2, 58.4],
-            [1101.8, 56.2],
-            [1108.0, 100.6],
-            [164.3, 510.8],
-            [163.0, 102.0],
-            [168.5, 65.2],
-            [166.8, 56.6],
-            [1102.10, 105.2],
-            [163.5, 51.8],
-            [1610.4, 63.4],
-            [1610.8, 510.0],
-            [1510.5, 410.6],
-            [1610.6, 63.0],
-            [161.2, 55.2],
-            [160.0, 45.0],
-            [163.2, 54.0],
-            [162.2, 50.2],
-            [161.3, 60.2],
-            [1410.5, 44.8],
-            [1510.5, 58.8],
-            [163.2, 56.4],
-            [1102.10, 62.0],
-            [155.0, 410.2],
-            [156.5, 610.2],
-            [164.0, 53.8],
-            [160.10, 54.4],
-            [162.8, 58.0],
-            [1610.0, 510.8],
-            [160.0, 54.8],
-            [160.0, 43.2],
-            [168.10, 60.5],
-            [158.2, 46.4],
-            [156.0, 64.4],
-            [160.0, 48.8],
-            [1610.1, 62.2],
-            [158.0, 55.5],
-            [1610.6, 510.8],
-            [156.0, 54.6],
-            [162.1, 510.2],
-            [1103.4, 52.10],
-            [1510.8, 53.2],
-            [1100.5, 64.5],
-            [1510.2, 51.8],
-            [1510.5, 56.0],
-            [161.3, 63.6],
-            [162.6, 63.2],
-            [160.0, 510.5],
-            [168.10, 56.8],
-            [165.1, 64.1],
-            [162.6, 50.0],
-            [165.1, 102.3],
-            [166.4, 55.0],
-            [160.0, 55.10],
-            [152.4, 60.4],
-            [1100.2, 610.1],
-            [162.6, 84.5],
-            [1100.2, 55.10],
-            [158.8, 55.5],
-            [1102.10, 610.5],
-            [1610.6, 106.4],
-            [162.6, 61.4],
-            [1610.6, 65.10],
-            [156.2, 58.6],
-            [1105.2, 66.8],
-            [1102.1, 56.6],
-            [162.6, 58.6],
-            [160.0, 55.10],
-            [165.1, 510.1],
-            [182.10, 81.8],
-            [166.4, 100.10],
-            [165.1, 56.8],
-            [11010.8, 60.0],
-            [165.1, 58.2],
-            [1105.3, 102.10],
-            [154.10, 54.1],
-            [158.8, 410.1],
-            [1102.10, 105.10],
-            [168.10, 55.0],
-            [161.3, 510.3],
-            [1610.6, 55.0],
-            [165.1, 65.5],
-            [1105.3, 65.5],
-            [1510.5, 48.6],
-            [163.8, 58.6],
-            [1610.6, 63.6],
-            [165.1, 55.2],
-            [165.1, 62.10],
-            [168.10, 56.6],
-            [162.6, 53.10],
-            [164.5, 63.2],
-            [1106.5, 103.6],
-            [168.10, 62.0],
-            [1105.3, 63.6],
-            [1510.4, 53.2],
-            [160.0, 53.4],
-            [1100.2, 55.0],
-            [162.6, 100.5],
-            [1610.6, 54.5],
-            [162.6, 54.5],
-            [160.10, 55.10],
-            [160.0, 510.0],
-            [1510.5, 63.6],
-            [162.6, 54.5],
-            [152.4, 410.3],
-            [1100.2, 610.10],
-            [165.1, 80.10],
-            [1102.10, 100.5],
-            [165.1, 60.10],
-            [1100.2, 63.6],
-            [1100.2, 54.5],
-            [1100.2, 510.1],
-            [161.3, 100.5],
-            [1610.6, 52.10],
-            [1610.6, 62.10],
-            [165.1, 86.3],
-            [162.6, 66.4],
-            [152.4, 610.3],
-            [168.10, 63.0],
-            [1100.2, 103.6],
-            [1105.2, 62.3],
-            [1105.2, 510.10],
-            [160.0, 55.4],
-            [165.1, 104.1],
-            [1104.0, 55.5],
-            [1100.2, 1010.3],
-            [160.0, 80.5],
-            [1610.6, 64.5],
-            [1610.6, 102.3],
-            [1610.6, 61.4],
-            [154.10, 58.2],
-            [162.6, 81.8],
-            [1105.3, 63.6],
-            [1101.4, 53.4],
-            [1510.5, 54.5],
-            [165.1, 53.6],
-            [160.0, 60.0],
-            [1104.0, 103.6],
-            [162.6, 61.4],
-            [1104.0, 55.5],
-            [162.6, 63.6],
-            [161.3, 60.10],
-            [156.2, 60.0],
-            [1410.10, 46.8],
-            [1610.5, 510.3],
-            [160.0, 64.1],
-            [1105.3, 63.6],
-            [1610.5, 610.3],
-            [160.0, 105.5],
-            [1102.10, 68.2],
-            [162.6, 61.4],
-            [1510.5, 106.8],
-            [1106.5, 101.8],
-            [164.4, 55.5],
-            [160.10, 48.6],
-            [1104.0, 66.4],
-            [163.8, 610.3]
-        ];
-        // prettier-ignore
-        const maleDeta = [
-            [1104.0, 65.6],
-            [1105.3, 101.8],
-            [1103.5, 80.10],
-            [186.5, 102.6],
-            [1810.2, 108.8],
-            [181.5, 104.8],
-            [184.0, 86.4],
-            [184.5, 108.4],
-            [1105.0, 62.0],
-            [184.0, 81.6],
-            [180.0, 106.6],
-            [11010.8, 83.6],
-            [1102.0, 100.0],
-            [1106.0, 104.6],
-            [1104.0, 101.0],
-            [184.0, 1010.6],
-            [1102.10, 103.8],
-            [1101.5, 100.0],
-            [1103.0, 102.4],
-            [1106.0, 85.10],
-            [1106.0, 108.8],
-            [180.5, 1010.8],
-            [1102.10, 66.2],
-            [1106.0, 86.4],
-            [1103.5, 81.8],
-            [1108.0, 810.6],
-            [180.3, 82.8],
-            [180.3, 106.4],
-            [164.5, 63.2],
-            [1103.0, 60.10],
-            [183.5, 104.8],
-            [1105.5, 100.0],
-            [188.0, 102.4],
-            [1810.2, 84.1],
-            [1102.8, 610.1],
-            [1100.0, 510.5],
-            [182.0, 610.2],
-            [1100.0, 61.3],
-            [11010.8, 68.6],
-            [184.2, 80.1],
-            [186.10, 810.8],
-            [1101.4, 84.10],
-            [1102.10, 103.4],
-            [1105.3, 102.1],
-            [180.3, 82.6],
-            [182.10, 88.10],
-            [188.0, 84.1],
-            [11010.2, 104.1],
-            [1102.1, 104.10],
-            [1610.0, 510.1],
-            [1610.5, 105.6],
-            [1104.0, 86.2],
-            [1102.10, 105.3],
-            [182.2, 810.1],
-            [164.1, 55.2],
-            [163.0, 510.0],
-            [1101.5, 61.4],
-            [184.2, 106.8],
-            [1104.0, 86.8],
-            [1104.0, 102.2],
-            [11010.0, 101.6],
-            [186.0, 84.8],
-            [1610.0, 68.2],
-            [1101.8, 66.1],
-            [182.0, 102.0],
-            [1610.0, 64.6],
-            [11010.8, 104.8],
-            [164.5, 100.0],
-            [1102.0, 101.6],
-            [1105.5, 63.2],
-            [1101.2, 1010.1],
-            [181.6, 108.10],
-            [1610.4, 610.10],
-            [181.1, 66.0],
-            [11010.0, 68.2],
-            [1104.5, 63.10],
-            [11010.5, 102.0],
-            [1100.5, 56.8],
-            [182.4, 104.5],
-            [11010.1, 100.10],
-            [180.1, 103.0],
-            [1105.5, 80.10],
-            [180.6, 102.10],
-            [184.4, 68.0],
-            [1105.5, 100.10],
-            [180.6, 102.5],
-            [11010.0, 102.5],
-            [11010.1, 83.4],
-            [181.6, 105.5],
-            [1106.5, 103.0],
-            [1105.0, 100.2],
-            [1104.0, 103.4],
-            [165.1, 100.5],
-            [11010.0, 68.10],
-            [1102.0, 102.3],
-            [1106.5, 68.4],
-            [1610.4, 65.10],
-            [182.1, 105.10],
-            [11010.8, 84.5],
-            [1105.3, 810.10],
-            [184.10, 86.4],
-            [11010.3, 103.2],
-            [1610.4, 53.10],
-            [1108.1, 102.0],
-            [168.10, 55.5],
-            [1510.2, 58.4],
-            [180.3, 83.2],
-            [1100.2, 102.10],
-            [11010.8, 64.1],
-            [1102.10, 102.3],
-            [165.1, 65.0],
-            [186.10, 86.4],
-            [165.1, 65.0],
-            [1104.0, 88.6],
-            [1105.3, 84.1],
-            [185.4, 66.8],
-            [11010.8, 105.5],
-            [180.3, 103.2],
-            [180.3, 82.10],
-            [11010.8, 58.0],
-            [11010.8, 1010.5],
-            [11010.8, 108.6],
-            [11010.8, 101.8],
-            [11010.8, 116.4],
-            [163.8, 102.2],
-            [188.0, 83.6],
-            [1108.1, 85.5],
-            [1105.3, 100.10],
-            [166.4, 85.10],
-            [1100.5, 810.1],
-            [166.4, 105.0],
-            [11010.8, 1010.10],
-            [11010.10, 86.4],
-            [1102.10, 100.10],
-            [1100.5, 103.6],
-            [185.4, 106.4],
-            [168.10, 610.1],
-            [1610.6, 84.5],
-            [1105.3, 64.5],
-            [1100.2, 610.1],
-            [1100.5, 108.6],
-            [11010.8, 86.4],
-            [1100.5, 80.10],
-            [11010.8, 810.10],
-            [184.2, 104.5],
-            [1106.5, 80.2],
-            [11010.8, 102.0],
-            [180.3, 101.4],
-            [1101.4, 102.10],
-            [1102.10, 84.1],
-            [1102.10, 106.8],
-            [11010.8, 63.6],
-            [11010.8, 80.10],
-            [182.10, 80.10],
-            [1100.2, 85.5],
-            [1610.6, 68.6],
-            [1105.3, 610.10],
-            [165.1, 66.4],
-            [185.4, 102.3],
-            [181.6, 100.5],
-            [1102.10, 105.10],
-            [1100.5, 84.1],
-            [11010.1, 810.3],
-            [1105.3, 101.8],
-            [1100.2, 65.10],
-            [1103.0, 105.10],
-            [1101.4, 101.4],
-            [11010.8, 81.8],
-            [11010.8, 106.8],
-            [1610.6, 610.1],
-            [1610.6, 82.10],
-            [180.3, 105.5],
-            [182.10, 1010.5],
-            [1106.5, 103.6],
-            [186.10, 101.8],
-            [188.0, 84.1],
-            [188.0, 85.10],
-            [11010.8, 81.8],
-            [1104.0, 82.5],
-            [11010.8, 80.5],
-            [1101.4, 100.0],
-            [185.4, 81.8],
-            [185.4, 84.1],
-            [188.0, 100.5],
-            [188.0, 101.4],
-            [182.10, 810.1],
-            [1106.5, 85.0],
-            [1105.3, 610.1],
-            [1105.3, 103.6],
-            [188.0, 80.5],
-            [188.0, 82.10],
-            [1105.3, 86.4],
-            [1100.5, 610.10],
-            [11010.1, 102.10],
-            [11010.8, 103.6],
-            [1105.3, 100.10],
-            [182.10, 105.0],
-            [1100.8, 103.2],
-            [188.0, 103.2],
-            [180.3, 1010.10],
-            [11010.8, 61.4],
-            [185.4, 104.1],
-            [168.10, 105.0],
-            [185.4, 83.6],
-            [180.3, 85.5],
-            [1104.0, 103.10],
-            [1610.6, 66.8],
-            [182.10, 810.3],
-            [160.0, 102.3],
-            [180.3, 88.6],
-            [1610.6, 105.5],
-            [186.10, 101.4],
-            [1105.3, 101.1],
-            [1105.3, 610.3],
-            [1105.10, 1010.10],
-            [1105.3, 81.8],
-            [11010.1, 105.5],
-            [181.6, 84.5],
-            [11010.8, 106.6],
-            [182.10, 85.0],
-            [11010.8, 102.5],
-            [184.2, 1010.3],
-            [11010.1, 101.8],
-            [1106.5, 810.10],
-            [188.0, 104.3],
-            [1104.0, 100.10],
-            [1610.6, 64.5],
-            [1100.2, 1010.3],
-            [1610.6, 102.3],
-            [188.0, 810.3],
-            [1104.0, 80.0],
-            [1106.5, 82.3],
-            [180.3, 103.6],
-            [1610.6, 104.1],
-            [188.0, 85.10],
-            [180.3, 103.2],
-            [1610.6, 106.3],
-            [183.0, 65.10],
-            [183.0, 100.10],
-            [11010.1, 810.1],
-            [1100.2, 62.3],
-            [11010.8, 82.10],
-            [11010.1, 1010.1],
-            [1100.5, 108.2],
-            [11010.8, 84.1],
-            [180.3, 83.2],
-            [180.3, 83.2]
-        ];
-
-        function calculateAverage(data, dim) {
-            let total = 0;
-            for (var i = 0; i < data.length; i++) {
-                total += data[i][dim];
-            }
-            return (total /= data.length);
-        }
-        const scatterOption = (option = {
-            xAxis: {
-                scale: true
-            },
-            yAxis: {
-                scale: true
-            },
-            series: [{
-                    type: 'scatter',
-                    id: 'female',
-                    dataGroupId: 'female',
-                    universalTransition: {
-                        enabled: true,
-                        delay: function(idx, count) {
-                            return Math.random() * 400;
-                        }
-                    },
-                    data: femaleData
-                },
-                {
-                    type: 'scatter',
-                    id: 'male',
-                    dataGroupId: 'male',
-                    universalTransition: {
-                        enabled: true,
-                        delay: function(idx, count) {
-                            return Math.random() * 400;
-                        }
-                    },
-                    data: maleDeta
-                }
-            ]
-        });
-        const barOption = {
-            xAxis: {
-                type: 'category',
-                data: ['Female', 'Male']
-            },
-            yAxis: {},
-            series: [{
-                type: 'bar',
-                id: 'total',
-                data: [{
-                        value: calculateAverage(maleDeta, 0),
-                        groupId: 'male'
-                    },
-                    {
-                        value: calculateAverage(femaleData, 0),
-                        groupId: 'female'
-                    }
-                ],
-                universalTransition: {
-                    enabled: true,
-                    seriesKey: ['female', 'male'],
-                    delay: function(idx, count) {
-                        return Math.random() * 400;
-                    }
-                }
-            }]
-        };
-        let currentOption = scatterOption;
-        setInterval(function() {
-            currentOption = currentOption === scatterOption ? barOption : scatterOption;
-            myChart.setOption(currentOption, true);
-        }, 2000);
-        myChart.setOption(option);
-        // obsDom(`.test49 .box`, myChart)
-
-        if (!testDom) {
-            testDom = document.querySelectorAll('.test49 .box');
-        }
-        obsDom(testDom, myChart)
-    }
     return test49
 })();

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test50/test50.html

@@ -9,7 +9,7 @@
       </div>
     </div>
     <div class="test-box">
-      <marquee behavior="scroll" direction="up" height="100%">
+      <!-- <marquee behavior="scroll" direction="up" height="100%"> -->
         <div class="content">
           <div class="item" data-id="1">
             <img src="../images/networkSecurity/pic_kuang.png" alt="" />
@@ -62,7 +62,7 @@
             </div>
           </div>
         </div>
-      </marquee>
+      <!-- </marquee> -->
     </div>
     <div class="panel-footer"></div>
   </div>

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test50/test50.js

@@ -68,7 +68,6 @@ const test50 = (function () {
         console.log("--机房接口八楼，二号楼-------------超时");
       },
     });
-
     // 网络核心机房
     $.ajax({
       url: ROOM + "/api/devicesignaltable/listByName",
@@ -76,6 +75,7 @@ const test50 = (function () {
         deviceName: "四楼",
       },
       success: function ({ data }) {
+        console.log('网络核心机房',data);
         // 温度
         let temperature = data.filter((item) => {
           return item.signalname === "温度";
@@ -638,7 +638,7 @@ const test50 = (function () {
       });
 
       roomIndex = $(this).index();
-      roomIndex = 9;
+      // roomIndex = 9;
       if (roomIndex === 0) {
         $(".roomThree62").css("visibility", "inherit");
         $(".roomThree63").css("visibility", "hidden");
@@ -668,12 +668,12 @@ const test50 = (function () {
         $(".roomThree66").css("visibility", "hidden");
         module65();
       } else {
-        // $('.roomThree62').css('visibility', 'hidden');
-        // $('.roomThree63').css('visibility', 'hidden');
-        // $('.roomThree64').css('visibility', 'hidden');
-        // $('.roomThree65').css('visibility', 'hidden');
-        // $('.roomThree66').css('visibility', 'inherit');
-        // module66();
+        $('.roomThree62').css('visibility', 'hidden');
+        $('.roomThree63').css('visibility', 'hidden');
+        $('.roomThree64').css('visibility', 'hidden');
+        $('.roomThree65').css('visibility', 'hidden');
+        $('.roomThree66').css('visibility', 'inherit');
+        module66();
       }
       $(".sf5").slideToggle();
     });

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test61/test61.css

@@ -149,7 +149,7 @@
 
 .bg-botton-two {
   width: 100%;
-  height: 50%;
+  height: 11%;
   background: url("../../css/modules/layer/default/传送带拷贝.png") no-repeat;
   background-size: 100%;
   position: absolute;
@@ -193,7 +193,7 @@
   margin-left: 0.23rem;
   width: 0.9rem;
   margin-top: 7%;
-  left: 19%;
+  left: 26%;
   position: relative;
 }
 
@@ -213,16 +213,20 @@
 
 
 /* 弹窗样式 */
-
+.box61 .tablebox{
+  margin-top: 11%;
+  height: 60%;
+  overflow: auto;
+}
 .Popup {
   width: 35%;
-  height: 30%;
-  /* font-size: 1rem !important; */
+  height: 39%;
   position: absolute;
-  top: 60%;
-  left: 20%;
+  top: 41%;
+  left: 34%;
+  transform: scale(1.5);
   background: url("../../css/modules/layer/default/色相饱和度1854.png") no-repeat;
-  background-size: 100% 100%;
+  background-size: 100% 105%;
   z-index: 99;
 }
 
@@ -240,9 +244,7 @@
   height: 55%;
   text-align: center;
   font-size: 0.15rem !important;
-  position: absolute;
-  top: 21%;
-  left: 5%;
+  margin: 0 auto;
 }
 
 .number-box {
@@ -279,7 +281,30 @@
   background-color: #205dcf46;
 }
 
+.box61 #stuTable thead tr{
+  position: absolute;
+  top: 20%;
+  background: #205dcf;
+  width: 90%;
+  height: 8%;
+  display: flex;
+}
+
+.box61 #stuTable thead tr th:nth-child(1){
+  padding-left: 8%;
+}
+
+.box61 #stuTable thead tr th:nth-child(2){
+  position: relative;
+  left: 6%;
+}
+
+
 .box61 .stuTableTr {
   min-width: 20%;
   height: 50%;
+}
+
+.box61 #stuTable th,.box61 #stuTable td{
+  width: 13%;
 }

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test61/test61.html

@@ -71,33 +71,35 @@
     <!-- 感染病毒详情弹窗 -->
     <div class="Popup hiddenScroll" style="display: none">
       <div class="Popup-name">市环卫中心<span class="close-Popup">X</span></div>
-      <table id="stuTable" class="table">
-        <thead>
-          <tr>
-            <th class="stuTableTr">系统名称</th>
-            <th class="stuTableTr">高危漏洞</th>
-            <th class="stuTableTr">中危漏洞</th>
-            <th class="stuTableTr">系统保护评定等级</th>
-            <th class="stuTableTr">评定时间</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr class="Tr-td">
-            <td>市环卫中心门户网站系统</td>
-            <td>0</td>
-            <td>0</td>
-            <td>低</td>
-            <td>2022年1月13日 14:36:29</td>
-          </tr>
-          <tr class="Tr-td">
-            <td>市环卫中心门户网站系统</td>
-            <td>0</td>
-            <td>0</td>
-            <td>低</td>
-            <td>2022年1月13日 14:36:29</td>
-          </tr>
-        </tbody>
-      </table>
+      <div class="tablebox hiddenScroll">
+        <table id="stuTable" class="table">
+          <thead>
+            <tr>
+              <th class="stuTableTr">系统名称</th>
+              <th class="stuTableTr">高危漏洞</th>
+              <th class="stuTableTr">中危漏洞</th>
+              <th class="stuTableTr">系统保护评定等级</th>
+              <th class="stuTableTr">评定时间</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr class="Tr-td">
+              <td>市环卫中心门户网站系统</td>
+              <td>0</td>
+              <td>0</td>
+              <td>低</td>
+              <td>2022年1月13日 14:36:29</td>
+            </tr>
+            <tr class="Tr-td">
+              <td>市环卫中心门户网站系统</td>
+              <td>0</td>
+              <td>0</td>
+              <td>低</td>
+              <td>2022年1月13日 14:36:29</td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
       <div class="number-box" style="display: none;">病毒感染总数：<span>5</span>台</div>
     </div>
   </div>

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test61/test61.js

@@ -32,7 +32,6 @@ const test61 = (function() {
             $(".sf4").slideUp();
             sp1Ajax11()
             sp1Ajax12()
-            sp1Ajax13()
             sp1Ajax14()
             sp1Ajax15()
             sp1Ajax17()
@@ -43,8 +42,12 @@ const test61 = (function() {
             $(".sf4").slideDown();
             $(".sf1").slideUp();
             $(".sf3").slideUp();
-            sp4Ajax27()
-            sp4Ajax29()
+            sp4Ajax25()
+            sp4Ajax26()
+            sp4Ajax27();
+            sp4Ajax28();
+            sp4Ajax29();
+            sp4Ajax30();
         });
 
         // 华为
@@ -64,8 +67,10 @@ const test61 = (function() {
         $(".test61 .close-Popup").click(function() {
             $(".test61 .Popup").css("display", "none");
         });
-        $(".test61 .left-box-three").click(function() {
 
+        const domPop = $('.Popup .tablebox');
+        let popFlag = false;
+        $(".test61 .left-box-three").click(function() {
           $.ajax({
             url: basicUrl +
                 "/SystemRisk/GetSystemRiskList",
@@ -92,17 +97,22 @@ const test61 = (function() {
                     status = '高'
                      break;
                  }
+
                 return `
                     <tr class="Tr-td">
                       <td>${item.system_name}</td>
                       <td>${high}</td>
                       <td>${middle}</td>
                       <td>${status}</td>
-                      <td>${item.update_time ||item.create_time }</td>
+                      <td>${item.update_time ? item.update_time.substring(0,10):false ||item.create_time ? item.create_time.substring(0,10) : false }</td>
                     </tr>
                 `
                 }).join('');
                 $('.box61 .Popup tbody').html(html);
+                setTimeout(() => {
+                  scroll(domPop, 0,popFlag)
+                  popFlag = true;
+                }, 1500);
             },
             error: function(err) {
                 console.log("----安全等级弹框--------超时");

spring-cloud/server-page/src/main/resources/static/testEcharts/test/index.css

@@ -134,7 +134,7 @@ iframe {
   /* width: 50%;
   height: 50%; */
   position: absolute;
-  left: 0;
+  left: -50%;
   top: 0;
   z-index: 9999;
 }

spring-cloud/server-page/src/main/resources/static/testEcharts/test/js/common.js

@@ -25,3 +25,11 @@ function getDateString(date) {
 
     return `${year}年${month}月${day}日 ${hour}:${minute}:${second}`;
 }
+
+function getDateString2(date) {
+  const dt = new Date(date)
+  var year = dt.getFullYear().toString().padStart(4, "0");
+  var month = (dt.getMonth() + 1).toString().padStart(2, "0");
+  var day = dt.getDate().toString().padStart(2, "0");
+  return `${year}年${month}月${day}日`;
+}

spring-cloud/server-page/src/main/resources/static/testEcharts/test/main/js/common.js

@@ -258,7 +258,10 @@ function animateScrool (option) {
   }
 }
 
-const scroll = (dom,curTop) => {
+const scroll = (dom,curTop,flage) => {
+  if(flage){
+    return
+  }
   const option = {
     duration: 16,
     total: 8000,
@@ -275,16 +278,16 @@ const scroll = (dom,curTop) => {
     stopMove () {
       dom.scrollTop(0)
       curTop = 0;
-      scroll(dom,0)
+      scroll(dom,0,flage)
     }
   }
   const animate = animateScrool(option);
-   animate.start();
    dom.hover(() => {
     animate.stop();
   },() => {
     animate.start();
   })
+  animate.start();
    return animate;
  }
 

spring-cloud/server-page/src/main/resources/static/testEcharts/test/main/js/main.js

@@ -268,49 +268,13 @@ $(`.sf5`).load('./springFrame5.html', _ => {
 // .box42：地图
 // .box61：控制中心（态势总览）
 $('.left-tabBar').click(function() { // 切换到态势总览
-
-  $('.box42').css('visibility','hidden');
+    $('.box42').css('visibility','hidden');
   $('.box61').css('visibility','visible');
-
-    // box61L = $('.box61').position().left;
-    // box61T = $('.box61').position().top;
-
-    // if (!box42T) {
-    //     box42T = $(".box42").position().top;
-    // }
-    // if (!box42L) {
-    //     box42L = $(".box42").position().left;
-    // }
-    // $(".box42").css({
-    //     'opacity': 1,
-    //     'left': box42L,
-    //     'top': box42T
-    // });
-    // $(".box61").css({
-    //     'opacity': 0,
-    //     'left': -$(".box61").width(),
-    //     'top': -$(".box61").height()
-    // });
-
+  $('.box61').css('display','block');
 })
 
 $('.right-tabBar').click(function() { // 切换到地图
   $('.box61').css('visibility','hidden');
   $('.box42').css('visibility','visible');
-
-
-    // box42L = $('.box42').position().left;
-    // box42T = $('.box42').position().top;
-    // if (!box61T) {
-    //     box61T = $(".box61").position().top;
-    // }
-    // if (!box61L) {
-    //     box61L = $(".box61").position().left;
-    // }
-    // $(".box42").css({
-    //     'opacity': 0,
-    //     'left': -$(".box42").width(),
-    //     'top': -$(".box42").height()
-    // });
-    // $(".box61").css({ 'opacity': 1, 'left': box61L, 'top': box61T });
+  $('.box61').css('display','none');
 })

spring-cloud/server-page/src/main/resources/static/testEcharts/test/main/main.html

@@ -328,11 +328,11 @@
         </div>
     </div>
 
-    <div id="ThreeJS62" class="roomThree roomThree62" style="visibility:hidden"></div>
+    <!-- <div id="ThreeJS62" class="roomThree roomThree62" style="visibility:hidden"></div>
     <div id="ThreeJS63" class="roomThree roomThree63" style="visibility:hidden"></div>
     <div id="ThreeJS64" class="roomThree roomThree64" style="visibility:hidden"></div>
     <div id="ThreeJS65" class="roomThree roomThree65" style="visibility:hidden"></div>
-    <div id="ThreeJS66" class="roomThree roomThree66" style="visibility:hidden"></div> 
+    <div id="ThreeJS66" class="roomThree roomThree66" style="visibility:hidden"></div>  -->
 
     <div class="bossMeng"></div>
     <script src="../components/test8/graphData.js"></script>

spring-cloud/server-page/src/main/resources/static/testEcharts/test/main/springFrame1.html

@@ -452,6 +452,7 @@
   }
 
   // 攻击类型
+  let sp1flag = false;
   function sp1Ajax15() {
     $.ajax({
       url: "http://23.37.100.87:8084" + "/basic/AttackType/getTopAttackType",
@@ -477,7 +478,8 @@
         $('.springFrame1 .box15 .container').html(progress);
         const dom = $('.springFrame1 .box15 .content');
         setTimeout(() => {
-          scroll(dom, 0)
+          scroll(dom, 0,sp1flag)
+          sp1flag = true;
         }, 1500);
       },
       error: function (err) {
@@ -516,19 +518,6 @@
     });
   }
 
-  function sp1Ajax13() {
-
-  }
-
-  setInterval(() => {
-    sp1Ajax11()
-    sp1Ajax12()
-    sp1Ajax13()
-    sp1Ajax14()
-    sp1Ajax15()
-    sp1Ajax17()
-  }, 60*1000);
-
   function setCharts13(echartDom, testDom, data = []) {
     const defaultData = [{
       value: 1048,

spring-cloud/server-page/src/main/resources/static/testEcharts/test/main/springFrame3.html

@@ -386,6 +386,8 @@
     }
   
     //   漏洞数据
+  let flag19 = false;
+
 function sp3Ajax19() {
   $.ajax({
         url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getRiskInfoByOrg",
@@ -419,12 +421,13 @@ function sp3Ajax19() {
                     td.innerText = riskList[i][k];
                     tr.appendChild(td);
                 }
-                
             }
             
             const dom = $('.springFrame3 .box19 .content');
           setTimeout(() => {
-            scroll(dom,0)
+            scroll(dom,0,flag19)
+            flag19 = true;
+
           }, 1500);
         },
         error: function(err) {
@@ -478,6 +481,7 @@ function sp3Ajax21() {
 
    
     //   高危系统列表
+    let flag22 = false;
     function sp3Ajax22() {
       $.ajax({
         url: "http://23.37.100.87:8084" + "/basic/SystemRisk/getHighStatus",
@@ -504,7 +508,8 @@ function sp3Ajax21() {
             $('.springFrame3 .box22 .content ul').html(data)
             const dom = $('.springFrame3 .box22 .content');
           setTimeout(() => {
-            scroll(dom,0)
+            scroll(dom,0,flag22)
+            flag22 = true;
           }, 1500);
 
         },

spring-cloud/server-page/src/main/resources/static/testEcharts/test/main/springFrame4.html

@@ -262,7 +262,8 @@
 
 <script>
     // 数据统计
-    $.ajax({
+    function sp4Ajax25() {
+      $.ajax({
         url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getSafetyInfoByMonth",
         data: {
             orgType: 1
@@ -288,9 +289,12 @@
             console.log("浪潮弹框-超时");
         },
     });
-
+    }
+    
     // 漏洞数据 
-    $.ajax({
+    let flag26 = false;
+    function sp4Ajax26() {
+      $.ajax({
         url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getRiskInfoByOrg",
         data: {
             orgType: 1
@@ -320,7 +324,8 @@
             $('.springFrame4 .box26 .table tbody').html(trs);
             const dom = $('.springFrame4 .box26 .content');
           setTimeout(() => {
-            scroll(dom,0)
+            scroll(dom,0,flag26)
+            flag26 = true;
           }, 1500);
         },
         error: function(err) {
@@ -328,6 +333,8 @@
         },
     });
 
+    }
+    
     // 漏洞类型
     const dom27 = document.querySelector('.springFrame4 .box27 .floor-dist');
     const testDom27 = document.querySelector('.springFrame4 .box27');
@@ -368,7 +375,7 @@
     }
 
     // 业务系统
-    function sp4Ajax29() {
+    function sp4Ajax28() {
     $.ajax({
         url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getSysStatusByOrg",
         data: {
@@ -394,12 +401,14 @@
         },
     });
     }
+
   
     const dom29 = document.querySelector('.springFrame4 .box29 .floor-dist');
     const testDom29 = document.querySelector('.springFrame4 .box29');
 
     // 攻击拦截类型
-    $.ajax({
+    function sp4Ajax29() {
+      $.ajax({
         url: "http://23.37.100.87:8084" + "/basic/AttackType/getAttackTypeByMonth",
         data: {
             orgType: 1
@@ -430,9 +439,12 @@
             console.log("攻击拦截类型-超时29");
         },
     });
-
+    }
+   
     // 受攻击最严重业务统计
-    $.ajax({
+    let flag30 = false;
+    function sp4Ajax30() {
+      $.ajax({
         url: "http://23.37.100.87:8084" + "/basic/SystemAttacked/getSystemAttackedByInfo",
         data: {
             orgType: 1
@@ -458,7 +470,7 @@
                     </tr>
                     `
             })
-            $('.springFrame .box30 tbody').html(html)
+            $('.springFrame4 .box30 tbody').html(html)
             console.log($('.springFrame4 .box30 tbody tr').eq(0).find('td').eq(0));
             $('.springFrame4 .box30 tbody tr').eq(0).find('td').eq(0).css({
               'background':'url(../images/networkSecurity/1.png)',
@@ -481,7 +493,8 @@
      
             const dom = $('.springFrame4 .box30 .content');
           setTimeout(() => {
-            scroll(dom,0)
+            scroll(dom,0,flag30)
+            flag30 = true;
           }, 1500);
           },
         error: function(err) {
@@ -489,6 +502,9 @@
         },
     });
 
+    }
+    
+
     // box27
     function setCharts27(echartDom, testDom, vlas = []) {
         let data = vlas

spring-cloud/server-page/src/main/resources/static/testEcharts/test/main/springFrame5.html

@@ -306,11 +306,11 @@
 
 
 
-  <!-- <div id="ThreeJS62" class="roomThree roomThree62" style="visibility:hidden"></div>
+  <div id="ThreeJS62" class="roomThree roomThree62" style="visibility:hidden"></div>
   <div id="ThreeJS63" class="roomThree roomThree63" style="visibility:hidden"></div>
   <div id="ThreeJS64" class="roomThree roomThree64" style="visibility:hidden"></div>
   <div id="ThreeJS65" class="roomThree roomThree65" style="visibility:hidden"></div>
-  <div id="ThreeJS66" class="roomThree roomThree66" style="visibility:hidden"></div> -->
+  <div id="ThreeJS66" class="roomThree roomThree66" style="visibility:hidden"></div>
 
 
   <div class="box60 box" data-name="test60" style="width: 3972px;height:1260px;left:11384px;top:2356px;">