统计页面调整

eden-authcenter-agent/src/main/resources/static/css/ds.css

-html {
-  height: 100vh;
+html, body {
+  height: 100%;
+  overflow: hidden;
 }
 .ds {
   max-width: 1900px;
@@ -11,6 +12,7 @@ html {
   margin: 2vh 0;
   margin-left: 10%;
   height: 5vh;
+  max-height: 40px;
 }
 .ds-content {
   width: 100%;
@@ -47,21 +49,24 @@ html {
   margin-top: 3%;
 }
 .ds-content-source {
-  display: flex;
+  /* display: flex; */
   max-width: 1000px;
   margin: 0 auto;
   height: calc(100% - 100px);
 }
 .ds-content-city {
-  flex-basis: 400px;
+  /* flex-basis: 400px; */
+  float: left;
+  width: 35%;
   padding-right: 10px;
   height: 100%;
-  flex-grow: 1;
+  /* flex-grow: 1;
   display: flex;
-  justify-content: flex-end;
+  justify-content: flex-end; */
 }
 .ds-content-city-float {
   width: 300px;
+  margin-left: auto;
 }
 .ds-content-city-float > p {
   width: 90px;
@@ -74,8 +79,10 @@ html {
   margin-left: 10px;
 }
 .ds-content-district {
-  flex-basis: 600px;
-  flex-grow: 2;
+  float: left;
+  width: 58%;
+  /* flex-basis: 600px;
+  flex-grow: 2; */
   height: 100%;
   margin-left: 10px;
 }
@@ -137,6 +144,7 @@ html {
   margin-bottom: 8px;
 }
 .ds-divide-line {
+  float: left;
   width: 2px;
   margin: 10px 20px;
   height: 40vh;
@@ -170,13 +178,14 @@ html {
     font-size: 20px;
   }
   .ds-content-city {
-    flex-basis: 350px;
+    /* flex-basis: 350px; */
     padding-right: 0;
     height: 100%;
-    flex-grow: 1;
+    min-width: 210px;
+    /* flex-grow: 1; */
   }
   .ds-content-city-float {
-    width: 220px;
+    width: 210px;
   }
   .ds-content-city-float > p {
     font-size: 16px;
@@ -184,7 +193,7 @@ html {
     margin: 6px 5px;
   }
   .ds-content-district {
-    flex-grow: 1;
+    /* flex-grow: 1; */
     margin: 0 auto;
   }
   .ds-content-district > p {
@@ -219,20 +228,17 @@ html {
     font-size: 25px;
   }
   .ds-content-city {
-    flex-basis: 400px;
     padding-right: 0;
     height: 100%;
-    flex-grow: 1;
   }
   .ds-content-city-float {
     width: 100%;
-    float: none;
   }
   .ds-content-city-float > p {
     font-size: 18px;
   }
   .ds-content-district {
-    flex-grow: 1;
+    /* flex-grow: 1; */
     margin: 0 auto;
   }
   .ds-content-district > p {
@@ -250,10 +256,10 @@ html {
     font-size: 25px;
   }
   .ds-content-city {
-    flex-basis: 400px;
+    /* flex-basis: 400px; */
     padding-right: 10px;
     height: 100%;
-    flex-grow: 1;
+    /* flex-grow: 1; */
   }
   .ds-content-city-float {
     width: 300px;
@@ -262,7 +268,7 @@ html {
     font-size: 18px;
   }
   .ds-content-district {
-    flex-grow: 1;
+    /* flex-grow: 1; */
     margin: 0 auto;
   }
   .ds-content-district > p {

eden-authcenter-agent/src/main/resources/static/css/statistics.css

@@ -10,14 +10,12 @@ body {
   background-color: white;
   align-items: center;
   justify-content: space-between;
-}
-.flex {
-  /* flex: 1; */
+  padding: 5px 0;
 }
 .statistics-content {
   margin: 6px 6px;
   display: flex;
-  height: calc(100vh - 80px);
+  height: calc(100vh - 90px);
 }
 .statistics-content-item {
   background-color: white;
@@ -31,24 +29,40 @@ body {
   height: 60%;
 }
 .statistics-content-item-title {
-  padding: 20px 0 0 20px;
+  padding: 12px 0 0 20px;
   font-size: 14px;
+  color: #777c82;
+}
+.statistics-content-item-title-remark {
+  float: right;
+  margin-right: 20px;
 }
 .nums-total {
   width: 140px;
-  height: 70px;
+  height: 91px;
   display: inline-block;
   background-size: cover !important;
   font-size: 12px;
 }
 .nums-title {
   color: white;
-  margin: 10px 10px;
+  margin: 20px 10px 10px 10px;
+  font-weight: 700;
+}
+.nums-title-num {
+  color: white;
+  margin: 0px 10px 20px 10px;
   font-weight: 700;
 }
 .nums-total-nums {
-  font-size: 18px;
+  font-size: 22px;
 }
 .idp-total-nums {
   color: rgb(77, 160, 255);
+}
+.nums-by-idp {
+  width: 100%;
+  padding: 8px 20px 0 20px;
+  display: flex;
+  justify-content: space-between;
 }
\ No newline at end of file

eden-authcenter-agent/src/main/resources/templates/statistics.html

@@ -127,8 +127,8 @@
         <div class="statistics-content-item item-height-higher">
           <p class="statistics-content-item-title">认证热点单位<span class="statistics-content-item-title-remark">单位：人次</span>
           </p>
-          <div id="user-org" style="height: calc(100% - 40px)">
-            <p style="padding: 6px 20px 0 20px; color: #5f646a; font-size: 12px; line-height: 1.8;" v-for="item in userOrgList"><span
+          <div id="user-org" style="height: calc(100% - 40px); margin-top: 8px;">
+            <p style="padding: 5px 20px 0 20px; color: #5f646a; font-size: 12px; line-height: 1.8;" v-for="item in userOrgList"><span
                 style="color: orange; font-weight: 900; padding-right: 8px;">·</span><span v-text="item.name"></span><span
                 style="float: right;" v-text="item.count">次</span></p>
           </div>
@@ -229,7 +229,7 @@
             },
             legend: {
               icon: "circle",
-              bottom: 10,
+              bottom: 0,
               data: ["数字教材", "阅览室", "其他"]
             },
             series: [
@@ -237,11 +237,9 @@
                 name: "应用来源",
                 type: "pie",
                 radius: ["40%", "60%"],
-                center: ["50%", "42%"],
+                center: ["50%", "48%"],
                 label: {
                   position: 'outside',
-                  alignTo: 'edge',
-                  margin: 10,
                   formatter: "{per|{d}%}",
                   rich: {
                     per: {
@@ -603,7 +601,7 @@
             },
             legend: {
               icon: "circle",
-              bottom: 10,
+              bottom: 0,
               data: []
             },
             series: [
@@ -611,11 +609,9 @@
                 name: "访客身份",
                 type: "pie",
                 radius: ["30%", "50%"],
-                center: ["50%", "40%"],
+                center: ["50%", "48%"],
                 label: {
                   position: 'outside',
-                  alignTo: 'edge',
-                  margin: 10,
                   formatter: "{per|{d}%}",
                   rich: {
                     per: {