|
@@ -224,6 +224,20 @@
|
|
|
:src="pptImgUrl1"
|
|
|
></iframe>
|
|
|
</div>
|
|
|
+ <div
|
|
|
+ class="wheel"
|
|
|
+ v-if="showType == 3"
|
|
|
+ style="height: 520px; width: 90%; margin: 0 0 20px 30px"
|
|
|
+ >
|
|
|
+ <!-- <iframe
|
|
|
+ style="width: 100%; height: 100%; border: none"
|
|
|
+ :src="pptImgUrl1"
|
|
|
+ ></iframe> -->
|
|
|
+ <pdf
|
|
|
+ :pdfUrl="pptImgUrl1"
|
|
|
+ style="width: 100%; height: 100%; overflow: auto"
|
|
|
+ ></pdf>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
@@ -819,17 +833,10 @@
|
|
|
v-for="(w, wIndex) in workStudent[toolIndex]"
|
|
|
:key="wIndex"
|
|
|
>
|
|
|
- <div class="workImg" v-if="w.type == 0">
|
|
|
- <img
|
|
|
- :src="w.works"
|
|
|
- @click="previewImg(w.works)"
|
|
|
- alt
|
|
|
- />
|
|
|
- </div>
|
|
|
- <div class="workImg" v-if="w.type == 1">
|
|
|
+ <div class="workImg">
|
|
|
<img
|
|
|
src="../assets/icon/works/noImg.png"
|
|
|
- @click="openFile(w.works)"
|
|
|
+ @click="openTools(4, toolIndex, taskCount, w.works)"
|
|
|
alt
|
|
|
/>
|
|
|
</div>
|
|
@@ -931,27 +938,28 @@
|
|
|
>
|
|
|
<div
|
|
|
class="works"
|
|
|
- style="width: 200px; height: 140px; padding-top: 25px"
|
|
|
- v-for="(w, wIndex) in workStudent[toolIndex]"
|
|
|
+ v-for="(w, wIndex) in worksStudent[toolIndex]"
|
|
|
:key="wIndex"
|
|
|
>
|
|
|
- <div class="workImg" v-if="w.type == 0">
|
|
|
- <img
|
|
|
- :src="w.works"
|
|
|
- @click="previewImg(w.works)"
|
|
|
- alt
|
|
|
- />
|
|
|
- </div>
|
|
|
- <div class="workImg" v-if="w.type == 1">
|
|
|
- <img
|
|
|
+ <div class="workImg">
|
|
|
+ <!-- <img
|
|
|
src="../assets/icon/works/noImg.png"
|
|
|
- @click="openFile(w.works)"
|
|
|
- alt
|
|
|
- />
|
|
|
- </div>
|
|
|
- <div class="worksName">
|
|
|
- 姓名:
|
|
|
- <span>{{ w.sName }}</span>
|
|
|
+ @click="openTools(15, toolIndex, taskCount, w.works)"
|
|
|
+ alt=""
|
|
|
+ />-->
|
|
|
+ <div class="answerBg">
|
|
|
+ <div>{{ w.sName }}</div>
|
|
|
+ <el-tooltip
|
|
|
+ class="item"
|
|
|
+ effect="light"
|
|
|
+ :content="JSON.parse(w.works)[0].answer"
|
|
|
+ placement="top"
|
|
|
+ >
|
|
|
+ <div class="answerContent">
|
|
|
+ {{ JSON.parse(w.works)[0].answer }}
|
|
|
+ </div>
|
|
|
+ </el-tooltip>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -1044,20 +1052,13 @@
|
|
|
v-for="(w, wIndex) in workStudent[toolIndex]"
|
|
|
:key="wIndex"
|
|
|
>
|
|
|
- <div class="workImg" v-if="w.type == 0">
|
|
|
+ <div class="workImg">
|
|
|
<img
|
|
|
:src="w.works"
|
|
|
@click="previewImg(w.works)"
|
|
|
alt
|
|
|
/>
|
|
|
</div>
|
|
|
- <div class="workImg" v-if="w.type == 1">
|
|
|
- <img
|
|
|
- src="../assets/icon/works/noImg.png"
|
|
|
- @click="openFile(w.works)"
|
|
|
- alt
|
|
|
- />
|
|
|
- </div>
|
|
|
<div class="worksName">
|
|
|
姓名:
|
|
|
<span>{{ w.sName }}</span>
|
|
@@ -1153,20 +1154,13 @@
|
|
|
v-for="(w, wIndex) in workStudent[toolIndex]"
|
|
|
:key="wIndex"
|
|
|
>
|
|
|
- <div class="workImg" v-if="w.type == 0">
|
|
|
+ <div class="workImg">
|
|
|
<img
|
|
|
:src="w.works"
|
|
|
@click="previewImg(w.works)"
|
|
|
alt
|
|
|
/>
|
|
|
</div>
|
|
|
- <div class="workImg" v-if="w.type == 1">
|
|
|
- <img
|
|
|
- src="../assets/icon/works/noImg.png"
|
|
|
- @click="openFile(w.works)"
|
|
|
- alt
|
|
|
- />
|
|
|
- </div>
|
|
|
<div class="worksName">
|
|
|
姓名:
|
|
|
<span>{{ w.sName }}</span>
|
|
@@ -1262,20 +1256,13 @@
|
|
|
v-for="(w, wIndex) in workStudent[toolIndex]"
|
|
|
:key="wIndex"
|
|
|
>
|
|
|
- <div class="workImg" v-if="w.type == 0">
|
|
|
+ <div class="workImg">
|
|
|
<img
|
|
|
:src="w.works"
|
|
|
@click="previewImg(w.works)"
|
|
|
alt
|
|
|
/>
|
|
|
</div>
|
|
|
- <div class="workImg" v-if="w.type == 1">
|
|
|
- <img
|
|
|
- src="../assets/icon/works/noImg.png"
|
|
|
- @click="openFile(w.works)"
|
|
|
- alt
|
|
|
- />
|
|
|
- </div>
|
|
|
<div class="worksName">
|
|
|
姓名:
|
|
|
<span>{{ w.sName }}</span>
|
|
@@ -1371,20 +1358,13 @@
|
|
|
v-for="(w, wIndex) in workStudent[toolIndex]"
|
|
|
:key="wIndex"
|
|
|
>
|
|
|
- <div class="workImg" v-if="w.type == 0">
|
|
|
+ <div class="workImg">
|
|
|
<img
|
|
|
:src="w.works"
|
|
|
@click="previewImg(w.works)"
|
|
|
alt
|
|
|
/>
|
|
|
</div>
|
|
|
- <div class="workImg" v-if="w.type == 1">
|
|
|
- <img
|
|
|
- src="../assets/icon/works/noImg.png"
|
|
|
- @click="openFile(w.works)"
|
|
|
- alt
|
|
|
- />
|
|
|
- </div>
|
|
|
<div class="worksName">
|
|
|
姓名:
|
|
|
<span>{{ w.sName }}</span>
|
|
@@ -1819,11 +1799,11 @@
|
|
|
|
|
|
<script>
|
|
|
import "../common/aws-sdk-2.235.1.min.js";
|
|
|
-// import pdf from "./components/pdf";
|
|
|
+import pdf from "./components/pdf2";
|
|
|
import EditorBar from "../components/tools/wangEnduit.vue";
|
|
|
import Time from "../components/tools/time.vue";
|
|
|
export default {
|
|
|
- components: { EditorBar, Time },
|
|
|
+ components: { EditorBar, Time, pdf },
|
|
|
data() {
|
|
|
return {
|
|
|
dialogVisible: false,
|
|
@@ -1917,7 +1897,7 @@ export default {
|
|
|
dialogVisible1: false,
|
|
|
dialogVisible2: false,
|
|
|
dialogVisible3: false,
|
|
|
- dialogVisible6:false,
|
|
|
+ dialogVisible6: false,
|
|
|
dialogVisible4: false,
|
|
|
isNoHomeWork: false,
|
|
|
dialogVisible5: false,
|
|
@@ -1934,7 +1914,7 @@ export default {
|
|
|
answerList: [],
|
|
|
navList: [],
|
|
|
worksStudent: [],
|
|
|
- workStudent:[],
|
|
|
+ workStudent: [],
|
|
|
noWorksS: [],
|
|
|
isWorksS: [],
|
|
|
noWorksStudent: [],
|
|
@@ -2099,9 +2079,9 @@ export default {
|
|
|
console.error(err);
|
|
|
});
|
|
|
},
|
|
|
- selectStudent(){
|
|
|
+ selectStudent() {
|
|
|
let params = {
|
|
|
- uid:this.userid,
|
|
|
+ uid: this.userid,
|
|
|
cid: this.id,
|
|
|
s: this.courseType,
|
|
|
t: this.taskCount,
|
|
@@ -2235,7 +2215,7 @@ export default {
|
|
|
file.name.split(".")[0] +
|
|
|
new Date().getTime() +
|
|
|
"." +
|
|
|
- file.name.split(".")[file.name.split(".").length-1],
|
|
|
+ file.name.split(".")[file.name.split(".").length - 1],
|
|
|
ContentType: file.type,
|
|
|
Body: file,
|
|
|
"Access-Control-Allow-Credentials": "*",
|
|
@@ -2649,12 +2629,22 @@ export default {
|
|
|
this.taskCount
|
|
|
].chapterData[0].type == 3
|
|
|
) {
|
|
|
- this.showType = 2;
|
|
|
- this.pptImgUrl1 =
|
|
|
- "https://view.officeapps.live.com/op/view.aspx?src=" +
|
|
|
+ let _url =
|
|
|
this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
|
|
|
this.taskCount
|
|
|
].chapterData[0].url;
|
|
|
+ if (
|
|
|
+ _url
|
|
|
+ .split(".")
|
|
|
+ [_url.split(".").length - 1].toLocaleUpperCase() == "PDF"
|
|
|
+ ) {
|
|
|
+ this.showType = 3;
|
|
|
+ this.pptImgUrl1 = _url;
|
|
|
+ } else {
|
|
|
+ this.showType = 2;
|
|
|
+ this.pptImgUrl1 =
|
|
|
+ "https://view.officeapps.live.com/op/view.aspx?src=" + _url;
|
|
|
+ }
|
|
|
} else if (
|
|
|
this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
|
|
|
this.taskCount
|
|
@@ -2668,6 +2658,13 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ this.selectStudent();
|
|
|
+ this.selectSWorks();
|
|
|
+ let _this = this;
|
|
|
+ _this.timer = setInterval(function () {
|
|
|
+ _this.selectSWorks();
|
|
|
+ _this.selectStudent();
|
|
|
+ }, 5000);
|
|
|
this.$nextTick(function () {
|
|
|
setTimeout(() => {
|
|
|
// for (
|
|
@@ -2689,13 +2686,6 @@ export default {
|
|
|
a - 100 + "px";
|
|
|
}, 500);
|
|
|
});
|
|
|
- this.selectStudent();
|
|
|
- this.selectSWorks();
|
|
|
- let _this = this;
|
|
|
- _this.timer = setInterval(function () {
|
|
|
- _this.selectSWorks();
|
|
|
- _this.selectStudent();
|
|
|
- }, 5000);
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
loading.close();
|
|
@@ -2773,7 +2763,7 @@ export default {
|
|
|
},
|
|
|
downFile(f, i) {
|
|
|
this.pptImgUrl1 = "";
|
|
|
- var a = ["PPT", "PPTX", "PDF", "XLSX", "XLS", "DOC", "DOCX"];
|
|
|
+ var a = ["PPT", "PPTX", "XLSX", "XLS", "DOC", "DOCX"]; //"PDF",
|
|
|
console.log(
|
|
|
a.indexOf(
|
|
|
f.url.split(".")[f.url.split(".").length - 1].toLocaleUpperCase()
|
|
@@ -2788,6 +2778,13 @@ export default {
|
|
|
"https://view.officeapps.live.com/op/view.aspx?src=" + f.url;
|
|
|
// this.dialogVisible3 = true;
|
|
|
this.showType = 2;
|
|
|
+ } else if (
|
|
|
+ f.url.split(".")[f.url.split(".").length - 1].toLocaleUpperCase() ==
|
|
|
+ "PDF"
|
|
|
+ ) {
|
|
|
+ this.pptImgUrl1 = f.url;
|
|
|
+ // this.dialogVisible3 = true;
|
|
|
+ this.showType = 3;
|
|
|
} else {
|
|
|
window.open(this.file[i].url);
|
|
|
}
|
|
@@ -3777,8 +3774,8 @@ export default {
|
|
|
border-bottom: 1px solid #d7d7d7;
|
|
|
padding-bottom: 5px;
|
|
|
background: #d2e3ff;
|
|
|
- width: 70px;
|
|
|
- min-width: 70px;
|
|
|
+ width: 55px;
|
|
|
+ min-width: 55px;
|
|
|
border-radius: 5px;
|
|
|
color: #4d97d6;
|
|
|
text-align: center;
|