合并代码

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

@@ -9,7 +9,6 @@ const test38 = (function() {
         move2('.test38 .containerTool')
 
 
-        let timer = null;
 
 
         $('.test38 .close').click(function() {
@@ -23,13 +22,24 @@ const test38 = (function() {
         eventClick('.test38');
 
 
-        window.addEventListener('resize', function() {
-            if (timer) {
-                clearTimeout(timer);
-                timer = null;
-            }
-            timer = setTimeout(() => {}, 500);
-        })
+         // 安全事件
+         $.ajax({
+          url: FLAT_PATH_THREE +'/apiUrl/sendApiUrlAndParam',
+          type:'GET',
+          data: {
+            urlCode:'AQZX_014',
+            params:'{"startTime":"2020-06-23+00:00:00","endTime":"2022-04-29+19:41:58"}'
+          },
+          success: function(res) {
+            console.log('安全事件', JSON.parse(res.data));
+
+          },
+          error: function(err) {
+              console.log("----安全事件--------超时");
+          },
+      });
+
+
     }
 
     return test38

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

@@ -28,9 +28,10 @@ const test39 = (function() {
           type:'GET',
           data: {
             urlCode:'AQZX_011',
-            params:'{"startTime":"2020-06-23 00:00:00","endTime":"2022-04-29 19:41:58","size":5}'
+            params:'{"startTime":"2022-05-04+00:00:00","endTime":"2022-05-10+19:41:58","size":5}'
           },
           success: function(res) {
+            console.log(res);
             const result = JSON.parse(res.data);
             console.log('攻击类型', result);
              const html = result.data.map((item,index) => {

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

@@ -16,7 +16,7 @@
                     <div>网络核心机房</div>
                     <div class="temp">
                         <p>温度：<span>25℃</span></p>
-                        <p>温度：<span>25℃</span></p>
+                        <p>湿度：<span>25℃</span></p>
                     </div>
                 </div>
             </div>
@@ -26,7 +26,7 @@
                     <div>2号楼中心机房</div>
                     <div class="temp">
                         <p>温度：<span>25℃</span></p>
-                        <p>温度：<span>25℃</span></p>
+                        <p>湿度：<span>25℃</span></p>
                     </div>
                 </div>
             </div>
@@ -36,7 +36,7 @@
                     <div>配线间机房</div>
                     <div class="temp">
                         <p>温度：<span>25℃</span></p>
-                        <p>温度：<span>25℃</span></p>
+                        <p>湿度：<span>25℃</span></p>
                     </div>
                 </div>
             </div>
@@ -46,7 +46,7 @@
                     <div>档案库房</div>
                     <div class="temp">
                         <p>温度：<span>25℃</span></p>
-                        <p>温度：<span>25℃</span></p>
+                        <p>湿度：<span>25℃</span></p>
                     </div>
                 </div>
             </div>
@@ -56,7 +56,7 @@
                     <div>UPS供电机房</div>
                     <div class="temp">
                         <p>温度：<span>25℃</span></p>
-                        <p>温度：<span>25℃</span></p>
+                        <p>湿度：<span>25℃</span></p>
                     </div>
                 </div>
             </div>

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

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

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

@@ -159,15 +159,15 @@ $.ajax({
 
 
 
-$.ajax({
-  url: basicUrl + '/SystemRisk/GetSystemRiskList',
-  success: function(res) {
-      console.log('测试接口', res);
-  },
-  error: function(err) {
-      console.log('---测试接口-----------超时');
-  }
-});
+// $.ajax({
+//   url: basicUrl + '/SystemRisk/GetSystemRiskList',
+//   success: function(res) {
+//       console.log('测试接口', res);
+//   },
+//   error: function(err) {
+//       console.log('---测试接口-----------超时');
+//   }
+// });
 
 // 监控设备状态
 $.ajax({