From d1c6a4460355766d3ae67fc7330785a1cc748f9e Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 20 十一月 2024 17:01:29 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/civilAviation/view/components/chapter002.vue | 189 ++++++++++++++++++++++++++++-------------------
1 files changed, 112 insertions(+), 77 deletions(-)
diff --git a/src/books/civilAviation/view/components/chapter002.vue b/src/books/civilAviation/view/components/chapter002.vue
index 5ae9685..240ba35 100644
--- a/src/books/civilAviation/view/components/chapter002.vue
+++ b/src/books/civilAviation/view/components/chapter002.vue
@@ -111,39 +111,36 @@
</span>
<div class="bk">
<p><b>鑰冭瘉鎸囧崡锛氱┖娓湇鍔＄鐞嗗笀鑰冮</b></p>
- <div v-for="(item,index) in singleChoiceOne" :key="index">
- <p class="block">{{index+1}}.{{ item.txt }}</p>
- <p class="block" v-for="(citem,cindex) in item.option" :key="cindex">
- <input type="radio" :value="citem.zm" name="toobusy"
- :disabled="item.isComplete"
- v-model="item.userAnswer" @change="saveChoiceOne" />
- {{ citem.txt }}
- </p>
- <p class="event-header-text-bc pd-5 fl jc-sa" style="margin-left: 8px; width: 93%"
- v-if="showSingleChoice">
- <span class="c-g"> 绛旀锛歿{ item.answer }} </span>
- <span
- :class="{ 'c-g': item.isRight, 'c-r': item.isRight == false }">鎮ㄧ殑绛旀锛歿{
+ <div v-for="(item, index) in singleChoiceOne" :key="index">
+ <p class="block">{{ index + 1 }}.{{ item.txt }}</p>
+ <p class="block" v-for="(citem, cindex) in item.option" :key="cindex">
+ <input type="radio" :value="citem.zm" name="toobusy" :disabled="item.isComplete"
+ v-model="item.userAnswer" @change="saveChoiceOne" />
+ {{ citem.txt }}
+ </p>
+ <p class="event-header-text-bc pd-5 fl jc-sa" style="margin-left: 8px; width: 93%"
+ v-if="showSingleChoice">
+ <span class="c-g"> 绛旀锛歿{ item.answer }} </span>
+ <span :class="{ 'c-g': item.isRight, 'c-r': item.isRight == false }">鎮ㄧ殑绛旀锛歿{
item.userAnswer
- }}</span>
- <span class="icon-box-big fl al-c">
- <svg v-if="item.isRight" t="1716986419862" class="icon"
- viewBox="0 0 1820 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
- p-id="18767" xmlns:xlink="http://www.w3.org/1999/xlink" width="40" height="20">
- <path
- d="M1439.374222 216.007111s-169.472 56.490667-367.179852 282.443852C888.604444 703.222519 846.241185 787.949037 775.632593 900.93037 768.568889 893.866667 662.651259 689.095111 380.207407 540.814222l148.290371-141.226666s134.162963 91.790222 225.953185 261.262222c0 0 233.016889-360.116148 684.923259-536.642371v91.799704z m0 0"
- fill="#1AFA29" p-id="18768"></path>
- </svg>
- <svg v-if="item.isRight == false" t="1716987085767"
- class="icon" viewBox="0 0 1024 1024" version="1.1"
- xmlns="http://www.w3.org/2000/svg" p-id="25745"
- xmlns:xlink="http://www.w3.org/1999/xlink" width="20" height="20">
- <path
- d="M116.579135 38.64349531L38.703935 103.74399781c138.82075969 102.96027281 268.24660875 221.31426938 381.68489719 339.96758156C246.29374906 618.40145938 109.95003031 790.19602344 38.10817906 859.25288281l148.35573469 123.62658094c52.61360812-108.17625656 167.23381594-272.86683656 320.56281844-445.01635875 153.50744156 173.21056312 268.36844625 338.43166313 321.38977781 447.49243969 0 0 144.5682225-152.96636906 157.47435281-129.29729625-55.80632344-62.49011156-191.37776625-244.16501625-374.17990593-430.27403438 104.68422375-107.1132975 222.15274031-213.10127719 347.60304468-306.24740437L925.17746562 56.03842156C782.85412063 126.51895625 647.69328031 231.09093594 526.07845437 342.39755 403.34886594 226.82662719 264.46095125 116.16373719 116.579135 38.64349531L116.579135 38.64349531zM116.579135 38.64349531"
- fill="#d81e06" p-id="25746"></path>
- </svg>
- </span>
- </p>
+ }}</span>
+ <span class="icon-box-big fl al-c">
+ <svg v-if="item.isRight" t="1716986419862" class="icon" viewBox="0 0 1820 1024"
+ version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="18767"
+ xmlns:xlink="http://www.w3.org/1999/xlink" width="40" height="20">
+ <path
+ d="M1439.374222 216.007111s-169.472 56.490667-367.179852 282.443852C888.604444 703.222519 846.241185 787.949037 775.632593 900.93037 768.568889 893.866667 662.651259 689.095111 380.207407 540.814222l148.290371-141.226666s134.162963 91.790222 225.953185 261.262222c0 0 233.016889-360.116148 684.923259-536.642371v91.799704z m0 0"
+ fill="#1AFA29" p-id="18768"></path>
+ </svg>
+ <svg v-if="item.isRight == false" t="1716987085767" class="icon"
+ viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
+ p-id="25745" xmlns:xlink="http://www.w3.org/1999/xlink" width="20" height="20">
+ <path
+ d="M116.579135 38.64349531L38.703935 103.74399781c138.82075969 102.96027281 268.24660875 221.31426938 381.68489719 339.96758156C246.29374906 618.40145938 109.95003031 790.19602344 38.10817906 859.25288281l148.35573469 123.62658094c52.61360812-108.17625656 167.23381594-272.86683656 320.56281844-445.01635875 153.50744156 173.21056312 268.36844625 338.43166313 321.38977781 447.49243969 0 0 144.5682225-152.96636906 157.47435281-129.29729625-55.80632344-62.49011156-191.37776625-244.16501625-374.17990593-430.27403438 104.68422375-107.1132975 222.15274031-213.10127719 347.60304468-306.24740437L925.17746562 56.03842156C782.85412063 126.51895625 647.69328031 231.09093594 526.07845437 342.39755 403.34886594 226.82662719 264.46095125 116.16373719 116.579135 38.64349531L116.579135 38.64349531zM116.579135 38.64349531"
+ fill="#d81e06" p-id="25746"></path>
+ </svg>
+ </span>
+ </p>
</div>
<!-- 鎻愪氦鎸夐挳 -->
<div class="w100 fl ju-cn">
@@ -384,41 +381,38 @@
</p>
<div class="bk">
<p><b>鑰冭瘉鎸囧崡锛氱┖娓湇鍔＄鐞嗗笀鑰冮</b></p>
- <div v-for="(item,index) in singleChoice" :key="index">
- <p class="block">{{index+1}}.{{ item.txt }}</p>
- <p class="block" v-for="(citem,cindex) in item.option" :key="cindex">
- <input type="radio" :value="citem.zm" name="toobusy"
- :disabled="item.isComplete"
- v-model="item.userAnswer" @change="saveInputChoice" />
- {{ citem.txt }}
- </p>
- <p class="event-header-text-bc pd-5 fl jc-sa" style="margin-left: 8px; width: 93%"
- v-if="showChoiceAnswer">
- <span class="c-g"> 绛旀锛歿{ item.answer }} </span>
- <span
- :class="{ 'c-g': item.isRight, 'c-r': item.isRight == false }">鎮ㄧ殑绛旀锛歿{
+ <div v-for="(item, index) in singleChoice" :key="index">
+ <p class="block">{{ index + 1 }}.{{ item.txt }}</p>
+ <p class="block" v-for="(citem, cindex) in item.option" :key="cindex">
+ <input type="radio" :value="citem.zm" name="toobusy" :disabled="item.isComplete"
+ v-model="item.userAnswer" @change="saveInputChoice" />
+ {{ citem.txt }}
+ </p>
+ <p class="event-header-text-bc pd-5 fl jc-sa" style="margin-left: 8px; width: 93%"
+ v-if="showChoiceAnswer">
+ <span class="c-g"> 绛旀锛歿{ item.answer }} </span>
+ <span :class="{ 'c-g': item.isRight, 'c-r': item.isRight == false }">鎮ㄧ殑绛旀锛歿{
item.userAnswer
- }}</span>
- <span class="icon-box-big fl al-c">
- <svg v-if="item.isRight" t="1716986419862" class="icon"
- viewBox="0 0 1820 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
- p-id="18767" xmlns:xlink="http://www.w3.org/1999/xlink" width="40" height="20">
- <path
- d="M1439.374222 216.007111s-169.472 56.490667-367.179852 282.443852C888.604444 703.222519 846.241185 787.949037 775.632593 900.93037 768.568889 893.866667 662.651259 689.095111 380.207407 540.814222l148.290371-141.226666s134.162963 91.790222 225.953185 261.262222c0 0 233.016889-360.116148 684.923259-536.642371v91.799704z m0 0"
- fill="#1AFA29" p-id="18768"></path>
- </svg>
- <svg v-if="item.isRight == false" t="1716987085767"
- class="icon" viewBox="0 0 1024 1024" version="1.1"
- xmlns="http://www.w3.org/2000/svg" p-id="25745"
- xmlns:xlink="http://www.w3.org/1999/xlink" width="20" height="20">
- <path
- d="M116.579135 38.64349531L38.703935 103.74399781c138.82075969 102.96027281 268.24660875 221.31426938 381.68489719 339.96758156C246.29374906 618.40145938 109.95003031 790.19602344 38.10817906 859.25288281l148.35573469 123.62658094c52.61360812-108.17625656 167.23381594-272.86683656 320.56281844-445.01635875 153.50744156 173.21056312 268.36844625 338.43166313 321.38977781 447.49243969 0 0 144.5682225-152.96636906 157.47435281-129.29729625-55.80632344-62.49011156-191.37776625-244.16501625-374.17990593-430.27403438 104.68422375-107.1132975 222.15274031-213.10127719 347.60304468-306.24740437L925.17746562 56.03842156C782.85412063 126.51895625 647.69328031 231.09093594 526.07845437 342.39755 403.34886594 226.82662719 264.46095125 116.16373719 116.579135 38.64349531L116.579135 38.64349531zM116.579135 38.64349531"
- fill="#d81e06" p-id="25746"></path>
- </svg>
- </span>
- </p>
+ }}</span>
+ <span class="icon-box-big fl al-c">
+ <svg v-if="item.isRight" t="1716986419862" class="icon" viewBox="0 0 1820 1024"
+ version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="18767"
+ xmlns:xlink="http://www.w3.org/1999/xlink" width="40" height="20">
+ <path
+ d="M1439.374222 216.007111s-169.472 56.490667-367.179852 282.443852C888.604444 703.222519 846.241185 787.949037 775.632593 900.93037 768.568889 893.866667 662.651259 689.095111 380.207407 540.814222l148.290371-141.226666s134.162963 91.790222 225.953185 261.262222c0 0 233.016889-360.116148 684.923259-536.642371v91.799704z m0 0"
+ fill="#1AFA29" p-id="18768"></path>
+ </svg>
+ <svg v-if="item.isRight == false" t="1716987085767" class="icon"
+ viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
+ p-id="25745" xmlns:xlink="http://www.w3.org/1999/xlink" width="20" height="20">
+ <path
+ d="M116.579135 38.64349531L38.703935 103.74399781c138.82075969 102.96027281 268.24660875 221.31426938 381.68489719 339.96758156C246.29374906 618.40145938 109.95003031 790.19602344 38.10817906 859.25288281l148.35573469 123.62658094c52.61360812-108.17625656 167.23381594-272.86683656 320.56281844-445.01635875 153.50744156 173.21056312 268.36844625 338.43166313 321.38977781 447.49243969 0 0 144.5682225-152.96636906 157.47435281-129.29729625-55.80632344-62.49011156-191.37776625-244.16501625-374.17990593-430.27403438 104.68422375-107.1132975 222.15274031-213.10127719 347.60304468-306.24740437L925.17746562 56.03842156C782.85412063 126.51895625 647.69328031 231.09093594 526.07845437 342.39755 403.34886594 226.82662719 264.46095125 116.16373719 116.579135 38.64349531L116.579135 38.64349531zM116.579135 38.64349531"
+ fill="#d81e06" p-id="25746"></path>
+ </svg>
+ </span>
+ </p>
</div>
-
+
<!-- 鎻愪氦鎸夐挳 -->
<div class="w100 fl ju-cn">
<ul class="fl ju-ev w80 choice">
@@ -1166,6 +1160,9 @@
<p class="p-odd">
閫氳繃椹鹃┒鏉嗙殑鍓嶆帹鍜屽悗鎷夛紝椋炶鍛樻帶鍒跺钩灏惧悗鏂圭殑鍗囬檷鑸靛亸杞�傛媺鏉嗘椂锛屽崌闄嶈埖涓婂亸锛岄鏈虹殑骞冲熬涓婃柟姘旀祦鍙楅樆锛岄�熷害鍑忓皬锛屽帇鍔涘澶э紝鍦ㄥ钩灏句笂浜х敓鍚戜笅鐨勭┖姘斿姩鍔涳紝鐢变簬骞冲熬鍦ㄩ噸蹇冧箣鍚庡苟涓旂閲嶅績杈冭繙锛岃繖涓┖姘斿姩鍔涘皢瀵归鏈洪噸蹇冩瀯鎴愪笂浠板姏鐭╋紝浣挎満澶翠笂浠帮紝椋炴満杩庤澧炲ぇ锛堝浘2-39锛夈�傚悓鐞嗭紝濡傛灉椋炶鍛樻帹鏉嗭紝鍗囬檷鑸典笅鍋忥紝骞冲熬浜х敓鍚戜笂鐨勭┖姘斿姩鍔涳紝瀵归噸蹇冩瀯鎴愪笅淇姏鐭╋紝鏈哄ご涓嬩刊锛岄鏈鸿繋瑙掑噺灏忋�傚湪姝ｅ父鐨勮繋瑙掕寖鍥村唴銆侀琛岄�熷害涓嶅彉鐨勬儏鍐典笅锛屾媺鏉嗕娇杩庤澧炲ぇ锛屽崌鍔涘澶э紝椋炴満灏嗕笂鍗囬珮搴︼紝鎺ㄦ潌浣胯繋瑙掑噺灏忥紝鍗囧姏鍑忓皬锛岄鏈哄皢涓嬮檷楂樺害銆傚鏋滆鎿嶇旱椋炴満涓婂崌锛岄櫎浜嗘媺鏉嗕互閫傚綋澧炲ぇ杩庤銆佸崌鍔涗箣澶栵紝杩橀渶鐩稿簲鍔犲ぇ娌归棬锛屼繚鎸佽冻澶熺殑椋炶閫熷害锛涙搷绾甸鏈轰笅婊戯紝鍒欐敹灏忔补闂紝闅忕潃閫熷害鍑忓皬锛岄鏈哄崌鍔涘噺灏忥紝椋炴満鑷劧杞叆涓嬫粦銆備负闃叉涓嬫粦瑙掑お澶э紝椋炶鍛樿繕闇�鐩稿簲鎷夌偣鏉嗭紝閫傚綋澧炲姞杩庤锛屾墠鑳戒繚鎸侀瀹氱殑涓嬫粦瑙掋��
</p>
+ <div style="min-height:400px"><iframe :src="iframSrcOne" frameborder="0"
+ style="width: 100%; height: 400px"></iframe></div>
+ <p class="img">鍥�2-38 椋炴満鐨勬搷绾甸潰</p>
<p class="center openImgBox">
<img class="img-b" alt="" src="../../assets/images/0071-2.jpg" />
</p>
@@ -1483,9 +1480,8 @@
<p class="p-even td-0">
鏋勬垚鏈虹考鐨勯鏋讹紝钂欑毊闄勭潃鍦ㄩ鏋朵笂灏辨槸瀹屾暣鐨勬満缈笺�傜考鑲嬩綔涓烘満缈肩殑妯悜楠ㄦ灦锛屼繚鎸佺潃鏈虹考鐨勭考鍨嬶紝鐩存帴鏀寔钂欑毊鎵垮彈绌烘皵鍔ㄥ姏锛涚考姊佷綔涓烘満缈肩殑绾靛悜楠ㄦ灦锛屾壙鍙楁暣涓満缈间笂浜х敓鐨勭┖姘斿姩鍔涳紝骞堕�氳繃鎺ュご灏嗗姏浼犵粰鏈鸿韩锛涙鏉″钩琛屼簬缈兼宓屽湪缈艰倠涓婏紝浠ユ敮鎸佽挋鐨��
</p>
- <p class="center p-even openImgBox">
- <img class="img-a" alt="" src="../../assets/images/0078-1.jpg" />
- </p>
+ <div style="min-height:400px"><iframe :src="iframSrc" frameborder="0"
+ style="width: 100%; height: 400px"></iframe></div>
<p class="img p-even">鍥�2-54 鏈虹考鐨勫唴閮ㄧ粨鏋�</p>
<p class="p-even">
鏈虹考鍐呴儴鏈夎緝澶х殑绌洪棿锛屾皯鐢ㄩ鏈洪�氬父灏嗗叾瀵嗗皝鍚庝綔涓哄瓨鍌ㄧ噧娌圭殑娌圭锛屽ぇ鍨嬪柗姘斿紡瀹㈡満鐨勬満缈兼补绠卞偍瀛樹簡鍏ㄦ満鍥涘垎涔嬩竴宸﹀彸鐨勭噧娌广�傚ぇ澶氳埅绾块鏈轰富璧疯惤鏋跺畨瑁呭湪鏈虹考涓婏紝鏈虹考鐨勫唴閮ㄧ┖闂磋繕鏈変竴閮ㄥ垎鐢ㄦ潵璁剧疆璧疯惤鏋惰埍銆�
@@ -4230,7 +4226,7 @@
</div>
</div>
</div>
- <preView :isClear="dialogVisible" :md5="p_md5" :pdfTitle="somePdfTitleValue" ref="pdfDialogRef"></preView>
+ <preView :isClear="dialogVisible" :md5="p_md5" :pdfTitle="somePdfTitleValue" ref="pdfDialogRef"></preView>
</div>
</template>
@@ -4248,6 +4244,8 @@
},
data() {
return {
+ iframSrc: "",
+ iframSrcOne: "",
dialogVisible: false,
p_md5: '',
somePdfTitleValue: '',
@@ -4368,7 +4366,6 @@
}
},
mounted() {
-
const bookQuestion = localStorage.getItem("civilAviatyon-book-chapter02-expandQuestion");
if (bookQuestion) {
this.expandQuestion = JSON.parse(bookQuestion);
@@ -4383,6 +4380,8 @@
if (singleChoiceOne) {
this.singleChoiceOne = JSON.parse(singleChoiceOne);
}
+ this.getModel()
+ this.getModelOne()
},
methods: {
toUrl(val) {
@@ -4404,7 +4403,7 @@
JSON.stringify(this.expandQuestion)
);
},
- goChoiceJudge(){
+ goChoiceJudge() {
this.singleChoice.forEach(item => {
item.isComplete = true;
if (item.userAnswer == item.answer) {
@@ -4415,7 +4414,7 @@
});
this.showChoiceAnswer = true
},
- changeChoiceData(){
+ changeChoiceData() {
localStorage.removeItem("civilAviatyon-book-chapter02-singleChoice")
this.singleChoice.forEach(item => {
item.isComplete = false;
@@ -4424,13 +4423,13 @@
});
this.showChoiceAnswer = false
},
- saveInputChoice(){
+ saveInputChoice() {
localStorage.setItem(
"civilAviatyon-book-chapter02-singleChoice",
JSON.stringify(this.singleChoice)
);
},
- goSingleChoice(){
+ goSingleChoice() {
this.singleChoiceOne.forEach(item => {
item.isComplete = true;
if (item.userAnswer == item.answer) {
@@ -4441,7 +4440,7 @@
});
this.showSingleChoice = true
},
- changeSingleChoice(){
+ changeSingleChoice() {
localStorage.removeItem("civilAviatyon-book-chapter02-singleChoiceOne")
this.singleChoiceOne.forEach(item => {
item.isComplete = false;
@@ -4450,12 +4449,37 @@
});
this.showSingleChoice = false
},
- saveChoiceOne(){
+ saveChoiceOne() {
localStorage.setItem(
"civilAviatyon-book-chapter02-singleChoiceOne",
JSON.stringify(this.singleChoiceOne)
);
+ },
+
+ // 涓夌淮妯″瀷
+ getModel() {
+ const ctx = 'https://jsek.bnuic.com'
+ let localStr =
+ './static/modelView/index.html?md5=62d4eadc420b7403fce2be993baa095d' +
+ '&name=je' +
+ '&domain=' +
+ ctx +
+ '&target=iframe'
+ this.iframSrc = localStr
+ },
+ // 涓夌淮妯″瀷
+ getModelOne() {
+ const ctx = 'https://jsek.bnuic.com'
+ let localStr =
+ './static/modelView/index.html?md5=9784edec2ecf5f001ee09f049d27acf3' +
+ '&name=je' +
+ '&domain=' +
+ ctx +
+ '&exd=obj' +
+ '&target=iframe'
+ this.iframSrcOne = localStr
}
+
}
};
</script>
@@ -4474,7 +4498,8 @@
margin: 0 !important;
font-size: 16px !important;
position: absolute !important;
- left: 40% !important;
+ left: 50% !important;
+ transform: translateX(-50%);
bottom: -2% !important;
}
@@ -4482,4 +4507,14 @@
height: 80%;
}
}
+
+
+hr {
+ margin-left: 0;
+ margin-bottom: 4px;
+ width: 15.5%;
+ border: none;
+ height: 2px;
+ background-color: #000;
+}
</style>
--
Gitblit v1.9.1