From 36e0f739f354244d0e49ebfa457104ca710c4aff Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 30 五月 2024 19:07:48 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/sportsAndHealth/view/chapter002.vue | 56 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 10 deletions(-)
diff --git a/src/books/sportsAndHealth/view/chapter002.vue b/src/books/sportsAndHealth/view/chapter002.vue
index 0574049..bfffd9b 100644
--- a/src/books/sportsAndHealth/view/chapter002.vue
+++ b/src/books/sportsAndHealth/view/chapter002.vue
@@ -46,6 +46,7 @@
<p>
浠�涔堟槸鐪熸鐨勫仴搴峰憿锛熷湪涓嶅悓鏃朵唬锛屼汉浠殑鍥炵瓟鍚勪笉鐩稿悓銆傞殢鐫�缁忔祹銆佺ぞ浼氱殑鍙戝睍锛屽仴搴风殑鍐呮兜宸蹭粠鐢熷瓨鎰忎箟涓婄殑韬綋鍋ュ悍锛屽彂灞曞埌韬績鍋ュ悍锛屽啀鍙戝睍鍒板缁村仴搴枫�傚叾鏈川鏄垜浠叏闈€�佸畬鏁村強鍜岃皭鍦板彂灞曘�傚叾涓紝鍏ㄩ潰鍙戝睍鎸囧痉鏅轰綋缇庡姵鍏ㄩ潰涓斿潎琛″彂灞曪紱瀹屾暣鍙戝睍鎸囪函浣撱�佸績鐞嗐�佺ぞ浼氶�傚簲鑳藉姏鍙婇亾寰烽殢鐫�骞撮緞鐨勫闀挎湁绉╁簭鍦般�佸畬鏁村湴鍙戝睍锛涘拰璋愬彂灞曟寚娉ㄩ噸鍚勫熀鏈礌璐ㄩ�傚綋銆佸崗璋冦�佸钩琛″彂灞曘�傚仴搴锋槸鍏ㄩ潰銆佸畬鏁淬�佸拰璋愬彂灞曠殑缁熶竴锛屾槸瀛︽牎浣撹偛鐨勭洰鏍囷紝鏇存槸瀛︽牎鏁欒偛鐨勬渶缁堢洰鏍囦箣涓�銆�
</p>
+ <br />
<div class="bk-xyx">
<div class="bj1-xyx publicxbc">
路 瀛︿竴瀛� 路 鍋ュ悍姒傚康鐨勬紨鍙�
@@ -94,9 +95,10 @@
>鏌ラ槄鈥滃仴搴锋蹇电殑婕斿彉鈥濄��
</p> -->
</div>
+ <br />
<div class="bk-xyx">
<div class="bj1-xyx publicxbc">
- 路 娴嬩竴娴� 路
+ 路 娴嬩竴娴� 路 涓栫晫鍗敓缁勭粐浜旈」韬績鍋ュ悍鎸囨爣璇勪环
<div class="icon" @click="activityXyx2">
<svg
xmlns="http://www.w3.org/2000/svg"
@@ -408,8 +410,8 @@
<span style="color: red">{{ chapter002.score1 }}</span>
</div>
<div class="btn">
- <span @click="submit01()">鎻愪氦</span>
- <span @click="resetData01()">閲嶅仛</span>
+ <span @click="submit(1)">鎻愪氦</span>
+ <span @click="resetData(1)">閲嶅仛</span>
</div>
</div>
</div>
@@ -457,7 +459,7 @@
<p><br /></p>
<div class="bk-xyx">
<div class="bj1-xyx publicxbc">
- 路 姣斾竴姣� 路
+ 路 姣斾竴姣� 路 8 绉嶅仴搴风姸鍐垫祴璇�
<div class="icon" @click="activityXyx3">
<svg
xmlns="http://www.w3.org/2000/svg"
@@ -812,9 +814,10 @@
姝ｅ父鐨勫ぇ姘斻�佹按銆佸湡澹ゃ�佸井灏忔皵鍊欑瓑鏄垜浠禆浠ョ敓瀛樸�佷笉鍙垨缂虹殑鍘熺敓鐜銆傜洰鍓嶏紝宸ュ啘涓氱敓浜у拰浜虹被娲诲姩绛変骇鐢熺殑娆＄敓鐜闂锛堝妫灄瑕嗙洊闈㈢Н鍑忓皯銆佹按鍦熸祦澶便�佺┖姘旀薄鏌撶瓑锛夋棩鐩婂嵄瀹崇潃鎴戜滑鐨勫仴搴枫�傛澶栵紝鑷劧鐜涓殑鐗╃悊鍥犵礌锛堝姘旀俯銆佹皵鍘嬨�佸櫔澹般�佽緪灏勭瓑锛�
涓庡寲瀛﹀洜绱狅紙濡傚ぉ鐒舵垨浜哄伐鍚堟垚鐨勬煇浜涘寲瀛︾墿璐ㄥ強鍔ㄧ墿鍜屽井鐢熺墿浣撳唴鐨勬煇浜涘寲瀛﹀厓绱狅級锛屼笌浜轰綋鎺ヨЕ瓒呰繃涓�瀹氶檺搴︼紝涔熶細瀵规垜浠殑鍋ュ悍浜х敓鍗卞銆�
</p>
+ <br />
<div class="bk-xyx">
<div class="bj1-xyx publicxbc">
- 路 娴嬩竴娴� 路
+ 路 娴嬩竴娴� 路 鐢熸椿浜嬩欢璇勪环
<div class="icon" @click="activityXyx4">
<svg
xmlns="http://www.w3.org/2000/svg"
@@ -2180,6 +2183,19 @@
</tr>
</tbody>
</table>
+ <div class="table-bottom">
+ <div class="score" v-if="!isShowScore2">
+ 鎮ㄧ殑寰楀垎锛�<span style="color: red">璇锋彁浜ゅ悗鏌ョ湅锛�</span>
+ </div>
+ <div class="score" v-if="isShowScore2">
+ 鎮ㄧ殑寰楀垎锛�
+ <span style="color: red">{{ chapter002.score2 }}</span>
+ </div>
+ <div class="btn">
+ <span @click="submit(2)">鎻愪氦</span>
+ <span @click="resetData(2)">閲嶅仛</span>
+ </div>
+ </div>
</div>
<p style="font-size: 14px">
娉細浜洪檯鍘嬪姏 锛� 1銆�2銆�4銆�15锛夈�佸涔犲帇鍔� 锛�
@@ -2279,6 +2295,7 @@
data() {
return {
isShowScore1: false,
+ isShowScore2: false,
picArr: [require("../image/0017-1.jpg")],
picOneUrl: require("../image/0017-1.jpg"),
picArr2: [require("../image/0021-1.jpg")],
@@ -2292,6 +2309,7 @@
isShowXyx05: true,
isShowXyx06: true,
score1: 0,
+ score2: 0,
tablexyx1: {},
tablexyx02: {
text2: "绗竴娆¤窇锛屾劅瑙夋湁鐐瑰効绱紝寰堟灟鐕�",
@@ -2308,7 +2326,6 @@
const localData = JSON.parse(localStorage.getItem("chapter002"));
if (localData) {
this.chapter002 = { ...Object.assign(this.chapter002, localData) };
- console.log(this.chapter002);
}
},
methods: {
@@ -2335,11 +2352,19 @@
window.open(getResourcePath("1b7ecc924bfab900ec10f0ed4bb2466b"));
}
},
- submit01() {
- this.isShowScore1 = true;
+ submit(val) {
+ if (val == 1) this.isShowScore1 = true;
+ if (val == 2) this.isShowScore2 = true;
+ localStorage.setItem("chapter002", JSON.stringify(this.chapter002));
},
- resetData01() {
- this.chapter002.tablexyx1 = {};
+ resetData(val) {
+ const localData = JSON.parse(localStorage.getItem("chapter002"));
+ if (localData) {
+ if (val == 1) localData.tablexyx1 = {};localData.score1=0;
+ if (val == 2) localData.tablecyc2 = {};localData.score2=0;
+ this.chapter002 = { ...Object.assign(this.chapter002, localData) };
+ }
+ localStorage.setItem("chapter002", JSON.stringify(this.chapter002));
},
changeBox(e, val) {
this.isShowScore1 = false;
@@ -2361,7 +2386,18 @@
localStorage.setItem("chapter002", JSON.stringify(this.chapter002));
},
changecyc2(e, val) {
+ this.isShowScore2 = false;
this.chapter002.tablecyc2[val] = e.target.checked;
+ if (e.target.checked) {
+ this.chapter002.score2 += Number(e.target.value);
+ } else {
+ if (this.chapter002.score2 == 0) {
+ return false;
+ }
+ if (!e.target.checked) {
+ this.chapter002.score2 -= Number(e.target.value);
+ }
+ }
localStorage.setItem("chapter002", JSON.stringify(this.chapter002));
},
changeAssess(e, val) {
--
Gitblit v1.9.1