Merge branch 'jzl'

zh-baseversion-web/src/assets/css/font.css

 @font-face {
-    font-family: "arialbd";
-    src: url('~@/assets/fonts/UnidreamLED.ttf') format('truetype');
-    font-weight: normal;
-    font-style: normal;
-}
\ No newline at end of file
+  font-family: "arialbd";
+  src: url("~@/assets/fonts/UnidreamLED.ttf") format("truetype");
+  font-weight: normal;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: "YouSheBiaoTiHei";
+  src: url("~@/assets/fonts/youshebiaotihei.ttf") format("truetype");
+  font-weight: normal;
+  font-style: normal;
+}

zh-baseversion-web/src/assets/fonts/font.css

@@ -4,4 +4,12 @@
   src: url('UnidreamLED.ttf');
   font-weight: normal;
   font-style: normal;
+}
+
+
+@font-face {
+  font-family: 'YouSheBiaoTiHei';
+  src: url('youshebiaotihei.ttf');
+  font-weight: normal;
+  font-style: normal;
 }
\ No newline at end of file

zh-baseversion-web/src/main.js

 /*
  * @Author: your name
  * @Date: 2022-01-07 11:29:13
- * @LastEditTime: 2022-02-26 20:59:19
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-07-26 17:31:44
+ * @LastEditors: 纪泽龙 jizelong@qq.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /gassafety-progress/gassafetyprogress-web/src/main.js
  */
@@ -27,6 +27,7 @@ import permission from "./directive/permission";
 import * as echarts from "echarts";
 import "./assets/icons"; // icon
 import "./permission"; // permission control
+
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
 import {

zh-baseversion-web/src/views/bigWindow/index.vue

 <!--
  * @Author: your name
  * @Date: 2022-01-11 13:44:17
- * @LastEditTime: 2024-07-26 17:02:45
+ * @LastEditTime: 2024-07-26 17:41:09
  * @LastEditors: 纪泽龙 jizelong@qq.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /test/hello-world/src/views/Home.vue
@@ -824,7 +824,7 @@ export default {
   width: 100%;
   height: 85px;
   font-family: "YouSheBiaoTiHei";
-  font-size: 40px;
+  font-size: 45px;
   font-weight: normal;
   line-height: normal;
   letter-spacing: 0.08em;