From 30d147c4c92dbfd5ca1b2f8c24a617dc82d2d25b Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期一, 28 四月 2025 18:34:51 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout

---
 src/books/civilAviation/view/components/chapter002.vue |   42 +++++++++++++++++++++++++++++++-----------
 1 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/books/civilAviation/view/components/chapter002.vue b/src/books/civilAviation/view/components/chapter002.vue
index 4a87d11..efbcbcc 100644
--- a/src/books/civilAviation/view/components/chapter002.vue
+++ b/src/books/civilAviation/view/components/chapter002.vue
@@ -123,7 +123,7 @@
                                 <span class="c-g"> 绛旀锛歿{ item.answer }} </span>
                                 <span :class="{ 'c-g': item.isRight, 'c-r': item.isRight == false }">鎮ㄧ殑绛旀锛歿{
                                     item.userAnswer
-                                }}</span>
+                                    }}</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"
@@ -384,7 +384,7 @@
                         <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"
+                                <input type="radio" :value="citem.zm" :name="toobusy" :disabled="item.isComplete"
                                     v-model="item.userAnswer" @change="saveInputChoice" />
                                 {{ citem.txt }}
                             </p>
@@ -393,7 +393,7 @@
                                 <span class="c-g"> 绛旀锛歿{ item.answer }} </span>
                                 <span :class="{ 'c-g': item.isRight, 'c-r': item.isRight == false }">鎮ㄧ殑绛旀锛歿{
                                     item.userAnswer
-                                }}</span>
+                                    }}</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"
@@ -1160,9 +1160,14 @@
                     <p class="p-odd">
                         閫氳繃椹鹃┒鏉嗙殑鍓嶆帹鍜屽悗鎷夛紝椋炶鍛樻帶鍒跺钩灏惧悗鏂圭殑鍗囬檷鑸靛亸杞�傛媺鏉嗘椂锛屽崌闄嶈埖涓婂亸锛岄鏈虹殑骞冲熬涓婃柟姘旀祦鍙楅樆锛岄�熷害鍑忓皬锛屽帇鍔涘澶э紝鍦ㄥ钩灏句笂浜х敓鍚戜笅鐨勭┖姘斿姩鍔涳紝鐢变簬骞冲熬鍦ㄩ噸蹇冧箣鍚庡苟涓旂閲嶅績杈冭繙锛岃繖涓┖姘斿姩鍔涘皢瀵归鏈洪噸蹇冩瀯鎴愪笂浠板姏鐭╋紝浣挎満澶翠笂浠帮紝椋炴満杩庤澧炲ぇ锛堝浘2-39锛夈�傚悓鐞嗭紝濡傛灉椋炶鍛樻帹鏉嗭紝鍗囬檷鑸典笅鍋忥紝骞冲熬浜х敓鍚戜笂鐨勭┖姘斿姩鍔涳紝瀵归噸蹇冩瀯鎴愪笅淇姏鐭╋紝鏈哄ご涓嬩刊锛岄鏈鸿繋瑙掑噺灏忋�傚湪姝e父鐨勮繋瑙掕寖鍥村唴銆侀琛岄�熷害涓嶅彉鐨勬儏鍐典笅锛屾媺鏉嗕娇杩庤澧炲ぇ锛屽崌鍔涘澶э紝椋炴満灏嗕笂鍗囬珮搴︼紝鎺ㄦ潌浣胯繋瑙掑噺灏忥紝鍗囧姏鍑忓皬锛岄鏈哄皢涓嬮檷楂樺害銆傚鏋滆鎿嶇旱椋炴満涓婂崌锛岄櫎浜嗘媺鏉嗕互閫傚綋澧炲ぇ杩庤銆佸崌鍔涗箣澶栵紝杩橀渶鐩稿簲鍔犲ぇ娌归棬锛屼繚鎸佽冻澶熺殑椋炶閫熷害锛涙搷绾甸鏈轰笅婊戯紝鍒欐敹灏忔补闂紝闅忕潃閫熷害鍑忓皬锛岄鏈哄崌鍔涘噺灏忥紝椋炴満鑷劧杞叆涓嬫粦銆備负闃叉涓嬫粦瑙掑お澶э紝椋炶鍛樿繕闇�鐩稿簲鎷夌偣鏉嗭紝閫傚綋澧炲姞杩庤锛屾墠鑳戒繚鎸侀瀹氱殑涓嬫粦瑙掋��
                     </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="ma-0"><br></p>
+                    <p class="center openImgBox">
+                        <img class="img-b" alt="" src="../../assets/images/0071-1.jpg" />
+                    </p>
+                    <p class="img">鍥�2-38 椋炴満鐨勬搷绾甸潰</p>
+                    <div style="min-height:400px; margin-top: 30px"><iframe :src="iframSrcOne" frameborder="0"
+                            style="width: 100%; height: 400px"></iframe></div>
+                    <p class="ma-0"><br></p>
                     <p class="center openImgBox">
                         <img class="img-b" alt="" src="../../assets/images/0071-2.jpg" />
                     </p>
@@ -1480,9 +1485,13 @@
                     <p class="p-even td-0">
                         鏋勬垚鏈虹考鐨勯鏋讹紝钂欑毊闄勭潃鍦ㄩ鏋朵笂灏辨槸瀹屾暣鐨勬満缈笺�傜考鑲嬩綔涓烘満缈肩殑妯悜楠ㄦ灦锛屼繚鎸佺潃鏈虹考鐨勭考鍨嬶紝鐩存帴鏀寔钂欑毊鎵垮彈绌烘皵鍔ㄥ姏锛涚考姊佷綔涓烘満缈肩殑绾靛悜楠ㄦ灦锛屾壙鍙楁暣涓満缈间笂浜х敓鐨勭┖姘斿姩鍔涳紝骞堕�氳繃鎺ュご灏嗗姏浼犵粰鏈鸿韩锛涙鏉″钩琛屼簬缈兼宓屽湪缈艰倠涓婏紝浠ユ敮鎸佽挋鐨��
                     </p>
-                    <div style="min-height:400px"><iframe :src="iframSrc" frameborder="0"
-                            style="width: 100%; height: 400px"></iframe></div>
+                    <p class="ma-0"><br></p>
+                    <p class="center openImgBox">
+                        <img class="img-b" alt="" src="../../assets/images/0078-1.jpg" />
+                    </p>
                     <p class="img p-even">鍥�2-54 鏈虹考鐨勫唴閮ㄧ粨鏋�</p>
+                    <div style="min-height:400px;margin-top: 30px"><iframe :src="iframSrc" frameborder="0"
+                            style="width: 100%; height: 400px"></iframe></div>
                     <p class="p-even">
                         鏈虹考鍐呴儴鏈夎緝澶х殑绌洪棿锛屾皯鐢ㄩ鏈洪�氬父灏嗗叾瀵嗗皝鍚庝綔涓哄瓨鍌ㄧ噧娌圭殑娌圭锛屽ぇ鍨嬪柗姘斿紡瀹㈡満鐨勬満缈兼补绠卞偍瀛樹簡鍏ㄦ満鍥涘垎涔嬩竴宸﹀彸鐨勭噧娌广�傚ぇ澶氳埅绾块鏈轰富璧疯惤鏋跺畨瑁呭湪鏈虹考涓婏紝鏈虹考鐨勫唴閮ㄧ┖闂磋繕鏈変竴閮ㄥ垎鐢ㄦ潵璁剧疆璧疯惤鏋惰埍銆�
                     </p>
@@ -4245,7 +4254,7 @@
     data() {
         return {
             iframSrc: "",
-            iframSrcOne:"",
+            iframSrcOne: "",
             dialogVisible: false,
             p_md5: '',
             somePdfTitleValue: '',
@@ -4460,7 +4469,7 @@
         getModel() {
             const ctx = 'https://jsek.bnuic.com'
             let localStr =
-                './static/modelView/index.html?md5=62d4eadc420b7403fce2be993baa095d' +
+                'https://jsek.bnuic.com/books/book/civilAviation/static/modelView/index.html?md5=62d4eadc420b7403fce2be993baa095d' +
                 '&name=je' +
                 '&domain=' +
                 ctx +
@@ -4471,10 +4480,11 @@
         getModelOne() {
             const ctx = 'https://jsek.bnuic.com'
             let localStr =
-                './static/modelView/index.html?md5=0636d301dd7d1249590ae240b707560c' +
+                'https://jsek.bnuic.com/books/book/civilAviation/static/modelView/index.html?md5=e08040d0abb1763694cd674215df9ad5' +
                 '&name=je' +
                 '&domain=' +
                 ctx +
+                '&exd=obj' +
                 '&target=iframe'
             this.iframSrcOne = localStr
         }
@@ -4506,4 +4516,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