1

src/components/page/Dashboard.vue

@@ -25,13 +25,13 @@
                         <div class="left_charts">
                             <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: 138px" />
                                     </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: 138px" />
                                     </div>
@@ -39,7 +39,7 @@
                             </div>
                             <div class="leftdivitem leftdivitem1">
                                 <div class="leftdivitemchild">
-                                    <div class="title2">潜在接单司机</div>
+                                    <div class="title2 fontYH">潜在接单司机</div>
                                     <Charts :eOption="bing" v-if="bing" style="height: 138px" />
                                 </div>
                                 <div class="leftdivitemchild">
@@ -47,7 +47,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: 150px"></Charts>
                                 </div>
@@ -58,7 +58,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>
@@ -123,7 +123,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">{{ item.title }}</div>
                                     <div class="num_value">
@@ -133,8 +133,8 @@
                                 </div>
                             </div>
                             <div class="midMap">
-                                <div class="toptitle">矿区地图</div>
-                                <div style="height: 100%;border-radius:20px;overflow: hidden;">
+                                <div class="toptitle fontYH"></div>
+                                <div style="height: 100%;border-radius:20px; margin-top: 12px;overflow: hidden;">
                                     <amap :zoom="6" :marker="Weighbridge" :center="center" @map-loaded="onMapLoaded"></amap>
                                 </div>
                             </div>
@@ -143,7 +143,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"
@@ -180,9 +180,9 @@
                                         </div>
                                     </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="btnGroup ">
+                                            <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>
@@ -206,7 +206,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>
@@ -240,7 +240,7 @@
                                     </div>
                                 </div>
                                 <div class="rightcontent2">
-                                    <div class="title2">过磅记录数据库</div>
+                                    <div class="title2 fontYH">过磅记录数据库</div>
                                     <div class="list" style="overflow: hidden;">
                                         <vue-seamless-scroll :data="overweightRecord" class="seamless-warp"
                                             style="height: 150px;" :class-option="{
@@ -654,12 +654,17 @@ 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;
     src: url('./font/FX-LED Bold.TTF');
 }
-
+.fontYH {
+    font-family: yihei !important;
+}
 .fontMF {
     font-family: MFLiHei;
 }
@@ -948,7 +953,6 @@ export default {
                         margin-left: -42px;
                         color: #fff;
                         font-size: 18px;
-                        font-weight: bold;
                         font-family: MFLiHei;
                         letter-spacing: 3px;
                     }

src/components/page/data.js

@@ -4,11 +4,11 @@ export const pie = {
         {
             text: "场内拥堵率",
             x: "center",
-            top: "50%",
+            top: "55%",
             textStyle: {
                 color: "#FFFFFF",
-                fontSize: 14,
-                fontFamily: 'MFLiHei',
+                fontSize: 12,
+                fontFamily: 'yihei',
             },
         },
         {
@@ -16,7 +16,7 @@ export const pie = {
             x: "center",
             top: "28%",
             textStyle: {
-                fontSize: "20",
+                fontSize: "27",
                 color: "#FFFFFF",
                 fontFamily: "DINAlternate-Bold, DINAlternate",
                 foontWeight: "600",
@@ -83,11 +83,11 @@ export const pie2 = {
         {
             text: "场内异常率",
             x: "center",
-            top: "50%",
+            top: "55%",
             textStyle: {
                 color: "#FFFFFF",
-                fontSize: 14,
-                fontFamily: 'MFLiHei',
+                fontSize: 12,
+                fontFamily: 'yihei',
             },
         },
         {
@@ -95,7 +95,7 @@ export const pie2 = {
             x: "center",
             top: "25%",
             textStyle: {
-                fontSize: "20",
+                fontSize: "27",
                 color: "#FFFFFF",
                 fontFamily: "DINAlternate-Bold, DINAlternate",
                 foontWeight: "600",