From a670b0c082dcc5728ecf19e8d30b09c71f80b707 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期二, 26 十一月 2024 16:56:58 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout

---
 src/books/mathBook/view/components/chapter002.vue |  199 +++++++++++++++++++++++++------------------------
 1 files changed, 100 insertions(+), 99 deletions(-)

diff --git a/src/books/mathBook/view/components/chapter002.vue b/src/books/mathBook/view/components/chapter002.vue
index 2682768..a7043b0 100644
--- a/src/books/mathBook/view/components/chapter002.vue
+++ b/src/books/mathBook/view/components/chapter002.vue
@@ -268,7 +268,7 @@
                 <img class="img-gn2" alt="" src="../../assets/images/hzjl.jpg" />
               </p>
             </div>
-            <examinations :cardList="questionData[41]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+            <examinations :cardList="questionData[41]"  sourceType="json" inputBc="#d3edfa"
               v-if="questionData"></examinations>
           </div>
           <p>
@@ -355,7 +355,7 @@
         <div class="padding-116">
           <p class="left"><img class="img-gn" alt="" src="../../assets/images/stlx.jpg" /></p>
           <div class="bj">
-            <examinations :cardList="questionData[42]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+            <examinations :cardList="questionData[42]"  sourceType="json" inputBc="#d3edfa"
               v-if="questionData"></examinations>
           </div>
           <h3 id="c013">2.1.2 浣滃樊姣旇緝娉�<span class="fontsz2">锛烇紴锛�</span></h3>
@@ -771,13 +771,13 @@
                 <img class="img-gn2" alt="" src="../../assets/images/hzjl.jpg" />
               </p>
             </div>
-            <examinations :cardList="questionData[43] ? questionData[43][1] : []" :hideCollect="true" sourceType="json"
+            <examinations :cardList="questionData[43] ? questionData[43][1] : []"  sourceType="json"
               v-if="questionData">
             </examinations>
           </div>
           <p class="left"><img class="img-gn" alt="" src="../../assets/images/stlx.jpg" /></p>
           <div class="bj">
-            <examinations :cardList="questionData[43] ? questionData[43][2] : []" :hideCollect="true" sourceType="json"
+            <examinations :cardList="questionData[43] ? questionData[43][2] : []"  sourceType="json"
               inputBc="#d3edfa" v-if="questionData"></examinations>
           </div>
         </div>
@@ -797,7 +797,7 @@
         <div class="padding-116">
           <h3 id="c014">涔犻2.1<span class="fontsz2">锛烇紴锛�</span></h3>
           <div class="bj">
-            <examinations :cardList="questionData[44]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+            <examinations :cardList="questionData[44]"  sourceType="json" inputBc="#d3edfa"
               v-if="questionData"></examinations>
           </div>
           <h2 id="b008">2.2 鍖洪棿<span class="fontsz1">锛烇紴锛烇紴锛烇紴锛烇紴</span></h2>
@@ -866,7 +866,7 @@
             <p>绗簩鍗曞厓 涓嶇瓑寮�</p>
           </li>
           <li>
-            <p><span>039</span></p>
+            <p><span>039-041</span></p>
           </li>
         </ul>
         <div class="padding-116">
@@ -1042,28 +1042,16 @@
             <p>={<i>x</i>|-5锛�<i>x</i>鈮�-3}鈭獅<i>x</i>|3鈮�<i>x</i>锛�6}</p>
             <p>=锛�-5锛�-3锛解埅锛�3锛�6锛�.</p>
           </div>
-        </div>
-      </div>
-    </div>
-    <!-- 040 -->
-    <div class="page-box" page="47">
-      <div v-if="showPageList.indexOf(47) > -1">
-        <ul class="page-header-odd fl al-end">
-          <li>040-041</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[47] ? questionData[47][1] : []" :hideCollect="true" sourceType="json"
+            <examinations :cardList="questionData[47] ? questionData[47][1] : []"  sourceType="json"
               inputBc="#d3edfa" v-if="questionData"></examinations>
           </div>
           <h3 id="c015">涔犻2.2<span class="fontsz2">锛烇紴锛�</span></h3>
           <div class="bj">
-            <examinations :cardList="questionData[47] ? questionData[47][2] : []" :hideCollect="true" sourceType="json"
+            <examinations :cardList="questionData[47] ? questionData[47][2] : []"  sourceType="json"
               inputBc="#d3edfa" v-if="questionData"></examinations>
           </div>
           <h2 id="b009">
@@ -1087,6 +1075,9 @@
           </p>
         </div>
       </div>
+    </div>
+    <!-- 040 -->
+    <div class="page-box hidePage" page="47">
     </div>
     <!-- 041 -->
     <div class="page-box hidePage" page="48">
@@ -1248,41 +1239,6 @@
               </svg>
             </span>
           </p>
-          <p class="p-btn">
-            锛�2锛�
-            鎸囧嚭璇ュ嚱鏁板浘鍍忎笂绾靛潗鏍囧垎鍒负y=0锛寉锛�0锛寉锛�0鐨勬墍鏈夌偣锛�
-            <span class="btn-box" @click="isShowAnswer10 = !isShowAnswer10">
-              <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">
-            锛�3锛�
-            鏍规嵁鍑芥暟鍥惧儚鍐欏嚭y=0锛寉锛�0锛寉锛�0鏃舵墍瀵瑰簲鐨剎鐨勫�兼垨鍙栧�艰寖鍥�.
-            <span class="btn-box" @click="isShowAnswer11 = !isShowAnswer11">
-              <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>
-          <iframe src="https://www.geogebra.org/calculator" frameborder="0" class="iframe-box"></iframe>
-        </div>
-      </div>
-    </div>
-    <!-- 044 -->
-    <div class="page-box" page="51">
-      <div v-if="showPageList.indexOf(51) > -1">
-        <ul class="page-header-odd fl al-end">
-          <li>044</li>
-          <li>鏁板.鍩虹妯″潡</li>
-          <li>涓婂唽</li>
-        </ul>
-        <div class="padding-116">
           <div v-if="isShowAnswer9">
             <p class="center"><img class="img-c" alt="" src="../../assets/images/0055-1.jpg" /></p>
             <p class="img">鍥�2-3</p>
@@ -1350,12 +1306,36 @@
               鏍规嵁浠ヤ笂淇℃伅锛屽氨鍙互鐢诲嚭鍑芥暟<i>y</i>=<i>x</i><sup>2</sup>-2<i>x</i>-3鐨勫浘鍍忥紙濡傚浘2-3鎵�绀猴級.
             </p>
           </div>
+          <p class="p-btn">
+            锛�2锛�
+            鎸囧嚭璇ュ嚱鏁板浘鍍忎笂绾靛潗鏍囧垎鍒负y=0锛寉锛�0锛寉锛�0鐨勬墍鏈夌偣锛�
+            <span class="btn-box" @click="isShowAnswer10 = !isShowAnswer10">
+              <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="isShowAnswer10">
+            <span class="zt-ls"><b>瑙�</b></span>
             锛�2锛�
             瑙傚療鍥惧儚鍙煡锛屾弧瓒�<i>y</i>=0鐨勭偣鏄姏鐗╃嚎涓�<i>x</i>杞寸殑浜ょ偣锛涙弧瓒�<i>y</i>锛�0鐨勭偣鏄姏鐗╃嚎鍦�<i>x</i>杞翠笂鏂圭殑鎵�鏈夌偣锛涙弧瓒�<i>y</i>锛�0鐨勭偣鏄姏鐗╃嚎鍦�<i>x</i>杞翠笅鏂圭殑鎵�鏈夌偣.
           </p>
+          <p class="p-btn">
+            锛�3锛�
+            鏍规嵁鍑芥暟鍥惧儚鍐欏嚭y=0锛寉锛�0锛寉锛�0鏃舵墍瀵瑰簲鐨剎鐨勫�兼垨鍙栧�艰寖鍥�.
+            <span class="btn-box" @click="isShowAnswer11 = !isShowAnswer11">
+              <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="isShowAnswer11">
             <p>
+              <span class="zt-ls"><b>瑙�</b></span>
               锛�3锛�
               瑙傚療鍥惧儚鍙煡锛屽綋<i>y</i>=0鏃讹紝瀵瑰簲鎶涚墿绾夸笌<i>x</i>杞寸殑涓や釜浜ょ偣锛屾鏃�<i>x</i>鏈変袱涓彇鍊硷紝<i>x</i><sub>1</sub>=-1锛�<i>x</i><sub>2</sub>=3锛�
             </p>
@@ -1366,13 +1346,26 @@
               褰�<i>y</i>锛�0鏃讹紝瀵瑰簲鎶涚墿绾垮湪<i>x</i>杞翠笅鏂圭殑鎵�鏈夌偣锛屾鏃�<i>x</i>鐨勫彇鍊艰寖鍥存槸-1锛�<i>x</i>锛�3.
             </p>
           </div>
+          <iframe src="https://www.geogebra.org/calculator" frameborder="0" class="iframe-box"></iframe>
+        </div>
+      </div>
+    </div>
+    <!-- 044 -->
+    <div class="page-box" page="51">
+      <div v-if="showPageList.indexOf(51) > -1">
+        <ul class="page-header-odd fl al-end">
+          <li>044</li>
+          <li>鏁板.鍩虹妯″潡</li>
+          <li>涓婂唽</li>
+        </ul>
+        <div class="padding-116">
           <div class="bk-hzjl">
             <div class="bj1-hzjl">
               <p class="left">
                 <img class="img-gn2" alt="" src="../../assets/images/hzjl.jpg" />
               </p>
             </div>
-            <examinations :cardList="questionData[51] ? questionData[51][1] : []" :hideCollect="true" sourceType="json"
+            <examinations :cardList="questionData[51] ? questionData[51][1] : []"  sourceType="json"
               inputBc="#d3edfa" v-if="questionData"></examinations>
           </div>
           <p class="left"><img class="img-gn" alt="" src="../../assets/images/stlx.jpg" /></p>
@@ -1381,7 +1374,13 @@
             <p>鈶�<i>y</i>=<i>x</i><sup>2</sup>-3<i>x</i>-4锛� 鈶�<i>y</i>=<i>x</i><sup>2</sup>+<i>x</i>+2锛�
               鈶�<i>y</i>=<i>x</i><sup>2</sup>-6<i>x</i>+9.</p>
             <p>锛�1锛� 鍒嗗埆鐢诲嚭瀹冧滑鐨勫嚱鏁板浘鍍忥紱</p>
-            <paint :page="51" :imgUrl="this.config.activeBook.resourceUrl + '/images/a6fe3d63.png'" />
+            <!-- <paint :page="51" :imgUrl="this.config.activeBook.resourceUrl + '/images/a6fe3d63.png'" /> -->
+            <graffiti 
+                :page="51" 
+                :bcImg="this.config.activeBook.resourceUrl + '/images/a6fe3d63.png'"
+                :imgWidth="520"
+                :imgHeight="494"
+              />
             <p>
               锛�2锛� 鏍规嵁鍑芥暟鍥惧儚鍐欏嚭<i>y</i>=0锛�<i>y</i>锛�0锛�<i>y</i>锛�0鏃舵墍瀵瑰簲鐨�<i>x</i>鐨勫�兼垨鍙栧�艰寖鍥�.
               <span class="btn-box" @click="isShowAnswer = !isShowAnswer">
@@ -1943,17 +1942,6 @@
               </svg>
             </span>
           </p>
-          <p class="p-btn" >
-            <span>锛�2锛� <i>x</i><sup>2</sup>-2<i>x</i>+3锛�0.</span>
-            <span class="btn-box" @click="isShowAnswer13 = !isShowAnswer13">
-              <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>
-          <iframe src="https://www.geogebra.org/calculator" frameborder="0" class="iframe-box"></iframe>
           <div v-if="isShowAnswer12" >
             <p class="center"><img class="img-c" alt="" src="../../assets/images/0057-1.jpg" /></p>
             <p class="img">鍥�2-5</p>
@@ -1965,10 +1953,21 @@
               鍑芥暟<i>y</i>=-<i>x</i><sup>2</sup>+3<i>x</i>+4鐨勫浘鍍忔槸寮�鍙e悜涓嬬殑鎶涚墿绾匡紝涓�<i>x</i>杞寸殑浜ょ偣鍧愭爣鏄紙-1锛�0锛夛紝锛�4锛�0锛夛紝鍑芥暟<i>y</i>=-<i>x</i><sup>2</sup>+3<i>x</i>+4鐨勫浘鍍忓鍥�2-5鎵�绀�.
             </p>
           </div>
+          <p class="p-btn" >
+            <span>锛�2锛� <i>x</i><sup>2</sup>-2<i>x</i>+3锛�0.</span>
+            <span class="btn-box" @click="isShowAnswer13 = !isShowAnswer13">
+              <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="isShowAnswer13" >
             <p class="center"><img class="img-c" alt="" src="../../assets/images/0057-2.jpg" /></p>
             <p class="img">鍥�2-6</p>
             <p>
+              <span class="zt-ls"><b>瑙�</b></span>
               瑙傚療鍥惧儚鍙緱锛屼笉绛夊紡-<i>x</i><sup>2</sup>+3<i>x</i>+4锛�0鐨勮В闆嗘槸锛�-鈭烇紝
               -1锛夆埅锛�4锛� +鈭烇級.
             </p>
@@ -1983,6 +1982,7 @@
               瑙傚療鍥惧儚鍙緱锛屼笉绛夊紡<i>x</i><sup>2</sup>-2<i>x</i>+3锛�0鐨勮В闆嗕负<b>R</b>.
             </p>
           </div>
+          <iframe src="https://www.geogebra.org/calculator" frameborder="0" class="iframe-box"></iframe>
           <div class="bk">
             <div class="bj1">
               <p class="left">
@@ -2023,7 +2023,7 @@
                 <img class="img-gn2" alt="" src="../../assets/images/hzjl.jpg" />
               </p>
             </div>
-            <examinations :cardList="questionData[54] ? questionData[54][1] : []" :hideCollect="true" sourceType="json"
+            <examinations :cardList="questionData[54] ? questionData[54][1] : []"  sourceType="json"
               v-if="questionData">
             </examinations>
           </div>
@@ -2039,7 +2039,7 @@
           </p>
           <p>绗笁姝ワ細瑙傚療绠�鍥撅紝鍐欏嚭涓嶇瓑寮忕殑瑙i泦.</p>
           <div class="bj">
-            <examinations :cardList="questionData[54] ? questionData[54][2] : []" :hideCollect="true" sourceType="json"
+            <examinations :cardList="questionData[54] ? questionData[54][2] : []"  sourceType="json"
               inputBc="#d3edfa" v-if="questionData"></examinations>
           </div>
         </div>
@@ -2216,6 +2216,12 @@
               </svg>
             </span>
           </p>
+          <div v-if="isShowAnswer14" >
+            <p >
+              <span class="zt-ls"><b>瑙�</b></span>锛�1锛夛紙<i>x</i>+3锛夛紙<i>x</i>+1锛夛紲0锛屽嵆锛�<i>x</i>-锛�-3锛夛冀锛�<i>x</i>-锛�-1锛夛冀锛�0.
+            </p>
+            <p >鎵�浠ヤ笉绛夊紡鐨勮В闆嗕负锛�-3锛�-1锛�.</p>
+          </div>
           <p class="p-btn" >
             <span>锛�2锛夛紙6-<i>x</i>锛夛紙<i>x</i>+4锛夆墹0.</span>
             <span class="btn-box" @click="isShowAnswer15 = !isShowAnswer15">
@@ -2226,12 +2232,6 @@
               </svg>
             </span>
           </p>
-          <div v-if="isShowAnswer14" >
-            <p >
-              <span class="zt-ls"><b>瑙�</b></span>锛�1锛夛紙<i>x</i>+3锛夛紙<i>x</i>+1锛夛紲0锛屽嵆锛�<i>x</i>-锛�-3锛夛冀锛�<i>x</i>-锛�-1锛夛冀锛�0.
-            </p>
-            <p >鎵�浠ヤ笉绛夊紡鐨勮В闆嗕负锛�-3锛�-1锛�.</p>
-          </div>
           <div v-if="isShowAnswer15" >
             <p>
               <span class="zt-ls"><b>瑙�</b></span>
@@ -2263,16 +2263,6 @@
               </svg>
             </span>
           </p>
-          <p class="p-btn" >
-            <span>锛�2锛夛紙2<i>x</i>-3锛�<sup>2</sup>锛�9.</span>
-            <span class="btn-box" @click="isShowAnswer17 = !isShowAnswer17">
-              <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="isShowAnswer16" >
             <p>
               <span class="zt-ls"><b>瑙�</b></span>锛�1锛�
@@ -2283,6 +2273,16 @@
             <p>鍗炽��銆�銆�锛�<i>x</i>-锛�-3锛夛冀锛�<i>x</i>-1锛夆墺0锛�</p>
             <p>鎵�浠ヤ笉绛夊紡鐨勮В闆嗕负锛�-鈭烇紝-3锛解埅锛�1锛�+鈭烇級.</p>
           </div>
+          <p class="p-btn" >
+            <span>锛�2锛夛紙2<i>x</i>-3锛�<sup>2</sup>锛�9.</span>
+            <span class="btn-box" @click="isShowAnswer17 = !isShowAnswer17">
+              <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="isShowAnswer17" >
             <p>
               <span class="zt-ls"><b>瑙�</b></span>
@@ -2298,7 +2298,7 @@
           <p class="left"><img class="img-gn" alt="" src="../../assets/images/stlx.jpg" /></p>
           <div class="bj">
             <p>瑙d笅鍒椾竴鍏冧簩娆′笉绛夊紡.</p>
-            <examinations :cardList="questionData[56]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+            <examinations :cardList="questionData[56]"  sourceType="json" inputBc="#d3edfa"
               v-if="questionData"></examinations>
           </div>
         </div>
@@ -2315,7 +2315,7 @@
         <div class="padding-116">
           <h3 id="c019">涔犻2.3<span class="fontsz2">锛烇紴锛�</span></h3>
           <div class="bj">
-            <examinations :cardList="questionData[57]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+            <examinations :cardList="questionData[57]"  sourceType="json" inputBc="#d3edfa"
               v-if="questionData"></examinations>
           </div>
         </div>
@@ -2621,14 +2621,14 @@
                 <img class="img-gn2" alt="" src="../../assets/images/hzjl.jpg" />
               </p>
             </div>
-            <examinations :cardList="questionData[60] ? questionData[60][1] : []" :hideCollect="true" sourceType="json"
+            <examinations :cardList="questionData[60] ? questionData[60][1] : []"  sourceType="json"
               inputBc="#d3edfa" v-if="questionData"></examinations>
           </div>
           <p class="left">
             <img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
           </p>
           <div class="bj">
-            <examinations :cardList="questionData[60] ? questionData[60][2] : []" :hideCollect="true" sourceType="json"
+            <examinations :cardList="questionData[60] ? questionData[60][2] : []"  sourceType="json"
               inputBc="#d3edfa" v-if="questionData"></examinations>
           </div>
           <h3 id="c021">
@@ -2746,7 +2746,7 @@
           </div>
           <p class="left"><img class="img-gn" alt="" src="../../assets/images/stlx.jpg" /></p>
           <div class="bj">
-            <examinations :cardList="questionData[61]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+            <examinations :cardList="questionData[61]"  sourceType="json" inputBc="#d3edfa"
               v-if="questionData"></examinations>
           </div>
         </div>
@@ -2766,7 +2766,7 @@
         <div class="padding-116">
           <h3 id="c022">涔犻2.4<span class="fontsz2">锛烇紴锛�</span></h3>
           <div class="bj">
-            <examinations :cardList="questionData[62]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+            <examinations :cardList="questionData[62]"  sourceType="json" inputBc="#d3edfa"
               v-if="questionData"></examinations>
           </div>
           <h2 id="b011">
@@ -2889,7 +2889,7 @@
                 <img class="img-gn2" alt="" src="../../assets/images/hzjl.jpg" />
               </p>
             </div>
-            <examinations :cardList="questionData[63]" :hideCollect="true" sourceType="json" v-if="questionData">
+            <examinations :cardList="questionData[63]"  sourceType="json" v-if="questionData">
             </examinations>
           </div>
         </div>
@@ -2909,7 +2909,7 @@
         <div class="padding-116">
           <p class="left"><img class="img-gn" alt="" src="../../assets/images/stlx.jpg" /></p>
           <div class="bj">
-            <examinations :cardList="questionData[64]" :hideCollect="true" sourceType="json" v-if="questionData">
+            <examinations :cardList="questionData[64]"  sourceType="json" v-if="questionData">
             </examinations>
           </div>
           <h3 id="c024">
@@ -3040,7 +3040,7 @@
                 <img class="img-gn2" alt="" src="../../assets/images/hzjl.jpg" />
               </p>
             </div>
-            <examinations :cardList="questionData[65]" :hideCollect="true" sourceType="json" v-if="questionData">
+            <examinations :cardList="questionData[65]"  sourceType="json" v-if="questionData">
             </examinations>
           </div>
         </div>
@@ -3062,12 +3062,12 @@
             <img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
           </p>
           <div class="bj">
-            <examinations :cardList="questionData[66] ? questionData[66][1] : []" :hideCollect="true" sourceType="json"
+            <examinations :cardList="questionData[66] ? questionData[66][1] : []"  sourceType="json"
               inputBc="#d3edfa" v-if="questionData"></examinations>
           </div>
           <h3 id="c025">涔犻2.5<span class="fontsz2">锛烇紴锛�</span></h3>
           <div class="bj">
-            <examinations :cardList="questionData[66] ? questionData[66][2] : []" :hideCollect="true" sourceType="json"
+            <examinations :cardList="questionData[66] ? questionData[66][2] : []"  sourceType="json"
               v-if="questionData">
             </examinations>
           </div>
@@ -3592,7 +3592,7 @@
         <div class="padding-116">
           <h2 id="b014">鍗曞厓妫�娴�<span class="fontsz1">锛烇紴锛烇紴锛烇紴锛烇紴</span></h2>
           <div class="bj">
-            <examinations :cardList="questionData[72]" :hideCollect="true" sourceType="json" v-if="questionData">
+            <examinations :cardList="questionData[72]"  sourceType="json" v-if="questionData">
             </examinations>
           </div>
         </div>
@@ -3662,6 +3662,7 @@
   return obj
 }
 const showObj = handleShow(30)
+import graffiti from '@/components/graffiti/index.vue'
 import paint from '@/components/paint/index.vue'
 import examinations from '@/components/examinations/index.vue'
 export default {
@@ -3675,7 +3676,7 @@
       type: Object,
     },
   },
-  components: { examinations, paint },
+  components: { examinations, paint,graffiti },
   data() {
     return {
       collectImg: require('../../assets/images/icon/heart.png'),

--
Gitblit v1.9.1