zhanghao 4 months ago
parent
commit
8dbe5d1ef8

+ 2 - 2
src/views/screen/logistics/car/carStock.vue

@@ -37,7 +37,7 @@
         <div style="display: flex;align-items: center">
           <img src="../../../../assets/zhang/public_car.png" width="58" style="margin: 0 5px 0 33px">
           <div style="width: 108px;height: 24px;color: #00FFFF;font-size: 34px;margin-bottom: 10px">
-            <span>5566</span>
+            <span style="font-family: 'electronicFont'">5566</span>
             <span style="width: 15px;height: 24px;font-size: 14px;align-content: end">辆</span>
           </div>
         </div>
@@ -48,7 +48,7 @@
         <div style="display: flex;align-items: center">
           <img src="../../../../assets/zhang/pubicCar/pentagonCar.png" width="55" style="margin: 0 5px 0 33px">
           <div style="width: 108px;height: 24px;color: #00FFFF;font-size: 34px;margin-bottom: 10px">
-            <span>5566</span>
+            <span style="font-family: 'electronicFont'">5566</span>
             <span style="width: 15px;height: 24px;font-size: 14px;align-content: end">辆</span>
           </div>
         </div>

+ 4 - 4
src/views/screen/logistics/car/carStockDialog.vue

@@ -46,7 +46,7 @@
             <div style="display: flex;align-items: center">
               <img src="../../../../assets/zhang/public_car.png" width="58" style="margin: 0 5px 0 33px">
               <div style="width: 108px;height: 24px;color: #00FFFF;font-size: 34px;margin-bottom: 10px">
-                <span>5566</span>
+                <span style="font-family: 'electronicFont'">5566</span>
                 <span style="width: 15px;height: 24px;font-size: 14px;align-content: end">辆</span>
               </div>
             </div>
@@ -59,7 +59,7 @@
             <div style="display: flex;align-items: center;cursor: pointer" @click="chooseX">
               <img src="../../../../assets/zhang/pubicCar/pentagonCar.png" width="55" style="margin: 0 5px 0 33px">
               <div style="width: 108px;height: 24px;color: #00FFFF;font-size: 34px;margin-bottom: 10px">
-                <span>5566</span>
+                <span style="font-family: 'electronicFont'">5566</span>
                 <span style="width: 15px;height: 24px;font-size: 14px;align-content: end">辆</span>
               </div>
             </div>
@@ -72,7 +72,7 @@
             <div style="display: flex;align-items: center;cursor: pointer" @click="chooseY">
               <img src="../../../../assets/zhang/pubicCar/pentagonCar.png" width="55" style="margin: 0 5px 0 33px">
               <div style="width: 108px;height: 24px;color: #00FFFF;font-size: 34px;margin-bottom: 10px">
-                <span>5566</span>
+                <span style="font-family: 'electronicFont'">5566</span>
                 <span style="width: 15px;height: 24px;font-size: 14px;align-content: end">辆</span>
               </div>
             </div>
@@ -85,7 +85,7 @@
             <div style="display: flex;align-items: center;cursor: pointer" @click="chooseZ">
               <img src="../../../../assets/zhang/pubicCar/pentagonCar.png" width="55" style="margin: 0 5px 0 33px">
               <div style="width: 108px;height: 24px;color: #00FFFF;font-size: 34px;margin-bottom: 10px">
-                <span>5566</span>
+                <span style="font-family: 'electronicFont'">5566</span>
                 <span style="width: 15px;height: 24px;font-size: 14px;align-content: end">辆</span>
               </div>
             </div>

+ 7 - 6
src/views/screen/official/carWarning.vue

@@ -8,20 +8,21 @@
         <div style="display: flex;align-items: center">
           <img src="../../../assets/zhang/public_car.png" width="58" style="margin: 0 5px 0 33px">
           <div style="width: 108px;height: 24px;color: #00FFFF;font-size: 34px;margin-bottom: 10px">
-            <span>5566</span>
+            <span style="font-family: 'electronicFont'">5566</span>
             <span style="width: 15px;height: 24px;font-size: 14px;align-content: end">辆</span>
           </div>
         </div>
       </div>
 
+
       <div style="width: 50%;margin-bottom: 10px">
         <div class="c1_title_half">
-          <div style="position: absolute;left: 20px;top: -5px;">公务车行驶总里程</div>
+          <div style="position: absolute;left: 20px;top: -5px;">均车派单数</div>
         </div>
         <div style="display: flex;align-items: center">
           <img src="../../../assets/zhang/public_car.png" width="58" style="margin: 0 5px 0 33px">
           <div style="width: 108px;height: 24px;color: #00FFFF;font-size: 34px;margin-bottom: 10px">
-            <span>5566</span>
+            <span style="font-family: 'electronicFont'">5566</span>
             <span style="width: 15px;height: 24px;font-size: 14px;align-content: end">单</span>
           </div>
         </div>
@@ -29,12 +30,12 @@
 
       <div style="width: 50%;margin-bottom: 10px">
         <div class="c1_title_half">
-          <div style="position: absolute;left: 20px;top: -5px;">均车派单数</div>
+          <div style="position: absolute;left: 20px;top: -5px;">公务车行驶总里程</div>
         </div>
         <div style="display: flex;align-items: center">
           <img src="../../../assets/zhang/public_car.png" width="58" style="margin: 0 5px 0 33px">
           <div style="width: 108px;height: 24px;color: #00FFFF;font-size: 34px;margin-bottom: 10px">
-            <span>5566</span>
+            <span style="font-family: 'electronicFont'">5566</span>
             <span style="width: 15px;height: 24px;font-size: 14px;align-content: end">单</span>
           </div>
         </div>
@@ -47,7 +48,7 @@
         <div style="display: flex;align-items: center">
           <img src="../../../assets/zhang/public_car.png" width="58" style="margin: 0 5px 0 33px">
           <div style="width: 108px;height: 24px;color: #00FFFF;font-size: 34px;margin-bottom: 10px">
-            <span>5566</span>
+            <span style="font-family: 'electronicFont'">5566</span>
             <span style="width: 15px;height: 24px;font-size: 14px;align-content: end">辆</span>
           </div>
         </div>

+ 9 - 9
src/views/screen/official/terminalData.vue

@@ -19,7 +19,7 @@
             <div style="color: white;font-size: 15px">{{ it.type }}</div>
           </div>
           <div style="width: 100%;height: 25px;color: #00FFFF;display: flex">
-            <div style="font-size: 25px">{{ it.num }}</div>
+            <div style="font-size: 25px;font-family: 'electronicFont'">{{ it.num }}</div>
             <div style="font-size: 10px;height: 100%;display: flex;align-items: end">辆</div>
           </div>
         </div>
@@ -27,14 +27,14 @@
       <div style="display: flex;width: 100%;">
         <div style="width: 50%">
           <div class="c1_titleText_half1"></div>
-          <div style="display: flex;align-items: center;margin-bottom: 10px;padding-left: 50px">
+          <div style="display: flex;align-items: center;margin-bottom: 10px;padding-left: 30px">
             <div style="height: 50px;margin-right: 15px" v-for="(it, index) in carUseNum">
               <div style="display: flex;width: 100%;height: 25px;align-items: center">
-                <img src="../../../assets/zhang/pubicCar/miniCar.png" width="18" style="object-fit: cover">
+                <img src="../../../assets/zhang/pubicCar/miniCar.png" width="30" style="object-fit: cover">
                 <div style="color: white;font-size: 13px">{{ it.type }}</div>
               </div>
-              <div style="width: 100%;height: 25px;color: #00FFFF;display: flex">
-                <div style="font-size: 25px">{{ it.num }}</div>
+              <div style="width: 100%;height: 25px;color: #00FFFF;display: flex;margin-left: 10px">
+                <div style="font-size: 25px;font-family: 'electronicFont'">{{ it.num }}</div>
                 <div style="font-size: 10px;height: 100%;display: flex;align-items: end">辆</div>
               </div>
             </div>
@@ -42,14 +42,14 @@
         </div>
         <div style="width: 50%">
           <div class="c1_titleText_half2"></div>
-          <div style="display: flex;align-items: center;margin-bottom: 10px;padding-left: 50px">
+          <div style="display: flex;align-items: center;margin-bottom: 10px;padding-left: 30px">
             <div style="height: 50px;margin-right: 15px" v-for="(it, index) in carActivationNum">
               <div style="display: flex;width: 100%;height: 25px;align-items: center">
-                <img src="../../../assets/zhang/pubicCar/miniCar.png" width="18" style="object-fit: cover">
+                <img src="../../../assets/zhang/pubicCar/miniCar.png" width="30" style="object-fit: cover">
                 <div style="color: white;font-size: 13px">{{ it.type }}</div>
               </div>
-              <div style="width: 100%;height: 25px;color: #00FFFF;display: flex">
-                <div style="font-size: 25px">{{ it.num }}</div>
+              <div style="width: 100%;height: 25px;color: #00FFFF;display: flex;margin-left: 10px">
+                <div style="font-size: 25px;font-family: 'electronicFont'">{{ it.num }}</div>
                 <div style="font-size: 10px;height: 100%;display: flex;align-items: end">辆</div>
               </div>
             </div>

+ 14 - 14
src/views/screen/official/terminalDataDialog.vue

@@ -25,7 +25,7 @@
                 <div style="color: white;font-size: 15px">{{ it.type }}</div>
               </div>
               <div style="width: 100%;height: 25px;color: #00FFFF;display: flex">
-                <div style="font-size: 25px">{{ it.num }}</div>
+                <div style="font-size: 25px;font-family: 'electronicFont'">{{ it.num }}</div>
                 <div style="font-size: 10px;height: 100%;display: flex;align-items: end">辆</div>
               </div>
             </div>
@@ -33,14 +33,14 @@
           <div style="display: flex;width: 100%;">
             <div style="width: 50%">
               <div class="c1_titleText_half1"></div>
-              <div style="display: flex;align-items: center;margin-bottom: 10px;padding-left: 50px">
+              <div style="display: flex;align-items: center;margin-bottom: 10px;padding-left: 30px">
                 <div style="height: 50px;margin-right: 15px" v-for="(it, index) in carUseNum">
                   <div style="display: flex;width: 100%;height: 25px;align-items: center">
-                    <img src="../../../assets/zhang/pubicCar/miniCar.png" width="18" style="object-fit: cover">
+                    <img src="../../../assets/zhang/pubicCar/miniCar.png" width="30" style="object-fit: cover">
                     <div style="color: white;font-size: 13px">{{ it.type }}</div>
                   </div>
-                  <div style="width: 100%;height: 25px;color: #00FFFF;display: flex">
-                    <div style="font-size: 25px">{{ it.num }}</div>
+                  <div style="width: 100%;height: 25px;color: #00FFFF;display: flex;margin-left: 10px">
+                    <div style="font-size: 25px;font-family: 'electronicFont'">{{ it.num }}</div>
                     <div style="font-size: 10px;height: 100%;display: flex;align-items: end">辆</div>
                   </div>
                 </div>
@@ -48,14 +48,14 @@
             </div>
             <div style="width: 50%">
               <div class="c1_titleText_half2"></div>
-              <div style="display: flex;align-items: center;margin-bottom: 10px;padding-left: 50px">
+              <div style="display: flex;align-items: center;margin-bottom: 10px;padding-left: 30px">
                 <div style="height: 50px;margin-right: 15px" v-for="(it, index) in carActivationNum">
                   <div style="display: flex;width: 100%;height: 25px;align-items: center">
-                    <img src="../../../assets/zhang/pubicCar/miniCar.png" width="18" style="object-fit: cover">
+                    <img src="../../../assets/zhang/pubicCar/miniCar.png" width="30" style="object-fit: cover">
                     <div style="color: white;font-size: 13px">{{ it.type }}</div>
                   </div>
-                  <div style="width: 100%;height: 25px;color: #00FFFF;display: flex">
-                    <div style="font-size: 25px">{{ it.num }}</div>
+                  <div style="width: 100%;height: 25px;color: #00FFFF;display: flex;margin-left: 10px">
+                    <div style="font-size: 25px;font-family: 'electronicFont'">{{ it.num }}</div>
                     <div style="font-size: 10px;height: 100%;display: flex;align-items: end">辆</div>
                   </div>
                 </div>
@@ -71,7 +71,7 @@
             <div style="display: flex;align-items: center">
               <img src="../../../assets/zhang/public_car.png" width="58" style="margin: 10px 5px 0 33px">
               <div style="width: 108px;height: 24px;color: #00FFFF;font-size: 34px;margin-bottom: 10px">
-                <span>5566</span>
+                <span style="font-family: 'electronicFont'">5566</span>
                 <span style="width: 15px;height: 24px;font-size: 14px;align-content: end">辆</span>
               </div>
             </div>
@@ -84,7 +84,7 @@
             <div style="display: flex;align-items: center">
               <div style="position: relative">
                 <img src="../../../assets/zhang/pubicCar/arcBlueEx.png" width="90" style="margin: 20px 5px 0 33px">
-                <div style="position: absolute;color: #00FFFF;top: 5px;left: 55px;font-size: 34px">56<span style="font-size: 12px">%</span></div>
+                <div style="position: absolute;color: #00FFFF;top: 5px;left: 55px;font-size: 34px;font-family: 'electronicFont'">56<span style="font-size: 12px">%</span></div>
               </div>
 
             </div>
@@ -97,7 +97,7 @@
             <div style="display: flex;align-items: center">
               <div style="position: relative">
                 <img src="../../../assets/zhang/pubicCar/arcBlueEx.png" width="90" style="margin: 20px 5px 0 33px">
-                <div style="position: absolute;color: #00FFFF;top: 5px;left: 55px;font-size: 34px">56<span style="font-size: 12px">%</span></div>
+                <div style="position: absolute;color: #00FFFF;top: 5px;left: 55px;font-size: 34px;font-family: 'electronicFont'">56<span style="font-size: 12px">%</span></div>
               </div>
             </div>
           </div>
@@ -112,7 +112,7 @@
                 <div style="position: absolute;width: 48px;color: #00FFFF;top: 5px;left: 55px;font-size: 12px;text-align: center">年度增加车辆数</div>
               </div>
               <div style="width: 108px;height: 24px;color: #00FFFF;font-size: 34px;margin-bottom: 20px">
-                <span>56</span>
+                <span style="font-family: 'electronicFont'">56</span>
                 <span style="width: 15px;height: 24px;font-size: 10px;align-content: end">万辆</span>
               </div>
             </div>
@@ -122,7 +122,7 @@
                 <div style="position: absolute;width: 48px;color: #FEC72F;top: 5px;left: 55px;font-size: 12px;text-align: center">年度减少车辆数</div>
               </div>
               <div style="width: 108px;height: 24px;color: #FEC72F;font-size: 34px;margin-bottom: 20px">
-                <span>56</span>
+                <span style="font-family: 'electronicFont'">56</span>
                 <span style="width: 15px;height: 24px;font-size: 10px;align-content: end">万辆</span>
               </div>
             </div>