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/mathBook/view/components/chapter005.vue |  403 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 201 insertions(+), 202 deletions(-)

diff --git a/src/books/mathBook/view/components/chapter005.vue b/src/books/mathBook/view/components/chapter005.vue
index 669c704..0592e68 100644
--- a/src/books/mathBook/view/components/chapter005.vue
+++ b/src/books/mathBook/view/components/chapter005.vue
@@ -184,16 +184,6 @@
               </svg>
             </span>
           </p>
-          <p class="p-btn" >
-            <span>锛�2锛� -300掳.</span>
-            <span class="btn-box" @click="hadleAnswer(1)">
-              <svg xmlns="http://www.w3.org/2000/svg" width="16.501" height="16.501" viewBox="0 0 20.501 20.501">
-                <path class="a"
-                  d="M3344.717-15308.5H3337.4a10.186,10.186,0,0,1-7.25-3,10.185,10.185,0,0,1-3-7.25A10.262,10.262,0,0,1,3337.4-15329a10.26,10.26,0,0,1,10.249,10.248,10.129,10.129,0,0,1-2.2,6.341v3.177A.734.734,0,0,1,3344.717-15308.5Zm-9.606-7.29h4.493l.527,1.419c.071.182.156.386.254.608a2.428,2.428,0,0,0,.273.512.986.986,0,0,0,.315.262.971.971,0,0,0,.454.1,1.05,1.05,0,0,0,.773-.327,1.025,1.025,0,0,0,.319-.723,3.3,3.3,0,0,0-.277-1.051l-.062-.161-2.889-7.313c-.119-.321-.228-.607-.335-.873a2.972,2.972,0,0,0-.323-.616,1.56,1.56,0,0,0-.5-.469,1.552,1.552,0,0,0-.781-.181,1.535,1.535,0,0,0-.773.181,1.475,1.475,0,0,0-.5.477,3.674,3.674,0,0,0-.362.739l-.239.627-.054.135-2.824,7.355c-.095.229-.179.46-.25.688a1.529,1.529,0,0,0-.073.477.978.978,0,0,0,.323.72,1.039,1.039,0,0,0,.746.315.838.838,0,0,0,.716-.3,4.676,4.676,0,0,0,.466-.985l.062-.165.527-1.449Zm3.747-1.5h-3.293l1.812-5.124,1.481,5.123Z"
-                  transform="translate(-3327.144 15329)" />
-              </svg>
-            </span>
-          </p>
           <div v-if="isShowAnswer0" > 
             <p>
               <span class="zt-ls"><b>瑙�</b></span>锛�1锛�
@@ -205,8 +195,18 @@
             </p>
             <p class="img">鍥�5-4</p>
           </div>
+          <p class="p-btn" >
+            <span>锛�2锛� -300掳.</span>
+            <span class="btn-box" @click="hadleAnswer(1)">
+              <svg xmlns="http://www.w3.org/2000/svg" width="16.501" height="16.501" viewBox="0 0 20.501 20.501">
+                <path class="a"
+                  d="M3344.717-15308.5H3337.4a10.186,10.186,0,0,1-7.25-3,10.185,10.185,0,0,1-3-7.25A10.262,10.262,0,0,1,3337.4-15329a10.26,10.26,0,0,1,10.249,10.248,10.129,10.129,0,0,1-2.2,6.341v3.177A.734.734,0,0,1,3344.717-15308.5Zm-9.606-7.29h4.493l.527,1.419c.071.182.156.386.254.608a2.428,2.428,0,0,0,.273.512.986.986,0,0,0,.315.262.971.971,0,0,0,.454.1,1.05,1.05,0,0,0,.773-.327,1.025,1.025,0,0,0,.319-.723,3.3,3.3,0,0,0-.277-1.051l-.062-.161-2.889-7.313c-.119-.321-.228-.607-.335-.873a2.972,2.972,0,0,0-.323-.616,1.56,1.56,0,0,0-.5-.469,1.552,1.552,0,0,0-.781-.181,1.535,1.535,0,0,0-.773.181,1.475,1.475,0,0,0-.5.477,3.674,3.674,0,0,0-.362.739l-.239.627-.054.135-2.824,7.355c-.095.229-.179.46-.25.688a1.529,1.529,0,0,0-.073.477.978.978,0,0,0,.323.72,1.039,1.039,0,0,0,.746.315.838.838,0,0,0,.716-.3,4.676,4.676,0,0,0,.466-.985l.062-.165.527-1.449Zm3.747-1.5h-3.293l1.812-5.124,1.481,5.123Z"
+                  transform="translate(-3327.144 15329)" />
+              </svg>
+            </span>
+          </p>
           <p v-if="isShowAnswer1" >
-            锛�2锛�
+            <span class="zt-ls"><b>瑙�</b></span>锛�2锛�
             浠�<i>x</i>杞寸殑闈炶礋鍗婅酱涓哄杈癸紝椤烘椂閽堟柟鍚戞棆杞�300掳锛屽嵆褰㈡垚-300掳瑙掞紝濡傚浘5-4锛�2锛�
             鎵�绀�.鍥犱负-300掳瑙掔殑缁堣竟鍦ㄧ涓�璞¢檺鍐咃紝鎵�浠�-300掳瑙掓槸绗竴璞¢檺瑙�.
           </p>
@@ -214,7 +214,7 @@
             <img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
           </p>
           <div class="bj">
-            <examinations :cardList="questionData[164]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+            <examinations :cardList="questionData[164]"  sourceType="json" inputBc="#d3edfa"
               v-if="questionData"></examinations>
           </div>
           <h3 id="c049">
@@ -254,7 +254,7 @@
             <p>绗簲鍗曞厓 涓夎鍑芥暟</p>
           </li>
           <li>
-            <p><span>159</span></p>
+            <p><span>159-160</span></p>
           </li>
         </ul>
         <div class="padding-116">
@@ -287,6 +287,9 @@
               </svg>
             </span>
           </p>
+          <p v-if="isShowAnswer2" >
+            <span class="zt-ls"><b>瑙�</b></span>锛�1锛� 鍥犱负600掳=240掳+360掳锛屾墍浠�600掳瑙掍笌240掳瑙掔粓杈圭浉鍚岋紝鏄涓夎薄闄愯.
+          </p>
           <p class="p-btn" >
             <span>锛�2锛� -230掳锛�</span>
             <span class="btn-box" @click="hadleAnswer(3)">
@@ -296,6 +299,10 @@
                   transform="translate(-3327.144 15329)" />
               </svg>
             </span>
+          </p>
+          <p v-if="isShowAnswer3" >
+            <span class="zt-ls"><b>瑙�</b></span>锛�2锛�
+            鍥犱负-230掳=130掳-360掳锛屾墍浠�-230掳瑙掍笌130掳瑙掔粓杈圭浉鍚岋紝鏄浜岃薄闄愯.
           </p>
           <p class="p-btn" >
             <span>锛�3锛� -890掳.</span>
@@ -307,15 +314,8 @@
               </svg>
             </span>
           </p>
-          <p v-if="isShowAnswer2" >
-            <span class="zt-ls"><b>瑙�</b></span>锛�1锛� 鍥犱负600掳=240掳+360掳锛屾墍浠�600掳瑙掍笌240掳瑙掔粓杈圭浉鍚岋紝鏄涓夎薄闄愯.
-          </p>
-          <p v-if="isShowAnswer3" >
-            锛�2锛�
-            鍥犱负-230掳=130掳-360掳锛屾墍浠�-230掳瑙掍笌130掳瑙掔粓杈圭浉鍚岋紝鏄浜岃薄闄愯.
-          </p>
           <p v-if="isShowAnswer4" >
-            锛�3锛�
+            <span class="zt-ls"><b>瑙�</b></span>锛�3锛�
             鍥犱负-890掳=190掳-3脳360掳锛屾墍浠�-890掳瑙掍笌190掳瑙掔粓杈圭浉鍚岋紝鏄涓夎薄闄愯.
           </p>
           <p>
@@ -324,26 +324,6 @@
           <p class="p-btn" >
             <span>锛�1锛� 缁堣竟鍦�<i>y</i>杞存鍗婅酱涓婄殑瑙掔殑闆嗗悎锛�</span>
             <span class="btn-box" @click="hadleAnswer(5)">
-              <svg xmlns="http://www.w3.org/2000/svg" width="16.501" height="16.501" viewBox="0 0 20.501 20.501">
-                <path class="a"
-                  d="M3344.717-15308.5H3337.4a10.186,10.186,0,0,1-7.25-3,10.185,10.185,0,0,1-3-7.25A10.262,10.262,0,0,1,3337.4-15329a10.26,10.26,0,0,1,10.249,10.248,10.129,10.129,0,0,1-2.2,6.341v3.177A.734.734,0,0,1,3344.717-15308.5Zm-9.606-7.29h4.493l.527,1.419c.071.182.156.386.254.608a2.428,2.428,0,0,0,.273.512.986.986,0,0,0,.315.262.971.971,0,0,0,.454.1,1.05,1.05,0,0,0,.773-.327,1.025,1.025,0,0,0,.319-.723,3.3,3.3,0,0,0-.277-1.051l-.062-.161-2.889-7.313c-.119-.321-.228-.607-.335-.873a2.972,2.972,0,0,0-.323-.616,1.56,1.56,0,0,0-.5-.469,1.552,1.552,0,0,0-.781-.181,1.535,1.535,0,0,0-.773.181,1.475,1.475,0,0,0-.5.477,3.674,3.674,0,0,0-.362.739l-.239.627-.054.135-2.824,7.355c-.095.229-.179.46-.25.688a1.529,1.529,0,0,0-.073.477.978.978,0,0,0,.323.72,1.039,1.039,0,0,0,.746.315.838.838,0,0,0,.716-.3,4.676,4.676,0,0,0,.466-.985l.062-.165.527-1.449Zm3.747-1.5h-3.293l1.812-5.124,1.481,5.123Z"
-                  transform="translate(-3327.144 15329)" />
-              </svg>
-            </span>
-          </p>
-          <p class="p-btn" >
-            <span>锛�2锛� 缁堣竟鍦�<i>y</i>杞磋礋鍗婅酱涓婄殑瑙掔殑闆嗗悎锛�</span>
-            <span class="btn-box" @click="hadleAnswer(6)">
-              <svg xmlns="http://www.w3.org/2000/svg" width="16.501" height="16.501" viewBox="0 0 20.501 20.501">
-                <path class="a"
-                  d="M3344.717-15308.5H3337.4a10.186,10.186,0,0,1-7.25-3,10.185,10.185,0,0,1-3-7.25A10.262,10.262,0,0,1,3337.4-15329a10.26,10.26,0,0,1,10.249,10.248,10.129,10.129,0,0,1-2.2,6.341v3.177A.734.734,0,0,1,3344.717-15308.5Zm-9.606-7.29h4.493l.527,1.419c.071.182.156.386.254.608a2.428,2.428,0,0,0,.273.512.986.986,0,0,0,.315.262.971.971,0,0,0,.454.1,1.05,1.05,0,0,0,.773-.327,1.025,1.025,0,0,0,.319-.723,3.3,3.3,0,0,0-.277-1.051l-.062-.161-2.889-7.313c-.119-.321-.228-.607-.335-.873a2.972,2.972,0,0,0-.323-.616,1.56,1.56,0,0,0-.5-.469,1.552,1.552,0,0,0-.781-.181,1.535,1.535,0,0,0-.773.181,1.475,1.475,0,0,0-.5.477,3.674,3.674,0,0,0-.362.739l-.239.627-.054.135-2.824,7.355c-.095.229-.179.46-.25.688a1.529,1.529,0,0,0-.073.477.978.978,0,0,0,.323.72,1.039,1.039,0,0,0,.746.315.838.838,0,0,0,.716-.3,4.676,4.676,0,0,0,.466-.985l.062-.165.527-1.449Zm3.747-1.5h-3.293l1.812-5.124,1.481,5.123Z"
-                  transform="translate(-3327.144 15329)" />
-              </svg>
-            </span>
-          </p>
-          <p class="p-btn" >
-            <span>锛�3锛� 缁堣竟鍦�<i>y</i>杞翠笂鐨勮鐨勯泦鍚�.</span>
-            <span class="btn-box" @click="hadleAnswer(7)">
               <svg xmlns="http://www.w3.org/2000/svg" width="16.501" height="16.501" viewBox="0 0 20.501 20.501">
                 <path class="a"
                   d="M3344.717-15308.5H3337.4a10.186,10.186,0,0,1-7.25-3,10.185,10.185,0,0,1-3-7.25A10.262,10.262,0,0,1,3337.4-15329a10.26,10.26,0,0,1,10.249,10.248,10.129,10.129,0,0,1-2.2,6.341v3.177A.734.734,0,0,1,3344.717-15308.5Zm-9.606-7.29h4.493l.527,1.419c.071.182.156.386.254.608a2.428,2.428,0,0,0,.273.512.986.986,0,0,0,.315.262.971.971,0,0,0,.454.1,1.05,1.05,0,0,0,.773-.327,1.025,1.025,0,0,0,.319-.723,3.3,3.3,0,0,0-.277-1.051l-.062-.161-2.889-7.313c-.119-.321-.228-.607-.335-.873a2.972,2.972,0,0,0-.323-.616,1.56,1.56,0,0,0-.5-.469,1.552,1.552,0,0,0-.781-.181,1.535,1.535,0,0,0-.773.181,1.475,1.475,0,0,0-.5.477,3.674,3.674,0,0,0-.362.739l-.239.627-.054.135-2.824,7.355c-.095.229-.179.46-.25.688a1.529,1.529,0,0,0-.073.477.978.978,0,0,0,.323.72,1.039,1.039,0,0,0,.746.315.838.838,0,0,0,.716-.3,4.676,4.676,0,0,0,.466-.985l.062-.165.527-1.449Zm3.747-1.5h-3.293l1.812-5.124,1.481,5.123Z"
@@ -360,15 +340,35 @@
               <i>S</i>1={<i>尾</i>|<i>尾</i>=90掳+<i>k</i>路360掳锛�<i>k</i>鈭�<b>Z</b>}.
             </p>
           </div>
+          <p class="p-btn" >
+            <span>锛�2锛� 缁堣竟鍦�<i>y</i>杞磋礋鍗婅酱涓婄殑瑙掔殑闆嗗悎锛�</span>
+            <span class="btn-box" @click="hadleAnswer(6)">
+              <svg xmlns="http://www.w3.org/2000/svg" width="16.501" height="16.501" viewBox="0 0 20.501 20.501">
+                <path class="a"
+                  d="M3344.717-15308.5H3337.4a10.186,10.186,0,0,1-7.25-3,10.185,10.185,0,0,1-3-7.25A10.262,10.262,0,0,1,3337.4-15329a10.26,10.26,0,0,1,10.249,10.248,10.129,10.129,0,0,1-2.2,6.341v3.177A.734.734,0,0,1,3344.717-15308.5Zm-9.606-7.29h4.493l.527,1.419c.071.182.156.386.254.608a2.428,2.428,0,0,0,.273.512.986.986,0,0,0,.315.262.971.971,0,0,0,.454.1,1.05,1.05,0,0,0,.773-.327,1.025,1.025,0,0,0,.319-.723,3.3,3.3,0,0,0-.277-1.051l-.062-.161-2.889-7.313c-.119-.321-.228-.607-.335-.873a2.972,2.972,0,0,0-.323-.616,1.56,1.56,0,0,0-.5-.469,1.552,1.552,0,0,0-.781-.181,1.535,1.535,0,0,0-.773.181,1.475,1.475,0,0,0-.5.477,3.674,3.674,0,0,0-.362.739l-.239.627-.054.135-2.824,7.355c-.095.229-.179.46-.25.688a1.529,1.529,0,0,0-.073.477.978.978,0,0,0,.323.72,1.039,1.039,0,0,0,.746.315.838.838,0,0,0,.716-.3,4.676,4.676,0,0,0,.466-.985l.062-.165.527-1.449Zm3.747-1.5h-3.293l1.812-5.124,1.481,5.123Z"
+                  transform="translate(-3327.144 15329)" />
+              </svg>
+            </span>
+          </p>
           <div v-if="isShowAnswer6" > 
-            <p>锛�2锛� 鍦�0掳锝�360掳鍐咃紝缁堣竟鍦�<i>y</i>杞磋礋鍗婅酱涓婄殑瑙掓槸270掳瑙掞紝</p>
+            <p><span class="zt-ls"><b>瑙�</b></span>锛�2锛� 鍦�0掳锝�360掳鍐咃紝缁堣竟鍦�<i>y</i>杞磋礋鍗婅酱涓婄殑瑙掓槸270掳瑙掞紝</p>
             <p>鎵�浠ワ紝缁堣竟鍦�<i>y</i>杞磋礋鍗婅酱涓婄殑瑙掔殑闆嗗悎鏄�</p>
             <p class="center">
               <i>S</i>2={<i>尾</i>|<i>尾</i>=270掳+<i>k</i>路360掳锛�<i>k</i>鈭�<b>Z</b>}.
             </p>
           </div>
+          <p class="p-btn" >
+            <span>锛�3锛� 缁堣竟鍦�<i>y</i>杞翠笂鐨勮鐨勯泦鍚�.</span>
+            <span class="btn-box" @click="hadleAnswer(7)">
+              <svg xmlns="http://www.w3.org/2000/svg" width="16.501" height="16.501" viewBox="0 0 20.501 20.501">
+                <path class="a"
+                  d="M3344.717-15308.5H3337.4a10.186,10.186,0,0,1-7.25-3,10.185,10.185,0,0,1-3-7.25A10.262,10.262,0,0,1,3337.4-15329a10.26,10.26,0,0,1,10.249,10.248,10.129,10.129,0,0,1-2.2,6.341v3.177A.734.734,0,0,1,3344.717-15308.5Zm-9.606-7.29h4.493l.527,1.419c.071.182.156.386.254.608a2.428,2.428,0,0,0,.273.512.986.986,0,0,0,.315.262.971.971,0,0,0,.454.1,1.05,1.05,0,0,0,.773-.327,1.025,1.025,0,0,0,.319-.723,3.3,3.3,0,0,0-.277-1.051l-.062-.161-2.889-7.313c-.119-.321-.228-.607-.335-.873a2.972,2.972,0,0,0-.323-.616,1.56,1.56,0,0,0-.5-.469,1.552,1.552,0,0,0-.781-.181,1.535,1.535,0,0,0-.773.181,1.475,1.475,0,0,0-.5.477,3.674,3.674,0,0,0-.362.739l-.239.627-.054.135-2.824,7.355c-.095.229-.179.46-.25.688a1.529,1.529,0,0,0-.073.477.978.978,0,0,0,.323.72,1.039,1.039,0,0,0,.746.315.838.838,0,0,0,.716-.3,4.676,4.676,0,0,0,.466-.985l.062-.165.527-1.449Zm3.747-1.5h-3.293l1.812-5.124,1.481,5.123Z"
+                  transform="translate(-3327.144 15329)" />
+              </svg>
+            </span>
+          </p>
           <div v-if="isShowAnswer7" > 
-            <p>锛�3锛� 缁堣竟鍦�<i>y</i>杞翠笂鐨勮鐨勯泦鍚堟槸</p>
+            <p> <span class="zt-ls"><b>瑙�</b></span>锛�3锛� 缁堣竟鍦�<i>y</i>杞翠笂鐨勮鐨勯泦鍚堟槸</p>
             <p><i>S</i>=<i>S</i><sub>1</sub>鈭�<i>S</i><sub>2</sub></p>
             <p>
               ={<i>尾</i>|<i>尾</i>=90掳+<i>k</i>路360掳锛�<i>k</i>鈭�<b>Z</b>}鈭獅<i>尾</i>|<i>尾</i>=270掳+<i>k</i>路360掳锛�<i>k</i>鈭�<b>Z</b>}
@@ -378,28 +378,18 @@
             </p>
             <p>={<i>尾</i>|<i>尾</i>=90掳+<i>m</i>路180掳锛�<i>m</i>鈭�<b>Z</b>}.</p>
           </div>
-        </div>
-      </div>
-    </div>
-    <!-- 160 -->
-    <div class="page-box" page="167">
-      <div v-if="showPageList.indexOf(167) > -1">
-        <ul class="page-header-odd fl al-end">
-          <li>160</li>
-          <li>鏁板.鍩虹妯″潡</li>
-          <li>涓婂唽</li>
-        </ul>
-        <div class="padding-116">
-
           <p class="left">
             <img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
           </p>
           <div class="bj">
-            <examinations :cardList="questionData[167]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+            <examinations :cardList="questionData[167]"  sourceType="json" inputBc="#d3edfa"
               v-if="questionData"></examinations>
           </div>
         </div>
       </div>
+    </div>
+    <!-- 160 -->
+    <div class="page-box hidePage" page="167">
     </div>
     <!-- 161 -->
     <div class="page-box" page="168">
@@ -415,7 +405,7 @@
         <div class="padding-116">
           <h3 id="c050">涔犻5.1<span class="fontsz2">锛烇紴锛�</span></h3>
           <div class="bj">
-            <examinations :cardList="questionData[168]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+            <examinations :cardList="questionData[168]"  sourceType="json" inputBc="#d3edfa"
               v-if="questionData"></examinations>
           </div>
           <h2 id="b031">
@@ -897,7 +887,7 @@
           </p>
           <div v-if="isShowAnswer11" > 
             <p>
-              锛�2锛�
+              <span class="zt-ls"><b>瑙�</b></span>锛�2锛�
               鍏堝皢绉戝璁$畻鍣ㄧ殑绮剧‘搴﹁缃负0.01锛屽啀灏嗙瀛﹁绠楀櫒璁剧疆涓哄姬搴﹁绠楁ā寮忥紝绉戝璁$畻鍣ㄢ厾鎸�<img class="inline" alt=""
                 src="../../assets/images/0175-5.jpg" />锛岀瀛﹁绠楀櫒鈪℃寜<img class="inline" alt=""
                 src="../../assets/images/0175-6.jpg" />.涔嬪悗渚濇鎸変笅鍒楀悇閿�.
@@ -911,12 +901,12 @@
             </p>
             <p>鎵�浠ャ��154掳13鈥测増2.69 rad.</p>
           </div>
-          <calculator />
+          <iframe src="https://www.geogebra.org/scientific" frameborder="0" class="iframe-box"></iframe>
           <p class="left">
             <img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
           </p>
           <div class="bj">
-            <examinations :cardList="questionData[171]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+            <examinations :cardList="questionData[171]"  sourceType="json" inputBc="#d3edfa"
               v-if="questionData"></examinations>
           </div>
         </div>
@@ -1324,12 +1314,12 @@
             <img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
           </p>
           <div class="bj">
-            <examinations :cardList="questionData[173]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+            <examinations :cardList="questionData[173]"  sourceType="json" inputBc="#d3edfa"
               v-if="questionData"></examinations>
           </div>
           <h3 id="c053">涔犻5.2<span class="fontsz2">锛烇紴锛�</span></h3>
           <div class="bj">
-            <examinations :cardList="questionData[174]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+            <examinations :cardList="questionData[174]"  sourceType="json" inputBc="#d3edfa"
               v-if="questionData"></examinations>
           </div>
           <h2 id="b032">
@@ -1782,7 +1772,7 @@
             <img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
           </p>
           <div class="bj">
-            <examinations :cardList="questionData[176]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+            <examinations :cardList="questionData[176]"  sourceType="json" inputBc="#d3edfa"
               v-if="questionData"></examinations>
           </div>
           <p class="left">
@@ -1920,6 +1910,12 @@
               </svg>
             </span>
           </p>
+          <div v-if="isShowAnswer15" > 
+            <p>
+              <span class="zt-ls"><b>瑙�</b></span>锛�1锛� 鍥犱负-210掳鏄浜岃薄闄愯锛屾墍浠�
+            </p>
+            <p class="center">sin锛�-210掳锛夛紴0.</p>
+          </div>
           <p class="p-btn" >
             <span>锛�2锛� tan760掳锛�</span>
             <span class="btn-box" @click="hadleAnswer(16)">
@@ -1930,6 +1926,13 @@
               </svg>
             </span>
           </p>
+          <div v-if="isShowAnswer16" > 
+            <p>
+              <span class="zt-ls"><b>瑙�</b></span>锛�2锛�
+             鍥犱负760掳=40掳+2脳360掳锛屽彲鐭�760掳瑙掍笌40掳瑙掔殑缁堣竟鐩稿悓锛屾槸绗竴璞¢檺瑙掞紝鎵�浠�
+            </p>
+            <p class="center">tan 760掳锛�0.</p>
+          </div>
           <p class="p-btn" >
             <span>
               锛�3锛�
@@ -1953,22 +1956,9 @@
               </svg>
             </span>
           </p>
-          <div v-if="isShowAnswer15" > 
-            <p>
-              <span class="zt-ls"><b>瑙�</b></span>锛�1锛� 鍥犱负-210掳鏄浜岃薄闄愯锛屾墍浠�
-            </p>
-            <p class="center">sin锛�-210掳锛夛紴0.</p>
-          </div>
-          <div v-if="isShowAnswer16" > 
-            <p>
-            锛�2锛�
-             鍥犱负760掳=40掳+2脳360掳锛屽彲鐭�760掳瑙掍笌40掳瑙掔殑缁堣竟鐩稿悓锛屾槸绗竴璞¢檺瑙掞紝鎵�浠�
-            </p>
-            <p class="center">tan 760掳锛�0.</p>
-          </div>
           <div v-if="isShowAnswer17" > 
             <p>
-              锛�3锛� 鐢�<math display="0">
+              <span class="zt-ls"><b>瑙�</b></span>锛�3锛� 鐢�<math display="0">
                 <mfrac>
                   <mrow>
                     <mn>17</mn>
@@ -2051,7 +2041,7 @@
             <img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
           </p>
           <div class="bj">
-            <examinations :cardList="questionData[178]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+            <examinations :cardList="questionData[178]"  sourceType="json" inputBc="#d3edfa"
               v-if="questionData"></examinations>
           </div>
         </div>
@@ -2311,12 +2301,12 @@
             <img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
           </p>
           <div class="bj">
-            <examinations :cardList="questionData[180] ? questionData[180][1] : []" :hideCollect="true"
+            <examinations :cardList="questionData[180] ? questionData[180][1] : []" 
               sourceType="json" inputBc="#d3edfa" v-if="questionData"></examinations>
           </div>
           <h3 id="c054">涔犻5.3<span class="fontsz2">锛烇紴锛�</span></h3>
           <div class="bj">
-            <examinations :cardList="questionData[180] ? questionData[180][2] : []" :hideCollect="true"
+            <examinations :cardList="questionData[180] ? questionData[180][2] : []" 
               sourceType="json" inputBc="#d3edfa" v-if="questionData"></examinations>
           </div>
           <h2 id="b033">
@@ -3381,12 +3371,12 @@
             <img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
           </p>
           <div class="bj">
-            <examinations :cardList="questionData[184] ? questionData[184][1] : []" :hideCollect="true"
+            <examinations :cardList="questionData[184] ? questionData[184][1] : []" 
               sourceType="json" inputBc="#d3edfa" v-if="questionData"></examinations>
           </div>
           <h3 id="c055">涔犻5.4<span class="fontsz2">锛烇紴锛�</span></h3>
           <div class="bj">
-            <examinations :cardList="questionData[184] ? questionData[184][2] : []" :hideCollect="true"
+            <examinations :cardList="questionData[184] ? questionData[184][2] : []" 
               sourceType="json" inputBc="#d3edfa" v-if="questionData"></examinations>
           </div>
         </div>
@@ -3707,7 +3697,7 @@
             <img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
           </p>
           <div class="bj">
-            <examinations :cardList="questionData[186]" :hideCollect="true" sourceType="json" v-if="questionData">
+            <examinations :cardList="questionData[186]"  sourceType="json" v-if="questionData">
             </examinations>
           </div>
           <p class="left">
@@ -4183,7 +4173,7 @@
             <img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
           </p>
           <div class="bj">
-            <examinations :cardList="questionData[188]" :hideCollect="true" sourceType="json" v-if="questionData">
+            <examinations :cardList="questionData[188]"  sourceType="json" v-if="questionData">
             </examinations>
           </div>
           <p class="left">
@@ -4650,7 +4640,7 @@
             <img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
           </p>
           <div class="bj">
-            <examinations :cardList="questionData[190]" :hideCollect="true" sourceType="json" v-if="questionData">
+            <examinations :cardList="questionData[190]"  sourceType="json" v-if="questionData">
             </examinations>
           </div>
           <p class="left">
@@ -5193,7 +5183,7 @@
             <img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
           </p>
           <div class="bj">
-            <examinations :cardList="questionData[192]" :hideCollect="true" sourceType="json" v-if="questionData">
+            <examinations :cardList="questionData[192]"  sourceType="json" v-if="questionData">
             </examinations>
           </div>
           <p class="left">
@@ -5264,7 +5254,7 @@
           </p>
           <div v-if="isShowAnswer32" > 
             <p>
-              锛�2锛�
+              <span class="zt-ls"><b>瑙�</b></span>锛�2锛�
               鍏堝皢绮剧‘搴﹁缃负0.01锛屽啀灏嗙瀛﹁绠楀櫒璁剧疆涓哄姬搴﹁绠楁ā寮忥紝鐒跺悗渚濇鎸変笅鍒楀悇閿細
             </p>
             <p class="center">
@@ -5323,6 +5313,7 @@
           </p>
           <div v-if="isShowAnswer33" > 
             <p>
+              <span class="zt-ls"><b>瑙�</b></span>
               锛�3锛�
               鍏堝皢绮剧‘搴﹁缃负0.01锛屽啀灏嗙瀛﹁绠楀櫒璁剧疆涓哄姬搴﹁绠楁ā寮忥紝鐒跺悗渚濇鎸変笅鍒楀悇閿細
             </p>
@@ -5360,7 +5351,7 @@
             <img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
           </p>
           <div class="bj">
-            <examinations :cardList="questionData[193]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+            <examinations :cardList="questionData[193]"  sourceType="json" inputBc="#d3edfa"
               v-if="questionData"></examinations>
           </div>
         </div>
@@ -5383,7 +5374,7 @@
         <div class="padding-116">
           <h3 id="c056">涔犻5.5<span class="fontsz2">锛烇紴锛�</span></h3>
           <div class="bj">
-            <examinations :cardList="questionData[194]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+            <examinations :cardList="questionData[194]"  sourceType="json" inputBc="#d3edfa"
               v-if="questionData"></examinations>
           </div>
         </div>
@@ -5608,7 +5599,7 @@
             </span>
           </p>
           <div v-if="isShowAnswer35" > 
-            <p>锛�2锛� 鍒楄〃锛堣〃5-7锛�.</p>
+            <p><span class="zt-ls"><b>瑙�</b></span>锛�2锛� 鍒楄〃锛堣〃5-7锛�.</p>
             <p class="img">琛�5-7</p>
             <p class="center">
               <img class="img-a" alt="" src="../../assets/images/0201-4.jpg" />
@@ -5643,22 +5634,24 @@
                 <img class="img-gn2" alt="" src="../../assets/images/hzjl.jpg" />
               </p>
             </div>
-            <examinations :cardList="questionData[198]" :hideCollect="true" sourceType="json" v-if="questionData">
+            <examinations :cardList="questionData[198]"  sourceType="json" v-if="questionData">
             </examinations>
-            <p class="block">
-              <i>y</i>=-sin<i>x</i>涓�<i>y</i>=sin<i>x</i>鐨勫浘鍍忔湁浠�涔堝叧绯伙紵
-              <i>y</i>=1+sin<i>x</i>涓�<i>y</i>=sin<i>x</i>鐨勫浘鍍忔湁浠�涔堝叧绯伙紵
-            </p>
           </div>
           <p class="left">
             <img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
           </p>
           <div class="bj">
             <fillInTable :queryData="queryDataOne"  />
-            <paint 
+            <!-- <paint 
               :page="198"
               :imgUrl="this.config.activeBook.resourceUrl + '/images/0103-2.jpg'" 
-            />
+            /> -->
+            <graffiti 
+                :page="198" 
+                :bcImg="this.config.activeBook.resourceUrl + '/images/0103-2.jpg'"
+                :imgWidth="520"
+                :imgHeight="494"
+              />
           </div>
           <h3 id="c058">
             5.6.2 姝e鸡鍑芥暟鐨勬�ц川锛堜竴锛�<span class="fontsz2">锛烇紴锛�</span>
@@ -5799,18 +5792,6 @@
               </svg>
             </span>
           </p>
-          <p class="p-btn" >
-            <span>
-              锛�2锛� <i>y</i>=-2sin<i>x</i>.
-            </span>
-            <span class="btn-box" @click="hadleAnswer(38)">
-              <svg xmlns="http://www.w3.org/2000/svg" width="16.501" height="16.501" viewBox="0 0 20.501 20.501">
-                <path class="a"
-                  d="M3344.717-15308.5H3337.4a10.186,10.186,0,0,1-7.25-3,10.185,10.185,0,0,1-3-7.25A10.262,10.262,0,0,1,3337.4-15329a10.26,10.26,0,0,1,10.249,10.248,10.129,10.129,0,0,1-2.2,6.341v3.177A.734.734,0,0,1,3344.717-15308.5Zm-9.606-7.29h4.493l.527,1.419c.071.182.156.386.254.608a2.428,2.428,0,0,0,.273.512.986.986,0,0,0,.315.262.971.971,0,0,0,.454.1,1.05,1.05,0,0,0,.773-.327,1.025,1.025,0,0,0,.319-.723,3.3,3.3,0,0,0-.277-1.051l-.062-.161-2.889-7.313c-.119-.321-.228-.607-.335-.873a2.972,2.972,0,0,0-.323-.616,1.56,1.56,0,0,0-.5-.469,1.552,1.552,0,0,0-.781-.181,1.535,1.535,0,0,0-.773.181,1.475,1.475,0,0,0-.5.477,3.674,3.674,0,0,0-.362.739l-.239.627-.054.135-2.824,7.355c-.095.229-.179.46-.25.688a1.529,1.529,0,0,0-.073.477.978.978,0,0,0,.323.72,1.039,1.039,0,0,0,.746.315.838.838,0,0,0,.716-.3,4.676,4.676,0,0,0,.466-.985l.062-.165.527-1.449Zm3.747-1.5h-3.293l1.812-5.124,1.481,5.123Z"
-                  transform="translate(-3327.144 15329)" />
-              </svg>
-            </span>
-          </p>
           <div v-if="isShowAnswer37" > 
             <p>
               <span class="zt-ls"><b>瑙�</b></span>锛�1锛�
@@ -5878,9 +5859,21 @@
               </math>.杩欐椂鍑芥暟<i>y</i>=3+sin<i>x</i>鐨勬渶灏忓�间负<i>y</i>=3+锛�-1锛�=2.
             </p>
           </div>
+          <p class="p-btn" >
+            <span>
+              锛�2锛� <i>y</i>=-2sin<i>x</i>.
+            </span>
+            <span class="btn-box" @click="hadleAnswer(38)">
+              <svg xmlns="http://www.w3.org/2000/svg" width="16.501" height="16.501" viewBox="0 0 20.501 20.501">
+                <path class="a"
+                  d="M3344.717-15308.5H3337.4a10.186,10.186,0,0,1-7.25-3,10.185,10.185,0,0,1-3-7.25A10.262,10.262,0,0,1,3337.4-15329a10.26,10.26,0,0,1,10.249,10.248,10.129,10.129,0,0,1-2.2,6.341v3.177A.734.734,0,0,1,3344.717-15308.5Zm-9.606-7.29h4.493l.527,1.419c.071.182.156.386.254.608a2.428,2.428,0,0,0,.273.512.986.986,0,0,0,.315.262.971.971,0,0,0,.454.1,1.05,1.05,0,0,0,.773-.327,1.025,1.025,0,0,0,.319-.723,3.3,3.3,0,0,0-.277-1.051l-.062-.161-2.889-7.313c-.119-.321-.228-.607-.335-.873a2.972,2.972,0,0,0-.323-.616,1.56,1.56,0,0,0-.5-.469,1.552,1.552,0,0,0-.781-.181,1.535,1.535,0,0,0-.773.181,1.475,1.475,0,0,0-.5.477,3.674,3.674,0,0,0-.362.739l-.239.627-.054.135-2.824,7.355c-.095.229-.179.46-.25.688a1.529,1.529,0,0,0-.073.477.978.978,0,0,0,.323.72,1.039,1.039,0,0,0,.746.315.838.838,0,0,0,.716-.3,4.676,4.676,0,0,0,.466-.985l.062-.165.527-1.449Zm3.747-1.5h-3.293l1.812-5.124,1.481,5.123Z"
+                  transform="translate(-3327.144 15329)" />
+              </svg>
+            </span>
+          </p>
           <div v-if="isShowAnswer38" > 
             <p>
-              锛�2锛�
+              <span class="zt-ls"><b>瑙�</b></span>锛�2锛�
               浣垮嚱鏁�<i>y</i>=-2sin<i>x</i>鍙栧緱鏈�澶у�肩殑<i>x</i>鐨勯泦鍚堬紝灏辨槸浣垮嚱鏁�<i>y</i>=sin<i>x</i>鍙栧緱鏈�灏忓�肩殑<i>x</i>鐨勯泦鍚�<math display="0">
                 <mrow data-mjx-texclass="INNER">
                   <mo data-mjx-texclass="OPEN">{</mo>
@@ -5949,7 +5942,7 @@
             <img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
           </p>
           <div class="bj">
-            <examinations :cardList="questionData[199]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+            <examinations :cardList="questionData[199]"  sourceType="json" inputBc="#d3edfa"
               v-if="questionData"></examinations>
           </div>
           <h3 id="c059">
@@ -6101,42 +6094,6 @@
               </svg>
             </span>
           </p>
-          <p class="p-btn" >
-            <span>
-              锛�2锛�<math display="0">
-                <mi>sin</mi>
-                <mo data-mjx-texclass="NONE">鈦�</mo>
-                <mrow data-mjx-texclass="INNER">
-                  <mo data-mjx-texclass="OPEN">(</mo>
-                  <mo>鈭�</mo>
-                  <mfrac>
-                    <mi>蟺</mi>
-                    <mn>9</mn>
-                  </mfrac>
-                  <mo data-mjx-texclass="CLOSE">)</mo>
-                </mrow>
-              </math>涓�<math display="0">
-                <mi>sin</mi>
-                <mo data-mjx-texclass="NONE">鈦�</mo>
-                <mrow data-mjx-texclass="INNER">
-                  <mo data-mjx-texclass="OPEN">(</mo>
-                  <mo>鈭�</mo>
-                  <mfrac>
-                    <mi>蟺</mi>
-                    <mn>10</mn>
-                  </mfrac>
-                  <mo data-mjx-texclass="CLOSE">)</mo>
-                </mrow>
-              </math>.
-            </span>
-            <span class="btn-box" @click="hadleAnswer(40)">
-              <svg xmlns="http://www.w3.org/2000/svg" width="16.501" height="16.501" viewBox="0 0 20.501 20.501">
-                <path class="a"
-                  d="M3344.717-15308.5H3337.4a10.186,10.186,0,0,1-7.25-3,10.185,10.185,0,0,1-3-7.25A10.262,10.262,0,0,1,3337.4-15329a10.26,10.26,0,0,1,10.249,10.248,10.129,10.129,0,0,1-2.2,6.341v3.177A.734.734,0,0,1,3344.717-15308.5Zm-9.606-7.29h4.493l.527,1.419c.071.182.156.386.254.608a2.428,2.428,0,0,0,.273.512.986.986,0,0,0,.315.262.971.971,0,0,0,.454.1,1.05,1.05,0,0,0,.773-.327,1.025,1.025,0,0,0,.319-.723,3.3,3.3,0,0,0-.277-1.051l-.062-.161-2.889-7.313c-.119-.321-.228-.607-.335-.873a2.972,2.972,0,0,0-.323-.616,1.56,1.56,0,0,0-.5-.469,1.552,1.552,0,0,0-.781-.181,1.535,1.535,0,0,0-.773.181,1.475,1.475,0,0,0-.5.477,3.674,3.674,0,0,0-.362.739l-.239.627-.054.135-2.824,7.355c-.095.229-.179.46-.25.688a1.529,1.529,0,0,0-.073.477.978.978,0,0,0,.323.72,1.039,1.039,0,0,0,.746.315.838.838,0,0,0,.716-.3,4.676,4.676,0,0,0,.466-.985l.062-.165.527-1.449Zm3.747-1.5h-3.293l1.812-5.124,1.481,5.123Z"
-                  transform="translate(-3327.144 15329)" />
-              </svg>
-            </span>
-          </p>
           <div v-if="isShowAnswer39" > 
             <p>
               <span class="zt-ls"><b>瑙�</b></span>锛�1锛� 鍥犱负銆�<math display="0">
@@ -6213,9 +6170,45 @@
               <mtext>.&nbsp;</mtext>
             </math>
           </div>
+          <p class="p-btn" >
+            <span>
+              锛�2锛�<math display="0">
+                <mi>sin</mi>
+                <mo data-mjx-texclass="NONE">鈦�</mo>
+                <mrow data-mjx-texclass="INNER">
+                  <mo data-mjx-texclass="OPEN">(</mo>
+                  <mo>鈭�</mo>
+                  <mfrac>
+                    <mi>蟺</mi>
+                    <mn>9</mn>
+                  </mfrac>
+                  <mo data-mjx-texclass="CLOSE">)</mo>
+                </mrow>
+              </math>涓�<math display="0">
+                <mi>sin</mi>
+                <mo data-mjx-texclass="NONE">鈦�</mo>
+                <mrow data-mjx-texclass="INNER">
+                  <mo data-mjx-texclass="OPEN">(</mo>
+                  <mo>鈭�</mo>
+                  <mfrac>
+                    <mi>蟺</mi>
+                    <mn>10</mn>
+                  </mfrac>
+                  <mo data-mjx-texclass="CLOSE">)</mo>
+                </mrow>
+              </math>.
+            </span>
+            <span class="btn-box" @click="hadleAnswer(40)">
+              <svg xmlns="http://www.w3.org/2000/svg" width="16.501" height="16.501" viewBox="0 0 20.501 20.501">
+                <path class="a"
+                  d="M3344.717-15308.5H3337.4a10.186,10.186,0,0,1-7.25-3,10.185,10.185,0,0,1-3-7.25A10.262,10.262,0,0,1,3337.4-15329a10.26,10.26,0,0,1,10.249,10.248,10.129,10.129,0,0,1-2.2,6.341v3.177A.734.734,0,0,1,3344.717-15308.5Zm-9.606-7.29h4.493l.527,1.419c.071.182.156.386.254.608a2.428,2.428,0,0,0,.273.512.986.986,0,0,0,.315.262.971.971,0,0,0,.454.1,1.05,1.05,0,0,0,.773-.327,1.025,1.025,0,0,0,.319-.723,3.3,3.3,0,0,0-.277-1.051l-.062-.161-2.889-7.313c-.119-.321-.228-.607-.335-.873a2.972,2.972,0,0,0-.323-.616,1.56,1.56,0,0,0-.5-.469,1.552,1.552,0,0,0-.781-.181,1.535,1.535,0,0,0-.773.181,1.475,1.475,0,0,0-.5.477,3.674,3.674,0,0,0-.362.739l-.239.627-.054.135-2.824,7.355c-.095.229-.179.46-.25.688a1.529,1.529,0,0,0-.073.477.978.978,0,0,0,.323.72,1.039,1.039,0,0,0,.746.315.838.838,0,0,0,.716-.3,4.676,4.676,0,0,0,.466-.985l.062-.165.527-1.449Zm3.747-1.5h-3.293l1.812-5.124,1.481,5.123Z"
+                  transform="translate(-3327.144 15329)" />
+              </svg>
+            </span>
+          </p>
           <div v-if="isShowAnswer40" > 
             <p>
-                锛�2锛� 鍥犱负銆�<math display="0">
+              <span class="zt-ls"><b>瑙�</b></span>锛�2锛� 鍥犱负銆�<math display="0">
                   <mo>鈭�</mo>
                   <mfrac>
                     <mi>蟺</mi>
@@ -6298,12 +6291,12 @@
             <img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
           </p>
           <div class="bj">
-            <examinations :cardList="questionData[201] ? questionData[201][1] : []" :hideCollect="true"
+            <examinations :cardList="questionData[201] ? questionData[201][1] : []" 
               sourceType="json" inputBc="#d3edfa" v-if="questionData"></examinations>
           </div>
           <h3 id="c060">涔犻5.6<span class="fontsz2">锛烇紴锛�</span></h3>
           <div class="bj">
-            <examinations :cardList="questionData[201] ? questionData[201][2] : []" :hideCollect="true"
+            <examinations :cardList="questionData[201] ? questionData[201][2] : []" 
               sourceType="json" inputBc="#d3edfa" v-if="questionData"></examinations>
           </div>
         </div>
@@ -6538,11 +6531,17 @@
             <p class="table-answer-box" v-if="isShowAnswer">
               绛旀锛氱炕杞拰骞崇Щ
             </p>
-            <paint 
+            <!-- <paint 
               :page="204"
               :canvasHeight="200"
               :imgUrl="this.config.activeBook.resourceUrl + '/images/0208-4.jpg'" 
-            />
+            /> -->
+            <graffiti 
+                :page="204" 
+                :bcImg="this.config.activeBook.resourceUrl + '/images/0208-4.jpg'"
+                :imgWidth="520"
+                :imgHeight="294"
+              />
           </div>
         </div>
       </div>
@@ -6643,7 +6642,7 @@
                 <img class="img-gn2" alt="" src="../../assets/images/hzjl.jpg" />
               </p>
             </div>
-            <examinations :cardList="questionData[206] ? questionData[206][1] : []" :hideCollect="true"
+            <examinations :cardList="questionData[206] ? questionData[206][1] : []" 
               sourceType="json" v-if="questionData"></examinations>
           </div>
           <p>
@@ -6675,43 +6674,6 @@
               </math>锛�
             </span>
             <span class="btn-box" @click="hadleAnswer(44)">
-              <svg xmlns="http://www.w3.org/2000/svg" width="16.501" height="16.501" viewBox="0 0 20.501 20.501">
-                <path class="a"
-                  d="M3344.717-15308.5H3337.4a10.186,10.186,0,0,1-7.25-3,10.185,10.185,0,0,1-3-7.25A10.262,10.262,0,0,1,3337.4-15329a10.26,10.26,0,0,1,10.249,10.248,10.129,10.129,0,0,1-2.2,6.341v3.177A.734.734,0,0,1,3344.717-15308.5Zm-9.606-7.29h4.493l.527,1.419c.071.182.156.386.254.608a2.428,2.428,0,0,0,.273.512.986.986,0,0,0,.315.262.971.971,0,0,0,.454.1,1.05,1.05,0,0,0,.773-.327,1.025,1.025,0,0,0,.319-.723,3.3,3.3,0,0,0-.277-1.051l-.062-.161-2.889-7.313c-.119-.321-.228-.607-.335-.873a2.972,2.972,0,0,0-.323-.616,1.56,1.56,0,0,0-.5-.469,1.552,1.552,0,0,0-.781-.181,1.535,1.535,0,0,0-.773.181,1.475,1.475,0,0,0-.5.477,3.674,3.674,0,0,0-.362.739l-.239.627-.054.135-2.824,7.355c-.095.229-.179.46-.25.688a1.529,1.529,0,0,0-.073.477.978.978,0,0,0,.323.72,1.039,1.039,0,0,0,.746.315.838.838,0,0,0,.716-.3,4.676,4.676,0,0,0,.466-.985l.062-.165.527-1.449Zm3.747-1.5h-3.293l1.812-5.124,1.481,5.123Z"
-                  transform="translate(-3327.144 15329)" />
-              </svg>
-            </span>
-          </p>
-          <p class="p-btn" >
-            <span>
-              锛�2锛�
-              <math display="0">
-                <mi>cos</mi>
-                <mo data-mjx-texclass="NONE">鈦�</mo>
-                <mrow data-mjx-texclass="INNER">
-                  <mo data-mjx-texclass="OPEN">(</mo>
-                  <mo>鈭�</mo>
-                  <mfrac>
-                    <mi>蟺</mi>
-                    <mn>7</mn>
-                  </mfrac>
-                  <mo data-mjx-texclass="CLOSE">)</mo>
-                </mrow>
-              </math>涓�<math display="0">
-                <mi>cos</mi>
-                <mo data-mjx-texclass="NONE">鈦�</mo>
-                <mrow data-mjx-texclass="INNER">
-                  <mo data-mjx-texclass="OPEN">(</mo>
-                  <mo>鈭�</mo>
-                  <mfrac>
-                    <mi>蟺</mi>
-                    <mn>8</mn>
-                  </mfrac>
-                  <mo data-mjx-texclass="CLOSE">)</mo>
-                </mrow>
-              </math>.
-            </span>
-            <span class="btn-box" @click="hadleAnswer(45)">
               <svg xmlns="http://www.w3.org/2000/svg" width="16.501" height="16.501" viewBox="0 0 20.501 20.501">
                 <path class="a"
                   d="M3344.717-15308.5H3337.4a10.186,10.186,0,0,1-7.25-3,10.185,10.185,0,0,1-3-7.25A10.262,10.262,0,0,1,3337.4-15329a10.26,10.26,0,0,1,10.249,10.248,10.129,10.129,0,0,1-2.2,6.341v3.177A.734.734,0,0,1,3344.717-15308.5Zm-9.606-7.29h4.493l.527,1.419c.071.182.156.386.254.608a2.428,2.428,0,0,0,.273.512.986.986,0,0,0,.315.262.971.971,0,0,0,.454.1,1.05,1.05,0,0,0,.773-.327,1.025,1.025,0,0,0,.319-.723,3.3,3.3,0,0,0-.277-1.051l-.062-.161-2.889-7.313c-.119-.321-.228-.607-.335-.873a2.972,2.972,0,0,0-.323-.616,1.56,1.56,0,0,0-.5-.469,1.552,1.552,0,0,0-.781-.181,1.535,1.535,0,0,0-.773.181,1.475,1.475,0,0,0-.5.477,3.674,3.674,0,0,0-.362.739l-.239.627-.054.135-2.824,7.355c-.095.229-.179.46-.25.688a1.529,1.529,0,0,0-.073.477.978.978,0,0,0,.323.72,1.039,1.039,0,0,0,.746.315.838.838,0,0,0,.716-.3,4.676,4.676,0,0,0,.466-.985l.062-.165.527-1.449Zm3.747-1.5h-3.293l1.812-5.124,1.481,5.123Z"
@@ -6786,9 +6748,46 @@
               <mo>.</mo>
             </math>
           </div>
+          <p class="p-btn" >
+            <span>
+              锛�2锛�
+              <math display="0">
+                <mi>cos</mi>
+                <mo data-mjx-texclass="NONE">鈦�</mo>
+                <mrow data-mjx-texclass="INNER">
+                  <mo data-mjx-texclass="OPEN">(</mo>
+                  <mo>鈭�</mo>
+                  <mfrac>
+                    <mi>蟺</mi>
+                    <mn>7</mn>
+                  </mfrac>
+                  <mo data-mjx-texclass="CLOSE">)</mo>
+                </mrow>
+              </math>涓�<math display="0">
+                <mi>cos</mi>
+                <mo data-mjx-texclass="NONE">鈦�</mo>
+                <mrow data-mjx-texclass="INNER">
+                  <mo data-mjx-texclass="OPEN">(</mo>
+                  <mo>鈭�</mo>
+                  <mfrac>
+                    <mi>蟺</mi>
+                    <mn>8</mn>
+                  </mfrac>
+                  <mo data-mjx-texclass="CLOSE">)</mo>
+                </mrow>
+              </math>.
+            </span>
+            <span class="btn-box" @click="hadleAnswer(45)">
+              <svg xmlns="http://www.w3.org/2000/svg" width="16.501" height="16.501" viewBox="0 0 20.501 20.501">
+                <path class="a"
+                  d="M3344.717-15308.5H3337.4a10.186,10.186,0,0,1-7.25-3,10.185,10.185,0,0,1-3-7.25A10.262,10.262,0,0,1,3337.4-15329a10.26,10.26,0,0,1,10.249,10.248,10.129,10.129,0,0,1-2.2,6.341v3.177A.734.734,0,0,1,3344.717-15308.5Zm-9.606-7.29h4.493l.527,1.419c.071.182.156.386.254.608a2.428,2.428,0,0,0,.273.512.986.986,0,0,0,.315.262.971.971,0,0,0,.454.1,1.05,1.05,0,0,0,.773-.327,1.025,1.025,0,0,0,.319-.723,3.3,3.3,0,0,0-.277-1.051l-.062-.161-2.889-7.313c-.119-.321-.228-.607-.335-.873a2.972,2.972,0,0,0-.323-.616,1.56,1.56,0,0,0-.5-.469,1.552,1.552,0,0,0-.781-.181,1.535,1.535,0,0,0-.773.181,1.475,1.475,0,0,0-.5.477,3.674,3.674,0,0,0-.362.739l-.239.627-.054.135-2.824,7.355c-.095.229-.179.46-.25.688a1.529,1.529,0,0,0-.073.477.978.978,0,0,0,.323.72,1.039,1.039,0,0,0,.746.315.838.838,0,0,0,.716-.3,4.676,4.676,0,0,0,.466-.985l.062-.165.527-1.449Zm3.747-1.5h-3.293l1.812-5.124,1.481,5.123Z"
+                  transform="translate(-3327.144 15329)" />
+              </svg>
+            </span>
+          </p>
           <div v-if="isShowAnswer45" > 
             <p>
-              锛�2锛�<math display="0">
+              <span class="zt-ls"><b>瑙�</b></span>锛�2锛�<math display="0">
                 <mi>cos</mi>
                 <mo data-mjx-texclass="NONE">鈦�</mo>
                 <mrow data-mjx-texclass="INNER">
@@ -6904,7 +6903,7 @@
             <img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
           </p>
           <div class="bj">
-            <examinations :cardList="questionData[206] ? questionData[206][2] : []" :hideCollect="true"
+            <examinations :cardList="questionData[206] ? questionData[206][2] : []" 
               sourceType="json" inputBc="#d3edfa" v-if="questionData"></examinations>
           </div>
         </div>
@@ -6921,7 +6920,7 @@
         <div class="padding-116">
           <h3 id="c063">涔犻5.7<span class="fontsz2">锛烇紴锛�</span></h3>
           <div class="bj">
-            <examinations :cardList="questionData[207]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+            <examinations :cardList="questionData[207]"  sourceType="json" inputBc="#d3edfa"
               v-if="questionData"></examinations>
           </div>
           <h2 id="b037">
@@ -7570,7 +7569,7 @@
             <img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
           </p>
           <div class="bj">
-            <examinations :cardList="questionData[209]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+            <examinations :cardList="questionData[209]"  sourceType="json" inputBc="#d3edfa"
               v-if="questionData"></examinations>
           </div>
         </div>
@@ -7632,7 +7631,7 @@
               </svg>
             </span>
           </p>
-          <calculator />
+          <iframe src="https://www.geogebra.org/scientific" frameborder="0" class="iframe-box"></iframe>
           <div v-if="isShowAnswer49" > 
             <p>
               <span class="zt-ls"><b>瑙�</b></span> 鍥犱负<math display="0">
@@ -7745,7 +7744,7 @@
               </svg>
             </span>
           </p>
-          <calculator />
+          <iframe src="https://www.geogebra.org/scientific" frameborder="0" class="iframe-box"></iframe>
           <div v-if="isShowAnswer51" > 
             <p>
               <span class="zt-ls"><b>瑙�</b></span> 鍥犱负<math display="0">
@@ -7846,12 +7845,12 @@
             <img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
           </p>
           <div class="bj">
-            <examinations :cardList="questionData[212] ? questionData[212][1] : []" :hideCollect="true"
+            <examinations :cardList="questionData[212] ? questionData[212][1] : []" 
               sourceType="json" inputBc="#d3edfa" v-if="questionData"></examinations>
           </div>
           <h3 id="c066">涔犻5.8<span class="fontsz2">锛烇紴锛�</span></h3>
           <div class="bj">
-            <examinations :cardList="questionData[212] ? questionData[212][2] : []" :hideCollect="true"
+            <examinations :cardList="questionData[212] ? questionData[212][2] : []" 
               sourceType="json" inputBc="#d3edfa" v-if="questionData"></examinations>
           </div>
         </div>
@@ -8174,7 +8173,7 @@
             鍗曞厓妫�娴�<span class="fontsz1">锛烇紴锛烇紴锛烇紴锛烇紴</span>
           </h2>
           <div class="bj">
-            <examinations :cardList="questionData[217]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+            <examinations :cardList="questionData[217]"  sourceType="json" inputBc="#d3edfa"
               v-if="questionData"></examinations>
           </div>
         </div>
@@ -8236,9 +8235,9 @@
 
 <script>
 import paint from '@/components/paint/index.vue'
+import graffiti from '@/components/graffiti/index.vue'
 import examinations from "@/components/examinations/index.vue";
 import fillInTable from "@/components/fillInTable/index.vue";
-import calculator from '@/components/calculator/index.vue'
 const handleShow = (num) => {
   const obj = {}
   for (let index = 0; index < num; index++) {
@@ -8258,7 +8257,7 @@
       type: Object,
     },
   },
-  components: { examinations, fillInTable,paint,calculator },
+  components: { examinations, fillInTable,paint,graffiti },
   data() {
     return {
       ...showObj,

--
Gitblit v1.9.1