接口对接

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

@@ -55,15 +55,6 @@ const test1 = (function() {
           `
             });
             $('.test1 .trends ul').html('').append(html);
-            // 实际的高度
-            // let actualHeight = parseInt($('.column1 .gzh_gata .inner').get(0).clientHeight);
-            // // 显示的高度
-            // let showHeight = parseInt($('.column1 .gzh_gata .inner_box').get(0).clientHeight);
-            // if (actualHeight < showHeight) {
-            //     // 添加向上的滚动动画
-            //     // 参数：滚动元素，方向，时间（默认元素的子元素长度*25）
-            //     setAnimation($('.inner_box'), 'news')
-            // }
         }
     }
 

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

@@ -13,7 +13,7 @@ const test2 = (function() {
                  * 成功的回调，失败回调 */
                 url: ZQURL + '/getVisitRank',
                 data: {
-                    dateType: 0
+                    dateType: 3
                 },
                 type: 'POST',
                 dataType: 'JSON',
@@ -27,8 +27,7 @@ const test2 = (function() {
                     if (dataArr.length == 0) {
                         return
                     }
-                    // console.log(dataArr);
-                    // This.createRanking(dataArr);
+                    This.createRanking(dataArr);
                 },
                 error: function() {
                     console.log('站群网站访问量排行超时了');
@@ -37,33 +36,18 @@ const test2 = (function() {
         },
 
         createRanking(dataArr) {
-            let html = '';
-            dataArr.forEach((d, i) => {
-                if (i < 3) { // 排名前三有单独的文字样式
-                    html += `
-        <div class="rank">
-          <span class="sp1 no${i + 1}" ></span>
-          <span class="sp2">${d.name}</span>
-        </div>
-        `
-                } else {
-                    html += `
-        <div class="rank">
-          <span class="sp1">NO.${i + 1}</span>
-          <span class="sp2">${d.name}</span>
-        </div>
-        `
-                }
-            });
-            // 暂无数据隐藏
-            $('.column1 .ssgjz .no_data').css('display', 'none')
-            $('.column1 .ssgjz .ssgjz_inner_box').html('').append(html)
-            let actualHeight = parseInt($('.column1 .ssgjz .inner').get(0).clientHeight);
-            // 显示的高度
-            let showHeight = parseInt($('.column1 .ssgjz_inner_box').get(0).clientHeight);
-            if (actualHeight < showHeight) {
-                setAnimation($('.column1 .ssgjz_inner_box'), 'news')
-            }
+          $('.test2 .box2 .one h4').html(dataArr[0].name);
+          $('.test2 .box2 .two h4').html(dataArr[1].name);
+          $('.test2 .box2 .three h4').html(dataArr[2].name);
+           const html = dataArr.map((item,index) => {
+              return `
+              <tr>
+                <td>${index+1}</td>
+                <td>${item.name}</td>
+              </tr>
+              `
+            }).join('')
+            $('.test2 .box2 tbody').html(html)
         }
     }
 
@@ -91,7 +75,7 @@ const test2 = (function() {
         })
         eventClick('.test2');
 
-        // trafficRanking.init();
+        trafficRanking.init();
 
         if ($('.test2 .box .content .noData').length !== 0) {
             return

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

@@ -26,29 +26,29 @@
                         </div>
                     </li>
                     <li>
-                        <p>总访问人数</p>
+                        <p>总文章浏览量</p>
                         <div>
                             <div class="info">
                                 <span class="num">89,774</span>
-                                <span class="unit">人</span>
+                                <span class="unit">次</span>
                             </div>
                         </div>
                     </li>
                     <li>
-                        <p>总访问人数</p>
+                        <p>总文章发布条数</p>
                         <div>
                             <div class="info">
                                 <span class="num">89,774</span>
-                                <span class="unit">人</span>
+                                <span class="unit">条</span>
                             </div>
                         </div>
                     </li>
                     <li>
-                        <p>总访问人数</p>
+                        <p>总空间大小</p>
                         <div>
                             <div class="info">
                                 <span class="num">89,774</span>
-                                <span class="unit">人</span>
+                                <span class="unit">GB</span>
                             </div>
                         </div>
                     </li>

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

@@ -1,6 +1,6 @@
 const test3 = (function() {
 
-    const articleTotalVisits = { // 页面浏览量趋势
+    const articleTotalVisits = { // 文章访问总数
         init() {
             this.getData();
         },
@@ -18,15 +18,14 @@ const test3 = (function() {
                 dataType: 'JSON',
                 contentType: 'application/x-www-form-urlencoded',
                 success: function(data) {
-                    console.log('页面浏览量趋势', data);
+                    console.log('文章访问总数', data);
                     if (data.success != 'true') return
                     const {
                         obj: dataObj
                     } = data;
-                    console.log(dataObj);
                 },
                 error: function() {
-                    console.log('页面浏览量趋势超时了');
+                    console.log('文章访问总数超时了');
                 },
             });
         }
@@ -43,7 +42,7 @@ const test3 = (function() {
         move3('.test3 .test-box')
         move2('.test3 .containerTool')
 
-        // articleTotalVisits.init();
+        articleTotalVisits.init();
         let timer = null;
 
         $('.test3 .close').click(function() {

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

@@ -26,7 +26,6 @@ const test50 = (function () {
         "deviceName": '八楼'
       },
       success: function ({ data }) {
-        console.log('机房接口八楼，二号楼', data);
         // 温度
         let temperature = data.filter(item => {
           return item.signalname==='温度'
@@ -36,7 +35,8 @@ const test50 = (function () {
           return item.signalname==='湿度'
         })[0].signalvalue;
 
-        $('.test50 .box50 .item').eq(1).find('.temp').eq(0).find('span').html(temperature +'℃');
+        $('.test50 .box50 .item').eq(1).find('.temp').find('span').eq(0).html(temperature +'℃');
+        $('.test50 .box50 .item').eq(1).find('.temp').find('span').eq(1).html(humidity +'℃');
       },
       error: function (err) {
         console.log('--机房接口八楼，二号楼-------------超时');
@@ -44,10 +44,53 @@ const test50 = (function () {
     });
 
 
+    // 网络核心机房
+    $.ajax({
+      url: ROOM + '/api/devicesignaltable/listByName',
+      data: {
+        "deviceName": '四楼'
+      },
+      success: function ({ data }) {
+        // 温度
+        let temperature = data.filter(item => {
+          return item.signalname==='温度'
+        })[0].signalvalue;
+        // 湿度 
+        let humidity = data.filter(item => {
+          return item.signalname==='湿度'
+        })[0].signalvalue;
+        
+        $('.test50 .box50 .item').eq(0).find('.temp').find('span').eq(0).html(temperature +'℃');
+        $('.test50 .box50 .item').eq(0).find('.temp').find('span').eq(1).html(humidity +'℃');
+      },
+      error: function (err) {
+        console.log('--网络核心机房-------------超时');
+      }
+    });
 
 
-
-
+    // 配线间机房
+    $.ajax({
+      url: ROOM + '/api/devicesignaltable/listByName',
+      data: {
+        "deviceName": '九楼'
+      },
+      success: function ({ data }) {
+        // 温度
+        let temperature = data.filter(item => {
+          return item.signalname==='温度'
+        })[0].signalvalue;
+        // 湿度 
+        let humidity = data.filter(item => {
+          return item.signalname==='湿度'
+        })[0].signalvalue;
+        $('.test50 .box50 .item').eq(2).find('.temp').find('span').eq(0).html(temperature +'℃');
+        $('.test50 .box50 .item').eq(2).find('.temp').find('span').eq(1).html(humidity +'℃');
+      },
+      error: function (err) {
+        console.log('--配线间机房-------------超时');
+      }
+    });
 
     $('.test50 .box50 .item').click(function () {
 

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

@@ -27,7 +27,7 @@ const test8 = (function() {
         const testDoms = document.querySelectorAll('.test8 .box');
         for (let i = 0; i < dists.length; i++) {
             const dom = dists[i];
-            setCharts(dom, testDoms[i]);
+            // setCharts(dom, testDoms[i]);
         }
 
         let myChart = echarts.init(dists[0]);

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

@@ -2,82 +2,14 @@ const test9 = (function() {
 
 
 
-    // 最新动态数据
-    const officialAccount = {
-        init() {
-            this.getData();
-        },
-
-        getData() {
-            $.ajax({
-                /** url，data参数，
-                 * type请求类型，响应体结果，超时时间
-                 * 成功的回调，失败回调 */
-                url: baseURL + '/getHotNews_Top10',
-                data: {
-                    dateType: 0
-                },
-                type: 'POST',
-                dataType: 'JSON',
-                contentType: 'application/x-www-form-urlencoded',
-                success: function(data) {
-                    if (data.success != 'true') return
-                    const {
-                        obj: dataArr
-                    } = data;
-                    if (dataArr.length == 0) {
-                        return
-                    }
-                    console.log(dataArr, '热门文章排行');
-                    // This.createRankingPopularArticles(dataArr);
-                },
-                error: function() {
-                    console.log('超时了');
-                },
-            });
-        },
-
-        createRankingPopularArticles(dataArr) {
-            let html = '';
-            let newDataArr = dataArr.filter((item) => {
-                return item.titlepic != '' && item.summary != '';
-            })
-            newDataArr.forEach((d, i) => {
-                    html += `
-          <div class="news" >
-          <img src="${imgURL + d.titlepic}" class="imgx"></img>
-            <!-- 排名 -->
-            <div class="ranking">
-                <span>${(i + 1 + '').padStart(2, "0")}</span>
-            </div>
-            <p class="title">${d.title}</p>
-            <p class="news_cont">${d.summary}</p>
-          </div>
-        `
-                })
-                // 暂无数据隐藏
-            $('.column3 .rmwzph .no_data').css('display', 'none')
-            $('.column3 .rmwzph .inner').html('').append(html);
-            // 实际的高度
-            const actualHeight = parseInt($('.column3 .rmwzph').get(0).clientHeight) - parseInt($('.column3 .panel_title').get(0).clientHeight);
-            // 显示的高度
-            const showHeight = parseInt($('.column3 .inner').get(0).clientHeight);
-            if (showHeight > actualHeight) {
-                // setAnimation($('.column3 .rmwzph .inner'), 'news', 70)
-            }
-        },
-
-    }
-
     // 热门文章排行
     const RankingOfPopularArticles = {
         init() {
-            const This = this;
             $.ajax({
                 /** url，data参数，
                  * type请求类型，响应体结果，超时时间
                  * 成功的回调，失败回调 */
-                url: baseURL + '/getHotNews_Top10',
+                url: ZQURL + '/getHotNews_Top10',
                 data: {
                     dateType: 0
                 },
@@ -85,18 +17,23 @@ const test9 = (function() {
                 dataType: 'JSON',
                 contentType: 'application/x-www-form-urlencoded',
                 success: function(data) {
+                  console.log(data, '热门文章排行');
+
                     if (data.success != 'true') return
                     const {
                         obj: dataArr
                     } = data;
                     if (dataArr.length == 0) {
+                      $('.test9 .box9 .content').html('暂无数据');
+                      $('.test9 .box9 .content').css({
+                        'color':'#fff'
+                      })
                         return
                     }
-                    console.log(dataArr, '热门文章排行');
-                    This.createRankingPopularArticles(dataArr);
+                    // This.createRankingPopularArticles(dataArr);
                 },
                 error: function() {
-                    console.log('超时了');
+                    console.log('热门文章排行超时了');
                 },
             });
         },
@@ -142,7 +79,7 @@ const test9 = (function() {
         eventClick('.test9');
 
 
-        officialAccount.init()
+        RankingOfPopularArticles.init()
 
     }
 

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

@@ -3,7 +3,7 @@ let baseURL = 'http://23.37.100.80:8088/itsm/openInterface'; // 资源保障管
 
 const FLAT_PATH_THREE = "http://23.37.100.80:8084/threeapi";
 
-const ZQURL = 'http://23.37.100.81:81/InterfaceController.asmx'; // 站群
+const ZQURL = 'http://23.37.100.80:81/InterfaceController.asmx'; // 站群
 const imgURL = 'http://23.37.100.80:82'; // 站群
 
 // const FLAT_PATH_THREE = "http://23.37.100.80:8084/threeapi"

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

@@ -979,4 +979,16 @@ ul.subject li .previewBox {
     font-weight: 700;
     color: #fffffd;
     margin-top: 3px;
+}
+
+.bossMeng{
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background-color: transparent;
+  z-index: 99999999;
+  display: none;
+
 }

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

@@ -1,4 +1,4 @@
-async function setChartsTest13() {
+ function setChartsTest13() {
     const echartDom = document.querySelector('.test13 .floor-dist');
     // 1实例化对象
     const myChart = echarts.init(echartDom);
@@ -53,5 +53,5 @@ async function setChartsTest13() {
             ]
         }]
     };
-    await myChart.setOption(option);
+   myChart.setOption(option);
 }

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

@@ -4,7 +4,6 @@ import modus from "./modular.js"; // 所有模块
 import domClick from "./domClick.js"; // 模块菜单信息的添加监听
 import { manyValues } from "./util.js";
 
-// import { module62, module63, module64, module65, module66 } from "./setRoom.js";
 
 let roomIndex = 0; // 机房标识
 //左侧菜单点击
@@ -71,6 +70,7 @@ if (problem.type === '-1') {
         for (const box of $('.box')) {
             box.ondragend = null;
         }
+        $('.bossMeng').css('display','block');
     }, 100);
 }
 
@@ -171,7 +171,6 @@ $(`.sf1`).load('./springFrame1.html', _ => {
         $(this).parent().parent().css('display', 'none')
     });
 });
-// $(`.sf2`).load('./springFrame2.html', _ => {})
 $(`.sf3`).load('./springFrame3.html', _ => {
     for (let i = 18; i <= 24; i++) {
         move3(`.springFrame3 .box${i} .test-box`)
@@ -182,6 +181,8 @@ $(`.sf3`).load('./springFrame3.html', _ => {
     })
 
 })
+
+
 $(`.sf4`).load('./springFrame4.html', _ => {
     for (let i = 25; i <= 30; i++) {
         move3(`.springFrame4 .box${i} .test-box`)
@@ -217,7 +218,6 @@ $(`.sf5`).load('./springFrame5.html', _ => {
     })
 })
 
-let box42L, box42T, box61L, box61T;
 
 // 网络安全态势地图的切换 
 // .box42：地图

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

@@ -327,6 +327,10 @@
             </div>
         </div>
     </div>
+
+
+
+    <div class="bossMeng"></div>
     <script src="../components/test8/graphData.js"></script>
 
 

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

@@ -180,7 +180,7 @@
                             top: +domPosition[1] / 50 + 'vh'
                         })
                         if (theme.dom_name === 'test13') {
-                            await setChartsTest13();
+                             setChartsTest13();
                         }
                         // localStorage.setItem(res.id, document.querySelector('#wrapper').outerHTML);
                     })

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

@@ -483,9 +483,6 @@
 
 
 
-    // setCharts13(dom13, testDom13);
-    // setCharts14(dom14, testDom14);
-
     function setCharts13(echartDom, testDom, data = []) {
         const defaultData = [{
             value: 1048,

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

@@ -379,7 +379,6 @@
                 $('.springFrame4 .box28 .text1').text(result.safeSystemCount);
                 $('.springFrame4 .box28 .text2').text(result.middleSystemCount);
             }
-
         },
         error: function(err) {
             console.log("业务系统-超时");
@@ -412,8 +411,9 @@
                 const val = item.attackType.reduce((a, b) => {
                     return a + b.attack_count;
                 }, 0)
-                vals.push(vals);
+                vals.push(val);
             });
+
             setCharts29(dom29, testDom29, vals);
         },
         error: function(err) {
@@ -521,21 +521,12 @@
         if (!testDom) {
             testDom = document.querySelectorAll('.test27 .box');
         }
-        window.addEventListener('resize', function() {
-            if (timer) {
-                clearTimeout(timer);
-                timer = null;
-            }
-            timer = setTimeout(() => {
-                myChart.resize();
-            }, 500);
-        })
         obsDom(testDom, myChart)
     }
 
     // box29
     function setCharts29(echartDom, testDom, vals = []) {
-        if (vals === undefined || vals.length === 0) {
+        if (vals.length === 0) {
             vals = [{
                 value: 1048,
                 name: '广告'
@@ -548,7 +539,6 @@
             }];
         }
 
-
         let timer = null;
 
         // 1实例化对象
@@ -709,15 +699,6 @@
         if (!testDom) {
             testDom = document.querySelectorAll('.test29 .box');
         }
-        window.addEventListener('resize', function() {
-            if (timer) {
-                clearTimeout(timer);
-                timer = null;
-            }
-            timer = setTimeout(() => {
-                myChart.resize();
-            }, 500);
-        })
         obsDom(testDom, myChart)
     }
 </script>

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

@@ -256,7 +256,7 @@
           <div class="Water-immersion-box-one">
             <div class="Water-immersion-box-title">
               <div class="Water-immersion-box-svg">
-                <img src="../../font/水滴.png" alt="" />
+                <img src="../font/水滴.png" alt="" />
               </div>
               <div>水滴1状态</div>
             </div>