From cd372b367df87784ac5672601a95d6235782c918 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期三, 20 十一月 2024 16:52:30 +0800
Subject: [PATCH] 会议策划与组织

---
 public/static/modelView/js/main.js                     |    8 +
 src/books/meetingPlanners/assets/mian.less             |   44 ++++++
 src/books/civilAviation/view/components/index.vue      |    6 
 src/books/civilAviation/view/components/chapter005.vue |    9 +
 src/books/meetingPlanners/view/components/index.vue    |    2 
 src/books/civilAviation/view/components/chapter001.vue |   10 +
 src/books/civilAviation/view/components/chapter004.vue |    9 +
 src/App.vue                                            |    2 
 src/books/meetingPlanners/view/components/header.vue   |  151 ++++++++++++++++---------
 src/books/civilAviation/view/components/chapter002.vue |   23 ++-
 src/books/civilAviation/assets/main.less               |    8 -
 src/books/civilAviation/view/components/chapter003.vue |   78 +++++++------
 12 files changed, 235 insertions(+), 115 deletions(-)

diff --git a/public/static/modelView/js/main.js b/public/static/modelView/js/main.js
index 6e50cc4..03e0d1b 100644
--- a/public/static/modelView/js/main.js
+++ b/public/static/modelView/js/main.js
@@ -262,6 +262,7 @@
   const dataS = getUrlParams();
   // const str = dataS.domain + '/file/api/ApiDownload?md5=' + dataS.md5
   let str = "";
+  let exd = dataS.exd;
   if (dataS.token != null || dataS.token != undefined) {
     str =
       dataS.domain +
@@ -276,7 +277,12 @@
     },
   ];
   var sceneInfo = modelList[index]; //index from array of sample models in html select options
-  loader = new THREE.FBXLoader(manager);
+  if (exd == "obj") {
+    loader = new THREE.OBJLoader(manager);
+  }
+  if (exd == "fbx" || !exd) {
+    loader = new THREE.FBXLoader(manager);
+  }
   var url = sceneInfo.url;
 
   //progress/loading bar
diff --git a/src/App.vue b/src/App.vue
index 2306550..c9fc08c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -74,7 +74,7 @@
       process.env.VUE_APP_RESOURCE_CTX +
         (process.env.VUE_APP_ENV == "product"
           ? process.env.VUE_APP_BOOK_ID
-          : "civilAviation")
+          : "meetingPlanners")
       );
 
       // this.activeBook = await this.config.getBookConfig(
diff --git a/src/books/civilAviation/assets/main.less b/src/books/civilAviation/assets/main.less
index 916c994..fbf8a5b 100644
--- a/src/books/civilAviation/assets/main.less
+++ b/src/books/civilAviation/assets/main.less
@@ -60,14 +60,6 @@
         width: 80%;
     }
 
-    hr{
-        margin-left: 0;
-        margin-bottom: 4px;
-        width: 15.5%; 
-        border: none;
-        height: 2px;
-        background-color: #000;
-    }
 
     sup{ 
         vertical-align: super; /* 淇濇寔涓婃爣瀵归綈鏂瑰紡 */  
diff --git a/src/books/civilAviation/view/components/chapter001.vue b/src/books/civilAviation/view/components/chapter001.vue
index eb6349c..c8b4cce 100644
--- a/src/books/civilAviation/view/components/chapter001.vue
+++ b/src/books/civilAviation/view/components/chapter001.vue
@@ -1903,4 +1903,14 @@
 .choice {
     padding: 0% !important;
 }
+
+
+hr {
+    margin-left: 0;
+    margin-bottom: 4px;
+    width: 15.5%;
+    border: none;
+    height: 2px;
+    background-color: #000;
+}
 </style>
\ No newline at end of file
diff --git a/src/books/civilAviation/view/components/chapter002.vue b/src/books/civilAviation/view/components/chapter002.vue
index 4a87d11..240ba35 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"
@@ -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"
@@ -1161,8 +1161,8 @@
                         閫氳繃椹鹃┒鏉嗙殑鍓嶆帹鍜屽悗鎷夛紝椋炶鍛樻帶鍒跺钩灏惧悗鏂圭殑鍗囬檷鑸靛亸杞�傛媺鏉嗘椂锛屽崌闄嶈埖涓婂亸锛岄鏈虹殑骞冲熬涓婃柟姘旀祦鍙楅樆锛岄�熷害鍑忓皬锛屽帇鍔涘澶э紝鍦ㄥ钩灏句笂浜х敓鍚戜笅鐨勭┖姘斿姩鍔涳紝鐢变簬骞冲熬鍦ㄩ噸蹇冧箣鍚庡苟涓旂閲嶅績杈冭繙锛岃繖涓┖姘斿姩鍔涘皢瀵归鏈洪噸蹇冩瀯鎴愪笂浠板姏鐭╋紝浣挎満澶翠笂浠帮紝椋炴満杩庤澧炲ぇ锛堝浘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>
+                            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>
@@ -4245,7 +4245,7 @@
     data() {
         return {
             iframSrc: "",
-            iframSrcOne:"",
+            iframSrcOne: "",
             dialogVisible: false,
             p_md5: '',
             somePdfTitleValue: '',
@@ -4471,10 +4471,11 @@
         getModelOne() {
             const ctx = 'https://jsek.bnuic.com'
             let localStr =
-                './static/modelView/index.html?md5=0636d301dd7d1249590ae240b707560c' +
+                './static/modelView/index.html?md5=9784edec2ecf5f001ee09f049d27acf3' +
                 '&name=je' +
                 '&domain=' +
                 ctx +
+                '&exd=obj' +
                 '&target=iframe'
             this.iframSrcOne = localStr
         }
@@ -4506,4 +4507,14 @@
         height: 80%;
     }
 }
+
+
+hr {
+    margin-left: 0;
+    margin-bottom: 4px;
+    width: 15.5%;
+    border: none;
+    height: 2px;
+    background-color: #000;
+}
 </style>
diff --git a/src/books/civilAviation/view/components/chapter003.vue b/src/books/civilAviation/view/components/chapter003.vue
index 15aaaf5..d5f31b2 100644
--- a/src/books/civilAviation/view/components/chapter003.vue
+++ b/src/books/civilAviation/view/components/chapter003.vue
@@ -303,41 +303,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">
@@ -1088,7 +1085,7 @@
                 JSON.stringify(this.expandQuestion)
             );
         },
-        goChoiceJudge(){
+        goChoiceJudge() {
             this.singleChoice.forEach(item => {
                 item.isComplete = true;
                 if (item.userAnswer == item.answer) {
@@ -1099,7 +1096,7 @@
             });
             this.showChoiceAnswer = true
         },
-        changeChoiceData(){
+        changeChoiceData() {
             localStorage.removeItem("civilAviatyon-book-chapter03-singleChoice")
             this.singleChoice.forEach(item => {
                 item.isComplete = false;
@@ -1108,7 +1105,7 @@
             });
             this.showChoiceAnswer = false
         },
-        saveInputChoice(){
+        saveInputChoice() {
             localStorage.setItem(
                 "civilAviatyon-book-chapter03-singleChoice",
                 JSON.stringify(this.singleChoice)
@@ -1140,4 +1137,13 @@
         height: 80%;
     }
 }
+
+hr {
+    margin-left: 0;
+    margin-bottom: 4px;
+    width: 15.5%;
+    border: none;
+    height: 2px;
+    background-color: #000;
+}
 </style>
\ No newline at end of file
diff --git a/src/books/civilAviation/view/components/chapter004.vue b/src/books/civilAviation/view/components/chapter004.vue
index c40c974..2c802b0 100644
--- a/src/books/civilAviation/view/components/chapter004.vue
+++ b/src/books/civilAviation/view/components/chapter004.vue
@@ -461,4 +461,13 @@
         height: 80%;
     }
 }
+
+hr{
+        margin-left: 0;
+        margin-bottom: 4px;
+        width: 15.5%; 
+        border: none;
+        height: 2px;
+        background-color: #000;
+    }
 </style>
\ No newline at end of file
diff --git a/src/books/civilAviation/view/components/chapter005.vue b/src/books/civilAviation/view/components/chapter005.vue
index 77136a9..2dfe937 100644
--- a/src/books/civilAviation/view/components/chapter005.vue
+++ b/src/books/civilAviation/view/components/chapter005.vue
@@ -2068,4 +2068,13 @@
 .clear {
     clear: both;
 }
+
+hr {
+    margin-left: 0;
+    margin-bottom: 4px;
+    width: 15.5%;
+    border: none;
+    height: 2px;
+    background-color: #000;
+}
 </style>
\ No newline at end of file
diff --git a/src/books/civilAviation/view/components/index.vue b/src/books/civilAviation/view/components/index.vue
index de316af..54e7ccc 100644
--- a/src/books/civilAviation/view/components/index.vue
+++ b/src/books/civilAviation/view/components/index.vue
@@ -159,8 +159,8 @@
     }, 500);
 
     // 娴嬭瘯椤甸潰璺宠浆
-    // setTimeout(() => {
-    //   this.gotoPage(3,67);
+    setTimeout(() => {
+      this.gotoPage(3,67);
     //   setTimeout(() => {
     //     this.renderSign("Highlight", {
     //       id: "2ACA9359",
@@ -174,7 +174,7 @@
     //     ids: ["2ACA9359"]
     //   });
     // }, 2000);
-    // }, 500);
+    }, 500);
 
     // const pageDom = (this.container ? this.container : document)
     //   .querySelector("#app")
diff --git a/src/books/meetingPlanners/assets/mian.less b/src/books/meetingPlanners/assets/mian.less
index 7f85048..6a8956e 100644
--- a/src/books/meetingPlanners/assets/mian.less
+++ b/src/books/meetingPlanners/assets/mian.less
@@ -176,8 +176,12 @@
         justify-content: space-around
     }
 
+    .jc-sb {
+        justify-content: space-between
+    }
+
     .mr-70 {
-        margin-right: 70px;
+        margin-right: 70px !important;
     }
 
     .mr-10 {
@@ -447,7 +451,7 @@
     div.bodystyle {
         font-family: 'FZLTXIHJW';
         text-align: justify;
-        margin: 0 10%;
+        margin: 0 82px;
         padding-bottom: 10%;
         line-height: 30px;
     }
@@ -497,11 +501,11 @@
 
 
     p {
-        margin-top: 0;
+        font-family: "瀹嬩綋";
+        margin: 0;
         text-indent: 2em;
         line-height: 30px;
         text-align: justify;
-        font-family: 'msyh';
     }
 
     .cover {
@@ -517,11 +521,29 @@
     }
 
     .left {
-        font-family: kaiti;
         font-size: 18px;
         text-indent: 1em;
         margin-top: 0% !important;
         margin-bottom: 0% !important;
+    }
+
+    .left1 {
+        font-size: 18px;
+        text-indent: 0em;
+        text-wrap: nowrap;
+    }
+
+    .left2 {
+        font-family: kaiti;
+        font-size: 18px;
+        text-indent: 0em;
+        text-wrap: nowrap;
+    }
+
+    .left3 {
+        font-family: kaiti;
+        font-size: 18px;
+        text-indent: 0em;
     }
 
     .right {
@@ -572,6 +594,14 @@
         padding: 6px;
         background-color: #FFDF22;
         margin-top: 1em;
+        margin-left: 0.3em;
+        margin-right: 0.5em;
+    }
+
+    .h2-zt2 {
+        height: 50px;
+        padding: 6px;
+        background-color: #919195;
         margin-left: 0.3em;
         margin-right: 0.5em;
     }
@@ -679,6 +709,10 @@
         width: 30%;
     }
 
+    .img-25 {
+        width: 25%;
+    }
+
     .img-h {
         width: 20%;
     }
diff --git a/src/books/meetingPlanners/view/components/header.vue b/src/books/meetingPlanners/view/components/header.vue
index 9fbe27d..e226ca7 100644
--- a/src/books/meetingPlanners/view/components/header.vue
+++ b/src/books/meetingPlanners/view/components/header.vue
@@ -15,7 +15,7 @@
         <!-- 鐗堟潈椤� -->
         <div class="page-box" page="3">
             <div v-if="showPageList.indexOf(3) > -1">
-                <div style="max-width: 400px; margin: 0 auto; padding: 10% 0; ">
+                <div style="max-width: 420px; margin: 0 auto; padding: 10% 0; ">
                     <hr />
                     <p class="left"><b>鍥句功鍦ㄧ増缂栫洰锛圕IP锛夋暟鎹�</b></p>
                     <p class="left  mr-0">浼氳绛栧垝涓庣粍缁�/鍛ㄥ仴鍗庣紪钁�.鈥�2鐗�.鈥斿寳浜細鍖椾含甯堣寖澶у鍑虹増绀撅紝2024.6</p>
@@ -43,15 +43,15 @@
                     <p class="left td-0">鍗般��銆�娆★細2024骞�6鏈堢7娆″嵃鍒�</p>
                     <p class="left td-0">瀹氥��銆�浠凤細49.80鍏�</p>
                     <hr />
-                    <p class="left td-0">绛栧垝缂栬緫锛氶檲浠曚簯銆�銆�銆�銆�璐d换缂栬緫锛氶檲浠曚簯</p>
-                    <p class="left td-0">缇庢湳缂栬緫锛氱劍銆�涓姐��銆�銆�銆�瑁呭抚璁捐锛氱劍銆�涓�</p>
-                    <p class="left td-0">璐d换鏍″锛氶檲銆�姘戙��銆�銆�銆�璐d换鍗板埗锛氶檲銆�娑涖��璧点��榫�</p>
+                    <p class="left td-0">绛栧垝缂栬緫锛氶檲浠曚簯銆�銆�銆�璐d换缂栬緫锛氶檲浠曚簯</p>
+                    <p class="left td-0">缇庢湳缂栬緫锛氱劍銆�涓姐��銆�銆�瑁呭抚璁捐锛氱劍銆�涓�</p>
+                    <p class="left td-0">璐d换鏍″锛氶檲銆�姘戙��銆�銆�璐d换鍗板埗锛氶檲銆�娑涖��璧点��榫�</p>
                     <p class="center mt-20 mb-0"><b class="fz-18">鐗堟潈鎵�鏈夈��渚垫潈蹇呯┒</b></p>
-                    <p class="left center"> <b class="fz-16">鍙嶇洍鐗堛�佷镜鏉冧妇鎶ョ數璇濓細</b><span class="">010-58808104</span></p>
-                    <p class="left center  ">鍖椾含璇昏�呮湇鍔¢儴鐢佃瘽锛�010-58808104</p>
-                    <p class="left center ">澶栧煚閭喘鐢佃瘽锛�010-58808083</p>
-                    <p class="left center ">鏈功濡傛湁鍗拌璐ㄩ噺闂锛岃涓庡嵃鍒剁鐞嗛儴鑱旂郴璋冩崲銆�</p>
-                    <p class="left center ">鍗板埗绠$悊閮ㄧ數璇濓細010-58808284</p>
+                    <p class="left center td-0"> <b class="fz-16">鍙嶇洍鐗堛�佷镜鏉冧妇鎶ョ數璇濓細</b><span class="">010-58808104</span></p>
+                    <p class="left center td-0">鍖椾含璇昏�呮湇鍔¢儴鐢佃瘽锛�010-58808104</p>
+                    <p class="left center td-0">澶栧煚閭喘鐢佃瘽锛�010-58808083</p>
+                    <p class="left center td-0">鏈功濡傛湁鍗拌璐ㄩ噺闂锛岃涓庡嵃鍒剁鐞嗛儴鑱旂郴璋冩崲銆�</p>
+                    <p class="left center td-0">鍗板埗绠$悊閮ㄧ數璇濓細010-58808284</p>
                 </div>
 
             </div>
@@ -60,7 +60,7 @@
         <div class="page-box" page="4">
             <div v-if="showPageList.indexOf(4) > -1">
                 <div class="bodystyle" style="padding-top: 10%;">
-                    <h1 id="a004" class="front"><span class="h2-zt1"></span>涓撳鎺ㄨ崘</h1>
+                    <h1 id="a004"><span class="h2-zt1"></span>涓撳鎺ㄨ崘</h1>
                     <p class="ma-0"><br></p>
                     <div class="img-float w150 openImgBox">
                         <img class="img-b" alt="" src="../../assets/images/0005-1.jpg" />
@@ -142,74 +142,121 @@
         <!-- 缂栧啓濮斿憳浼� -->
         <div class="page-box" page="6">
             <div v-if="showPageList.indexOf(6) > -1">
-                <div class="bodystyle" style="padding-top: 20%;">
-                    <h1 id="a005" class="front center">鏂颁笘绾珮绛夊鏍℃暀鏉惵锋梾娓哥鐞嗘牳蹇冭绯诲垪<br/>缂栧啓鎸囧濮斿憳浼�</h1>
-                    <p class="left"><b class="mb-30">涓汇��浠�</b>銆�鐢宠憜鍢夈��<span>鍗楀紑澶у鍟嗗闄㈡梾娓稿绯绘暀鎺堛�佲�滀腑鍥芥梾娓告暀鑲蹭笌鐮旂┒缁堣韩鎴愬氨濂栤�濆敮涓�鑾峰鑰�</span></p>
-                    <p class="left"><b>鍓富浠�</b>銆�榄忓皬瀹夈��涓浗鏃呮父鐮旂┒闄㈢涓�灞婂鏈鍛樹細涓讳换濮斿憳銆佷腑鍥界ぞ浼氱瀛﹂櫌鏃呮父鐮旂┒涓績鐮旂┒鍛樸�佷腑澶皯鏃忓ぇ瀛﹀崥澹敓瀵煎笀</p>
-                    <p class="left"><b>濮斿憳</b>锛堜互濮撴皬绗旂敾涓哄簭锛�</p>
-                    <p class="left"><b>Larry Yu</b>銆�銆�缇庡浗涔旀不路鍗庣洓椤垮ぇ瀛︽梾娓镐笌閰掑簵绠$悊绯讳富浠汇�佹暀鎺�</p>
-                    <p class="left"><b>Liping Cai</b>銆�缇庡浗鏅浮澶у鏃呮父涓庨厭搴楃郴涓讳换銆佹暀鎺�</p>
-                    <p class="left"><b>鏉庡ぉ鍏�</b>銆�銆�銆�鍗楀紑澶у鏃呮父涓庢湇鍔″闄㈡暀鎺堛�佸崥澹敓瀵煎笀</p>
-                    <p class="left"><b>鍚存寤�</b>銆�銆�銆�鍖椾含甯堣寖澶у鍦扮悊绉戝瀛﹂儴鏁欐巿銆佸崥澹敓瀵煎笀</p>
-                    <p class="left"><b>閭圭粺閽�</b>銆�銆�銆�鍖椾含绗簩澶栧浗璇闄㈡梾娓哥瀛﹀闄㈡暀鎺堛�佸崥澹敓瀵煎笀</p>
-                    <p class="left"><b>瀹嬫捣宀�</b>銆�銆�銆�棣欐腐鐞嗗伐澶у閰掑簵鍙婃梾娓镐笟绠$悊瀛﹂櫌鍓櫌闀裤�佹暀鎺堛�佸崥澹敓瀵煎笀</p>
-                    <p class="left"><b>缃楁槑涔�</b>銆�銆�銆�浜戝崡璐㈢粡澶у鏁欐巿銆佸崥澹敓瀵煎笀锛屽師浜戝崡鐪佹梾娓稿眬灞�闀�</p>
-                    <p class="left"><b>璋㈠溅鍚�</b>銆�銆�銆�娴峰崡澶у鏃呮父瀛﹂櫌鏁欐巿銆佸崥澹敓瀵煎笀</p>
+                <div class="bodystyle" style="padding-top: 20%; margin: 0 13.5%">
+                    <h1 id="a005" class="front center">鏂颁笘绾珮绛夊鏍℃暀鏉惵锋梾娓哥鐞嗘牳蹇冭绯诲垪<br />缂栧啓鎸囧濮斿憳浼�</h1>
+                    <div class="fl">
+                        <p class="left1 ma-0 "><b>涓汇��浠�</b></p>
+                        <p class="ma-0 left2">銆�鐢宠憜鍢夈��</p>
+                        <p class="left3 ma-0">鍗楀紑澶у鍟嗗闄㈡梾娓稿绯绘暀鎺堛�佲�滀腑鍥芥梾娓告暀鑲蹭笌鐮旂┒缁堣韩鎴愬氨濂栤�濆敮涓�鑾峰鑰�</p>
+                    </div>
+                    <div class="fl">
+                        <p class="left1 ma-0 "><b>鍓富浠�</b></p>
+                        <p class="ma-0 left2 ">銆�榄忓皬瀹夈��</p>
+                        <p class="left3 ma-0">涓浗鏃呮父鐮旂┒闄㈢涓�灞婂鏈鍛樹細涓讳换濮斿憳銆佷腑鍥界ぞ浼氱瀛﹂櫌鏃呮父鐮旂┒涓績鐮旂┒鍛樸�佷腑澶皯鏃忓ぇ瀛﹀崥澹敓瀵煎笀</p>
+                    </div>
+                    <p class="left td-0"><b>濮斿憳</b><span class="left3">锛堜互濮撴皬绗旂敾涓哄簭锛�</span></p>
+                    <div class="fl">
+                        <p class="left1 ma-0 "><b>Larry Yu銆�銆�</b></p>
+                        <p class="left3 ma-0">缇庡浗涔旀不路鍗庣洓椤垮ぇ瀛︽梾娓镐笌閰掑簵绠$悊绯讳富浠汇�佹暀鎺�</p>
+                    </div>
+                    <div class="fl">
+                        <p class="left1 ma-0 "><b>Liping Cai銆�</b></p>
+                        <p class="left3 ma-0">缇庡浗鏅浮澶у鏃呮父涓庨厭搴楃郴涓讳换銆佹暀鎺�</p>
+                    </div>
+                    <div class="fl">
+                        <p class="left1 ma-0 "><b>鏉庡ぉ鍏冦��銆�銆�</b></p>
+                        <p class="left3 ma-0">鍗楀紑澶у鏃呮父涓庢湇鍔″闄㈡暀鎺堛�佸崥澹敓瀵煎笀</p>
+                    </div>
+                    <div class="fl">
+                        <p class="left1 ma-0 "><b>鍚存寤枫��銆�銆�</b></p>
+                        <p class="left3 ma-0">鍖椾含甯堣寖澶у鍦扮悊绉戝瀛﹂儴鏁欐巿銆佸崥澹敓瀵煎笀</p>
+                    </div>
+                    <div class="fl">
+                        <p class="left1 ma-0 "><b>閭圭粺閽庛��銆�銆�</b></p>
+                        <p class="left3 ma-0">鍖椾含绗簩澶栧浗璇闄㈡梾娓哥瀛﹀闄㈡暀鎺堛�佸崥澹敓瀵煎笀</p>
+                    </div>
+                    <div class="fl">
+                        <p class="left1 ma-0 "><b>瀹嬫捣宀┿��銆�銆�</b></p>
+                        <p class="left3 ma-0">棣欐腐鐞嗗伐澶у閰掑簵鍙婃梾娓镐笟绠$悊瀛﹂櫌鍓櫌闀裤�佹暀鎺堛�佸崥澹敓瀵煎笀</p>
+                    </div>
+                    <div class="fl">
+                        <p class="left1 ma-0 "><b>缃楁槑涔夈��銆�銆�</b></p>
+                        <p class="left3 ma-0">浜戝崡璐㈢粡澶у鏁欐巿銆佸崥澹敓瀵煎笀锛屽師浜戝崡鐪佹梾娓稿眬灞�闀�</p>
+                    </div>
+                    <div class="fl">
+                        <p class="left1 ma-0 "><b>璋㈠溅鍚涖��銆�銆�</b></p>
+                        <p class="left3 ma-0">娴峰崡澶у鏃呮父瀛﹂櫌鏁欐巿銆佸崥澹敓瀵煎笀</p>
+                    </div>
                 </div>
             </div>
         </div>
-        <!-- 缂栧啓濮斿憳浼� -->
-        <div class="page-box" page="6">
-            <div v-if="showPageList.indexOf(6) > -1">
+        <!-- 搴� -->
+        <div class="page-box" page="7">
+            <div v-if="showPageList.indexOf(7) > -1">
                 <div class="bodystyle" style="padding-top: 20%;">
-
+                    <div class="fl jc-sb mb-30">
+                        <img class="img-g" alt="" src="../../assets/images/0009-1.jpg" />
+                        <h1 id="a006" class="front">搴�<span class="h2-zt2"></span></h1>
+                    </div>
+                    <p>鍛ㄥ仴鍗庤�佸笀缂栬憲鐨勩�婁細璁瓥鍒掍笌缁勭粐銆嬫暀鏉愬嵆灏嗗啀鐗堬紝鎴戝緢楂樺叴涓烘涔﹀啀鐗堟挵鍐欏簭瑷�銆�</p>
+                    <p>鏈功鎵�璁哄強鐨勪細璁紝鍖呮嫭澶т細銆佸勾浼氥�佸伐浣滀細銆佺爺璁ㄤ細銆佽鍧涚瓑澶氱琛ㄧ幇褰㈠紡锛涙秹鍙婃斂搴溿�佷紒涓氥�佸崗浼氥�佺ぞ鍥㈢瓑鍚勭被涓诲姙鍗曚綅锛涜妯℃湁澶ф湁灏忥紝鏃堕棿鏈夐暱鏈夌煭銆備細璁槸鍙ゅ凡鏈変箣銆佷粖鏇村彂杈剧殑浜轰滑鑱氶泦璁簨鐨勪竴绉嶆椿鍔ㄣ�傞殢鐫�浼氳娲诲姩鐨勬棩鐩婇绻侊紝涓轰細璁椿鍔ㄦ彁渚涚瓥鍒掍笌缁勭粐绛夊悇绉嶆湇鍔$殑涓氭�佸簲杩愯�岀敓锛屽苟閫愭鍙戝睍璧锋潵锛屼笌灞曡涓氫竴璧峰苟绉颁负鈥滀細璁睍瑙堟湇鍔′笟鈥濓紝鍗充細灞曚笟銆�
+                    </p>
+                    <p>鍏氱殑鍗佸叓澶т互鏉ワ紝鎴戝浗浼氳涓氶潰瀵规柊褰㈠娍鍜屾柊闇�姹傦紝鏈変簡鏂板彂灞曞拰鏂版彁鍗囷紝姒傛嫭鑰岃█锛屼綋鐜板湪浠ヤ笅鏂归潰銆�</p>
+                    <p>绗竴锛屽紑浼氥�佸姙浼氭湁浜嗘槑纭殑瑙勮寖銆傚嵆涓ぎ鍏」瑙勫畾鍙婂叾瀹炴柦缁嗗垯鎵�鎻愬嚭鐨勮姹傘�傚叾涓昏鍐呭鏈夛細绮剧畝浼氳娲诲姩锛屽垏瀹炴敼杩涗細椋庯紱鎻愰珮浼氳瀹炴晥锛屽紑鐭細銆佽鐭瘽锛屽姏鎴掔┖璇濄�佸璇濓紱鍑忓皯浼氳娲诲姩锛涙帶鍒朵細璁椿鍔ㄨ妯″拰鏃堕棿锛涙彁楂樹細璁椿鍔ㄦ晥鐜囧拰璐ㄩ噺锛涗弗鏍兼帶鍒朵細璁椿鍔ㄧ粡璐癸紱绛夌瓑銆�
+                    </p>
+                    <p>绗簩锛屾垜鍥戒細璁笟鍒跺畾浜嗗熀纭�鎬х殑鍥藉鏍囧噯銆傝繖灏辨槸銆婁細璁垎绫诲拰鏈銆嬶紙GB/T30520-2014锛夈��</p>
+                    <p>绗笁锛屾槑纭湪涓浗涓惧姙鍥介檯浼氳蹇呴』閬靛惊鈥滄湇鍔″彂灞曘�佺‘淇濋噸鐐广�佽鑼冪鐞嗐�佺簿绠�鍔″疄鈥濈殑鍘熷垯銆�</p>
+                    <p>绗洓锛岀Н鏋佸悜鍥介檯鐭ュ悕浼氳璁哄潧瀛︿範銆備範杩戝钩鎬讳功璁版妸涓栫晫缁忔祹璁哄潧绉颁负鈥滄柦鐡﹀竷缁忔祹瀛︹�濓紝骞惰繘涓�姝ユ寚鍑猴紝涓浗鍚屼笘鐣岀粡娴庤鍧涚殑鍚堜綔涓庝腑鍥芥敼闈╁紑鏀捐繘绋嬪嚑涔庡悓姝ャ�傚弻鏂硅涓庢椂淇辫繘锛屽姞寮哄悎浣溿��</p>
+                    <p>绗簲锛屼範杩戝钩鎬讳功璁板娆″嚭甯笘鐣岄噸瑕佷細璁紝骞跺悜鍦ㄦ垜鍥藉彫寮�鐨勪竴浜涘浗闄呬細璁彂鏉ヨ春淇℃垨绁濊春瑙嗛锛岃〃鏄庡厷鍜屾斂搴滈珮搴﹂噸瑙嗗浗闄呬細璁殑浣滅敤銆�</p>
+                    <p>绗叚锛屼細璁殑鍔熸晥灏卞湪浜庢惌寤衡�滃钩鍙扳�濄�備範杩戝钩鎬讳功璁拌锛氣�滄垜浠�¤灏嗕腑鍥藉叡浜у厷涓庝笘鐣屾斂鍏氶珮灞傚璇濅細鏈哄埗鍖栵紝浣夸箣鎴愪负鍏锋湁骞挎硾浠h〃鎬у拰鍥介檯褰卞搷鍔涚殑楂樼鏀挎不瀵硅瘽骞冲彴銆傗��2018骞�11鏈堬紝涔犺繎骞虫�讳功璁板湪涓婃捣涓惧姙鐨勯灞婁腑鍥藉浗闄呰繘鍙e崥瑙堜細涓婅繕鎸囧嚭锛岃繖鏄釜澶у钩鍙帮紝浠婂悗瑕佸勾骞村姙涓嬪幓銆傝繖涓嶆槸涓�鑸�х殑浼氬睍锛岃�屾槸鎴戜滑涓诲姩寮�鏀惧競鍦虹殑閲嶅ぇ鏀跨瓥瀹gず鍜岃鍔ㄣ��
+                    </p>
+                    <p>绗竷锛屼綔涓轰腑鍥戒富鍦哄浜ょ殑浼氬睍娲诲姩鍦ㄦ瀯寤轰汉绫诲懡杩愬叡鍚屼綋銆佹彁鍑轰腑鍥芥柟妗堛�佽濂戒腑鍥芥晠浜嬬瓑璇稿鏂归潰锛岃秺鏉ヨ秺澶氬湴鍙戞尌鍑烘瀬涓洪噸瑕佺殑浣滅敤锛屼篃杩涗竴姝ユ彁鍗囦簡涓浗浼氳涓氱殑鍦颁綅锛屽甫鍔ㄤ簡涓浗浼氳涓氭暣浣撴按骞崇殑鎻愬崌銆�
+                    </p>
+                    <p>绗叓锛屼妇鍔為噸瑕佷細璁笌鍩庡競寤鸿鍙婄ぞ浼氬彂灞曞叧绯诲瘑鍒囥�傗�滃姙濂戒竴娆′細锛屾悶娲讳竴搴у煄鈥濈殑鏈夌泭缁忛獙锛屽�煎緱杩涗竴姝ユ�荤粨鍜屽�熼壌銆�</p>
+                    <p>涓轰簡涓庝笂杩版柊褰㈠娍銆佹柊鍙戝睍鐩搁�傚簲锛屾垜鍥戒細璁笟鏁欒偛鍩硅涔熼渶瑕佹湁鏂扮殑璁ょ煡鍜屾柊鐨勬敼杩涖�傛垜浠敞鎰忓埌锛屼粠2002骞村紑濮嬶紝鎴戝浗灏卞湪楂樻牎寮�璁句簡浼氬睍涓撲笟锛屼篃闄嗙画鍑虹増浜嗙浉鍏�
+                    </p>
                 </div>
             </div>
         </div>
-        <!-- 缂栧啓濮斿憳浼� -->
+        <!-- 鍓嶈█ -->
         <div class="page-box" page="8">
             <div v-if="showPageList.indexOf(8) > -1">
-                <div class="bodystyle" style="padding-top: 20%;">
-
+                <ul class="fl al-c pad-t-55 pad-l-80 mb-45">
+                    <li class="header-left-Number">2</li>
+                    <li class="header-left-text">浼氳绛栧垝涓庣粍缁囷紙绗簩鐗堬級</li>
+                </ul>
+                <div class="bodystyle">
+                    <p class="td-0">涓撲笟鐨勫悇绉嶆暀鏉愩�備絾浼氳鏂归潰鐨勬暀鏉愪笌灞曡鏂归潰鐨勬暀鏉愮浉姣旓紝鍏剁紪鍐欏拰鍑虹増鐨勬暟閲忛兘鐩稿灏戜竴浜涖�傝繖涓庢垜鍥戒細璁笟姣斿睍瑙堜笟鍙戝睍寰楄鏅氫竴浜涖�佹參涓�浜涚殑鐘跺喌鐩镐竴鑷淬�備絾鐜板湪浼氳涓氱殑鍙戝睍閫熷害宸茬粡蹇簡璧锋潵锛屽�煎緱鎴戜滑缁欎簣鏇村鍏虫敞銆�</p>
+                    <p>鎴戜滑鐪嬪埌锛岀浉瀵逛簬鍏朵粬鏁欐潗锛屼細璁柟闈㈢殑鏁欐潗鍐欎綔鍏锋湁涓�瀹氶毦搴︺�傚懆鍋ュ崕鑰佸笀缂栬憲鐨勩�婁細璁瓥鍒掍笌缁勭粐銆嬭繖鏈暀鏉愮揣瀵嗙粨鍚堜細璁涓氬墠娌垮姩鎬侊紝鍐呭绯荤粺娣卞叆锛屽眰娆″垎鏄庛�佹潯鐞嗘竻妤氾紝娉ㄩ噸鐞嗚鑱旂郴瀹為檯锛屽瀹炶返鍏锋湁鎸囧浣滅敤銆傚姞涔嬭繖鏈暀鏉愮幇鍦ㄩ渶瑕佸啀鐗堬紝涔熻鏄庡畠鍙楀埌璇昏�呯殑娆㈣繋锛屽緱鍒颁簡甯傚満鐨勮鍙��
+                    </p>
+                    <p>棰勭鏈功鍦ㄤ細璁笟楂樼瓑鏁欒偛涓繘涓�姝ュ彂鎸ユ洿鍔犻噸瑕佺殑浣滅敤锛屼负浼氳琛屼笟鍩瑰吇鏇村鐨勫悗澶囦汉鎵嶃��</p>
+                    <p class="right mr-70"><img class="img-25" alt="" src="../../assets/images/0010-1.jpg" /></p>
+                    <p class="right">涓浗浼氬睍缁忔祹鐮旂┒浼氬鏈寚瀵煎鍛樹細甯稿姟鍓富浠�</p>
                 </div>
             </div>
         </div>
         <!-- 缂栧啓濮斿憳浼� -->
-        <div class="page-box" page="9">
+        <!-- <div class="page-box" page="9">
             <div v-if="showPageList.indexOf(9) > -1">
                 <div class="bodystyle" style="padding-top: 20%;">
 
                 </div>
             </div>
-        </div>
+        </div> -->
         <!-- 缂栧啓濮斿憳浼� -->
-        <div class="page-box" page="10">
+        <!-- <div class="page-box" page="10">
             <div v-if="showPageList.indexOf(10) > -1">
                 <div class="bodystyle" style="padding-top: 20%;">
 
                 </div>
             </div>
-        </div>
-        <!-- 缂栧啓濮斿憳浼� -->
-        <div class="page-box" page="11">
-            <div v-if="showPageList.indexOf(11) > -1">
-                <div class="bodystyle" style="padding-top: 20%;">
-
-                </div>
-            </div>
-        </div>
-        <!-- 缂栧啓濮斿憳浼� -->
-        <div class="page-box" page="12">
-            <div v-if="showPageList.indexOf(12) > -1">
-                <div class="bodystyle" style="padding-top: 20%;">
-
-                </div>
-            </div>
-        </div>
+        </div> -->
     </div>
 </template>
 
 <script>
+import { Dict } from 'core-js';
+
 export default {
     name: "pageHeader",
     props: {
@@ -234,8 +281,4 @@
     background-color: #000;
 }
 
-p {
-    font-size: 15px;
-    text-indent: 1em;
-}
 </style>
\ No newline at end of file
diff --git a/src/books/meetingPlanners/view/components/index.vue b/src/books/meetingPlanners/view/components/index.vue
index c2f3d1a..ad2c950 100644
--- a/src/books/meetingPlanners/view/components/index.vue
+++ b/src/books/meetingPlanners/view/components/index.vue
@@ -53,7 +53,7 @@
     computed: {
       fontSize() {
         this.transformDom(this.$store.state.qiankun.fontSize)
-        return this.$store.state.qiankun.fontSize ? this.$store.state.qiankun.fontSize : 18;
+        return this.$store.state.qiankun.fontSize ? this.$store.state.qiankun.fontSize : 17;
       },
       pageZoom() {
         return this.$store.state.qiankun.scale ? this.$store.state.qiankun.scale / 100 : 1;

--
Gitblit v1.9.1