Merge remote-tracking branch 'origin/main'

src/views/pad/official/terminalData.vue

@@ -18,8 +18,8 @@
             <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;font-family: 'electronicFont'">{{ it.num }}</div>
-            <div style="font-size: 10px;height: 100%;display: flex;align-items: end">辆</div>
+            <div style="font-size: 30px;font-family: 'electronicFont'">{{ it.num }}</div>
+            <div style="font-size: 10px;height: 100%;display: flex;align-items: end;margin-top: 4px">辆</div>
           </div>
         </div>
       </div>
@@ -33,8 +33,8 @@
                 <div style="color: white;font-size: 13px">{{ it.type }}</div>
               </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 style="font-size: 30px;font-family: 'electronicFont'">{{ it.num }}</div>
+                <div style="font-size: 10px;height: 100%;display: flex;align-items: end;margin-top: 4px">辆</div>
               </div>
             </div>
           </div>
@@ -48,8 +48,8 @@
                 <div style="color: white;font-size: 13px">{{ it.type }}</div>
               </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 style="font-size: 30px;font-family: 'electronicFont'">{{ it.num }}</div>
+                <div style="font-size: 10px;height: 100%;display: flex;align-items: end;margin-top: 4px">辆</div>
               </div>
             </div>
           </div>

src/views/pad/official/terminalDataDialog.vue

@@ -25,8 +25,8 @@
                 <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;font-family: 'electronicFont'">{{ it.num }}</div>
-                <div style="font-size: 10px;height: 100%;display: flex;align-items: end">辆</div>
+                <div style="font-size: 30px;font-family: 'electronicFont'">{{ it.num }}</div>
+                <div style="font-size: 10px;height: 100%;display: flex;align-items: end;margin-top: 4px">辆</div>
               </div>
             </div>
           </div>
@@ -40,8 +40,8 @@
                     <div style="color: white;font-size: 13px">{{ it.type }}</div>
                   </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 style="font-size: 30px;font-family: 'electronicFont'">{{ it.num }}</div>
+                    <div style="font-size: 10px;height: 100%;display: flex;align-items: end;margin-top: 4px">辆</div>
                   </div>
                 </div>
               </div>
@@ -55,8 +55,8 @@
                     <div style="color: white;font-size: 13px">{{ it.type }}</div>
                   </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 style="font-size: 30px;font-family: 'electronicFont'">{{ it.num }}</div>
+                    <div style="font-size: 10px;height: 100%;display: flex;align-items: end;margin-top: 4px">辆</div>
                   </div>
                 </div>
               </div>

src/views/screen/official/terminalData.vue

@@ -17,9 +17,10 @@
             <img src="../../../assets/zhang/publicCar/miniCar.png" width="18" style="object-fit: cover">
             <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;font-family: 'electronicFont'">{{ it.num }}</div>
-            <div style="font-size: 10px;height: 100%;display: flex;align-items: end">辆</div>
+            <div style="font-size: 30px;font-family: 'electronicFont'">{{ it.num }}</div>
+            <div style="font-size: 10px;height: 100%;display: flex;align-items: end;margin-top: 4px">辆</div>
           </div>
         </div>
       </div>
@@ -33,8 +34,8 @@
                 <div style="color: white;font-size: 13px">{{ it.type }}</div>
               </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 style="font-size: 30px;font-family: 'electronicFont'">{{ it.num }}</div>
+                <div style="font-size: 10px;height: 100%;display: flex;align-items: end;margin-top: 4px">辆</div>
               </div>
             </div>
           </div>
@@ -48,8 +49,8 @@
                 <div style="color: white;font-size: 13px">{{ it.type }}</div>
               </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 style="font-size: 30px;font-family: 'electronicFont'">{{ it.num }}</div>
+                <div style="font-size: 10px;height: 100%;display: flex;align-items: end;margin-top: 4px">辆</div>
               </div>
             </div>
           </div>

src/views/screen/official/terminalDataDialog.vue

@@ -25,8 +25,8 @@
                   <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;font-family: 'electronicFont'">{{ it.num }}</div>
-                  <div style="font-size: 10px;height: 100%;display: flex;align-items: end">辆</div>
+                  <div style="font-size: 30px;font-family: 'electronicFont'">{{ it.num }}</div>
+                  <div style="font-size: 10px;height: 100%;display: flex;align-items: end;margin-top: 4px">辆</div>
                 </div>
               </div>
             </div>
@@ -40,8 +40,8 @@
                       <div style="color: white;font-size: 13px">{{ it.type }}</div>
                     </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 style="font-size: 30px;font-family: 'electronicFont'">{{ it.num }}</div>
+                      <div style="font-size: 10px;height: 100%;display: flex;align-items: end;margin-top: 4px">辆</div>
                     </div>
                   </div>
                 </div>
@@ -55,8 +55,8 @@
                       <div style="color: white;font-size: 13px">{{ it.type }}</div>
                     </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 style="font-size: 30px;font-family: 'electronicFont'">{{ it.num }}</div>
+                      <div style="font-size: 10px;height: 100%;display: flex;align-items: end;margin-top: 4px">辆</div>
                     </div>
                   </div>
                 </div>