代码合并

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

@@ -13,7 +13,7 @@ const test1 = (function() {
                  * 成功的回调，失败回调 */
                 url: ZQURL + '/getNews_Top10',
                 data: {
-                    dateType: 3
+                    dateType: 0
                 },
                 type: 'GET',
                 dataType: 'JSON',

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: 3
+                    dateType: 0
                 },
                 type: 'POST',
                 dataType: 'JSON',
@@ -25,6 +25,10 @@ const test2 = (function() {
                         obj: dataArr
                     } = data;
                     if (dataArr.length == 0) {
+                      $('.test2 .box2 .content').html('暂无数据')
+                      $('.test2 .box2 .content').css('text-align','center')
+                      $('.test2 .box2 .content').css('justify-content','center')
+                      $('.test2 .box2 .content').css('fontSize','0.2rem')
                         return
                     }
                     This.createRanking(dataArr);
@@ -36,10 +40,14 @@ const test2 = (function() {
         },
 
         createRanking(dataArr) {
+          let names = [];
+          let values = [];
           $('.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) => {
+             names.push(item.name);
+             values.push(+item.cnts);
               return `
               <tr>
                 <td>${index+1}</td>
@@ -48,6 +56,9 @@ const test2 = (function() {
               `
             }).join('')
             $('.test2 .box2 tbody').html(html)
+            const dom = document.querySelector('.test2 .floor-dist');
+            const testDom = document.querySelector('.test2 .box');
+            setCharts(dom, testDom,names,values);
         }
     }
 
@@ -62,8 +73,6 @@ const test2 = (function() {
         move3('.test2 .test-box')
         move2('.test2 .containerTool')
 
-        let timer = null;
-
 
         $('.test2 .close').click(function() {
             $('.test2 .box').remove();
@@ -80,33 +89,12 @@ const test2 = (function() {
         if ($('.test2 .box .content .noData').length !== 0) {
             return
         }
-
-        const dists = document.querySelectorAll('.test2 .floor-dist');
-        const testDoms = document.querySelectorAll('.test2 .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(() => {
-                move3('.test2 .test-box')
-
-                myChart.resize();
-            }, 500);
-        })
     }
 
 
-    function setCharts(echartDom, testDom) {
+    function setCharts(echartDom, testDom,names,values) {
         var myChart = echarts.init(echartDom);
-
+let timer = null;
         const offsetX = 20;
         const offsetY = 10;
         // 绘制左侧面
@@ -160,7 +148,7 @@ const test2 = (function() {
         echarts.graphic.registerShape('CubeRight', CubeRight);
         echarts.graphic.registerShape('CubeTop', CubeTop);
 
-        const VALUE = [100, 200, 300, 400, 300, 200, 100];
+        const VALUE = values;
 
         option = {
             // backgroundColor: '#012366',
@@ -183,7 +171,7 @@ const test2 = (function() {
             },
             xAxis: {
                 type: 'category',
-                data: ['1001', '1002', '1003', '1004', '1005', '1006', '1007'],
+                data: names,
                 axisLine: {
                     show: true,
                     lineStyle: {
@@ -331,6 +319,17 @@ const test2 = (function() {
             ],
         };
         myChart.setOption(option);
+        window.addEventListener('resize', function() {
+          if (timer) {
+              clearTimeout(timer);
+              timer = null;
+          }
+          timer = setTimeout(() => {
+              move3('.test2 .test-box')
+
+              myChart.resize();
+          }, 500);
+      })
         if (!testDom) {
             testDom = document.querySelectorAll('.test8 .box');
         }

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

@@ -34,7 +34,7 @@ const test27 = (function() {
     }
 
     $.ajax({
-        url: "http://23.37.100.80:8084" + "/basic/RiskType/getSysRiskType",
+        url: "http://23.37.100.87:8084" + "/basic/RiskType/getSysRiskType",
         data: {
             orgType: 1,
             riskClassify: 1

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

@@ -24,7 +24,7 @@ const test29 = (function() {
         eventClick('.test29');
         // setCharts(`.test29 .floor-dist`);
         $.ajax({
-            url: "http://23.37.100.80:8084" + "/basic/AttackType/getAttackTypeBymonth",
+            url: "http://23.37.100.87:8084" + "/basic/AttackType/getAttackTypeBymonth",
             data: {
                 orgType: 1
             },

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

@@ -18,12 +18,45 @@ const test31 = (function() {
             }),
             $(".box31 li").click(function() {
                 $(".company-details").show();
-
                 if (con++ % 2 === 1) {
                     $('.box31-two').css('height', '0')
                 } else {
                     $('.box31-two').css('height', '100%')
                 }
+                $.ajax({
+                  url: basicUrl +
+                      "/SystemRisk/GetSystemRiskList",
+                  data: {},
+                  success: function(res) {
+                      console.log('安全等级弹框', res);
+                      const {result} = res;
+                     const html = result.map((item,index) => {
+                       const high = item.high_risk_number;
+                       const middle = item.middle_risk_number;
+                       let sum = high + middle;
+                       if(isNaN(sum)){
+                         sum = 0;
+                       }
+                      return `
+                          <tr class="tbody-box">
+                            <td class="tbody-details">${index+1}</td>
+                            <td class="tbody-details">${item.office_name}</td>
+                            <td class="tbody-details">${item.system_name}</td>
+                            <td class="tbody-details">${high||'-'}</td>
+                            <td class="tbody-details">${middle || '-'}</td>
+                            <td class="tbody-details">-</td>
+                            <td class="tbody-details">${sum}</td>
+                            <td class="tbody-details"></td>
+                          </tr>
+                      `
+                      }).join('');
+                      $('.box31-two .company-details tbody').html(html);
+                  },
+                  error: function(err) {
+                      console.log("----安全等级弹框--------超时");
+                  },
+              });
+
             });
 
 

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

@@ -9,7 +9,6 @@ const test39 = (function() {
         move2('.test39 .containerTool')
 
 
-        let timer = null;
 
 
         $('.test39 .close').click(function() {
@@ -22,82 +21,35 @@ const test39 = (function() {
 
         eventClick('.test39');
 
-        const dists = document.querySelectorAll('.test39 .floor-dist');
-        const testDoms = document.querySelectorAll('.test39 .box');
-        for (let i = 0; i < dists.length; i++) {
-            const dom = dists[i];
-            // setCharts(dom, testDoms[i]);
-        }
 
-        // let myChart = echarts.init(dists[0]);
+        // 攻击类型
+        $.ajax({
+          url: FLAT_PATH_THREE +'/apiUrl/sendApiUrlAndParam',
+          type:'GET',
+          data: {
+            urlCode:'AQZX_011',
+            params:'{"startTime":"2020-06-23 00:00:00","endTime":"2022-04-29 19:41:58","size":5}'
+          },
+          success: function(res) {
+            const result = JSON.parse(res.data);
+            console.log('攻击类型', result);
+             const html = result.data.map((item,index) => {
+              return `
+              <div class="progress">
+                <div class="proDesc"><i style="background-color: #ccc;"></i> 远程控制 》 恶意IP</div>
+                <span style="width: 20%;"><span>20%</span></span>
+                <span class="txt"><i style="color: #ccc;">202</i> 条</span>
+              </div>
+              `
+              }).join('');
+              $('.test39 .box39 .container').html(html ? html : '暂无数据')
+          },
+          error: function(err) {
+              console.log("----攻击类型--------超时");
+          },
+      });
 
-        window.addEventListener('resize', function() {
-            if (timer) {
-                clearTimeout(timer);
-                timer = null;
-            }
-            timer = setTimeout(() => {
-                // myChart.resize();
-            }, 500);
-        })
     }
 
-    function setCharts(echartDom, testDom) {
-        // 1实例化对象
-        myChart = echarts.init(echartDom);
-        let option = {
-            tooltip: {
-                trigger: 'item'
-            },
-            legend: {
-                orient: 'vertical',
-                left: 'right',
-                top: "center",
-                textStyle: {
-                    color: "rgba(255,255,255,.5)",
-                    fontSize: "12",
-                },
-            },
-            series: [{
-                name: 'Access From',
-                type: 'pie',
-                radius: ['40%', '70%'],
-                avoidLabelOverlap: false,
-                itemStyle: {
-                    borderRadius: 10,
-                    borderColor: '#fff',
-                    borderWidth: 2
-                },
-                label: {
-                    show: false,
-                    position: 'center'
-                },
-                emphasis: {
-                    label: {
-                        show: true,
-                        fontSize: '40',
-                        fontWeight: 'bold'
-                    }
-                },
-                labelLine: {
-                    show: false
-                },
-                data: [
-                    { value: 1048, name: 'Search' },
-                    { value: 735, name: 'Direct' },
-                    { value: 580, name: 'Email' },
-                    { value: 484, name: 'U Ads' },
-                    { value: 300, name: 'V Ads' }
-                ]
-            }]
-        };
-        myChart.setOption(option);
-        // obsDom(`.test39 .box`, myChart)
-
-        if (!testDom) {
-            testDom = document.querySelectorAll('.test39 .box');
-        }
-        obsDom(testDom, myChart)
-    }
     return test39
 })();

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

@@ -1,248 +1,241 @@
-const test44 = (function () {
-  let allHealth = 80;
+const test44 = (function() {
+    let allHealth = 80;
 
-  function test44(id, domTitle) {
-    if (domTitle) {
-      $(".test44 .title h2").text(domTitle);
-    }
-    $(".test44 .box").css("z-index", ++zIndex);
-    $(".test44 .box").attr("data-id", id);
-    move3(".test44 .test-box");
-    move2(".test44 .containerTool");
+    function test44(id, domTitle) {
+        if (domTitle) {
+            $(".test44 .title h2").text(domTitle);
+        }
+        $(".test44 .box").css("z-index", ++zIndex);
+        $(".test44 .box").attr("data-id", id);
+        move3(".test44 .test-box");
+        move2(".test44 .containerTool");
+
+        $(".test44 .close").click(function() {
+            $(".test44 .box").remove();
+            $(".test44 .containerTool").css("display", "none");
+            $(".test44 .setWidth").val("");
+            $(".test44 .setHeight").val("");
+            moduleIdRemove.push(id);
+        });
 
-    $(".test44 .close").click(function () {
-      $(".test44 .box").remove();
-      $(".test44 .containerTool").css("display", "none");
-      $(".test44 .setWidth").val("");
-      $(".test44 .setHeight").val("");
-      moduleIdRemove.push(id);
-    });
+        eventClick(".test44");
 
-    eventClick(".test44");
-    const dists = document.querySelectorAll(".test44 .floor-dist");
-    const testDoms = document.querySelectorAll(".test44 .box");
-    for (let i = 0; i < dists.length; i++) {
-      const dom = dists[i];
-      setCharts(dom, testDoms[i], allHealth);
+        myAjax44();
     }
-    // myAjax44();
-  }
 
-  function setCharts(echartDom, testDom, allHealth) {
-    let timer = null;
+    function setCharts(echartDom, testDom, allHealth) {
+        let timer = null;
 
-    // 1实例化对象
-    let myChart = echarts.init(echartDom);
-    if (allHealth > 180) {
-      allHealth = 180;
-    } else if (allHealth < 0) {
-      allHealth = -parseInt(allHealth);
-    }
+        // 1实例化对象
+        let myChart = echarts.init(echartDom);
+        if (allHealth > 180) {
+            allHealth = 180;
+        } else if (allHealth < 0) {
+            allHealth = -parseInt(allHealth);
+        }
 
-    // obsDom(`.test7 .box`, myChart)
+        // obsDom(`.test7 .box`, myChart)
 
-    var normal = 100,
-      all = 100;
-    option = {
-      series: [
-        {
-          name: "刻度",
-          type: "gauge",
-          center: ["50%", "70%"],
-          radius: "110%",
-          min: 0, //最小刻度
-          max: 100, //最大刻度
-          splitNumber: 10, //刻度数量
-          startAngle: 180,
-          endAngle: 0,
-          axisLine: {
-            show: true,
-            lineStyle: {
-              width: 1,
-              color: [[1, "rgba(0,0,0,0)"]],
-            },
-          }, //仪表盘轴线
-          axisLabel: {
-            show: true,
-            color: "#fff",
-            fontSize: 80,
-            distance: -50,
-            formatter: function (v) {
-              return v;
-            },
-          }, //刻度标签。
-          axisTick: {
-            show: true,
-            splitNumber: 5,
-            lineStyle: {
-              color: "#263b35",
-              width: 1,
-              // length:10
-            },
-            length: -20,
-          }, //刻度样式
-          splitLine: {
-            show: true,
-            length: -20,
-            lineStyle: {
-              color: "#4aca96",
-              width: 2,
-            },
-          }, //分隔线样式
-        },
-        {
-          type: "gauge",
-          radius: "100%",
-          center: ["50%", "70%"],
-          splitNumber: 0, //刻度数量
-          startAngle: 180,
-          endAngle: 0,
-          axisLine: {
-            show: true,
-            lineStyle: {
-              width: 50,
-              color: [
-                [
-                  1,
-                  new echarts.graphic.LinearGradient(0, 0, 1, 0, [
-                    {
-                      offset: 0,
-                      color: "#fcfe92",
+        var normal = 100,
+            all = 100;
+        option = {
+            series: [{
+                    name: "刻度",
+                    type: "gauge",
+                    center: ["50%", "70%"],
+                    radius: "110%",
+                    min: 0, //最小刻度
+                    max: 100, //最大刻度
+                    splitNumber: 10, //刻度数量
+                    startAngle: 180,
+                    endAngle: 0,
+                    axisLine: {
+                        show: true,
+                        lineStyle: {
+                            width: 1,
+                            color: [
+                                [1, "rgba(0,0,0,0)"]
+                            ],
+                        },
+                    }, //仪表盘轴线
+                    axisLabel: {
+                        show: true,
+                        color: "#fff",
+                        fontSize: 30,
+                        distance: -50,
+                        formatter: function(v) {
+                            return v;
+                        },
+                    }, //刻度标签。
+                    axisTick: {
+                        show: true,
+                        splitNumber: 5,
+                        lineStyle: {
+                            color: "#263b35",
+                            width: 1,
+                            // length:10
+                        },
+                        length: -20,
+                    }, //刻度样式
+                    splitLine: {
+                        show: true,
+                        length: -20,
+                        lineStyle: {
+                            color: "#4aca96",
+                            width: 2,
+                        },
+                    }, //分隔线样式
+                },
+                {
+                    type: "gauge",
+                    radius: "100%",
+                    center: ["50%", "70%"],
+                    splitNumber: 0, //刻度数量
+                    startAngle: 180,
+                    endAngle: 0,
+                    axisLine: {
+                        show: true,
+                        lineStyle: {
+                            width: 50,
+                            color: [
+                                [
+                                    1,
+                                    new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
+                                            offset: 0,
+                                            color: "#fcfe92",
+                                        },
+                                        {
+                                            offset: 1,
+                                            color: "#4ccb96",
+                                        },
+                                    ]),
+                                ],
+                            ],
+                        },
                     },
-                    {
-                      offset: 1,
-                      color: "#4ccb96",
+                    //分隔线样式。
+                    splitLine: {
+                        show: false,
                     },
-                  ]),
-                ],
-              ],
-            },
-          },
-          //分隔线样式。
-          splitLine: {
-            show: false,
-          },
-          axisLabel: {
-            show: false,
-          },
-          axisTick: {
-            show: false,
-          },
-          pointer: {
-            show: true,
-            length: "80%",
-            width: "2%",
-          },
-          title: {
-            show: true,
-            offsetCenter: [0, "60%"], // x, y，单位px
-            textStyle: {
-              fontWeight: "bold",
-              color: "#0ab7ff",
-              fontSize: 100,
-            },
-          },
-          //仪表盘详情，用于显示数据。
-          detail: {
-            show: true,
-            offsetCenter: [0, "-40%"],
-            color: "#ffffff",
-            textStyle: {
-              fontSize: 150,
-              color: "#4aca96",
-            },
-          },
-          data: [
-            {
-              value: allHealth,
-            },
-          ],
-        },
-      ],
-    };
+                    axisLabel: {
+                        show: false,
+                    },
+                    axisTick: {
+                        show: false,
+                    },
+                    pointer: {
+                        show: true,
+                        length: "80%",
+                        width: "2%",
+                    },
+                    title: {
+                        show: true,
+                        offsetCenter: [0, "60%"], // x, y，单位px
+                        textStyle: {
+                            fontWeight: "bold",
+                            color: "#0ab7ff",
+                            fontSize: 30,
+                        },
+                    },
+                    //仪表盘详情，用于显示数据。
+                    detail: {
+                        show: true,
+                        offsetCenter: [0, "-40%"],
+                        color: "#ffffff",
+                        textStyle: {
+                            fontSize: 40,
+                            color: "#4aca96",
+                        },
+                    },
+                    data: [{
+                        value: allHealth,
+                    }, ],
+                },
+            ],
+        };
 
-    // setInterval(function() {
-    //     currentOption = currentOption === scatterOption ? barOption : scatterOption;
-    //     myChart.setOption(currentOption, true);
-    // }, 2000);
-    myChart.setOption(option);
-    // obsDom(`.test7 .box`, myChart)
-    window.addEventListener("resize", function () {
-      if (timer) {
-        clearTimeout(timer);
-        timer = null;
-      }
-      timer = setTimeout(() => {
-        move3(".test44 .test-box");
+        // setInterval(function() {
+        //     currentOption = currentOption === scatterOption ? barOption : scatterOption;
+        //     myChart.setOption(currentOption, true);
+        // }, 2000);
+        myChart.setOption(option);
+        // obsDom(`.test7 .box`, myChart)
+        window.addEventListener("resize", function() {
+            if (timer) {
+                clearTimeout(timer);
+                timer = null;
+            }
+            timer = setTimeout(() => {
+                move3(".test44 .test-box");
 
-        myChart.resize();
-      }, 500);
-    });
-    if (!testDom) {
-      testDom = document.querySelectorAll(".test7 .box");
+                myChart.resize();
+            }, 500);
+        });
+        if (!testDom) {
+            testDom = document.querySelectorAll(".test7 .box");
+        }
+        obsDom(testDom, myChart);
     }
-    obsDom(testDom, myChart);
-  }
 
-  //   function myAjax44() {
-  //     $.ajax({
-  //       url: baseURL + "/getHealthOfAll",
-  //       data: {
-  //         orgIds: "200",
-  //       },
-  //       type: "GET",
-  //       dataType: "JSON",
-  //       success: function (data) {
-  //         if (data.code != 0) {
-  //           console.log("健康度------------------------code!=0");
-  //           return;
-  //         }
-  //         // const result = eval('(' + data.data + ')');
-  //         console.log("健康度------------------------", data);
+    function myAjax44() {
+        $.ajax({
+            url: baseURL + "/getHealthOfAll",
+            data: {
+                orgIds: "200",
+            },
+            type: "GET",
+            dataType: "JSON",
+            success: function(data) {
+                if (data.code != 0) {
+                    console.log("健康度------------------------code!=0");
+                    return;
+                }
+                // const result = eval('(' + data.data + ')');
+                console.log("健康度------------------------", data);
 
-  //         const res = data.data.params;
-  //         allHealth = data.data.allHealth; // 网络设备维修度
-  //         setContent(res);
+                const res = data.data.params;
+                allHealth = data.data.allHealth; // 网络设备维修度
+                setContent(res);
 
-  //         const dists = document.querySelectorAll(".test44 .floor-dist");
-  //         const testDoms = document.querySelectorAll(".test44 .box");
-  //         for (let i = 0; i < dists.length; i++) {
-  //           const dom = dists[i];
-  //           // setCharts(dom, testDoms[i], allHealth);
-  //         }
-  //       },
-  //       timeout: 6000,
-  //       error: function () {
-  //         console.log("健康度------------------------超时了");
-  //       },
-  //     });
+                const dists = document.querySelectorAll(".test44 .floor-dist");
+                const testDoms = document.querySelectorAll(".test44 .box");
+                for (let i = 0; i < dists.length; i++) {
+                    const dom = dists[i];
+                    setCharts(dom, testDoms[i], allHealth);
+                }
+            },
+            timeout: 6000,
+            error: function() {
+                console.log("健康度------------------------超时了");
+            },
+        });
 
-  //     // 设计文本内容
-  //     function setContent(Data) {
-  //       for (let i = 0; i < Data.length; i++) {
-  //         switch (Data[i].TYPE) {
-  //           case "1": // 服务器
-  //             $(".server_prec").html(Math.ceil(Data[i].average) + "%");
-  //             break;
-  //           case "2": // 数据库
-  //             $(".database_prec").html(Math.ceil(Data[i].average) + "%");
-  //             break;
-  //           case "3": // 应用服务器
-  //             $(".app_server_prec").html(Math.ceil(Data[i].average) + "%");
-  //             break;
-  //           case "4": // 网络设备
-  //             $(".network_prec").html(Math.ceil(Data[i].average) + "%");
-  //             break;
-  //           case "5": // 应用系统
-  //             $(".app_system_prec").html(Math.ceil(Data[i].average) + "%");
-  //             break;
-  //           case "6": // 第三方应用系统
-  //             $(".other_prec").html(Math.ceil(Data[i].average) + "%");
-  //             break;
-  //         }
-  //       }
-  //     }
-  //   }
+        // 设计文本内容
+        function setContent(Data) {
+            for (let i = 0; i < Data.length; i++) {
+                switch (Data[i].TYPE) {
+                    case "1": // 服务器
+                        $(".server_prec").html(Math.ceil(Data[i].average) + "%");
+                        break;
+                    case "2": // 数据库
+                        $(".database_prec").html(Math.ceil(Data[i].average) + "%");
+                        break;
+                    case "3": // 应用服务器
+                        $(".app_server_prec").html(Math.ceil(Data[i].average) + "%");
+                        break;
+                    case "4": // 网络设备
+                        $(".network_prec").html(Math.ceil(Data[i].average) + "%");
+                        break;
+                    case "5": // 应用系统
+                        $(".app_system_prec").html(Math.ceil(Data[i].average) + "%");
+                        break;
+                    case "6": // 第三方应用系统
+                        $(".other_prec").html(Math.ceil(Data[i].average) + "%");
+                        break;
+                }
+            }
+        }
+    }
 
-  return test44;
-})();
+    return test44;
+})();

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

@@ -1,433 +1,545 @@
 const test50 = (function () {
-  function test50(id, domTitle) {
+  function test50 (id, domTitle) {
     if (domTitle) {
-      $(".test50 .title h2").text(domTitle);
+      $('.test50 .title h2').text(domTitle)
     }
-    $(".test50 .box").css("z-index", ++zIndex);
-    $(".test50 .box").attr("data-id", id);
-    move3(".test50 .test-box");
-    move2(".test50 .containerTool");
-
-    $(".test50 .close").click(function () {
-      $(".test50 .box").remove();
-      $(".test50 .containerTool").css("display", "none");
-      $(".test50 .setWidth").val("");
-      $(".test50 .setHeight").val("");
-      moduleIdRemove.push(id);
-    });
+    $('.test50 .box').css('z-index', ++zIndex)
+    $('.test50 .box').attr('data-id', id)
+    move3('.test50 .test-box')
+    move2('.test50 .containerTool')
+
 
-    eventClick(".test50");
+    $('.test50 .close').click(function () {
+      $('.test50 .box').remove();
+      $('.test50 .containerTool').css('display', 'none');
+      $('.test50 .setWidth').val('')
+      $('.test50 .setHeight').val('')
+      moduleIdRemove.push(id)
+    })
 
-    // 二号楼中心机房
+    eventClick('.test50');
+
+      // 二号楼中心机房
     $.ajax({
-      url: ROOM + "/api/devicesignaltable/listByName",
+      url: ROOM + '/api/devicesignaltable/listByName',
       data: {
-        deviceName: "八楼",
+        "deviceName": '八楼'
       },
       success: function ({ data }) {
         // 温度
-        let temperature = data.filter((item) => {
-          return item.signalname === "温度";
+        let temperature = data.filter(item => {
+          return item.signalname==='温度'
         })[0].signalvalue;
-        // 湿度
-        let humidity = data.filter((item) => {
-          return item.signalname === "湿度";
+        // 湿度 
+        let humidity = data.filter(item => {
+          return item.signalname==='湿度'
         })[0].signalvalue;
 
-        $(".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 + "℃");
+        $('.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("--机房接口八楼，二号楼-------------超时");
-      },
+        console.log('--机房接口八楼，二号楼-------------超时');
+      }
     });
 
+
     // 网络核心机房
     $.ajax({
-      url: ROOM + "/api/devicesignaltable/listByName",
+      url: ROOM + '/api/devicesignaltable/listByName',
       data: {
-        deviceName: "四楼",
+        "deviceName": '四楼'
       },
       success: function ({ data }) {
         // 温度
-        let temperature = data.filter((item) => {
-          return item.signalname === "温度";
+        let temperature = data.filter(item => {
+          return item.signalname==='温度'
         })[0].signalvalue;
-        // 湿度
-        let humidity = data.filter((item) => {
-          return item.signalname === "湿度";
+        // 湿度 
+        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 + "℃");
+        
+        $('.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("--网络核心机房-------------超时");
-      },
+        console.log('--网络核心机房-------------超时');
+      }
     });
 
+
     // 配线间机房
     $.ajax({
-      url: ROOM + "/api/devicesignaltable/listByName",
+      url: ROOM + '/api/devicesignaltable/listByName',
       data: {
-        deviceName: "九楼",
+        "deviceName": '九楼'
       },
       success: function ({ data }) {
         // 温度
-        let temperature = data.filter((item) => {
-          return item.signalname === "温度";
+        let temperature = data.filter(item => {
+          return item.signalname==='温度'
         })[0].signalvalue;
-        // 湿度
-        let humidity = data.filter((item) => {
-          return item.signalname === "湿度";
+        // 湿度 
+        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 + "℃");
+        $('.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("--配线间机房-------------超时");
-      },
+        console.log('--配线间机房-------------超时');
+      }
     });
 
-    $(".test50 .box50 .item").click(function () {
-      const typeId = $(this).attr("data-id");
-
-      const dom52 = document.querySelector(".springFrame5 .box52 .floor-dist");
-      const testDom52 = document.querySelector(".springFrame5 .box52");
-      const dom53 = document.querySelector(".springFrame5 .box53 .floor-dist");
-      const testDom53 = document.querySelector(".springFrame5 .box53");
-      const dom54 = document.querySelector(".springFrame5 .box54 .floor-dist");
-      const testDom54 = document.querySelector(".springFrame5 .box54");
-      const dom58 = document.querySelector(".springFrame5 .box58 .floor-dist");
-      const testDom58 = document.querySelector(".springFrame5 .box58");
-      const dom59 = document.querySelector(".springFrame5 .box59 .floor-dist");
-      const testDom59 = document.querySelector(".springFrame5 .box59");
-
-      setCharts53(dom53, testDom53);
-      setCharts54(dom54, testDom54);
-
-      if (typeId === "1") {
-        // 网络核心机房
+// 档案室库房
+    $.ajax({
+      /** url，data参数，
+       * type请求类型，响应体结果，超时时间
+       * 成功的回调，失败回调 */
+      url: DH + 'queryData/queryDeviceParam',
+      data: {
+          "urlCode": 'DH_002'
+      },
+      type: 'GET',
+      dataType: 'JSON',
+      success: function({data}) {
+        console.log('档案室库房',data);
+        // 温度
+        let temperature = data.filter(item => {
+          if(item.sname === '环境温度'){
+            return true
+          }
+        }).reduce((cur,item)=>{
+          return cur+parseFloat(item.value);
+        },0);
+        // 湿度 
+        let humidity = data.filter(item => {
+          if(item.sname === '环境湿度'){
+            return true
+          }
+        }).reduce((cur,item)=>{
+          return cur+parseFloat(item.value);
+        },0);
+        $('.test50 .box50 .item').eq(3).find('.temp').find('span').eq(0).html(temperature +'℃');
+        $('.test50 .box50 .item').eq(3).find('.temp').find('span').eq(1).html(humidity +'℃');
+
+      },
+      timeout: 6000,
+      error: function() {
+          console.log('档案室库房超时了');
+      },
+  });
+
+
+    $('.test50 .box50 .item').click(function () {
+
+      const typeId = $(this).attr('data-id')
+
+      const dom52 = document.querySelector('.springFrame5 .box52 .floor-dist');
+      const testDom52 = document.querySelector('.springFrame5 .box52');
+      const dom53 = document.querySelector('.springFrame5 .box53 .floor-dist');
+      const testDom53 = document.querySelector('.springFrame5 .box53');
+      const dom54 = document.querySelector('.springFrame5 .box54 .floor-dist');
+      const testDom54 = document.querySelector('.springFrame5 .box54');
+      const dom58 = document.querySelector('.springFrame5 .box58 .floor-dist');
+      const testDom58 = document.querySelector('.springFrame5 .box58');
+      const dom59 = document.querySelector('.springFrame5 .box59 .floor-dist');
+      const testDom59 = document.querySelector('.springFrame5 .box59');
+
+      setCharts53(dom53, testDom53)
+      setCharts54(dom54, testDom54)
+
+      if(typeId==='1'){ // 网络核心机房
         fourthFloor();
-      } else if (typeId === "2") {
-        // 2号楼中心机房
+      }else if(typeId === '2'){ // 2号楼中心机房
         eighthFloor();
-      } else if (typeId === "3") {
-        // 配线间机房
-        ninthFloor();
-      } else if (typeId === "4") {
-        // 档案库房
+      }else if(typeId === '3'){ // 配线间机房
+        ninthFloor()
+      }else if(typeId === '4'){ // 档案库房
         dasRoom();
-      } else {
-        // UPS供电机房
+      }else{ // UPS供电机房
         upsOf();
       }
 
       // 二号楼中心机房
       function eighthFloor() {
         $.ajax({
-          url: ROOM + "/api/devicesignaltable/listByName",
+          url: ROOM + '/api/devicesignaltable/listByName',
           data: {
-            deviceName: "八楼",
+            "deviceName": '八楼'
           },
           success: function ({ data }) {
-            console.log("机房接口八楼，二号楼", data);
+            console.log('机房接口八楼，二号楼', data);
             // 温度
-            let temperature = data.filter((item) => {
-              return item.signalname === "温度";
+            let temperature = data.filter(item => {
+              return item.signalname==='温度'
             })[0].signalvalue;
-            // 湿度
-            let humidity = data.filter((item) => {
-              return item.signalname === "湿度";
+            // 湿度 
+            let humidity = data.filter(item => {
+              return item.signalname==='湿度'
             })[0].signalvalue;
-
+            
             // 漏水位置/米
-            let leackgePosition = data.filter((item) => {
-              return item.signalname === "漏水1位置";
+            let leackgePosition = data.filter(item => {
+              return item.signalname==='漏水1位置'
             })[0].signalvalue;
             // 电阻率
             let eleRes = data[3].signalvalue;
-            if (isNaN(eleRes)) {
+            if(isNaN(eleRes)){
               eleRes = 0;
             }
             // 机房水浸状态
-            let waterStauts = data.filter((item) => {
-              return item.signalname === "水浸1状态";
+            let waterStauts = data.filter(item => {
+              return item.signalname==='水浸1状态'
             })[0].signalvalue;
             // 机房通信状态
             let comStatus = data[0].signalvalue;
-            $(".springFrame5 .box58 .text1").html(comStatus);
-            $(".springFrame5 .box58 .text2").html(waterStauts);
-            setCharts52(dom52, testDom52, temperature, humidity);
-            setCharts59(dom59, testDom59, temperature, humidity);
-            setCharts58(dom58, testDom58, leackgePosition, eleRes);
+
+
+            // 开关量
+            let swit = data.filter(item => {
+              return item.signalname.indexOf('开关量')!==-1 && item.signalvalue.indexOf('正常') !== -1;
+            });
+            $('.springFrame5 .box58 .text1').html(comStatus);
+            $('.springFrame5 .box58 .text2').html(waterStauts);
+
+            setValue(temperature,humidity,waterStauts,'-','-','-',swit ? '正常' :'')
+            
+            setCharts52(dom52, testDom52, temperature, humidity)
+            setCharts59(dom59, testDom59, temperature, humidity)
+            setCharts58(dom58, testDom58,leackgePosition,eleRes)
           },
           error: function (err) {
-            console.log("--机房接口八楼，二号楼-------------超时");
-          },
+            console.log('--机房接口八楼，二号楼-------------超时');
+          }
         });
       }
 
       // 网络核心机房
       function fourthFloor() {
         $.ajax({
-          url: ROOM + "/api/devicesignaltable/listByName",
+          url: ROOM + '/api/devicesignaltable/listByName',
           data: {
-            deviceName: "四楼",
+            "deviceName": '四楼'
           },
           success: function ({ data }) {
-            console.log("网络核心机房", data);
+            console.log('网络核心机房', data);
             // 温度
-            let temperature = data.filter((item) => {
-              return item.signalname === "温度";
+            let temperature = data.filter(item => {
+              return item.signalname==='温度'
             })[0].signalvalue;
-            // 湿度
-            let humidity = data.filter((item) => {
-              return item.signalname === "湿度";
+            // 湿度 
+            let humidity = data.filter(item => {
+              return item.signalname==='湿度'
             })[0].signalvalue;
-
+            
             // 漏水位置/米
-            let leackgePosition = data.filter((item) => {
-              return item.signalname === "漏水1位置";
+            let leackgePosition = data.filter(item => {
+              return item.signalname==='漏水1位置'
             })[0].signalvalue;
             // 电阻率
             let eleRes = data[3].signalvalue;
-            if (isNaN(eleRes)) {
+            if(isNaN(eleRes)){
               eleRes = 0;
             }
             // 机房温湿度状态
-            let waterStauts = data.filter((item) => {
-              return (
-                item.devicename === "四楼机房温湿度1" &&
-                item.signalname === "通信状态"
-              );
+            let waterStauts = data.filter(item => {
+              return item.devicename==="四楼机房温湿度1" && item.signalname==='通信状态'
             })[0].signalvalue;
 
             // 机房水浸通信状态
-            let comStatus = data.filter((item) => {
-              return (
-                item.devicename === "四楼机房水浸1" &&
-                item.signalname === "通信状态"
-              );
+            let comStatus = data.filter(item => {
+              return item.devicename==="四楼机房水浸1" && item.signalname==='通信状态'
             })[0].signalvalue;
 
             // 机房水浸1状态
-            let sStatus = data.filter((item) => {
-              return (
-                item.devicename === "四楼机房水浸1" &&
-                item.signalname === "水浸1状态"
-              );
+            let sStatus = data.filter(item => {
+              return item.devicename==="四楼机房水浸1" && item.signalname==="水浸1状态"
             })[0].signalvalue;
 
             // 消防状态模块-通信状态
-            let xfStatus = data.filter((item) => {
-              return (
-                item.devicename === "四楼机房消防状态模块1" &&
-                item.signalname === "通信状态"
-              );
+            let xfStatus = data.filter(item => {
+              return item.devicename==="四楼机房消防状态模块1" && item.signalname==='通信状态'
             })[0].signalvalue;
             // 消防状态模块-主机状态
-            let zjStatus = data.filter((item) => {
-              return (
-                item.devicename === "四楼机房消防状态模块1" &&
-                item.signalname === "四楼2#消防主机状态"
-              );
+            let zjStatus = data.filter(item => {
+              return item.devicename==="四楼机房消防状态模块1" && item.signalname==="四楼2#消防主机状态"
             })[0].signalvalue;
 
-            // 消防状态模块-开关量2
-            let kgStatus = data.filter((item) => {
-              return (
-                item.devicename === "四楼机房空开状态模块3" &&
-                item.signalname === "开关量1"
-              );
+             // 消防状态模块-开关量2
+             let kgStatus = data.filter(item => {
+              return item.devicename==="四楼机房空开状态模块3" && item.signalname==="开关量1"
             })[0].signalvalue;
 
-            $(".springFrame5 .box58 .text1").html(comStatus);
-            $(".springFrame5 .box58 .text2").html(sStatus);
-            $(".springFrame5 .box59 .Water-immersion-text").html(waterStauts);
-            $(".springFrame5 .box60 .text1").html(xfStatus);
-            $(".springFrame5 .box60 .text2").html(zjStatus);
-            $(".springFrame5 .box60 .text3").html(kgStatus);
-            setCharts52(dom52, testDom52, temperature, humidity);
-            setCharts59(dom59, testDom59, temperature, humidity);
-            setCharts58(dom58, testDom58, leackgePosition, eleRes);
+            setValue(temperature,humidity,sStatus,'-','-',kgStatus,'')
+
+            $('.springFrame5 .box58 .text1').html(comStatus);
+            $('.springFrame5 .box58 .text2').html(sStatus);
+            $('.springFrame5 .box59 .Water-immersion-text').html(waterStauts);
+            $('.springFrame5 .box60 .text1').html(xfStatus);
+            $('.springFrame5 .box60 .text2').html(zjStatus);
+            $('.springFrame5 .box60 .text3').html(kgStatus);
+            setCharts52(dom52, testDom52, temperature, humidity)
+            setCharts59(dom59, testDom59, temperature, humidity)
+            setCharts58(dom58, testDom58,leackgePosition,eleRes)
           },
           error: function (err) {
-            console.log("--网络核心机房-------------超时");
-          },
+            console.log('--网络核心机房-------------超时');
+          }
         });
       }
 
       // 配线间机房
       function ninthFloor() {
         $.ajax({
-          url: ROOM + "/api/devicesignaltable/listByName",
+          url: ROOM + '/api/devicesignaltable/listByName',
           data: {
-            deviceName: "九楼",
+            "deviceName": '九楼'
           },
           success: function ({ data }) {
-            console.log("配线间机房", data);
+            console.log('配线间机房', data);
             // 温度
-            let temperature = data.filter((item) => {
-              return item.signalname === "温度";
+            let temperature = data.filter(item => {
+              return item.signalname==='温度'
             })[0].signalvalue;
-            // 湿度
-            let humidity = data.filter((item) => {
-              return item.signalname === "湿度";
+            // 湿度 
+            let humidity = data.filter(item => {
+              return item.signalname==='湿度'
             })[0].signalvalue;
-
+            
             // 漏水位置/米
-            let leackgePosition = data.filter((item) => {
-              return item.signalname === "漏水1位置";
+            let leackgePosition = data.filter(item => {
+              return item.signalname==='漏水1位置'
             })[0].signalvalue;
             // 电阻率
             let eleRes = data[3].signalvalue; // d
-            if (isNaN(eleRes)) {
+            if(isNaN(eleRes)){
               eleRes = 0;
             }
             // 机房温湿度状态
-            let waterStauts = data.filter((item) => {
-              return (
-                item.devicename === "九楼机房温湿度4" &&
-                item.signalname === "通信状态"
-              );
+            let waterStauts = data.filter(item => {
+              return item.devicename==="九楼机房温湿度4" && item.signalname==='通信状态'
             })[0].signalvalue;
 
             // 机房水浸通信状态
-            let comStatus = data.filter((item) => {
-              return (
-                item.devicename === "九楼机房水浸3" &&
-                item.signalname === "通信状态"
-              );
+            let comStatus = data.filter(item => {
+              return item.devicename==="九楼机房水浸3" && item.signalname==='通信状态'
             })[0].signalvalue;
 
             // 机房水浸1状态
-            let sStatus = data.filter((item) => {
-              return item.signalname === "水浸1状态";
+            let sStatus = data.filter(item => {
+              return item.signalname==="水浸1状态"
             })[0].signalvalue;
 
-            $(".springFrame5 .box58 .text1").html(comStatus);
-            $(".springFrame5 .box58 .text2").html(sStatus);
-            $(".springFrame5 .box59 .Water-immersion-text").html(waterStauts);
-            setCharts52(dom52, testDom52, temperature, humidity);
-            setCharts59(dom59, testDom59, temperature, humidity);
-            setCharts58(dom58, testDom58, leackgePosition, eleRes);
+            setValue(temperature,humidity,sStatus,'-','-','-','')
+
+
+            $('.springFrame5 .box58 .text1').html(comStatus);
+            $('.springFrame5 .box58 .text2').html(sStatus);
+            $('.springFrame5 .box59 .Water-immersion-text').html(waterStauts);
+            setCharts52(dom52, testDom52, temperature, humidity)
+            setCharts59(dom59, testDom59, temperature, humidity)
+            setCharts58(dom58, testDom58,leackgePosition,eleRes)
           },
           error: function (err) {
-            console.log("--配线间机房-------------超时");
-          },
+            console.log('--配线间机房-------------超时');
+          }
         });
       }
 
+     
+
       // 档案室库房
       function dasRoom() {
         $.ajax({
           /** url，data参数，
            * type请求类型，响应体结果，超时时间
            * 成功的回调，失败回调 */
-          url: DH + "apiUrl/sendApiUrl",
+          url: DH + 'queryData/queryDeviceParam',
           data: {
-            urlCode: "DH_002",
+              "urlCode": 'DH_002'
           },
-          type: "GET",
-          dataType: "JSON",
-          success: function ({ data }) {
-            console.log("档案室库房", data);
+          type: 'GET',
+          dataType: 'JSON',
+          success: function({data}) {
+            console.log('档案室库房',data);
+            // 温度
+            let temperature,
+            
+           curtemp = data.filter(item => {
+              if(item.sname === '环境温度'){
+                return true
+              }
+            });
+            temperature = (curtemp.reduce((cur,item)=>{
+              return cur+parseInt(item.value);
+            },0) / curtemp.length).toFixed(2);
+
+            // 湿度 
+            let humidity,
+            curhum = data.filter(item => {
+              if(item.sname === '环境湿度'){
+                return true
+              }
+            })
+           humidity = (curhum.reduce((cur,item)=>{
+              return cur+parseInt(item.value);
+            },0) / curhum.length).toFixed(2);
+
+
+            setValue(temperature,humidity,'-','-','-','-','')
+
+
+            setCharts52(dom52, testDom52, temperature, humidity)
+            setCharts59(dom59, testDom59, temperature, humidity)
+
+            let index = 0;
+           const status = data.filter(item => {
+              return item.sname.indexOf('状态') !== -1;
+            });
+            console.log('各种状态',status);
+            $('.Water-immersion-box-one').each(function () {
+              $(this).find('.Water-immersion-box-title').find('div').eq(1).html(status[index].sname)
+              $(this).find('.Water-immersion-text').html(status[index].value === 'true' ? '正常' : '异常')
+              index++;
+            })
+
+
+
+            // setCharts58(dom58, testDom58,leackgePosition,eleRes)
           },
           timeout: 6000,
-          error: function () {
-            console.log("档案室库房超时了");
+          error: function() {
+              console.log('档案室库房超时了');
           },
-        });
+      });
       }
 
       // UPS供电机房
       function upsOf() {
         $.ajax({
-          url: ROOM + "/api/devicesignaltable/listByName",
+          url: ROOM + '/api/devicesignaltable/listByName',
           data: {
-            deviceName: "UPS",
+            "deviceName": 'UPS'
           },
-          success: function ({ data }) {
-            console.log("UPS供电机房", data);
+          success:function ({data}) {
+            console.log('UPS供电机房',data);
           },
           error: function (err) {
-            console.log("--UPS供电机房-------------超时");
-          },
+            console.log('--UPS供电机房-------------超时');
+          }
         });
       }
 
+
+      function setValue(temperature,humidity,water,smoke,ups,swit,isToll) {
+        $('.springFrame5 .box55 .box-box').eq(0).find('.temperature-box-one').eq(0).find('div').eq(2).html(temperature+'°')
+        $('.springFrame5 .box55 .box-box').eq(0).find('.temperature-box-one').eq(1).find('div').eq(2).html(humidity+'RH%')
+        $('.springFrame5 .box55 .box-box').eq(0).find('.temperature-box-one').eq(2).find('div').eq(2).html(water)
+
+
+        $('.springFrame5 .box55 .box-box').eq(1).find('.temperature-box-one').eq(0).find('div').eq(2).html(smoke)
+        $('.springFrame5 .box55 .box-box').eq(1).find('.temperature-box-one').eq(1).find('div').eq(2).html(ups)
+        $('.springFrame5 .box55 .box-box').eq(1).find('.temperature-box-one').eq(2).find('div').eq(2).html(swit)
+
+        // 温度是否过高
+        $('.springFrame5 .box55 .text-box').html(isToll)
+      }
+
+
+       // 告警信息
+   $.ajax({
+    /** url，data参数，
+     * type请求类型，响应体结果，超时时间
+     * 成功的回调，失败回调 */
+    url: DH + 'queryData/queryWarningInfo',
+    type: 'GET',
+    dataType: 'JSON',
+    success: function({data}) {
+      console.log('告警信息',data);
+      const html = data.map((item,index) => {
+        let level = '一级';
+        switch (item.level) {
+          case 1:
+            level = '一级';
+            break;
+            case 2:
+            level = '二级';
+            break;
+            case 3:
+            level = '三级';
+            break;
+            case 4:
+            level = '四级';
+            break;
+            case 5:
+            level = '五级';
+            break;
+          default:
+            level = '六级';
+            break;
+        }
+        return `
+        <tr>
+          <td>${index+1}</td>
+          <td>${item.aname}</td>
+          <td>${item.description}</td>
+          <td>${level}</td>
+          <td>${item.eventtime}</td>
+        </tr>
+        `
+      }).join('')
+      $('.springFrame5 .box56 tbody').html(html)
+    },
+    timeout: 6000,
+    error: function() {
+        console.log('告警信息超时了');
+    },
+});
+
+
       roomIndex = $(this).index();
-      roomIndex = 9;
+      roomIndex = 9
       if (roomIndex === 0) {
-        $(".springFrame5 .roomThree62").css("visibility", "inherit");
-        $(".springFrame5 .roomThree63").css("visibility", "hidden");
-        $(".springFrame5 .roomThree64").css("visibility", "hidden");
-        $(".springFrame5 .roomThree65").css("visibility", "hidden");
-        $(".springFrame5 .roomThree66").css("visibility", "hidden");
+        $('.roomThree62').css('visibility', 'inherit');
+        $('.roomThree63').css('visibility', 'hidden');
+        $('.roomThree64').css('visibility', 'hidden');
+        $('.roomThree65').css('visibility', 'hidden');
+        $('.roomThree66').css('visibility', 'hidden');
         module62();
       } else if (roomIndex === 1) {
-        $(".springFrame5 .roomThree62").css("visibility", "hidden");
-        $(".springFrame5 .roomThree63").css("visibility", "inherit");
-        $(".springFrame5 .roomThree64").css("visibility", "hidden");
-        $(".springFrame5 .roomThree65").css("visibility", "hidden");
-        $(".springFrame5 .roomThree66").css("visibility", "hidden");
+        $('.roomThree62').css('visibility', 'hidden');
+        $('.roomThree63').css('visibility', 'inherit');
+        $('.roomThree64').css('visibility', 'hidden');
+        $('.roomThree65').css('visibility', 'hidden');
+        $('.roomThree66').css('visibility', 'hidden');
         module63();
       } else if (roomIndex === 2) {
-        $(".springFrame5 .roomThree62 ").css("visibility", "hidden");
-        $(".springFrame5 .roomThree63").css("visibility", "hidden");
-        $(".springFrame5 .roomThree64").css("visibility", "inherit");
-        $(".springFrame5 .roomThree65").css("visibility", "hidden");
-        $(".springFrame5 .roomThree66").css("visibility", "hidden");
+        $('.roomThree62 ').css('visibility', 'hidden');
+        $('.roomThree63').css('visibility', 'hidden');
+        $('.roomThree64').css('visibility', 'inherit');
+        $('.roomThree65').css('visibility', 'hidden');
+        $('.roomThree66').css('visibility', 'hidden');
         module64();
       } else if (roomIndex === 3) {
-        $(".springFrame5 .roomThree62").css("visibility", "hidden");
-        $(".springFrame5 .roomThree63").css("visibility", "hidden");
-        $(".springFrame5 .roomThree64").css("visibility", "hidden");
-        $(".springFrame5 .roomThree65").css("visibility", "inherit");
-        $(".springFrame5 .roomThree66").css("visibility", "hidden");
+        $('.roomThree62').css('visibility', 'hidden');
+        $('.roomThree63').css('visibility', 'hidden');
+        $('.roomThree64').css('visibility', 'hidden');
+        $('.roomThree65').css('visibility', 'inherit');
+        $('.roomThree66').css('visibility', 'hidden');
         module65();
       } else {
-        // $('.springFrame5 .roomThree62').css('visibility', 'hidden');
-        // $('.springFrame5 .roomThree63').css('visibility', 'hidden');
-        // $('.springFrame5 .roomThree64').css('visibility', 'hidden');
-        // $('.springFrame5 .roomThree65').css('visibility', 'hidden');
-        // $('.springFrame5 .roomThree66').css('visibility', 'inherit');
+        // $('.roomThree62').css('visibility', 'hidden');
+        // $('.roomThree63').css('visibility', 'hidden');
+        // $('.roomThree64').css('visibility', 'hidden');
+        // $('.roomThree65').css('visibility', 'hidden');
+        // $('.roomThree66').css('visibility', 'inherit');
         // module66();
       }
       $(".sf5").slideToggle();
-    });
+    })
   }
 
-  return test50;
+  return test50
 })();

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

@@ -18,6 +18,56 @@ const test51 = (function() {
         })
 
         eventClick('.test51');
+
+           // 告警信息
+   $.ajax({
+    /** url，data参数，
+     * type请求类型，响应体结果，超时时间
+     * 成功的回调，失败回调 */
+    url: DH + 'queryData/queryWarningInfo',
+    type: 'GET',
+    dataType: 'JSON',
+    success: function({data}) {
+      console.log('告警信息',data);
+      const html = data.map((item,index) => {
+        let level = '一级';
+        switch (item.level) {
+          case 1:
+            level = '一级';
+            break;
+            case 2:
+            level = '二级';
+            break;
+            case 3:
+            level = '三级';
+            break;
+            case 4:
+            level = '四级';
+            break;
+            case 5:
+            level = '五级';
+            break;
+          default:
+            level = '六级';
+            break;
+        }
+        return `
+        <tr>
+          <td>${index+1}</td>
+          <td>${item.aname}</td>
+          <td>${item.description}</td>
+          <td>${level}</td>
+          <td>${item.eventtime}</td>
+        </tr>
+        `
+      }).join('')
+      $('.test51 .box51 tbody').html(html)
+    },
+    timeout: 6000,
+    error: function() {
+        console.log('告警信息超时了');
+    },
+});
     }
 
     return test51

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

@@ -25,6 +25,35 @@ const test6 = (function() {
         eventClick('.test6');
         // setCharts(`.test6 .floor-dist`);
 
+
+        //地图
+        $.ajax({
+          /** url，data参数，
+           * type请求类型，响应体结果，超时时间
+           * 成功的回调，失败回调 */
+          url: ZQURL + '/getHotMap',
+          data: {
+              dateType: 0
+          },
+          type: 'POST',
+          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) {
+                  return
+              }
+              This.createRanking(dataArr);
+          },
+          error: function() {
+              console.log('地图超时了');
+          },
+      });
+
         const dists = document.querySelectorAll('.test6 .floor-dist');
         const testDoms = document.querySelectorAll('.test6 .box');
         for (let i = 0; i < dists.length; i++) {
@@ -45,6 +74,7 @@ const test6 = (function() {
                 myChart.resize();
             }, 500);
         })
+
     }
 
     function setCharts(echartDom, testDom) {

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

@@ -30,8 +30,6 @@ const test61 = (function() {
             $(".sf1").slideDown();
             $(".sf3").slideUp();
             $(".sf4").slideUp();
-            setCharts13(dom13, testDom13);
-            setCharts14(dom14, testDom14);
         });
 
 
@@ -42,8 +40,8 @@ const test61 = (function() {
             $(".sf1").slideUp();
             $(".sf3").slideUp();
 
-            setCharts27(dom27, testDom27);
-            setCharts29(dom29, testDom29);
+            // setCharts27(dom27, testDom27);
+            // setCharts29(dom29, testDom29);
         });
 
         // 华为
@@ -60,6 +58,51 @@ const test61 = (function() {
             $(".test61 .Popup").css("display", "none");
         });
         $(".test61 .left-box-three").click(function() {
+
+          $.ajax({
+            url: basicUrl +
+                "/SystemRisk/GetSystemRiskList",
+            data: {},
+            success: function(res) {
+                console.log('安全等级弹框', res);
+                const {result} = res;
+               const html = result.map((item,index) => {
+                 const high = item.high_risk_number;
+                 const middle = item.middle_risk_number;
+                 let sum = high + middle;
+                 if(isNaN(sum)){
+                   sum = 0;
+                 }
+                 let status = '中';
+                 switch (item.safety_status) {
+                   case 1:
+                    status = '低'
+                     break;
+                     case 2:
+                      status = '中'
+                      break;
+                   default:
+                    status = '高'
+                     break;
+                 }
+                return `
+                    <tr class="Tr-td">
+                      <td>${item.system_name}</td>
+                      <td>${high}</td>
+                      <td>${middle}</td>
+                      <td>${status}</td>
+                      <td>${item.update_time ||item.create_time }</td>
+                    </tr>
+                `
+                }).join('');
+                $('.box61 .Popup tbody').html(html);
+            },
+            error: function(err) {
+                console.log("----安全等级弹框--------超时");
+            },
+        });
+
+
             $(".test61 .Popup").css("display", "block");
         });
     }

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

@@ -5,6 +5,7 @@ const test9 = (function() {
     // 热门文章排行
     const RankingOfPopularArticles = {
         init() {
+          const This = this;
             $.ajax({
                 /** url，data参数，
                  * type请求类型，响应体结果，超时时间
@@ -30,7 +31,7 @@ const test9 = (function() {
                       })
                         return
                     }
-                    // This.createRankingPopularArticles(dataArr);
+                    This.createRankingPopularArticles(dataArr);
                 },
                 error: function() {
                     console.log('热门文章排行超时了');
@@ -44,16 +45,19 @@ const test9 = (function() {
                 return item.titlepic != '' && item.summary != '';
             })
             newDataArr.forEach((d, i) => {
-                html += `
-            <div>
-                <img src="${imgURL + d.titlepic}" alt="">
-            </div>
-                <div class="info">
-              <h5>${d.title}</h5>
-            <p>${d.summary}</p>
-          </div>
-        `
+                  html+=`
+                  <li>
+                  <div>
+                      <img src="${imgURL + d.titlepic}" alt="">
+                  </div>
+                  <div class="info">
+                      <h5>${d.title}</h5>
+                      <p>${d.summary}</p>
+                  </div>
+              </li>
+                   `
             })
+            $('.test9 .box9 ul').html(html);
         }
     }