Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

ruoyi-ui/src/App.vue

@@ -50,7 +50,6 @@ export default {
 </script>
 
 <style>
-
 @font-face {
   font-family: "YouSheBiaoTiHei";
   src: url("/static/fonts/优设标题黑.ttf");
@@ -61,5 +60,8 @@ export default {
   src: url("/static/fonts/庞门正道标题体.ttf");
 }
 
-
+@font-face {
+  font-family: "PangMenZhengDao-3";
+  src: url("/static/fonts/庞门正道标题体3.ttf");
+}
 </style>

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/index.vue

@@ -255,8 +255,8 @@ export default {
           position: absolute;
           top: 50px;
           font-size: 18px;
-          font-family: Hiragino Sans GB, Hiragino Sans GB;
+          font-family: 'Hiragino Sans GB', 'Hiragino Sans GB';
-          font-weight: normal;
+          font-weight: 600;
           color: #3de8ff;
           text-shadow: 0px 1px 2px rgba(23, 147, 227, 0.58);
         }
@@ -269,7 +269,7 @@ export default {
           // left: 50px;
           margin: auto;
           font-size: 12px;
-          font-family: Hiragino Sans GB, Hiragino Sans GB;
+          font-family: 'Hiragino Sans GB', 'Hiragino Sans GB';
           font-weight: normal;
           color: #ffffff;
         }
@@ -305,7 +305,10 @@ export default {
           font-size: 16px;
           font-family: PangMenZhengDao-3, PangMenZhengDao-3;
           font-weight: 400;
-          color: #ffcd4d;
+          color: #FFCD4D;
+          text-align: left;
+          font-style: normal;
+          text-transform: none;
         }
       }
     }
@@ -519,7 +522,7 @@ export default {
             width: 220px;
             text-align: right;
             font-size: 12px;
-            font-family: Hiragino Sans GB, Hiragino Sans GB;
+            font-family: 'Hiragino Sans GB', 'Hiragino Sans GB';
             color: #fff;
             line-height: 40px;
             letter-spacing: 7px;
@@ -528,7 +531,7 @@ export default {
           .value {
             flex: 1;
             width: 0;
-            font-family: Hiragino Sans GB, Hiragino Sans GB;
+            font-family: 'Hiragino Sans GB', 'Hiragino Sans GB';
             line-height: 40px;
             text-align: center;