机房接口对接

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

@@ -1,8 +1,7 @@
 .box10 .inner a {
-    display: inline-block;
-    margin: 0.12rem;
+  display: inline-block;
+  margin: 0.12rem;
 }
-
 .box10 .inner a img {
-    width: 2.4rem;
-}
+  width: 1.7rem;
+}

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test10/test10.less

@@ -7,7 +7,7 @@
       margin: 0.12rem;
 
       img {
-        width: 1.4rem;
+        width: 1.7rem;
       }
     }
   }

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.87:8084" + "/basic/RiskType/getSysRiskType",
+        url: "http://23.37.100.80: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.87:8084" + "/basic/AttackType/getAttackTypeBymonth",
+            url: "http://23.37.100.80:8084" + "/basic/AttackType/getAttackTypeBymonth",
             data: {
                 orgType: 1
             },

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

@@ -21,7 +21,7 @@ const test34 = (function() {
 
 
         $.ajax({
-            url: "http://23.37.100.87:8084" + "/basic/RiskNews/getRiskNewsByInfo",
+            url: "http://23.37.100.80:8084" + "/basic/RiskNews/getRiskNewsByInfo",
             data: {},
             success: function(res) {
                 console.log('漏洞情报', res);

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

@@ -27,7 +27,7 @@
 }
 .box50 .content .item .item-box div:nth-child(1) {
   background-image: linear-gradient(45deg, #2dced9a1, transparent);
-  font-size: 0.1rem !important;
+  font-size: 0.15rem !important;
   width: 145%;
 }
 .box50 .content .item .item-box .temp {

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

@@ -10,7 +10,7 @@
     </div>
     <div class="test-box">
         <div class="content">
-            <div class="item">
+            <div class="item" data-id=1>
                 <img src="../images/networkSecurity/pic_kuang.png" alt="">
                 <div class="item-box">
                     <div>网络核心机房</div>
@@ -20,40 +20,40 @@
                     </div>
                 </div>
             </div>
-            <div class="item">
+            <div class="item" data-id=2>
                 <img src="../images/networkSecurity/pic_kuang.png" alt="">
                 <div class="item-box">
-                    <div>网络核心机房</div>
+                    <div>2号楼中心机房</div>
                     <div class="temp">
                         <p>温度：<span>25℃</span></p>
                         <p>温度：<span>25℃</span></p>
                     </div>
                 </div>
             </div>
-            <div class="item">
+            <div class="item" data-id=3>
                 <img src="../images/networkSecurity/pic_kuang.png" alt="">
                 <div class="item-box">
-                    <div>网络核心机房</div>
+                    <div>配线间机房</div>
                     <div class="temp">
                         <p>温度：<span>25℃</span></p>
                         <p>温度：<span>25℃</span></p>
                     </div>
                 </div>
             </div>
-            <div class="item">
+            <div class="item" data-id=4>
                 <img src="../images/networkSecurity/pic_kuang.png" alt="">
                 <div class="item-box">
-                    <div>网络核心机房</div>
+                    <div>档案库房</div>
                     <div class="temp">
                         <p>温度：<span>25℃</span></p>
                         <p>温度：<span>25℃</span></p>
                     </div>
                 </div>
             </div>
-            <div class="item">
+            <div class="item" data-id=5>
                 <img src="../images/networkSecurity/pic_kuang.png" alt="">
                 <div class="item-box">
-                    <div>网络核心机房</div>
+                    <div>UPS供电机房</div>
                     <div class="temp">
                         <p>温度：<span>25℃</span></p>
                         <p>温度：<span>25℃</span></p>

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

@@ -19,7 +19,40 @@ const test50 = (function () {
 
     eventClick('.test50');
 
+      // 二号楼中心机房
+    $.ajax({
+      url: ROOM + '/api/devicesignaltable/listByName',
+      data: {
+        "deviceName": '八楼'
+      },
+      success: function ({ data }) {
+        console.log('机房接口八楼，二号楼', 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(1).find('.temp').eq(0).find('span').html(temperature +'℃');
+      },
+      error: function (err) {
+        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');
@@ -30,14 +63,236 @@ const test50 = (function () {
       const testDom58 = document.querySelector('.springFrame5 .box58');
       const dom59 = document.querySelector('.springFrame5 .box59 .floor-dist');
       const testDom59 = document.querySelector('.springFrame5 .box59');
-      setCharts52(dom52, testDom52)
+
       setCharts53(dom53, testDom53)
       setCharts54(dom54, testDom54)
-      setCharts58(dom58, testDom58)
-      setCharts59(dom59, testDom59)
+
+      if(typeId==='1'){ // 网络核心机房
+        fourthFloor();
+      }else if(typeId === '2'){ // 2号楼中心机房
+        eighthFloor();
+      }else if(typeId === '3'){ // 配线间机房
+        ninthFloor()
+      }else if(typeId === '4'){ // 档案库房
+        dasRoom();
+      }else{ // UPS供电机房
+        upsOf();
+      }
+
+      // 二号楼中心机房
+      function eighthFloor() {
+        $.ajax({
+          url: ROOM + '/api/devicesignaltable/listByName',
+          data: {
+            "deviceName": '八楼'
+          },
+          success: function ({ data }) {
+            console.log('机房接口八楼，二号楼', data);
+            // 温度
+            let temperature = data.filter(item => {
+              return item.signalname==='温度'
+            })[0].signalvalue;
+            // 湿度 
+            let humidity = data.filter(item => {
+              return item.signalname==='湿度'
+            })[0].signalvalue;
+            
+            // 漏水位置/米
+            let leackgePosition = data.filter(item => {
+              return item.signalname==='漏水1位置'
+            })[0].signalvalue;
+            // 电阻率
+            let eleRes = data[3].signalvalue;
+            if(isNaN(eleRes)){
+              eleRes = 0;
+            }
+            // 机房水浸状态
+            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)
+          },
+          error: function (err) {
+            console.log('--机房接口八楼，二号楼-------------超时');
+          }
+        });
+      }
+
+      // 网络核心机房
+      function fourthFloor() {
+        $.ajax({
+          url: ROOM + '/api/devicesignaltable/listByName',
+          data: {
+            "deviceName": '四楼'
+          },
+          success: function ({ data }) {
+            console.log('网络核心机房', data);
+            // 温度
+            let temperature = data.filter(item => {
+              return item.signalname==='温度'
+            })[0].signalvalue;
+            // 湿度 
+            let humidity = data.filter(item => {
+              return item.signalname==='湿度'
+            })[0].signalvalue;
+            
+            // 漏水位置/米
+            let leackgePosition = data.filter(item => {
+              return item.signalname==='漏水1位置'
+            })[0].signalvalue;
+            // 电阻率
+            let eleRes = data[3].signalvalue;
+            if(isNaN(eleRes)){
+              eleRes = 0;
+            }
+            // 机房温湿度状态
+            let waterStauts = data.filter(item => {
+              return item.devicename==="四楼机房温湿度1" && item.signalname==='通信状态'
+            })[0].signalvalue;
+
+            // 机房水浸通信状态
+            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状态"
+            })[0].signalvalue;
+
+            // 消防状态模块-通信状态
+            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#消防主机状态"
+            })[0].signalvalue;
+
+             // 消防状态模块-开关量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)
+          },
+          error: function (err) {
+            console.log('--网络核心机房-------------超时');
+          }
+        });
+      }
+
+      // 配线间机房
+      function ninthFloor() {
+        $.ajax({
+          url: ROOM + '/api/devicesignaltable/listByName',
+          data: {
+            "deviceName": '九楼'
+          },
+          success: function ({ data }) {
+            console.log('配线间机房', data);
+            // 温度
+            let temperature = data.filter(item => {
+              return item.signalname==='温度'
+            })[0].signalvalue;
+            // 湿度 
+            let humidity = data.filter(item => {
+              return item.signalname==='湿度'
+            })[0].signalvalue;
+            
+            // 漏水位置/米
+            let leackgePosition = data.filter(item => {
+              return item.signalname==='漏水1位置'
+            })[0].signalvalue;
+            // 电阻率
+            let eleRes = data[3].signalvalue; // d
+            if(isNaN(eleRes)){
+              eleRes = 0;
+            }
+            // 机房温湿度状态
+            let waterStauts = data.filter(item => {
+              return item.devicename==="九楼机房温湿度4" && item.signalname==='通信状态'
+            })[0].signalvalue;
+
+            // 机房水浸通信状态
+            let comStatus = data.filter(item => {
+              return item.devicename==="九楼机房水浸3" && item.signalname==='通信状态'
+            })[0].signalvalue;
+
+            // 机房水浸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)
+          },
+          error: function (err) {
+            console.log('--配线间机房-------------超时');
+          }
+        });
+      }
+
+      // 档案室库房
+      function dasRoom() {
+        $.ajax({
+          /** url，data参数，
+           * type请求类型，响应体结果，超时时间
+           * 成功的回调，失败回调 */
+          url: DH + 'apiUrl/sendApiUrl',
+          data: {
+              "urlCode": 'DH_002'
+          },
+          type: 'GET',
+          dataType: 'JSON',
+          success: function({data}) {
+            console.log('档案室库房',data);
+          },
+          timeout: 6000,
+          error: function() {
+              console.log('档案室库房超时了');
+          },
+      });
+      }
+
+      // UPS供电机房
+      function upsOf() {
+        $.ajax({
+          url: ROOM + '/api/devicesignaltable/listByName',
+          data: {
+            "deviceName": 'UPS'
+          },
+          success:function ({data}) {
+            console.log('UPS供电机房',data);
+          },
+          error: function (err) {
+            console.log('--UPS供电机房-------------超时');
+          }
+        });
+      }
 
 
       roomIndex = $(this).index();
+      roomIndex = 9
       if (roomIndex === 0) {
         $('.springFrame5 .roomThree62').css('visibility', 'inherit');
         $('.springFrame5 .roomThree63').css('visibility', 'hidden');
@@ -52,8 +307,6 @@ const test50 = (function () {
         $('.springFrame5 .roomThree65').css('visibility', 'hidden');
         $('.springFrame5 .roomThree66').css('visibility', 'hidden');
         module63();
-        console.log('63');
-
       } else if (roomIndex === 2) {
         $('.springFrame5 .roomThree62 ').css('visibility', 'hidden');
         $('.springFrame5 .roomThree63').css('visibility', 'hidden');
@@ -69,12 +322,12 @@ const test50 = (function () {
         $('.springFrame5 .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');
-        module66();
+        // $('.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');
+        // module66();
       }
       $(".sf5").slideToggle();
     })

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

@@ -18,5 +18,4 @@
 }
 .img-box-one img {
   width: 100%;
-  height: 100%;
 }

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

@@ -28,6 +28,7 @@
   border-radius: 20%;
   text-align: center;
   margin-left: 5%;
+  margin-top: 0.4rem;
 }
 .Water-immersion-box-title {
   margin: auto;

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

@@ -13,12 +13,8 @@
 .box62 > div {
   position: absolute;
 }
-.box62 > div :not(.ex) {
-  width: 6%;
-}
 .box62 > div :not(.ex) img {
-  width: 100%;
-  height: 100%;
+  width: 75%;
 }
 .box62 .l-bg {
   width: 100%;

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

@@ -18,7 +18,7 @@
         <p>郊区区县</p>
       </div>
       <div class="c-center1">
-        <img src="../images/zybz/组240拷贝.png" alt="">
+        <img src="../images/zybz/组240拷贝.png" alt="" style="width:282px;">
         <p>指挥大厅</p>
       </div>
       <div class="c-center2">

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

@@ -15,10 +15,8 @@
   &>div {
     position: absolute;
     :not(.ex){
-      width: 6%;
       img{
-        width: 100%;
-        height: 100%;
+        width: 75%;
       }
     }
   }

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

@@ -1,17 +1,17 @@
-let baseURL = 'http://23.37.100.87:8088/itsm/openInterface'; // 资源保障管理专题（运维）
+let baseURL = 'http://23.37.100.80:8088/itsm/openInterface'; // 资源保障管理专题（运维）
 
 
-const FLAT_PATH_THREE = "http://23.37.100.87:8084/threeapi";
+const FLAT_PATH_THREE = "http://23.37.100.80:8084/threeapi";
 
-const ZQURL = 'http://23.37.100.87:81/InterfaceController.asmx'; // 站群
-const imgURL = 'http://23.37.100.87:82'; // 站群
+const ZQURL = 'http://23.37.100.81:81/InterfaceController.asmx'; // 站群
+const imgURL = 'http://23.37.100.80:82'; // 站群
 
-// const FLAT_PATH_THREE = "http://23.37.100.87:8084/threeapi"
-// 23.37.100.87
+// const FLAT_PATH_THREE = "http://23.37.100.80:8084/threeapi"
+// 23.37.100.80
 // 机房 - 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/';
+const ROOM = 'http://23.37.100.80:7002';
+const DH = 'http://23.37.100.80:8084/threeapi/';
+// const DH = 'http://23.37.100.80:8084/imcp-api/';
 
 function getDateString(date) {
     const dt = new Date(date)

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

@@ -1,7 +1,7 @@
-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
+// http://23.37.100.80:8084
 
 let pages = [];
 let themeId; // 主题id

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

@@ -140,20 +140,6 @@ $.ajax({
     }
 });
 
-// 机房接口
-$.ajax({
-    url: ROOM + '/api/devicesignaltable/listByName',
-    data: {
-        "deviceName": '四楼'
-    },
-    success: function(res) {
-        console.log('机房接口', res);
-    },
-    error: function(err) {
-        console.log('--机房接口-------------超时');
-    }
-});
-
 
 // 动环接口
 $.ajax({

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

@@ -146,7 +146,7 @@ function setChartsDom(echartDom) {
 
 
 
-function setCharts52(echartDom, testDom) {
+function setCharts52(echartDom, testDom,temperature,humidity) {
   var myChart = echarts.init(echartDom);
   // 地图背景颜色
   var highlight = "#03b7c9";
@@ -154,7 +154,7 @@ function setCharts52(echartDom, testDom) {
   var demoData = [
     {
       name: "平均温度",
-      value: 22,
+      value: temperature,
       unit: "℃",
       pos: ["25%", "40%"],
       range: [-40, 100],
@@ -166,7 +166,7 @@ function setCharts52(echartDom, testDom) {
     },
     {
       name: "平均湿度",
-      value: 90,
+      value: humidity,
       unit: "%",
       pos: ["75%", "40%"],
       range: [0, 100],
@@ -199,7 +199,7 @@ function setCharts52(echartDom, testDom) {
             axisLine: {
               show: true,
               lineStyle: {
-                width: 2,
+                width: 52,
                 shadowBlur: 0,
                 color: [[1, highlight]],
               },
@@ -208,7 +208,7 @@ function setCharts52(echartDom, testDom) {
               show: true,
               lineStyle: {
                 color: highlight,
-                width: 1,
+                width: 50,
               },
               length: -5,
               splitNumber: 10,
@@ -224,7 +224,7 @@ function setCharts52(echartDom, testDom) {
               distance: -18,
               textStyle: {
                 color: highlight,
-                fontSize: "10",
+                fontSize: "100",
               },
             },
             pointer: {
@@ -263,7 +263,7 @@ function setCharts52(echartDom, testDom) {
               lineStyle: {
                 // 属性lineStyle控制线条样式
                 color: "auto",
-                width: 2,
+                width: 50,
               },
             },
             splitLine: {
@@ -279,7 +279,7 @@ function setCharts52(echartDom, testDom) {
               textStyle: {
                 // 其余属性默认使用全局文本样式，详见TEXTSTYLE
                 fontWeight: "bolder",
-                fontSize: 20,
+                fontSize: 100,
                 fontStyle: "italic",
               },
             },
@@ -287,7 +287,7 @@ function setCharts52(echartDom, testDom) {
               show: true,
               offsetCenter: [0, "100%"],
               textStyle: {
-                fontSize: 25,
+                fontSize: 100,
               },
               formatter: [
                 "{value} " + (item.unit || ""),
@@ -295,7 +295,7 @@ function setCharts52(echartDom, testDom) {
               ].join("\n"),
               rich: {
                 name: {
-                  fontSize: 16,
+                  fontSize: 100,
                   lineHeight: 30,
                   color: "#4be4de",
                 },
@@ -307,7 +307,7 @@ function setCharts52(echartDom, testDom) {
               },
             ],
             pointer: {
-              width: 5,
+              width: 50,
             },
           },
           // 内侧指针、数值显示
@@ -346,6 +346,7 @@ function setCharts52(echartDom, testDom) {
               color: "rgba(255, 153, 0, 0.31)",
               borderColor: "#ff9900",
               borderWidth: 1,
+              fontSize:110
             },
             detail: {
               show: false,
@@ -360,7 +361,7 @@ function setCharts52(echartDom, testDom) {
               ].join("\n"),
               rich: {
                 name: {
-                  fontSize: 14,
+                  fontSize: 100,
                   lineHeight: 30,
                   color: "#00eff2",
                 },
@@ -469,7 +470,7 @@ function setCharts53(echartDom, testDom) {
                   color: "#fff",
                   align: "left",
                   margin: 80,
-                  fontSize: 13,
+                  fontSize: 100,
                   formatter: function(value, index) {
                       if (opt.index === 0 && index < 3) {
                           return (
@@ -534,7 +535,7 @@ function setCharts53(echartDom, testDom) {
                   color: "#fff",
                   align: "left",
                   margin: 20,
-                  fontSize: 13,
+                  fontSize: 100,
                   formatter: function(value, index) {
                       return data[index].value + "条";
                   },
@@ -766,7 +767,7 @@ function setCharts54(echartDom, testDom) {
 }
 
 
-function setCharts58(echartDom, testDom) {
+function setCharts58(echartDom, testDom,leackgePosition,eleRes) {
   var myChart = echarts.init(echartDom);
   // 地图背景颜色
   var highlight = "#03b7c9";
@@ -774,7 +775,7 @@ function setCharts58(echartDom, testDom) {
   var demoData = [
     {
       name: "漏水位置",
-      value: 22,
+      value: leackgePosition,
       unit: "/米",
       pos: ["25%", "40%"],
       range: [-40, 100],
@@ -786,7 +787,7 @@ function setCharts58(echartDom, testDom) {
     },
     {
       name: "电阻率",
-      value: 90,
+      value: eleRes,
       unit: "",
       pos: ["75%", "40%"],
       range: [0, 100],
@@ -843,7 +844,7 @@ function setCharts58(echartDom, testDom) {
               distance: -18,
               textStyle: {
                 color: highlight,
-                fontSize: "10",
+                fontSize: "100",
               },
             },
             pointer: {
@@ -898,7 +899,7 @@ function setCharts58(echartDom, testDom) {
               textStyle: {
                 // 其余属性默认使用全局文本样式，详见TEXTSTYLE
                 fontWeight: "bolder",
-                fontSize: 20,
+                fontSize: 100,
                 fontStyle: "italic",
               },
             },
@@ -906,7 +907,7 @@ function setCharts58(echartDom, testDom) {
               show: true,
               offsetCenter: [0, "100%"],
               textStyle: {
-                fontSize: 25,
+                fontSize: 100,
               },
               formatter: [
                 "{value} " + (item.unit || ""),
@@ -914,7 +915,7 @@ function setCharts58(echartDom, testDom) {
               ].join("\n"),
               rich: {
                 name: {
-                  fontSize: 16,
+                  fontSize: 100,
                   lineHeight: 30,
                   color: "#4be4de",
                 },
@@ -970,7 +971,7 @@ function setCharts58(echartDom, testDom) {
               show: false,
               offsetCenter: [0, "100%"],
               textStyle: {
-                fontSize: 20,
+                fontSize: 100,
                 color: "#00eff2",
               },
               formatter: [
@@ -979,7 +980,7 @@ function setCharts58(echartDom, testDom) {
               ].join("\n"),
               rich: {
                 name: {
-                  fontSize: 14,
+                  fontSize: 100,
                   lineHeight: 30,
                   color: "#00eff2",
                 },
@@ -1007,7 +1008,7 @@ function setCharts58(echartDom, testDom) {
   obsDom(testDom, myChart);
 }
 
-function setCharts59(echartDom, testDom) {
+function setCharts59(echartDom, testDom,temperature,humidity) {
   var myChart = echarts.init(echartDom);
   // 地图背景颜色
   var highlight = "#03b7c9";
@@ -1015,7 +1016,7 @@ function setCharts59(echartDom, testDom) {
   var demoData = [
     {
       name: "平均温度",
-      value: 22,
+      value: temperature,
       unit: "°",
       pos: ["25%", "40%"],
       range: [-40, 100],
@@ -1027,7 +1028,7 @@ function setCharts59(echartDom, testDom) {
     },
     {
       name: "平均温度",
-      value: 90,
+      value: humidity,
       unit: "°",
       pos: ["75%", "40%"],
       range: [0, 100],
@@ -1084,7 +1085,7 @@ function setCharts59(echartDom, testDom) {
               distance: -18,
               textStyle: {
                 color: highlight,
-                fontSize: "10",
+                fontSize: "100",
               },
             },
             pointer: {
@@ -1139,7 +1140,7 @@ function setCharts59(echartDom, testDom) {
               textStyle: {
                 // 其余属性默认使用全局文本样式，详见TEXTSTYLE
                 fontWeight: "bolder",
-                fontSize: 20,
+                fontSize: 100,
                 fontStyle: "italic",
               },
             },

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

@@ -354,7 +354,6 @@
     <script src="../js/common.js"></script>
 
 
-
     <script src="./js/setRoom.js"></script>
 
 

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

@@ -326,7 +326,7 @@
     const testDom14 = document.querySelector(".springFrame1 .box14");
     // 数据统计
     $.ajax({
-        url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getSafetyInfoByMonth",
+        url: "http://23.37.100.80:8084" + "/basic/safetyInfor/getSafetyInfoByMonth",
         data: {
             orgType: 3
         },
@@ -349,7 +349,7 @@
 
     // 局本级门户网站
     $.ajax({
-        url: "http://23.37.100.87:8084" + "/basic/safetyInfo/getWebSafetyStatusByOrg",
+        url: "http://23.37.100.80:8084" + "/basic/safetyInfo/getWebSafetyStatusByOrg",
         data: {
             orgType: 3
         },
@@ -404,7 +404,7 @@
 
     // 终端安全态势
     $.ajax({
-        url: "http://23.37.100.87:8084" + "/basic/OfficeVirus/getOfficeSafetyInfo",
+        url: "http://23.37.100.80:8084" + "/basic/OfficeVirus/getOfficeSafetyInfo",
         data: {
             orgType: 3
         },
@@ -438,7 +438,7 @@
 
 // 攻击类型
     $.ajax({
-        url: "http://23.37.100.87:8084" + "/basic/AttackType/getTopAttackType",
+        url: "http://23.37.100.80:8084" + "/basic/AttackType/getTopAttackType",
         data: {
             orgType: 3
         },
@@ -468,7 +468,7 @@
 
     // 应急保障组成员信息
     $.ajax({
-        url: "http://23.37.100.87:8084" + "/basic/GuaranteeGroup/getAllGuaranteeGroup",
+        url: "http://23.37.100.80:8084" + "/basic/GuaranteeGroup/getAllGuaranteeGroup",
         success: function(res) {
             const result = res.result;
             console.log('应急保障组成员信息', result);

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

@@ -370,7 +370,7 @@
     const testDom23 = document.querySelector(".springFrame3 .box23");
     // 数据统计
     $.ajax({
-        url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getSafetyInfoByMonth",
+        url: "http://23.37.100.80:8084" + "/basic/safetyInfor/getSafetyInfoByMonth",
         data: {
             orgType: 2
         },
@@ -384,7 +384,7 @@
     });
     //   漏洞数据
     $.ajax({
-        url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getRiskInfoByOrg",
+        url: "http://23.37.100.80:8084" + "/basic/safetyInfor/getRiskInfoByOrg",
         data: {
             orgType: 2
         },
@@ -425,7 +425,7 @@
 
     function myAjax1() {
         $.ajax({
-            url: "http://23.37.100.87:8084" +
+            url: "http://23.37.100.80:8084" +
                 "/basic/SystemRisk/analyzeSystemRiskByMonth",
             data: {},
             success: function(res) {
@@ -446,7 +446,7 @@
 
     //   业务系统
     $.ajax({
-        url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getSysStatusByOrg",
+        url: "http://23.37.100.80:8084" + "/basic/safetyInfor/getSysStatusByOrg",
         data: {
             orgType: 2
         },
@@ -463,7 +463,7 @@
     });
     //   高危系统列表
     $.ajax({
-        url: "http://23.37.100.87:8084" + "/basic/SystemRisk/getHighStatus",
+        url: "http://23.37.100.80:8084" + "/basic/SystemRisk/getHighStatus",
         data: {
             orgType: 2,
             Status: 1
@@ -494,7 +494,7 @@
     //   高危业务系统趋势
     function myAjax2() {
         $.ajax({
-            url: "http://23.37.100.87:8084" + "/basic/SystemRisk/getHighStatusByMonth",
+            url: "http://23.37.100.80:8084" + "/basic/SystemRisk/getHighStatusByMonth",
             data: {
                 orgType: 2
             },
@@ -514,7 +514,7 @@
     //   攻击事件类型
     function myAjax3() {
         $.ajax({
-            url: "http://23.37.100.87:8084" + "/basic/AttackEvent/getAttackEventByInfo",
+            url: "http://23.37.100.80:8084" + "/basic/AttackEvent/getAttackEventByInfo",
             data: {
                 orgType: 2
             },

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

@@ -264,7 +264,7 @@
 <script>
     // 数据统计
     $.ajax({
-        url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getSafetyInfoByMonth",
+        url: "http://23.37.100.80:8084" + "/basic/safetyInfor/getSafetyInfoByMonth",
         data: {
             orgType: 1
         },
@@ -292,7 +292,7 @@
 
     // 漏洞数据 
     $.ajax({
-        url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getRiskInfoByOrg",
+        url: "http://23.37.100.80:8084" + "/basic/safetyInfor/getRiskInfoByOrg",
         data: {
             orgType: 1
         },
@@ -330,7 +330,7 @@
     const dom27 = document.querySelector('.springFrame4 .box27 .floor-dist');
     const testDom27 = document.querySelector('.springFrame4 .box27');
     $.ajax({
-        url: "http://23.37.100.87:8084" + "/basic/RiskType/getSysRiskType",
+        url: "http://23.37.100.80:8084" + "/basic/RiskType/getSysRiskType",
         data: {
             orgType: 1,
             riskClassify: 1
@@ -361,7 +361,7 @@
 
     // 业务系统
     $.ajax({
-        url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getSysStatusByOrg",
+        url: "http://23.37.100.80:8084" + "/basic/safetyInfor/getSysStatusByOrg",
         data: {
             orgType: 1
         },
@@ -391,7 +391,7 @@
 
     // 攻击拦截类型
     $.ajax({
-        url: "http://23.37.100.87:8084" + "/basic/AttackType/getAttackTypeByMonth",
+        url: "http://23.37.100.80:8084" + "/basic/AttackType/getAttackTypeByMonth",
         data: {
             orgType: 1
         },
@@ -423,7 +423,7 @@
 
     // 受攻击最严重业务统计
     $.ajax({
-        url: "http://23.37.100.87:8084" + "/basic/SystemAttacked/getSystemAttackedByInfo",
+        url: "http://23.37.100.80:8084" + "/basic/SystemAttacked/getSystemAttackedByInfo",
         data: {
             orgType: 1
         },

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

@@ -2,17 +2,19 @@
   .springFrame5 .box62 .test-box,
   .springFrame5 .box63 .test-box,
   .springFrame5 .box64 .test-box,
-  .springFrame5 .box65 .test-box,
+  .springFrame5 .box65 .test-box,  
   .springFrame5 .box66 .test-box {
     padding: 0.5rem;
   }
 
   .springFrame5 .roomThree{
-    width: 100%;
-    height: 100%;
+    width: 50%;
+    height: 80%;
     position: absolute;
     z-index: 99;
-    left: -50%;
+  }
+  .springFrame5 .box57 .content{
+    padding-top: 0.7rem;
   }
 </style>
 <div class="springFrame springFrame5">
@@ -195,18 +197,22 @@
 
           <div class="img-box-one">
 
-            <img src="https://img2.baidu.com/it/u=3318794981,1136893020&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500"
-              alt="" />
+            <img
+            src="../images/room.webp"
+            alt=""
+          />
           </div>
           <div class="img-box-one">
-
-            <img src="https://img2.baidu.com/it/u=3318794981,1136893020&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500"
-              alt="" />
+            <img
+            src="../images/room.webp"
+            alt=""
+          />
           </div>
           <div class="img-box-one">
-
-            <img src="https://img2.baidu.com/it/u=3318794981,1136893020&fm=253&fmt=auto&app=138&f=JPEG?w=667&h=500"
-              alt="" />
+            <img
+            src="../images/room.webp"
+            alt=""
+          />
           </div>
 
         </div>
@@ -245,16 +251,16 @@
               </div>
               <div>通信状态</div>
             </div>
-            <div class="Water-immersion-text">正常</div>
+            <div class="Water-immersion-text text1">正常</div>
           </div>
           <div class="Water-immersion-box-one">
             <div class="Water-immersion-box-title">
               <div class="Water-immersion-box-svg">
                 <img src="../../font/水滴.png" alt="" />
               </div>
-              <div>水滴1正常</div>
+              <div>水滴1状态</div>
             </div>
-            <div class="Water-immersion-text">正常</div>
+            <div class="Water-immersion-text text2">正常</div>
           </div>
         </div>
         <div class="floor-dist"></div>
@@ -304,12 +310,15 @@
     <!-- 机房 -->
   <div class="frameClose">X</div>
 
+
+
   <div id="ThreeJS62" class="roomThree roomThree62" style="visibility:hidden"></div>
   <div id="ThreeJS63" class="roomThree roomThree63" style="visibility:hidden"></div>
   <div id="ThreeJS64" class="roomThree roomThree64" style="visibility:hidden"></div>
   <div id="ThreeJS65" class="roomThree roomThree65" style="visibility:hidden"></div>
   <div id="ThreeJS66" class="roomThree roomThree66" style="visibility:hidden"></div>
 
+
   <div class="box60 box" data-name="test60" style="width: 3972px;height:1260px;left:11384px;top:2356px;">
 
     <div class="tool">
@@ -340,7 +349,53 @@
               </div>
               <div>通信状态</div>
             </div>
-            <div class="Water-immersion-text">正常</div>
+            <div class="Water-immersion-text text1">正常</div>
+          </div>
+
+          <div class="Water-immersion-box-one">
+            <div class="Water-immersion-box-title">
+              <div class="Water-immersion-box-svg">
+                <svg t="1650283656534" class="icon" viewBox="0 0 1024 1024" version="1.1"
+                  xmlns="http://www.w3.org/2000/svg" p-id="1578" width="20" height="20">
+                  <path d="M478.462882 476.972344L304.069869 973.321689h496.349345L626.026201 475.481805z"
+                    fill="#1296db" p-id="1579"></path>
+                  <path
+                    d="M682.666667 535.103348c55.149927-40.244541 90.922853-105.828239 90.922853-178.864629C773.60952 234.014556 673.723435 134.148472 551.499272 134.148472c-123.714702 0-223.600786 99.866084-223.600786 222.090247 0 74.526929 37.263464 140.110626 93.90393 181.845706l19.377002-55.149927c-35.772926-31.30131-60.131004-76.017467-60.131005-126.695779 0-92.413392 74.526929-166.94032 166.940321-166.94032 92.413392 0 166.94032 74.526929 166.94032 166.94032 0 49.187773-20.86754 92.413392-55.149927 123.714702l20.86754 55.149927z"
+                    fill="#1296db" p-id="1600"></path>
+                  <path
+                    d="M551.499272 356.238719m-86.451237 0a86.451237 86.451237 0 1 0 172.902474 0 86.451237 86.451237 0 1 0-172.902474 0Z"
+                    fill="#1296db" p-id="1601"></path>
+                  <path
+                    d="M386.049491 640.931607l19.377001-53.660389c-77.508006-49.187773-128.186317-134.148472-128.186317-231.033479 0-150.544396 122.224163-274.260098 274.260097-274.260097 150.544396 0 274.260098 122.224163 274.260098 274.260097 0 95.394469-49.187773 180.355167-125.20524 229.54294l17.886462 53.660389c96.885007-60.131004 160.978166-163.960243 160.978166-283.202329 0-181.845706-147.563319-329.409025-327.918486-329.409025-181.845706 0-329.409025 147.563319-329.409025 329.409025 0 120.733624 65.603697 226.561863 163.960244 284.692868z"
+                    fill="#1296db" p-id="1602"></path>
+                </svg>
+              </div>
+              <div>消防主机状态</div>
+            </div>
+            <div class="Water-immersion-text text2">正常</div>
+          </div>
+
+          <div class="Water-immersion-box-one">
+            <div class="Water-immersion-box-title">
+              <div class="Water-immersion-box-svg">
+                <svg t="1650283656534" class="icon" viewBox="0 0 1024 1024" version="1.1"
+                  xmlns="http://www.w3.org/2000/svg" p-id="1578" width="20" height="20">
+                  <path d="M478.462882 476.972344L304.069869 973.321689h496.349345L626.026201 475.481805z"
+                    fill="#1296db" p-id="1579"></path>
+                  <path
+                    d="M682.666667 535.103348c55.149927-40.244541 90.922853-105.828239 90.922853-178.864629C773.60952 234.014556 673.723435 134.148472 551.499272 134.148472c-123.714702 0-223.600786 99.866084-223.600786 222.090247 0 74.526929 37.263464 140.110626 93.90393 181.845706l19.377002-55.149927c-35.772926-31.30131-60.131004-76.017467-60.131005-126.695779 0-92.413392 74.526929-166.94032 166.940321-166.94032 92.413392 0 166.94032 74.526929 166.94032 166.94032 0 49.187773-20.86754 92.413392-55.149927 123.714702l20.86754 55.149927z"
+                    fill="#1296db" p-id="1600"></path>
+                  <path
+                    d="M551.499272 356.238719m-86.451237 0a86.451237 86.451237 0 1 0 172.902474 0 86.451237 86.451237 0 1 0-172.902474 0Z"
+                    fill="#1296db" p-id="1601"></path>
+                  <path
+                    d="M386.049491 640.931607l19.377001-53.660389c-77.508006-49.187773-128.186317-134.148472-128.186317-231.033479 0-150.544396 122.224163-274.260098 274.260097-274.260097 150.544396 0 274.260098 122.224163 274.260098 274.260097 0 95.394469-49.187773 180.355167-125.20524 229.54294l17.886462 53.660389c96.885007-60.131004 160.978166-163.960243 160.978166-283.202329 0-181.845706-147.563319-329.409025-327.918486-329.409025-181.845706 0-329.409025 147.563319-329.409025 329.409025 0 120.733624 65.603697 226.561863 163.960244 284.692868z"
+                    fill="#1296db" p-id="1602"></path>
+                </svg>
+              </div>
+              <div>开关量</div>
+            </div>
+            <div class="Water-immersion-text text3">正常</div>
           </div>
         </div>
       </div>
@@ -348,6 +403,8 @@
     <div class="panel-footer"></div>
   </div>
 
+  
+
 
 </div>