Merge branch 'master' of http://116.63.33.55/git/dt2

spring-cloud/server-page/src/main/resources/static/ipad/js/basic/direct/index.js

@@ -151,7 +151,7 @@ const UI = {
                     // 		path: UI.DPZHD_PATH + 'browser/login/zhzxzhglpt'
                     // 	}
                     // }));
-                    util.get({
+                    $.get({
                         url: DPZHD_PATH + 'automation/guide/switch',
                         data: {
                             id: data.systemInfo.system_id

spring-cloud/server-page/src/main/resources/static/lbzd/css/ztzs.css

@@ -87,11 +87,28 @@ li {
 /* 新增 */
 
 .aba-theme {
+    position: relative;
     width: 100%;
     height: 100%;
+    transform: scale(0.2, 0.2);
+    transform-origin: top left;
 }
 
 .aba-theme iframe {
+    width: 10240px;
+    height: 2686.57px;
+}
+
+.back-ztzs {
+    position: fixed;
+    top: 1%;
+    right: 1%;
+    width: 5%;
+    padding: 0.5%;
+    border-radius: 10px;
+    background-color: rgb(218, 33, 33);
+}
+
+.back-ztzs>img {
     width: 100%;
-    height: 100%;
 }

spring-cloud/server-page/src/main/resources/static/lbzd/ztzs.html

@@ -55,10 +55,30 @@
         </div>
         <!-- 适配主题展示 -->
         <div class="aba-theme" style="display: none;">
-            <iframe src="./indexb.html" frameborder="0"></iframe>
+            <iframe src="http://localhost:3000/totalplatform" frameborder="0"></iframe>
+        </div>
+        <div class="back-ztzs" style="display: none;">
+            <img src="img/back-ztzs.png" />
         </div>
     </div>
     <script src="js/jquery-3.5.1.min.js" type="text/javascript" charset="utf-8"></script>
+    <script>
+        window.onload = function() {
+            $(".ztzs-list").on("click", ".ztzs-item", function() {
+                $(".ztzs-list").css("display", "none");
+                $(".but-box").css("display", "none");
+                $(".aba-theme").css("display", "block");
+                $(".back-ztzs").css("display", "block");
+            })
+
+            $(".back-ztzs").on("click", function() {
+                $(".ztzs-list").css("display", "block");
+                $(".but-box").css("display", "flex");
+                $(".aba-theme").css("display", "none")
+                $(".back-ztzs").css("display", "none")
+            })
+        }
+    </script>
 </body>
 
 </html>

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

@@ -21,7 +21,7 @@
             <ul class="rightInfo">
                 <li>
                     <img src="../images/networkSecurity/gwld.png" alt="">
-                    <span>已失资产数</span>
+                    <span>已失陷资产数</span>
                     <div>
                         <span class="num">0</span>
                         <i>个</i>
@@ -29,7 +29,7 @@
                 </li>
                 <li>
                     <img src="../images/networkSecurity/zwld.png" alt="">
-                    <span>已失资产数</span>
+                    <span>高风险资产数</span>
                     <div>
                         <span class="num">0</span>
                         <i>个</i>
@@ -37,7 +37,7 @@
                 </li>
                 <li>
                     <img src="../images/networkSecurity/zwld.png" alt="">
-                    <span>已失资产数</span>
+                    <span>低风险资产数</span>
                     <div>
                         <span class="num">0</span>
                         <i>个</i>

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

@@ -9,10 +9,6 @@ const test37 = (function() {
         move2('.test37 .containerTool')
 
 
-        let timer = null;
-
-
-
         $('.test37 .close').click(function() {
             $('.test37 .box').remove();
             $('.test37 .containerTool').css('display', 'none');
@@ -22,87 +18,25 @@ const test37 = (function() {
         })
 
         eventClick('.test37');
-        // setCharts(`.test37 .floor-dist`);
-
-        const dists = document.querySelectorAll('.test37 .floor-dist');
-        console.log(dists);
-        const testDoms = document.querySelectorAll('.test37 .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('.test37 .box')
-                // myChart.resize();
-            }, 500);
-        })
+        // 风险系数
+        $.ajax({
+          url: FLAT_PATH_THREE + '/apiUrl/sendApiUrlAndParam',
+          type: 'GET',
+          data: {
+            urlCode: 'AQZX_019',
+            params: '{"startTime":"2022-05-05 00:00:00","endTime":"2022-05-11 20:21:42"}'
+          },
+          success: function (res) {
+            console.log('风险系数', JSON.parse(res.data));
+            const result = JSON.parse(res.data);
+            // $('test37 .box37 .content li div .sum').eq(0).html(result[0])
+          },
+          error: function (err) {
+            console.log("----风险系数--------超时");
+          },
+        });
     }
 
-    function setCharts(echartDom, testDom) {
-
-        // 1实例化对象
-        myChart = echarts.init(echartDom);
-        let option = {
-            tooltip: {},
-            series: [{
-                type: 'tree',
-                data: [data],
-                left: '2%',
-                right: '2%',
-                top: '8%',
-                bottom: '20%',
-
-                layout: 'orthogonal',
-                orient: 'LR',
-
-                symbol: 'emptyCircle',
-                symbolSize: 7,
-
-                roam: true,
-
-                expandAndCollapse: true,
-                initialTreeDepth: 2,
-
-                itemStyle: {
-                    color: 'green', //树枝的填充色
-                },
-                label: {
-                    position: 'left',
-                    fontSize: 14,
-                },
-                lineStyle: {
-                    color: 'pink',
-                    width: 1,
-                    curveness: 0.5
-                },
-                emphasis: {
-                    label: {
-                        fontSize: 20,
-                    },
-                    lineStyle: { //没起作用
-                        color: 'blue',
-                    },
-                },
-                leaves: { //没有展开的样式
-                    label: {
-                        position: 'right',
-                    }
-                }
-            }]
-        };
-        myChart.setOption(option);
-
-        if (!testDom) {
-            testDom = document.querySelectorAll('.test37 .box');
-        }
-        obsDom(testDom, myChart)
-    }
     return test37
 })();

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

@@ -9,10 +9,6 @@ const test40 = (function() {
         move2('.test40 .containerTool')
 
 
-        let timer = null;
-
-
-
         $('.test40 .close').click(function() {
             $('.test40 .box').remove();
             $('.test40 .containerTool').css('display', 'none');
@@ -22,626 +18,51 @@ const test40 = (function() {
         })
 
         eventClick('.test40');
-        // setCharts(`.test40 .floor-dist`);
-
-        const dists = document.querySelectorAll('.test40 .floor-dist');
-        const testDoms = document.querySelectorAll('.test40 .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('.test40 .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]
-        ];
+        // 攻击来源
+        $.ajax({
+          url: FLAT_PATH_THREE + '/apiUrl/sendApiUrlAndParam',
+          type: 'GET',
+          data: {
+            urlCode: 'AQZX_017',
+            params: '{"url":"lastest/web/item/list","domain":"all","size":5}'
+          },
+          success: function (res) {
+            console.log('攻击来源', JSON.parse(res.data));
+            const result = JSON.parse(res.data);
+            const classify = list => list.reduce((result, currentItem) => {
+              (result[`${currentItem.attackSource}`] || (result[`${currentItem.attackSource}`] = [])).push(currentItem)
+              return result
+          }, {})
 
-        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 newRes = classify(result.data)
+          console.log(newRes);
+          const arr = []
+          for (const key in newRes) {
+            arr.push({
+                attress:key.split(',')[0],
+                attackIp:key.split(',')[1],
+                count:newRes[key].length
+            })
+          }
+          arr.sort((a,b)=> b.count - a.count)
+          let html = '';
+          arr.forEach((item,index) => {
+            html += `
+              <tr>
+                <td>${index+1}</td>
+                <td>${item.attress}</td>
+                <td>${item.attackIp}</td>
+                <td>${item.count}</td>
+              </tr>
+            `
+          })
+          $('.test40 .box40 tbody').html(html);
+          },
+          error: function (err) {
+            console.log("----攻击来源--------超时");
+          },
         });
-        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(`.test40 .box`, myChart)
-
-        if (!testDom) {
-            testDom = document.querySelectorAll('.test40 .box');
-        }
-        obsDom(testDom, myChart)
     }
     return test40
 })();

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

@@ -25,29 +25,48 @@ const test42 = (function() {
         eventClick('.test42');
         // setCharts(`.test42 .floor-dist`);
 
-        const dists = document.querySelectorAll('.test42 .floor-dist');
-        const testDoms = document.querySelectorAll('.test42 .box');
-        for (let i = 0; i < dists.length; i++) {
-            const dom = dists[i];
-            setCharts(dom, testDoms[i]);
-        }
+        const dom = document.querySelector('.test42 .floor-dist');
+        const testDom = document.querySelector('.test42 .box');
 
-        let myChart = echarts.init(dists[0]);
 
-        window.addEventListener('resize', function() {
-            if (timer) {
-                clearTimeout(timer);
-                timer = null;
-            }
-            timer = setTimeout(() => {
-                move3('.test42 .test-box')
+        // 态势地图
+        $.ajax({
+          url: FLAT_PATH_THREE + '/apiUrl/sendApiUrlAndParam',
+          type: 'GET',
+          data: {
+            urlCode: 'AQZX_018',
+            params: '{"beginTime":"2022-05-05 00:00:00","endTime":"2022-05-11 20:08:46"}'
+          },
+          success: function (res) {
+            console.log('态势地图', JSON.parse(res.data));
+            const result = JSON.parse(res.data);
+            const geo = result.payload.geo;
+            const chinaDatas = []
+            result.payload.world.thermodynamic.forEach(item => {
+              chinaDatas.push({
+                name: item.name,
+                value: item.value,
+                price: 100,
+                num: 2,
+              })
+            })
+            setCharts(dom, testDom,geo,chinaDatas);
+          },
+          error: function (err) {
+            console.log("----态势地图--------超时");
+          },
+        });
 
-                myChart.resize();
-            }, 500);
-        })
+
+        
+
+
+
+       
     }
 
-    function setCharts(echartDom, testDom) {
+    function setCharts(echartDom, testDom,chinaGeoCoordMap1,chinaDatas1) {
+      let timer = null;
         var myChart = echarts.init(echartDom);
         // 地图背景颜色
         const mapBgColor = '#000000';
@@ -144,6 +163,8 @@ const test42 = (function() {
             英国: [0.1, 51.3],
             俄罗斯: [37, 55],
         };
+        console.log(chinaGeoCoordMap);
+
         var chinaDatas = [
             [{
                 name: '英国',
@@ -331,7 +352,17 @@ const test42 = (function() {
         if (option) {
             myChart.setOption(option);
         }
+        window.addEventListener('resize', function() {
+          if (timer) {
+              clearTimeout(timer);
+              timer = null;
+          }
+          timer = setTimeout(() => {
+              move3('.test42 .test-box')
 
+              myChart.resize();
+          }, 500);
+      })
         if (!testDom) {
             testDom = document.querySelectorAll('.test42 .box');
         }

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

@@ -1,19 +1,19 @@
-.box43 .content {
-  margin: 0;
-}
-.box43 ul {
-  display: flex;
-  margin-top: 0.3rem;
-}
-.box43 ul li {
-  color: #fff;
-  flex: 1;
-  text-align: center;
-  position: relative;
-}
-.box43 ul li img {
-  width: 100%;
-}
-.box43 ul li .desc {
-  position: relative;
-}
+.box43 .content {
+  margin: 0;
+}
+.box43 ul {
+  display: flex;
+  margin-top: 0.3rem;
+}
+.box43 ul li {
+  color: #fff;
+  flex: 1;
+  text-align: center;
+  position: relative;
+}
+.box43 ul li img {
+  width: 52%;
+}
+.box43 ul li .desc {
+  position: relative;
+}

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

@@ -23,6 +23,7 @@
   width: 100%;
   height: 25%;
   /* background-image: linear-gradient(45deg, #155ed5, transparent); */
+}
   background: url("../../css/modules/layer/default/组245.png");
   background-size: 100% 100%;
 }

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

@@ -13,10 +13,10 @@
       <!-- 应急保障组成员信息 -->
       <div class="left">
         <div class="item" style="text-align: center">
-          <div style="width: 32%; height: 74%;" class="item-img1">
+          <div style="width: 30%; height: 100%">
             <img
               style="width: 100%; height: 100%"
-              src="../images/bgImg/组244.png"
+              src="../images/networkSecurity/zfx.png"
               alt=""
             />
           </div>
@@ -24,27 +24,27 @@
           <div class="server_prec" style="width: 33%">97%</div>
         </div>
         <div class="item" style="text-align: center">
-          <div style="width: 32%; height: 74%;">
-            <img
-              style="width: 100%; height: 100%"
-              src="../images/bgImg/组244.png"
-              alt=""
-            />
+            <div style="width: 30%; height: 100%">
+              <img
+                style="width: 100%; height: 100%"
+                src="../images/networkSecurity/zfx.png"
+                alt=""
+              />
+            </div>
+            <div class="text" style="width: 33%">服务器</div>
+            <div class="app_server_prec" style="width: 33%">97%</div>
           </div>
-          <div class="text" style="width: 33%">服务器</div>
-          <div class="app_server_prec" style="width: 33%">97%</div>
-        </div>
-        <div class="item" style="text-align: center">
-          <div style="width: 32%; height: 74%;">
-            <img
-              style="width: 100%; height: 100%"
-              src="../images/bgImg/组247.png"
-              alt=""
-            />
+          <div class="item" style="text-align: center">
+            <div style="width: 30%; height: 100%">
+              <img
+                style="width: 100%; height: 100%"
+                src="../images/networkSecurity/zfx.png"
+                alt=""
+              />
+            </div>
+            <div class="text" style="width: 33%">服务器</div>
+            <div class="other_prec" style="width: 33%">97%</div>
           </div>
-          <div class="text" style="width: 33%">服务器</div>
-          <div class="other_prec" style="width: 33%">97%</div>
-        </div>
         <!-- <div class="item">
           <img src="../images/networkSecurity/zfx.png" alt="" />
           <span class="text">应用服务器</span>
@@ -60,40 +60,7 @@
         <div class="floor-dist"></div>
       </div>
       <div class="right">
-        <div class="item" style="text-align: center">
-          <div style="width: 32%; height: 74%;">
-            <img
-              style="width: 100%; height: 100%"
-              src="../images/bgImg/组248.png"
-              alt=""
-            />
-          </div>
-          <div class="text" style="width: 33%">服务器</div>
-          <div class="network_prec" style="width: 33%">97%</div>
-        </div>
-        <div class="item" style="text-align: center">
-          <div style="width: 32%; height: 74%;">
-            <img
-              style="width: 100%; height: 100%"
-              src="../images/bgImg/组249.png"
-              alt=""
-            />
-          </div>
-          <div class="text" style="width: 33%">服务器</div>
-          <div class="app_system_prec" style="width: 33%">97%</div>
-        </div>
-        <div class="item" style="text-align: center">
-          <div style="width: 32%; height: 74%;">
-            <img
-              style="width: 100%; height: 100%"
-              src="../images/bgImg/组250.png"
-              alt=""
-            />
-          </div>
-          <div class="text" style="width: 33%">服务器</div>
-          <div class="database_prec" style="width: 33%">97%</div>
-        </div>
-        <!-- <div class="item">
+        <div class="item">
           <img src="../images/networkSecurity/zfx.png" alt="" />
           <span class="text">网络设备</span>
           <span class="network_prec">95%</span>
@@ -107,7 +74,7 @@
           <img src="../images/networkSecurity/zfx.png" alt="" />
           <span class="text">数据库</span>
           <span class="database_prec">9%</span>
-        </div> -->
+        </div>
       </div>
     </div>
   </div>

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

@@ -1,75 +1,78 @@
-.box45 .test-box {
-  overflow: hidden;
-}
-.box45 .content {
-  margin: 0;
-}
-.box45 .left,
-.box45 .right {
-  width: 50%;
-  height: 100%;
-  display: flex;
-  align-items: center;
-  flex: 1;
-  background: none;
-  position: relative;
-}
-.box45 .left span,
-.box45 .right span {
-  font-size: 15px;
-  color: #fff;
-  font-weight: bold;
-}
-.box45 .left .info,
-.box45 .right .info {
-  display: flex;
-  flex-direction: column;
-}
-.box45 .left .num,
-.box45 .right .num {
-  left: 52%;
-  top: 72%;
-}
-.box45 .left .txt,
-.box45 .right .txt {
-  font-size: 18px;
-  color: antiquewhite;
-}
-.box45 .left img,
-.box45 .right img {
-  width: 45%;
-}
-.box45 .dataCount_box {
-  display: flex;
-}
-.box45 table {
-  width: 100%;
-  text-align: center;
-  line-height: 30px;
-  font-size: 14px;
-}
-.box45 #stuTable thead {
-  color: #eee;
-  background-color: #205dcf83;
-}
-.box45 #stuTable tbody {
-  color: #fff;
-  background-color: #205dcf46;
-}
-.box45 #stuTable .editBtn {
-  background-color: #5cb85c;
-}
-.box45 #stuTable .delBtn {
-  background-color: #d9534f;
-}
-.box45 .serious {
-  width: 50%;
-  height: 189px;
-  /* background-color: #d9534f; */
-  background: #d9534f;
-  margin: auto;
-  line-height: 189px;
-}
-.box45 .commonly {
-  background-color: #66650c;
-}
+.box45 .test-box {
+  overflow: hidden;
+}
+.box45 .content {
+  margin: 0;
+
+
+}
+.box45 .left,
+.box45 .right {
+  width: 50%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  flex: 1;
+  background: none;
+  position: relative;
+}
+.box45 .left span,
+.box45 .right span {
+  font-size: 15px;
+  color: #fff;
+  font-weight: bold;
+}
+.box45 .left .info,
+.box45 .right .info {
+  display: flex;
+  flex-direction: column;
+}
+.box45 .left .num,
+.box45 .right .num {
+  left: 52%;
+  top: 72%;
+}
+.box45 .left .txt,
+.box45 .right .txt {
+  font-size: 18px;
+  color: antiquewhite;
+}
+.box45 .left img,
+.box45 .right img {
+  width: 45%;
+}
+.box45 .dataCount_box {
+  display: flex;
+}
+.box45 table {
+  width: 100%;
+  text-align: center;
+  line-height: 30px;
+  font-size: 14px;
+}
+.box45 #stuTable thead {
+  color: #eee;
+  background-color: #205dcf83;
+}
+.box45 #stuTable tbody {
+  color: #fff;
+  background-color: #205dcf46;
+}
+.box45 #stuTable .editBtn {
+  background-color: #5cb85c;
+}
+.box45 #stuTable .delBtn {
+  background-color: #d9534f;
+}
+.box45 .serious {
+  width: 50%;
+  height: 160px;
+  font-size: 0.13rem !important;
+  /* background-color: #d9534f; */
+  background: #d9534f;
+  margin: auto;
+  line-height: 160px;
+}
+.box45 .commonly {
+  background-color: #66650c;
+}

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

@@ -1,103 +1,104 @@
-.box46 .container {
-  margin: 50px auto;
-  width: 60%;
-  margin-left: 1.8rem;
-}
-.box46 .container > div {
-  margin-top: 8%;
-  /* margin-bottom: 5%; */
-}
-.box46 .progress {
-  height: 0.09rem;
-  background: #ebebeb;
-  border-left: 1px solid transparent;
-  border-right: 1px solid transparent;
-  border-radius: 1rem;
-  position: relative;
-}
-.box46 .progress .proDesc {
-  position: absolute;
-  top: -70% !important;
-  left: -43%;
-  color: #fff;
-}
-.box46 .progress > span {
-  position: relative;
-  float: left;
-  margin: 0 -1px;
-  min-width: 30px;
-  height: 0.09rem;
-  line-height: 0.2rem;
-  text-align: right;
-  background: #cccccc;
-  border: 1px solid;
-  border-color: #bfbfbf #b3b3b3 #9e9e9e;
-  border-radius: 1rem;
-  background-image: -webkit-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
-  background-image: -moz-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
-  background-image: -o-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
-  background-image: linear-gradient(to bottom, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
-  -webkit-box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px 2px rgba(0, 0, 0, 0.2);
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px 2px rgba(0, 0, 0, 0.2);
-}
-.box46 .progress > span span {
-  padding: 0 8px;
-  font-weight: bold;
-  color: #404040;
-  color: rgba(0, 0, 0, 0.7);
-  text-shadow: 0 1px rgba(255, 255, 255, 0.4);
-}
-.box46 .progress > span::before {
-  content: '';
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  z-index: 1;
-  height: 0.2rem;
-  background: url(../../images/progress.png) 0 0 repeat-x;
-  border-radius: 1rem;
-}
-.box46 .progress .txt {
-  position: absolute;
-  right: -15%;
-  background: none;
-  border: none;
-  color: #fff;
-}
-.box46 .progress .green {
-  background: #85c440;
-  border-color: #78b337 #6ba031 #568128;
-  background-image: -webkit-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
-  background-image: -moz-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
-  background-image: -o-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
-  background-image: linear-gradient(to bottom, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
-}
-.box46 .progress .orange {
-  background: #f2b63c;
-  border-color: #f0ad24 #eba310 #c5880d;
-  background-image: -webkit-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
-  background-image: -moz-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
-  background-image: -o-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
-  background-image: linear-gradient(to bottom, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
-}
-.box46 .progress .red {
-  background: #db3a27;
-  border-color: #c73321 #b12d1e #8e2418;
-  background-image: -webkit-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
-  background-image: -moz-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
-  background-image: -o-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
-  background-image: linear-gradient(to bottom, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
-}
-.box46 .progress .blue {
-  background: #5aaadb;
-  border-color: #459fd6 #3094d2 #277db2;
-  background-image: -webkit-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
-  background-image: -moz-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
-  background-image: -o-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
-  background-image: linear-gradient(to bottom, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
-}
-.box46 .floor-dist {
-  width: 100%;
-}
+.box46 .container {
+  margin: 50px auto;
+  width: 60%;
+  margin-left: 1.8rem;
+}
+.box46 .container > div {
+  margin-top: 8%;
+  /* margin-bottom: 5%; */
+}
+.box46 .progress {
+  height: 0.09rem;
+  background: #ebebeb;
+  border-left: 1px solid transparent;
+  border-right: 1px solid transparent;
+  border-radius: 1rem;
+  position: relative;
+}
+.box46 .progress .proDesc {
+  position: absolute;
+  top: -70% !important;
+  left: -43%;
+  color: #fff;
+}
+.box46 .progress > span {
+  position: relative;
+  float: left;
+  margin: 0 -1px;
+  min-width: 30px;
+  height: 0.09rem;
+  line-height: 0.2rem;
+  text-align: right;
+  background: #cccccc;
+  border: 1px solid;
+  border-color: #bfbfbf #b3b3b3 #9e9e9e;
+  border-radius: 1rem;
+  background-image: -webkit-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
+  background-image: -moz-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
+  background-image: -o-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
+  background-image: linear-gradient(to bottom, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
+  -webkit-box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px 2px rgba(0, 0, 0, 0.2);
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px 2px rgba(0, 0, 0, 0.2);
+}
+.box46 .progress > span span {
+  padding: 0 8px;
+  font-weight: bold;
+  color: #404040;
+  color: rgba(0, 0, 0, 0.7);
+  text-shadow: 0 1px rgba(255, 255, 255, 0.4);
+}
+.box46 .progress > span::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 1;
+  height: 0.2rem;
+  background: url(../../images/progress.png) 0 0 repeat-x;
+  border-radius: 1rem;
+}
+.box46 .progress .txt {
+  position: absolute;
+  right: -15%;
+  background: none;
+  border: none;
+  color: #fff;
+}
+.box46 .progress .green {
+  background: #85c440;
+  border-color: #78b337 #6ba031 #568128;
+  background-image: -webkit-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
+  background-image: -moz-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
+  background-image: -o-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
+  background-image: linear-gradient(to bottom, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
+}
+.box46 .progress .orange {
+  background: #f2b63c;
+  border-color: #f0ad24 #eba310 #c5880d;
+  background-image: -webkit-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
+  background-image: -moz-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
+  background-image: -o-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
+  background-image: linear-gradient(to bottom, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
+}
+.box46 .progress .red {
+  background: #db3a27;
+  border-color: #c73321 #b12d1e #8e2418;
+  background-image: -webkit-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
+  background-image: -moz-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
+  background-image: -o-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
+  background-image: linear-gradient(to bottom, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
+}
+.box46 .progress .blue {
+  background: #5aaadb;
+  border-color: #459fd6 #3094d2 #277db2;
+  background-image: -webkit-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
+  background-image: -moz-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
+  background-image: -o-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
+  background-image: linear-gradient(to bottom, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
+}
+.box46 .floor-dist {
+  width: 100%;
+}
+}

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

@@ -1,69 +1,69 @@
-<div class="box46 box" data-name="test46">
-    <div class="toolBox">
-      <span class="fit"></span>
-      <span class="close"></span>
-    </div>
-    <div class="tool">
-      <div class="title bgTitle">
-        <h2>攻击类型</h2>
-      </div>
-    </div>
-    <div class="test-box">
-      <div class="content">
-        <!-- 攻击类型 -->
-        <div class="container" style="margin-top: -4%">
-          <div class="progress">
-            <div class="proDesc">OA中间主服务器</div>
-            <span id="OA" style="width: 20%"></span>
-            <span class="txt">20%</span>
-          </div>
-  
-          <div class="progress">
-            <div class="proDesc">核心交换机1060</div>
-            <span id="core" class="green" style="width: 40%"></span>
-            <span class="txt">40%</span>
-          </div>
-  
-          <div class="progress">
-            <div class="proDesc">杀毒服务器</div>
-            <span id="Anti-Virus" class="orange" style="width: 60%"></span>
-            <span class="txt">50%</span>
-          </div>
-  
-          <div class="progress">
-            <div class="proDesc">电子盖章服务器</div>
-            <span id="Electronic-seal" class="red" style="width: 80%"></span>
-            <span class="txt">80%</span>
-          </div>
-  
-          <div class="progress">
-            <div class="proDesc">office</div>
-            <span id="office" class="blue" style="width: 100%"></span>
-            <span class="txt">30%</span>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="panel-footer"></div>
-  </div>
-  
-  <!-- 工具弹框 -->
-  <div class="tools" style="display: none">
-    <div class="containerTool test46Toll">
-      <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>
-  
+<div class="box46 box" data-name="test46">
+    <div class="toolBox">
+      <span class="fit"></span>
+      <span class="close"></span>
+    </div>
+    <div class="tool">
+      <div class="title bgTitle">
+        <h2>攻击类型</h2>
+      </div>
+    </div>
+    <div class="test-box">
+      <div class="content">
+        <!-- 攻击类型 -->
+        <div class="container" style="margin-top: -4%">
+          <div class="progress">
+            <div class="proDesc">OA中间主服务器</div>
+            <span id="OA" style="width: 20%"></span>
+            <span class="txt">20%</span>
+          </div>
+  
+          <div class="progress">
+            <div class="proDesc">核心交换机1060</div>
+            <span id="core" class="green" style="width: 40%"></span>
+            <span class="txt">40%</span>
+          </div>
+  
+          <div class="progress">
+            <div class="proDesc">杀毒服务器</div>
+            <span id="Anti-Virus" class="orange" style="width: 60%"></span>
+            <span class="txt">50%</span>
+          </div>
+  
+          <div class="progress">
+            <div class="proDesc">电子盖章服务器</div>
+            <span id="Electronic-seal" class="red" style="width: 80%"></span>
+            <span class="txt">80%</span>
+          </div>
+  
+          <div class="progress">
+            <div class="proDesc">office</div>
+            <span id="office" class="blue" style="width: 100%"></span>
+            <span class="txt">30%</span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="panel-footer"></div>
+  </div>
+  
+  <!-- 工具弹框 -->
+  <div class="tools" style="display: none">
+    <div class="containerTool test46Toll">
+      <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/test46/test46.js

@@ -1,113 +1,115 @@
-const test46 = (function () {
-  function test46(id, domTitle) {
-    if (domTitle) {
-      $(".test46 .title h2").text(domTitle);
-    }
-    $(".test46 .box").css("z-index", ++zIndex);
-    $(".test46 .box").attr("data-id", id);
-    move3(".test46 .test-box");
-    move2(".test46 .containerTool");
-
-    $(".test46 .close").click(function () {
-      $(".test46 .box").remove();
-      $(".test46 .containerTool").css("display", "none");
-      $(".test46 .setWidth").val("");
-      $(".test46 .setHeight").val("");
-      moduleIdRemove.push(id);
-    });
-
-    eventClick(".test46");
-    function sucTimer() {
-      var num = 0;
-      var num1 = 0;
-
-      var num2 = 0;
-
-      var num3 = 0;
-
-      var num4 = 0;
-
-      var timer = setInterval(function () {
-        $("#OA").css("width", num + "%");
-        if (num == 20) {
-          clearInterval(timer);
-        } else {
-          num += 5;
-        }
-      }, 30);
-      var timer1 = setInterval(function () {
-        $("#core").css("width", num1 + "%");
-        if (num1 == 40) {
-          clearInterval(timer1);
-        } else {
-          num1 += 5;
-        }
-      }, 30);
-      var timer2 = setInterval(function () {
-        $("#Anti-Virus").css("width", num2 + "%");
-        if (num2 == 60) {
-          clearInterval(timer2);
-        } else {
-          num2 += 5;
-        }
-      }, 30);
-      var timer3 = setInterval(function () {
-        $("#Electronic-seal").css("width", num3 + "%");
-        if (num3 == 80) {
-          clearInterval(timer3);
-        } else {
-          num3 += 5;
-        }
-      }, 30);
-      var timer4 = setInterval(function () {
-        $("#office").css("width", num4 + "%");
-        if (num4 == 100) {
-          clearInterval(timer4);
-        } else {
-          num4 += 5;
-        }
-      }, 30);
-    }
-    sucTimer();
-  }
-
-  function myAjax() {
-    $.ajax({
-      url: baseURL + "/selectMgtServerTop5",
-      data: {
-        orgIds: "323598b4196341b6a73969cfe7162209",
-      },
-      type: "GET",
-      dataType: "JSON",
-      success: function (data) {
-        const { data: res } = data;
-        if (data.code != 0) {
-          return alert("请求数据失败");
-        }
-        // topData = eval('(' + data.data + ')');
-        setCPU(res.cpu);
-      },
-      timeout: 6000,
-      error: function () {
-        console.log("超时了");
-      },
-    });
-
-    function setCPU(res) {
-      let str = "";
-      for (let i = 0; i < res.length; i++) {
-        const prog = res[i];
-        str += `
-          <div class="progress">
-            <div class="proDesc">${prog.RESNAME}</div>
-            <span class="green" style="width: 19%;"></span>
-            <span class="txt">40%</span>
-          </div>`;
-      }
-
-      $(".container").html(str);
-    }
-  }
-
-  return test46;
-})();
+const test46 = (function () {
+  function test46(id, domTitle) {
+    if (domTitle) {
+      $(".test46 .title h2").text(domTitle);
+    }
+    $(".test46 .box").css("z-index", ++zIndex);
+    $(".test46 .box").attr("data-id", id);
+    move3(".test46 .test-box");
+    move2(".test46 .containerTool");
+
+    $(".test46 .close").click(function () {
+      $(".test46 .box").remove();
+      $(".test46 .containerTool").css("display", "none");
+      $(".test46 .setWidth").val("");
+      $(".test46 .setHeight").val("");
+      moduleIdRemove.push(id);
+    });
+
+    eventClick(".test46");
+    function sucTimer() {
+      var num = 0;
+      var num1 = 0;
+
+      var num2 = 0;
+
+      var num3 = 0;
+
+      var num4 = 0;
+
+      var timer = setInterval(function () {
+        $("#OA").css("width", num + "%");
+        if (num == 20) {
+          clearInterval(timer);
+        } else {
+          num += 5;
+        }
+      }, 30);
+      var timer1 = setInterval(function () {
+        $("#core").css("width", num1 + "%");
+        if (num1 == 40) {
+          clearInterval(timer1);
+        } else {
+          num1 += 5;
+        }
+      }, 30);
+      var timer2 = setInterval(function () {
+        $("#Anti-Virus").css("width", num2 + "%");
+        if (num2 == 60) {
+          clearInterval(timer2);
+        } else {
+          num2 += 5;
+        }
+      }, 30);
+      var timer3 = setInterval(function () {
+        $("#Electronic-seal").css("width", num3 + "%");
+        if (num3 == 80) {
+          clearInterval(timer3);
+        } else {
+          num3 += 5;
+        }
+      }, 30);
+      var timer4 = setInterval(function () {
+        $("#office").css("width", num4 + "%");
+        if (num4 == 100) {
+          clearInterval(timer4);
+        } else {
+          num4 += 5;
+        }
+      }, 30);
+    }
+    sucTimer();
+  }
+
+  function myAjax() {
+    $.ajax({
+      url: baseURL + "/selectMgtServerTop5",
+      data: {
+        orgIds: "323598b4196341b6a73969cfe7162209",
+      },
+      type: "GET",
+      dataType: "JSON",
+      success: function (data) {
+        const { data: res } = data;
+        if (data.code != 0) {
+          return alert("请求数据失败");
+        }
+        // topData = eval('(' + data.data + ')');
+        setCPU(res.cpu);
+      },
+      timeout: 6000,
+      error: function () {
+        console.log("超时了");
+      },
+    });
+
+    function setCPU(res) {
+      let str = "";
+      for (let i = 0; i < res.length; i++) {
+        const prog = res[i];
+        str += `
+})();
+})();
+          <div class="progress">
+            <div class="proDesc">${prog.RESNAME}</div>
+            <span class="green" style="width: 19%;"></span>
+            <span class="txt">40%</span>
+          </div>`;
+      }
+
+      $(".container").html(str);
+    }
+  }
+
+  return test46;
+})();

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

@@ -1,103 +1,103 @@
-.box47 .container {
-  margin: 50px auto;
-  width: 60%;
-  margin-left: 1.8rem;
-}
-.box47 .container > div {
-  margin-top: 8%;
-  /* margin-bottom: 5%; */
-}
-.box47 .progress {
-  height: 0.09rem;
-  background: #ebebeb;
-  border-left: 1px solid transparent;
-  border-right: 1px solid transparent;
-  border-radius: 1rem;
-  position: relative;
-}
-.box47 .progress .proDesc {
-  position: absolute;
-  top: -70% !important;
-  left: -43%;
-  color: #fff;
-}
-.box47 .progress > span {
-  position: relative;
-  float: left;
-  margin: 0 -1px;
-  min-width: 30px;
-  height: 0.09rem;
-  line-height: 0.2rem;
-  text-align: right;
-  background: #cccccc;
-  border: 1px solid;
-  border-color: #bfbfbf #b3b3b3 #9e9e9e;
-  border-radius: 1rem;
-  background-image: -webkit-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
-  background-image: -moz-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
-  background-image: -o-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
-  background-image: linear-gradient(to bottom, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
-  -webkit-box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px 2px rgba(0, 0, 0, 0.2);
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px 2px rgba(0, 0, 0, 0.2);
-}
-.box47 .progress > span span {
-  padding: 0 8px;
-  font-weight: bold;
-  color: #404040;
-  color: rgba(0, 0, 0, 0.7);
-  text-shadow: 0 1px rgba(255, 255, 255, 0.4);
-}
-.box47 .progress > span::before {
-  content: '';
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  z-index: 1;
-  height: 0.2rem;
-  background: url(../../images/progress.png) 0 0 repeat-x;
-  border-radius: 1rem;
-}
-.box47 .progress .txt {
-  position: absolute;
-  right: -15%;
-  background: none;
-  border: none;
-  color: #fff;
-}
-.box47 .progress .green {
-  background: #85c440;
-  border-color: #78b337 #6ba031 #568128;
-  background-image: -webkit-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
-  background-image: -moz-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
-  background-image: -o-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
-  background-image: linear-gradient(to bottom, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
-}
-.box47 .progress .orange {
-  background: #f2b63c;
-  border-color: #f0ad24 #eba310 #c5880d;
-  background-image: -webkit-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
-  background-image: -moz-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
-  background-image: -o-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
-  background-image: linear-gradient(to bottom, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
-}
-.box47 .progress .red {
-  background: #db3a27;
-  border-color: #c73321 #b12d1e #8e2418;
-  background-image: -webkit-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
-  background-image: -moz-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
-  background-image: -o-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
-  background-image: linear-gradient(to bottom, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
-}
-.box47 .progress .blue {
-  background: #5aaadb;
-  border-color: #459fd6 #3094d2 #277db2;
-  background-image: -webkit-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
-  background-image: -moz-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
-  background-image: -o-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
-  background-image: linear-gradient(to bottom, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
-}
-.box47 .floor-dist {
-  width: 100%;
-}
+.box47 .container {
+  margin: 50px auto;
+  width: 60%;
+  margin-left: 1.8rem;
+}
+.box47 .container > div {
+  margin-top: 8%;
+  /* margin-bottom: 5%; */
+}
+.box47 .progress {
+  height: 0.09rem;
+  background: #ebebeb;
+  border-left: 1px solid transparent;
+  border-right: 1px solid transparent;
+  border-radius: 1rem;
+  position: relative;
+}
+.box47 .progress .proDesc {
+  position: absolute;
+  top: -70% !important;
+  left: -43%;
+  color: #fff;
+}
+.box47 .progress > span {
+  position: relative;
+  float: left;
+  margin: 0 -1px;
+  min-width: 30px;
+  height: 0.09rem;
+  line-height: 0.2rem;
+  text-align: right;
+  background: #cccccc;
+  border: 1px solid;
+  border-color: #bfbfbf #b3b3b3 #9e9e9e;
+  border-radius: 1rem;
+  background-image: -webkit-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
+  background-image: -moz-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
+  background-image: -o-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
+  background-image: linear-gradient(to bottom, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
+  -webkit-box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px 2px rgba(0, 0, 0, 0.2);
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px 2px rgba(0, 0, 0, 0.2);
+}
+.box47 .progress > span span {
+  padding: 0 8px;
+  font-weight: bold;
+  color: #404040;
+  color: rgba(0, 0, 0, 0.7);
+  text-shadow: 0 1px rgba(255, 255, 255, 0.4);
+}
+.box47 .progress > span::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 1;
+  height: 0.2rem;
+  background: url(../../images/progress.png) 0 0 repeat-x;
+  border-radius: 1rem;
+}
+.box47 .progress .txt {
+  position: absolute;
+  right: -15%;
+  background: none;
+  border: none;
+  color: #fff;
+}
+.box47 .progress .green {
+  background: #85c440;
+  border-color: #78b337 #6ba031 #568128;
+  background-image: -webkit-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
+  background-image: -moz-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
+  background-image: -o-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
+  background-image: linear-gradient(to bottom, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
+}
+.box47 .progress .orange {
+  background: #f2b63c;
+  border-color: #f0ad24 #eba310 #c5880d;
+  background-image: -webkit-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
+  background-image: -moz-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
+  background-image: -o-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
+  background-image: linear-gradient(to bottom, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
+}
+.box47 .progress .red {
+  background: #db3a27;
+  border-color: #c73321 #b12d1e #8e2418;
+  background-image: -webkit-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
+  background-image: -moz-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
+  background-image: -o-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
+  background-image: linear-gradient(to bottom, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
+}
+.box47 .progress .blue {
+  background: #5aaadb;
+  border-color: #459fd6 #3094d2 #277db2;
+  background-image: -webkit-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
+  background-image: -moz-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
+  background-image: -o-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
+  background-image: linear-gradient(to bottom, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
+}
+.box47 .floor-dist {
+  width: 100%;
+}

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

@@ -1,68 +1,68 @@
-<div class="box47 box" data-name="test47">
-  <div class="toolBox">
-    <span class="fit"></span>
-    <span class="close"></span>
-  </div>
-  <div class="tool">
-    <div class="title bgTitle">
-      <h2>攻击类型</h2>
-    </div>
-  </div>
-  <div class="test-box">
-    <div class="content">
-      <!-- 攻击类型 -->
-      <div class="container" style="margin-top: -4%">
-        <div class="progress">
-          <div class="proDesc">OA中间主服务器</div>
-          <span id="OA1" style="width: 20%"></span>
-          <span class="txt">20%</span>
-        </div>
-
-        <div class="progress">
-          <div class="proDesc">核心交换机1060</div>
-          <span id="core1" class="green" style="width: 40%"></span>
-          <span class="txt">40%</span>
-        </div>
-
-        <div class="progress">
-          <div class="proDesc">杀毒服务器</div>
-          <span id="Anti-Virus1" class="orange" style="width: 60%"></span>
-          <span class="txt">50%</span>
-        </div>
-
-        <div class="progress">
-          <div class="proDesc">电子盖章服务器</div>
-          <span id="Electronic-seal1" class="red" style="width: 80%"></span>
-          <span class="txt">80%</span>
-        </div>
-
-        <div class="progress">
-          <div class="proDesc">office</div>
-          <span id="office1" class="blue" style="width: 100%"></span>
-          <span class="txt">30%</span>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div class="panel-footer"></div>
-</div>
-
-<!-- 工具弹框 -->
-<div class="tools" style="display: none">
-  <div class="containerTool test47Toll">
-    <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>
+<div class="box47 box" data-name="test47">
+  <div class="toolBox">
+    <span class="fit"></span>
+    <span class="close"></span>
+  </div>
+  <div class="tool">
+    <div class="title bgTitle">
+      <h2>攻击类型</h2>
+    </div>
+  </div>
+  <div class="test-box">
+    <div class="content">
+      <!-- 攻击类型 -->
+      <div class="container" style="margin-top: -4%">
+        <div class="progress">
+          <div class="proDesc">OA中间主服务器</div>
+          <span id="OA1" style="width: 20%"></span>
+          <span class="txt">20%</span>
+        </div>
+
+        <div class="progress">
+          <div class="proDesc">核心交换机1060</div>
+          <span id="core1" class="green" style="width: 40%"></span>
+          <span class="txt">40%</span>
+        </div>
+
+        <div class="progress">
+          <div class="proDesc">杀毒服务器</div>
+          <span id="Anti-Virus1" class="orange" style="width: 60%"></span>
+          <span class="txt">50%</span>
+        </div>
+
+        <div class="progress">
+          <div class="proDesc">电子盖章服务器</div>
+          <span id="Electronic-seal1" class="red" style="width: 80%"></span>
+          <span class="txt">80%</span>
+        </div>
+
+        <div class="progress">
+          <div class="proDesc">office</div>
+          <span id="office1" class="blue" style="width: 100%"></span>
+          <span class="txt">30%</span>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="panel-footer"></div>
+</div>
+
+<!-- 工具弹框 -->
+<div class="tools" style="display: none">
+  <div class="containerTool test47Toll">
+    <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/test47/test47.js

@@ -1,113 +1,115 @@
-const test47 = (function () {
-  function test47(id, domTitle) {
-    if (domTitle) {
-      $(".test47 .title h2").text(domTitle);
-    }
-    $(".test47 .box").css("z-index", ++zIndex);
-    $(".test47 .box").attr("data-id", id);
-    move3(".test47 .test-box");
-    move2(".test47 .containerTool");
-
-    $(".test47 .close").click(function () {
-      $(".test47 .box").remove();
-      $(".test47 .containerTool").css("display", "none");
-      $(".test47 .setWidth").val("");
-      $(".test47 .setHeight").val("");
-      moduleIdRemove.push(id);
-    });
-
-    eventClick(".test47");
-    function sucTimer() {
-      var num = 0;
-      var num1 = 0;
-
-      var num2 = 0;
-
-      var num3 = 0;
-
-      var num4 = 0;
-
-      var timer = setInterval(function () {
-        $("#OA1").css("width", num + "%");
-        if (num == 20) {
-          clearInterval(timer);
-        } else {
-          num += 5;
-        }
-      }, 30);
-      var timer1 = setInterval(function () {
-        $("#core1").css("width", num1 + "%");
-        if (num1 == 40) {
-          clearInterval(timer1);
-        } else {
-          num1 += 5;
-        }
-      }, 30);
-      var timer2 = setInterval(function () {
-        $("#Anti-Virus1").css("width", num2 + "%");
-        if (num2 == 60) {
-          clearInterval(timer2);
-        } else {
-          num2 += 5;
-        }
-      }, 30);
-      var timer3 = setInterval(function () {
-        $("#Electronic-seal1").css("width", num3 + "%");
-        if (num3 == 80) {
-          clearInterval(timer3);
-        } else {
-          num3 += 5;
-        }
-      }, 30);
-      var timer4 = setInterval(function () {
-        $("#office1").css("width", num4 + "%");
-        if (num4 == 100) {
-          clearInterval(timer4);
-        } else {
-          num4 += 5;
-        }
-      }, 30);
-    }
-    sucTimer();
-  }
-
-  function myAjax() {
-    $.ajax({
-      url: baseURL + "/selectMgtServerTop5",
-      data: {
-        orgIds: "323598b4196341b6a73969cfe7162209",
-      },
-      type: "GET",
-      dataType: "JSON",
-      success: function (data) {
-        const { data: res } = data;
-        if (data.code != 0) {
-          return alert("请求数据失败");
-        }
-        // topData = eval('(' + data.data + ')');
-        setCPU(res.cpu);
-      },
-      timeout: 6000,
-      error: function () {
-        console.log("超时了");
-      },
-    });
-
-    function setCPU(res) {
-      let str = "";
-      for (let i = 0; i < res.length; i++) {
-        const prog = res[i];
-        str += `
-        <div class="progress">
-          <div class="proDesc">${prog.RESNAME}</div>
-          <span class="green" style="width: 19%;"></span>
-          <span class="txt">40%</span>
-        </div>`;
-      }
-
-      $(".container").html(str);
-    }
-  }
-
-  return test47;
-})();
+const test47 = (function () {
+  function test47(id, domTitle) {
+    if (domTitle) {
+      $(".test47 .title h2").text(domTitle);
+    }
+    $(".test47 .box").css("z-index", ++zIndex);
+    $(".test47 .box").attr("data-id", id);
+    move3(".test47 .test-box");
+    move2(".test47 .containerTool");
+
+    $(".test47 .close").click(function () {
+      $(".test47 .box").remove();
+      $(".test47 .containerTool").css("display", "none");
+      $(".test47 .setWidth").val("");
+      $(".test47 .setHeight").val("");
+      moduleIdRemove.push(id);
+    });
+
+    eventClick(".test47");
+    function sucTimer() {
+      var num = 0;
+      var num1 = 0;
+
+      var num2 = 0;
+
+      var num3 = 0;
+
+      var num4 = 0;
+
+      var timer = setInterval(function () {
+        $("#OA1").css("width", num + "%");
+        if (num == 20) {
+          clearInterval(timer);
+        } else {
+          num += 5;
+        }
+      }, 30);
+      var timer1 = setInterval(function () {
+        $("#core1").css("width", num1 + "%");
+        if (num1 == 40) {
+          clearInterval(timer1);
+        } else {
+          num1 += 5;
+        }
+      }, 30);
+      var timer2 = setInterval(function () {
+        $("#Anti-Virus1").css("width", num2 + "%");
+        if (num2 == 60) {
+          clearInterval(timer2);
+        } else {
+          num2 += 5;
+        }
+      }, 30);
+      var timer3 = setInterval(function () {
+        $("#Electronic-seal1").css("width", num3 + "%");
+        if (num3 == 80) {
+          clearInterval(timer3);
+        } else {
+          num3 += 5;
+        }
+      }, 30);
+      var timer4 = setInterval(function () {
+        $("#office1").css("width", num4 + "%");
+        if (num4 == 100) {
+          clearInterval(timer4);
+        } else {
+          num4 += 5;
+        }
+      }, 30);
+    }
+    sucTimer();
+  }
+
+
+})();
+  function myAjax() {
+    $.ajax({
+      url: baseURL + "/selectMgtServerTop5",
+      data: {
+        orgIds: "323598b4196341b6a73969cfe7162209",
+      },
+      type: "GET",
+      dataType: "JSON",
+      success: function (data) {
+        const { data: res } = data;
+        if (data.code != 0) {
+          return alert("请求数据失败");
+        }
+        // topData = eval('(' + data.data + ')');
+        setCPU(res.cpu);
+      },
+      timeout: 6000,
+      error: function () {
+        console.log("超时了");
+      },
+    });
+
+    function setCPU(res) {
+      let str = "";
+      for (let i = 0; i < res.length; i++) {
+        const prog = res[i];
+        str += `
+        <div class="progress">
+          <div class="proDesc">${prog.RESNAME}</div>
+          <span class="green" style="width: 19%;"></span>
+          <span class="txt">40%</span>
+        </div>`;
+      }
+
+      $(".container").html(str);
+    }
+  }
+
+  return test47;
+})();

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

@@ -1,103 +1,103 @@
-.box48 .container {
-  margin: 50px auto;
-  width: 60%;
-  margin-left: 1.8rem;
-}
-.box48 .container > div {
-  margin-top: 8%;
-  /* margin-bottom: 5%; */
-}
-.box48 .progress {
-  height: 0.09rem;
-  background: #ebebeb;
-  border-left: 1px solid transparent;
-  border-right: 1px solid transparent;
-  border-radius: 1rem;
-  position: relative;
-}
-.box48 .progress .proDesc {
-  position: absolute;
-  top: -70% !important;
-  left: -43%;
-  color: #fff;
-}
-.box48 .progress > span {
-  position: relative;
-  float: left;
-  margin: 0 -1px;
-  min-width: 30px;
-  height: 0.09rem;
-  line-height: 0.2rem;
-  text-align: right;
-  background: #cccccc;
-  border: 1px solid;
-  border-color: #bfbfbf #b3b3b3 #9e9e9e;
-  border-radius: 1rem;
-  background-image: -webkit-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
-  background-image: -moz-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
-  background-image: -o-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
-  background-image: linear-gradient(to bottom, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
-  -webkit-box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px 2px rgba(0, 0, 0, 0.2);
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px 2px rgba(0, 0, 0, 0.2);
-}
-.box48 .progress > span span {
-  padding: 0 8px;
-  font-weight: bold;
-  color: #404040;
-  color: rgba(0, 0, 0, 0.7);
-  text-shadow: 0 1px rgba(255, 255, 255, 0.4);
-}
-.box48 .progress > span::before {
-  content: '';
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  z-index: 1;
-  height: 0.2rem;
-  background: url(../../images/progress.png) 0 0 repeat-x;
-  border-radius: 1rem;
-}
-.box48 .progress .txt {
-  position: absolute;
-  right: -15%;
-  background: none;
-  border: none;
-  color: #fff;
-}
-.box48 .progress .green {
-  background: #85c440;
-  border-color: #78b337 #6ba031 #568128;
-  background-image: -webkit-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
-  background-image: -moz-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
-  background-image: -o-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
-  background-image: linear-gradient(to bottom, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
-}
-.box48 .progress .orange {
-  background: #f2b63c;
-  border-color: #f0ad24 #eba310 #c5880d;
-  background-image: -webkit-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
-  background-image: -moz-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
-  background-image: -o-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
-  background-image: linear-gradient(to bottom, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
-}
-.box48 .progress .red {
-  background: #db3a27;
-  border-color: #c73321 #b12d1e #8e2418;
-  background-image: -webkit-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
-  background-image: -moz-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
-  background-image: -o-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
-  background-image: linear-gradient(to bottom, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
-}
-.box48 .progress .blue {
-  background: #5aaadb;
-  border-color: #459fd6 #3094d2 #277db2;
-  background-image: -webkit-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
-  background-image: -moz-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
-  background-image: -o-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
-  background-image: linear-gradient(to bottom, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
-}
-.box48 .floor-dist {
-  width: 100%;
-}
+.box48 .container {
+  margin: 50px auto;
+  width: 60%;
+  margin-left: 1.8rem;
+}
+.box48 .container > div {
+  margin-top: 8%;
+  /* margin-bottom: 5%; */
+}
+.box48 .progress {
+  height: 0.09rem;
+  background: #ebebeb;
+  border-left: 1px solid transparent;
+  border-right: 1px solid transparent;
+  border-radius: 1rem;
+  position: relative;
+}
+.box48 .progress .proDesc {
+  position: absolute;
+  top: -70% !important;
+  left: -43%;
+  color: #fff;
+}
+.box48 .progress > span {
+  position: relative;
+  float: left;
+  margin: 0 -1px;
+  min-width: 30px;
+  height: 0.09rem;
+  line-height: 0.2rem;
+  text-align: right;
+  background: #cccccc;
+  border: 1px solid;
+  border-color: #bfbfbf #b3b3b3 #9e9e9e;
+  border-radius: 1rem;
+  background-image: -webkit-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
+  background-image: -moz-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
+  background-image: -o-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
+  background-image: linear-gradient(to bottom, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
+  -webkit-box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px 2px rgba(0, 0, 0, 0.2);
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px 2px rgba(0, 0, 0, 0.2);
+}
+.box48 .progress > span span {
+  padding: 0 8px;
+  font-weight: bold;
+  color: #404040;
+  color: rgba(0, 0, 0, 0.7);
+  text-shadow: 0 1px rgba(255, 255, 255, 0.4);
+}
+.box48 .progress > span::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 1;
+  height: 0.2rem;
+  background: url(../../images/progress.png) 0 0 repeat-x;
+  border-radius: 1rem;
+}
+.box48 .progress .txt {
+  position: absolute;
+  right: -15%;
+  background: none;
+  border: none;
+  color: #fff;
+}
+.box48 .progress .green {
+  background: #85c440;
+  border-color: #78b337 #6ba031 #568128;
+  background-image: -webkit-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
+  background-image: -moz-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
+  background-image: -o-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
+  background-image: linear-gradient(to bottom, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
+}
+.box48 .progress .orange {
+  background: #f2b63c;
+  border-color: #f0ad24 #eba310 #c5880d;
+  background-image: -webkit-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
+  background-image: -moz-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
+  background-image: -o-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
+  background-image: linear-gradient(to bottom, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
+}
+.box48 .progress .red {
+  background: #db3a27;
+  border-color: #c73321 #b12d1e #8e2418;
+  background-image: -webkit-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
+  background-image: -moz-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
+  background-image: -o-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
+  background-image: linear-gradient(to bottom, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
+}
+.box48 .progress .blue {
+  background: #5aaadb;
+  border-color: #459fd6 #3094d2 #277db2;
+  background-image: -webkit-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
+  background-image: -moz-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
+  background-image: -o-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
+  background-image: linear-gradient(to bottom, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
+}
+.box48 .floor-dist {
+  width: 100%;
+}

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

@@ -1,68 +1,68 @@
-<div class="box48 box" data-name="test48">
-  <div class="toolBox">
-    <span class="fit"></span>
-    <span class="close"></span>
-  </div>
-  <div class="tool">
-    <div class="title bgTitle">
-      <h2>攻击类型</h2>
-    </div>
-  </div>
-  <div class="test-box">
-    <div class="content">
-      <!-- 攻击类型 -->
-      <div class="container" style="margin-top: -4%">
-        <div class="progress">
-          <div class="proDesc">OA中间主服务器</div>
-          <span id="OA2" style="width: 20%"></span>
-          <span class="txt">20%</span>
-        </div>
-
-        <div class="progress">
-          <div class="proDesc">核心交换机1060</div>
-          <span id="core2" class="green" style="width: 40%"></span>
-          <span class="txt">40%</span>
-        </div>
-
-        <div class="progress">
-          <div class="proDesc">杀毒服务器</div>
-          <span id="Anti-Virus2" class="orange" style="width: 60%"></span>
-          <span class="txt">50%</span>
-        </div>
-
-        <div class="progress">
-          <div class="proDesc">电子盖章服务器</div>
-          <span id="Electronic-seal2" class="red" style="width: 80%"></span>
-          <span class="txt">80%</span>
-        </div>
-
-        <div class="progress">
-          <div class="proDesc">office</div>
-          <span id="office2" class="blue" style="width: 100%"></span>
-          <span class="txt">30%</span>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div class="panel-footer"></div>
-</div>
-
-<!-- 工具弹框 -->
-<div class="tools" style="display: none">
-  <div class="containerTool test48Toll">
-    <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>
+<div class="box48 box" data-name="test48">
+  <div class="toolBox">
+    <span class="fit"></span>
+    <span class="close"></span>
+  </div>
+  <div class="tool">
+    <div class="title bgTitle">
+      <h2>攻击类型</h2>
+    </div>
+  </div>
+  <div class="test-box">
+    <div class="content">
+      <!-- 攻击类型 -->
+      <div class="container" style="margin-top: -4%">
+        <div class="progress">
+          <div class="proDesc">OA中间主服务器</div>
+          <span id="OA2" style="width: 20%"></span>
+          <span class="txt">20%</span>
+        </div>
+
+        <div class="progress">
+          <div class="proDesc">核心交换机1060</div>
+          <span id="core2" class="green" style="width: 40%"></span>
+          <span class="txt">40%</span>
+        </div>
+
+        <div class="progress">
+          <div class="proDesc">杀毒服务器</div>
+          <span id="Anti-Virus2" class="orange" style="width: 60%"></span>
+          <span class="txt">50%</span>
+        </div>
+
+        <div class="progress">
+          <div class="proDesc">电子盖章服务器</div>
+          <span id="Electronic-seal2" class="red" style="width: 80%"></span>
+          <span class="txt">80%</span>
+        </div>
+
+        <div class="progress">
+          <div class="proDesc">office</div>
+          <span id="office2" class="blue" style="width: 100%"></span>
+          <span class="txt">30%</span>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="panel-footer"></div>
+</div>
+
+<!-- 工具弹框 -->
+<div class="tools" style="display: none">
+  <div class="containerTool test48Toll">
+    <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/test48/test48.js

@@ -1,113 +1,114 @@
-const test48 = (function () {
-  function test48(id, domTitle) {
-    if (domTitle) {
-      $(".test48 .title h2").text(domTitle);
-    }
-    $(".test48 .box").css("z-index", ++zIndex);
-    $(".test48 .box").attr("data-id", id);
-    move3(".test48 .test-box");
-    move2(".test48 .containerTool");
-
-    $(".test48 .close").click(function () {
-      $(".test48 .box").remove();
-      $(".test48 .containerTool").css("display", "none");
-      $(".test48 .setWidth").val("");
-      $(".test48 .setHeight").val("");
-      moduleIdRemove.push(id);
-    });
-
-    eventClick(".test48");
-    function sucTimer() {
-      var num = 0;
-      var num1 = 0;
-
-      var num2 = 0;
-
-      var num3 = 0;
-
-      var num4 = 0;
-
-      var timer = setInterval(function () {
-        $("#OA2").css("width", num + "%");
-        if (num == 20) {
-          clearInterval(timer);
-        } else {
-          num += 5;
-        }
-      }, 30);
-      var timer1 = setInterval(function () {
-        $("#core2").css("width", num1 + "%");
-        if (num1 == 40) {
-          clearInterval(timer1);
-        } else {
-          num1 += 5;
-        }
-      }, 30);
-      var timer2 = setInterval(function () {
-        $("#Anti-Virus2").css("width", num2 + "%");
-        if (num2 == 60) {
-          clearInterval(timer2);
-        } else {
-          num2 += 5;
-        }
-      }, 30);
-      var timer3 = setInterval(function () {
-        $("#Electronic-seal2").css("width", num3 + "%");
-        if (num3 == 80) {
-          clearInterval(timer3);
-        } else {
-          num3 += 5;
-        }
-      }, 30);
-      var timer4 = setInterval(function () {
-        $("#office2").css("width", num4 + "%");
-        if (num4 == 100) {
-          clearInterval(timer4);
-        } else {
-          num4 += 5;
-        }
-      }, 30);
-    }
-    sucTimer();
-  }
-
-  function myAjax() {
-    $.ajax({
-      url: baseURL + "/selectMgtServerTop5",
-      data: {
-        orgIds: "323598b4196341b6a73969cfe7162209",
-      },
-      type: "GET",
-      dataType: "JSON",
-      success: function (data) {
-        const { data: res } = data;
-        if (data.code != 0) {
-          return alert("请求数据失败");
-        }
-        // topData = eval('(' + data.data + ')');
-        setCPU(res.cpu);
-      },
-      timeout: 6000,
-      error: function () {
-        console.log("超时了");
-      },
-    });
-
-    function setCPU(res) {
-      let str = "";
-      for (let i = 0; i < res.length; i++) {
-        const prog = res[i];
-        str += `
-        <div class="progress">
-          <div class="proDesc">${prog.RESNAME}</div>
-          <span class="green" style="width: 19%;"></span>
-          <span class="txt">40%</span>
-        </div>`;
-      }
-
-      $(".container").html(str);
-    }
-  }
-
-  return test48;
-})();
+const test48 = (function () {
+  
+  function test48(id, domTitle) {
+    if (domTitle) {
+      $(".test48 .title h2").text(domTitle);
+    }
+    $(".test48 .box").css("z-index", ++zIndex);
+    $(".test48 .box").attr("data-id", id);
+    move3(".test48 .test-box");
+    move2(".test48 .containerTool");
+
+    $(".test48 .close").click(function () {
+      $(".test48 .box").remove();
+      $(".test48 .containerTool").css("display", "none");
+      $(".test48 .setWidth").val("");
+      $(".test48 .setHeight").val("");
+      moduleIdRemove.push(id);
+    });
+
+    eventClick(".test48");
+    function sucTimer() {
+      var num = 0;
+      var num1 = 0;
+
+      var num2 = 0;
+
+      var num3 = 0;
+
+      var num4 = 0;
+
+      var timer = setInterval(function () {
+        $("#OA2").css("width", num + "%");
+        if (num == 20) {
+          clearInterval(timer);
+        } else {
+          num += 5;
+        }
+      }, 30);
+      var timer1 = setInterval(function () {
+        $("#core2").css("width", num1 + "%");
+        if (num1 == 40) {
+          clearInterval(timer1);
+        } else {
+          num1 += 5;
+        }
+      }, 30);
+      var timer2 = setInterval(function () {
+        $("#Anti-Virus2").css("width", num2 + "%");
+        if (num2 == 60) {
+          clearInterval(timer2);
+        } else {
+          num2 += 5;
+        }
+      }, 30);
+      var timer3 = setInterval(function () {
+        $("#Electronic-seal2").css("width", num3 + "%");
+        if (num3 == 80) {
+          clearInterval(timer3);
+        } else {
+          num3 += 5;
+        }
+      }, 30);
+      var timer4 = setInterval(function () {
+        $("#office2").css("width", num4 + "%");
+        if (num4 == 100) {
+          clearInterval(timer4);
+        } else {
+          num4 += 5;
+        }
+      }, 30);
+    }
+    sucTimer();
+  }
+
+  function myAjax() {
+    $.ajax({
+      url: baseURL + "/selectMgtServerTop5",
+      data: {
+        orgIds: "323598b4196341b6a73969cfe7162209",
+      },
+      type: "GET",
+      dataType: "JSON",
+      success: function (data) {
+        const { data: res } = data;
+        if (data.code != 0) {
+          return alert("请求数据失败");
+        }
+        // topData = eval('(' + data.data + ')');
+        setCPU(res.cpu);
+      },
+      timeout: 6000,
+      error: function () {
+        console.log("超时了");
+      },
+    });
+
+    function setCPU(res) {
+      let str = "";
+      for (let i = 0; i < res.length; i++) {
+        const prog = res[i];
+        str += `
+        <div class="progress">
+          <div class="proDesc">${prog.RESNAME}</div>
+          <span class="green" style="width: 19%;"></span>
+          <span class="txt">40%</span>
+        </div>`;
+      }
+
+      $(".container").html(str);
+    }
+  }
+
+  return test48;
+})();

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

@@ -1,70 +1,67 @@
-.box49 .content {
-    flex-direction: row;
-    justify-content: space-around;
-    margin: 0 0.1rem;
-}
-
-.box49 .content .title {
-    text-align: center;
-    background-image: linear-gradient(45deg, #155ed5, transparent);
-    line-height: 0.4rem;
-    height: 0.4rem;
-    /* padding-left: 0.3rem; */
-}
-.title img {
-  width: 3%;
-  height: 100%;
-}
-.box49 .content-left,
-.box49 .content-right {
-    height: 90%;
-    flex: 1;
-}
-
-.box49 .dataCount_box {
-    display: flex;
-}
-
-.box49 .content-left {
-    margin-right: 0.5rem;
-}
-
-.box49 table {
-    width: 100%;
-    text-align: center;
-    margin-top: 0.1rem;
-}
-
-.box49 td {
-    font-size: 0.14rem !important;
-}
-
-.box49 tr {
-    height: 0.3rem;
-}
-
-.box49 th {
-    font-size: 0.14rem !important;
-}
-
-.box49 #stuTable thead,
-.box49 #content-stuTable thead {
-    color: #eee;
-    background-color: #205dcf83;
-}
-
-.box49 #stuTable tbody,
-.box49 #content-stuTable tbody {
-    color: #fff;
-    background-color: #205dcf46;
-}
-
-.box49 #stuTable .editBtn,
-.box49 #content-stuTable .editBtn {
-    background-color: #5cb85c;
-}
-
-.box49 #stuTable .delBtn,
-.box49 #content-stuTable .delBtn {
-    background-color: #d9534f;
+.box49 .content {
+    flex-direction: row;
+    justify-content: space-around;
+    margin: 0 0.1rem;
+}
+
+.box49 .content .title {
+    text-align: center;
+    background-image: linear-gradient(45deg, #155ed5, transparent);
+    line-height: 0.4rem;
+    height: 0.4rem;
+    padding-left: 0.3rem;
+}
+
+.box49 .content-left,
+.box49 .content-right {
+    height: 90%;
+    flex: 1;
+}
+
+.box49 .dataCount_box {
+    display: flex;
+}
+
+.box49 .content-left {
+    margin-right: 0.5rem;
+}
+
+.box49 table {
+    width: 100%;
+    text-align: center;
+    margin-top: 0.1rem;
+}
+
+.box49 td {
+    font-size: 0.14rem !important;
+}
+
+.box49 tr {
+    height: 0.3rem;
+}
+
+.box49 th {
+    font-size: 0.14rem !important;
+}
+
+.box49 #stuTable thead,
+.box49 #content-stuTable thead {
+    color: #eee;
+    background-color: #205dcf83;
+}
+
+.box49 #stuTable tbody,
+.box49 #content-stuTable tbody {
+    color: #fff;
+    background-color: #205dcf46;
+}
+
+.box49 #stuTable .editBtn,
+.box49 #content-stuTable .editBtn {
+    background-color: #5cb85c;
+}
+
+.box49 #stuTable .delBtn,
+.box49 #content-stuTable .delBtn {
+    background-color: #d9534f;
 }

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

@@ -1,129 +1,125 @@
-<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>
-  </div>
-  <div class="test-box">
-    <div class="content">
-      <!-- 漏洞数据 -->
-      <div class="content-left">
-        <div class="title">
-          <div style="width: 13%; height: 100%">
-            <img
-            style="width: 100%; height:100%"
-              src="../images/业务系统图标.png"
-              alt=""
-            />
-          </div>
-          <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="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>
+<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>
+    </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="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>

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

@@ -1,74 +1,77 @@
-.box62 p {
-  font-size: 0.15rem !important;
-  font-weight: 700;
-  color: #75e2fa;
-}
-.box62 .concent > div {
-  position: absolute;
-}
-.box62 {
-  text-align: center;
-  right: 12%;
-}
-.box62 > div {
-  position: absolute;
-}
-.box62 > div :not(.ex) img {
-  width: 75%;
-}
-.box62 .l-bg {
-  width: 100%;
-  height: 100%;
-  background: url("../../images/zybz/背景.png") no-repeat center;
-  background-size: 100%;
-}
-.box62 .x-bg {
-  width: 100%;
-  height: 100%;
-  background: url("../../images/zybz/线.png") no-repeat center;
-  background-size: 100%;
-}
-.box62 .c-left-img-one {
-  left: 5%;
-  top: 26%;
-}
-.box62 .c-left-img-two {
-  left: 16%;
-  top: 6%;
-}
-.box62 .c-center1 {
-  left: 50%;
-  top: 50%;
-  transform: translate(-50%, -50%);
-}
-.box62 .c-center2 {
-  left: 32%;
-  top: 56%;
-}
-.box62 .c-center3 {
-  left: 36%;
-  top: 20%;
-}
-.box62 .c-center4 {
-  left: 60%;
-  top: 25%;
-}
-.box62 .c-center5 {
-  left: 64%;
-  top: 54%;
-}
-.box62 .c-center6 {
-  left: 50%;
-  top: 67%;
-}
-.box62 .c-r-item1 {
-  right: 22%;
-  top: 25%;
-}
-.box62 .c-r-item2 {
-  right: 12%;
-}
-.box62 .c-r-item3 {
-  right: 4%;
-  top: 25%;
-}
+.box62 p {
+  font-size: 0.15rem !important;
+  font-weight: 700;
+  color: #75e2fa;
+}
+.box62 .concent > div {
+  position: absolute;
+  background-position: center -6%;
+  background-size: 95% 86%;
+}
+.box62 {
+  text-align: center;
+  right: 12%;
+}
+.box62 > div {
+  position: absolute;
+}
+.box62 > div :not(.ex) img {
+  width: 75%;
+}
+.box62 .l-bg {
+  width: 100%;
+  height: 100%;
+  background: url("../../images/zybz/背景.png") no-repeat center;
+  background-size: 100%;
+}
+.box62 .x-bg {
+  width: 100%;
+  height: 100%;
+  background: url("../../images/zybz/线.png") no-repeat center;
+  background-size: 100%;
+}
+.box62 .c-left-img-one {
+  left: 11%;
+  top: 14%;
+}
+.box62 .c-left-img-two {
+  left: 16%;
+  top: 8%;
+}
+.box62 .c-center1 {
+  left: 50%;
+  top: 35%;
+  transform: translate(-50%, -50%);
+}
+.box62 .c-center2 {
+  left: 29%;
+  top: 37%;
+}
+.box62 .c-center3 {
+  left: 36%;
+  top: 16%;
+}
+.box62 .c-center4 {
+  left: 55%;
+  top: 22%;
+}
+.box62 .c-center5 {
+  left: 55%;
+  top: 39%;
+}
+.box62 .c-center6 {
+  left: 43%;
+  top: 47%;
+}
+.box62 .c-r-item1 {
+  right: 20%;
+  top: 15%;
+}
+.box62 .c-r-item2 {
+  right: 15%;
+  top: 5%;
+}
+.box62 .c-r-item3 {
+  right:11%;
+  top: 15%;
+}

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

@@ -9,16 +9,16 @@
       <div class="l-bg ex"></div>
       <!-- <div class="x-bg ex"></div> -->
 
-      <div class="c-left-img-one">
+      <div style="width: 120%;" class="c-left-img-one">
         <img src="../images/zybz/jbq拷贝3.png" alt="">
         <p>主城区县</p>
       </div>
-      <div class="c-left-img-two">
+      <div class="c-left-img-two" style="width: 80%;">
         <img src="../images/zybz/ybq拷贝2.png" alt="">
         <p>郊区区县</p>
       </div>
       <div class="c-center1">
-        <img src="../images/zybz/组240拷贝.png" alt="" style="width:282px;">
+        <img src="../images/zybz/组240拷贝.png" alt="" style="width:1666px;">
         <p>指挥大厅</p>
       </div>
       <div class="c-center2">
@@ -33,12 +33,12 @@
         <img src="../images/zybz/icon_jifang拷贝3.png" alt="">
         <p>2号楼中心机房</p>
       </div>
-      <div class="c-center5">
+      <div class="c-center5" style="width: 5%;">
         <img src="../images/zybz/icon_jifang拷贝3.png" alt="">
         <p>档案室库房</p>
       </div>
       <div class="c-center6">
-        <img src="../images/zybz/icon_jifang拷贝3.png" alt="">
+        <img style="width: 57%;" src="../images/zybz/icon_jifang拷贝3.png" alt="">
         <p>城管局网络核心机房</p>
       </div>
 
@@ -46,11 +46,11 @@
         <img src="../images/zybz/hwy拷贝.png" alt="">
         <p>华为云</p>
       </div>
-      <div class="c-r-item2">
+      <div class="c-r-item2" style="width: 6%;">
         <img src="../images/zybz/xcy拷贝.png" alt="">
         <p>信创云</p>
       </div>
-      <div class="c-r-item3">
+      <div class="c-r-item3" style="width: 5%;">
         <img src="../images/zybz/lcy拷贝.png" alt="">
         <p>浪潮云</p>
       </div>
@@ -61,7 +61,7 @@
 
 <!-- 工具弹框 -->
 <div class="tools" style="display: none">
-  <div class="containerTool test62Toll">
+  <div class="containerTool test61Toll">
     <ul>
       <li>
         <span>宽度：</span>

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

@@ -1,4 +1,4 @@
-<div class="box63 box" data-name="test63">
+<div class="box61 box" data-name="test61">
     <div class="toolBox">
         <span class="fit"></span>
         <span class="close"></span>
@@ -13,7 +13,7 @@
 
 <!-- 工具弹框 -->
 <div class="tools" style="display: none">
-    <div class="containerTool test63Toll">
+    <div class="containerTool test61Toll">
         <ul>
             <li>
                 <span>宽度：</span>

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

@@ -1,4 +1,4 @@
-<div class="box64 box" data-name="test64">
+<div class="box64 box" data-name="test61">
     <div class="toolBox">
         <span class="fit"></span>
         <span class="close"></span>
@@ -13,7 +13,7 @@
 
 <!-- 工具弹框 -->
 <div class="tools" style="display: none">
-    <div class="containerTool test64Toll">
+    <div class="containerTool test61Toll">
         <ul>
             <li>
                 <span>宽度：</span>

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

@@ -1,4 +1,4 @@
-<div class="box65 box" data-name="test65">
+<div class="box65 box" data-name="test61">
     <div class="toolBox">
         <span class="fit"></span>
         <span class="close"></span>
@@ -13,7 +13,7 @@
 
 <!-- 工具弹框 -->
 <div class="tools" style="display: none">
-    <div class="containerTool test65Toll">
+    <div class="containerTool test61Toll">
         <ul>
             <li>
                 <span>宽度：</span>

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

@@ -1,4 +1,4 @@
-<div class="box66 box" data-name="test66">
+<div class="box66 box" data-name="test61">
     <div class="toolBox">
         <span class="fit"></span>
         <span class="close"></span>
@@ -13,7 +13,7 @@
 
 <!-- 工具弹框 -->
 <div class="tools" style="display: none">
-    <div class="containerTool test66Toll">
+    <div class="containerTool test61Toll">
         <ul>
             <li>
                 <span>宽度：</span>

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

@@ -7,17 +7,10 @@ html {
 }
 
 .heaTit h1 {
-  color: #8caaf5;
-  /* text-shadow: 1px 1px #ffffff, -1px -1px #2205f5; */
-  font-size: 0.45rem;
-  letter-spacing: 0.1rem;
-  background-image: -webkit-linear-gradient(
-    top,
-    rgb(36, 182, 162),
-    rgb(252, 250, 249)
-  );
-  -webkit-background-clip: text;
-  -webkit-text-fill-color: transparent;
+    color: #8caaf5;
+    text-shadow: 1px 1px #ffffff, -1px -1px #2205f5;
+    font-size: 0.45rem;
+    letter-spacing: 0.1rem;
 }
 
 .box {

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

@@ -1,27 +1,27 @@
-let baseURL = 'http://23.37.100.87:8088/itsm/openInterface'; // 资源保障管理专题（运维）
-
-
-const FLAT_PATH_THREE = "http://23.37.100.87:8084/threeapi";
-
-const ZQURL = 'http://23.37.100.87:81/InterfaceController.asmx'; // 站群
-const imgURL = 'http://23.37.100.87:82'; // 站群
-
-// const FLAT_PATH_THREE = "http://23.37.100.87:8084/threeapi"
-// 23.37.100.87
-// 机房 - DH
-const ROOM = 'http://23.37.100.87:7002';
-const DH = 'http://23.37.100.87:8084/threeapi/';
-// const DH = 'http://23.37.100.87:8084/imcp-api/';
-
-function getDateString(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");
-
-    var hour = dt.getHours().toString().padStart(2, "0");
-    var minute = dt.getMinutes().toString().padStart(2, "0");
-    var second = dt.getSeconds().toString().padStart(2, "0");
-
-    return `${year}年${month}月${day}日 ${hour}:${minute}:${second}`;
-}
+let baseURL = 'http://23.37.100.87:8088/itsm/openInterface'; // 资源保障管理专题（运维）
+
+
+const FLAT_PATH_THREE = "http://23.37.100.87:8084/threeapi";
+
+const ZQURL = 'http://23.37.100.87:8181/InterfaceController.asmx'; // 站群
+const imgURL = 'http://23.37.100.87:8182'; // 站群
+
+// const FLAT_PATH_THREE = "http://23.37.100.87:8084/threeapi"
+// 23.37.100.87
+// 机房 - DH
+const ROOM = 'http://23.37.100.87:7002';
+// const DH = 'http://23.37.100.87:8084/threeapi/';
+const DH = 'http://23.37.100.87:8084/imcp-api/';
+
+function getDateString(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");
+
+    var hour = dt.getHours().toString().padStart(2, "0");
+    var minute = dt.getMinutes().toString().padStart(2, "0");
+    var second = dt.getSeconds().toString().padStart(2, "0");
+
+    return `${year}年${month}月${day}日 ${hour}:${minute}:${second}`;
+}

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

@@ -1,4 +1,4 @@
-const basicUrl = 'http://23.37.100.87:8084/basic';
+const basicUrl = 'http://23.37.100.80:8084/basic';
 // const basicUrl = "http://192.168.0.100:8084/basic";
 
 // http://23.37.100.87:8084