From 62cecbf2b9f9fdf85fa20f80b83eb0d52d5d1bbd Mon Sep 17 00:00:00 2001
From: litian <2804272236@qq.com>
Date: 星期五, 06 六月 2025 15:08:26 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
.env.product | 12 ++--
src/books/kindergartenActivitiesDesignGuidance/css/default.less | 36 ++++++++---
src/books/kindergartenActivitiesDesignGuidance/view/components/chapter001.vue | 75 +++++++++++++++++++++---
src/books/kindergartenActivitiesDesignGuidance/Fonts/FZSSK.TTF | 0
src/books/kindergartenActivitiesDesignGuidance/Fonts/FZXBSK.TTF | 0
src/books/kindergartenActivitiesDesignGuidance/view/components/chapter002.vue | 2
.env | 4
src/books/MMVRTCMP/images/006-2.png | 0
src/books/MMVRTCMP/view/components/chapter001.vue | 2
src/books/MMVRTCMP/view/components/pageHeader.vue | 4
src/App.vue | 2
11 files changed, 103 insertions(+), 34 deletions(-)
diff --git a/.env b/.env
index de1e4ef..bfd4d4d 100644
--- a/.env
+++ b/.env
@@ -1,7 +1,7 @@
VUE_APP_ENV = 'dev'
VUE_APP_API_URL = "https://jsek.bnuic.com"
# VUE_APP_API_URL = "https://www.tepcb.com"
-VUE_APP_RESOURCE_CTX = 'https://jsek.bnuic.com/books/resource/'
-# VUE_APP_RESOURCE_CTX = 'http://182.92.203.7:3007/books/resource/'
+# VUE_APP_RESOURCE_CTX = 'https://jsek.bnuic.com/books/resource/'
+VUE_APP_RESOURCE_CTX = 'http://182.92.203.7:3007/books/resource/'
# VUE_APP_RESOURCE_CTX = 'https://www.tepcb.com/books/resource/'
VUE_APP_PUBLIC_PATH = '/books/book'
\ No newline at end of file
diff --git a/.env.product b/.env.product
index 498b8ba..975fb17 100644
--- a/.env.product
+++ b/.env.product
@@ -1,11 +1,11 @@
VUE_APP_ENV = 'product'
VUE_APP_API_URL = "https://jsek.bnuic.com"
# VUE_APP_API_URL = "https://www.tepcb.com"
-VUE_APP_RESOURCE_CTX = 'https://jsek.bnuic.com/books/resource/'
-VUE_APP_PUBLIC_PATH = 'https://jsek.bnuic.com/books/book/foodSensoryInspection'
-# VUE_APP_RESOURCE_CTX = 'http://182.92.203.7:3007/books/resource/'
-# VUE_APP_PUBLIC_PATH = 'http://182.92.203.7:3007/books/book/foodSensoryInspection'
+# VUE_APP_RESOURCE_CTX = 'https://jsek.bnuic.com/books/resource/'
+# VUE_APP_PUBLIC_PATH = 'https://jsek.bnuic.com/books/book/toddlerGameImplementation'
+VUE_APP_RESOURCE_CTX = 'http://182.92.203.7:3007/books/resource/'
+VUE_APP_PUBLIC_PATH = 'http://182.92.203.7:3007/books/book/MMVRTCMP'
# VUE_APP_RESOURCE_CTX = 'https://www.tepcb.com/books/resource/'
# VUE_APP_PUBLIC_PATH = 'https://www.tepcb.com/books/book/policiesAndRegulations'
-VUE_APP_BOOK_LIST = "childHealth/lifeCare/sportsAndHealth/embedded/english/artAndDance/artAndDrama/mathBook/botany/civilAviation/civilServices/meetingPlanners/aviationBasicSkills/aviationEtiquette/aviationSafety/toddlerGameImplementation/childcareInstitutionsManagement/preschoolGameGuidance/kindergartenLanguageActivity/preschoolEvaluation/preschoolBasicKnowledge/practicalCareChildrenManual/OralAndBroadcasting/aurturingAndEducationAged0to3/policiesAndRegulations/kindergartenActivitiesDesignGuidance/toddlerSportsSafetyProtection/artInitiationForAges0to3/childIllnessPreventionCare/behaviorObserveAndGuid/cognitiveLanDevEduAges0to3/aviationPassengerTransport6th/hotelEnglishTrainingBrochure2nd/hydraulicTransmission/foodSensoryInspection/MMVRTCMP"
-VUE_APP_BOOK_ID = 'foodSensoryInspection'
+VUE_APP_BOOK_LIST = "childHealth/lifeCare/sportsAndHealth/embedded/english/artAndDance/artAndDrama/mathBook/botany/civilAviation/civilServices/meetingPlanners/aviationBasicSkills/aviationEtiquette/aviationSafety/toddlerGameImplementation/childcareInstitutionsManagement/preschoolGameGuidance/kindergartenLanguageActivity/preschoolEvaluation/preschoolBasicKnowledge/practicalCareChildrenManual/OralAndBroadcasting/aurturingAndEducationAged0to3/policiesAndRegulations/kindergartenActivitiesDesignGuidance/toddlerSportsSafetyProtection/artInitiationForAges0to3/childIllnessPreventionCare/behaviorObserveAndGuid/cognitiveLanDevEduAges0to3/aviationPassengerTransport6th/hotelEnglishTrainingBrochure2nd/hydraulicTransmission/MMVRTCMP"
+VUE_APP_BOOK_ID = 'MMVRTCMP'
diff --git a/src/App.vue b/src/App.vue
index a7acbe8..3fdfa8b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -237,7 +237,7 @@
process.env.VUE_APP_RESOURCE_CTX +
(process.env.VUE_APP_ENV == "product"
? process.env.VUE_APP_BOOK_ID
- : "foodSensoryInspection")
+ : "MMVRTCMP")
);
// 娴嬭瘯璇曡30椤�
diff --git a/src/books/MMVRTCMP/images/006-22.png b/src/books/MMVRTCMP/images/006-2.png
similarity index 100%
rename from src/books/MMVRTCMP/images/006-22.png
rename to src/books/MMVRTCMP/images/006-2.png
Binary files differ
diff --git a/src/books/MMVRTCMP/view/components/chapter001.vue b/src/books/MMVRTCMP/view/components/chapter001.vue
index 050a6f6..a3691aa 100644
--- a/src/books/MMVRTCMP/view/components/chapter001.vue
+++ b/src/books/MMVRTCMP/view/components/chapter001.vue
@@ -165,7 +165,7 @@
<img src="../../images/006-1.png" alt="" />
</div>
<div class="openImgBox imgWidth">
- <!-- <img src="../../images/006-2.png" alt="" /> -->
+ <img src="../../images/006-2.png" alt="" />
<img class="itemImage5" src="../../images/006-3.png" alt="" />
</div>
</div>
diff --git a/src/books/MMVRTCMP/view/components/pageHeader.vue b/src/books/MMVRTCMP/view/components/pageHeader.vue
index 0ec4c18..cc0d455 100644
--- a/src/books/MMVRTCMP/view/components/pageHeader.vue
+++ b/src/books/MMVRTCMP/view/components/pageHeader.vue
@@ -11,8 +11,8 @@
name: "pageHeader",
props: {
page: {
- type: Number,
- default: 0,
+ type: String,
+ default: "",
},
name: {
type: String,
diff --git a/src/books/kindergartenActivitiesDesignGuidance/Fonts/FZSSK.TTF b/src/books/kindergartenActivitiesDesignGuidance/Fonts/FZSSK.TTF
new file mode 100644
index 0000000..d4f6b93
--- /dev/null
+++ b/src/books/kindergartenActivitiesDesignGuidance/Fonts/FZSSK.TTF
Binary files differ
diff --git a/src/books/kindergartenActivitiesDesignGuidance/Fonts/FZXBSK.TTF b/src/books/kindergartenActivitiesDesignGuidance/Fonts/FZXBSK.TTF
new file mode 100644
index 0000000..2ea675f
--- /dev/null
+++ b/src/books/kindergartenActivitiesDesignGuidance/Fonts/FZXBSK.TTF
Binary files differ
diff --git a/src/books/kindergartenActivitiesDesignGuidance/css/default.less b/src/books/kindergartenActivitiesDesignGuidance/css/default.less
index 4b6434a..9c88ea1 100644
--- a/src/books/kindergartenActivitiesDesignGuidance/css/default.less
+++ b/src/books/kindergartenActivitiesDesignGuidance/css/default.less
@@ -9,7 +9,7 @@
overflow: auto;
.public-kindergartenActivitiesDesignGuidance {
- font-family: "瀹嬩綋";
+ font-family: "鏂规涔﹀畫";
max-width: 816px;
min-width: 375px;
margin: 0 auto;
@@ -233,6 +233,17 @@
li {
list-style-type: none;
+ }
+
+ @font-face {
+ font-family: '鏂规涔﹀畫';
+ src: url('../Fonts/FZSSK.TTF');
+ }
+
+
+ @font-face {
+ font-family: '鏂规灏忔爣瀹�';
+ src: url('../Fonts/FZXBSK.TTF');
}
@font-face {
@@ -704,19 +715,20 @@
}
h2 {
+ font-family: "鏂规灏忔爣瀹�";
text-align: center;
- font-weight: bold;
font-size: 1.6em;
margin-bottom: 0em;
margin-top: 1em;
margin-bottom: 1em;
+ font-weight: 400;
}
.h2-zt {
border-radius: 0.2em 0em 0em 0.2em;
margin-bottom: 1em;
margin-top: -0.5em;
- padding: 0.2em 0.5em 0.2em 0.5em;
+ padding: 0.2em 0.5em 0.2em 0.5em
}
.h2-zt1 {
@@ -727,31 +739,33 @@
line-height: 40px;
}
- .h3-zt {}
-
- .h3-zt1 {}
h3 {
- font-weight: bold;
- font-size: 1.2em;
- margin-bottom: 0.6em;
- margin-top: 0.6em;
+ font-family: "鏂规灏忔爣瀹�";
+ font-weight: 400;
+ font-size: 1.34em;
+ margin-bottom: 0.8em;
+ margin-top: 0.8em;
text-indent: 2em;
}
h4 {
+ font-family: "鏂规灏忔爣瀹�";
+ font-weight: 500;
margin-top: 0.7em;
margin-bottom: 0.7em;
- font-size: 1.05em;
+ font-size: 1.1em;
text-indent: 2em;
}
h5 {
+ font-family: "鏂规灏忔爣瀹�";
margin-top: 0.5em;
margin-bottom: 0.5em;
color: #000;
font-size: 1.1em;
text-indent: 2em;
+ font-weight: 400;
}
.zt-h6 {
diff --git a/src/books/kindergartenActivitiesDesignGuidance/view/components/chapter001.vue b/src/books/kindergartenActivitiesDesignGuidance/view/components/chapter001.vue
index b7b67d2..1f4500c 100644
--- a/src/books/kindergartenActivitiesDesignGuidance/view/components/chapter001.vue
+++ b/src/books/kindergartenActivitiesDesignGuidance/view/components/chapter001.vue
@@ -812,28 +812,51 @@
<img class="rwmb-1" alt="" src="../../images/tb-7.png" /><span class="zt-ht">鎬濊�冮</span>
</p>
<p>1.濡備綍鐞嗚В骞煎効鍥殑鏁欒偛娲诲姩锛�</p>
+ <div class="bk-xyx">
+ <textarea rows="2" v-model="chapter001.one" @change="setBookQuestion" class="ml-40"></textarea>
+ </div>
<p>2.骞煎効鍥暀鑲叉椿鍔ㄧ殑鍐呭鎸夐鍩熷垎鏈夊摢浜涳紵鍚勫寘鎷摢浜涘叿浣撳唴瀹癸紵</p>
+ <div class="bk-xyx">
+ <textarea rows="2" v-model="chapter001.two" @change="setBookQuestion" class="ml-40"></textarea>
+ </div>
<p>3.骞煎効鍥暀鑲叉椿鍔ㄧ殑褰㈠紡濡備綍鍒掑垎锛熻瘯闃愯堪鍚勭褰㈠紡鐨勭壒鐐广��</p>
+ <div class="bk-xyx">
+ <textarea rows="2" v-model="chapter001.three" @change="setBookQuestion" class="ml-40"></textarea>
+ </div>
<p>
4.骞煎効鍥暀鑲叉椿鍔ㄨ璁＄殑鍘熷垯鏈夊摢浜涳紵璇曠敤杩欎簺鍘熷垯鍒嗘瀽1锝�2涓椿鍔ㄦ渚嬨��
</p>
+ <div class="bk-xyx">
+ <textarea rows="2" v-model="chapter001.four" @change="setBookQuestion" class="ml-40"></textarea>
+ </div>
<p>5.绠�杩板辜鍎垮洯鏁欒偛娲诲姩璁捐鐨勬楠ゃ��</p>
+ <div class="bk-xyx">
+ <textarea rows="2" v-model="chapter001.five" @change="setBookQuestion" class="ml-40"></textarea>
+ </div>
<p>6.濡備綍纭畾娲诲姩鐩爣锛岃瘯涓�1锝�2涓椿鍔ㄧ‘瀹氱洰鏍囥��</p>
+ <div class="bk-xyx">
+ <textarea rows="2" v-model="chapter001.six" @change="setBookQuestion" class="ml-40"></textarea>
+ </div>
<p>7.骞煎効鍥暀鑲叉椿鍔ㄧ粍缁囨寚瀵肩殑绫诲瀷鏈夊摢浜涳紵鍚勬湁浠�涔堢壒鐐癸紵</p>
+ <div class="bk-xyx">
+ <textarea rows="2" v-model="chapter001.seven" @change="setBookQuestion" class="ml-40"></textarea>
+ </div>
<p>8.骞煎効鍥暀鑲叉椿鍔ㄧ殑鎸囧鎶�鑳戒富瑕佹湁鍝簺锛�</p>
+ <div class="bk-xyx">
+ <textarea rows="2" v-model="chapter001.eight" @change="setBookQuestion" class="ml-40"></textarea>
+ </div>
<p>9.璁捐鎻愰棶鐨勮姹傛槸浠�涔堬紵涓句緥璇存槑銆�</p>
+ <div class="bk-xyx">
+ <textarea rows="2" v-model="chapter001.nine" @change="setBookQuestion" class="ml-40"></textarea>
+ </div>
<p>
<img class="rwmb-1" alt="" src="../../images/tb-8.png" /><span class="zt-ht">瀛︿範鍙嶆��</span>
</p>
- <br />
- <hr />
- <br />
- <hr />
- <br />
- <hr />
- <br />
- <hr />
- <ul class="footer-right">
+ <div class="bk-xyx">
+ <textarea rows="2" v-model="chapter001.ten" @change="setBookQuestion" class="ml-40"></textarea>
+ </div>
+ <p><br></p>
+ <ul class="footer-right ">
<li class="footer-right-text">绗竴鍗曞厓銆�骞煎効鍥暀鑲叉椿鍔ㄨ璁′笌鎸囧姒傝堪</li>
<li class="footer-right-number">21</li>
</ul>
@@ -852,7 +875,39 @@
},
},
data() {
- return {};
+ return {
+ chapter001: {
+ one: "",
+ two: "",
+ three: "",
+ four: "",
+ five: "",
+ six: "",
+ seven: "",
+ eight: "",
+ nine: "",
+ ten: "",
+ },
+ };
+
+ },
+ async mounted() {
+ const bookQuestion = localStorage.getItem(
+ "kindergartenActivitiesDesignGuidance-book-chapter001"
+ );
+ if (bookQuestion) {
+ this.chapter001 = JSON.parse(bookQuestion);
+ }
+
+ },
+
+ methods: {
+ setBookQuestion() {
+ localStorage.setItem(
+ "kindergartenActivitiesDesignGuidance-book-chapter001",
+ JSON.stringify(this.chapter001)
+ );
+ },
},
};
</script>
diff --git a/src/books/kindergartenActivitiesDesignGuidance/view/components/chapter002.vue b/src/books/kindergartenActivitiesDesignGuidance/view/components/chapter002.vue
index 822df7b..88e01e0 100644
--- a/src/books/kindergartenActivitiesDesignGuidance/view/components/chapter002.vue
+++ b/src/books/kindergartenActivitiesDesignGuidance/view/components/chapter002.vue
@@ -1955,7 +1955,7 @@
<img class="rwmb-1" alt="" src="../../images/tb-8.png" /><span class="zt-ht">瀛︿範鍙嶆��</span>
</p>
<div class="bk-xyx mt-20">
- <textarea rows="2" v-model="chapter001.textBybItem10" @change="setBookQuestion" class="ml-40"></textarea>
+ <textarea rows="2" v-model="chapter001.textBybItem18" @change="setBookQuestion" class="ml-40"></textarea>
</div>
<ul class="footer-right">
<li class="footer-right-text">绗簩鍗曞厓銆�骞煎効鍋ュ悍鏁欒偛</li>
--
Gitblit v1.9.1