15902849627 4 months ago
parent
commit
e08e673766

+ 1 - 1
public/public.json

@@ -1,3 +1,3 @@
 {
-    "api": "http://10.10.10.108:9501"
+    "api": "https://saas.sckaiwu.cn/api"
 }

+ 35 - 28
src/components/page/Dashboard.vue

@@ -29,7 +29,7 @@
                                     <div :class="current1 == 2 ? 'btn1' : 'btn2'" style="position:relative;left:-6px"
                                         @click="current1 = 2">铲车</div>
                                 </div>
-                                <div class="title1">物流铲车司机排行榜 </div>
+                                <div class="title1 fontYH">物流铲车司机排行榜 </div>
                                 <div class="scroll_table">
                                     <div class="thead flex">
                                         <div class="th" style="width: 20%;padding-left: 10px;">排名</div>
@@ -95,13 +95,13 @@
                         <div class="left_charts newLeftdivitem" style="margin-left: 20px;">
                             <div class="leftdivitem leftdivitem1">
                                 <div class="leftdivitemchild">
-                                    <div class="title2">场内拥堵率</div>
+                                    <div class="title2 fontYH">场内拥堵率</div>
                                     <div class="pie pie1">
                                         <Charts :eOption="pie" v-if="pie" style="height: 207px" />
                                     </div>
                                 </div>
                                 <div class="leftdivitemchild">
-                                    <div class="title2">场内异常率</div>
+                                    <div class="title2 fontYH">场内异常率</div>
                                     <div class="pie pie2">
                                         <Charts :eOption="pie2" v-if="pie2" style="height: 207px" />
                                     </div>
@@ -109,7 +109,7 @@
                             </div>
                             <div class="leftdivitem leftdivitem1" style="">
                                 <div class="leftdivitemchild">
-                                    <div class="title2">潜在接单司机</div>
+                                    <div class="title2 fontYH">潜在接单司机</div>
                                     <Charts :eOption="bing" v-if="bing" style="height:250px" />
                                 </div>
                                 <div class="leftdivitemchild">
@@ -117,7 +117,7 @@
                                 </div>
                             </div>
                             <div class="leftdivitem " style="padding: 14px 30px;">
-                                <div class="title2">近30天出货量</div>
+                                <div class="title2 fontYH">近30天出货量</div>
                                 <div>
                                     <Charts :eOption="line" v-if="line" style="height: 250px"></Charts>
                                 </div>
@@ -129,7 +129,7 @@
 
                         <div class="mid">
                             <div class="topChart flex">
-                                <div class="toptitle">今日概况</div>
+                                <div class="toptitle fontYH">今日概况</div>
                                 <div class="num_item" v-for="(item, i) in topChartList" :key="i">
                                     <div class="num_title"> <img src="../../assets/newimg/s.png" alt=""> {{ item.title
                                         }}</div>
@@ -140,7 +140,7 @@
                                 </div>
                             </div>
                             <div class="midMap">
-                                <div class="toptitle">矿区地图</div>
+                                <div class="toptitle fontYH">矿区地图</div>
                                 <div style="height: 100%;border-radius:20px;overflow: hidden;">
                                     <amap :zoom="6" :marker="Weighbridge" :center="center" @map-loaded="onMapLoaded">
                                     </amap>
@@ -151,7 +151,7 @@
                         <div class="right">
                             <div class="right_content">
                                 <div class="rightcontent1">
-                                    <div class="title2">地磅数据统计</div>
+                                    <div class="title2 fontYH">地磅数据统计</div>
                                     <div class="btnGroup2">
                                         <div :class="current2 == 1 ? 'btn1' : 'btn2'" @click="current2 = 1">按月计算</div>
                                         <div :class="current2 == 2 ? 'btn1' : 'btn2'" @click="current2 = 2"
@@ -189,8 +189,8 @@
                                     </div>
                                     <div class="detail">
                                         <div class="btnGroup">
-                                            <div :class="current3 == 1 ? 'btn1' : 'btn2'" @click="current3 = 1">今日</div>
-                                            <div :class="current3 == 2 ? 'btn1' : 'btn2'" @click="current3 = 2">本月</div>
+                                            <div :class="current3 == 1 ? 'btn1' : 'btn2'" @click="current3 = 1" class="fontYH">今日</div>
+                                            <div :class="current3 == 2 ? 'btn1' : 'btn2'" @click="current3 = 2" class="fontYH">本月</div>
                                         </div>
                                         <div class="aa a1">
                                             <p>{{ current3 == 1 ? "今日" : "本月" }}总量/吨</p>
@@ -214,7 +214,7 @@
                                     </div>
                                 </div>
                                 <div class="rightcontent2">
-                                    <div class="title1">异常过磅车辆数据库</div>
+                                    <div class="title1 fontYH">异常过磅车辆数据库</div>
                                     <div class="scroll_table">
                                         <div class="thead flex">
                                             <div class="th" style="width: 20%;padding-left: 10px;">地磅名称</div>
@@ -254,7 +254,7 @@
                             <div class="right_content">
 
                                 <div class="rightcontent2">
-                                    <div class="title2">过磅记录数据库</div>
+                                    <div class="title2 fontYH">过磅记录数据库</div>
                                     <div class="list" style="overflow: hidden;margin-top: 17px;">
                                         <vue-seamless-scroll :data="overweightRecord" class="seamless-warp"
                                             style="height: 820px;" :class-option="{
@@ -673,6 +673,10 @@ export default {
     font-family: MFLiHei;
     src: url('./font/MFLiHei_Noncommercial-Regular.otf') format('opentype');
 }
+@font-face {
+    font-family: yihei;
+    src: url('./font/yihei.ttf') format('opentype');
+}
 
 @font-face {
     font-family: FXLed;
@@ -682,6 +686,9 @@ export default {
 .fontMF {
     font-family: MFLiHei;
 }
+.fontYH {
+    font-family: yihei !important;
+}
 
 .fontFx {
     font-family: FXLed;
@@ -723,7 +730,7 @@ export default {
             height: 31px;
             font-family: MFLiHei;
             font-weight: 400;
-            font-size: 16px;
+            font-size: 18px;
             color: #FFFFFF;
             line-height: 30px;
             padding-left: 20px;
@@ -738,7 +745,7 @@ export default {
             height: 31px;
             font-family: MFLiHei;
             font-weight: 400;
-            font-size: 16px;
+            font-size: 18px;
             color: #FFFFFF;
             line-height: 30px;
             padding-left: 20px;
@@ -1003,7 +1010,7 @@ export default {
                         margin-top: 9px;
 
                         .num_title {
-                            font-size: 14px;
+                            font-size: 18px;
                             font-weight: 500;
                             color: #ffffff;
                             line-height: 18px;
@@ -1025,7 +1032,7 @@ export default {
                                 background-image: url(https://ore-1302260927.cos.ap-chengdu.myqcloud.com/data_screen/image/num_bg.png);
                                 background-repeat: no-repeat;
                                 background-size: 100% 100%;
-                                font-size: 30px;
+                                font-size: 35px;
                                 font-weight: normal;
                                 color: #fffffe;
                                 padding: 4px;
@@ -1142,15 +1149,15 @@ export default {
                                     }
 
                                     p {
-                                        font-size: 12px;
+                                        font-size: 14px;
                                         color: #fff;
                                         line-height: 20px;
                                         margin: 0;
                                         text-align: left;
-                                        width: 180px;
+                                        width: 220px;
 
                                         span {
-                                            width: 60px;
+                                            width: 80px;
                                             display: inline-block;
                                             text-align: right;
                                         }
@@ -1158,7 +1165,7 @@ export default {
 
                                     p.tt {
                                         font-weight: bold;
-                                        font-size: 12px;
+                                        font-size: 16px;
                                         color: #01FFFF;
                                         line-height: 20px;
                                         margin-bottom: 13px;
@@ -1319,14 +1326,14 @@ export default {
                                 div {
                                     width: 50%;
                                     text-align: center;
-                                    font-size: 12px;
-                                    padding-top: 35px;
+                                    font-size: 14px;
+                                    padding-top: 30px;
                                 }
 
                                 p:first-child {
                                     font-family: FXLed;
                                     font-weight: normal;
-                                    font-size: 24px;
+                                    font-size: 29px;
                                     color: #FFFFFF;
                                     margin-bottom: 0;
                                 }
@@ -1346,14 +1353,14 @@ export default {
                                 div {
                                     width: 50%;
                                     text-align: center;
-                                    font-size: 12px;
-                                    padding-top: 35px;
+                                    font-size: 14px;
+                                    padding-top: 30px;
                                 }
 
                                 p:first-child {
                                     font-family: FXLed;
                                     font-weight: normal;
-                                    font-size: 24px;
+                                    font-size: 29px;
                                     color: #FFFFFF;
                                     margin-bottom: 0;
                                 }
@@ -1475,14 +1482,14 @@ export default {
 
     .th {
         text-align: left;
-        font-size: 12px;
+        font-size: 16px;
         font-weight: 400;
         color: #ffffff;
         line-height: 30px;
     }
 
     .td {
-        font-size: 12px;
+        font-size: 14px;
         font-weight: 400;
         color: #ffffff;
         line-height: 30px;

+ 2 - 2
src/components/page/data.js

@@ -8,7 +8,7 @@ export const pie = {
             textStyle: {
                 color: "#FFFFFF",
                 fontSize: 21,
-                fontFamily: 'MFLiHei',
+                fontFamily: 'yihei',
             },
         },
         {
@@ -87,7 +87,7 @@ export const pie2 = {
             textStyle: {
                 color: "#FFFFFF",
                 fontSize: 21,
-                fontFamily: 'MFLiHei',
+                fontFamily: 'yihei',
             },
         },
         {

BIN
src/components/page/font/yihei.ttf