natasha 2 vuotta sitten
vanhempi
commit
d69f3f916d

+ 6 - 0
public/index.html

@@ -6,6 +6,12 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
+    <link rel="preload" href="https://file-kf.helxsoft.cn/CSFileServer/URL/003/CE253E409C59E8F2659D34B38B756FDA99991231240000FI9VBLVBGENZUGTIFNABGIVPVH8HFCSQBYXNLLPC_00301-20230131-10-90GQ08AX.TTF" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="https://file-kf.helxsoft.cn/CSFileServer/URL/003/8743B91A9CF9F8078447E94D62E076E799991231240000GLVGVG84F2SSBWXQLKPAFB9WBPVJGONPUYTEFOAD_00301-20230131-10-CJQKXBLV.TTF" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="https://file-kf.helxsoft.cn/CSFileServer/URL/001/7D3BE676EDFAD1478A6FE848269820EF99991231240000PVA2LYFQXMTMBAUQSPN7FSG28ZVKVVBFVL9UGZFB_00102-20230131-10-1J2DHRAK.TTF" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="https://file-kf.helxsoft.cn/CSFileServer/URL/003/99CF08C241EA29498978EA80A3CCB7B399991231240000FUGE90VIBFVZVV8WG7F0N6SIUQBYTXXAFSLCABPA_00301-20230131-10-XI8JE4B2.TTF" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="https://file-kf.helxsoft.cn/CSFileServer/URL/001/C94319C15F2CCAC1D7E52B47147C10F199991231240000FM96BUVEGNN5UKTVFPAWGBVNVJ8VFDSVB1XPLGPC_00101-20230131-10-MT9ILQEX.TTF" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="https://file-kf.helxsoft.cn/CSFileServer/URL/001/B89A18DBD51991ACB45D2989689F4C0A99991231240000G9V0VL82FMSBBMXKLFPLFM9RBMVPGHNHUOTYFTAD_00101-20230130-18-Z0TABOBO.TTF" as="font" type="font/ttf" crossorigin="anonymous">
     <!-- <link rel="icon" href="<%= BASE_URL %>favicon.ico"> -->
     <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
     <title>

BIN
src/assets/teacherdev/fzbsxjf.png


BIN
src/assets/teacherdev/fzbysk.png


BIN
src/assets/teacherdev/fzcbzbksjf.png


BIN
src/assets/teacherdev/fzfyksjc.png


BIN
src/assets/teacherdev/fzmz.png


BIN
src/assets/teacherdev/fzskbxkk.png


+ 73 - 42
src/common/font/font.css

@@ -1,99 +1,130 @@
 @font-face {
-  font-family: 'FZJCGFKTK';
-  src: url('FZJCGFKTK.TTF');
-  font-weight: normal;
-  font-style: normal;
+    font-family: 'FZJCGFKTK';
+    src: url('FZJCGFKTK.TTF');
+    font-weight: normal;
+    font-style: normal;
 }
 
 @font-face {
-  font-family: 'GB-PINYINOK-A';
-  src: url('GB PINYINOK-A.TTF');
+    font-family: 'GB-PINYINOK-A';
+    src: url('GB PINYINOK-A.TTF');
 }
 
 @font-face {
-  font-family: 'GB-PINYINOK-B';
-  src: url('GB PINYINOK-B.TTF');
+    font-family: 'GB-PINYINOK-B';
+    src: url('GB PINYINOK-B.TTF');
 }
 
 @font-face {
-  font-family: 'GB-PINYINOK-C';
-  src: url('GB PINYINOK-C.TTF');
+    font-family: 'GB-PINYINOK-C';
+    src: url('GB PINYINOK-C.TTF');
 }
 
 @font-face {
-  font-family: 'GB-PINYINOK-D';
-  src: url('GB PINYINOK-D.TTF');
+    font-family: 'GB-PINYINOK-D';
+    src: url('GB PINYINOK-D.TTF');
 }
 
 @font-face {
-  font-family: 'GB-PINYINOK-E';
-  src: url('GB PINYINOK-E.TTF');
+    font-family: 'GB-PINYINOK-E';
+    src: url('GB PINYINOK-E.TTF');
 }
 
 @font-face {
-  font-family: 'GB-PINYINOK-F';
-  src: url('GB PINYINOK-F.TTF');
+    font-family: 'GB-PINYINOK-F';
+    src: url('GB PINYINOK-F.TTF');
 }
 
 @font-face {
-  font-family: 'GB-PINYINOK-G';
-  src: url('GB PINYINOK-G.TTF');
+    font-family: 'GB-PINYINOK-G';
+    src: url('GB PINYINOK-G.TTF');
 }
 
 @font-face {
-  font-family: 'GB-PINYINOK-H';
-  src: url('GB PINYINOK-H.TTF');
+    font-family: 'GB-PINYINOK-H';
+    src: url('GB PINYINOK-H.TTF');
 }
 
 @font-face {
-  font-family: 'GB-PINYINOK-I';
-  src: url('GB PINYINOK-I.TTF');
+    font-family: 'GB-PINYINOK-I';
+    src: url('GB PINYINOK-I.TTF');
 }
 
 @font-face {
-  font-family: 'GB-PINYINOK-J';
-  src: url('GB PINYINOK-J.TTF');
+    font-family: 'GB-PINYINOK-J';
+    src: url('GB PINYINOK-J.TTF');
 }
 
 @font-face {
-  font-family: 'GB-PINYINOK';
-  src: url('GB PINYINOK.TTF');
+    font-family: 'GB-PINYINOK';
+    src: url('GB PINYINOK.TTF');
 }
 
 @font-face {
-  font-family: 'iconFont';
-  src: url('iconfont.woff');
+    font-family: 'iconFont';
+    src: url('iconfont.woff');
 }
 
 @font-face {
-  font-family: 'robot';
-  src: url('Roboto-Regular.ttf');
+    font-family: 'robot';
+    src: url('Roboto-Regular.ttf');
 }
 
 @font-face {
-  font-family: 'sourceR';
-  src: url('SourceSansPro-Regular.ttf');
+    font-family: 'sourceR';
+    src: url('SourceSansPro-Regular.ttf');
 }
 
 @font-face {
-  font-family: 'FZKT-GBK';
-  src: url('FZKTK.TTF');
+    font-family: 'FZKT-GBK';
+    src: url('FZKTK.TTF');
 }
 
 @font-face {
-  font-family: 'FZLTH';
-  src: url('FZLTHJW.TTF');
+    font-family: 'FZLTH';
+    src: url('FZLTHJW.TTF');
 }
 
 @font-face {
-  font-family: 'FZSS';
-  src: url('FZSSJW.TTF');
+    font-family: 'FZSS';
+    src: url('FZSSJW.TTF');
 }
+
 @font-face {
-  font-family: 'FZPY';
-  src: url('FZPY.TTF');
+    font-family: 'FZPY';
+    src: url('FZPY.TTF');
+}
+
+@font-face {
+    font-family: 'fzbsxjf';
+    src: url('https://file-kf.helxsoft.cn/CSFileServer/URL/003/CE253E409C59E8F2659D34B38B756FDA99991231240000FI9VBLVBGENZUGTIFNABGIVPVH8HFCSQBYXNLLPC_00301-20230131-10-90GQ08AX.TTF');
+}
+
+@font-face {
+    font-family: 'fzbysk';
+    src: url('https://file-kf.helxsoft.cn/CSFileServer/URL/003/8743B91A9CF9F8078447E94D62E076E799991231240000GLVGVG84F2SSBWXQLKPAFB9WBPVJGONPUYTEFOAD_00301-20230131-10-CJQKXBLV.TTF');
+}
+
+@font-face {
+    font-family: 'fzcbzbksjf';
+    src: url('https://file-kf.helxsoft.cn/CSFileServer/URL/001/7D3BE676EDFAD1478A6FE848269820EF99991231240000PVA2LYFQXMTMBAUQSPN7FSG28ZVKVVBFVL9UGZFB_00102-20230131-10-1J2DHRAK.TTF');
 }
-#app {
-  font-family: "sourceR";
 
+@font-face {
+    font-family: 'fzfyksjc';
+    src: url('https://file-kf.helxsoft.cn/CSFileServer/URL/003/99CF08C241EA29498978EA80A3CCB7B399991231240000FUGE90VIBFVZVV8WG7F0N6SIUQBYTXXAFSLCABPA_00301-20230131-10-XI8JE4B2.TTF');
+}
+
+@font-face {
+    font-family: 'fzskbxkk';
+    src: url('https://file-kf.helxsoft.cn/CSFileServer/URL/001/C94319C15F2CCAC1D7E52B47147C10F199991231240000FM96BUVEGNN5UKTVFPAWGBVNVJ8VFDSVB1XPLGPC_00101-20230131-10-MT9ILQEX.TTF');
+}
+
+@font-face {
+    font-family: 'fz1';
+    src: url('https://file-kf.helxsoft.cn/CSFileServer/URL/001/B89A18DBD51991ACB45D2989689F4C0A99991231240000G9V0VL82FMSBBMXKLFPLFM9RBMVPGHNHUOTYFTAD_00101-20230130-18-Z0TABOBO.TTF');
+}
+
+#app {
+    font-family: "sourceR";
 }

+ 17 - 15
src/views/CalligraphyMaster/cread.vue

@@ -641,24 +641,28 @@ export default {
       } else {
         fontArray = [
           {
-            value: "FZJCGFKTK",
-            img: require("../../assets/teacherdev/img1.png"),
+            value: "fzbsxjf",
+            img: require("../../assets/teacherdev/fzbsxjf.png"),
           },
           {
-            value: "FZLTH",
-            img: require("../../assets/teacherdev/img2.png"),
+            value: "fzbysk",
+            img: require("../../assets/teacherdev/fzbysk.png"),
           },
           {
-            value: "sourceR",
-            img: require("../../assets/teacherdev/img1.png"),
+            value: "fzcbzbksjf",
+            img: require("../../assets/teacherdev/fzcbzbksjf.png"),
           },
           {
-            value: "robot",
-            img: require("../../assets/teacherdev/img2.png"),
+            value: "fzfyksjc",
+            img: require("../../assets/teacherdev/fzfyksjc.png"),
           },
           {
-            value: "iconFont",
-            img: require("../../assets/teacherdev/img1.png"),
+            value: "fzskbxkk",
+            img: require("../../assets/teacherdev/fzskbxkk.png"),
+          },
+          {
+            value: "fz1",
+            img: require("../../assets/teacherdev/fzmz.png"),
           },
         ];
       }
@@ -704,9 +708,7 @@ export default {
           classname +
           '"><img src="' +
           fontArray[i].img +
-          '" /><p>' +
-          fontArray[i].value +
-          "</p></li>";
+          '" /></li>';
       }
       fontSelectHTML += "</ul></div>";
 
@@ -1193,7 +1195,7 @@ export default {
   }
   .font-select-list {
     display: flex;
-    width: 100px;
+    width: 200px;
     flex-flow: wrap;
     position: absolute;
     z-index: 1;
@@ -1205,7 +1207,7 @@ export default {
     li {
       background: #ffffff;
       font-size: 0;
-      padding: 10px 5px;
+      padding: 0 5px;
       cursor: pointer;
       img {
         width: 100%;