11wqe1 11 mesiacov pred
rodič
commit
245473190c

+ 69 - 0
src/assets/icon/exportPdfworks/MaskGroup.svg

@@ -0,0 +1,69 @@
+<svg width="151" height="28" viewBox="0 0 151 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_267_1565" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="151" height="28">
+<path d="M150.883 0H0V28H150.883V0Z" fill="black"/>
+</mask>
+<g mask="url(#mask0_267_1565)">
+<mask id="mask1_267_1565" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="151" height="28">
+<path d="M150.883 0H0V28H150.883V0Z" fill="white"/>
+</mask>
+<g mask="url(#mask1_267_1565)">
+<path d="M30.6778 5.31717C30.6778 5.11279 30.6778 5.1128 30.4849 4.90842C30.2919 4.49966 30.099 4.0909 30.099 3.68214C27.7836 -0.405454 20.2588 -1.22297 12.541 1.84272C4.63028 4.70404 -0.772173 10.631 -0.00039427 15.3318C-0.00039427 15.7405 0.19255 16.1493 0.385495 16.3537C0.385495 16.5581 0.385495 16.7624 0.57844 16.7624C3.66556 25.5508 12.9269 30.0471 21.2235 26.777C29.3272 23.507 33.572 13.9011 30.6778 5.31717ZM23.5389 16.3537L22.3812 15.7405C21.0306 16.5581 19.487 17.3756 17.9435 17.9887C10.4186 20.85 3.08672 19.8281 1.73611 15.7405C0.385495 11.6529 5.20911 5.93031 12.9269 3.069C20.6447 0.207685 27.5907 1.0252 29.1343 5.1128C29.906 7.56535 28.5554 10.631 25.6613 13.288V17.58L23.5389 16.3537Z" fill="#2E5AA8"/>
+</g>
+<mask id="mask2_267_1565" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="151" height="28">
+<path d="M150.883 0H0V28H150.883V0Z" fill="white"/>
+</mask>
+<g mask="url(#mask2_267_1565)">
+<path d="M22.3815 12.267C24.8897 10.2232 26.2404 7.97505 25.4686 6.34001C24.5039 3.4787 19.1014 2.86556 13.506 5.11374C7.9106 7.36191 3.85876 11.4495 4.82349 14.1064C5.78821 16.7634 11.1907 17.5809 16.979 15.3327C17.9437 14.924 19.1014 14.5152 20.0661 13.9021L22.3815 15.7415V12.267Z" fill="#2E5AA8"/>
+</g>
+<mask id="mask3_267_1565" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="151" height="28">
+<path d="M150.883 0H0V28H150.883V0Z" fill="white"/>
+</mask>
+<g mask="url(#mask3_267_1565)">
+<path d="M53.0597 15.3287C52.6738 18.3944 50.3584 21.0513 46.4995 21.0513C42.0618 21.0513 39.5535 17.7812 39.5535 13.898C39.5535 10.0148 42.0618 6.74475 46.3066 6.74475C50.3584 6.74475 52.6738 9.40168 53.0597 12.6718H49.2008C49.0078 11.4455 48.0431 10.4236 46.4995 10.4236C44.5701 10.4236 43.4124 12.0586 43.4124 13.898C43.4124 15.9418 44.5701 17.3725 46.4995 17.3725C47.8502 17.3725 48.8149 16.3506 49.0078 15.3287H53.0597Z" fill="#2E5AA8"/>
+</g>
+<mask id="mask4_267_1565" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="151" height="28">
+<path d="M150.883 0H0V28H150.883V0Z" fill="white"/>
+</mask>
+<g mask="url(#mask4_267_1565)">
+<path d="M53.8323 14.1012C53.8323 10.4223 56.3406 6.94788 60.7783 6.94788C65.216 6.94788 67.7243 10.2179 67.7243 14.1012C67.7243 17.9844 65.216 21.2544 60.7783 21.2544C56.3406 21.2544 53.8323 17.78 53.8323 14.1012ZM63.8654 14.1012C63.8654 12.2617 62.7077 10.6267 60.7783 10.6267C58.8488 10.6267 57.6912 12.2617 57.6912 14.1012C57.6912 15.9406 58.8488 17.5756 60.7783 17.5756C62.7077 17.3712 63.8654 15.7362 63.8654 14.1012Z" fill="#2E5AA8"/>
+</g>
+<mask id="mask5_267_1565" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="151" height="28">
+<path d="M150.883 0H0V28H150.883V0Z" fill="white"/>
+</mask>
+<g mask="url(#mask5_267_1565)">
+<path d="M82.1944 15.3287C81.8085 18.3944 79.4931 21.0513 75.6342 21.0513C71.1965 21.0513 68.6882 17.7812 68.6882 13.898C68.6882 10.0148 71.1965 6.74475 75.4413 6.74475C79.4931 6.74475 81.8085 9.40168 82.1944 12.6718H78.3355C78.1425 11.4455 77.1778 10.4236 75.6342 10.4236C73.7048 10.4236 72.5471 12.0586 72.5471 13.898C72.5471 15.9418 73.7048 17.3725 75.6342 17.3725C76.9849 17.3725 77.9496 16.3506 78.1425 15.3287H82.1944Z" fill="#2E5AA8"/>
+</g>
+<mask id="mask6_267_1565" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="151" height="28">
+<path d="M150.883 0H0V28H150.883V0Z" fill="white"/>
+</mask>
+<g mask="url(#mask6_267_1565)">
+<path d="M83.1599 14.1012C83.1599 10.4223 85.6682 6.94788 90.1059 6.94788C94.3507 6.94788 97.0519 10.2179 97.0519 14.1012C97.0519 17.9844 94.5437 21.2544 90.1059 21.2544C85.6682 21.0501 83.1599 17.78 83.1599 14.1012ZM93.0001 14.1012C93.0001 12.2617 91.8424 10.6267 89.913 10.6267C87.9835 10.6267 86.8259 12.2617 86.8259 14.1012C86.8259 15.9406 87.9835 17.5756 89.913 17.5756C91.8424 17.3712 93.0001 15.7362 93.0001 14.1012Z" fill="#2E5AA8"/>
+</g>
+<mask id="mask7_267_1565" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="151" height="28">
+<path d="M150.883 0H0V28H150.883V0Z" fill="white"/>
+</mask>
+<g mask="url(#mask7_267_1565)">
+<path d="M98.4018 7.35873H104.383C107.277 7.35873 109.207 9.60691 109.207 12.2638C109.207 14.1033 108.435 15.7383 106.891 16.5558L109.4 20.6434H104.962L102.84 17.3733H102.068V20.8478H98.4018V7.35873ZM105.348 12.2638C105.348 11.2419 104.769 10.4244 103.611 10.4244H102.068V14.3076H103.611C104.769 14.1033 105.348 13.2857 105.348 12.2638Z" fill="#2E5AA8"/>
+</g>
+<mask id="mask8_267_1565" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="151" height="28">
+<path d="M150.883 0H0V28H150.883V0Z" fill="white"/>
+</mask>
+<g mask="url(#mask8_267_1565)">
+<path d="M110.365 14.1012C110.365 10.4223 112.873 6.94788 117.311 6.94788C121.555 6.94788 124.257 10.2179 124.257 14.1012C124.257 17.9844 121.748 21.2544 117.311 21.2544C112.873 21.0501 110.365 17.78 110.365 14.1012ZM120.205 14.1012C120.205 12.2617 119.047 10.6267 117.118 10.6267C115.188 10.6267 114.031 12.2617 114.031 14.1012C114.031 15.9406 115.188 17.5756 117.118 17.5756C119.047 17.3712 120.205 15.7362 120.205 14.1012Z" fill="#2E5AA8"/>
+</g>
+<mask id="mask9_267_1565" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="151" height="28">
+<path d="M150.883 0H0V28H150.883V0Z" fill="white"/>
+</mask>
+<g mask="url(#mask9_267_1565)">
+<path d="M125.607 7.35873H131.781C135.254 7.35873 135.833 9.60691 135.833 11.0376C135.833 12.4682 134.868 13.6945 133.71 14.1033C134.482 14.1033 136.026 15.1252 136.026 17.169C136.026 18.5996 135.447 20.8478 131.974 20.8478H125.8V7.35873H125.607ZM130.623 12.4682C131.781 12.4682 132.167 11.8551 132.167 11.0376C132.167 10.4244 131.974 9.60691 130.623 9.60691H129.273V12.2638H130.623V12.4682ZM129.273 15.1252V17.7821H130.623C131.781 17.7821 132.167 17.169 132.167 16.3514C132.167 15.7383 131.781 14.9208 130.623 14.9208H129.273V15.1252Z" fill="#2E5AA8"/>
+</g>
+<mask id="mask10_267_1565" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="151" height="28">
+<path d="M150.883 0H0V28H150.883V0Z" fill="white"/>
+</mask>
+<g mask="url(#mask10_267_1565)">
+<path d="M137.184 14.1012C137.184 10.4223 139.692 6.94788 144.13 6.94788C148.374 6.94788 151.076 10.2179 151.076 14.1012C151.076 17.9844 148.567 21.2544 144.13 21.2544C139.692 21.2544 137.184 17.78 137.184 14.1012ZM147.024 14.1012C147.024 12.2617 145.866 10.6267 143.937 10.6267C142.007 10.6267 140.85 12.2617 140.85 14.1012C140.85 15.9406 142.007 17.5756 143.937 17.5756C145.866 17.3712 147.024 15.7362 147.024 14.1012Z" fill="#2E5AA8"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.9467 26.1145C29.3702 22.933 33.5306 12.6816 30.4392 4.63035C28.6042 -0.148856 20.3845 -1.43832 12.08 1.75029C3.77551 4.93888 -1.46902 11.3981 0.366002 16.1773C4.9788 27.175 14.5233 29.296 21.9467 26.1145ZM18.1994 17.4963C10.6646 20.3894 3.3079 19.4832 1.76785 15.4722C0.227798 11.4613 5.08756 5.86442 12.6224 2.97134C20.1573 0.0782516 27.5139 0.98446 29.054 4.99541C30.003 7.46712 28.5217 10.5411 25.4817 13.2134V17.2771L22.3041 15.5096C21.0581 16.2545 19.6804 16.9276 18.1994 17.4963Z" fill="#2E5AA8"/>
+<path d="M4.82413 13.9556C5.88935 16.7299 11.3498 17.2139 17.0204 15.0366C18.0806 14.6295 19.0731 14.1583 19.9791 13.6429L22.2997 15.5097L22.2997 12.0812C24.7714 10.1044 26.037 7.83663 25.3591 6.07102C24.2939 3.29673 18.8334 2.81276 13.1629 4.99003C7.49229 7.16731 3.75892 11.1813 4.82413 13.9556Z" fill="#2E5AA8"/>
+</g>
+</svg>

+ 14 - 3
src/components/pages/components/exportDataDialog.vue

@@ -34,11 +34,12 @@
         </div>
         <div class="coverPageFrom" style="z-index: 10;">
           <div class="coverPageFromTit">
-            <img
+            <!-- <img
               style="width: 90%;"
               src="../../../assets/icon/exportPdfworks/title.svg"
               alt=""
-            />
+            /> -->
+            學生學習報告
           </div>
           <div class="termC">
             <div><span>2023-2024</span>学年</div>
@@ -1268,7 +1269,7 @@ export default {
       imgList: [
         {
           schoolId: "45facc0a-1211-11ec-80ad-005056b86db5",
-          logo: require("../../../assets/icon/exportPdfworks/cocoroboLogo.svg"),
+          logo: require("../../../assets/icon/exportPdfworks/MaskGroup.svg"),
           conImg: require("../../../assets/icon/exportPdfworks/cocoroboCon.svg"),
           bjLogo: require("../../../assets/icon/exportPdfworks/logo2.svg"),
           bkColor: "#E5EFFE"
@@ -4459,6 +4460,16 @@ export default {
   display: flex;
   justify-content: center;
   width: 100%;
+  font-family: Roboto;
+  font-size: 56px;
+  font-weight: 900;
+  line-height: 64px;
+  letter-spacing: 0.12em;
+  text-align: center;
+  text-underline-position: from-font;
+  text-decoration-skip-ink: none;
+  
+  color: rgba(92, 80, 70, 1);
 }
 .fromCss {
   border: 1.5px dashed rgba(158, 208, 255, 1);

+ 1 - 1
src/components/pages/components/exportWorksDialog.vue

@@ -808,7 +808,7 @@ export default {
       imgList: [
         {
           schoolId: "45facc0a-1211-11ec-80ad-005056b86db5",
-          logo: require("../../../assets/icon/exportPdfworks/cocoroboLogo.svg"),
+          logo: require("../../../assets/icon/exportPdfworks/MaskGroup.svg"),
           conImg: require("../../../assets/icon/exportPdfworks/cocoroboCon.svg"),
           bjLogo: require("../../../assets/icon/exportPdfworks/logo2.svg"),
           bkColor: "#FFFBDC"