Browse Source

111字体

chenjun 2 years ago
parent
commit
20e536c8e7
54 changed files with 18 additions and 11 deletions
  1. 1 1
      src/components/SimpleTable/index.vue
  2. 1 0
      src/layout/components/Navbar.vue
  3. BIN
      src/styles/DIN/DIN-Black.otf
  4. BIN
      src/styles/DIN/DIN-BlackAlternate.otf
  5. BIN
      src/styles/DIN/DIN-BlackItalic.otf
  6. BIN
      src/styles/DIN/DIN-BlackItalicAlt.otf
  7. BIN
      src/styles/DIN/DIN-BlackItalicExp.otf
  8. BIN
      src/styles/DIN/DIN-Bold.otf
  9. BIN
      src/styles/DIN/DIN-BoldAlternate.otf
  10. BIN
      src/styles/DIN/DIN-BoldItalic.otf
  11. BIN
      src/styles/DIN/DIN-BoldItalicAlt.otf
  12. BIN
      src/styles/DIN/DIN-BoldItalicExp.otf
  13. BIN
      src/styles/DIN/DIN-Euro.otf
  14. BIN
      src/styles/DIN/DIN-Light.otf
  15. BIN
      src/styles/DIN/DIN-LightAlternate.otf
  16. BIN
      src/styles/DIN/DIN-LightItalic.otf
  17. BIN
      src/styles/DIN/DIN-LightItalicAlt.otf
  18. BIN
      src/styles/DIN/DIN-LightItalicExp.otf
  19. BIN
      src/styles/DIN/DIN-Medium.otf
  20. BIN
      src/styles/DIN/DIN-MediumAlternate.otf
  21. BIN
      src/styles/DIN/DIN-MediumItalic.otf
  22. BIN
      src/styles/DIN/DIN-MediumItalicAlt.otf
  23. BIN
      src/styles/DIN/DIN-MediumItalicExp.otf
  24. BIN
      src/styles/DIN/DIN-RegularItalic.otf
  25. BIN
      src/styles/DIN/DIN-RegularItalicAlt.otf
  26. BIN
      src/styles/DIN/DIN-RegularItalicExp.otf
  27. BIN
      src/styles/DIN/DINCond-Black.otf
  28. BIN
      src/styles/DIN/DINCond-BlackAlternate.otf
  29. BIN
      src/styles/DIN/DINCond-BlackExpert.otf
  30. BIN
      src/styles/DIN/DINCond-Bold.otf
  31. BIN
      src/styles/DIN/DINCond-BoldAlternate.otf
  32. BIN
      src/styles/DIN/DINCond-BoldExpert.otf
  33. BIN
      src/styles/DIN/DINCond-Light.otf
  34. BIN
      src/styles/DIN/DINCond-LightAlternate.otf
  35. BIN
      src/styles/DIN/DINCond-LightExpert.otf
  36. BIN
      src/styles/DIN/DINCond-Medium.otf
  37. BIN
      src/styles/DIN/DINCond-MediumAlternate.otf
  38. BIN
      src/styles/DIN/DINCond-MediumExpert.otf
  39. BIN
      src/styles/DIN/DINCond-Regular.otf
  40. BIN
      src/styles/DIN/DINCond-RegularAlternate.otf
  41. BIN
      src/styles/DIN/DINCond-RegularExpert.otf
  42. BIN
      src/styles/DIN/DINEngschrift.otf
  43. BIN
      src/styles/DIN/DINPro-Black.otf
  44. BIN
      src/styles/DIN/DINPro-Bold.otf
  45. BIN
      src/styles/DIN/DINPro-Light.otf
  46. BIN
      src/styles/DIN/DINPro-Medium.otf
  47. BIN
      src/styles/DIN/DINPro-Regular.otf
  48. 7 2
      src/styles/index.scss
  49. 1 1
      src/views/dataQuery/components/DataQueryView/index.vue
  50. 1 1
      src/views/realTime/components/AirportView/AirportForm.vue
  51. 2 2
      src/views/realTime/components/AirportView/index copy.scss
  52. 1 1
      src/views/realTime/components/AirportView/index.scss
  53. 3 2
      src/views/realTime/components/CountBox/index.vue
  54. 1 1
      src/views/systemSettings/serviceManagement/index.vue

+ 1 - 1
src/components/SimpleTable/index.vue

@@ -394,7 +394,7 @@ defineExpose({
       padding: 0;
       font-size: 14px;
       color: #101116;
-      font-family: Helvetica, Microsoft YaHei;
+      font-family:DIN, Microsoft YaHei;
       &:not(.el-tooltip) {
         white-space: pre-line;
       }

+ 1 - 0
src/layout/components/Navbar.vue

@@ -58,5 +58,6 @@ onUnmounted(() => {
   cursor: pointer;
   margin-right: 40px;
   background-color: var(--nav-bar-right-menu-background);
+  font-family: DIN, Microsoft YaHei;
 }
 </style>

BIN
src/styles/DIN/DIN-Black.otf


BIN
src/styles/DIN/DIN-BlackAlternate.otf


BIN
src/styles/DIN/DIN-BlackItalic.otf


BIN
src/styles/DIN/DIN-BlackItalicAlt.otf


BIN
src/styles/DIN/DIN-BlackItalicExp.otf


BIN
src/styles/DIN/DIN-Bold.otf


BIN
src/styles/DIN/DIN-BoldAlternate.otf


BIN
src/styles/DIN/DIN-BoldItalic.otf


BIN
src/styles/DIN/DIN-BoldItalicAlt.otf


BIN
src/styles/DIN/DIN-BoldItalicExp.otf


BIN
src/styles/DIN/DIN-Euro.otf


BIN
src/styles/DIN/DIN-Light.otf


BIN
src/styles/DIN/DIN-LightAlternate.otf


BIN
src/styles/DIN/DIN-LightItalic.otf


BIN
src/styles/DIN/DIN-LightItalicAlt.otf


BIN
src/styles/DIN/DIN-LightItalicExp.otf


BIN
src/styles/DIN/DIN-Medium.otf


BIN
src/styles/DIN/DIN-MediumAlternate.otf


BIN
src/styles/DIN/DIN-MediumItalic.otf


BIN
src/styles/DIN/DIN-MediumItalicAlt.otf


BIN
src/styles/DIN/DIN-MediumItalicExp.otf


BIN
src/styles/DIN/DIN-RegularItalic.otf


BIN
src/styles/DIN/DIN-RegularItalicAlt.otf


BIN
src/styles/DIN/DIN-RegularItalicExp.otf


BIN
src/styles/DIN/DINCond-Black.otf


BIN
src/styles/DIN/DINCond-BlackAlternate.otf


BIN
src/styles/DIN/DINCond-BlackExpert.otf


BIN
src/styles/DIN/DINCond-Bold.otf


BIN
src/styles/DIN/DINCond-BoldAlternate.otf


BIN
src/styles/DIN/DINCond-BoldExpert.otf


BIN
src/styles/DIN/DINCond-Light.otf


BIN
src/styles/DIN/DINCond-LightAlternate.otf


BIN
src/styles/DIN/DINCond-LightExpert.otf


BIN
src/styles/DIN/DINCond-Medium.otf


BIN
src/styles/DIN/DINCond-MediumAlternate.otf


BIN
src/styles/DIN/DINCond-MediumExpert.otf


BIN
src/styles/DIN/DINCond-Regular.otf


BIN
src/styles/DIN/DINCond-RegularAlternate.otf


BIN
src/styles/DIN/DINCond-RegularExpert.otf


BIN
src/styles/DIN/DINEngschrift.otf


BIN
src/styles/DIN/DINPro-Black.otf


BIN
src/styles/DIN/DINPro-Bold.otf


BIN
src/styles/DIN/DINPro-Light.otf


BIN
src/styles/DIN/DINPro-Medium.otf


BIN
src/styles/DIN/DINPro-Regular.otf


+ 7 - 2
src/styles/index.scss

@@ -3,9 +3,14 @@
 @import './scss-suger.scss';
 @import './reset-style.scss';
 @import './elemenet-style-overflow.scss';
-
+@font-face {
+  font-family: DIN;
+  src: url(../styles/DIN/DIN-Medium.otf);
+  font-weight: normal;
+  font-style: normal;
+}
 *{
-  font-family: Microsoft YaHei !important;
+  font-family: DIN, Microsoft YaHei;
 }
 
 //scroll

+ 1 - 1
src/views/dataQuery/components/DataQueryView/index.vue

@@ -530,7 +530,7 @@ const cellClickHandler = (row, column, cell, event) => {
 
       .el-input__inner {
         font-size: 14px;
-        font-family: Helvetica, Microsoft YaHei;
+        font-family: DIN, Microsoft YaHei;
         color: #303133;
       }
     }

+ 1 - 1
src/views/realTime/components/AirportView/AirportForm.vue

@@ -201,7 +201,7 @@ const waybillTypeOptions = ref([
 
     .el-input__inner {
       font-size: 14px;
-      font-family: Helvetica, Microsoft YaHei;
+      font-family: DIN, Microsoft YaHei;
       color: #303133;
     }
     .el-date-editor {

+ 2 - 2
src/views/realTime/components/AirportView/index copy.scss

@@ -40,7 +40,7 @@
       .el-table-v2__header-cell-text,
       .el-table-v2__cell-text {
         font-size: 12px;
-        font-family: Helvetica, Microsoft YaHei;
+        font-family: DIN, Microsoft YaHei;
         font-weight: bold;
         color: #101116;
         white-space: pre-line;
@@ -115,7 +115,7 @@
         background-color: #dfe3ea;
         &-count {
           font-size: 16px;
-          font-family: Helvetica, Microsoft YaHei;
+          font-family: DIN, Microsoft YaHei;
           font-weight: bold;
           color: #303133;
           &:not(:last-of-type) {

+ 1 - 1
src/views/realTime/components/AirportView/index.scss

@@ -105,7 +105,7 @@
     background-color: #dfe3ea;
     &-count {
       font-size: 16px;
-      font-family: Helvetica, Microsoft YaHei;
+      font-family: DIN, Microsoft YaHei;
       font-weight: bold;
       color: #303133;
       &:not(:last-of-type) {

+ 3 - 2
src/views/realTime/components/CountBox/index.vue

@@ -74,7 +74,7 @@ watch(numberItems, items => {
   .label {
     padding-right: 8px;
     line-height: 32px;
-    font-family: Helvetica, Microsoft YaHei;
+    font-family: DIN, Microsoft YaHei;
     font-weight: bold;
     color: #101116;
     writing-mode: horizontal-tb !important;
@@ -94,7 +94,7 @@ watch(numberItems, items => {
     background: #410425;
     border-radius: 4px;
     border: 1px solid #d2d6df;
-    font-family: Helvetica, Microsoft YaHei;
+    font-family: DIN, Microsoft YaHei;
     font-weight: bold;
     color: #ffffff;
     & > .number-box {
@@ -107,6 +107,7 @@ watch(numberItems, items => {
       text-orientation: upright;
       overflow: hidden;
       & > .number-list {
+        font-family: DIN,Microsoft YaHei;
         font-style: normal;
         position: absolute;
         top: 8px;

+ 1 - 1
src/views/systemSettings/serviceManagement/index.vue

@@ -600,7 +600,7 @@ const dataSourceSubmitHandler = () => {
   optgroup,
   select,
   textarea {
-    font-family: Helvetica, Microsoft YaHei;
+    font-family: DIN, Microsoft YaHei;
     font-size: 14px;
     font-weight: 400;
   }