From 009933dde9463595cd759e539c94f3ab2e175dfc Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期一, 30 十二月 2024 15:16:16 +0800
Subject: [PATCH] 礼仪
---
src/books/aviationSafety/view/components/index.vue | 2
src/books/aviationSafety/assets/main.less | 22 +++++++---
src/books/aviationEtiquette/view/components/chapter001.vue | 43 +++++++++++----------
src/books/aviationEtiquette/assets/main.less | 9 ++--
src/App.vue | 1
src/books/aviationEtiquette/view/components/index.vue | 6 +-
6 files changed, 47 insertions(+), 36 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index a2980c7..c2270fc 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -99,6 +99,7 @@
// meetingPlanners
// aviationBasicSkills
// aviationSafety
+ // aviationEtiquette
this.activeBook = await this.config.getBookConfig(
process.env.VUE_APP_RESOURCE_CTX +
(process.env.VUE_APP_ENV == "product"
diff --git a/src/books/aviationEtiquette/assets/main.less b/src/books/aviationEtiquette/assets/main.less
index c58c043..c8ee4d5 100644
--- a/src/books/aviationEtiquette/assets/main.less
+++ b/src/books/aviationEtiquette/assets/main.less
@@ -966,9 +966,8 @@
}
-
.block {
- font-family: "瀹嬩綋";
+ font-family: "kaiti";
margin-top: 0.2em;
margin-bottom: 0.2em !important;
text-indent: 2em;
@@ -982,7 +981,7 @@
}
.block2 {
- font-family: "FANGSONG";
+ // font-family: "FANGSONG";
font-size: 17px;
}
@@ -1366,11 +1365,11 @@
position: relative;
p {
- font-family: ZHONGDENGXIAN;
+ // font-family: ZHONGDENGXIAN;
}
span {
- font-family: ZHUNYUAN;
+ // font-family: ZHUNYUAN;
}
}
diff --git a/src/books/aviationEtiquette/view/components/chapter001.vue b/src/books/aviationEtiquette/view/components/chapter001.vue
index 2ae67dd..0b641ba 100644
--- a/src/books/aviationEtiquette/view/components/chapter001.vue
+++ b/src/books/aviationEtiquette/view/components/chapter001.vue
@@ -41,7 +41,7 @@
<div class="bk2">
<div class="zysx">
<p>
- <span class="zt-zysx1">瀵�</span><span class="zt-zysx1">绀�</span><span class="zt-zysx1">涔�</span><span
+ <span class="zt-zysx1">瀵�</span><span class="zt-zysx1">绀�</span><span class="zt-zysx1">涔�</span><span
class="zt-zysx1">闂�</span>
</p>
</div>
@@ -58,8 +58,8 @@
<div v-if="showPageList.indexOf(8) > -1">
<ul class="fl al-c jc-sb pad-t-55 pad-l-80 pad-r-80">
<li class="header-left-Number">
- <span class="mr-10">2</span>
- <span><span class="span-box-title"></span>姘戣埅鏈嶅姟绀间华<span class="span-box-title"></span></span>
+ <span class="mr-10">2</span>
+ <span><span class="span-box-title"></span>姘戣埅鏈嶅姟绀间华<span class="span-box-title"></span></span>
</li>
<li class="header-left-text">
<img class="w80" src="../../assets/images/yemei01.png" alt="" />
@@ -102,11 +102,11 @@
<li class="header-right-Number header-right-title">妯″潡涓�</li>
<li class="header-right-Number">姘戣埅绀间华涓庢湇鍔¤兘鍔涜鐭�</li>
<li class="header-right-Number">3</li>
- <li class="header-right-Number"><img class="" src="../../assets/images/yemei02.png" alt="" /></li>
- <li class="header-right-last" style=""><br></li>
- <li class="header-right-end" style=""><br></li>
+ <li class="header-right-Number"><img class="" src="../../assets/images/yemei02.png" alt="" /></li>
+ <li class="header-right-last"><br></li>
+ <li class="header-right-end"><br></li>
</ul>
- <div class="bodystyle">
+ <div class="bodystyle p-even">
<h6 id="f004">4.绀间负浜烘�у拰鐜鐭涚浘鐨勪骇鐗�</h6>
<p>
鈥滈娓婇棶浠併�傚瓙鏇帮細鈥樺厠宸卞绀间负浠併�備竴鏃ュ厠宸卞绀硷紝澶╀笅褰掍粊鐒夈�傗�濓紙銆婅璇烽娓娿�嬶級鍏嬪繁鏄鑷垜鐨勭鐞嗭紝浜轰笌鐜浼氫骇鐢熺煕鐩撅紝鑰岃В鍐宠繖绉嶇煕鐩剧殑鏂规硶灏辨槸鈥滃厠宸扁�濄�傚瓟瀛愪竴鐩存妸瀵逛汉鎬х殑绾︽潫鍜岀鐞嗕綔涓烘仮澶嶅懆绀肩殑閲嶈閫斿緞锛屼汉鏈夊悇绉嶆鏈涳紝闇�閫氳繃閬撳痉銆佺ぜ浠�佹硶寰嬬瓑褰㈠紡杩涜瑙勮寖锛屾晠绀间负浜烘�у拰鐜鐭涚浘鐨勪骇鐗┿��
@@ -129,7 +129,7 @@
鍛ㄥ叕鐨勨�滃埗绀间綔涔愨�濓紝瀹為檯涓婂氨鏄缓绔嬪懆浠ｇ殑涓�绯诲垪鍒跺害锛屽畠娑夊強鏀挎不銆佺粡娴庛�佹硶寰嬨�佺ぜ浠�佺キ绁�銆佹暀鑲茬瓑鍒跺害鍙婁箰鑸炴椿鍔紝鏄鍛ㄤ唬鐨勭ぞ浼氭斂娌绘枃鍖栧悇涓柟闈㈢殑杈冨叏闈㈢殑瑙勮寖銆傚湪鍒跺畾鍛ㄤ唬绀煎埗杩囩▼涓紝鍛ㄥ叕涓嶆槸绠�鍗曞湴閲嶅鍓嶄唬绀间华锛岃�屾槸鎶婄ぜ浠疮绌夸簬鎵�鏈夋椿鍔ㄤ腑锛屼粠鑰屽缓绔嬩簡涓�濂楀畬鏁淬�佸懆瀵嗙敋鑷崇儲鐞愮殑绀间华绯荤粺锛屼娇绀间华鍦ㄥ懆浠ｅ叿鏈夊叏鏂扮殑鎰忎箟銆�
</p>
<p>
- 鏄ョ鏃舵湡锛岀ぞ浼氱敓浜у姏鐨勫彂灞曪紝鏂板叴鍦颁富闃剁骇鐨勫嚭鐜板鑷粹�滅ぜ宕╀箰鍧忊�濓紝绀句細鍗佸垎娣蜂贡锛屾柊鏃у娍鍔涚殑鏂椾簤灏栭攼銆傚瓟瀛愬湪杩欎竴鏃舵湡鎻愬嚭鈥滀粊鈥濈殑鎬濇兂锛屽苟鎶婂畠鍚屸�滅ぜ鈥濇湁鏈虹粨鍚堝湪涓�璧凤紝褰㈡垚浜嗗剴瀹舵�濇兂浣撶郴鐨勬牳蹇冿紝鏋勬垚浜嗗剴瀹舵�濇兂鐨勭ぞ浼氶亾寰疯鑼冦�傚湪涓浗鏃╂湡鏂囨槑鍙蹭笂锛屽懆鐜嬫湞绀间箰鏂囨槑鎸佺画鏁扮櫨杞斤紝瀵逛腑鍗庢皯鏃忔枃鍖栧績鐞嗙殑濉戦�犱骇鐢熶簡閲嶈褰卞搷锛屾渶缁�
+ 鏄ョ鏃舵湡锛岀ぞ浼氱敓浜у姏鐨勫彂灞曪紝鏂板叴鍦颁富闃剁骇鐨勫嚭鐜板鑷粹�滅ぜ宕╀箰鍧忊�濓紝绀句細鍗佸垎娣蜂贡锛屾柊鏃у娍鍔涚殑鏂椾簤灏栭攼銆傚瓟瀛愬湪杩欎竴鏃舵湡鎻愬嚭鈥滀粊鈥濈殑鎬濇兂锛屽苟鎶婂畠鍚屸�滅ぜ鈥濇湁鏈虹粨鍚堝湪涓�璧凤紝褰㈡垚浜嗗剴瀹舵�濇兂浣撶郴鐨勬牳蹇冿紝鏋勬垚浜嗗剴瀹舵�濇兂鐨勭ぞ浼氶亾寰疯鑼冦�傚湪涓浗鏃╂湡鏂囨槑鍙蹭笂锛屽懆鐜嬫湞绀间箰鏂囨槑鎸佺画鏁扮櫨杞斤紝瀵逛腑鍗庢皯鏃忔枃鍖栧績鐞嗙殑濉戦�犱骇鐢熶簡閲嶈褰卞搷锛屾渶缁堢‘
</p>
</div>
</div>
@@ -139,15 +139,15 @@
<div v-if="showPageList.indexOf(10) > -1">
<ul class="fl al-c jc-sb pad-t-55 pad-l-80 pad-r-80">
<li class="header-left-Number">
- <span class="mr-10">4</span>
- <span><span class="span-box-title"></span>姘戣埅鏈嶅姟绀间华<span class="span-box-title"></span></span>
+ <span class="mr-10">4</span>
+ <span><span class="span-box-title"></span>姘戣埅鏈嶅姟绀间华<span class="span-box-title"></span></span>
</li>
<li class="header-left-text">
<img class="w80" src="../../assets/images/yemei01.png" alt="" />
</li>
</ul>
- <div class="bodystyle">
- <p>纭珛浜嗕腑鍥解�滅ぜ浠箣閭︹�濈殑鍘嗗彶鍦颁綅銆�</p>
+ <div class="bodystyle p-odd">
+ <p>绔嬩簡涓浗鈥滅ぜ浠箣閭︹�濈殑鍘嗗彶鍦颁綅銆�</p>
<div class="bk2">
<div class="zysx">
<p>
@@ -178,14 +178,14 @@
</p>
</div>
</div>
- <p><span class="bj2">路瑙︾ぜ鏃侀�毬�</span></p>
- <p>
+ <p class="td-0 mt-20 mb-20"><span class="bj2">路瑙︾ぜ鏃侀�毬�</span></p>
+ <p class="block">
鈥滅儹鐖辫嚜宸辩殑鐝骇锛岄伒瀹堢彮绾хぜ浠鑼冿紝灏嗕娇鐢ㄦ枃鏄庣ぜ璨岀敤璇綔涓轰範鎯紝灏嗗浜哄井绗戜綔涓轰慨鍏伙紝灏嗕负浠栦汉鏈嶅姟浣滀负绱犺川锛屽皢寰椾綋鐨勫寲濡嗗拰瑙勮寖鐨勭潃瑁呬綔涓哄熀纭�锛屾垜灏嗙墷璁板拰閬靛畧鈥︹�︹��
</p>
- <p>
+ <p class="block">
杩欐槸鍥涘窛瑗垮崡鑸┖鑱屼笟瀛﹂櫌2002绾х┖涔�1鐝彮绾у叕绾︾殑寮�澶撮儴鍒嗭紝鍚屽浠湪姣忓ぉ鐨勭彮绾у叕绾﹁璇讳腑娼滅Щ榛樺寲鍦版敼鍙樼潃鑷繁鐨勮█琛屼妇姝紝璁╄嚜宸辨嫢鏈変竴棰椾负浠栦汉鐫�鎯炽�佷负鐝骇浜夊厜鐨勮崳瑾変箣蹇冦��
</p>
- <p>
+ <p class="block">
姣曚笟鍗佸勾浠ュ悗锛屾瘡褰撳悓瀛︿滑鍜岃�佸笀涓�璧峰洖蹇嗚繖涓墖娈碉紝鍚屽浠悍绾疯〃绀鸿繖鏍风殑鐝骇鍏害鑳藉鎻愰啋浠栦滑鏃舵椂鍒诲埢灏嗙ぜ浠鑼冪墷璁颁簬蹇冦�佽返涔嬩簬琛岋紝鏃舵椂鍒诲埢绾︽潫浠栦滑鍦ㄥ伐浣滀腑銆佺敓娲讳腑鍏虫敞鍏害锛屽叧娉ㄦ柊鐨勮鑼冿紝涓嶆柇鎻愬崌鏂囧寲鍐呮兜銆�
</p>
</div>
@@ -194,10 +194,13 @@
<!-- 5椤� -->
<div class="page-box" page="11">
<div v-if="showPageList.indexOf(11) > -1">
- <ul class="fl al-c pad-t-55 pad-l-80 mb-45">
- <li class="header-left-Number">妯″潡涓�</li>
- <li class="header-left-text">姘戣埅绀间华涓庢湇鍔¤兘鍔涜鐭�</li>
- <li class="header-left-Number">5</li>
+ <ul class="fl al-c pad-t-55 pad-l-80 jc-fe mb-45">
+ <li class="header-right-Number header-right-title">妯″潡涓�</li>
+ <li class="header-right-Number">姘戣埅绀间华涓庢湇鍔¤兘鍔涜鐭�</li>
+ <li class="header-right-Number">5</li>
+ <li class="header-right-Number"><img class="" src="../../assets/images/yemei02.png" alt="" /></li>
+ <li class="header-right-last"><br></li>
+ <li class="header-right-end"><br></li>
</ul>
<div class="bodystyle">
<h3 id="c002">
diff --git a/src/books/aviationEtiquette/view/components/index.vue b/src/books/aviationEtiquette/view/components/index.vue
index 67ab14f..3313a78 100644
--- a/src/books/aviationEtiquette/view/components/index.vue
+++ b/src/books/aviationEtiquette/view/components/index.vue
@@ -156,8 +156,8 @@
}, 500);
// 娴嬭瘯椤甸潰璺宠浆
- // setTimeout(() => {
- // this.gotoPage(3, 92);
+ setTimeout(() => {
+ this.gotoPage(2, 11);
// setTimeout(() => {
// this.renderSign("Highlight", {
// id: "2ACA9359",
@@ -171,7 +171,7 @@
// ids: ["2ACA9359"]
// });
// }, 2000);
- // }, 500);
+ }, 500);
// const pageDom = (this.container ? this.container : document)
// .querySelector("#app")
diff --git a/src/books/aviationSafety/assets/main.less b/src/books/aviationSafety/assets/main.less
index db995d8..02ae469 100644
--- a/src/books/aviationSafety/assets/main.less
+++ b/src/books/aviationSafety/assets/main.less
@@ -1101,7 +1101,7 @@
}
.block2 {
- font-family: "FANGSONG";
+ // font-family: "FANGSONG"
font-size: 17px;
}
@@ -1125,7 +1125,7 @@
p {
- font-family: "BOYA";
+ // font-family: "BOYA";
margin-top: 0.2em;
margin-bottom: 0.2em !important;
text-indent: 2em;
@@ -1221,7 +1221,7 @@
.h1-bj {
- font-family: 'ZHUNYUAN';
+ // font-family: 'ZHUNYUAN';
font-weight: 100;
color: #FFFFFF;
background-color: #6E85AF;
@@ -1230,7 +1230,7 @@
}
.h1-bk {
- font-family: 'FANGZHENG';
+ // font-family: 'FANGZHENG';
box-shadow: inset 0em 0.1em 0em 0em #C3C2C0;
border-top-style: solid;
border-right-style: solid;
@@ -1482,6 +1482,8 @@
font-size: 1.2em;
}
+
+
.bk {
border: 0.15em dotted #FAAD70;
padding: 1em;
@@ -1491,11 +1493,11 @@
position: relative;
p {
- font-family: ZHONGDENGXIAN;
+ // font-family: ZHONGDENGXIAN;
}
span {
- font-family: ZHUNYUAN;
+ // font-family: ZHUNYUAN;
}
}
@@ -1523,6 +1525,9 @@
font-weight: 100;
padding: 0em 0.15em 0em 0.3em;
}
+
+
+
.bk1 {
@@ -1614,7 +1619,7 @@
margin-bottom: 0.2em;
margin-left: -0.6em;
margin-right: -0.6em;
- margin-top: -0.7em;
+ margin-top: 0.3em;
}
span.bj3-xyx {
@@ -1634,6 +1639,9 @@
}
+
+
+
.ts-1 {
font-weight: bold;
}
diff --git a/src/books/aviationSafety/view/components/index.vue b/src/books/aviationSafety/view/components/index.vue
index f5a878c..b4708a4 100644
--- a/src/books/aviationSafety/view/components/index.vue
+++ b/src/books/aviationSafety/view/components/index.vue
@@ -165,7 +165,7 @@
// 娴嬭瘯椤甸潰璺宠浆
setTimeout(() => {
- this.gotoPage(6,119);
+ this.gotoPage(1,1);
// setTimeout(() => {
// this.renderSign("Highlight", {
// id: "2ACA9359",
--
Gitblit v1.9.1