Quellcode durchsuchen

[Mod 0000]修改首页字体等样式

wangkeyi vor 3 Monaten
Ursprung
Commit
2d21d41b3b

BIN
src/assets/font/D-DIN-Bold.otf


BIN
src/assets/font/D-DIN.otf


+ 32 - 21
src/components/Configurable/detail/MiniBoard.vue

@@ -104,6 +104,14 @@
 </script>
 <style lang="less" scoped>
   @import '/@/design/theme.less';
+  @font-face {
+    font-family: 'DDIN-Bold';
+    src: url('/@/assets/font//D-DIN-Bold.otf');
+  }
+  @font-face {
+    font-family: 'DDIN';
+    src: url('/@/assets/font//D-DIN.otf');
+  }
 
   .mini-board {
     --image-board-bg-A-1: url('/@/assets/images/sealedGoaf/configurable/miniBoard/board-bg-A-1.png');
@@ -156,17 +164,18 @@
   }
   .mini-board__label_A {
     color: #000000;
-    font-size: 13px;
-    font-family: 'Microsoft YaHei';
-    font-weight: bold;
+    font-size: 137x;
+    font-family: 'Source Han Sans SC';
+    font-style: normal;
+    font-weight: 700;
     padding-bottom: 5px;
   }
   .mini-board__value_A {
     width: 55px;
     color: #000000;
-    font-size: 22px;
+    font-size: 26px;
     padding-bottom: 10px;
-    font-family: 'Microsoft YaHei';
+    font-family: 'DDIN-Bold';
   }
   .mini-board_B {
     width: 98px;
@@ -179,37 +188,38 @@
   .mini-board__label_B {
     color: #000000;
     font-size: 14px;
-    font-family: 'Microsoft YaHei';
+    font-family: 'Source Han Sans SC';
+    font-weight: 700;
+
   }
   .mini-board__value_B {
     color: #000000;
     font-size: 26px;
-    font-weight: bold;
-    font-family: 'Microsoft YaHei';
+    font-family: 'DDIN-Bold';
     padding-bottom: 17px;
   }
   /* 1. 第一个容器:label和value为蓝色 */
   .mini-board_B:nth-child(1) .mini-board__label_B,
   .mini-board_B:nth-child(1) .mini-board__value_B {
-    color: #1890ff;
+    color: #0052cc;
   }
 
   /* 2. 第二个容器:label和value为黄色 */
   .mini-board_B:nth-child(2) .mini-board__label_B,
   .mini-board_B:nth-child(2) .mini-board__value_B {
-    color: #36a64d;
+    color: #4caf50;
   }
 
   /* 3. 第三个容器:label和value为橙色 */
   .mini-board_B:nth-child(3) .mini-board__label_B,
   .mini-board_B:nth-child(3) .mini-board__value_B {
-    color: #a97523;
+    color: #c97800;
   }
 
   /* 4. 第四个容器:label和value为红色 */
   .mini-board_B:nth-child(4) .mini-board__label_B,
   .mini-board_B:nth-child(4) .mini-board__value_B {
-    color: #d6666c;
+    color: #c45656;
   }
   .mini-board_C {
     width: 98px;
@@ -222,19 +232,19 @@
   .mini-board__label_C {
     color: #000000;
     font-size: 14px;
-    font-family: 'Microsoft YaHei';
+    font-family: 'Source Han Sans SC';
+    font-weight: 700;
   }
   .mini-board__value_C {
     color: #000000;
     font-size: 26px;
-    font-weight: bold;
-    font-family: 'Microsoft YaHei';
+    font-family: 'DDIN-Bold';
     padding-bottom: 17px;
   }
   /* 1. 第一个容器:label和value为蓝色 */
   .mini-board_C:nth-child(1) .mini-board__label_C,
   .mini-board_C:nth-child(1) .mini-board__value_C {
-    color: #1890ff;
+    color: #0052cc;
   }
 
   /* 2. 第二个容器:label和value为黄色 */
@@ -252,25 +262,26 @@
   /* 4. 第四个容器:label和value为红色 */
   .mini-board_C:nth-child(4) .mini-board__label_C,
   .mini-board_C:nth-child(4) .mini-board__value_C {
-    color: #ff4d4f;
+    color: #c45656;
   }
   .mini-board_D {
     width: 96px;
-    height: 65px;
+    height: 75px;
     background-image: var(--image-board-bg-D);
     background-size: 100% 100%;
-    padding-top: 6px;
+    padding-top: 12px;
   }
 
   .mini-board__label_D {
     color: #000000;
     font-size: 14px;
-    font-family: 'Microsoft YaHei';
+    font-weight: 800;
   }
   .mini-board__value_D {
     color: #2b6ff0;
     font-size: 22px;
-    font-family: 'Microsoft YaHei';
+    font-family: 'DDIN-Bold';
+    padding-bottom: 3px;
   }
 
   .mini-board_E {

+ 4 - 4
src/views/dashboard/SealedGoaf/configurable.data.sealedGoaf.ts

@@ -514,7 +514,7 @@ export const testConfigSealedGoaf: Config[] = [
       },
     },
     showStyle: {
-      size: 'width:440px;height:340px;',
+      size: 'width:440px;height:330px;',
       version: '原版',
       position: 'top:-20px;right:25px;',
     },
@@ -681,9 +681,9 @@ export const testConfigSealedGoaf: Config[] = [
       // },
     },
     showStyle: {
-      size: 'width:440px;height:310px;',
+      size: 'width:440px;height:300px;',
       version: '原版',
-      position: 'top:330px;right:25px;',
+      position: 'top:320px;right:25px;',
     },
   },
   // 7. 当日报警情况统计
@@ -768,7 +768,7 @@ export const testConfigSealedGoaf: Config[] = [
       preset: [],
     },
     showStyle: {
-      size: 'width:440px;height:180px;',
+      size: 'width:440px;height:205px;',
       version: '原版',
       position: 'bottom:10px;right:25px;',
     },