Ana Sayfa Keşfet Yardım
Giriş Yap
CocoRoboLabs
/
pbl-student-table
3
0
Çatalla 0
Dosyalar Sorunlar 0 Değişiklik İstekleri 0 Wiki
Kaynağa Gözat

Merge branch 'beta' into HK

lsc 1 yıl önce
ebeveyn
a9068bd66f c0bbfe338e
işleme
28c890d51c
21 değiştirilmiş dosya ile 886 ekleme ve 72 silme
Görünümü Böl Farklılık Durumunu Göster
  1. 4 0
      dist/index.html
  2. 0 0
      dist/static/css/app.16d287e69cbc6b8dc366eb7a7d6b50f8.css
  3. 0 0
      dist/static/css/app.16d287e69cbc6b8dc366eb7a7d6b50f8.css.map
  4. 0 0
      dist/static/js/app.287f9620e766e83cb989.js.map
  5. 0 0
      dist/static/js/app.dde0506a2d198d0b6865.js
  6. 1 0
      dist/static/js/app.dde0506a2d198d0b6865.js.map
  7. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  8. 28 7
      src/components/Choice/index.vue
  9. 1 1
      src/components/GM/studyStudentGM.vue
  10. 28 3
      src/components/courseDetail.vue
  11. 3 3
      src/components/easy2/studyStudent jiu.vue
  12. 199 13
      src/components/easy2/studyStudent.vue
  13. 3 3
      src/components/easy3/studyStudent jiu.vue
  14. 200 13
      src/components/easy3/studyStudent.vue
  15. 201 3
      src/components/interVideo/index.vue
  16. 2 2
      src/components/noTerminal/studyStudent.vue
  17. 2 1
      src/components/student/studyStudent.vue
  18. 202 14
      src/components/studyStudent.vue
  19. 4 3
      src/components/trainCourse/easy2/studyStudent.vue
  20. 4 3
      src/components/trainCourse/easy3/studyStudent.vue
  21. 4 3
      src/components/trainCourse/studyStudent.vue

+ 4 - 0
dist/index.html
Dosyayı Görüntüle 

@@ -27,7 +27,11 @@
 
     html,
 
     body{
 
       font-family: 'Source Han Sans SC', sans-serif;
 
+<<<<<<< HEAD
 
     }</style><link href=./static/css/app.10f1d8672fca5b4054ebe8c3ad8be78c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.db8aabf79454924ff575.js></script><script type=text/javascript src=./static/js/app.287f9620e766e83cb989.js></script></body></html><script>function stopSafari() {
 
+=======
 
+    }</style><link href=./static/css/app.16d287e69cbc6b8dc366eb7a7d6b50f8.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.9ee7cb8cb3c0161956b8.js></script><script type=text/javascript src=./static/js/app.dde0506a2d198d0b6865.js></script></body></html><script>function stopSafari() {
 
+>>>>>>> beta
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/css/app.16d287e69cbc6b8dc366eb7a7d6b50f8.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/css/app.16d287e69cbc6b8dc366eb7a7d6b50f8.css.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/app.287f9620e766e83cb989.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/app.dde0506a2d198d0b6865.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
dist/static/js/app.dde0506a2d198d0b6865.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 28 - 7
src/components/Choice/index.vue
Dosyayı Görüntüle 

@@ -30,7 +30,7 @@
 
                         </div>
 
                         <div class="a_add_body">
 
                             <div class="a_add_input">
 
-                                <el-radio-group v-model="radio[index1]" v-if="testJson.testJson[index1].type == '1'">
 
+                                <el-radio-group v-model="radio[index1]" v-if="testJson.testJson[index1].type == '1'" :disabled="videoType==1" >
 
                                     <div class="radioBox">
 
                                         <el-radio v-for="(item2, checkIndex) in testJson.testJson[index1]
 
                                             .checkList" :key="checkIndex" :label="checkIndex"
 
@@ -41,11 +41,11 @@
 
                                                     <img :src="item2.src" alt="" />
 
                                                 </div>
 
                                             </div>
 
-                                            <span v-else v-html="item2"></span>
 
+                                            <span :class="typeof radio[index1] == 'number' && [radio[index1]==checkIndex?'showLight':'']" v-else v-html="item2"></span>
 
                                         </el-radio>
 
                                     </div>
 
                                 </el-radio-group>
 
-                                <el-checkbox-group v-model="radio[index1]" v-if="testJson.testJson[index1].type == '2'">
 
+                                <el-checkbox-group v-model="radio[index1]" v-if="testJson.testJson[index1].type == '2'" :disabled="videoType==1">
 
                                     <div class="radioBox">
 
                                         <el-checkbox v-for="(item2, checkIndex) in testJson.testJson[index1]
 
                                             .checkList" :key="checkIndex" :label="checkIndex"
 
@@ -56,7 +56,7 @@
 
                                                     <img :src="item2.src" alt="" />
 
                                                 </div>
 
                                             </div>
 
-                                            <span v-else v-html="item2"></span>
 
+                                            <span :class="radio[index1].length && [radio[index1].includes(checkIndex)?'showLight':'']" v-else v-html="item2"></span>
 
                                         </el-checkbox>
 
                                     </div>
 
                                 </el-checkbox-group>
 
@@ -90,7 +90,7 @@ export default {
 
             type: String,
 
         },
 
         courseType: {
 
-            type: String,
 
+            type: String || Number,
 
         },
 
         taskCount: {
 
             type: Number,
 
@@ -100,13 +100,19 @@ export default {
 
         },
 
         videoTime: {
 
             type: Number,
 
-        }
 
+        },
 
+				userChooseAnswer:{
 
+					type:Array,
 
+				},
 
+				videoType:{
 
+					type:Number,
 
+					default:0
 
+				}
 
     },
 
     data() {
 
         return {
 
             testJson: {},
 
             radio: []
 
-
 
         }
 
     },
 
     watch: {
 
@@ -120,6 +126,7 @@ export default {
 
                     this.radio.push("");
 
                 }
 
             }
 
+						
         }
 
     },
 
     methods: {
 
@@ -134,6 +141,14 @@ export default {
 
         previewImg(url) {
 
             this.$hevueImgPreview(url);
 
         },
 
+				setUserAnswer(userAnswer){
 
+					this.radio = userAnswer;
 
+					// if(userAnswer.find(i=>i.testJson[0].teststitle==this.testJson[0].teststitle)){
 
+					// 	console.log("有答案了")
 
+					// }else{
 
+					// 	console.log("没有答案")
 
+					// }
 
+				},
 
         addStudentTest() {
 
             if (!this.radio.length) {
 
                 this.$message.error("请选择选项");
 
@@ -148,6 +163,8 @@ export default {
 
                     return;
 
                 }
 
             }
 
+						this.videoType==0?this.$emit("success",{answer:this.radio,json:this.testJson}):'';
 
+
 
             this.close();
 
             // let askList = []
 
             // askList.push({ testJson: this.testJson, anwer: this.radio,type:8,tool:45 });
 
@@ -350,4 +367,8 @@ export default {
 
     height: 100%;
 
     object-fit: cover;
 
 }
 
+
 
+.showLight{
 
+	color: #0061FF !important;
 
+}
 
 </style>

+ 1 - 1
src/components/GM/studyStudentGM.vue
Dosyayı Görüntüle 

@@ -1278,7 +1278,7 @@
 
                       <div class="works" v-for="(w, wIndex) in worksStudent[toolIndex]" :key="wIndex">
 
                         <div class="workImg" style="
 
                             border-radius: 15px;
 
-                            box-shadow: #eee 0px 0px 5px 5px;
 
+                            box-shadow: 0px 0px 5px 5px #eee;
 
                           ">
 
                           <!-- <img
 
                             src="@/assets/icon/works/noImg.png"

+ 28 - 3
src/components/courseDetail.vue
Dosyayı Görüntüle 

@@ -190,14 +190,14 @@
 
                 </div> -->
 
               </div>
 
               <div
 
-                v-if="tType != 2"
 
+                v-if="tType != 2 && (classList.length || courseDetail.userid == userid)"
 
                 class="goToStudy"
 
                 @click="goToStudyOrDia(classList)"
 
               >
 
                 <div class="returnIndexImg">
 
                   <img src="../assets/icon/newIcon/people.png" alt="" />
 
                 </div>
 
-                <div>立即授课</div>
 
+                <div>以班级授课</div>
 
               </div>
 
             </div>
 
           </div>
 
@@ -1314,7 +1314,25 @@ export default {
 
       if (l.length > 0) {
 
         this.dialogVisibleSk = true;
 
       } else {
 
-        this.addUserRate(0);
 
+				this.getCourseDetail1().then(_=>{
 
+					if(this.classList.length<=0){
 
+						this.$confirm("该课程尚未指定授课班级，请放回首页，使用修改功能添加授课班级。","提示",{
 
+							confirmButtonText: '去修改',
 
+        		  cancelButtonText: '取消',
 
+							type:"error",
 
+						}).then(() => {
 
+							if(this.courseDetail.state == 1 || this.courseDetail.state == 2){
 
+								window.parent.postMessage({ tools: "openCourseUpdate",cid:this.id }, "*");
 
+							}else if(this.courseDetail.state == 3){
 
+								window.parent.postMessage({ tools: "openCourseEUpdate",cid:this.id }, "*");
 
+							}
 
+
 
+						})
 
+					}else{
 
+						this.dialogVisibleSk = true;
 
+					}
 
+        })
 
+        // this.addUserRate(0);
 
       }
 
     },
 
     goToStudyRate(i) {
 
@@ -2066,6 +2084,7 @@ export default {
 
 
 .returnIndexImg > img {
 
   width: 100%;
 
+	
 }
 
 
 .wheel {
 
@@ -3060,4 +3079,10 @@ export default {
 
   margin: 0 auto;
 
   cursor: pointer;
 
 }
 
+
 
+.confirmButtonClass{
 
+	background-color: #1463eb !important;
 
+	border-color: #1463eb !important;
 
+}
 
+
 
 </style>

+ 3 - 3
src/components/easy2/studyStudent jiu.vue
Dosyayı Görüntüle 

@@ -2130,7 +2130,7 @@
 
                         class="workImg"
 
                         style="
 
                           border-radius: 15px;
 
-                          box-shadow: #eee 0px 0px 5px 5px;
 
+                          box-shadow: 0px 0px 5px 5px #eee;
 
                         "
 
                       >
 
                         <!-- <img
 
@@ -4296,7 +4296,7 @@
 
                         class="workImg"
 
                         style="
 
                           border-radius: 15px;
 
-                          box-shadow: #eee 0px 0px 5px 5px;
 
+                          box-shadow: 0px 0px 5px 5px #eee;
 
                         "
 
                       >
 
                         <!-- <img
 
@@ -6632,7 +6632,7 @@
 
                         class="workImg"
 
                         style="
 
                           border-radius: 15px;
 
-                          box-shadow: #eee 0px 0px 5px 5px;
 
+                          box-shadow: 0px 0px 5px 5px #eee;
 
                         "
 
                       >
 
                         <!-- <img

+ 199 - 13
src/components/easy2/studyStudent.vue
Dosyayı Görüntüle 

@@ -1780,6 +1780,141 @@
 
                       </div> -->
 
                     </div>
 
                   </div>
 
+                  <div
 
+									v-if="
 
+                      tType &&
 
+                      ((tType == 2 && sIsOpen == true) ||
 
+                        tType == 1 ||
 
+                        tType == 4) &&
 
+                      tool.tool.indexOf(62) != -1
 
+                    "
 
+                    class="worksBox"
 
+                  >
 
+                    <div
 
+                      class="zuoyeYulan"
 
+                      v-if="
 
+                        worksStudent.length &&
 
+                        worksStudent[toolIndex].length > 0
 
+                      "
 
+                    >
 
+                      <div class="worksTop">
 
+                        <div>作业预览</div>
 
+                        <div
 
+                          class="corOpen"
 
+                          @click="contract(toolIndex)"
 
+                          v-if="
 
+                            (isCloseList[toolIndex].isCloseBoolean) &&
 
+                            isCloseList[toolIndex].isClose == 0
 
+                          "
 
+                        >
 
+                          折叠
 
+                        </div>
 
+                        <div
 
+                          class="corOpen"
 
+                          @click="contract(toolIndex)"
 
+                          v-if="isCloseList[toolIndex].isClose == 1"
 
+                        >
 
+                          展开
 
+                        </div>
 
+                      </div>
 
+                      <!-- <el-button type="text" @click="jump()" v-if="tType == 2" class="buttonA">我的评价</el-button> -->
 
+                    </div>
 
+                    <div>
 
+                      <div
 
+                        :id="'tool-' + toolIndex"
 
+                        :style="{
 
+                          height:isCloseList[toolIndex].isClose == 1 ? retrnToolHeight('tool-' + toolIndex) : 'auto',
 
+                          overflow: isCloseList[toolIndex].isClose == 1 ? 'hidden' : 'unset'
 
+                        }"
 
+                        class="worksDetailBox"
 
+                        v-if="
 
+                          worksStudent.length &&
 
+                          worksStudent[toolIndex].length > 0
 
+                        "
 
+                      >
 
+                        <div
 
+                          v-for="(w, wIndex) in worksStudent[toolIndex]"
 
+                          :key="wIndex"
 
+                          class="isWorksName2"
 
+                          @click="
 
+                            openTools(
 
+                              62,
 
+                              toolIndex,
 
+                              taskCount,
 
+                              w.works,
 
+                              w.sName
 
+                            )
 
+                          "
 
+                        >
 
+                          {{ w.sName }}
 
+                          <img
 
+                            class="deleteImg deleteImg2"
 
+                            src="../../assets/deleteworks.png"
 
+                            v-if="
 
+                              w.userid == userid || tType == 1 || tType == 4
 
+                            "
 
+                            @click.stop="deleteWorks(w.wid)"
 
+                            alt
 
+                          />
 
+                        </div>
 
+                      </div>
 
+                    </div>
 
+
 
+                    <div style="font-size: 18px" v-if="courseDetail.juri != ''">
 
+                      未提交
 
+                    </div>
 
+                    <div
 
+                      class="noWorksS"
 
+                      v-if="noWorksS && noWorksS[toolIndex].length"
 
+                    >
 
+                      <div
 
+                        v-for="(s, sIndex) in noWorksS[toolIndex]"
 
+                        :key="sIndex"
 
+                        class="noWorksName"
 
+                      >
 
+                        {{ s.student }}
 
+                      </div>
 
+                    </div>
 
+                  </div>
 
+									<div
 
+                    v-if="
 
+                      tType &&
 
+                      tType == 2 &&
 
+                      !sIsOpen &&
 
+                      tool.tool.indexOf(62) != -1
 
+                    "
 
+                    class="worksBox"
 
+                  >
 
+                    <div
 
+                      class="zuoyeYulan"
 
+                      v-if="workStudent[toolIndex].length > 0"
 
+                    >
 
+                      <span class="worksTitle">作业预览</span>
 
+                      <!-- <el-button type="text" @click="jump()" v-if="tType == 2" class="buttonA">我的评价</el-button> -->
 
+                    </div>
 
+                    <div
 
+                      class="worksDetailBox"
 
+                      v-if="workStudent[toolIndex].length > 0"
 
+                    >
 
+                      <div
 
+                        class="isWorksName2"
 
+                        v-for="(w, wIndex) in workStudent[toolIndex]"
 
+                        :key="wIndex"
 
+                        @click="
 
+                          openTools(62, toolIndex, taskCount, w.works, w.sName)
 
+                        "
 
+                      >
 
+                        {{ w.sName }}
 
+                        <img
 
+                          class="deleteImg deleteImg2"
 
+                          src="../../assets/deleteworks.png"
 
+                          v-if="w.userid == userid || tType == 1 || tType == 4"
 
+                          @click.stop="deleteWorks(w.wid)"
 
+                          alt
 
+                        />
 
+                      </div>
 
+                    </div>
 
+                  </div>
 
                   <div
 
                     v-if="
 
                       tType &&
 
@@ -4114,7 +4249,7 @@
 
                               class="workImg"
 
                               style="
 
                                 border-radius: 15px;
 
-                                box-shadow: #eee 0px 0px 5px 5px;
 
+                                box-shadow: 0px 0px 5px 5px #eee;
 
                               "
 
                             >
 
                               <div
 
@@ -4234,7 +4369,7 @@
 
                           class="workImg"
 
                           style="
 
                             border-radius: 15px;
 
-                            box-shadow: #eee 0px 0px 5px 5px;
 
+                            box-shadow: 0px 0px 5px 5px #eee;
 
                           "
 
                         >
 
                           <!-- <img
 
@@ -11625,6 +11760,7 @@
 
       :courseType="courseType"
 
       :taskCount="taskCount"
 
       :toolindex="toolindex"
 
+			:videoType="videoType"
 
     ></interVideo>
 
     <UpdateMore
 
       :dialogVisibleMember.sync="dialogVisibleMember"
 
@@ -12038,6 +12174,7 @@ export default {
 
         askJson: [{ askstitle: "", askItem: 1, checkList: [] }],
 
       },
 
       testJson: {},
 
+			videoType:0,
 
       checkJson: [],
 
       askList: [],
 
       answerList: [],
 
@@ -13727,6 +13864,18 @@ export default {
 
                     time: b[j].time,
 
                     userid: b[j].userid,
 
                     wid: b[j].id,
 
+                  });
 
+								} else if (b[j].type == 14 && a[i].tool[0] == 62) {
 
+                  //英语口语
 
+                  this.workStudent[i].push({
 
+                    works: b[j].content,
 
+                    sName: b[j].name,
 
+                    score: b[j].score,
 
+                    img: b[j].img,
 
+                    type: 14,
 
+                    time: b[j].time,
 
+                    userid: b[j].userid,
 
+                    wid: b[j].id,
 
                   });
 
                 }
 
               }
 
@@ -14831,6 +14980,26 @@ export default {
 
                   };
 
                   _worksStudent[i].push(_work);
 
                   _worksStudent2[i].push(_work);
 
+                  this.isWorksS[i].push({ uid: b[j].userid, sName: b[j].name });
 
+								} else if (b[j].type == 14 && a[i].tool[0] == 62) {
 
+                  //交互视频
 
+                  let _work = {
 
+                    userid: b[j].userid,
 
+                    ateacher: b[j].ateacher,
 
+                    wid: b[j].id,
 
+                    works: b[j].content,
 
+                    sName: b[j].name,
 
+                    type: 14,
 
+                    time: b[j].time,
 
+                    score: b[j].score,
 
+                    img: b[j].img,
 
+                    likesCount: likesCount,
 
+                    commentCount: commentCount,
 
+                    isLikes: isLikes,
 
+                    commentJson: commentJson,
 
+                  };
 
+                  _worksStudent[i].push(_work);
 
+                  _worksStudent2[i].push(_work);
 
                   this.isWorksS[i].push({ uid: b[j].userid, sName: b[j].name });
 
                 } else if (b[j].type == 11 && a[i].tool[0] == 49) {
 
                   let _gindex = JSON.parse(b[j].content);
 
@@ -15641,8 +15810,9 @@ export default {
 
               ) {
 
                 if (
 
                   this.courseDetail.userid != this.userid && 
-                  this.courseDetail.course_teacher &&
 
-                  this.courseDetail.course_teacher.indexOf(this.userid) == -1
 
+                  (!this.courseDetail.course_teacher ||
 
+                  (this.courseDetail.course_teacher &&
 
+                  this.courseDetail.course_teacher.indexOf(this.userid) == -1))
 
                 ) {
 
                   this.$message.error("任务未解锁");
 
                 } else {
 
@@ -15689,8 +15859,9 @@ export default {
 
               !this.chapInfoList[this.courseType].chapterInfo[0].taskJson[bbb]
 
                 .isLook &&
 
               this.courseDetail.userid != this.userid && 
-              this.courseDetail.course_teacher &&
 
-              this.courseDetail.course_teacher.indexOf(this.userid) == -1 &&
 
+              (!this.courseDetail.course_teacher ||
 
+          (this.courseDetail.course_teacher &&
 
+          this.courseDetail.course_teacher.indexOf(this.userid) == -1)) &&
 
               this.IsLookOpen
 
             ) {
 
               this.$message.error("任务未解锁");
 
@@ -15714,8 +15885,9 @@ export default {
 
             if (
 
               !this.chapInfoList[bbb].chapterInfo[0].taskJson[0].isLook &&
 
               this.courseDetail.userid != this.userid && 
-              this.courseDetail.course_teacher &&
 
-              this.courseDetail.course_teacher.indexOf(this.userid) == -1 &&
 
+              (!this.courseDetail.course_teacher ||
 
+          (this.courseDetail.course_teacher &&
 
+          this.courseDetail.course_teacher.indexOf(this.userid) == -1)) &&
 
               this.IsLookOpen
 
             ) {
 
               this.$message.error("任务未解锁");
 
@@ -15731,8 +15903,9 @@ export default {
 
               !this.chapInfoList[this.courseType].chapterInfo[0].taskJson[bbb]
 
                 .isLook &&
 
               this.courseDetail.userid != this.userid && 
-              this.courseDetail.course_teacher &&
 
-              this.courseDetail.course_teacher.indexOf(this.userid) == -1 &&
 
+              (!this.courseDetail.course_teacher ||
 
+          (this.courseDetail.course_teacher &&
 
+          this.courseDetail.course_teacher.indexOf(this.userid) == -1)) &&
 
               this.IsLookOpen
 
             ) {
 
               this.$message.error("任务未解锁");
 
@@ -15796,8 +15969,9 @@ export default {
 
         if (
 
           !this.chapInfoList[s].chapterInfo[0].taskJson[n].isLook &&
 
           this.courseDetail.userid != this.userid && 
-          this.courseDetail.course_teacher &&
 
-          this.courseDetail.course_teacher.indexOf(this.userid) == -1
 
+          (!this.courseDetail.course_teacher ||
 
+          (this.courseDetail.course_teacher &&
 
+          this.courseDetail.course_teacher.indexOf(this.userid) == -1))
 
         ) {
 
           this.$message.error("任务未解锁");
 
           return;
 
@@ -17492,6 +17666,15 @@ export default {
 
         this.newEnglishList = { engTitle:"",engText:"" }
 
         this.newEnglishList1 = []
 
         this.selectEngC(id,z);
 
+			}else if(t == 62){
 
+				this.videoType = 1;
 
+				this.videoJson = {};
 
+				this.videoJson = JSON.parse(c);
 
+				// this.videoJson =
 
+        //   this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
 
+        //     index
 
+        //   ].toolChoose[i].videoJson;
 
+				this.dialogVisibleVideo = true;
 
       }
 
       //  else if (t == 15) {
 
       //   this.answerQ = "";
 
@@ -18011,6 +18194,8 @@ export default {
 
         this.islock = this.groupJson.islock == 1 ? true : false;
 
         this.dialogVisibleGroup = true;
 
       } else if (t == 62) {
 
+				this.videoType = 0;
 
+				this.videoJson = {};
 
         this.videoJson =
 
           this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
 
             index
 
@@ -21311,9 +21496,10 @@ export default {
 
   min-width: 15px;
 
   width: 15px;
 
   height: 15px;
 
+  display: flex;
 
 }
 
 .lastText {
 
-  padding: 0 5px 2px 5px;
 
+  padding: 0 5px 0 5px;
 
   box-sizing: border-box;
 
   font-size: 14px;
 
 }

+ 3 - 3
src/components/easy3/studyStudent jiu.vue
Dosyayı Görüntüle 

@@ -2140,7 +2140,7 @@
 
                         class="workImg"
 
                         style="
 
                           border-radius: 15px;
 
-                          box-shadow: #eee 0px 0px 5px 5px;
 
+                          box-shadow: 0px 0px 5px 5px #eee;
 
                         "
 
                       >
 
                         <!-- <img
 
@@ -4306,7 +4306,7 @@
 
                         class="workImg"
 
                         style="
 
                           border-radius: 15px;
 
-                          box-shadow: #eee 0px 0px 5px 5px;
 
+                          box-shadow: 0px 0px 5px 5px #eee;
 
                         "
 
                       >
 
                         <!-- <img
 
@@ -6641,7 +6641,7 @@
 
                         class="workImg"
 
                         style="
 
                           border-radius: 15px;
 
-                          box-shadow: #eee 0px 0px 5px 5px;
 
+                          box-shadow: 0px 0px 5px 5px #eee;
 
                         "
 
                       >
 
                         <!-- <img

+ 200 - 13
src/components/easy3/studyStudent.vue
Dosyayı Görüntüle 

@@ -1767,6 +1767,141 @@
 
                       </div> -->
 
                     </div>
 
                   </div>
 
+                  <div
 
+									v-if="
 
+                      tType &&
 
+                      ((tType == 2 && sIsOpen == true) ||
 
+                        tType == 1 ||
 
+                        tType == 4) &&
 
+                      tool.tool.indexOf(62) != -1
 
+                    "
 
+                    class="worksBox"
 
+                  >
 
+                    <div
 
+                      class="zuoyeYulan"
 
+                      v-if="
 
+                        worksStudent.length &&
 
+                        worksStudent[toolIndex].length > 0
 
+                      "
 
+                    >
 
+                      <div class="worksTop">
 
+                        <div>作业预览</div>
 
+                        <div
 
+                          class="corOpen"
 
+                          @click="contract(toolIndex)"
 
+                          v-if="
 
+                            (isCloseList[toolIndex].isCloseBoolean) &&
 
+                            isCloseList[toolIndex].isClose == 0
 
+                          "
 
+                        >
 
+                          折叠
 
+                        </div>
 
+                        <div
 
+                          class="corOpen"
 
+                          @click="contract(toolIndex)"
 
+                          v-if="isCloseList[toolIndex].isClose == 1"
 
+                        >
 
+                          展开
 
+                        </div>
 
+                      </div>
 
+                      <!-- <el-button type="text" @click="jump()" v-if="tType == 2" class="buttonA">我的评价</el-button> -->
 
+                    </div>
 
+                    <div>
 
+                      <div
 
+                        :id="'tool-' + toolIndex"
 
+                        :style="{
 
+                          height:isCloseList[toolIndex].isClose == 1 ? retrnToolHeight('tool-' + toolIndex) : 'auto',
 
+                          overflow: isCloseList[toolIndex].isClose == 1 ? 'hidden' : 'unset'
 
+                        }"
 
+                        class="worksDetailBox"
 
+                        v-if="
 
+                          worksStudent.length &&
 
+                          worksStudent[toolIndex].length > 0
 
+                        "
 
+                      >
 
+                        <div
 
+                          v-for="(w, wIndex) in worksStudent[toolIndex]"
 
+                          :key="wIndex"
 
+                          class="isWorksName2"
 
+                          @click="
 
+                            openTools(
 
+                              62,
 
+                              toolIndex,
 
+                              taskCount,
 
+                              w.works,
 
+                              w.sName
 
+                            )
 
+                          "
 
+                        >
 
+                          {{ w.sName }}
 
+                          <img
 
+                            class="deleteImg deleteImg2"
 
+                            src="../../assets/deleteworks.png"
 
+                            v-if="
 
+                              w.userid == userid || tType == 1 || tType == 4
 
+                            "
 
+                            @click.stop="deleteWorks(w.wid)"
 
+                            alt
 
+                          />
 
+                        </div>
 
+                      </div>
 
+                    </div>
 
+
 
+                    <div style="font-size: 18px" v-if="courseDetail.juri != ''">
 
+                      未提交
 
+                    </div>
 
+                    <div
 
+                      class="noWorksS"
 
+                      v-if="noWorksS && noWorksS[toolIndex].length"
 
+                    >
 
+                      <div
 
+                        v-for="(s, sIndex) in noWorksS[toolIndex]"
 
+                        :key="sIndex"
 
+                        class="noWorksName"
 
+                      >
 
+                        {{ s.student }}
 
+                      </div>
 
+                    </div>
 
+                  </div>
 
+									<div
 
+                    v-if="
 
+                      tType &&
 
+                      tType == 2 &&
 
+                      !sIsOpen &&
 
+                      tool.tool.indexOf(62) != -1
 
+                    "
 
+                    class="worksBox"
 
+                  >
 
+                    <div
 
+                      class="zuoyeYulan"
 
+                      v-if="workStudent[toolIndex].length > 0"
 
+                    >
 
+                      <span class="worksTitle">作业预览</span>
 
+                      <!-- <el-button type="text" @click="jump()" v-if="tType == 2" class="buttonA">我的评价</el-button> -->
 
+                    </div>
 
+                    <div
 
+                      class="worksDetailBox"
 
+                      v-if="workStudent[toolIndex].length > 0"
 
+                    >
 
+                      <div
 
+                        class="isWorksName2"
 
+                        v-for="(w, wIndex) in workStudent[toolIndex]"
 
+                        :key="wIndex"
 
+                        @click="
 
+                          openTools(62, toolIndex, taskCount, w.works, w.sName)
 
+                        "
 
+                      >
 
+                        {{ w.sName }}
 
+                        <img
 
+                          class="deleteImg deleteImg2"
 
+                          src="../../assets/deleteworks.png"
 
+                          v-if="w.userid == userid || tType == 1 || tType == 4"
 
+                          @click.stop="deleteWorks(w.wid)"
 
+                          alt
 
+                        />
 
+                      </div>
 
+                    </div>
 
+                  </div>
 
                   <div
 
                     v-if="
 
                       tType &&
 
@@ -4101,7 +4236,7 @@
 
                               class="workImg"
 
                               style="
 
                                 border-radius: 15px;
 
-                                box-shadow: #eee 0px 0px 5px 5px;
 
+                                box-shadow: 0px 0px 5px 5px #eee;
 
                               "
 
                             >
 
                               <div
 
@@ -4221,7 +4356,7 @@
 
                           class="workImg"
 
                           style="
 
                             border-radius: 15px;
 
-                            box-shadow: #eee 0px 0px 5px 5px;
 
+                            box-shadow: 0px 0px 5px 5px #eee;
 
                           "
 
                         >
 
                           <!-- <img
 
@@ -11613,6 +11748,7 @@
 
       :courseType="courseType"
 
       :taskCount="taskCount"
 
       :toolindex="toolindex"
 
+			:videoType="videoType"
 
     ></interVideo>
 
     <UpdateMore
 
       :dialogVisibleMember.sync="dialogVisibleMember"
 
@@ -12108,6 +12244,7 @@ export default {
 
         16, 32, 57, 4, 45, 15, 1, 3, 6, 7, 26, 41, 47, 48, 52, 50, 40,
 
       ], //, 40
 
       videoJson: {},
 
+			videoType:0,
 
       toolType: 0,
 
       checktoolArray: [],
 
       vChapterData: [],
 
@@ -13717,6 +13854,18 @@ export default {
 
                     time: b[j].time,
 
                     userid: b[j].userid,
 
                     wid: b[j].id,
 
+                  });
 
+								} else if (b[j].type == 14 && a[i].tool[0] == 62) {
 
+                  //交互视频
 
+                  this.workStudent[i].push({
 
+                    works: b[j].content,
 
+                    sName: b[j].name,
 
+                    score: b[j].score,
 
+                    img: b[j].img,
 
+                    type: 14,
 
+                    time: b[j].time,
 
+                    userid: b[j].userid,
 
+                    wid: b[j].id,
 
                   });
 
                 }
 
               }
 
@@ -14843,6 +14992,26 @@ export default {
 
                   };
 
                   _worksStudent[i].push(_work);
 
                   _worksStudent2[i].push(_work);
 
+                  this.isWorksS[i].push({ uid: b[j].userid, sName: b[j].name });
 
+								} else if (b[j].type == 14 && a[i].tool[0] == 62) {
 
+                  //交互视频
 
+                  let _work = {
 
+                    userid: b[j].userid,
 
+                    ateacher: b[j].ateacher,
 
+                    wid: b[j].id,
 
+                    works: b[j].content,
 
+                    sName: b[j].name,
 
+                    type: 14,
 
+                    time: b[j].time,
 
+                    score: b[j].score,
 
+                    img: b[j].img,
 
+                    likesCount: likesCount,
 
+                    commentCount: commentCount,
 
+                    isLikes: isLikes,
 
+                    commentJson: commentJson,
 
+                  };
 
+                  _worksStudent[i].push(_work);
 
+                  _worksStudent2[i].push(_work);
 
                   this.isWorksS[i].push({ uid: b[j].userid, sName: b[j].name });
 
                 } else if (b[j].type == 11 && a[i].tool[0] == 49) {
 
                   let _gindex = JSON.parse(b[j].content);
 
@@ -15653,8 +15822,9 @@ export default {
 
               ) {
 
                 if (
 
                   this.courseDetail.userid != this.userid && 
-                  this.courseDetail.course_teacher && 
-                  this.courseDetail.course_teacher.indexOf(this.userid) == -1
 
+                  (!this.courseDetail.course_teacher ||
 
+          (this.courseDetail.course_teacher &&
 
+          this.courseDetail.course_teacher.indexOf(this.userid) == -1))
 
                 ) {
 
                   this.$message.error("任务未解锁");
 
                 } else {
 
@@ -15701,8 +15871,9 @@ export default {
 
               !this.chapInfoList[this.courseType].chapterInfo[0].taskJson[bbb]
 
                 .isLook &&
 
               this.courseDetail.userid != this.userid && 
-              this.courseDetail.course_teacher &&
 
-              this.courseDetail.course_teacher.indexOf(this.userid) == -1 &&
 
+              (!this.courseDetail.course_teacher ||
 
+          (this.courseDetail.course_teacher &&
 
+          this.courseDetail.course_teacher.indexOf(this.userid) == -1)) &&
 
               this.IsLookOpen
 
             ) {
 
               this.$message.error("任务未解锁");
 
@@ -15726,8 +15897,9 @@ export default {
 
             if (
 
               !this.chapInfoList[bbb].chapterInfo[0].taskJson[0].isLook &&
 
               this.courseDetail.userid != this.userid && 
-              this.courseDetail.course_teacher &&
 
-              this.courseDetail.course_teacher.indexOf(this.userid) == -1 &&
 
+              (!this.courseDetail.course_teacher ||
 
+          (this.courseDetail.course_teacher &&
 
+          this.courseDetail.course_teacher.indexOf(this.userid) == -1)) &&
 
               this.IsLookOpen
 
             ) {
 
               this.$message.error("任务未解锁");
 
@@ -15743,8 +15915,9 @@ export default {
 
               !this.chapInfoList[this.courseType].chapterInfo[0].taskJson[bbb]
 
                 .isLook &&
 
               this.courseDetail.userid != this.userid && 
-              this.courseDetail.course_teacher &&
 
-              this.courseDetail.course_teacher.indexOf(this.userid) == -1 &&
 
+              (!this.courseDetail.course_teacher ||
 
+          (this.courseDetail.course_teacher &&
 
+          this.courseDetail.course_teacher.indexOf(this.userid) == -1)) &&
 
               this.IsLookOpen
 
             ) {
 
               this.$message.error("任务未解锁");
 
@@ -15808,8 +15981,9 @@ export default {
 
         if (
 
           !this.chapInfoList[s].chapterInfo[0].taskJson[n].isLook &&
 
           this.courseDetail.userid != this.userid && 
-          this.courseDetail.course_teacher &&
 
-          this.courseDetail.course_teacher.indexOf(this.userid) == -1
 
+          (!this.courseDetail.course_teacher ||
 
+          (this.courseDetail.course_teacher &&
 
+          this.courseDetail.course_teacher.indexOf(this.userid) == -1))
 
         ) {
 
           this.$message.error("任务未解锁");
 
           return;
 
@@ -17508,6 +17682,16 @@ export default {
 
         this.newEnglishList = { engTitle:"",engText:"" }
 
         this.newEnglishList1 = []
 
         this.selectEngC(id,z);
 
+			}else if(t == 62){
 
+				this.videoType = 1;
 
+				this.videoJson = {};
 
+				this.videoJson = JSON.parse(c);
 
+				// this.videoJson =
 
+        //   this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
 
+        //     index
 
+        //   ].toolChoose[i].videoJson;
 
+				this.dialogVisibleVideo = true;
 
+				
       }
 
       //  else if (t == 15) {
 
       //   this.answerQ = "";
 
@@ -18027,6 +18211,8 @@ export default {
 
         this.islock = this.groupJson.islock == 1 ? true : false;
 
         this.dialogVisibleGroup = true;
 
       } else if (t == 62) {
 
+				this.videoType = 0;
 
+				this.videoJson = {};
 
         this.videoJson =
 
           this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
 
             index
 
@@ -21325,9 +21511,10 @@ export default {
 
   min-width: 15px;
 
   width: 15px;
 
   height: 15px;
 
+  display: flex;
 
 }
 
 .lastText {
 
-  padding: 0 5px 2px 5px;
 
+  padding: 0 5px 0 5px;
 
   box-sizing: border-box;
 
   font-size: 14px;
 
 }

+ 201 - 3
src/components/interVideo/index.vue
Dosyayı Görüntüle 

@@ -6,15 +6,34 @@
 
                 <div class="videoBox">
 
                     <video-player class="video-player vjs-custom-skin" ref="videoPlayer" :playsinline="true"
 
                         :options="playerO" v-if="this.json.video" @timeupdate="onPlayerTimeupdate($event)"></video-player>
 
+										
+										<div class="chooseNodeBox">
 
+											<div class="chooseNodeItem" v-for="(item,index) in json.setting" @click.stop="chooseNode(item)">
 
+												<!-- <div v-if="userChooseAnswer.find(i=>i.testJson[0].teststitle==item.tool.toolJson.testJson[0].teststitle)" class="el-icon-circle-check"></div> -->
 
+												<div v-if="userChooseAnswer[index]" class="el-icon-circle-check"></div>
 
+												<div v-else>{{ index+1 }}</div>
 
+											</div>
 
+										</div>
 
                 </div>
 
+								<div class="accuracy" v-if="accuracyList.length>0">
 
+									<span>准确率：</span>
 
+									<div class="accuracyItem" v-for="(item,index) in accuracyList">
 
+										<div class="accuracyTitle">第 {{ index+1 }} 题：</div>
 
+										<div class="accuracyValue">正确率{{item}}%</div>
 
+									</div>
 
+								</div>
 
             </div>
 
+						
             <span slot="footer" class="dialog-footer">
 
                 <el-button @click="close">关 闭</el-button>
 
+								<el-button @click.stop="submitBtn" type="primary">确认</el-button>
 
             </span>
 
         </el-dialog>
 
         <choiceD 
+				ref="choiceD"
 
         :dialogVisibleChoice.sync="dialogVisibleChoice" 
-        :json="toolJson" 
+        :json="toolJson"
 
+				:userChooseAnswer:="userChooseAnswer"
 
         @play="gotoPlay"
 
         :userid="userid"
 
         :id="id"
 
@@ -22,6 +41,8 @@
 
         :taskCount="taskCount"
 
         :toolindex="toolindex"
 
         :videoTime="stopTime"
 
+				:videoType="videoType"
 
+				@success="choiceAnswer"
 
         ></choiceD>
 
     </div>
 
 </template>
 
@@ -30,6 +51,7 @@
 
 import choiceD from '../Choice/index.vue'
 
 
 export default {
 
+		emits:['success'],
 
     props: {
 
         dialogVisibleVideo: {
 
             type: Boolean,
 
@@ -45,14 +67,18 @@ export default {
 
             type: String,
 
         },
 
         courseType: {
 
-            type: String,
 
+            type: String || Number,
 
         },
 
         taskCount: {
 
             type: Number,
 
         },
 
         toolindex: {
 
             type: Number,
 
-        }
 
+        },
 
+				videoType:{
 
+					type:Number,
 
+					default:0
 
+				}
 
     },
 
     components: {
 
         choiceD,
 
@@ -60,6 +86,8 @@ export default {
 
     data() {
 
         return {
 
             json: {},
 
+						userChooseAnswer:[],
 
+						accuracyList:[],
 
             playerOptions: {
 
                 playbackRates: [0.7, 1.0, 1.5, 2.0], //播放速度
 
                 autoplay: false, //如果true,浏览器准备好时开始回放。
 
@@ -98,12 +126,15 @@ export default {
 
             if (this.json.video) {
 
                 this.playerO = JSON.parse(JSON.stringify(this.playerOptions));
 
                 this.playerO.sources[0].src = this.json.video
 
+								this.videoType==1?this.userChooseAnswer = this.json.setting.map(i=>i.tool.toolJson):[];
 
+								this.getAccuracyList();
 
                 this.$nextTick(() => {
 
                     setTimeout(() => {
 
                         this.videoTime = Math.round(this.$refs['videoPlayer'].player.cache_.duration)
 
                     }, 500)
 
                 })
 
             }
 
+						if(!newValue)this.json = [];
 
         }
 
     },
 
     methods: {
 
@@ -124,6 +155,10 @@ export default {
 
                     if (this.json.setting[i].tool.tool == 45) {
 
                         this.dialogVisibleChoice = true
 
                         this.toolJson = this.json.setting[i].tool.toolJson
 
+												let answerIndex = this.json.setting.findIndex(i=>JSON.stringify(i.tool.toolJson)==JSON.stringify(this.toolJson))
 
+												if(answerIndex!=-1 && this.userChooseAnswer[answerIndex]){
 
+													this.$refs['choiceD'].setUserAnswer(this.userChooseAnswer[answerIndex].testJson.map(i=>i.answer2))
 
+												}
 
                     }
 
                 }
 
             }
 
@@ -134,6 +169,92 @@ export default {
 
             this.$refs['videoPlayer'].player.currentTime(this.stopTime + 1)
 
             this.$refs['videoPlayer'].player.play()
 
         },
 
+				// 点击了节点
 
+				chooseNode(setting){
 
+					this.$refs['videoPlayer'].player.currentTime(setting.time)
 
+					this.stopTime = setting.time;
 
+          this.$refs['videoPlayer'].player.pause()
 
+          if (setting.tool.tool == 45) {
 
+              this.dialogVisibleChoice = true
 
+              this.toolJson = setting.tool.toolJson
 
+							let answerIndex = this.json.setting.findIndex(i=>JSON.stringify(i.tool.toolJson)==JSON.stringify(this.toolJson))
 
+							if(answerIndex!=-1 && this.userChooseAnswer[answerIndex]){
 
+								this.$refs['choiceD'].setUserAnswer(this.userChooseAnswer[answerIndex].testJson.map(i=>i.answer2))
 
+							}
 
+          }
 
+				},
 
+				// 选择答案并且确定
 
+				choiceAnswer(data){
 
+					let answer = data.answer;
 
+					let testJson = data.json;
 
+					let changeIndex = this.json.setting.findIndex(i=>JSON.stringify(i.tool.toolJson)==JSON.stringify(testJson))
 
+					if(changeIndex!=-1){
 
+						testJson.testJson.forEach((i,index)=>{
 
+							i.answer2 = answer[index];
 
+						})
 
+						this.userChooseAnswer[changeIndex] = testJson;
 
+					}
 
+					this.getAccuracyList();
 
+				},
 
+				getAccuracyList(){
 
+					if(this.userChooseAnswer.length<0)return;
 
+					let score = [];
 
+					this.json.setting.forEach((item,index)=>{
 
+						if(this.userChooseAnswer[index]){
 
+							let count = 0;
 
+							let type = item.tool.toolJson.testJson.map(i=>i.type)
 
+							let userAnswer = this.userChooseAnswer[index].testJson.map(i=>i.answer2);
 
+							let rightAnswer = this.userChooseAnswer[index].testJson.map(i=>i.answer);
 
+							let num = item.tool.toolJson.testJson.length;
 
+
 
+							userAnswer.forEach((item2,index2)=>{
 
+								if(type[index2]=='2'){
 
+									if(JSON.stringify(userAnswer[index2].sort((a,b)=>a-b))==JSON.stringify(rightAnswer[index2].sort((a,b)=>a-b))){
 
+										count++
 
+									}
 
+								}else if(type[index2]=='1'){
 
+									if(userAnswer[index2]==rightAnswer[index2]){
 
+										count++;
 
+									}
 
+								}
 
+							})
 
+
 
+							score.push((count/num).toFixed(2)*100)
 
+						}else{
 
+							score.push(0)
 
+						}
 
+					})
 
+					this.accuracyList = score;
 
+					this.$forceUpdate();
 
+				},
 
+				submitBtn(){
 
+					if(this.videoType==1)return this.close();
 
+					if(this.userChooseAnswer<this.json.setting.length)return this.$message.info("请答题");
 
+					let data = this.json;
 
+					data.setting.forEach((i,index)=>i.tool.toolJson = this.userChooseAnswer[index])
 
+					let params = [{
 
+						uid:this.userid,
 
+						cid:this.id,
 
+						stage:this.courseType,
 
+						task:this.taskCount,
 
+						tool:this.toolindex,
 
+						content:encodeURIComponent(JSON.stringify(data)),
 
+						type:14,
 
+						atool:62,
 
+						text:"",
 
+					}]
 
+					// return;
 
+					this.ajax
 
+        	.post(this.$store.state.api + "addCourseWorks5", params)
 
+        	.then((res) => {
 
+        	  this.$message.success("提交成功");
 
+        	  this.close();
 
+        	})
 
+        	.catch((err) => {
 
+        	  this.$message.error("提交失败");
 
+        	  console.error(err);
 
+        	});
 
+				},
 
     },
 
     mounted() {
 
         this.json = JSON.parse(JSON.stringify(this.videoJson));
 
@@ -185,6 +306,35 @@ export default {
 
     position: relative;
 
 }
 
 
+.chooseNodeBox{
 
+	width: auto;
 
+	height:50px;
 
+	position:absolute;
 
+	bottom:45px;
 
+	left:50%;
 
+	transform:translateX(-50%);
 
+	display:flex;
 
+	justify-content: center;
 
+	align-items: center;
 
+	background-color: none;
 
+}
 
+
 
+.chooseNodeBox>.chooseNodeItem{
 
+	width: 40px;
 
+	height: 40px;
 
+	background: black;
 
+	margin: 0 10px;
 
+	border-radius: 50%;
 
+	cursor: pointer;
 
+	z-index: 9;
 
+	display: flex;
 
+	justify-content: center;
 
+	align-items: center;
 
+	color: white;
 
+	font-size: 1.5em;
 
+	font-weight: bold;
 
+}
 
+
 
 .videoBox>.content {
 
     /* position: absolute; */
 
     line-height: 600px;
 
@@ -202,4 +352,52 @@ export default {
 
     padding: 0 !important;
 
     height: 100%;
 
 }
 
+
 
+.accuracy{
 
+	width: 300px;
 
+	height: auto;
 
+	background-color: #d4dde1;
 
+	border-radius: 5px;
 
+	margin: 10px 0;
 
+	box-sizing: border-box;
 
+	padding: 10px;
 
+}
 
+
 
+.accuracy>span{
 
+	font-size: 22px;
 
+	font-weight: bold;
 
+	margin: 10px 0;
 
+}
 
+
 
+.accuracy>.accuracyItem{
 
+	width: 100%;
 
+	height: 40px;
 
+	margin-top: 10px;
 
+	display: flex;
 
+	align-items: center;
 
+}
 
+
 
+.accuracyItem>.accuracyTitle{
 
+	width: 120px;
 
+	height: 100%;
 
+	display: flex;
 
+	justify-content: center;
 
+	align-items: center;
 
+	font-weight: bold;
 
+	font-size:1.3em;
 
+	background-color: #2c2f3b;
 
+	color: white;
 
+	border-radius: 5px;
 
+}
 
+
 
+.accuracyItem>.accuracyValue{
 
+	width:120px;
 
+	margin-left: 20px;
 
+	font-size: 16px;
 
+	box-sizing: border-box;
 
+	padding: 5px;
 
+	border-radius: 5px;
 
+	border:solid 1px #0061FF;
 
+	color:#0061FF;
 
+}
 
 </style>

+ 2 - 2
src/components/noTerminal/studyStudent.vue
Dosyayı Görüntüle 

@@ -1155,7 +1155,7 @@
 
                     <div class="works" v-for="(w, wIndex) in worksTeacher[toolIndex]" :key="wIndex">
 
                       <div class="workImg" style="
 
                                                                 border-radius: 15px;
 
-                                                                box-shadow: #eee 0px 0px 5px 5px;
 
+                                                                box-shadow: 0px 0px 5px 5px #eee;
 
                                                               ">
 
                         <!-- <img
 
                             src="../../assets/icon/works/noImg.png"
 
@@ -2472,7 +2472,7 @@
 
                       : worksStudent2[toolIndex].slice(0, 6)" :key="wIndex">
 
                       <div class="workImg" style="
 
                                                                 border-radius: 15px;
 
-                                                                box-shadow: #eee 0px 0px 5px 5px;
 
+                                                                box-shadow: 0px 0px 5px 5px #eee;
 
                                                               ">
 
                         <!-- <img
 
                             src="../../assets/icon/works/noImg.png"

+ 2 - 1
src/components/student/studyStudent.vue
Dosyayı Görüntüle 

@@ -5489,9 +5489,10 @@ export default {
 
   min-width: 15px;
 
   width: 15px;
 
   height: 15px;
 
+  display: flex;
 
 }
 
 .lastText {
 
-  padding: 0 5px 2px 5px;
 
+  padding: 0 5px 0 5px;
 
   box-sizing: border-box;
 
   font-size: 14px;
 
 }

+ 202 - 14
src/components/studyStudent.vue
Dosyayı Görüntüle 

@@ -1775,6 +1775,141 @@
 
                         </div>
 
                       </div> -->
 
                     </div>
 
+                  </div>
 
+									<div
 
+                    v-if="
 
+                      tType &&
 
+                      ((tType == 2 && sIsOpen == true) ||
 
+                        tType == 1 ||
 
+                        tType == 4) &&
 
+                      tool.tool.indexOf(62) != -1
 
+                    "
 
+                    class="worksBox"
 
+                  >
 
+                    <div
 
+                      class="zuoyeYulan"
 
+                      v-if="
 
+                        worksStudent.length &&
 
+                        worksStudent[toolIndex].length > 0
 
+                      "
 
+                    >
 
+                      <div class="worksTop">
 
+                        <div>作业预览</div>
 
+                        <div
 
+                          class="corOpen"
 
+                          @click="contract(toolIndex)"
 
+                          v-if="
 
+                            (isCloseList[toolIndex].isCloseBoolean) &&
 
+                            isCloseList[toolIndex].isClose == 0
 
+                          "
 
+                        >
 
+                          折叠
 
+                        </div>
 
+                        <div
 
+                          class="corOpen"
 
+                          @click="contract(toolIndex)"
 
+                          v-if="isCloseList[toolIndex].isClose == 1"
 
+                        >
 
+                          展开
 
+                        </div>
 
+                      </div>
 
+                      <!-- <el-button type="text" @click="jump()" v-if="tType == 2" class="buttonA">我的评价</el-button> -->
 
+                    </div>
 
+                    <div>
 
+                      <div
 
+                        :id="'tool-' + toolIndex"
 
+                        :style="{
 
+                          height:isCloseList[toolIndex].isClose == 1 ? retrnToolHeight('tool-' + toolIndex) : 'auto',
 
+                          overflow: isCloseList[toolIndex].isClose == 1 ? 'hidden' : 'unset'
 
+                        }"
 
+                        class="worksDetailBox"
 
+                        v-if="
 
+                          worksStudent.length &&
 
+                          worksStudent[toolIndex].length > 0
 
+                        "
 
+                      >
 
+                        <div
 
+                          v-for="(w, wIndex) in worksStudent[toolIndex]"
 
+                          :key="wIndex"
 
+                          class="isWorksName2"
 
+                          @click="
 
+                            openTools(
 
+                              62,
 
+                              toolIndex,
 
+                              taskCount,
 
+                              w.works,
 
+                              w.sName
 
+                            )
 
+                          "
 
+                        >
 
+                          {{ w.sName }}
 
+                          <img
 
+                            class="deleteImg deleteImg2"
 
+                            src="../assets/deleteworks.png"
 
+                            v-if="
 
+                              w.userid == userid || tType == 1 || tType == 4
 
+                            "
 
+                            @click.stop="deleteWorks(w.wid)"
 
+                            alt
 
+                          />
 
+                        </div>
 
+                      </div>
 
+                    </div>
 
+
 
+                    <div style="font-size: 18px" v-if="courseDetail.juri != ''">
 
+                      未提交
 
+                    </div>
 
+                    <div
 
+                      class="noWorksS"
 
+                      v-if="noWorksS && noWorksS[toolIndex].length"
 
+                    >
 
+                      <div
 
+                        v-for="(s, sIndex) in noWorksS[toolIndex]"
 
+                        :key="sIndex"
 
+                        class="noWorksName"
 
+                      >
 
+                        {{ s.student }}
 
+                      </div>
 
+                    </div>
 
+                  </div>
 
+									<div
 
+                    v-if="
 
+                      tType &&
 
+                      tType == 2 &&
 
+                      !sIsOpen &&
 
+                      tool.tool.indexOf(62) != -1
 
+                    "
 
+                    class="worksBox"
 
+                  >
 
+                    <div
 
+                      class="zuoyeYulan"
 
+                      v-if="workStudent[toolIndex].length > 0"
 
+                    >
 
+                      <span class="worksTitle">作业预览</span>
 
+                      <!-- <el-button type="text" @click="jump()" v-if="tType == 2" class="buttonA">我的评价</el-button> -->
 
+                    </div>
 
+                    <div
 
+                      class="worksDetailBox"
 
+                      v-if="workStudent[toolIndex].length > 0"
 
+                    >
 
+                      <div
 
+                        class="isWorksName2"
 
+                        v-for="(w, wIndex) in workStudent[toolIndex]"
 
+                        :key="wIndex"
 
+                        @click="
 
+                          openTools(62, toolIndex, taskCount, w.works, w.sName)
 
+                        "
 
+                      >
 
+                        {{ w.sName }}
 
+                        <img
 
+                          class="deleteImg deleteImg2"
 
+                          src="../assets/deleteworks.png"
 
+                          v-if="w.userid == userid || tType == 1 || tType == 4"
 
+                          @click.stop="deleteWorks(w.wid)"
 
+                          alt
 
+                        />
 
+                      </div>
 
+                    </div>
 
                   </div>
 
                   <div
 
                     v-if="
 
@@ -4110,7 +4245,7 @@
 
                               class="workImg"
 
                               style="
 
                                 border-radius: 15px;
 
-                                box-shadow: #eee 0px 0px 5px 5px;
 
+                                box-shadow: 0px 0px 5px 5px #eee;
 
                               "
 
                             >
 
                               <div
 
@@ -4230,7 +4365,7 @@
 
                           class="workImg"
 
                           style="
 
                             border-radius: 15px;
 
-                            box-shadow: #eee 0px 0px 5px 5px;
 
+                            box-shadow: 0px 0px 5px 5px #eee;
 
                           "
 
                         >
 
                           <!-- <img
 
@@ -11598,6 +11733,7 @@
 
       :courseType="courseType"
 
       :taskCount="taskCount"
 
       :toolindex="toolindex"
 
+			:videoType="videoType"
 
     ></interVideo>
 
     <UpdateMore
 
       :dialogVisibleMember.sync="dialogVisibleMember"
 
@@ -12007,6 +12143,7 @@ export default {
 
         askJson: [{ askstitle: "", askItem: 1, checkList: [] }],
 
       },
 
       testJson: {},
 
+			videoType:0,
 
       checkJson: [],
 
       askList: [],
 
       answerList: [],
 
@@ -13699,6 +13836,18 @@ export default {
 
                     userid: b[j].userid,
 
                     wid: b[j].id,
 
                   });
 
+                } else if (b[j].type == 14 && a[i].tool[0] == 62) {
 
+                  //英语口语
 
+                  this.workStudent[i].push({
 
+                    works: b[j].content,
 
+                    sName: b[j].name,
 
+                    score: b[j].score,
 
+                    img: b[j].img,
 
+                    type: 14,
 
+                    time: b[j].time,
 
+                    userid: b[j].userid,
 
+                    wid: b[j].id,
 
+                  });
 
                 }
 
               }
 
             }
 
@@ -14825,6 +14974,26 @@ export default {
 
                   _worksStudent[i].push(_work);
 
                   _worksStudent2[i].push(_work);
 
                   this.isWorksS[i].push({ uid: b[j].userid, sName: b[j].name });
 
+                } else if (b[j].type == 14 && a[i].tool[0] == 62) {
 
+                  //交互视频
 
+                  let _work = {
 
+                    userid: b[j].userid,
 
+                    ateacher: b[j].ateacher,
 
+                    wid: b[j].id,
 
+                    works: b[j].content,
 
+                    sName: b[j].name,
 
+                    type: 14,
 
+                    time: b[j].time,
 
+                    score: b[j].score,
 
+                    img: b[j].img,
 
+                    likesCount: likesCount,
 
+                    commentCount: commentCount,
 
+                    isLikes: isLikes,
 
+                    commentJson: commentJson,
 
+                  };
 
+                  _worksStudent[i].push(_work);
 
+                  _worksStudent2[i].push(_work);
 
+                  this.isWorksS[i].push({ uid: b[j].userid, sName: b[j].name });
 
                 } else if (b[j].type == 11 && a[i].tool[0] == 49) {
 
                   let _gindex = JSON.parse(b[j].content);
 
                   if (
 
@@ -15634,8 +15803,9 @@ export default {
 
               ) {
 
                 if (
 
                   this.courseDetail.userid != this.userid && 
-                  this.courseDetail.course_teacher &&
 
-                  this.courseDetail.course_teacher.indexOf(this.userid) == -1
 
+                  (!this.courseDetail.course_teacher ||
 
+                  (this.courseDetail.course_teacher &&
 
+                  this.courseDetail.course_teacher.indexOf(this.userid) == -1))
 
                 ) {
 
                   this.$message.error("任务未解锁");
 
                 } else {
 
@@ -15681,8 +15851,9 @@ export default {
 
             if (
 
               !this.chapInfoList[this.courseType].chapterInfo[0].taskJson[bbb]
 
                 .isLook &&
 
-              this.courseDetail.userid != this.userid && this.courseDetail.course_teacher &&
 
-              this.courseDetail.course_teacher.indexOf(this.userid) == -1 &&
 
+              this.courseDetail.userid != this.userid && (!this.courseDetail.course_teacher ||
 
+          (this.courseDetail.course_teacher &&
 
+          this.courseDetail.course_teacher.indexOf(this.userid) == -1)) &&
 
               this.IsLookOpen
 
             ) {
 
               this.$message.error("任务未解锁");
 
@@ -15706,8 +15877,9 @@ export default {
 
             if (
 
               !this.chapInfoList[bbb].chapterInfo[0].taskJson[0].isLook &&
 
               this.courseDetail.userid != this.userid &&
 
-              this.courseDetail.course_teacher &&
 
-              this.courseDetail.course_teacher.indexOf(this.userid) == -1 &&
 
+              (!this.courseDetail.course_teacher ||
 
+          (this.courseDetail.course_teacher &&
 
+          this.courseDetail.course_teacher.indexOf(this.userid) == -1)) &&
 
               this.IsLookOpen
 
             ) {
 
               this.$message.error("任务未解锁");
 
@@ -15723,8 +15895,9 @@ export default {
 
               !this.chapInfoList[this.courseType].chapterInfo[0].taskJson[bbb]
 
                 .isLook &&
 
               this.courseDetail.userid != this.userid &&
 
-              this.courseDetail.course_teacher &&
 
-              this.courseDetail.course_teacher.indexOf(this.userid) == -1 &&
 
+              (!this.courseDetail.course_teacher ||
 
+          (this.courseDetail.course_teacher &&
 
+          this.courseDetail.course_teacher.indexOf(this.userid) == -1)) &&
 
               this.IsLookOpen
 
             ) {
 
               this.$message.error("任务未解锁");
 
@@ -15788,8 +15961,9 @@ export default {
 
         if (
 
           !this.chapInfoList[s].chapterInfo[0].taskJson[n].isLook &&
 
           this.courseDetail.userid != this.userid &&
 
-          this.courseDetail.course_teacher &&
 
-          this.courseDetail.course_teacher.indexOf(this.userid) == -1
 
+          (!this.courseDetail.course_teacher ||
 
+          (this.courseDetail.course_teacher &&
 
+          this.courseDetail.course_teacher.indexOf(this.userid) == -1))
 
         ) {
 
           this.$message.error("任务未解锁");
 
           return;
 
@@ -17490,7 +17664,17 @@ export default {
 
         this.newEnglishList = { engTitle:"",engText:"" }
 
         this.newEnglishList1 = []
 
         this.selectEngC(id,z);
 
-      }
 
+      }else if(t == 62){
 
+				this.videoType = 1;
 
+				this.videoJson = {};
 
+				this.videoJson = JSON.parse(c);
 
+				// this.videoJson =
 
+        //   this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
 
+        //     index
 
+        //   ].toolChoose[i].videoJson;
 
+				this.dialogVisibleVideo = true;
 
+				//this.dialog
 
+			}
 
       //  else if (t == 15) {
 
       //   this.answerQ = "";
 
       //   this.questionAnswer = "";
 
@@ -18009,6 +18193,8 @@ export default {
 
         this.islock = this.groupJson.islock == 1 ? true : false;
 
         this.dialogVisibleGroup = true;
 
       } else if (t == 62) {
 
+				this.videoType = 0;
 
+				this.videoJson = {};
 
         this.videoJson =
 
           this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
 
             index
 
@@ -19667,6 +19853,7 @@ export default {
 
         return c;
 
       };
 
     },
 
+
 
   },
 
   mounted() {
 
     document.body.addEventListener("click", (e) => {
 
@@ -21299,9 +21486,10 @@ export default {
 
   min-width: 15px;
 
   width: 15px;
 
   height: 15px;
 
+  display: flex;
 
 }
 
 .lastText {
 
-  padding: 0 5px 2px 5px;
 
+  padding: 0 5px 0 5px;
 
   box-sizing: border-box;
 
   font-size: 14px;
 
 }

+ 4 - 3
src/components/trainCourse/easy2/studyStudent.vue
Dosyayı Görüntüle 

@@ -3956,7 +3956,7 @@
 
                               class="workImg"
 
                               style="
 
                                 border-radius: 15px;
 
-                                box-shadow: #eee 0px 0px 5px 5px;
 
+                                box-shadow: 0px 0px 5px 5px #eee;
 
                               "
 
                             >
 
                               <div
 
@@ -4076,7 +4076,7 @@
 
                           class="workImg"
 
                           style="
 
                             border-radius: 15px;
 
-                            box-shadow: #eee 0px 0px 5px 5px;
 
+                            box-shadow: 0px 0px 5px 5px #eee;
 
                           "
 
                         >
 
                           <!-- <img
 
@@ -21081,9 +21081,10 @@ export default {
 
   min-width: 15px;
 
   width: 15px;
 
   height: 15px;
 
+  display: flex;
 
 }
 
 .lastText {
 
-  padding: 0 5px 2px 5px;
 
+  padding: 0 5px 0 5px;
 
   box-sizing: border-box;
 
   font-size: 14px;
 
 }

+ 4 - 3
src/components/trainCourse/easy3/studyStudent.vue
Dosyayı Görüntüle 

@@ -3943,7 +3943,7 @@
 
                               class="workImg"
 
                               style="
 
                                 border-radius: 15px;
 
-                                box-shadow: #eee 0px 0px 5px 5px;
 
+                                box-shadow: 0px 0px 5px 5px #eee;
 
                               "
 
                             >
 
                               <div
 
@@ -4063,7 +4063,7 @@
 
                           class="workImg"
 
                           style="
 
                             border-radius: 15px;
 
-                            box-shadow: #eee 0px 0px 5px 5px;
 
+                            box-shadow: 0px 0px 5px 5px #eee;
 
                           "
 
                         >
 
                           <!-- <img
 
@@ -21073,9 +21073,10 @@ export default {
 
   min-width: 15px;
 
   width: 15px;
 
   height: 15px;
 
+  display: flex;
 
 }
 
 .lastText {
 
-  padding: 0 5px 2px 5px;
 
+  padding: 0 5px 0 5px;
 
   box-sizing: border-box;
 
   font-size: 14px;
 
 }

+ 4 - 3
src/components/trainCourse/studyStudent.vue
Dosyayı Görüntüle 

@@ -3952,7 +3952,7 @@
 
                               class="workImg"
 
                               style="
 
                                 border-radius: 15px;
 
-                                box-shadow: #eee 0px 0px 5px 5px;
 
+                                box-shadow: 0px 0px 5px 5px #eee;
 
                               "
 
                             >
 
                               <div
 
@@ -4072,7 +4072,7 @@
 
                           class="workImg"
 
                           style="
 
                             border-radius: 15px;
 
-                            box-shadow: #eee 0px 0px 5px 5px;
 
+                            box-shadow: 0px 0px 5px 5px #eee;
 
                           "
 
                         >
 
                           <!-- <img
 
@@ -21047,9 +21047,10 @@ export default {
 
   min-width: 15px;
 
   width: 15px;
 
   height: 15px;
 
+  display: flex;
 
 }
 
 .lastText {
 
-  padding: 0 5px 2px 5px;
 
+  padding: 0 5px 0 5px;
 
   box-sizing: border-box;
 
   font-size: 14px;
 
 }

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor