更新

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

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 .box43 .content {
   margin: 0;
 }
@@ -26,24 +25,3 @@
   font-family: "LESLIE";
   src: url("../../font/LESLIE.TTF");
 }
-=======
-.box43 .content {
-  margin: 0;
-}
-.box43 ul {
-  display: flex;
-  margin-top: 0.3rem;
-}
-.box43 ul li {
-  color: #fff;
-  flex: 1;
-  text-align: center;
-  position: relative;
-}
-.box43 ul li img {
-  width: 52%;
-}
-.box43 ul li .desc {
-  position: relative;
-}
->>>>>>> 06a129e7dbcdf8e387e3e2c0d942a52175d47a33

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

@@ -21,12 +21,9 @@
   justify-content: space-around;
   align-items: center;
   width: 100%;
+  height: 25%;
   /* background-image: linear-gradient(45deg, #155ed5, transparent); */
-<<<<<<< HEAD
   background: url("../../css/modules/layer/default/组245.png");
-=======
-  background: url("../../css/modules/layer/bgImg/组245.png");
->>>>>>> 06a129e7dbcdf8e387e3e2c0d942a52175d47a33
   background-size: 100% 100%;
 }
 .box44 .item img {
@@ -34,8 +31,20 @@
 }
 .text {
   text-align: center;
-<<<<<<< HEAD
   font-size: 0.12rem !important;
-=======
->>>>>>> 06a129e7dbcdf8e387e3e2c0d942a52175d47a33
 }
+.box44 .item-img {
+  background: url("./img/组246.png");
+  background-size: 100% 100%;
+}
+.storing-num{
+  font-size: 0.2rem !important;
+  position: relative;
+  top: -20%;
+  left: 16%;
+  width: 70%;
+  text-align: center;
+  /* background-color: ; */
+  background: url("../../images/矩形-513.png");
+  background-size: 100% 100%;
+}

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

@@ -24,27 +24,27 @@
           <div class="server_prec" style="width: 33%">97%</div>
         </div>
         <div class="item" style="text-align: center">
-            <div style="width: 30%; height: 77%">
-              <img
-                style="width: 100%; height: 100%"
-                src="../images/bgImg/组244.png"
-                alt=""
-              />
-            </div>
-            <div class="text" style="width: 33%">服务器</div>
-            <div class="app_server_prec" style="width: 33%">97%</div>
+          <div style="width: 30%; height: 77%">
+            <img
+              style="width: 100%; height: 100%"
+              src="../images/bgImg/组244.png"
+              alt=""
+            />
           </div>
-          <div class="item" style="text-align: center">
-            <div style="width: 30%; height: 77%">
-              <img
-                style="width: 100%; height: 100%"
-                src="../images/bgImg/组247.png"
-                alt=""
-              />
-            </div>
-            <div class="text" style="width: 33%">服务器</div>
-            <div class="other_prec" style="width: 33%">97%</div>
+          <div class="text" style="width: 33%">服务器</div>
+          <div class="app_server_prec" style="width: 33%">97%</div>
+        </div>
+        <div class="item" style="text-align: center">
+          <div style="width: 30%; height: 77%">
+            <img
+              style="width: 100%; height: 100%"
+              src="../images/bgImg/组247.png"
+              alt=""
+            />
           </div>
+          <div class="text" style="width: 33%">服务器</div>
+          <div class="other_prec" style="width: 33%">97%</div>
+        </div>
         <!-- <div class="item">
           <img src="../images/networkSecurity/zfx.png" alt="" />
           <span class="text">应用服务器</span>
@@ -58,6 +58,7 @@
       </div>
       <div class="main">
         <div class="floor-dist"></div>
+        <div class="storing-num">健康指数</div>
       </div>
       <div class="right">
         <div class="item" style="text-align: center">

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

@@ -18,7 +18,7 @@
 .box46 .progress .proDesc {
   position: absolute;
   top: -70% !important;
-  left: -43%;
+  left: -35%;
   color: #fff;
 }
 .box46 .progress > span {
@@ -56,7 +56,7 @@
   right: 0;
   z-index: 1;
   height: 0.2rem;
-  background: url(../../images/progress.png) 0 0 repeat-x;
+  background: url('../../images/progress.png') 0 0 repeat-x;
   border-radius: 1rem;
 }
 .box46 .progress .txt {

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

@@ -11,10 +11,10 @@
   <div class="test-box">
     <div class="content">
       <!-- 攻击类型 -->
-      <div class="container" style="margin-top: 0%">
+      <div class="container" style="margin-top: -4%">
         <div class="progress">
           <div class="proDesc">OA中间主服务器</div>
-          <span id="OA" style="width: 20%"></span>
+          <span id="OA2" style="width: 20%"></span>
           <span class="txt">20%</span>
         </div>
 

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

@@ -18,7 +18,7 @@
 .box47 .progress .proDesc {
   position: absolute;
   top: -70% !important;
-  left: -43%;
+  left: -35%;
   color: #fff;
 }
 .box47 .progress > span {
@@ -56,7 +56,7 @@
   right: 0;
   z-index: 1;
   height: 0.2rem;
-  background: url(../../images/progress.png) 0 0 repeat-x;
+  background: url('../../images/progress.png') 0 0 repeat-x;
   border-radius: 1rem;
 }
 .box47 .progress .txt {

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

@@ -11,7 +11,7 @@
   <div class="test-box">
     <div class="content">
       <!-- 攻击类型 -->
-      <div class="container" style="margin-top: 0%">
+      <div class="container" style="margin-top: -4%">
         <div class="progress">
           <div class="proDesc">OA中间主服务器</div>
           <span id="OA1" style="width: 20%"></span>
@@ -31,7 +31,7 @@
         </div>
 
         <div class="progress">
-          <div class="proDesc1">电子盖章服务器</div>
+          <div class="proDesc">电子盖章服务器</div>
           <span id="Electronic-seal1" class="red" style="width: 80%"></span>
           <span class="txt">80%</span>
         </div>

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

@@ -72,29 +72,6 @@ const test47 = (function () {
     sucTimer();
   }
 
-<<<<<<< HEAD
-  function myAjax() {
-    $.ajax({
-      url: baseURL + "/selectMgtServerTop5",
-      data: {
-        orgIds: "323598b4196341b6a73969cfe7162209",
-      },
-      type: "GET",
-      dataType: "JSON",
-      success: function (data) {
-        const { data: res } = data;
-        if (data.code != 0) {
-          return alert("请求数据失败");
-        }
-        // topData = eval('(' + data.data + ')');
-        setCPU(res.cpu);
-      },
-      timeout: 6000,
-      error: function () {
-        console.log("超时了");
-      },
-    });
-=======
   // function myAjax() {
   //   $.ajax({
   //     url: baseURL + "/selectMgtServerTop5",
@@ -128,7 +105,6 @@ const test47 = (function () {
   //         <span class="txt">40%</span>
   //       </div>`;
   //     }
->>>>>>> 06a129e7dbcdf8e387e3e2c0d942a52175d47a33
 
   //     $(".container").html(str);
   //   }

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

@@ -18,7 +18,7 @@
 .box48 .progress .proDesc {
   position: absolute;
   top: -70% !important;
-  left: -43%;
+  left: -35%;
   color: #fff;
 }
 .box48 .progress > span {
@@ -56,7 +56,7 @@
   right: 0;
   z-index: 1;
   height: 0.2rem;
-  background: url(../../images/progress.png) 0 0 repeat-x;
+  background: url('../../images/progress.png') 0 0 repeat-x;
   border-radius: 1rem;
 }
 .box48 .progress .txt {

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

@@ -11,7 +11,7 @@
   <div class="test-box">
     <div class="content">
       <!-- 攻击类型 -->
-      <div class="container" style="margin-top: 0%">
+      <div class="container" style="margin-top: -4%">
         <div class="progress">
           <div class="proDesc">OA中间主服务器</div>
           <span id="OA2" style="width: 20%"></span>

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

@@ -7,7 +7,6 @@
         <div class="title bgTitle">
             <h2>受攻击最严重业务系统</h2>
         </div>
-<<<<<<< HEAD
         <table id="stuTable" class="table">
           <thead>
             <tr>
@@ -96,8 +95,6 @@
           </tbody>
         </table>
       </div>
-=======
->>>>>>> 06a129e7dbcdf8e387e3e2c0d942a52175d47a33
     </div>
     <div class="test-box">
         <div class="content">

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

@@ -11,12 +11,14 @@
 .box50 .content .item {
   display: flex;
   align-items: center;
-  font-size: 0.3rem;
+  /* font-size: 0.3rem; */
   width: 43%;
+  height: 48%;
+  margin-top: 1%;
 }
 .box50 .content .item img {
-  width: 37%;
-  height: 68%;
+  width: 70%;
+  height: 92%;
   margin: 0 0.1rem;
 }
 .box50 .content .item .item-box {
@@ -42,11 +44,31 @@
 }
 .box50 .content .item .item-box .temp::after {
   content: "";
-  width: 2px;
+  width: 10px;
   height: 50%;
   background-color: #fff;
   position: absolute;
-  left: 49%;
+  left: 43%;
   top: 50%;
   transform: translate(-50%, -50%);
 }
+#slide {
+  position: absolute;
+  height: 300px;
+  width: 260px;
+  color: #fa8e93;
+  overflow: hidden;
+  border: 1px solid #ccc;
+}
+#slide p {
+  height: 34px;
+  line-height: 34px;
+  overflow: hidden;
+}
+#slide span {
+  float: right;
+}
+@font-face {
+  font-family: "LESLIE";
+  src: url("../../font/LESLIE.TTF");
+}

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

@@ -1,109 +1,88 @@
-<div class="box50 box" data-name='test50'>
+<div class="box50 box" data-name="test50">
     <div class="toolBox">
-        <span class="fit"></span>
-        <span class="close"></span>
+      <span class="fit"></span>
+      <span class="close"></span>
     </div>
     <div class="tool">
-        <div class="title bgTitle">
-            <h2>受攻击最严重业务系统</h2>
-        </div>
+      <div class="title bgTitle">
+        <h2>受攻击最严重业务系统</h2>
+      </div>
     </div>
     <div class="test-box">
+      <marquee behavior="scroll" direction="up" height="100%">
         <div class="content">
-            <div class="item" data-id=1>
-                <img src="../images/networkSecurity/pic_kuang.png" alt="">
-                <div class="item-box">
-                    <div>网络核心机房</div>
-                    <div class="temp">
-                        <p>温度：<span>25℃</span></p>
-                        <p>湿度：<span>25℃</span></p>
-                    </div>
-                </div>
+          <div class="item" data-id="1">
+            <img src="../images/networkSecurity/pic_kuang.png" alt="" />
+            <div class="item-box">
+              <div>网络核心机房</div>
+              <div class="temp">
+                <p>温度：<span>25℃</span></p>
+                <p>湿度：<span>25℃</span></p>
+              </div>
             </div>
-            <div class="item" data-id=2>
-                <img src="../images/networkSecurity/pic_kuang.png" alt="">
-                <div class="item-box">
-                    <div>2号楼中心机房</div>
-                    <div class="temp">
-                        <p>温度：<span>25℃</span></p>
-                        <p>湿度：<span>25℃</span></p>
-                    </div>
-                </div>
+          </div>
+          <div class="item" data-id="2">
+            <img src="../images/networkSecurity/pic_kuang.png" alt="" />
+            <div class="item-box">
+              <div>2号楼中心机房</div>
+              <div class="temp">
+                <p>温度：<span>25℃</span></p>
+                <p>湿度：<span>25℃</span></p>
+              </div>
             </div>
-            <div class="item" data-id=3>
-                <img src="../images/networkSecurity/pic_kuang.png" alt="">
-                <div class="item-box">
-                    <div>配线间机房</div>
-                    <div class="temp">
-                        <p>温度：<span>25℃</span></p>
-                        <p>湿度：<span>25℃</span></p>
-                    </div>
-                </div>
+          </div>
+          <div class="item" data-id="3">
+            <img src="../images/networkSecurity/pic_kuang.png" alt="" />
+            <div class="item-box">
+              <div>配线间机房</div>
+              <div class="temp">
+                <p>温度：<span>25℃</span></p>
+                <p>湿度：<span>25℃</span></p>
+              </div>
             </div>
-            <div class="item" data-id=4>
-                <img src="../images/networkSecurity/pic_kuang.png" alt="">
-                <div class="item-box">
-                    <div>档案库房</div>
-                    <div class="temp">
-                        <p>温度：<span>25℃</span></p>
-                        <p>湿度：<span>25℃</span></p>
-                    </div>
-                </div>
+          </div>
+          <div class="item" data-id="4">
+            <img src="../images/networkSecurity/pic_kuang.png" alt="" />
+            <div class="item-box">
+              <div>档案库房</div>
+              <div class="temp">
+                <p>温度：<span>25℃</span></p>
+                <p>湿度：<span>25℃</span></p>
+              </div>
             </div>
-            <div class="item" data-id=5>
-                <img src="../images/networkSecurity/pic_kuang.png" alt="">
-                <div class="item-box">
-                    <div>UPS供电机房</div>
-                    <div class="temp">
-                        <p>温度：<span>25℃</span></p>
-                        <p>湿度：<span>25℃</span></p>
-                    </div>
-                </div>
+          </div>
+          <div class="item" data-id="5">
+            <img src="../images/networkSecurity/pic_kuang.png" alt="" />
+            <div class="item-box">
+              <div>UPS供电机房</div>
+              <div class="temp">
+                <p>温度：<span>25℃</span></p>
+                <p>湿度：<span>25℃</span></p>
+              </div>
             </div>
+          </div>
         </div>
+      </marquee>
     </div>
     <div class="panel-footer"></div>
-
-</div>
-
-
-<!-- 工具弹框 -->
-<<<<<<< HEAD
-<div class="tools" style="display: none">
-  <div class="containerTool test50Toll">
-    <ul>
-      <li>
-        <span>宽度：</span>
-        <input class="setWidth" type="text" />
-        <span id="validateAge" class="regValidate"></span>
-      </li>
-      <li>
-        <span>高度：</span>
-        <input class="setHeight" type="text" />
-      </li>
-    </ul>
-    <!-- 确定 -->
-    <button class="fixBtn toolBtn">确定</button>
-    <button class="offBtn toolBtn">取消</button>
   </div>
-=======
-<div class="tools" style="display: none;">
-
+  
+  <!-- 工具弹框 -->
+  <div class="tools" style="display: none">
     <div class="containerTool test50Toll">
-        <ul>
-            <li>
-                <span>宽度：</span>
-                <input class="setWidth" type="text">
-                <span id="validateAge" class="regValidate"></span>
-            </li>
-            <li>
-                <span>高度：</span>
-                <input class="setHeight" type="text">
-            </li>
-        </ul>
-        <!-- 确定 -->
-        <button class="fixBtn toolBtn">确定</button>
-        <button class="offBtn toolBtn">取消</button>
+      <ul>
+        <li>
+          <span>宽度：</span>
+          <input class="setWidth" type="text" />
+          <span id="validateAge" class="regValidate"></span>
+        </li>
+        <li>
+          <span>高度：</span>
+          <input class="setHeight" type="text" />
+        </li>
+      </ul>
+      <!-- 确定 -->
+      <button class="fixBtn toolBtn">确定</button>
+      <button class="offBtn toolBtn">取消</button>
     </div>
->>>>>>> 06a129e7dbcdf8e387e3e2c0d942a52175d47a33
-</div>
+  </div>

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

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 const test50 = (function () {
   function test50(id, domTitle) {
     if (domTitle) {
@@ -639,7 +638,7 @@ const test50 = (function () {
       });
 
       roomIndex = $(this).index();
-      // roomIndex = 9;
+      roomIndex = 9;
       if (roomIndex === 0) {
         $(".roomThree62").css("visibility", "inherit");
         $(".roomThree63").css("visibility", "hidden");
@@ -682,550 +681,3 @@ const test50 = (function () {
 
   return test50;
 })();
-=======
-const test50 = (function () {
-  function test50 (id, domTitle) {
-    if (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)
-    })
-
-    eventClick('.test50');
-
-    // 二号楼中心机房
-    $.ajax({
-      url: ROOM + '/api/devicesignaltable/listByName',
-      data: {
-        "deviceName": '八楼'
-      },
-      success: function ({ data }) {
-        // 温度
-        let temperature = data.filter(item => {
-          return item.signalname === '温度'
-        })[0].signalvalue;
-        // 湿度 
-        let humidity = data.filter(item => {
-          return item.signalname === '湿度'
-        })[0].signalvalue;
-
-        $('.test50 .box50 .item').eq(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('--机房接口八楼，二号楼-------------超时');
-      }
-    });
-
-
-    // 网络核心机房
-    $.ajax({
-      url: ROOM + '/api/devicesignaltable/listByName',
-      data: {
-        "deviceName": '四楼'
-      },
-      success: function ({ data }) {
-        // 温度
-        let temperature = data.filter(item => {
-          return item.signalname === '温度'
-        })[0].signalvalue;
-        // 湿度 
-        let humidity = data.filter(item => {
-          return item.signalname === '湿度'
-        })[0].signalvalue;
-
-        $('.test50 .box50 .item').eq(0).find('.temp').find('span').eq(0).html(temperature + '℃');
-        $('.test50 .box50 .item').eq(0).find('.temp').find('span').eq(1).html(humidity + '℃');
-      },
-      error: function (err) {
-        console.log('--网络核心机房-------------超时');
-      }
-    });
-
-
-    // 配线间机房
-    $.ajax({
-      url: ROOM + '/api/devicesignaltable/listByName',
-      data: {
-        "deviceName": '九楼'
-      },
-      success: function ({ data }) {
-        // 温度
-        let temperature = data.filter(item => {
-          return item.signalname === '温度'
-        })[0].signalvalue;
-        // 湿度 
-        let humidity = data.filter(item => {
-          return item.signalname === '湿度'
-        })[0].signalvalue;
-        $('.test50 .box50 .item').eq(2).find('.temp').find('span').eq(0).html(temperature + '℃');
-        $('.test50 .box50 .item').eq(2).find('.temp').find('span').eq(1).html(humidity + '℃');
-      },
-      error: function (err) {
-        console.log('--配线间机房-------------超时');
-      }
-    });
-
-    // 档案室库房
-    $.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号楼中心机房
-        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;
-
-
-            // 开关量
-            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('--机房接口八楼，二号楼-------------超时');
-          }
-        });
-      }
-
-      // 网络核心机房
-      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;
-
-            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('--网络核心机房-------------超时');
-          }
-        });
-      }
-
-      // 配线间机房
-      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;
-
-            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('--配线间机房-------------超时');
-          }
-        });
-      }
-
-
-
-      // 档案室库房
-      function dasRoom () {
-        $.ajax({
-          /** url，data参数，
-           * type请求类型，响应体结果，超时时间
-           * 成功的回调，失败回调 */
-          url: DH + 'queryData/queryDeviceParam',
-          data: {
-            "urlCode": 'DH_002'
-          },
-          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('档案室库房超时了');
-          },
-        });
-      }
-
-      // 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供电机房-------------超时');
-          }
-        });
-      }
-
-
-      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
-      if (roomIndex === 0) {
-        $('.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) {
-        $('.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) {
-        $('.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) {
-        $('.roomThree62').css('visibility', 'hidden');
-        $('.roomThree63').css('visibility', 'hidden');
-        $('.roomThree64').css('visibility', 'hidden');
-        $('.roomThree65').css('visibility', 'inherit');
-        $('.roomThree66').css('visibility', 'hidden');
-        module65();
-      } else {
-        // $('.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
-})();
->>>>>>> 06a129e7dbcdf8e387e3e2c0d942a52175d47a33

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

@@ -12,8 +12,9 @@
   color: #fff;
 }
 .box55 .box-box {
-  margin-top: 20%;
+  margin-top: 7%;
   display: flex;
+  margin-bottom: 29%;
 }
 .box55 .temperature-box-one {
   width: 33%;

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

@@ -49,9 +49,9 @@
             version="1.1"
             xmlns="http://www.w3.org/2000/svg"
             p-id="2773"
-            width="20"
-            height="20"
-          >
+            width="300"
+            height="250"
+            style="margin-top: -2%;"            >
             <path
               d="M944.256 926.4c-31.04 0-820.8 0-865.792 0-44.288 0-65.856-52.16-46.4-91.968C58.688 780.096 441.216 136.064 465.088 90.176c21.376-41.216 72.384-41.92 93.76 0 32.576 63.808 413.248 704.96 432 742.272C1014.464 879.104 984.576 926.4 944.256 926.4L944.256 926.4zM466.496 332.736l30.464 319.616 45.632 0 30.528-319.616L466.496 332.736 466.496 332.736zM573.12 698.112 466.496 698.112l0 91.264 106.624 0L573.12 698.112 573.12 698.112z"
               p-id="2774"

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

@@ -42,3 +42,6 @@
 .Water-immersion-box-svg {
   padding: 5px;
 }
+.Water-immersion-box-title-text{
+  font-size: 0.11rem !important;
+}

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

@@ -21,8 +21,8 @@
                 version="1.1"
                 xmlns="http://www.w3.org/2000/svg"
                 p-id="1578"
-                width="20"
-                height="20"
+                width="300"
+                height="250"
               >
                 <path
                   d="M478.462882 476.972344L304.069869 973.321689h496.349345L626.026201 475.481805z"
@@ -46,16 +46,16 @@
                 ></path>
               </svg>
             </div>
-            <div>通信状态</div>
+            <div class="Water-immersion-box-title-text">通信状态</div>
           </div>
           <div class="Water-immersion-text">正常</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="" />
+              <img class="Water-immersion-box-img" src="../../font/水滴.png" alt="" />
             </div>
-            <div>水滴1正常</div>
+            <div class="Water-immersion-box-title-text">水滴1正常</div>
           </div>
           <div class="Water-immersion-text">正常</div>
         </div>

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

@@ -42,3 +42,10 @@
 .Water-immersion-box-svg {
   padding: 5px;
 }
+.Water-immersion-box-title-text {
+  font-size: 0.11rem !important;
+}
+.Water-immersion-box-img{
+  width: 250px;
+  height: 250px ;
+}                                                                                                         

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

@@ -21,8 +21,8 @@
                 version="1.1"
                 xmlns="http://www.w3.org/2000/svg"
                 p-id="1578"
-                width="20"
-                height="20"
+                width="300"
+                height="250"
               >
                 <path
                   d="M478.462882 476.972344L304.069869 973.321689h496.349345L626.026201 475.481805z"
@@ -46,7 +46,7 @@
                 ></path>
               </svg>
             </div>
-            <div>通信状态</div>
+            <div class="Water-immersion-box-title-text">通信状态</div>
           </div>
           <div class="Water-immersion-text">正常</div>
         </div>

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

@@ -41,3 +41,6 @@
 .Water-immersion-box-svg {
   padding: 5px;
 }
+.Water-immersion-box-title-text {
+  font-size: 0.11rem !important;
+}

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

@@ -21,8 +21,8 @@
                 version="1.1"
                 xmlns="http://www.w3.org/2000/svg"
                 p-id="1578"
-                width="20"
-                height="20"
+                width="300"
+                height="250"
               >
                 <path
                   d="M478.462882 476.972344L304.069869 973.321689h496.349345L626.026201 475.481805z"
@@ -46,7 +46,7 @@
                 ></path>
               </svg>
             </div>
-            <div>通信状态</div>
+            <div class="Water-immersion-box-title-text">通信状态</div>
           </div>
           <div class="Water-immersion-text">正常</div>
         </div>

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

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 @font-face {
   font-family: "庞门正道标题体";
   src: url("../../font/庞门正道标题体.TTF");
@@ -85,79 +84,3 @@
   right: 11%;
   top: 15%;
 }
-=======
-.box62 p {
-  font-size: 0.15rem !important;
-  font-weight: 700;
-  color: #75e2fa;
-}
-.box62 .concent > div {
-  position: absolute;
-}
-.box62 {
-  text-align: center;
-  right: 12%;
-}
-.box62 > div {
-  position: absolute;
-}
-.box62 > div :not(.ex) img {
-  width: 75%;
-}
-.box62 .l-bg {
-  width: 100%;
-  height: 100%;
-  background: url("../../images/zybz/背景.png") no-repeat center;
-  background-size: 100%;
-}
-.box62 .x-bg {
-  width: 100%;
-  height: 100%;
-  background: url("../../images/zybz/线.png") no-repeat center;
-  background-size: 100%;
-}
-.box62 .c-left-img-one {
-  left: 5%;
-  top: 26%;
-}
-.box62 .c-left-img-two {
-  left: 16%;
-  top: 6%;
-}
-.box62 .c-center1 {
-  left: 50%;
-  top: 50%;
-  transform: translate(-50%, -50%);
-}
-.box62 .c-center2 {
-  left: 32%;
-  top: 56%;
-}
-.box62 .c-center3 {
-  left: 36%;
-  top: 20%;
-}
-.box62 .c-center4 {
-  left: 60%;
-  top: 25%;
-}
-.box62 .c-center5 {
-  left: 64%;
-  top: 54%;
-}
-.box62 .c-center6 {
-  left: 50%;
-  top: 67%;
-}
-.box62 .c-r-item1 {
-  right: 22%;
-  top: 25%;
-}
-.box62 .c-r-item2 {
-  right: 12%;
-}
-.box62 .c-r-item3 {
-  right: 4%;
-  top: 25%;
-}
->>>>>>> 06a129e7dbcdf8e387e3e2c0d942a52175d47a33

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

@@ -18,13 +18,8 @@
         <p>郊区区县</p>
       </div>
       <div class="c-center1">
-<<<<<<< HEAD
         <img src="../images/zybz/组240拷贝.png" alt="" style="width: 1666px" />
         <p style="font-family: '庞门正道标题体'">指挥大厅</p>
-=======
-        <img src="../images/zybz/组240拷贝.png" alt="" style="width:282px;">
-        <p>指挥大厅</p>
->>>>>>> 06a129e7dbcdf8e387e3e2c0d942a52175d47a33
       </div>
       <div class="c-center2">
         <img src="../images/zybz/icon_jifang拷贝3.png" alt="">
@@ -43,19 +38,19 @@
         <p>档案室库房</p>
       </div>
       <div class="c-center6">
-        <img src="../images/zybz/icon_jifang拷贝3.png" alt="">
+        <img style="width: 49%;" src="../images/zybz/icon_jifang拷贝3.png" alt="">
         <p>城管局网络核心机房</p>
       </div>
 
-      <div class="c-r-item1">
+      <div class="c-r-item1" style="width: 5%;">
         <img src="../images/zybz/hwy拷贝.png" alt="">
         <p>华为云</p>
       </div>
-      <div class="c-r-item2">
+      <div class="c-r-item2" style="width: 6%;">
         <img src="../images/zybz/xcy拷贝.png" alt="">
         <p>信创云</p>
       </div>
-      <div class="c-r-item3">
+      <div class="c-r-item3" style="width: 5%;">
         <img src="../images/zybz/lcy拷贝.png" alt="">
         <p>浪潮云</p>
       </div>

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

@@ -1,305 +1,307 @@
-const test62 = (function() {
-    function test62(id, domTitle) {
-        if (domTitle) {
-            $(".test62 .title h2").text(domTitle);
-        }
-        $(".test62 .box").css("z-index", ++zIndex);
-        $(".test62 .box").attr("data-id", id);
-        move3(".test62 .test-box");
-        move2(".test62 .containerTool");
+const test62 = (function () {
+  function test62(id, domTitle) {
+    if (domTitle) {
+      $(".test62 .title h2").text(domTitle);
+    }
+    $(".test62 .box").css("z-index", ++zIndex);
+    $(".test62 .box").attr("data-id", id);
+    move3(".test62 .test-box");
+    move2(".test62 .containerTool");
 
-        let timer = null;
+    let timer = null;
 
-        $(".test62 .close").click(function() {
-            $(".test62 .box").remove();
-            $(".test62 .containerTool").css("display", "none");
-            $(".test62 .setWidth").val("");
-            $(".test62 .setHeight").val("");
-            moduleIdRemove.push(id);
-        });
+    $(".test62 .close").click(function () {
+      $(".test62 .box").remove();
+      $(".test62 .containerTool").css("display", "none");
+      $(".test62 .setWidth").val("");
+      $(".test62 .setHeight").val("");
+      moduleIdRemove.push(id);
+    });
 
-        eventClick(".test62");
+    eventClick(".test62");
 
-        const dists = document.querySelectorAll(".test62 .floor-dist");
-        const testDoms = document.querySelectorAll(".test62 .box");
-        for (let i = 0; i < dists.length; i++) {
-            const dom = dists[i];
-            setCharts(dom, testDoms[i]);
-        }
+    const dists = document.querySelectorAll(".test62 .floor-dist");
+    const testDoms = document.querySelectorAll(".test62 .box");
+    for (let i = 0; i < dists.length; i++) {
+      const dom = dists[i];
+      setCharts(dom, testDoms[i]);
+    }
 
-        // 局本级
-        $('.bg-center-img-one').click(function() {
-            $('.sf1').slideDown();
-            $('.sf3').slideUp();
-            $('.sf4').slideUp();
-        })
+    // 局本级
+    $(".bg-center-img-one").click(function () {
+      $(".sf1").slideDown();
+      $(".sf3").slideUp();
+      $(".sf4").slideUp();
+    });
 
-        // 浪潮
-        $('.bg-center-img-three').click(function() {
-            $('.sf4').slideDown();
-            $('.sf1').slideUp();
-            $('.sf3').slideUp();
-        })
+    // 浪潮
+    $(".bg-center-img-three").click(function () {
+      $(".sf4").slideDown();
+      $(".sf1").slideUp();
+      $(".sf3").slideUp();
+    });
 
-        // 华为
-        $('.bg-center-img-four').click(function() {
-            $('.sf3').slideDown();
-            $('.sf1').slideUp();
-            $('.sf4').slideUp();
-        })
+    // 华为
+    $(".bg-center-img-four").click(function () {
+      $(".sf3").slideDown();
+      $(".sf1").slideUp();
+      $(".sf4").slideUp();
+    });
 
+    // let myChart = echarts.init(dists[0]);
 
+    // window.addEventListener("resize", function () {
+    //   if (timer) {
+    //     clearTimeout(timer);
+    //     timer = null;
+    //   }
+    //   timer = setTimeout(() => {
+    //     move3(".test62 .test-box");
 
-        window.addEventListener("resize", function() {
-            if (timer) {
-                clearTimeout(timer);
-                timer = null;
-            }
-            timer = setTimeout(() => {
-                move3(".test62 .test-box");
+    //     myChart.resize();
+    //   }, 500);
+    // });
+  }
 
-                myChart.resize();
-            }, 500);
-        });
-    }
+  function setCharts(echartDom, testDom) {
+    var myChart = echarts.init(echartDom);
+    // 地图背景颜色
+    var highlight = "#03b7c9";
+
+    var demoData = [
+      {
+        name: "平均温度",
+        value: 22,
+        unit: "°",
+        pos: ["25%", "40%"],
+        range: [-40, 100],
+        YS: [
+          [0.4, "#119eff"],
+          [0.5, "#30da74"],
+          [1, "#f3390d"],
+        ],
+      },
+      {
+        name: "平均温度",
+        value: 90,
+        unit: "°",
+        pos: ["75%", "40%"],
+        range: [0, 100],
+        splitNum: 10,
+        YS: [
+          [0.3, "#f3390d"],
+          [0.8, "#30da74"],
+          [1, "#119eff"],
+        ],
+      },
+    ];
 
-    function setCharts(echartDom, testDom) {
-        var myChart = echarts.init(echartDom);
-        // 地图背景颜色
-        var highlight = "#03b7c9";
+    option = {
+      series: (function () {
+        var result = [];
 
-        var demoData = [{
-                name: "平均温度",
-                value: 22,
-                unit: "°",
-                pos: ["25%", "40%"],
-                range: [-40, 100],
-                YS: [
-                    [0.4, "#119eff"],
-                    [0.5, "#30da74"],
-                    [1, "#f3390d"],
-                ],
+        demoData.forEach(function (item) {
+          result.push(
+            // 外围刻度
+            {
+              type: "gauge",
+              center: item.pos,
+              radius: "50%", // 1行2个
+              splitNumber: item.splitNum || 10,
+              min: item.range[0],
+              max: item.range[1],
+              startAngle: 225,
+              endAngle: -45,
+              axisLine: {
+                show: true,
+                lineStyle: {
+                  width: 2,
+                  shadowBlur: 0,
+                  color: [[1, highlight]],
+                },
+              },
+              axisTick: {
+                show: true,
+                lineStyle: {
+                  color: highlight,
+                  width: 1,
+                },
+                length: -5,
+                splitNumber: 10,
+              },
+              splitLine: {
+                show: true,
+                length: -10,
+                lineStyle: {
+                  color: highlight,
+                },
+              },
+              axisLabel: {
+                distance: -18,
+                textStyle: {
+                  color: highlight,
+                  fontSize: "10",
+                },
+              },
+              pointer: {
+                show: 0,
+              },
+              detail: {
+                show: 0,
+              },
             },
             {
-                name: "平均温度",
-                value: 90,
-                unit: "°",
-                pos: ["75%", "40%"],
-                range: [0, 100],
-                splitNum: 10,
-                YS: [
-                    [0.3, "#f3390d"],
-                    [0.8, "#30da74"],
-                    [1, "#119eff"],
-                ],
+              name: "速度",
+              type: "gauge",
+              center: item.pos,
+              splitNumber: item.splitNum || 10,
+              min: item.range[0],
+              max: item.range[1],
+              radius: "45%",
+              axisLine: {
+                // 坐标轴线
+                show: false,
+                lineStyle: {
+                  // 属性lineStyle控制线条样式
+                  color: item.YS,
+                  shadowColor: "#ccc",
+                  shadowBlur: 25,
+                  width: 0,
+                },
+              },
+              axisLabel: {
+                show: false,
+              },
+              axisTick: {
+                // 坐标轴小标记
+                // show: false,
+                length: 20, // 属性length控制线长
+                lineStyle: {
+                  // 属性lineStyle控制线条样式
+                  color: "auto",
+                  width: 2,
+                },
+              },
+              splitLine: {
+                // 分隔线
+                show: false,
+                length: 20, // 属性length控制线长
+                lineStyle: {
+                  // 属性lineStyle（详见lineStyle）控制线条样式
+                  color: "auto",
+                },
+              },
+              title: {
+                textStyle: {
+                  // 其余属性默认使用全局文本样式，详见TEXTSTYLE
+                  fontWeight: "bolder",
+                  fontSize: 20,
+                  fontStyle: "italic",
+                },
+              },
+              detail: {
+                show: true,
+                offsetCenter: [0, "100%"],
+                textStyle: {
+                  fontSize: 25,
+                },
+                formatter: [
+                  "{value} " + (item.unit || ""),
+                  "{name|" + item.name + "}",
+                ].join("\n"),
+                rich: {
+                  name: {
+                    fontSize: 16,
+                    lineHeight: 30,
+                    color: "#4be4de",
+                  },
+                },
+              },
+              data: [
+                {
+                  value: item.value,
+                },
+              ],
+              pointer: {
+                width: 5,
+              },
             },
-        ];
-
-        option = {
-            series: (function() {
-                var result = [];
-
-                demoData.forEach(function(item) {
-                    result.push(
-                        // 外围刻度
-                        {
-                            type: "gauge",
-                            center: item.pos,
-                            radius: "50%", // 1行2个
-                            splitNumber: item.splitNum || 10,
-                            min: item.range[0],
-                            max: item.range[1],
-                            startAngle: 225,
-                            endAngle: -45,
-                            axisLine: {
-                                show: true,
-                                lineStyle: {
-                                    width: 2,
-                                    shadowBlur: 0,
-                                    color: [
-                                        [1, highlight]
-                                    ],
-                                },
-                            },
-                            axisTick: {
-                                show: true,
-                                lineStyle: {
-                                    color: highlight,
-                                    width: 1,
-                                },
-                                length: -5,
-                                splitNumber: 10,
-                            },
-                            splitLine: {
-                                show: true,
-                                length: -10,
-                                lineStyle: {
-                                    color: highlight,
-                                },
-                            },
-                            axisLabel: {
-                                distance: -18,
-                                textStyle: {
-                                    color: highlight,
-                                    fontSize: "10",
-                                },
-                            },
-                            pointer: {
-                                show: 0,
-                            },
-                            detail: {
-                                show: 0,
-                            },
-                        }, {
-                            name: "速度",
-                            type: "gauge",
-                            center: item.pos,
-                            splitNumber: item.splitNum || 10,
-                            min: item.range[0],
-                            max: item.range[1],
-                            radius: "45%",
-                            axisLine: {
-                                // 坐标轴线
-                                show: false,
-                                lineStyle: {
-                                    // 属性lineStyle控制线条样式
-                                    color: item.YS,
-                                    shadowColor: "#ccc",
-                                    shadowBlur: 25,
-                                    width: 0,
-                                },
-                            },
-                            axisLabel: {
-                                show: false,
-                            },
-                            axisTick: {
-                                // 坐标轴小标记
-                                // show: false,
-                                length: 20, // 属性length控制线长
-                                lineStyle: {
-                                    // 属性lineStyle控制线条样式
-                                    color: "auto",
-                                    width: 2,
-                                },
-                            },
-                            splitLine: {
-                                // 分隔线
-                                show: false,
-                                length: 20, // 属性length控制线长
-                                lineStyle: {
-                                    // 属性lineStyle（详见lineStyle）控制线条样式
-                                    color: "auto",
-                                },
-                            },
-                            title: {
-                                textStyle: {
-                                    // 其余属性默认使用全局文本样式，详见TEXTSTYLE
-                                    fontWeight: "bolder",
-                                    fontSize: 20,
-                                    fontStyle: "italic",
-                                },
-                            },
-                            detail: {
-                                show: true,
-                                offsetCenter: [0, "100%"],
-                                textStyle: {
-                                    fontSize: 25,
-                                },
-                                formatter: [
-                                    "{value} " + (item.unit || ""),
-                                    "{name|" + item.name + "}",
-                                ].join("\n"),
-                                rich: {
-                                    name: {
-                                        fontSize: 16,
-                                        lineHeight: 30,
-                                        color: "#4be4de",
-                                    },
-                                },
-                            },
-                            data: [{
-                                value: item.value,
-                            }, ],
-                            pointer: {
-                                width: 5,
-                            },
-                        },
-                        // 内侧指针、数值显示
-                        {
-                            name: item.name,
-                            type: "gauge",
-                            center: item.pos,
-                            radius: "40%",
-                            startAngle: 225,
-                            endAngle: -45,
-                            min: item.range[0],
-                            max: item.range[1],
-                            axisLine: {
-                                show: true,
-                                lineStyle: {
-                                    width: 16,
-                                    color: [
-                                        [1, "rgba(75,228,255,.1)"]
-                                    ],
-                                },
-                            },
-                            axisTick: {
-                                show: 0,
-                            },
-                            splitLine: {
-                                show: 0,
-                            },
-                            axisLabel: {
-                                show: 0,
-                            },
-                            pointer: {
-                                show: true,
-                                length: "90%",
-                                width: 3,
-                            },
-                            itemStyle: {
-                                //表盘指针的颜色
-                                color: "rgba(255, 153, 0, 0.31)",
-                                borderColor: "#ff9900",
-                                borderWidth: 1,
-                            },
-                            detail: {
-                                show: false,
-                                offsetCenter: [0, "100%"],
-                                textStyle: {
-                                    fontSize: 20,
-                                    color: "#00eff2",
-                                },
-                                formatter: [
-                                    "{value} " + (item.unit || ""),
-                                    "{name|" + item.name + "}",
-                                ].join("\n"),
-                                rich: {
-                                    name: {
-                                        fontSize: 14,
-                                        lineHeight: 30,
-                                        color: "#00eff2",
-                                    },
-                                },
-                            },
+            // 内侧指针、数值显示
+            {
+              name: item.name,
+              type: "gauge",
+              center: item.pos,
+              radius: "40%",
+              startAngle: 225,
+              endAngle: -45,
+              min: item.range[0],
+              max: item.range[1],
+              axisLine: {
+                show: true,
+                lineStyle: {
+                  width: 16,
+                  color: [[1, "rgba(75,228,255,.1)"]],
+                },
+              },
+              axisTick: {
+                show: 0,
+              },
+              splitLine: {
+                show: 0,
+              },
+              axisLabel: {
+                show: 0,
+              },
+              pointer: {
+                show: true,
+                length: "90%",
+                width: 3,
+              },
+              itemStyle: {
+                //表盘指针的颜色
+                color: "rgba(255, 153, 0, 0.31)",
+                borderColor: "#ff9900",
+                borderWidth: 1,
+              },
+              detail: {
+                show: false,
+                offsetCenter: [0, "100%"],
+                textStyle: {
+                  fontSize: 20,
+                  color: "#00eff2",
+                },
+                formatter: [
+                  "{value} " + (item.unit || ""),
+                  "{name|" + item.name + "}",
+                ].join("\n"),
+                rich: {
+                  name: {
+                    fontSize: 14,
+                    lineHeight: 30,
+                    color: "#00eff2",
+                  },
+                },
+              },
 
-                            data: [{
-                                value: item.value,
-                            }, ],
-                        }
-                    );
-                });
-                return result;
-            })(),
-        };
-        if (option) {
-            myChart.setOption(option);
-        }
+              data: [
+                {
+                  value: item.value,
+                },
+              ],
+            }
+          );
+        });
+        return result;
+      })(),
+    };
+    if (option) {
+      myChart.setOption(option);
+    }
 
-        if (!testDom) {
-            testDom = document.querySelectorAll(".test62 .box");
-        }
-        obsDom(testDom, myChart);
+    if (!testDom) {
+      testDom = document.querySelectorAll(".test62 .box");
     }
-    return test62;
-})();
+    obsDom(testDom, myChart);
+  }
+  return test62;
+})();

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

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