From 65524f5c67140430ab08fedc92098e45dd1d437d Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期五, 16 五月 2025 14:39:45 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/OralAndBroadcasting/view/components/chapter002.vue | 11 +-
src/assets/js/config.js | 15 --
src/books/childcareInstitutionsManagement/view/components/chapter001.vue | 1
src/components/graffiti/index.vue | 3
src/components/examinations/index.vue | 6 +
src/assets/methods/resources.js | 2
src/books/mathBook/view/components/index.vue | 29 -----
src/books/childHealth/view/content/components/chapter001.vue | 1
src/plugin/axios/index.js | 1
README.md | 1
src/books/OralAndBroadcasting/view/components/chapter004.vue | 220 +++++++++++++++++++++++--------------------
11 files changed, 137 insertions(+), 153 deletions(-)
diff --git a/README.md b/README.md
index a2c406e..5c46d03 100644
--- a/README.md
+++ b/README.md
@@ -22,3 +22,4 @@
### Customize configuration
See [Configuration Reference](https://cli.vuejs.org/config/).
+
diff --git a/src/assets/js/config.js b/src/assets/js/config.js
index dd4c667..d1fce38 100644
--- a/src/assets/js/config.js
+++ b/src/assets/js/config.js
@@ -1,9 +1,4 @@
import axios from "axios";
-export const resourceCtx = "http://182.92.203.7:3007/books/resource/"; // 璧勬簮璇锋眰鍦板潃
-// export const resourceCtx = "https://www.tepcb.com/books/resource/"; // 璧勬簮璇锋眰鍦板潃
-// export const resourceCtx = "https://jsek.bnuic.com/books/resource/"; // 璧勬簮璇锋眰鍦板潃
-// export const tinymceBaseUrl = "https://jsek.bnuic.com/home/";
-export const tinymceBaseUrl = "https://www.tepcb.com/home/";
export let activeBook = {}; // 璧勬簮璇锋眰鍦板潃
// export let activeBook = {
@@ -20,19 +15,15 @@
const response = await axios.get(ctx + "/bookConfig.json");
return response.data;
};
-export const appId = 1;
export const requestTimeOut = 300000; // 璇锋眰瓒呮椂鏃堕棿
-//export const tokenKey = "jsek-token";
-export const tokenKey = "website-front-token";
+// export const tokenKey = "token";
+ export const tokenKey = "website-front-token"
const config = {
- resourceCtx,
- tinymceBaseUrl,
activeBook,
requestTimeOut,
tokenKey,
goodsStore,
- appId,
- getBookConfig,
+ getBookConfig
};
export default config;
diff --git a/src/assets/methods/resources.js b/src/assets/methods/resources.js
index 2178480..35d10ff 100644
--- a/src/assets/methods/resources.js
+++ b/src/assets/methods/resources.js
@@ -1,7 +1,7 @@
import fileApi from "@/assets/js/middleGround/api/file";
import identityApi from "../js/middleGround/api/identity";
import { tokenKey } from "../js/config";
-export const getResourcePath = async (md5, appRefCode = "tourismWebsite") => {
+export const getResourcePath = async (md5, appRefCode = "jingshieke") => {
const res = fileApi.getAliVod({
md5,
appRefCode,
diff --git a/src/books/OralAndBroadcasting/view/components/chapter002.vue b/src/books/OralAndBroadcasting/view/components/chapter002.vue
index 81ed7f2..83481bf 100644
--- a/src/books/OralAndBroadcasting/view/components/chapter002.vue
+++ b/src/books/OralAndBroadcasting/view/components/chapter002.vue
@@ -522,7 +522,7 @@
<span>{{ item.name }}</span>
<img
:src="
- collectResourceList.includes(item.md5)
+ collectResourceList.findIndex(citem => citem.md5 == item.md5) > -1
? collectCheck
: collectImg
"
@@ -975,7 +975,7 @@
<span>{{ item.name }}</span>
<img
:src="
- collectResourceList.includes(item.md5)
+ collectResourceList.findIndex(citem => citem.md5 == item.md5) > -1
? collectCheck
: collectImg
"
@@ -1255,7 +1255,7 @@
<span>{{ videoThree[0].name }}</span>
<img
:src="
- collectResourceList.includes(videoThree[0].md5)
+ collectResourceList.findIndex(citem => citem.md5 == videoThree[0].md5) > -1
? collectCheck
: collectImg
"
@@ -1282,7 +1282,7 @@
<span>{{ videoThree[1].name }}</span>
<img
:src="
- collectResourceList.includes(videoThree[1].md5)
+ collectResourceList.findIndex(citem => citem.md5 == videoThree[1].md5) > -1
? collectCheck
: collectImg
"
@@ -1935,7 +1935,7 @@
<span>{{ videoThree[2].name }}</span>
<img
:src="
- collectResourceList.includes(videoThree[2].md5)
+ collectResourceList.findIndex(citem => citem.md5 == videoThree[2].md5) > -1
? collectCheck
: collectImg
"
@@ -2324,6 +2324,7 @@
this.collectResourceList = await getCollectResource(
this.config.activeBook.bookId
);
+ console.log('鍚庣鏀�',this.collectResourceList)
},
methods: {
diff --git a/src/books/OralAndBroadcasting/view/components/chapter004.vue b/src/books/OralAndBroadcasting/view/components/chapter004.vue
index f76c08b..7eac6cf 100644
--- a/src/books/OralAndBroadcasting/view/components/chapter004.vue
+++ b/src/books/OralAndBroadcasting/view/components/chapter004.vue
@@ -3,8 +3,8 @@
<div class="page-box" page="133">
<div v-if="showPageList.indexOf(133) > -1">
<div class="first-page">
- <img class="img-0" alt="" src="../../assets/images/xm4.jpg" />
- <div class="first-txt" style="border-color:#9fab61" >
+ <img class="img-0" alt="" src="../../assets/images/xm4.jpg" />
+ <div class="first-txt" style="border-color: #9fab61">
<p>
鍦ㄦ皯鑸矖浣嶄笂锛岄�氳繃骞挎挱璁╂梾瀹簡瑙ｅ悇绉嶇浉鍏抽棶棰樺拰鏅強绌轰腑椋炶瀹夊叏鐭ヨ瘑鏄皯鑸挱闊冲憳鐨勫繀瑕佸伐浣滀箣涓�銆傝�屾�庢牱鏈夋妧宸ф�у湴鎾煶鍒欐槸涓氬姟姘村钩鐨勪綋鐜帮紝瀹冨叧绯诲埌鑸┖鍏徃缁欐梾瀹㈢暀涓嬬殑鏁翠綋鍗拌薄銆傚悓鏃讹紝鍏峰鑹ソ鐨勫彛璇氦闄呬笌鎾煶鑳藉姏鑳芥洿濂藉湴鍚戞梾瀹紶閫掓湁鏁堜俊鎭�傛墍浠ワ紝鎻愬崌鑸┖鏈嶅姟鍙ｈ浜ら檯涓庢挱闊宠兘鍔涘叿鏈夐潪甯搁噸瑕佺殑鐜板疄鎰忎箟銆�
</p>
@@ -39,7 +39,7 @@
</div>
<!-- 瑙嗛 -->
<ul class="vertical-video">
- <li v-for="(item, index) in videoOne.slice(0,1)" :key="item.md5">
+ <li v-for="(item, index) in videoOne.slice(0, 1)" :key="item.md5">
<video
:src="item.url"
webkit-playsinline="true"
@@ -56,13 +56,15 @@
<span>{{ item.name }}</span>
<img
:src="
- collectResourceList.includes(item.md5)
+ collectResourceList.findIndex(
+ (citem) => citem.md5 == item.md5
+ ) > -1
? collectCheck
: collectImg
"
alt=""
class="collect-btn"
- @click="handleCollect('videoOne',index)"
+ @click="handleCollect('videoOne', index)"
/>
</p>
</li>
@@ -124,7 +126,8 @@
鑹插僵涓板瘜锛屽彉鍖栬嚜濡傘�傚０闊宠壊褰╂槸鎾煶鍛橀殢鍐呭鐨勫彂灞曡�岃繍鍔ㄥ彉鍖栫潃鐨勬劅鎯呯殑澶栬。銆備汉鐨勬劅鎯呮槸涓嶆柇杩愬姩鍙樺寲鐨勶紝澹伴煶鑹插僵涔熸槸鍦ㄥ姣斿彉鍖栦腑浣撶幇鍑烘潵鐨勩�傚０闊宠壊褰╂湁濡傜敾瀹剁殑璋冭壊鏉匡紝瓒婁赴瀵岀粏鑷村氨瓒婅兘浼犳儏锛屼篃灏辫秺鏈夎〃鐜板姏銆傛劅鎯呰壊褰╃殑鍙樺寲鏄棤绌风殑锛屽０闊宠壊褰╃殑鍙樺寲涔熸槸鏃犵┓鐨勩�傛帉鎻″彂闊冲悙瀛楃殑鍩烘湰鏂规硶锛屾槸涓轰簡鍒╀簬澹伴煶鐨勫彉鍖栵紝鑰屼笉鏄负浜嗚拷姹傚浐瀹氫笉鍙樼殑闊宠壊銆�
</p>
<h3 id="c042">
- <span class="h3-zt">浜屻��</span><span class="h3-zt1">鎾煶鐨勬妧宸�</span>
+ <span class="h3-zt">浜屻��</span
+ ><span class="h3-zt1">鎾煶鐨勬妧宸�</span>
</h3>
<h4 id="d109">锛堜竴锛夊仠椤�</h4>
<p>
@@ -310,7 +313,8 @@
鍚堥�傜殑璇�熷拰娓呮櫚鐨勫彂闊冲彲浠ヤ繚璇佷氦娴佺殑鏈夋晥杩涜锛屽涓�浜涚壒娈婄殑鏃呭杩樿鐗规畩瀵瑰緟銆備緥濡傦紝闈㈠鑰佸勾鏃呭鎴栧惉闅滄梾瀹紝蹇呰鏃跺彲鎻愰珮闊抽噺锛屽噾杩戜竴浜涳紝閲嶅涓ら亶锛屾垨鐢ㄨ偄浣撹瑷�杈呭姪琛ㄨ揪锛屼互渚挎梾瀹㈣兘娓呮鍦扮悊瑙ｆ湇鍔′汉鍛樿琛ㄨ揪鐨勫唴瀹广��
</p>
<h3 id="c047">
- <span class="h3-zt">浜斻��</span><span class="h3-zt1">浣撴�佽琛ㄨ揪</span>
+ <span class="h3-zt">浜斻��</span
+ ><span class="h3-zt1">浣撴�佽琛ㄨ揪</span>
</h3>
<p>
<img
@@ -410,7 +414,7 @@
</div>
<!-- 瑙嗛 -->
<ul class="videos-box">
- <li v-for="(item, index) in videoOne.slice(1,2)" :key="item.md5">
+ <li v-for="(item, index) in videoOne.slice(1, 2)" :key="item.md5">
<audio
:src="item.url"
controls
@@ -440,7 +444,6 @@
</p>
<p>璋㈣阿锛�</p>
<p><br /></p>
-
</div>
</div>
</div>
@@ -469,7 +472,7 @@
</div>
<!-- 瑙嗛 -->
<ul class="videos-box">
- <li v-for="(item, index) in videoOne.slice(2,3)" :key="item.md5">
+ <li v-for="(item, index) in videoOne.slice(2, 3)" :key="item.md5">
<audio
:src="item.url"
controls
@@ -502,7 +505,7 @@
</div>
<!-- 瑙嗛 -->
<ul class="videos-box">
- <li v-for="(item, index) in videoOne.slice(3,4)" :key="item.md5">
+ <li v-for="(item, index) in videoOne.slice(3, 4)" :key="item.md5">
<audio
:src="item.url"
controls
@@ -571,7 +574,7 @@
</div>
<!-- 瑙嗛 -->
<ul class="videos-box">
- <li v-for="(item, index) in videoOne.slice(4,5)" :key="item.md5">
+ <li v-for="(item, index) in videoOne.slice(4, 5)" :key="item.md5">
<audio
:src="item.url"
controls
@@ -644,7 +647,7 @@
</div>
<!-- 瑙嗛 -->
<ul class="videos-box">
- <li v-for="(item, index) in videoOne.slice(5,6)" :key="item.md5">
+ <li v-for="(item, index) in videoOne.slice(5, 6)" :key="item.md5">
<audio
:src="item.url"
controls
@@ -729,7 +732,7 @@
</div>
<!-- 瑙嗛 -->
<ul class="videos-box">
- <li v-for="(item, index) in videoTwo.slice(0,1)" :key="item.md5">
+ <li v-for="(item, index) in videoTwo.slice(0, 1)" :key="item.md5">
<audio
:src="item.url"
controls
@@ -785,7 +788,7 @@
</div>
<!-- 瑙嗛 -->
<ul class="videos-box">
- <li v-for="(item, index) in videoTwo.slice(1,2)" :key="item.md5">
+ <li v-for="(item, index) in videoTwo.slice(1, 2)" :key="item.md5">
<audio
:src="item.url"
controls
@@ -821,7 +824,7 @@
</div>
<!-- 瑙嗛 -->
<ul class="videos-box">
- <li v-for="(item, index) in videoTwo.slice(2,3)" :key="item.md5">
+ <li v-for="(item, index) in videoTwo.slice(2, 3)" :key="item.md5">
<audio
:src="item.url"
controls
@@ -857,7 +860,7 @@
</div>
<!-- 瑙嗛 -->
<ul class="videos-box">
- <li v-for="(item, index) in videoTwo.slice(3,4)" :key="item.md5">
+ <li v-for="(item, index) in videoTwo.slice(3, 4)" :key="item.md5">
<audio
:src="item.url"
controls
@@ -908,7 +911,7 @@
</div>
<!-- 瑙嗛 -->
<ul class="videos-box">
- <li v-for="(item, index) in videoTwo.slice(4,5)" :key="item.md5">
+ <li v-for="(item, index) in videoTwo.slice(4, 5)" :key="item.md5">
<audio
:src="item.url"
controls
@@ -946,7 +949,7 @@
</div>
<!-- 瑙嗛 -->
<ul class="videos-box">
- <li v-for="(item, index) in videoTwo.slice(5,6)" :key="item.md5">
+ <li v-for="(item, index) in videoTwo.slice(5, 6)" :key="item.md5">
<audio
:src="item.url"
controls
@@ -1007,7 +1010,7 @@
</div>
<!-- 瑙嗛 -->
<ul class="videos-box">
- <li v-for="(item, index) in videoTwo.slice(6,7)" :key="item.md5">
+ <li v-for="(item, index) in videoTwo.slice(6, 7)" :key="item.md5">
<audio
:src="item.url"
controls
@@ -1069,7 +1072,7 @@
</div>
<!-- 瑙嗛 -->
<ul class="videos-box">
- <li v-for="(item, index) in videoTwo.slice(7,8)" :key="item.md5">
+ <li v-for="(item, index) in videoTwo.slice(7, 8)" :key="item.md5">
<audio
:src="item.url"
controls
@@ -1107,7 +1110,7 @@
</div>
<!-- 瑙嗛 -->
<ul class="videos-box">
- <li v-for="(item, index) in videoTwo.slice(8,9)" :key="item.md5">
+ <li v-for="(item, index) in videoTwo.slice(8, 9)" :key="item.md5">
<audio
:src="item.url"
controls
@@ -1167,7 +1170,10 @@
</div>
<!-- 瑙嗛 -->
<ul class="videos-box">
- <li v-for="(item, index) in videoTwo.slice(9,10)" :key="item.md5">
+ <li
+ v-for="(item, index) in videoTwo.slice(9, 10)"
+ :key="item.md5"
+ >
<audio
:src="item.url"
controls
@@ -1231,7 +1237,10 @@
</div>
<!-- 瑙嗛 -->
<ul class="videos-box">
- <li v-for="(item, index) in videoTwo.slice(9,10)" :key="item.md5">
+ <li
+ v-for="(item, index) in videoTwo.slice(9, 10)"
+ :key="item.md5"
+ >
<audio
:src="item.url"
controls
@@ -1274,7 +1283,10 @@
</div>
<!-- 瑙嗛 -->
<ul class="videos-box">
- <li v-for="(item, index) in videoTwo.slice(9,10)" :key="item.md5">
+ <li
+ v-for="(item, index) in videoTwo.slice(9, 10)"
+ :key="item.md5"
+ >
<audio
:src="item.url"
controls
@@ -1704,107 +1716,107 @@
collectImg: require("../../assets/images/icon/heart.png"),
collectCheck: require("../../assets/images/icon/heart-check.png"),
collectResourceList: [],
- videoOne:[
+ videoOne: [
{
- name:'甯歌骞挎挱璇嶅垎绫�',
- md5:'58713a0a123849d4ae5d48ea567decf5',
- type:'瑙嗛'
+ name: "甯歌骞挎挱璇嶅垎绫�",
+ md5: "58713a0a123849d4ae5d48ea567decf5",
+ type: "瑙嗛",
},
{
- name:'4.3.1',
- md5:'7d431083643a2b3fbb95c7933d19de83'
+ name: "4.3.1",
+ md5: "7d431083643a2b3fbb95c7933d19de83",
},
{
- name:'4.3.2',
- md5:'a0fe09310d765720a5abc30d4b4dc44e'
+ name: "4.3.2",
+ md5: "a0fe09310d765720a5abc30d4b4dc44e",
},
{
- name:'4.3.3',
- md5:'ac4981d570ef546f9f9e0803dc15b326'
+ name: "4.3.3",
+ md5: "ac4981d570ef546f9f9e0803dc15b326",
},
{
- name:'4.3.4',
- md5:'a3d6d7d585cd5f50c433b97000696022'
+ name: "4.3.4",
+ md5: "a3d6d7d585cd5f50c433b97000696022",
},
{
- name:'4.3.5',
- md5:'1b0cd532b18f0bff01a7e0c1513f7896'
- }
- ],
- videoTwo:[
- {
- name:'4.4.1',
- md5:'9b6b4a865b3290961db364d84e3c034c'
- },
- {
- name:'4.4.2',
- md5:'e766f0c27d5901247a4234db25af2f3e'
- },
- {
- name:'4.4.3',
- md5:'92364b5f3dbfee0c963f9dc16f8b25a9'
- },
- {
- name:'4.4.4',
- md5:'345f098717af4c35a5fb958dfc123039'
- },
- {
- name:'4.4.5',
- md5:'a1f580e0a28bc9a25e00f0b039c989c8'
- },
- {
- name:'4.4.6',
- md5:'1ca94b85d0065dffab86921e06b00fec'
- },
- {
- name:'4.5.1',
- md5:'906ad2ef7360132bd117ca5443354c7f'
- },
- {
- name:'4.5.2',
- md5:'a466c84932e87aaa1e6410d2b6d0c9e9'
- },
- {
- name:'4.5.3',
- md5:'a3cdd0b041424dbedf76a1be83d4a6cd'
- },
- {
- name:'4.5.4',
- md5:'5dc181761ead77bf721c74e8535bfd7c'
- },
- {
- name:'4.5.5',
- md5:'0477b8fb9c343a0bb74a559a840b51c6'
- },
- {
- name:'4.5.6',
- md5:'26387da419640ca40bdd93a052a686aa'
+ name: "4.3.5",
+ md5: "1b0cd532b18f0bff01a7e0c1513f7896",
},
],
- videoThree:[
+ videoTwo: [
{
- name:'4.7.1',
- md5:'99ccbec7d990839daff312d3c1cb6a88'
+ name: "4.4.1",
+ md5: "9b6b4a865b3290961db364d84e3c034c",
},
{
- name:'4.7.2',
- md5:'c5de5e43cf1061f4cf872b11bdf12c75'
+ name: "4.4.2",
+ md5: "e766f0c27d5901247a4234db25af2f3e",
},
- ]
+ {
+ name: "4.4.3",
+ md5: "92364b5f3dbfee0c963f9dc16f8b25a9",
+ },
+ {
+ name: "4.4.4",
+ md5: "345f098717af4c35a5fb958dfc123039",
+ },
+ {
+ name: "4.4.5",
+ md5: "a1f580e0a28bc9a25e00f0b039c989c8",
+ },
+ {
+ name: "4.4.6",
+ md5: "1ca94b85d0065dffab86921e06b00fec",
+ },
+ {
+ name: "4.5.1",
+ md5: "906ad2ef7360132bd117ca5443354c7f",
+ },
+ {
+ name: "4.5.2",
+ md5: "a466c84932e87aaa1e6410d2b6d0c9e9",
+ },
+ {
+ name: "4.5.3",
+ md5: "a3cdd0b041424dbedf76a1be83d4a6cd",
+ },
+ {
+ name: "4.5.4",
+ md5: "5dc181761ead77bf721c74e8535bfd7c",
+ },
+ {
+ name: "4.5.5",
+ md5: "0477b8fb9c343a0bb74a559a840b51c6",
+ },
+ {
+ name: "4.5.6",
+ md5: "26387da419640ca40bdd93a052a686aa",
+ },
+ ],
+ videoThree: [
+ {
+ name: "4.7.1",
+ md5: "99ccbec7d990839daff312d3c1cb6a88",
+ },
+ {
+ name: "4.7.2",
+ md5: "c5de5e43cf1061f4cf872b11bdf12c75",
+ },
+ ],
};
},
- watch:{
- showPageList:function(newValue) {
- if(newValue.includes(133) && !this.videoOne.find(item =>item.url)) {
+ watch: {
+ showPageList: function (newValue) {
+ if (newValue.includes(133) && !this.videoOne.find((item) => item.url)) {
this.getVideoPath("videoOne");
}
- if(newValue.includes(144) && !this.videoTwo.find(item =>item.url)) {
- this.getVideoPath("videoTwo");
+ if (newValue.includes(144) && !this.videoTwo.find((item) => item.url)) {
+ this.getVideoPath("videoTwo");
}
- if(newValue.includes(158) && !this.videoThree.find(item =>item.url)) {
- this.getVideoPath("videoThree");
+ if (newValue.includes(158) && !this.videoThree.find((item) => item.url)) {
+ this.getVideoPath("videoThree");
}
- }
+ },
},
async mounted() {
this.collectResourceList = await getCollectResource(
@@ -1821,7 +1833,7 @@
item["url"] = await getResourcePath(item.md5);
}
},
- handleCollect(dataName,num) {
+ handleCollect(dataName, num) {
const data = this[dataName][num];
this.handleCollectResource(
data.md5,
diff --git a/src/books/childHealth/view/content/components/chapter001.vue b/src/books/childHealth/view/content/components/chapter001.vue
index b48a8b3..6d034b4 100644
--- a/src/books/childHealth/view/content/components/chapter001.vue
+++ b/src/books/childHealth/view/content/components/chapter001.vue
@@ -3950,7 +3950,6 @@
</p>
</div>
<div class="right" style="width: 60%">
- <!-- config.resourceCtx + '/video/chapterOne/涓撻涓�锛氬鍓嶅効绔ョ溂鐫涚殑鐢熺悊鐗圭偣涓庝繚鍋�.mp4' -->
<video
:src="pathTwo"
poster="../../../assets/images/chapterOne/people-video-img.jpg"
diff --git a/src/books/childcareInstitutionsManagement/view/components/chapter001.vue b/src/books/childcareInstitutionsManagement/view/components/chapter001.vue
index 140c09d..72b49ba 100644
--- a/src/books/childcareInstitutionsManagement/view/components/chapter001.vue
+++ b/src/books/childcareInstitutionsManagement/view/components/chapter001.vue
@@ -1599,6 +1599,7 @@
import preView from '@/components/pdfview/index.vue'
import mindMapView from '@/components/mindMapView/index.vue'
import tool from '@/assets/js/toolClass.js'
+import { ElMessage } from 'element-plus'
export default {
name: "chapterOne",
props: {
diff --git a/src/books/mathBook/view/components/index.vue b/src/books/mathBook/view/components/index.vue
index 74c5672..27890b2 100644
--- a/src/books/mathBook/view/components/index.vue
+++ b/src/books/mathBook/view/components/index.vue
@@ -190,34 +190,7 @@
// 娴嬭瘯椤甸潰璺宠浆
// setTimeout(() => {
- // this.gotoPage(4,79);
- // // setTimeout(() => {
- // // this.renderSign("Highlight", {
- // // id: "2ACA9359",
- // // txt: "棰樹竴瀛︿範涓婚涓� 杩愬姩",
- // // page: "10",
- // // type: "Highlight",
- // // color: "#F5E12A"
- // // });
- // // setTimeout(() => {
- // // this.delSign({
- // // ids: ["2ACA9359"]
- // // });
- // // }, 2000);
- // // }, 5000);
-
- // // const pageDom = (this.container ? this.container : document)
- // // .querySelector("#app")
- // // .querySelectorAll(".page-box");
- // // 妫�绱�
- // // console.log(this.searchTextByPage("淇濇姢鍐呰剰鍣ㄥ畼"), "searchTextByPage");
- // // 妫�绱㈣烦杞�
- // // this.searchItemLocation({
- // // catalog: 2,
- // // page: 10,
- // // txt: " 杩愬姩绯荤粺鏄敱楠ㄣ�侀杩炵粨鍜岄楠艰倢涓夐儴鍒嗙粍鎴愮殑銆傚叏韬殑楠ㄩ�氳繃楠ㄨ繛缁撶粍鎴愪汉浣撻楠硷紙瑙佸浘1-1锛夈�傞楠兼槸浜轰綋鐨勬敮鏋讹紝鍏锋湁淇濇姢鍐呰剰鍣ㄥ畼銆佷緵鑲岃倝闄勭潃鍜屼綔涓鸿倢鑲夎繍鍔ㄧ殑鏉犳潌绛変綔鐢ㄣ�傚湪绁炵粡绯荤粺鐨勬敮閰嶄笅锛岃倢鑲夋敹缂╃壍鍔ㄦ墍闄勭潃鐨勯缁曠潃鍏宠妭杞姩锛屼娇韬綋浜х敓鍚勭鍔ㄤ綔銆傛墍浠ワ紝杩愬姩绯荤粺鍏锋湁杩愬姩銆佹敮鎸佸拰淇濇姢绛夊姛鑳斤紝骞煎勾鏃舵湡鐨勯楠艰繕鍏锋湁閫犺鍔熻兘銆� ",
- // // txtIndex: 57
- // // });
+ // this.gotoPage(3,51)
// }, 500);
// 鑾峰彇棰樼洰id鍒楄〃
diff --git a/src/components/examinations/index.vue b/src/components/examinations/index.vue
index 95c9fe5..31e0db9 100644
--- a/src/components/examinations/index.vue
+++ b/src/components/examinations/index.vue
@@ -969,10 +969,13 @@
max-width: 80%;
min-width: 220px;
}
+.examination ul li sup{
+ margin-bottom:8px ;
+}
</style>
<style lang="less" scoped>
-.catalogName {
+.catalogName {
display: flex;
text-indent: 1em !important;
font-size: 16px;
@@ -1613,3 +1616,4 @@
flex-wrap: wrap;
}
</style>
+
diff --git a/src/components/graffiti/index.vue b/src/components/graffiti/index.vue
index 902940e..c332154 100644
--- a/src/components/graffiti/index.vue
+++ b/src/components/graffiti/index.vue
@@ -150,7 +150,7 @@
imgData.setAttribute("crossOrigin", "");
}
imgData.onload = () => {
- this.context.drawImage(imgData, 0, 0, this.imgWidth, this.imgHeight);
+ this.context.drawImage(imgData, 0, 0, Math.min(window.innerWidth,this.imgWidth),this.imgHeight);
};
};
resetCanvas();
@@ -336,6 +336,7 @@
display: flex;
justify-content: space-around;
align-items: center;
+ flex-wrap: wrap;
height: 88px;
}
diff --git a/src/plugin/axios/index.js b/src/plugin/axios/index.js
index 80a8050..286c057 100644
--- a/src/plugin/axios/index.js
+++ b/src/plugin/axios/index.js
@@ -11,6 +11,7 @@
service.interceptors.request.use(
(config) => {
let token = localStorage.getItem(myConfig.tokenKey)
+ config.headers['Cache-Control'] = 'no-cache, no-store, must-revalidate'
if (token) config.headers['Authorization'] = `bearer ${token}`
return config
},
--
Gitblit v1.9.1