|
|
@@ -243,8 +243,8 @@
|
|
|
v-if="showType == 1"
|
|
|
style="
|
|
|
box-shadow: 0 0 6px 1px #f2f2f2;
|
|
|
- width: 90%;
|
|
|
- margin: 0 0 20px 30px;
|
|
|
+ width: 95%;
|
|
|
+ margin: 0 auto;
|
|
|
background: #f1f1f1;
|
|
|
"
|
|
|
>
|
|
|
@@ -268,7 +268,7 @@
|
|
|
<div
|
|
|
class="wheel"
|
|
|
v-if="showType == 2"
|
|
|
- style="height: 520px; width: 90%; margin: 0 0 20px 30px"
|
|
|
+ style="height: 520px; width: 95%; margin: 0 auto"
|
|
|
>
|
|
|
<iframe
|
|
|
style="width: 100%; height: 100%; border: none"
|
|
|
@@ -278,7 +278,7 @@
|
|
|
<div
|
|
|
class="wheel"
|
|
|
v-if="showType == 3"
|
|
|
- style="height: 520px; width: 90%; margin: 0 0 20px 30px"
|
|
|
+ style="height: 520px; width: 95%; margin: 0 auto"
|
|
|
>
|
|
|
<!-- <iframe
|
|
|
style="width: 100%; height: 100%; border: none"
|
|
|
@@ -292,12 +292,7 @@
|
|
|
<div
|
|
|
class="wheel"
|
|
|
v-if="showType == 4"
|
|
|
- style="
|
|
|
- height: 520px;
|
|
|
- width: 90%;
|
|
|
- margin: 0 0 20px 30px;
|
|
|
- overflow: auto;
|
|
|
- "
|
|
|
+ style="height: 520px; width: 95%; margin: 0 auto"
|
|
|
>
|
|
|
<el-image
|
|
|
:src="pptImgUrl1"
|
|
|
@@ -361,6 +356,7 @@
|
|
|
class="vedioTimeBox"
|
|
|
v-for="(media, vedioIndex) in vedio[taskCount]"
|
|
|
:key="vedioIndex + '1'"
|
|
|
+ @click="lookVedio(media.url)"
|
|
|
>
|
|
|
<div
|
|
|
class="media"
|
|
|
@@ -376,7 +372,6 @@
|
|
|
: mr
|
|
|
"
|
|
|
alt
|
|
|
- @click="lookVedio(media.url)"
|
|
|
/>
|
|
|
<div class="vedioTime">{{ vedioTime }}</div>
|
|
|
<!-- <div class="vedioName">{{ media.name }}</div> -->
|
|
|
@@ -393,6 +388,7 @@
|
|
|
class="newNav"
|
|
|
v-for="(text, textIndex) in textList[taskCount]"
|
|
|
:key="textIndex + '2'"
|
|
|
+ @click="lookText(taskCount, textIndex)"
|
|
|
>
|
|
|
<div
|
|
|
class="vedioNav"
|
|
|
@@ -408,10 +404,7 @@
|
|
|
文档
|
|
|
</div>
|
|
|
<div style="width: calc(100% - 115px)">
|
|
|
- <div
|
|
|
- class="navText"
|
|
|
- @click="lookText(taskCount, textIndex)"
|
|
|
- >
|
|
|
+ <div class="navText">
|
|
|
{{
|
|
|
textList[taskCount].length > 0 ? text.name : ""
|
|
|
}}.doc
|
|
|
@@ -449,6 +442,7 @@
|
|
|
class="newNav"
|
|
|
v-for="(lines, lineIndex) in lineList[taskCount]"
|
|
|
:key="lineIndex + '4'"
|
|
|
+ @click="doUrl(lines.url)"
|
|
|
>
|
|
|
<div
|
|
|
class="vedioNav"
|
|
|
@@ -468,7 +462,6 @@
|
|
|
<a
|
|
|
style="text-decoration: none; color: #000"
|
|
|
target="_Blank"
|
|
|
- @click="doUrl(lines.url)"
|
|
|
>{{ lines.url }}</a
|
|
|
>
|
|
|
</div>
|
|
|
@@ -483,6 +476,7 @@
|
|
|
"
|
|
|
v-for="(f, fileIndex) in file[taskCount]"
|
|
|
:key="fileIndex"
|
|
|
+ @click="downFile(f, fileIndex)"
|
|
|
>
|
|
|
<div
|
|
|
class="vedioNav"
|
|
|
@@ -498,7 +492,7 @@
|
|
|
文档
|
|
|
</div>
|
|
|
<div style="width: calc(100% - 115px)">
|
|
|
- <div class="navText" @click="downFile(f, fileIndex)">
|
|
|
+ <div class="navText">
|
|
|
{{ f.name }}
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -507,7 +501,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div
|
|
|
- style="padding: 0px 30px"
|
|
|
+ style="padding: 10px 30px 0"
|
|
|
v-if="showType == 2 || showType == 3"
|
|
|
>
|
|
|
<el-button
|
|
|
@@ -780,7 +774,39 @@
|
|
|
src="../assets/icon/secondToolList/networkPanel.png"
|
|
|
alt
|
|
|
/>
|
|
|
- <div style="margin: 5px 0">网络画板</div>
|
|
|
+ <div style="margin: 5px 0">数学画板</div>
|
|
|
+ </div>
|
|
|
+ <div v-if="tooC == 28">
|
|
|
+ <img
|
|
|
+ @click="addTools(tooC, toolIndex, taskCount)"
|
|
|
+ src="../assets/icon/secondToolList/networkPanel.png"
|
|
|
+ alt
|
|
|
+ />
|
|
|
+ <div style="margin: 5px 0">翻译</div>
|
|
|
+ </div>
|
|
|
+ <div v-if="tooC == 37">
|
|
|
+ <img
|
|
|
+ @click="addTools(tooC, toolIndex, taskCount)"
|
|
|
+ src="../assets/icon/secondToolList/networkPanel.png"
|
|
|
+ alt
|
|
|
+ />
|
|
|
+ <div style="margin: 5px 0">魔盒识字</div>
|
|
|
+ </div>
|
|
|
+ <div v-if="tooC == 38">
|
|
|
+ <img
|
|
|
+ @click="addTools(tooC, toolIndex, taskCount)"
|
|
|
+ src="../assets/icon/secondToolList/networkPanel.png"
|
|
|
+ alt
|
|
|
+ />
|
|
|
+ <div style="margin: 5px 0">24点</div>
|
|
|
+ </div>
|
|
|
+ <div v-if="tooC == 39">
|
|
|
+ <img
|
|
|
+ @click="addTools(tooC, toolIndex, taskCount)"
|
|
|
+ src="../assets/icon/secondToolList/networkPanel.png"
|
|
|
+ alt
|
|
|
+ />
|
|
|
+ <div style="margin: 5px 0">GeoGebra</div>
|
|
|
</div>
|
|
|
<div v-if="tooC == 32">
|
|
|
<img
|
|
|
@@ -905,7 +931,7 @@
|
|
|
>
|
|
|
<div
|
|
|
class="works"
|
|
|
- v-for="(w, wIndex) in worksStudent[toolIndex]"
|
|
|
+ v-for="(w, wIndex) in workStudent[toolIndex]"
|
|
|
:key="wIndex"
|
|
|
>
|
|
|
<div class="workImg">
|
|
|
@@ -1718,9 +1744,17 @@
|
|
|
<div class="up_photo">
|
|
|
<img src="../assets/icon/uploadImg.png" alt />
|
|
|
</div>
|
|
|
+ <!-- <input
|
|
|
+ type="file"
|
|
|
+ accept="application/pdf, application/.ppt, .pptx, .xlsx, .xls, application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document, image/*"
|
|
|
+ capture="camera"
|
|
|
+ style="display: none"
|
|
|
+ @change="beforeUpload1($event, 1)"
|
|
|
+ /> -->
|
|
|
<input
|
|
|
type="file"
|
|
|
- accept="application/pdf, application/.ppt, .pptx, .xlsx, .xls, application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document, image/png, image/gif, image/jpeg"
|
|
|
+ accept="image/*"
|
|
|
+ capture="camera"
|
|
|
style="display: none"
|
|
|
@change="beforeUpload1($event, 1)"
|
|
|
/>
|
|
|
@@ -2097,7 +2131,16 @@
|
|
|
>
|
|
|
<div slot="title" class="header-title">
|
|
|
<div style="color: #fff">查看文档</div>
|
|
|
- <div @click="fullDialogVisible=false" style="cursor:pointer;position: absolute; top: 20px; right: 20px;color: #fff;">
|
|
|
+ <div
|
|
|
+ @click="fullDialogVisible = false"
|
|
|
+ style="
|
|
|
+ cursor: pointer;
|
|
|
+ position: absolute;
|
|
|
+ top: 20px;
|
|
|
+ right: 20px;
|
|
|
+ color: #fff;
|
|
|
+ "
|
|
|
+ >
|
|
|
退出全屏
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -2935,6 +2978,7 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
getCourseDetail() {
|
|
|
+ document.scrollingElement.scrollTop = 0;
|
|
|
const loading = this.$loading.service({
|
|
|
background: "rgba(255, 255, 255, 0.7)",
|
|
|
target: document.querySelector(".student_table"),
|
|
|
@@ -3680,6 +3724,14 @@ export default {
|
|
|
window.parent.postMessage({ tools: "25" }, "*");
|
|
|
} else if (t == 31) {
|
|
|
window.parent.postMessage({ tools: "31" }, "*");
|
|
|
+ } else if (t == 28) {
|
|
|
+ window.parent.postMessage({ tools: "28" }, "*");
|
|
|
+ } else if (t == 37) {
|
|
|
+ window.parent.postMessage({ tools: "37" }, "*");
|
|
|
+ } else if (t == 38) {
|
|
|
+ window.parent.postMessage({ tools: "38" }, "*");
|
|
|
+ } else if (t == 39) {
|
|
|
+ window.parent.postMessage({ tools: "39" }, "*");
|
|
|
} else if (t == 32) {
|
|
|
window.parent.postMessage({ tools: "32" }, "*");
|
|
|
} else if (t == 26) {
|
|
|
@@ -3814,11 +3866,11 @@ export default {
|
|
|
},
|
|
|
},
|
|
|
created() {
|
|
|
- if(this.screenType == 2){
|
|
|
+ if (this.screenType == 2) {
|
|
|
window.parent.postMessage({ allScreen: 4 }, "*");
|
|
|
- }else if(this.screenType == 3){
|
|
|
+ } else if (this.screenType == 3) {
|
|
|
window.parent.postMessage({ allScreen: 5 }, "*");
|
|
|
- }else if(this.screenType == 1){
|
|
|
+ } else if (this.screenType == 1) {
|
|
|
window.parent.postMessage({ allScreen: 6 }, "*");
|
|
|
}
|
|
|
this.selectEva();
|
|
|
@@ -3932,7 +3984,8 @@ export default {
|
|
|
cursor: pointer;
|
|
|
}
|
|
|
.box_course {
|
|
|
- width: 60%;
|
|
|
+ /* width: 60%; */
|
|
|
+ width: 81%;
|
|
|
}
|
|
|
.wheel {
|
|
|
width: 100%;
|
|
|
@@ -4419,9 +4472,11 @@ export default {
|
|
|
.vedioList {
|
|
|
background: #f2f2f2;
|
|
|
border: 1px solid #ececec;
|
|
|
- width: 38.8%;
|
|
|
+ /* width: 38.8%; */
|
|
|
+ width: calc(100% - 83%);
|
|
|
height: 445px;
|
|
|
border-radius: 10px;
|
|
|
+ overflow: hidden;
|
|
|
}
|
|
|
.vedioNav {
|
|
|
margin: 10px 0 0 15px;
|
|
|
@@ -4851,7 +4906,7 @@ export default {
|
|
|
margin-bottom: 10px;
|
|
|
}
|
|
|
.taskBox {
|
|
|
- margin: 15px 0 20px 30px;
|
|
|
+ margin: 15px auto 20px;
|
|
|
background: #f7f7f7;
|
|
|
width: 97%;
|
|
|
border-radius: 10px;
|
|
|
@@ -4979,11 +5034,12 @@ export default {
|
|
|
}
|
|
|
.title {
|
|
|
background: #1e5cc9;
|
|
|
- width: 98%;
|
|
|
+ /* width: 98%; */
|
|
|
height: 45px;
|
|
|
color: #fff;
|
|
|
line-height: 45px;
|
|
|
padding-left: 20px;
|
|
|
+ box-sizing: border-box;
|
|
|
}
|
|
|
.textBox {
|
|
|
font-size: 20px;
|
