yhd hace 3 años
padre
commit
b578dbdf66
Se han modificado 19 ficheros con 143 adiciones y 78 borrados
  1. 5 14
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test10/test10.css
  2. 2 1
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test3/test3.css
  3. 1 1
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test32/test32.css
  4. 2 1
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test33/test33.js
  5. 18 3
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test35/test35.js
  6. 4 0
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test36/test36.js
  7. 17 24
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test43/test43.js
  8. 4 3
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test44/test44.js
  9. 3 11
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test45/test45.css
  10. 2 2
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test45/test45.html
  11. 1 1
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test45/test45.js
  12. 2 2
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test49/test49.html
  13. 7 7
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test50/test50.js
  14. 1 1
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test51/test51.html
  15. 23 4
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test61/test61.css
  16. 2 2
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test61/test61.html
  17. 1 1
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test61/test61.js
  18. 25 0
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/css/coom.css
  19. 23 0
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/main/css/main.css

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

@@ -1,16 +1,7 @@
-#demo a {
-  margin: 0.15rem;
-  width: 28%;
-  float: right;
-  margin-top: 5%;
+.box10 .inner a {
+  display: inline-block;
+  margin: 0.12rem;
 }
-#demo {
-  overflow: hidden;
-  width: 100%;
-  height: 100%;
-  /* margin-top: 5%; */
-}
-#demo img {
-  display: block;
-  /* width: 1.75rem; */
+.box10 .inner a img {
+  width: 1.7rem;
 }

+ 2 - 1
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test3/test3.css

@@ -22,6 +22,7 @@
 }
 .overall ul li .info {
   margin-right: 0.24rem;
+  margin-top: 0.06rem;
 }
 .overall ul li p {
   font-size: 0.22rem;
@@ -30,7 +31,7 @@
   color: #677ea1;
 }
 .overall ul li .num {
-  font-size: 0.25rem !important;
+  font-size: 0.28rem !important;
   font-family: "LESLIE";
   font-weight: 400;
 }

+ 1 - 1
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test32/test32.css

@@ -54,7 +54,7 @@
 .box32 .right .info span {
   font-size: 0.12rem !important;
   margin: 0.04rem 0.08rem;
-  color: #707438;
+  color: #ee8a08;
   /* text-shadow: 0 0 50px #fff; */
 }
 .box32 .right .info span{

+ 2 - 1
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test33/test33.js

@@ -138,10 +138,11 @@ const test33 = (function() {
                 hoverAnimation: false,
                 label: {
                     normal: {
-                        show: true,
+                        show: false,
                         position: "center",
                         formatter: "{b}\n{c}",
                         textStyle: {
+
                              fontSize: 120,
                             fontWeight: "bold",
                             color: "#fff",

+ 18 - 3
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test35/test35.js

@@ -18,12 +18,13 @@ const test35 = (function() {
 
         eventClick('.test35');
 
+        // 漏洞趋势
         $.ajax({
             url: basicUrl +
                 "/SystemRisk/analyzeSystemRiskByMonth",
             data: {},
             success: function(res) {
-                console.log(res);
+                console.log('漏洞趋势',res);
                 let bac = res.result;
                 const dists = document.querySelectorAll(".test35 .floor-dist");
                 const testDoms = document.querySelectorAll(".test35 .box");
@@ -33,7 +34,7 @@ const test35 = (function() {
                 }
             },
             error: function(err) {
-                console.log("------------------------超时");
+                console.log("--------漏洞趋势----------------超时");
             },
         });
 
@@ -53,13 +54,26 @@ const test35 = (function() {
         let option = {
             tooltip: {
                 trigger: "axis",
+                padding: [0, 80, 0, 10],
+                lineHeight: 125,
+                // padding:100,
+                // formatter:'{b}<br>{c}{a}'
+                formatter:function (arg) {
+                  let str = ''
+                  for (let i = 0; i < arg.length; i++) {
+                    str+= `${arg[i].seriesName} ${arg[i].axisValue} ${arg[i].value}<br><br>`
+                  }
+                  return str
+                  
+                  
+                }
             },
             legend: {
                 top: "0%",
                 data: ["高风险", "中风险", "低风险", "直接访问", "搜索引擎"],
                 textStyle: {
                     color: "rgba(255,255,255,.5)",
-                    fontSize: "80",
+                    fontSize: "130",
                     //   80
                 },
             },
@@ -165,6 +179,7 @@ const test35 = (function() {
                         color: "#0184d5",
                         borderColor: "rgba(221, 220, 107, .1)",
                         borderWidth: 12,
+
                     },
                     data: countHighRiskArr,
                 },

+ 4 - 0
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test36/test36.js

@@ -201,11 +201,15 @@ const test36 = (function() {
                     axisLine: {
                         lineStyle: {
                             color: "rgb(2,185,208)",
+                            fontSize: 116,
+                            fontWeight: "bold",
                         },
                     },
                     axisLabel: {
                         textStyle: {
                             color: "rgb(2,185,208)",
+                            fontSize: 116,
+                            fontWeight: "bold",
                         },
                         formatter: (value, index) => {
                             if (value === 0 || value === 50 || value === 100) {

+ 17 - 24
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test43/test43.js

@@ -28,16 +28,16 @@ const test43 = (function() {
             getListsData(id);
             getDatileData(id);
             setTimeout(() => {
-                setChartsDom(document.querySelector('.charts1'))
-            }, 500);
+                setChartsDom(document.querySelector('.charts1'),0)
+            }, 500);  
 
             setTimeout(() => {
-                setChartsDom(document.querySelector('.charts2'))
+                setChartsDom(document.querySelector('.charts2'),0)
             }, 1000);
 
 
             setTimeout(() => {
-                setChartsDom(document.querySelector('.charts3'))
+                setChartsDom(document.querySelector('.charts3'),0)
             }, 1500);
         })
 
@@ -181,6 +181,19 @@ const test43 = (function() {
                 const data2 = arr[0].data[1];
                 const data3 = arr[0].data[2];
                 console.log('获取单个资源的详细信息', data1, data2, data3, arr);
+
+              //   setTimeout(() => {
+              //     setChartsDom(document.querySelector('.charts1'),data1)
+              // }, 500);
+  
+              // setTimeout(() => {
+              //     setChartsDom(document.querySelector('.charts2'),data2)
+              // }, 1000);
+  
+  
+              // setTimeout(() => {
+              //     setChartsDom(document.querySelector('.charts3'),data3)
+              // }, 1500);
             },
             error: function(err) {
                 console.log('获取单个资源的详细信息超时');
@@ -248,26 +261,6 @@ const test43 = (function() {
                                 )
                             ]
                         ],
-                        // color: [
-                        //     [0.3, '#00ed03'],
-                        //     [0.7, '#ffb800'],
-                        //     [1, '#af00a9']
-                        // ]
-                        /*color: [
-                            [1, new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-                                    offset: 0.3,
-                                    color: "#00ed03"
-                                },
-                                {
-                                    offset: 0.7,
-                                    color: "#ffb800"
-                                },
-                                {
-                                    offset: 1,
-                                    color: "#af00a9"
-                                }
-                            ])]
-                        ]*/
                     }
                 },
                 // radius: '50%',

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

@@ -65,7 +65,7 @@ const test44 = (function () {
           axisLabel: {
             show: true,
             color: "#fff",
-            fontSize: 100,
+            fontSize: 150,
             distance: -50,
             formatter: function (v) {
               return v;
@@ -139,7 +139,7 @@ const test44 = (function () {
             textStyle: {
               fontWeight: "bold",
               color: "#0ab7ff",
-              fontSize: 100,
+              fontSize: 120,
             },
           },
           //仪表盘详情,用于显示数据。
@@ -148,7 +148,8 @@ const test44 = (function () {
             offsetCenter: [0, "-40%"],
             color: "#ffffff",
             textStyle: {
-              fontSize: 120,
+              fontSize: 180,
+              fontWeight: "bold",
               color: "#4aca96",
             },
           },

+ 3 - 11
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test45/test45.css

@@ -2,11 +2,9 @@
   overflow: hidden;
 }
 .box45 .content {
-  margin: 0;
-  width: 90%;
-  height: 90%;
-  margin-top: 2%;
-  margin-left: 6%;
+  margin: 0 auto;
+  width: 98%;
+  height: 93%;
 }
 .box45 .left,
 .box45 .right {
@@ -75,9 +73,3 @@
 .box45 .success {
   background-color: #4162ce;
 }
-.box45 .commonly {
-  background-color: #66650c;
-}
-.box45 .commonly {
-  background-color: #66650c;
-}

+ 2 - 2
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test45/test45.html

@@ -11,7 +11,7 @@
     <div class="test-box">
         <div class="content">
             <!-- 漏洞数据 -->
-            <table id="stuTable" class="table">
+            <table id="stuTable" class="table newTable">
                 <thead>
                     <tr>
                         <th>资源名称</th>
@@ -23,7 +23,7 @@
                 <tbody>
                     <tr>
                         <td>OA和运维监控平台</td>
-                        <td class="serious level">严重</td>
+                        <td class="level"><span class="serious">严重</span></td>
                         <td>2022年1月13日 14:36:29</td>
                         <td>资源连接失败</td>
                     </tr>

+ 1 - 1
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test45/test45.js

@@ -73,7 +73,7 @@ const test45 = (function() {
             }
             str += `<tr>
             <td>${data.RES_NAME}</td>
-            <td class='${cn} level'>${leve}</td>
+            <td class='level'><span class=${cn}>${leve}</span></td>
             <td>${getDateString(data.ALARM_DATE)}</td>
             <td>${data.ALARM_CONTENT}</td>
             </tr>`

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

@@ -15,7 +15,7 @@
               <div class="title">
                   <span>业务统计A</span>
               </div>
-              <table id="stuTable" class="table">
+              <table id="stuTable" class="table newTable">
                   <thead>
                       <tr>
                           <th>系统名称</th>
@@ -75,7 +75,7 @@
               <div class="title">
                   <span>业务统计B</span>
               </div>
-              <table id="content-stuTable" class="table">
+              <table id="content-stuTable" class="table newTable">
                   <thead>
                       <tr>
                           <th>系统名称</th>

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

@@ -638,7 +638,7 @@ const test50 = (function () {
       });
 
       roomIndex = $(this).index();
-      // roomIndex = 9;
+      roomIndex = 9;
       if (roomIndex === 0) {
         $(".roomThree62").css("visibility", "inherit");
         $(".roomThree63").css("visibility", "hidden");
@@ -668,12 +668,12 @@ const test50 = (function () {
         $(".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();
+        // $('.roomThree62').css('visibility', 'hidden');
+        // $('.roomThree63').css('visibility', 'hidden');
+        // $('.roomThree64').css('visibility', 'hidden');
+        // $('.roomThree65').css('visibility', 'hidden');
+        // $('.roomThree66').css('visibility', 'inherit');
+        // module66();
       }
       $(".sf5").slideToggle();
     });

+ 1 - 1
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test51/test51.html

@@ -10,7 +10,7 @@
     </div>
     <div class="test-box">
         <div class="content">
-            <table id="stuTable" class="table">
+            <table id="stuTable" class="table newTable">
                 <thead>
                     <tr>
                         <th>序号</th>

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

@@ -256,18 +256,22 @@
   content: "";
     width: 0;
     height: 0;
+    display: inline-block;
     border-top: 50px solid transparent;
-    border-right: 100px solid red;
+    border-right: 50px solid #00dcffc4;
     border-bottom: 50px solid transparent;
+    margin-left: 100px;
 }
 
 .number-box::before{
+    display: inline-block;
     content: "";
     width: 0;
     height: 0;
     border-top: 50px solid transparent;
-    border-left: 100px solid red;
+    border-left: 50px solid #00dcffc4;
     border-bottom: 50px solid transparent;
+    margin-right: 100px;
 }
 
 .Popup-name {
@@ -308,12 +312,27 @@
 }
 
 .box61 #stuTable thead tr th:nth-child(1){
-  padding-left: 8%;
+  padding-left: 3%;
 }
 
 .box61 #stuTable thead tr th:nth-child(2){
   position: relative;
-  left: 6%;
+  left: 4%;
+}
+
+.box61 #stuTable thead tr th:nth-child(3){
+  position: relative;
+  left: 2%;
+}
+
+
+/* 偶 */
+.box61 tbody tr:nth-child(2n){  
+  background-color: #1c538ce6;
+}
+/* 奇 */
+.box61 tbody tr:nth-child(2n+1){
+  background-color: #1c538c63;
 }
 
 

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

@@ -69,7 +69,7 @@
     </div>
     <!-- 感染病毒详情弹窗 -->
     <div class="Popup hiddenScroll" style="display: none">
-      <div class="Popup-name">市环卫中心<span class="close-Popup">X</span></div>
+      <div class="Popup-name"><span>市环卫中心</span><span class="close-Popup">X</span></div>
       <div class="tablebox hiddenScroll">
         <table id="stuTable" class="table">
           <thead>
@@ -99,7 +99,7 @@
           </tbody>
         </table>
       </div>
-      <div class="number-box" style="display: none;">病毒感染总数:<span>5</span>台</div>
+      <div class="number-box">病毒感染总数:<span>5</span>台</div>
     </div>
   </div>
   <div class="panel-footer"></div>

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

@@ -72,7 +72,7 @@ const test61 = (function() {
         let popFlag = false;
         $(".test61 .left-box-three").click(function() {
           const tit = $(this).find('.left-box-one-title').html();
-          $('.Popup-name').text(tit);
+          $('.Popup-name span').eq(0).text(tit);
           const id = +$(this).attr('data-id');
           $.ajax({
             url: basicUrl +

+ 25 - 0
spring-cloud/server-page/src/main/resources/static/testEcharts/test/css/coom.css

@@ -445,3 +445,28 @@ th {
 .progress span span {
   opacity: 0;
 }
+
+
+
+
+
+
+
+
+
+.newTable#stuTable td,.box51 #stuTable th{
+  white-space: nowrap;
+  flex: 1;
+  width: 600px;
+  overflow: hidden;
+  text-indent: 150px;
+  text-overflow: ellipsis;
+}
+
+
+.newTable#stuTable tr{
+  height: 0.3rem;
+  line-height: 0.3rem;
+  display: flex;
+  align-items: center;
+}

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

@@ -720,12 +720,35 @@ ul.subject li .previewBox {
     width: 4rem;
     height: 90%;
     margin-top: 0.3rem;
+    overflow: auto;
 }
 
 .detailsToos .detail-container .item:hover {
     background-color: #0011ff6c;
 }
 
+
+.detail-container::-webkit-scrollbar {
+  /*滚动条整体样式*/
+  width: 20px;
+  /*高宽分别对应横竖滚动条的尺寸*/
+  height: 20px;
+}
+
+.detail-container::-webkit-scrollbar-thumb {
+  /*滚动条里面小方块*/
+  border-radius: 0.2rem;
+  box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+  background: rgba(70, 116, 214, 0.452);
+}
+
+.detail-container::-webkit-scrollbar-track {
+  /*滚动条里面轨道*/
+  box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+  border-radius: 10px;
+  background: #ededed;
+}
+
 .detailsToos .detail-container .list {
     height: 90%;
 }