From b9619270312e01d3514cdb50112e09d477fa4431 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期一, 30 十二月 2024 12:01:07 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/aviationEtiquette/assets/Fonts/boYa.ttf | 0
src/books/aviationEtiquette/assets/Fonts/fangZheng.ttf | 0
src/books/aviationEtiquette/assets/Fonts/zhongdengxian.ttf | 0
src/books/aviationEtiquette/view/components/header.vue | 15 +++++--
src/books/aviationEtiquette/assets/main.less | 80 ++++++++++++++++++++++++++++------------
src/books/aviationEtiquette/assets/Fonts/fangSong.ttf | 0
src/books/aviationEtiquette/assets/Fonts/zhunyuan.ttf | 0
src/books/civilAviation/assets/main.less | 2
8 files changed, 68 insertions(+), 29 deletions(-)
diff --git a/src/books/aviationEtiquette/assets/Fonts/boYa.ttf b/src/books/aviationEtiquette/assets/Fonts/boYa.ttf
new file mode 100644
index 0000000..c724961
--- /dev/null
+++ b/src/books/aviationEtiquette/assets/Fonts/boYa.ttf
Binary files differ
diff --git a/src/books/aviationEtiquette/assets/Fonts/fangSong.ttf b/src/books/aviationEtiquette/assets/Fonts/fangSong.ttf
new file mode 100644
index 0000000..16eb427
--- /dev/null
+++ b/src/books/aviationEtiquette/assets/Fonts/fangSong.ttf
Binary files differ
diff --git a/src/books/aviationEtiquette/assets/Fonts/fangZheng.ttf b/src/books/aviationEtiquette/assets/Fonts/fangZheng.ttf
new file mode 100644
index 0000000..61c570e
--- /dev/null
+++ b/src/books/aviationEtiquette/assets/Fonts/fangZheng.ttf
Binary files differ
diff --git a/src/books/aviationEtiquette/assets/Fonts/zhongdengxian.ttf b/src/books/aviationEtiquette/assets/Fonts/zhongdengxian.ttf
new file mode 100644
index 0000000..040d2a1
--- /dev/null
+++ b/src/books/aviationEtiquette/assets/Fonts/zhongdengxian.ttf
Binary files differ
diff --git a/src/books/aviationEtiquette/assets/Fonts/zhunyuan.ttf b/src/books/aviationEtiquette/assets/Fonts/zhunyuan.ttf
new file mode 100644
index 0000000..0e453d3
--- /dev/null
+++ b/src/books/aviationEtiquette/assets/Fonts/zhunyuan.ttf
Binary files differ
diff --git a/src/books/aviationEtiquette/assets/main.less b/src/books/aviationEtiquette/assets/main.less
index 96d7c92..c58c043 100644
--- a/src/books/aviationEtiquette/assets/main.less
+++ b/src/books/aviationEtiquette/assets/main.less
@@ -764,7 +764,6 @@
list-style-type: none;
}
-
.custom_tag2 {
background-color: #F1BE49;
color: #FFFFFF;
@@ -968,10 +967,23 @@
- .block {}
+ .block {
+ font-family: "瀹嬩綋";
+ margin-top: 0.2em;
+ margin-bottom: 0.2em !important;
+ text-indent: 2em;
+ line-height: 30px;
+ font-size: 16px;
+ text-align: justify;
+ }
.block1 {
text-align: center;
+ }
+
+ .block2 {
+ font-family: "FANGSONG";
+ font-size: 17px;
}
@@ -1027,8 +1039,8 @@
.left {
text-indent: 0em;
- margin-left: 0%;
- margin-right: 0%;
+ margin: 0 !important;
+ line-height: 20px;
}
.left2 {
@@ -1037,6 +1049,10 @@
font-weight: bold;
margin-left: 0%;
margin-right: 0%;
+ }
+ .left3 {
+ margin: 0 !important;
+ line-height: 20px;
}
.right {
@@ -1290,10 +1306,9 @@
}
.zt-ls1 {
- color: #197BBC;
- font-size: 1.2em;
+ color: #000;
+ font-size: 16px;
font-weight: bold;
-
}
span.lsyq-1 {
@@ -1739,18 +1754,42 @@
@font-face {
font-family: 'FZLTZHJW';
src: url('./Fonts/FZLTZHJW.ttf');
-}
-
-@font-face {
+ }
+
+ @font-face {
font-family: 'FZLTXIHJW';
src: url('./Fonts/FZLTXIHJW.ttf');
-}
-
-@font-face {
+ }
+
+ @font-face {
font-family: 'FZHTJW';
src: url('./Fonts/FZHTJW.ttf');
-}
-
+ }
+
+ @font-face {
+ font-family: 'FANGSONG';
+ src: url('./Fonts/fangSong.ttf');
+ }
+
+ @font-face {
+ font-family: 'FANGZHENG';
+ src: url('./Fonts/fangZheng.ttf');
+ }
+
+ @font-face {
+ font-family: 'ZHUNYUAN';
+ src: url('./Fonts/zhunyuan.ttf');
+ }
+
+ @font-face {
+ font-family: 'ZHONGDENGXIAN';
+ src: url('./Fonts/zhongdengxian.ttf');
+ }
+
+ @font-face {
+ font-family: 'BOYA';
+ src: url('./Fonts/boYa.ttf');
+ }
// 闅愯棌椤甸潰
.hidePage {
@@ -1762,11 +1801,7 @@
/* 濯掍綋鏌ヨ鍋氬熀纭�鍝嶅簲寮忓竷灞� */
@media screen and (max-width: 1024px) {
- .pdfModal {
- width: 100%;
- height: 80vh;
- }
-
+
.custom-dialog {
.el-dialog {
width: 90vw !important;
@@ -1775,10 +1810,7 @@
}
@media screen and (max-width: 800px) {
- .pdfModal {
- width: 100%;
- height: 60vh;
- }
+
.custom-dialog {
.el-dialog {
diff --git a/src/books/aviationEtiquette/view/components/header.vue b/src/books/aviationEtiquette/view/components/header.vue
index 8545036..4949b05 100644
--- a/src/books/aviationEtiquette/view/components/header.vue
+++ b/src/books/aviationEtiquette/view/components/header.vue
@@ -29,14 +29,20 @@
<p class="left3 block mt-20">
鈪�.鈶犳皯鈥� 鈪�.鈶犳潕鈥� 鈶￠瓘鈥� 鈪�.鈶犳皯鐢ㄨ埅绌衡�斾箻鍔′汉鍛樷�旂ぜ浠�旇亴涓氭暀鑲测�旀暀鏉� 鈪�.鈶燜560.9
</p>
- <p class="left3 block">涓浗鍥藉鐗堟湰棣咰IP鏁版嵁鏍稿瓧锛�2023锛夌242225鍙�</p>
+ <p class="left3 block mt-20">
+ 涓浗鍥藉鐗堟湰棣咰IP鏁版嵁鏍稿瓧锛�2023锛夌242225鍙�
+ </p>
+ <hr />
<p><br /></p>
- <p class="left block">鍥句功鎰忚鍙嶉锛歾hijiao@bnupg.com</p>
+ <p><br /></p>
+ <p><br /></p>
+ <p class="left block mt-20">鍥句功鎰忚鍙嶉锛歾hijiao@bnupg.com</p>
<p class="left block">钀ラ攢涓績鐢佃瘽锛�010-58802755 58800035</p>
<p class="left block">缂栬緫閮ㄧ數璇濓細010-58802751</p>
+ <hr />
<p class="left block">鍑虹増鍙戣锛氬寳浜笀鑼冨ぇ瀛﹀嚭鐗堢ぞ www.bnupg.com</p>
- <p class="left block">鍖椾含甯傝タ鍩庡尯鏂拌鍙ｅ澶ц12-3鍙�</p>
- <p class="left block">閭斂缂栫爜锛�100088</p>
+ <p class="left block">銆�銆�銆�銆�銆�鍖椾含甯傝タ鍩庡尯鏂拌鍙ｅ澶ц12-3鍙�</p>
+ <p class="left block">銆�銆�銆�銆�銆�閭斂缂栫爜锛�100088</p>
<p class="left block">鍗般��銆�鍒凤細鍖椾含鐜鸿瘹鍗板姟鏈夐檺鍏徃</p>
<p class="left block">缁忋��銆�閿�锛氬叏鍥芥柊鍗庝功搴�</p>
<p class="left block">寮�銆�銆�鏈細889mm脳1194mm 1/16</p>
@@ -45,6 +51,7 @@
<p class="left block">鐗堛��銆�娆★細2024骞�11鏈堢1鐗�</p>
<p class="left block">鍗般��銆�娆★細2024骞�11鏈堢1娆″嵃鍒�</p>
<p class="left block">瀹氥��銆�浠凤細38.00鍏�</p>
+ <hr />
<p class="left block">绛栧垝缂栬緫锛氱帇浜戣嫳銆�銆�璐ｄ换缂栬緫锛氱帇璐鸿悓</p>
<p class="left block">缇庢湳缂栬緫锛氱劍銆�涓姐��銆�瑁呭抚璁捐锛氱劍銆�涓�</p>
<p class="left block">璐ｄ换鏍″锛氶檲銆�鑽熴��銆�璐ｄ换鍗板埗锛氳档銆�榫�</p>
diff --git a/src/books/civilAviation/assets/main.less b/src/books/civilAviation/assets/main.less
index 281ce24..9e0c245 100644
--- a/src/books/civilAviation/assets/main.less
+++ b/src/books/civilAviation/assets/main.less
@@ -866,7 +866,7 @@
}
.left3 {
- margin: 20 0 0 0 !important;
+ margin: 20px 0 0 0 !important;
line-height: 20px;
}
--
Gitblit v1.9.1