拉取

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

@@ -1,111 +1,117 @@
-<div class="box1 box" data-name='test1' data-id='' draggable="true">
-    <div class="toolBox">
-        <span class="fit"></span>
-        <span class="close"></span>
-    </div>
-    <div class="tool">
-        <div class="title bgTitle2">
-            <h2>最新动态test1</h2>
-        </div>
-    </div>
-    <div class="test-box">
-        <div class="content">
-            <!-- 最新动态 -->
-            <div class="trends">
-                <ul>
-                    <li>
-                        <div class="img">
-                            <img src="../images/img_01.jpg" alt="">
-                        </div>
-                        <div class="explain">
-                            <h3>大熊猫“新星”，38岁生日快乐！</h3>
-                            <p>“新星”38岁生日之际，重庆动物园为它准备了开心的生日会，现场游客、现场嘉宾</p>
-                            <div class="timer">2022-01-17</div>
-                        </div>
-                    </li>
-                    <li>
-                        <div class="img">
-                            <img src="../images/img_01.jpg" alt="">
-                        </div>
-                        <div class="explain">
-                            <h3>大熊猫“新星”，38岁生日快乐！</h3>
-                            <p>“新星”38岁生日之际，重庆动物园为它准备了开心的生日会，现场游客、现场嘉宾</p>
-                            <div class="timer">2022-01-17</div>
-                        </div>
-                    </li>
-                    <li>
-                        <div class="img">
-                            <img src="../images/img_01.jpg" alt="">
-                        </div>
-                        <div class="explain">
-                            <h3>大熊猫“新星”，38岁生日快乐！</h3>
-                            <p>“新星”38岁生日之际，重庆动物园为它准备了开心的生日会，现场游客、现场嘉宾</p>
-                            <div class="timer">2022-01-17</div>
-                        </div>
-                    </li>
-                    <li>
-                        <div class="img">
-                            <img src="../images/img_01.jpg" alt="">
-                        </div>
-                        <div class="explain">
-                            <h3>大熊猫“新星”，38岁生日快乐！</h3>
-                            <p>“新星”38岁生日之际，重庆动物园为它准备了开心的生日会，现场游客、现场嘉宾</p>
-                            <div class="timer">2022-01-17</div>
-                        </div>
-                    </li>
-                    <li>
-                        <div class="img">
-                            <img src="../images/img_01.jpg" alt="">
-                        </div>
-                        <div class="explain">
-                            <h3>大熊猫“新星”，38岁生日快乐！</h3>
-                            <p>“新星”38岁生日之际，重庆动物园为它准备了开心的生日会，现场游客、现场嘉宾</p>
-                            <div class="timer">2022-01-17</div>
-                        </div>
-                    </li>
-                    <li>
-                        <div class="img">
-                            <img src="../images/img_01.jpg" alt="">
-                        </div>
-                        <div class="explain">
-                            <h3>大熊猫“新星”，38岁生日快乐！</h3>
-                            <p>“新星”38岁生日之际，重庆动物园为它准备了开心的生日会，现场游客、现场嘉宾</p>
-                            <div class="timer">2022-01-17</div>
-                        </div>
-                    </li>
-                </ul>
-            </div>
-
-            <!-- 中间地图 -->
-            <!-- <div class="floor-dist">
-        </div> -->
-
-
-
-        </div>
-    </div>
-    <div class="panel-footer"></div>
-</div>
-
-
-
-<div class="tools" style="display: none;">
-
-    <!-- 工具弹框 -->
-    <div class="containerTool test1Toll">
-        <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>
+<div class="box1 box" data-name="test1" data-id="" draggable="true">
+  <div class="toolBox">
+    <span class="fit"></span>
+    <span class="close"></span>
+  </div>
+  <div class="tool">
+    <div class="title bgTitle2">
+      <h2>最新动态test1</h2>
+    </div>
+  </div>
+  <div class="test-box">
+    <div class="content">
+      <!-- 最新动态 -->
+      <div class="trends" id="trends">
+        <ul>
+          <li>
+            <div class="img">
+              <img src="../images/img_01.jpg" alt="" />
+            </div>
+            <div class="explain">
+              <h3>大熊猫“新星”，38岁生日快乐！</h3>
+              <p>
+                “新星”38岁生日之际，重庆动物园为它准备了开心的生日会，现场游客、现场嘉宾
+              </p>
+              <div class="timer">2022-01-17</div>
+            </div>
+          </li>
+          <li>
+            <div class="img">
+              <img src="../images/img_01.jpg" alt="" />
+            </div>
+            <div class="explain">
+              <h3>大熊猫“新星”，38岁生日快乐！</h3>
+              <p>
+                “新星”38岁生日之际，重庆动物园为它准备了开心的生日会，现场游客、现场嘉宾
+              </p>
+              <div class="timer">2022-01-17</div>
+            </div>
+          </li>
+          <li>
+            <div class="img">
+              <img src="../images/img_01.jpg" alt="" />
+            </div>
+            <div class="explain">
+              <h3>大熊猫“新星”，38岁生日快乐！</h3>
+              <p>
+                “新星”38岁生日之际，重庆动物园为它准备了开心的生日会，现场游客、现场嘉宾
+              </p>
+              <div class="timer">2022-01-17</div>
+            </div>
+          </li>
+          <li>
+            <div class="img">
+              <img src="../images/img_01.jpg" alt="" />
+            </div>
+            <div class="explain">
+              <h3>大熊猫“新星”，38岁生日快乐！</h3>
+              <p>
+                “新星”38岁生日之际，重庆动物园为它准备了开心的生日会，现场游客、现场嘉宾
+              </p>
+              <div class="timer">2022-01-17</div>
+            </div>
+          </li>
+          <li>
+            <div class="img">
+              <img src="../images/img_01.jpg" alt="" />
+            </div>
+            <div class="explain">
+              <h3>大熊猫“新星”，38岁生日快乐！</h3>
+              <p>
+                “新星”38岁生日之际，重庆动物园为它准备了开心的生日会，现场游客、现场嘉宾
+              </p>
+              <div class="timer">2022-01-17</div>
+            </div>
+          </li>
+          <li>
+            <div class="img">
+              <img src="../images/img_01.jpg" alt="" />
+            </div>
+            <div class="explain">
+              <h3>大熊猫“新星”，38岁生日快乐！</h3>
+              <p>
+                “新星”38岁生日之际，重庆动物园为它准备了开心的生日会，现场游客、现场嘉宾
+              </p>
+              <div class="timer">2022-01-17</div>
+            </div>
+          </li>
+        </ul>
+      </div>
+
+      <!-- 中间地图 -->
+      <!-- <div class="floor-dist">
+        </div> -->
+    </div>
+  </div>
+  <div class="panel-footer"></div>
+</div>
+
+<div class="tools" style="display: none">
+  <!-- 工具弹框 -->
+  <div class="containerTool test1Toll">
+    <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>

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

@@ -1,47 +1,45 @@
-const test1 = (function() {
-    // 最新动态数据
-    const officialAccount = {
-        init() {
-            this.getData();
-        },
+const test1 = (function () {
+  // 最新动态数据
+  const officialAccount = {
+    init() {
+      this.getData();
+    },
 
-        getData() {
-            const This = this;
-            $.ajax({
-                /** url，data参数，
-                 * type请求类型，响应体结果，超时时间
-                 * 成功的回调，失败回调 */
-                url: ZQURL + '/getNews_Top10',
-                data: {
-                    dateType: 0
-                },
-                type: 'GET',
-                dataType: 'JSON',
-                success: function(data) {
-                    console.log('最新动态数据', data);
-                    if (data.success != 'true') return
-                    const {
-                        obj: dataArr
-                    } = data;
-                    if (dataArr.length == 0) {
-                        return
-                    }
-                    This.publicNoData(dataArr)
-                    console.log(dataArr, '最新动态数据');
-                },
-                error: function() {
-                    console.log('站群最新动态接口超时了');
-                },
-            })
+    getData() {
+      const This = this;
+      $.ajax({
+        /** url，data参数，
+         * type请求类型，响应体结果，超时时间
+         * 成功的回调，失败回调 */
+        url: ZQURL + "/getNews_Top10",
+        data: {
+          dateType: 0,
+        },
+        type: "GET",
+        dataType: "JSON",
+        success: function (data) {
+          console.log("最新动态数据", data);
+          if (data.success != "true") return;
+          const { obj: dataArr } = data;
+          if (dataArr.length == 0) {
+            return;
+          }
+          This.publicNoData(dataArr);
+          console.log(dataArr, "最新动态数据");
+        },
+        error: function () {
+          console.log("站群最新动态接口超时了");
         },
+      });
+    },
 
-        publicNoData(dataArr) {
-            let html = '';
-            let newDataArr = dataArr.filter((item) => {
-                return item.titlepic != '' && item.summary != ''
-            })
-            newDataArr.forEach(d => {
-                html += ` 
+    publicNoData(dataArr) {
+      let html = "";
+      let newDataArr = dataArr.filter((item) => {
+        return item.titlepic != "" && item.summary != "";
+      });
+      newDataArr.forEach((d) => {
+        html += ` 
             <li>
               <div class="img">
                   <img src="${imgURL}${d.titlepic}" alt="">
@@ -52,51 +50,81 @@ const test1 = (function() {
                   <div class="timer">${d.releaseDate}</div>
               </div>
             </li>
-          `
-            });
-            $('.test1 .trends ul').html('').append(html);
-        }
-    }
-
-    function test1(id, domTitle) {
-        if (domTitle) {
-            $('.test1 .title h2').text(domTitle)
-        }
-        $('.test1 .box').css('z-index', ++zIndex)
-        $('.test1 .box').attr('data-id', id)
-            // move('.test1 .box')
-        move3('.test1 .test-box')
-        move2('.test1 .containerTool')
-        let timer = null;
-
-        $('.test1 .box .close').click(function() {
-            $('.test1 .box').remove();
-            $('.test1 .containerTool').css('display', 'none');
-            $('.test1 .setWidth').val('')
-            $('.test1 .setHeight').val('');
-
-            moduleIdRemove.push(id)
-        })
-
-        eventClick('.test1');
-
-        window.addEventListener('resize', function() {
-            if (timer) {
-                clearTimeout(timer);
-                timer = null;
-            }
-            timer = setTimeout(() => {
-                move3('.test1 .test-box')
-            }, 500);
-        });
+          `;
+      });
+      $(".test1 .trends ul").html("").append(html);
+    },
+  };
 
+  function test1(id, domTitle) {
+    if (domTitle) {
+      $(".test1 .title h2").text(domTitle);
+    }
+    $(".test1 .box").css("z-index", ++zIndex);
+    $(".test1 .box").attr("data-id", id);
+    // move('.test1 .box')
+    move3(".test1 .test-box");
+    move2(".test1 .containerTool");
+    let timer = null;
 
+    $(".test1 .box .close").click(function () {
+      $(".test1 .box").remove();
+      $(".test1 .containerTool").css("display", "none");
+      $(".test1 .setWidth").val("");
+      $(".test1 .setHeight").val("");
 
-        officialAccount.init()
+      moduleIdRemove.push(id);
+    });
+    $(function () {
+      var $this = $("#trends");
+      var scrollTimer;
+      $this
+        .hover(
+          function () {
+            clearInterval(scrollTimer);
+          },
+          function () {
+            scrollTimer = setInterval(function () {
+              scrollNews($this);
+            }, 1000);
+          }
+        )
+        .trigger("mouseleave");
 
-    };
+      function scrollNews(obj) {
+        var $self = obj.find("ul");
+        var lineHeight = $self.find("li:first").height();
+        $self.animate(
+          {
+            marginTop: -lineHeight + "px",
+          },
+          600,
+          function () {
+            $self
+              .css({
+                marginTop: 0,
+              })
+              .find("li:first")
+              .appendTo($self);
+          }
+        );
+      }
+    });
+    
+    eventClick(".test1");
 
+    window.addEventListener("resize", function () {
+      if (timer) {
+        clearTimeout(timer);
+        timer = null;
+      }
+      timer = setTimeout(() => {
+        move3(".test1 .test-box");
+      }, 500);
+    });
 
+    officialAccount.init();
+  }
 
-    return test1;
-})();
+  return test1;
+})();

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

@@ -4,5 +4,8 @@
   width: 28%;
 }
 .box10 .inner a img {
-  width: 1.7rem;
+  /* width: 1.7rem; */
+}
+.activeImg :hover {
+  transform: scale(1.4) !important;
 }

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

@@ -11,37 +11,37 @@
   <div class="test-box">
     <div class="content">
       <!-- 行业单位入口 -->
-      <marquee behavior="" direction="up">
-        <div class="inner">
-          <a href="javascript:void(0)" class="active"
-            ><img src="../images/stationGroup/tc2.png" alt=""
-          /></a>
-          <a href="javascript:void(0)" class="active"
-            ><img src="../images/stationGroup/tc3.png" alt=""
-          /></a>
-          <a href="javascript:void(0)" class="active"
-            ><img src="../images/stationGroup/tc7.png" alt=""
-          /></a>
-          <a href="javascript:void(0)" class="active"
-            ><img src="../images/stationGroup/tc8.png" alt=""
-          /></a>
-          <a href="javascript:void(0)" class="active"
-            ><img src="../images/stationGroup/tc9.png" alt=""
-          /></a>
-          <a href="javascript:void(0)" class="active"
-            ><img src="../images/stationGroup/tc10.png" alt=""
-          /></a>
-          <a href="javascript:void(0)" class="active"
-            ><img src="../images/stationGroup/tc11.png" alt=""
-          /></a>
-          <a href="javascript:void(0)" class="active"
-            ><img src="../images/stationGroup/tc12.png" alt=""
-          /></a>
-          <a href="javascript:void(0)" class="active"
-            ><img src="../images/stationGroup/tc13.png" alt=""
-          /></a>
-        </div>
-      </marquee>
+      <!-- <marquee behavior="" direction="up"> -->
+      <div class="inner">
+        <a href="javascript:void(0)" class="active"
+          ><img class="activeImg" src="../images/stationGroup/tc2.png" alt=""
+        /></a>
+        <a href="javascript:void(0)" class="active"
+          ><img src="../images/stationGroup/tc3.png" alt=""
+        /></a>
+        <a href="javascript:void(0)" class="active"
+          ><img src="../images/stationGroup/tc7.png" alt=""
+        /></a>
+        <a href="javascript:void(0)" class="active"
+          ><img src="../images/stationGroup/tc8.png" alt=""
+        /></a>
+        <a href="javascript:void(0)" class="active"
+          ><img src="../images/stationGroup/tc9.png" alt=""
+        /></a>
+        <a href="javascript:void(0)" class="active"
+          ><img src="../images/stationGroup/tc10.png" alt=""
+        /></a>
+        <a href="javascript:void(0)" class="active"
+          ><img src="../images/stationGroup/tc11.png" alt=""
+        /></a>
+        <a href="javascript:void(0)" class="active"
+          ><img src="../images/stationGroup/tc12.png" alt=""
+        /></a>
+        <a href="javascript:void(0)" class="active"
+          ><img src="../images/stationGroup/tc13.png" alt=""
+        /></a>
+      </div>
+      <!-- </marquee> -->
     </div>
   </div>
   <div class="panel-footer"></div>

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

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

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

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

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

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

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

@@ -3,7 +3,7 @@
 }
 .box43 ul {
   display: flex;
-  margin-top: 0.3rem;
+  margin-top: 0.15rem;
   font-family: "LESLIE";
 }
 .box43 ul li {
@@ -25,3 +25,9 @@
   font-family: "LESLIE";
   src: url("../../font/LESLIE.TTF");
 }
+.box43 .network_text{
+  font-size: 0.13rem !important;
+}
+.box43 .network_number{
+  font-size: 0.4rem !important;
+}

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

@@ -1,83 +1,83 @@
-<div class="box43 box" data-name='test43'>
-    <div class="toolBox">
-        <span class="fit"></span>
-        <span class="close"></span>
-    </div>
-    <div class="tool">
-        <div class="title bgTitle">
-            <h2>网络安全应急流程</h2>
-        </div>
-    </div>
-    <div class="test-box">
-        <div class="content">
-            <!-- 态势总览 -->
-            <ul>
-                <li data-id='5'>
-                    <img src="../images/networkSecurity/dwzs.png" alt="">
-                    <div class="desc">
-                        <div>网络设备</div>
-                        <div class="network_count">35</div>
-                    </div>
-                </li>
-                <li data-id='3'>
-                    <img src="../images/networkSecurity/yjsb.png" alt="">
-                    <div class="desc">
-                        <div>应用服务器</div>
-                        <div class="app_server_count">35</div>
-                    </div>
-                </li>
-                <li data-id='1'>
-                    <img src="../images/networkSecurity/xtzs.png" alt="">
-                    <div class="desc">
-                        <div>服务器</div>
-                        <div class="server_count">35</div>
-                    </div>
-                </li>
-                <li data-id='2'>
-                    <img src="../images/networkSecurity/xtzs.png" alt="">
-                    <div class="desc">
-                        <div>数据库</div>
-                        <div class="databae_count">35</div>
-                    </div>
-                </li>
-                <li data-id='6'>
-                    <img src="../images/networkSecurity/xtzs.png" alt="">
-                    <div class="desc">
-                        <div>应用系统</div>
-                        <div class="app_system_count">35</div>
-                    </div>
-                </li>
-                <li data-id='4'>
-                    <img src="../images/networkSecurity/xtzs.png" alt="">
-                    <div class="desc">
-                        <div>安全设备</div>
-                        <div class="safety_count">35</div>
-                    </div>
-                </li>
-            </ul>
-        </div>
-    </div>
-    <div class="panel-footer"></div>
-</div>
-
-
-<!-- 工具弹框 -->
-<div class="tools" style="display: none;">
-
-    <div class="containerTool test43Toll">
-        <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="box43 box" data-name='test43'>
+    <div class="toolBox">
+        <span class="fit"></span>
+        <span class="close"></span>
+    </div>
+    <div class="tool">
+        <div class="title bgTitle">
+            <h2>网络安全应急流程</h2>
+        </div>
+    </div>
+    <div class="test-box">
+        <div class="content">
+            <!-- 态势总览 -->
+            <ul>
+                <li data-id='5'>
+                    <img src="../images/networkSecurity/dwzs.png" alt="">
+                    <div class="desc">
+                        <div class="network_text">网络设备</div>
+                        <div class="network_count network_number">35</div>
+                    </div>
+                </li>
+                <li data-id='3'>
+                    <img src="../images/networkSecurity/yjsb.png" alt="">
+                    <div class="desc">
+                        <div class="network_text">应用服务器</div>
+                        <div class="app_server_count network_number">35</div>
+                    </div>
+                </li>
+                <li data-id='1'>
+                    <img src="../images/networkSecurity/xtzs.png" alt="">
+                    <div class="desc">
+                        <div class="network_text">服务器</div>
+                        <div class="server_count network_number">35</div>
+                    </div>
+                </li>
+                <li data-id='2'>
+                    <img src="../images/networkSecurity/xtzs.png" alt="">
+                    <div class="desc">
+                        <div class="network_text">数据库</div>
+                        <div class="databae_count network_number">35</div>
+                    </div>
+                </li>
+                <li data-id='6'>
+                    <img src="../images/networkSecurity/xtzs.png" alt="">
+                    <div class="desc">
+                        <div class="network_text">应用系统</div>
+                        <div class="app_system_count network_number">35</div>
+                    </div>
+                </li>
+                <li data-id='4'>
+                    <img src="../images/networkSecurity/xtzs.png" alt="">
+                    <div class="desc">
+                        <div class="network_text">安全设备</div>
+                        <div class="safety_count network_number">35</div>
+                    </div>
+                </li>
+            </ul>
+        </div>
+    </div>
+    <div class="panel-footer"></div>
+</div>
+
+
+<!-- 工具弹框 -->
+<div class="tools" style="display: none;">
+
+    <div class="containerTool test43Toll">
+        <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>

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

@@ -16,10 +16,89 @@
     transform: translateX(-50%);
   }
 }
-
+@keyframes turn1 {
+  0% {
+    transform: translate(0, 0);
+  }
+  20% {
+    transform: translate(7rem,0);
+  }
+  40% {
+    transform: translate(8.5rem, -1rem);
+  }
+  60% {
+    transform: translate(-8rem, -2rem);
+  }
+  80% {
+    transform: translate(-4rem, -0.5rem);
+  }
+  100% {
+    transform: translate(0, 0);
+  }
+}
+@keyframes turn2 {
+  0% {
+    transform: translate(0, 0);
+  }
+  20% {
+    transform: translate(6rem, 0);
+  }
+  40% {
+    transform: translate(12rem, 0);
+  }
+  60% {
+    transform: translate(11.5rem, 2rem);
+  }
+  80% {
+    transform: translate(-6rem, 2rem);
+  }
+  100% {
+    transform: translate(0, 0);
+  }
+}
+@keyframes turn3 {
+  0% {
+    transform: translate(0, 0);
+  }
+  20% {
+    transform: translate(-3rem, -1rem);
+  }
+  40% {
+    transform: translate(14rem, -1rem);
+  }
+  60% {
+    transform: translate(12.5rem, 0.5rem);
+  }
+  80% {
+    transform: translate(8rem, 0.5rem);
+  }
+  100% {
+    transform: translate(0, 0);
+  }
+}
+@keyframes turn4 {
+  0% {
+    transform: translate(0, 0);
+  }
+  20% {
+    transform: translate(-10rem, 1rem);
+  }
+  40% {
+    transform: translate(-14rem, 1rem);
+  }
+  60% {
+    transform: translate(-14.5rem, -1rem);
+  }
+  80% {
+    transform: translate(-5rem, -1rem);
+  }
+  100% {
+    transform: translate(0, 0);
+  }
+}
 .box61 .left-box,
 .box61 .right-box {
-  animation: row linear 20s infinite;
+  animation: row linear 30s infinite;
 }
 
 .left-box-three:hover {
@@ -48,21 +127,72 @@
   background-size: 100%; */
   position: absolute;
 }
+.bg-center-img-one {
+  position: absolute;
 
+  animation-name: turn1;
+  animation-timing-function: linear;
+  animation-duration: 40s;
+  animation-iteration-count: infinite;
+}
+.bg-center-img-one:hover {
+  animation-play-state: paused;
+  width: 10%;
+  font-size: 0.25rem !important;
+}
+.bg-center-img-two:hover {
+  animation-play-state: paused;
+  width: 10%;
+  font-size: 0.25rem !important;
+}
+.bg-center-img-three:hover {
+  animation-play-state: paused;
+  width: 10%;
+  font-size: 0.25rem !important;
+}
+.bg-center-img-four:hover {
+  animation-play-state: paused;
+  width: 10%;
+  font-size: 0.25rem !important;
+}
+.bg-center-img-two {
+  position: absolute;
+  z-index: 1000000;
+  animation-name: turn2;
+  animation-timing-function: linear;
+  animation-duration: 40s;
+  animation-iteration-count: infinite;
+}
+.bg-center-img-three {
+  position: absolute;
+
+  animation-name: turn3;
+  animation-timing-function: linear;
+  animation-duration: 40s;
+  animation-iteration-count: infinite;
+}
+.bg-center-img-four {
+  position: absolute;
+
+  animation-name: turn4;
+  animation-timing-function: linear;
+  animation-duration: 40s;
+  animation-iteration-count: infinite;
+}
 .bg-center-img-one {
   position: absolute;
-  top: 30%;
+  top: 60%;
   left: 46%;
-  width: 10%;
+  width: 5%;
   text-align: center;
 }
 
 .bg-center-img-one-text {
-  font-size: 0.2rem !important;
+  font-size: 0.15rem !important;
   font-weight: 700;
   color: #75e2fa;
 }
-.bgCenter{
+.bgCenter {
   position: relative;
   left: 5%;
 }
@@ -87,7 +217,7 @@
 
 .bg-center-img-three {
   position: absolute;
-  width: 6%;
+  width: 5%;
   top: 47%;
   left: 13%;
   text-align: center;
@@ -102,7 +232,7 @@
 .bg-center-img-four {
   position: absolute;
   top: 40%;
-  right: 10%;
+  left: 88%;
   width: 5%;
   text-align: center;
 }

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

@@ -8,9 +8,9 @@
       <div class="bg-center">
         <div
           id="bgCenter"
-          style="width: 100%; height: 100%; transform: scaleX(1.4)"
+          style="width: 100%; height: 100%; transform: scaleX(1.2)"
         ></div>
-        <div class="bg-center-img-one">
+        <div class="bg-center-img-one bg-center-img-One">
           <img src="../css/modules/layer/default/电脑桌面155拷贝.png" alt="" />
           <div class="bg-center-img-one-text">局本级</div>
         </div>
@@ -35,7 +35,15 @@
       </div>
       <div class="bg-botton">
         <!-- <img src="../css/modules/layer/default/组1443.png" alt="" /> -->
-        <div id="dzContainer" style="width: 100%;height:100%;transform: scaleX(1.2);margin-left: -6%;"></div>
+        <div
+          id="dzContainer"
+          style="
+            width: 100%;
+            height: 100%;
+            transform: scaleX(1.2);
+            margin-left: -6%;
+          "
+        ></div>
       </div>
       <div class="meng-bg"></div>
       <div class="number-img">

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

@@ -1,9 +1,5 @@
 const test61 = (function () {
-<<<<<<< HEAD
   function test61(id, domTitle) {
-=======
-  function test61 (id, domTitle) {
->>>>>>> e24c935307d344b19d1705f0f20916a46bc2aff7
     if (domTitle) {
       $(".test61 .title h2").text(domTitle);
     }
@@ -34,19 +30,11 @@ const test61 = (function () {
       $(".sf1").slideDown();
       $(".sf3").slideUp();
       $(".sf4").slideUp();
-<<<<<<< HEAD
       sp1Ajax11();
       sp1Ajax12();
       sp1Ajax14();
       sp1Ajax15();
       sp1Ajax17();
-=======
-      sp1Ajax11()
-      sp1Ajax12()
-      sp1Ajax14()
-      sp1Ajax15()
-      sp1Ajax17()
->>>>>>> e24c935307d344b19d1705f0f20916a46bc2aff7
     });
 
     // 浪潮
@@ -54,13 +42,8 @@ const test61 = (function () {
       $(".sf4").slideDown();
       $(".sf1").slideUp();
       $(".sf3").slideUp();
-<<<<<<< HEAD
       sp4Ajax25();
       sp4Ajax26();
-=======
-      sp4Ajax25()
-      sp4Ajax26()
->>>>>>> e24c935307d344b19d1705f0f20916a46bc2aff7
       sp4Ajax27();
       sp4Ajax28();
       sp4Ajax29();
@@ -72,7 +55,6 @@ const test61 = (function () {
       $(".sf3").slideDown();
       $(".sf1").slideUp();
       $(".sf4").slideUp();
-<<<<<<< HEAD
       sp3Ajax18();
       sp3Ajax19();
       sp3Ajax21();
@@ -80,22 +62,12 @@ const test61 = (function () {
       myAjax1();
       myAjax2();
       myAjax3();
-=======
-      sp3Ajax18()
-      sp3Ajax19()
-      sp3Ajax21()
-      sp3Ajax22()
-      myAjax1()
-      myAjax2()
-      myAjax3()
->>>>>>> e24c935307d344b19d1705f0f20916a46bc2aff7
     });
 
     $(".test61 .close-Popup").click(function () {
       $(".test61 .Popup").css("display", "none");
     });
 
-<<<<<<< HEAD
     const domPop = $(".Popup .tablebox");
     let popFlag = false;
     $(".test61 .left-box-three").click(function () {
@@ -132,50 +104,11 @@ const test61 = (function () {
               }
 
               return `
-=======
-    const domPop = $('.Popup .tablebox');
-    let popFlag = false;
-    $(".test61 .left-box-three").click(function () {
-      const tit = $(this).find('.left-box-one-title').html();
-      $('.Popup-name span').eq(0).text(tit);
-      const id = +$(this).attr('data-id');
-      $.ajax({
-        url: basicUrl +
-          "/SystemRisk/GetSystemRiskList",
-        data: {
-          officeId: id
-        },
-        success: function (res) {
-          console.log('安全等级弹框', res);
-          const { result } = res;
-          const html = result.map((item, index) => {
-            const high = item.high_risk_number;
-            const middle = item.middle_risk_number;
-            let sum = high + middle;
-            if (isNaN(sum)) {
-              sum = 0;
-            }
-            let status = '中';
-            switch (item.safety_status) {
-              case 1:
-                status = '低'
-                break;
-              case 2:
-                status = '中'
-                break;
-              default:
-                status = '高'
-                break;
-            }
-
-            return `
->>>>>>> e24c935307d344b19d1705f0f20916a46bc2aff7
                     <tr class="Tr-td">
                       <td>${item.system_name}</td>
                       <td>${high}</td>
                       <td>${middle}</td>
                       <td>${status}</td>
-<<<<<<< HEAD
                       <td>${
                         item.update_time
                           ? item.update_time.substring(0, 10)
@@ -190,15 +123,6 @@ const test61 = (function () {
           $(".box61 .Popup tbody").html(html);
           setTimeout(() => {
             scroll(domPop, 0, popFlag);
-=======
-                      <td>${item.update_time ? item.update_time.substring(0, 10) : false || item.create_time ? item.create_time.substring(0, 10) : false}</td>
-                    </tr>
-                `
-          }).join('');
-          $('.box61 .Popup tbody').html(html);
-          setTimeout(() => {
-            scroll(domPop, 0, popFlag)
->>>>>>> e24c935307d344b19d1705f0f20916a46bc2aff7
             popFlag = true;
           }, 1500);
         },
@@ -207,7 +131,6 @@ const test61 = (function () {
         },
       });
 
-<<<<<<< HEAD
       $(".test61 .Popup").css("display", "block");
     });
 
@@ -248,63 +171,12 @@ const test61 = (function () {
       );
     }
 
-=======
-
-      $(".test61 .Popup").css("display", "block");
-    });
-
-
-
-    const dom = $('.test61 .box61 .left-box');
-    const dom1Children = $('.test61 .box61 .left-box').children();
-
-    const dom2 = $('.test61 .box61 .right-box');
-    const dom2Children = $('.test61 .box61 .right-box').children();
-
-    dom.append(dom2Children.clone(true))
-    dom.append(dom1Children.clone(true))
-    dom.append(dom2Children.clone(true))
-
-
-    dom2.append(dom1Children.clone(true))
-    dom2.append(dom2Children.clone(true))
-    dom2.append(dom1Children.clone(true))
-
-
-
-
-
-
-    hoverAnimation(dom, dom2)
-    hoverAnimation(dom2, dom)
-    function hoverAnimation (dom, dom2) {
-      dom.hover(() => {
-        dom.css({
-          'animation-play-state': 'paused'
-        })
-        dom2.css({
-          'animation-play-state': 'paused'
-        })
-      },
-        () => {
-          dom.css({
-            'animation-play-state': 'running'
-          })
-          dom2.css({
-            'animation-play-state': 'running'
-          })
-        })
-    }
-
-
->>>>>>> e24c935307d344b19d1705f0f20916a46bc2aff7
     setTimeout(() => {
       const scroll = (dom, curLeft) => {
         const option = {
           duration: 16,
           total: 5000,
           begin: {
-<<<<<<< HEAD
             left: curLeft,
           },
           end: {
@@ -344,57 +216,22 @@ const test61 = (function () {
       player.startAnimation();
       player.onFrame(function (i) {});
     });
+    var playerOne = new SVGA.Player("#dzContainer");
+    var parserOne = new SVGA.Parser("#dzContainer");
+    parserOne.load("../svga/dizuo.svga", function (item) {
+      playerOne.loops = 999999999999; // 循环次数
+      playerOne.clearsAfterStop = false;
+      playerOne.setVideoItem(item);
+      playerOne.startAnimation();
+      playerOne.onFrame(function (i) {});
+    });
   }
 
   function setCharts(echartDom, testDom) {
-=======
-            left: curLeft
-          },
-          end: {
-            left: -dom.width() / 2
-          },
-          startMove (curData) {
-            curLeft = curData.left;
-            dom.css('margin-left', curLeft)
-          },
-          stopMove () {
-            dom.css('margin-left', 0)
-
-            curLeft = 0;
-            scroll(dom, 0)
-          }
-        }
-        const animate = animateScrool(option);
-        animate.start();
-        dom.hover(() => {
-          animate.stop();
-        }, () => {
-          animate.start();
-        })
-        return animate;
-      }
-      //  scroll(dom,0)
-    }, 1500);
-
-
-    var player = new SVGA.Player('#dzContainer');
-    var parser = new SVGA.Parser('#dzContainer');
-    parser.load('../svga/dizuo.svga', function (item) {
-      player.loops = 999999999999; // 循环次数
-      player.clearsAfterStop = false;
-      player.setVideoItem(item);
-      player.startAnimation();
-      player.onFrame(function (i) { });
-    })
-  }
-
-  function setCharts (echartDom, testDom) {
->>>>>>> e24c935307d344b19d1705f0f20916a46bc2aff7
     var myChart = echarts.init(echartDom);
     // 地图背景颜色
     var highlight = "#03b7c9";
 
-<<<<<<< HEAD
     var demoData = [
       {
         name: "平均温度",
@@ -421,33 +258,6 @@ const test61 = (function () {
           [1, "#119eff"],
         ],
       },
-=======
-    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"],
-      ],
-    },
->>>>>>> e24c935307d344b19d1705f0f20916a46bc2aff7
     ];
 
     option = {
@@ -457,7 +267,6 @@ const test61 = (function () {
         demoData.forEach(function (item) {
           result.push(
             // 外围刻度
-<<<<<<< HEAD
             {
               type: "gauge",
               center: item.pos,
@@ -581,130 +390,6 @@ const test61 = (function () {
                 width: 5,
               },
             },
-=======
-            {
-              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,
-            },
-          },
->>>>>>> e24c935307d344b19d1705f0f20916a46bc2aff7
             // 内侧指针、数值显示
             {
               name: item.name,
@@ -719,13 +404,7 @@ const test61 = (function () {
                 show: true,
                 lineStyle: {
                   width: 16,
-<<<<<<< HEAD
                   color: [[1, "rgba(75,228,255,.1)"]],
-=======
-                  color: [
-                    [1, "rgba(75,228,255,.1)"]
-                  ],
->>>>>>> e24c935307d344b19d1705f0f20916a46bc2aff7
                 },
               },
               axisTick: {
@@ -768,17 +447,11 @@ const test61 = (function () {
                 },
               },
 
-<<<<<<< HEAD
               data: [
                 {
                   value: item.value,
                 },
               ],
-=======
-              data: [{
-                value: item.value,
-              },],
->>>>>>> e24c935307d344b19d1705f0f20916a46bc2aff7
             }
           );
         });
@@ -795,8 +468,4 @@ const test61 = (function () {
     obsDom(testDom, myChart);
   }
   return test61;
-<<<<<<< HEAD
-})();
-=======
 })();
->>>>>>> e24c935307d344b19d1705f0f20916a46bc2aff7

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

@@ -6,11 +6,56 @@
   font-family: "LESLIE";
   src: url("../../font/LESLIE.TTF");
 }
-.box62 p {
+.CenterText {
   font-size: 0.25rem !important;
-  font-weight: 700;
-  color: #75e2fa;
-  font-family: "LESLIE";
+  color: #fff;
+}
+.CenterTextBg {
+  position: absolute;
+  /* top: 10; */
+  left: 30%;
+  width: 50%;
+  height: 20%;
+  text-align: center;
+  line-height: 45px;
+  border: 1px solid #4ae3ff;
+}
+.CenterTextBg2 {
+  position: absolute;
+  left: 94%;
+  top: 30%;
+  width: 90%;
+  height: 20%;
+  text-align: center;
+  line-height: 45px;
+  border: 1px solid #4ae3ff;
+}
+.CenterTextBg3 {
+  position: absolute;
+  left: 37%;
+  top: 103%;
+  width: 90%;
+  height: 20%;
+  text-align: center;
+  line-height: 45px;
+  border: 1px solid #4ae3ff;
+}
+.CenterTextBg4 {
+  position: absolute;
+  left: 37%;
+  /* top: 103%; */
+  width: 49%;
+  /* height: 20%; */
+  text-align: center;
+  line-height: 29px;
+  border: 1px solid #4ae3ff;
+}
+.hallHou {
+  position: absolute;
+  top: 40%;
+  left: 90%;
+  width: 100%;
+  font-size: 0.45rem !important;
 }
 .box62 .concent > div {
   position: absolute;
@@ -46,33 +91,46 @@
   top: 12%;
 }
 .box62 .c-left-img-two {
-  left: 15%;
-  top: 7%;
+  left: 11%;
+  top: 9%;
+}
+.OuterSuburbs {
+  text-shadow: 0 0 0.2rem rgb(85, 167, 214),0 0 0.2rem rgb(85, 167, 214),0 0 0.3rem rgb(85, 167, 214);
+  color: #fff;
+  /* font-size: 0.3rem !important; */
+}
+.hall {
+  text-shadow: 0 0 0.2rem rgb(85, 167, 214),0 0 0.2rem rgb(85, 167, 214),0 0 0.3rem rgb(85, 167, 214);
+  font-size: 0.7rem !important;
+  color: #fff;
+  position: absolute;
+  top: 50%;
+  left: -10%;
 }
 .box62 .c-center1 {
-  left: 49%;
-  top: 35%;
+  left: 46%;
+  top: 28%;
   transform: translate(-50%, -50%);
 }
 .box62 .c-center2 {
-  left: 28%;
-  top: 32%;
+  left: 21%;
+  top: 35%;
 }
 .box62 .c-center3 {
-  left: 34%;
-  top: 9%;
+  left: 31%;
+  top: 20%;
 }
 .box62 .c-center4 {
-  left: 57%;
-  top: 16%;
+  left: 62%;
+  top: 33%;
 }
 .box62 .c-center5 {
-  left: 51%;
-  top: 39%;
+  left: 44%;
+  top: 35%;
 }
 .box62 .c-center6 {
-  left: 40%;
-  top: 43%;
+  left: 31%;
+  top: 47%;
 }
 .box62 .c-r-item1 {
   right: 20%;

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

@@ -28,60 +28,54 @@
   <div class="test-box">
     <div class="concent">
       <div class="l-bg ex"></div>
-      <!-- <div class="x-bg ex"></div> -->
-
-      <div style="width: 6%" class="c-left-img-one">
-        <img src="../images/zybz/jbq拷贝3.png" alt="" />
-        <p style="color: rgb(255 199 138)">主城区县</p>
-      </div>
-      <div style="width: 5%" class="c-left-img-two">
+      <div style="width: 7%" class="c-left-img-two">
         <img src="../images/zybz/ybq拷贝2.png" alt="" />
-        <p>远郊区县</p>
+        <div class="OuterSuburbs CenterText">远郊区县</div>
       </div>
       <div class="c-center1">
-        <img src="../images/zybz/组240拷贝.png" alt="" style="width: 1660px" />
-        <p style="font-family: '庞门正道标题体'">指挥大厅</p>
+        <img src="../images/zybz/核心机房.png" alt="" style="width: w00px" />
+        <div class="OuterSuburbs hallHou">1号楼4F核心机房</div>
       </div>
       <div class="c-center2">
-        <img src="../images/zybz/icon_jifang拷贝3.png" alt="" />
-        <p>1号配线间机房</p>
+        <img src="../images/zybz/曲线 2 拷贝 2-1.png" alt="" />
+        <div class="CenterText CenterTextBg">UPS机房</div>
       </div>
       <div class="c-center3">
-        <img src="../images/zybz/icon_jifang拷贝3.png" alt="" />
-        <p>城管局UPS主供电房</p>
+        <img src="../images/zybz/曲线 2 拷贝 2.png" alt="" />
+        <div class="CenterText CenterTextBg2">1号楼9F配电间</div>
       </div>
       <div class="c-center4">
-        <img src="../images/zybz/icon_jifang拷贝3.png" alt="" />
-        <p>2号楼中心机房</p>
+        <img src="../images/zybz/曲线 2 拷贝 2-1.png" alt="" />
+        <div class="CenterText CenterTextBg3">2号楼8F中心机房</div>
       </div>
       <div class="c-center5">
         <img
-          src="../images/zybz/icon_jifang拷贝3.png"
+          src="../images/zybz/色相_饱和度 792 拷贝 7.png"
           alt=""
-          style="width: 5%"
+          style="width: 75%"
         />
-        <p>档案室库房</p>
+        <div class="hall">大厅</div>
       </div>
       <div class="c-center6">
         <img
           style="width: 49%"
-          src="../images/zybz/icon_jifang拷贝3.png"
+          src="../images/zybz/曲线 2 拷贝 2-1.png"
           alt=""
         />
-        <p>城管局网络核心机房</p>
+        <div class="CenterText CenterTextBg4">档案室</div>
       </div>
 
       <div class="c-r-item1" style="width: 5%">
         <img src="../images/zybz/hwy拷贝.png" alt="" />
-        <p>华为云</p>
+        <div class="CenterText">华为云</div>
       </div>
       <div class="c-r-item2" style="width: 6%">
         <img src="../images/zybz/xcy拷贝.png" alt="" />
-        <p style="color: rgb(255 199 138)">信创云</p>
+        <div style="color: rgb(255 199 138)" class="CenterText">信创云</div>
       </div>
       <div class="c-r-item3" style="width: 5%">
         <img src="../images/zybz/lcy拷贝.png" alt="" />
-        <p>浪潮云</p>
+        <div class="CenterText">浪潮云</div>
       </div>
     </div>
   </div>

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

@@ -56,7 +56,15 @@
   margin-bottom: 0.1rem;
   color: #c0d6f9;
 }
-
+ul li:nth-child(1) h5 {
+  color: red !important;
+}
+ul li:nth-child(2) h5 {
+  color: #f60 !important;
+}
+ul li:nth-child(3) h5 {
+  color: aqua !important;
+}
 .box9 .content li .info p {
   /* -webkit-box-orient: vertical;
     -webkit-line-clamp: 3;

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

@@ -19,7 +19,6 @@
               <img src="../images/img_01.jpg" alt="" />
             </div>
             <div class="info">
-
               <h5>重庆园博园 —— 科普盛宴，精彩纷呈</h5>
               <p>
                 确保工程质量的技术组织措施 为保证

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

@@ -1,91 +1,82 @@
-const test9 = (function() {
-
-
-
-    // 热门文章排行
-    const RankingOfPopularArticles = {
-        init() {
-          const This = this;
-            $.ajax({
-                /** url，data参数，
-                 * type请求类型，响应体结果，超时时间
-                 * 成功的回调，失败回调 */
-                url: ZQURL + '/getHotNews_Top10',
-                data: {
-                    dateType: 0
-                },
-                type: 'POST',
-                dataType: 'JSON',
-                contentType: 'application/x-www-form-urlencoded',
-                success: function(data) {
-                  console.log(data, '热门文章排行');
-
-                    if (data.success != 'true') return
-                    const {
-                        obj: dataArr
-                    } = data;
-                    if (dataArr.length == 0) {
-                      $('.test9 .box9 .content').html('暂无数据');
-                      $('.test9 .box9 .content').css({
-                        'color':'#fff'
-                      })
-                        return
-                    }
-                    This.createRankingPopularArticles(dataArr);
-                },
-                error: function() {
-                    console.log('热门文章排行超时了');
-                },
-            });
-        },
-
-        createRankingPopularArticles(dataArr) {
-            let html = '';
-            let newDataArr = dataArr.filter((item) => {
-                return item.titlepic != '' && item.summary != '';
-            })
-            newDataArr.forEach((d, i) => {
-                  html+=`
-                  <li>
-                  <div>
-                      <img src="${imgURL + d.titlepic}" alt="">
-                  </div>
-                  <div class="info">
-                      <h5>${d.title}</h5>
-                      <p>${d.summary}</p>
-                  </div>
-              </li>
-                   `
-            })
-            $('.test9 .box9 ul').html(html);
-        }
-    }
-
-    function test9(id, domTitle) {
-        if (domTitle) {
-            $('.test9 .title h2').text(domTitle)
-        }
-        $('.test9 .box').css('z-index', ++zIndex)
-        $('.test9 .box').attr('data-id', id)
-        move3('.test9 .test-box')
-        move2('.test9 .containerTool')
-
-
-
-        $('.test9 .close').click(function() {
-            $('.test9 .box').remove();
-            $('.test9 .containerTool').css('display', 'none');
-            $('.test9 .setWidth').val('')
-            $('.test9 .setHeight').val('')
-            moduleIdRemove.push(id)
-        })
-
-        eventClick('.test9');
-
-
-        RankingOfPopularArticles.init()
-
-    }
-
-    return test9
-})();
+const test9 = (function () {
+  // 热门文章排行
+  const RankingOfPopularArticles = {
+    init() {
+      const This = this;
+      $.ajax({
+        /** url，data参数，
+         * type请求类型，响应体结果，超时时间
+         * 成功的回调，失败回调 */
+        url: ZQURL + "/getHotNews_Top10",
+        data: {
+          dateType: 0,
+        },
+        type: "POST",
+        dataType: "JSON",
+        contentType: "application/x-www-form-urlencoded",
+        success: function (data) {
+          console.log(data, "热门文章排行");
+
+          if (data.success != "true") return;
+          const { obj: dataArr } = data;
+          if (dataArr.length == 0) {
+            $(".test9 .box9 .content").html("暂无数据");
+            $(".test9 .box9 .content").css({
+              color: "#fff",
+            });
+            return;
+          }
+          This.createRankingPopularArticles(dataArr);
+        },
+        error: function () {
+          console.log("热门文章排行超时了");
+        },
+      });
+    },
+
+    createRankingPopularArticles(dataArr) {
+      let html = "";
+      let newDataArr = dataArr.filter((item) => {
+        // return item.titlepic != "" && item.summary != "";
+      });
+      newDataArr.forEach((d, i) => {
+        html += `
+        <li>
+        <div>
+            <img src="${imgURL + d.titlepic}" alt="">
+        </div>
+        <div class="info">
+            <h5>${d.title}</h5>
+            <p>${d.summary}</p>
+        </div>
+    </li>
+         `;
+      });
+      $(".test9 .box9 ul").html(html);
+    },
+  };
+
+  function test9(id, domTitle) {
+    if (domTitle) {
+      $(".test9 .title h2").text(domTitle);
+    }
+    $(".test9 .box").css("z-index", ++zIndex);
+    $(".test9 .box").attr("data-id", id);
+    move3(".test9 .test-box");
+    move2(".test9 .containerTool");
+
+    $(".test9 .close").click(function () {
+      $(".test9 .box").remove();
+      $(".test9 .containerTool").css("display", "none");
+      $(".test9 .setWidth").val("");
+      $(".test9 .setHeight").val("");
+      moduleIdRemove.push(id);
+    });
+
+    eventClick(".test9");
+
+    RankingOfPopularArticles.init();
+  }
+
+  return test9;
+})();

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

@@ -1,17 +1,17 @@
-let baseURL = 'http://23.37.100.80:8088/itsm/openInterface'; // 资源保障管理专题（运维）
+let baseURL = 'http://23.37.100.87:8088/itsm/openInterface'; // 资源保障管理专题（运维）
 
 
-const FLAT_PATH_THREE = "http://23.37.100.80:8084/threeapi";
+const FLAT_PATH_THREE = "http://23.37.100.87:8084/threeapi";
 
-const ZQURL = 'http://23.37.100.80:8181/InterfaceController.asmx'; // 站群
-const imgURL = 'http://23.37.100.80:8182'; // 站群
+const ZQURL = 'http://23.37.100.87:8181/InterfaceController.asmx'; // 站群
+const imgURL = 'http://23.37.100.87:8182'; // 站群
 
-// const FLAT_PATH_THREE = "http://23.37.100.80:8084/threeapi"
-// 23.37.100.80
+// const FLAT_PATH_THREE = "http://23.37.100.87:8084/threeapi"
+// 23.37.100.87
 // 机房 - DH
-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/';
+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/';
 
 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.80:8084/basic';
+const basicUrl = 'http://23.37.100.87:8084/basic';
 // const basicUrl = "http://192.168.0.100:8084/basic";
 
-// http://23.37.100.80:8084
+// http://23.37.100.87:8084
 
 let pages = [];
 let themeId; // 主题id

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

@@ -339,7 +339,7 @@
   // 数据统计
   function sp1Ajax11() {
     $.ajax({
-    url: "http://23.37.100.80:8084" + "/basic/safetyInfor/getSafetyInfoByMonth",
+    url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getSafetyInfoByMonth",
     data: {
       orgType: 3
     },
@@ -363,7 +363,7 @@
   // 局本级门户网站
   function sp1Ajax12() {
     $.ajax({
-      url: "http://23.37.100.80:8084" + "/basic/safetyInfor/getWebSafetyStatusByOrg",
+      url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getWebSafetyStatusByOrg",
       data: {
         orgType: 3
       },
@@ -418,7 +418,7 @@
   // 终端安全态势
   function sp1Ajax14() {
     $.ajax({
-      url: "http://23.37.100.80:8084" + "/basic/OfficeVirus/getOfficeSafetyInfo",
+      url: "http://23.37.100.87:8084" + "/basic/OfficeVirus/getOfficeSafetyInfo",
       data: {
         orgType: 3
       },
@@ -455,7 +455,7 @@
   let sp1flag = false;
   function sp1Ajax15() {
     $.ajax({
-      url: "http://23.37.100.80:8084" + "/basic/AttackType/getTopAttackType",
+      url: "http://23.37.100.87:8084" + "/basic/AttackType/getTopAttackType",
       data: {
         orgType: 3
       },
@@ -491,7 +491,7 @@
   // 应急保障组成员信息
   function sp1Ajax17() {
     $.ajax({
-      url: "http://23.37.100.80:8084" + "/basic/GuaranteeGroup/getAllGuaranteeGroup",
+      url: "http://23.37.100.87: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

@@ -371,7 +371,7 @@
     // 数据统计
     function sp3Ajax18() {
       $.ajax({
-        url: "http://23.37.100.80:8084" + "/basic/safetyInfor/getSafetyInfoByMonth",
+        url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getSafetyInfoByMonth",
         data: {
             orgType: 2
         },
@@ -390,7 +390,7 @@
 
 function sp3Ajax19() {
   $.ajax({
-        url: "http://23.37.100.80:8084" + "/basic/safetyInfor/getRiskInfoByOrg",
+        url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getRiskInfoByOrg",
         data: {
             orgType: 2
         },
@@ -442,7 +442,7 @@ function sp3Ajax19() {
     //  漏洞趋势
     function myAjax1() {
         $.ajax({
-            url: "http://23.37.100.80:8084" +
+            url: "http://23.37.100.87:8084" +
                 "/basic/SystemRisk/analyzeSystemRiskByMonth",
             data: {},
             success: function(res) {
@@ -464,7 +464,7 @@ function sp3Ajax19() {
     //   业务系统
 function sp3Ajax21() {
   $.ajax({
-        url: "http://23.37.100.80:8084" + "/basic/safetyInfor/getSysStatusByOrg",
+        url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getSysStatusByOrg",
         data: {
             orgType: 2
         },
@@ -486,7 +486,7 @@ function sp3Ajax21() {
     let flag22 = false;
     function sp3Ajax22() {
       $.ajax({
-        url: "http://23.37.100.80:8084" + "/basic/SystemRisk/getHighStatus",
+        url: "http://23.37.100.87:8084" + "/basic/SystemRisk/getHighStatus",
         data: {
             orgType: 2,
             Status: 1
@@ -527,7 +527,7 @@ function sp3Ajax21() {
     //   高危业务系统趋势
     function myAjax2() {
         $.ajax({
-            url: "http://23.37.100.80:8084" + "/basic/SystemRisk/getHighStatusByMonth",
+            url: "http://23.37.100.87:8084" + "/basic/SystemRisk/getHighStatusByMonth",
             data: {
                 orgType: 2
             },
@@ -547,7 +547,7 @@ function sp3Ajax21() {
     //   攻击事件类型
     function myAjax3() {
         $.ajax({
-            url: "http://23.37.100.80:8084" + "/basic/AttackEvent/getAttackEventByInfo",
+            url: "http://23.37.100.87:8084" + "/basic/AttackEvent/getAttackEventByInfo",
             data: {
                 orgType: 2
             },

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

@@ -264,7 +264,7 @@
     // 数据统计
     function sp4Ajax25() {
       $.ajax({
-        url: "http://23.37.100.80:8084" + "/basic/safetyInfor/getSafetyInfoByMonth",
+        url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getSafetyInfoByMonth",
         data: {
             orgType: 1
         },
@@ -295,7 +295,7 @@
     let flag26 = false;
     function sp4Ajax26() {
       $.ajax({
-        url: "http://23.37.100.80:8084" + "/basic/safetyInfor/getRiskInfoByOrg",
+        url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getRiskInfoByOrg",
         data: {
             orgType: 1
         },
@@ -344,7 +344,7 @@
     }, 60*1000);
     function sp4Ajax27() {
       $.ajax({
-        url: "http://23.37.100.80:8084" + "/basic/RiskType/getSysRiskType",
+        url: "http://23.37.100.87:8084" + "/basic/RiskType/getSysRiskType",
         data: {
             orgType: 1,
             riskClassify: 1
@@ -377,7 +377,7 @@
     // 业务系统
     function sp4Ajax28() {
     $.ajax({
-        url: "http://23.37.100.80:8084" + "/basic/safetyInfor/getSysStatusByOrg",
+        url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getSysStatusByOrg",
         data: {
             orgType: 1
         },
@@ -409,7 +409,7 @@
     // 攻击拦截类型
     function sp4Ajax29() {
       $.ajax({
-        url: "http://23.37.100.80:8084" + "/basic/AttackType/getAttackTypeByMonth",
+        url: "http://23.37.100.87:8084" + "/basic/AttackType/getAttackTypeByMonth",
         data: {
             orgType: 1
         },
@@ -445,7 +445,7 @@
     let flag30 = false;
     function sp4Ajax30() {
       $.ajax({
-        url: "http://23.37.100.80:8084" + "/basic/SystemAttacked/getSystemAttackedByInfo",
+        url: "http://23.37.100.87:8084" + "/basic/SystemAttacked/getSystemAttackedByInfo",
         data: {
             orgType: 1
         },