From 8c312ce260f1e76cd843a4c4c18620f167d7f436 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期五, 25 十月 2024 15:08:58 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/mathBook/view/components/chapter001.vue | 2 +-
.env.product | 4 ++--
src/books/sportsAndHealth/view/components/testPp.vue | 8 --------
src/books/mathBook/view/components/index.vue | 2 +-
src/components/paint/index.vue | 8 +-------
src/books/civilAviation/assets/main.less | 4 ----
6 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/.env.product b/.env.product
index 330fb39..847c00c 100644
--- a/.env.product
+++ b/.env.product
@@ -1,8 +1,8 @@
VUE_APP_ENV = 'product'
VUE_APP_API_URL = "https://jsek.bnuic.com"
VUE_APP_RESOURCE_CTX = 'https://jsek.bnuic.com/books/resource/'
-VUE_APP_PUBLIC_PATH = 'https://jsek.bnuic.com/books/book/civilAviation'
+VUE_APP_PUBLIC_PATH = 'https://jsek.bnuic.com/books/book/mathBook'
# VUE_APP_RESOURCE_CTX = 'http://182.92.203.7:3007/books/resource/'
# VUE_APP_PUBLIC_PATH = 'http://182.92.203.7:3007/books/book/botany'
VUE_APP_BOOK_LIST = "childHealth/lifeCare/sportsAndHealth/embedded/english/artAndDance/artAndDrama/mathBook/botany/civilAviation"
-VUE_APP_BOOK_ID = 'civilAviation'
\ No newline at end of file
+VUE_APP_BOOK_ID = 'mathBook'
\ No newline at end of file
diff --git a/src/books/civilAviation/assets/main.less b/src/books/civilAviation/assets/main.less
index 4a9ceb5..24c3c09 100644
--- a/src/books/civilAviation/assets/main.less
+++ b/src/books/civilAviation/assets/main.less
@@ -1220,14 +1220,11 @@
.custom-dialog {
overflow: hidden !important;
-
.el-dialog__body {
padding: 0;
}
-
.el-dialog__header {
background-color: rgba(0, 0, 0, 0.8);
-
.header_title {
display: flex;
justify-content: space-between;
@@ -1241,7 +1238,6 @@
cursor: pointer;
}
}
-
.el-dialog__title,
.el-dialog__headerbtn .el-dialog__close {
color: #fff;
diff --git a/src/books/mathBook/view/components/chapter001.vue b/src/books/mathBook/view/components/chapter001.vue
index a7c8f81..c54e2a2 100644
--- a/src/books/mathBook/view/components/chapter001.vue
+++ b/src/books/mathBook/view/components/chapter001.vue
@@ -2120,7 +2120,7 @@
<li v-for="(item, index) in thinkData" :key="index">
<div v-if="index <= showIndex" style="display: flex">
<span style="position: relative">
- <span style="position: absolute; top: 4px; left: 13px; color: #fff">{{ index + 1 }}</span>
+ <span style="position: absolute; top: 16px; left: 13px; color: #fff">{{ index + 1 }}</span>
<img src="../../assets/images/icon/blue-group.png" alt="" style="margin-right: 10px"
v-if="index < thinkOne.length - 1" />
<img src="../../assets/images/icon/blue.png" alt="" v-if="index == thinkOne.length - 1"
diff --git a/src/books/mathBook/view/components/index.vue b/src/books/mathBook/view/components/index.vue
index e57b77c..db41812 100644
--- a/src/books/mathBook/view/components/index.vue
+++ b/src/books/mathBook/view/components/index.vue
@@ -189,7 +189,7 @@
// 娴嬭瘯椤甸潰璺宠浆
// setTimeout(() => {
- // this.gotoPage(2,10);
+ // this.gotoPage(3,51);
// // setTimeout(() => {
// // this.renderSign("Highlight", {
// // id: "2ACA9359",
diff --git a/src/books/sportsAndHealth/view/components/testPp.vue b/src/books/sportsAndHealth/view/components/testPp.vue
index 7a2dbb4..eb14457 100644
--- a/src/books/sportsAndHealth/view/components/testPp.vue
+++ b/src/books/sportsAndHealth/view/components/testPp.vue
@@ -1036,14 +1036,6 @@
</div>
</div>
-
-
-
-
-
-
-
-
<div>
<el-dialog :visible.sync="dialogVisible" width="60vw" top="2vh" lock-scroll :show-close="false"
class="custom-dialog">
diff --git a/src/components/paint/index.vue b/src/components/paint/index.vue
index 75e7a89..114d6c7 100644
--- a/src/components/paint/index.vue
+++ b/src/components/paint/index.vue
@@ -14,7 +14,6 @@
<button @click="saveImgData">淇濆瓨</button>
</li>
<li>
-
</li>
<li>
<label>鐢荤瑪锛�</label>
@@ -205,9 +204,7 @@
rect.render(ctx);
return patternCanvas;
};
-
const img = new Image();
- // img.src = "../assets/images/drop.jpg";
this.texturePatternBrush = new fabric.PatternBrush(this.canvas);
this.texturePatternBrush.source = img;
}
@@ -269,11 +266,9 @@
if (brush.getPatternSrc) {
brush.source = brush.getPatternSrc.call(brush);
}
- console.log(e.srcElement.value);
},
// 淇敼鐢荤瑪绮楃粏
changeLineWidth(e) {
- console.log(e);
this.canvas.freeDrawingBrush.width =
parseInt(e.srcElement.value, 10) || 1;
},
@@ -326,7 +321,6 @@
changeShowColor(e) {
this.canvas.contextContainer.shadowColor = e.srcElement.value;
},
-
// 闃村奖瀹藉害
changeShowWidth(e) {
console.log(this.canvas);
@@ -340,7 +334,7 @@
this.canvas.contextContainer.shadowOffsetY =
parseInt(e.srcElement.value, 10) || 0;
},
- // 淇濆瓨鍥句功
+ // 淇濆瓨鍥剧墖
saveImgData() {
const imgData = this.canvas.toDataURL({
format: "png", // 鎸囧畾杈撳嚭鏍煎紡锛岄�氬父鏄�'png'鎴�'jpeg'
--
Gitblit v1.9.1