lsc 2 years ago
parent
commit
678623cd78

+ 1 - 1
dist/index.html

@@ -25,4 +25,4 @@
       height: 100%;
       height: 100%;
       width: 100%;
       width: 100%;
       background: #e6eaf0;
       background: #e6eaf0;
-    }</style><link href=./static/css/app.6e18672fc4f80a75c7190562bd8cd3bf.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.39a9f69d36ef7d211bbe.js></script><script type=text/javascript src=./static/js/vendor.aae8f7d9cec68eff34fe.js></script><script type=text/javascript src=./static/js/app.0256f3f5a373acf3f69b.js></script></body></html><script>document.domain = document.domain.split(".").slice(-2).join(".");</script>
+    }</style><link href=./static/css/app.7d2893e62f9fc1c256eac348a069538a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.39a9f69d36ef7d211bbe.js></script><script type=text/javascript src=./static/js/vendor.aae8f7d9cec68eff34fe.js></script><script type=text/javascript src=./static/js/app.db65824c7320a79f6f4a.js></script></body></html><script>document.domain = document.domain.split(".").slice(-2).join(".");</script>

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.6e18672fc4f80a75c7190562bd8cd3bf.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.7d2893e62f9fc1c256eac348a069538a.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.7d2893e62f9fc1c256eac348a069538a.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.0256f3f5a373acf3f69b.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.0256f3f5a373acf3f69b.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.db65824c7320a79f6f4a.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.db65824c7320a79f6f4a.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.39a9f69d36ef7d211bbe.js.map


+ 2 - 2
src/components/pages/course.vue

@@ -727,8 +727,8 @@ export default {
 
 
 .tup > img {
 .tup > img {
   width: 100%;
   width: 100%;
-  /* height: 100%; */
-  object-fit: cover;
+  height: 100%;
+  object-fit: contain;
 }
 }
 
 
 .kc_time {
 .kc_time {

+ 85 - 205
src/components/pages/liveRoom.vue

@@ -23,27 +23,17 @@
         <div class="logoLive">
         <div class="logoLive">
           <img src="../../assets/icon/logo.png" alt />
           <img src="../../assets/icon/logo.png" alt />
         </div>
         </div>
-        <div style="color: #fff; line-height: 45px; padding-left: 15px">
-          introduce a festival (Final)
-        </div>
+        <div style="color: #fff; line-height: 45px; padding-left: 15px">introduce a festival (Final)</div>
       </div>
       </div>
     </div>
     </div>
     <div class="isNoOther">
     <div class="isNoOther">
-      <div
-        class="imgMiddle"
-        :class="isBlock > 0 ? 'imghalf' : 'imgMiddle'"
-        v-show="!full"
-      >
+      <div class="imgMiddle" :class="isBlock > 0 ? 'imghalf' : 'imgMiddle'" v-show="!full">
         <!-- <img src="../../assets/icon/kc1.png" alt /> -->
         <!-- <img src="../../assets/icon/kc1.png" alt /> -->
         <!-- <iframe
         <!-- <iframe
           style="width: 100%; height: 100%; border: none"
           style="width: 100%; height: 100%; border: none"
           src="https://view.officeapps.live.com/op/view.aspx?src=https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/0701%E5%AE%9E%E6%97%B6%E8%AF%BE%E5%A0%82%E6%A8%A1%E6%8B%9F%E6%BC%94%E7%A4%BA%E8%AF%BE%E4%BB%B61656644341323.pptx"
           src="https://view.officeapps.live.com/op/view.aspx?src=https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/0701%E5%AE%9E%E6%97%B6%E8%AF%BE%E5%A0%82%E6%A8%A1%E6%8B%9F%E6%BC%94%E7%A4%BA%E8%AF%BE%E4%BB%B61656644341323.pptx"
         ></iframe>-->
         ></iframe>-->
-        <pdf
-          :pdfUrl="pdfUrl"
-          style="width: 100%; height: 100%"
-          :getPage="getPage"
-        ></pdf>
+        <pdf :pdfUrl="pdfUrl" style="width: 100%; height: 100%" :getPage="getPage"></pdf>
       </div>
       </div>
       <div
       <div
         style="
         style="
@@ -56,23 +46,15 @@
         "
         "
         v-if="isBlock == 1 || isBlock == 6"
         v-if="isBlock == 1 || isBlock == 6"
       >
       >
-        <div
-          style="background: #fff; height: 92%; width: 96%; margin: 10px auto"
-        >
-          <div
-            style="color: #bfbfbf; padding: 15px 0 20px 25px; font-size: 20px"
-          >
-            答题查看
-          </div>
+        <div style="background: #fff; height: 92%; width: 96%; margin: 10px auto">
+          <div style="color: #bfbfbf; padding: 15px 0 20px 25px; font-size: 20px">答题查看</div>
           <div class="answerBox" v-if="isBlock == 1 || isBlock == 6">
           <div class="answerBox" v-if="isBlock == 1 || isBlock == 6">
             <div class="memberBox" v-if="isBlock == 1">
             <div class="memberBox" v-if="isBlock == 1">
               <div
               <div
                 :class="{ pAnswer: item.is == 2 }"
                 :class="{ pAnswer: item.is == 2 }"
                 v-for="(item, index) in studentArray"
                 v-for="(item, index) in studentArray"
                 :key="index"
                 :key="index"
-              >
-                {{ item.name }}
-              </div>
+              >{{ item.name }}</div>
             </div>
             </div>
             <div class="memberBox" v-if="isBlock == 6">
             <div class="memberBox" v-if="isBlock == 6">
               <div
               <div
@@ -81,22 +63,12 @@
                 v-for="(item, index) in studentArray2"
                 v-for="(item, index) in studentArray2"
                 :key="index"
                 :key="index"
                 @click="whoAnswer(item, index)"
                 @click="whoAnswer(item, index)"
-              >
-                {{ item.name }}
-              </div>
+              >{{ item.name }}</div>
               <div v-if="studentArray2.length == 0">暂无学生</div>
               <div v-if="studentArray2.length == 0">暂无学生</div>
             </div>
             </div>
-            <div style="color: #948bdc; padding-top: 15px" v-if="isBlock == 1">
-              共有四个选项,正在答题......
-            </div>
-            <div class="viewSta" @click="isBlock = 3" v-if="isBlock == 1">
-              查看数据统计
-            </div>
-            <span
-              slot="footer"
-              class="dialog-footer sztFooter"
-              v-if="isBlock == 6"
-            >
+            <div style="color: #948bdc; padding-top: 15px" v-if="isBlock == 1">共有四个选项,正在答题......</div>
+            <div class="viewSta" @click="isBlock = 3" v-if="isBlock == 1">查看数据统计</div>
+            <span slot="footer" class="dialog-footer sztFooter" v-if="isBlock == 6">
               <el-button type="primary" @click="isBlock = 0">结束</el-button>
               <el-button type="primary" @click="isBlock = 0">结束</el-button>
               <!-- <el-button type="primary" @click="isBlock = 2">返回</el-button> -->
               <!-- <el-button type="primary" @click="isBlock = 2">返回</el-button> -->
             </span>
             </span>
@@ -142,11 +114,7 @@
           </span>
           </span>
         </div>
         </div>
       </div>
       </div>
-      <div
-        class="answerBox tools_box"
-        v-if="isBlock == 2"
-        style="padding: 10px 0 0 25px"
-      >
+      <div class="answerBox tools_box" v-if="isBlock == 2" style="padding: 10px 0 0 25px">
         <div style="color: #d1d1d1; font-size: 24px">课堂实践</div>
         <div style="color: #d1d1d1; font-size: 24px">课堂实践</div>
         <div
         <div
           style="
           style="
@@ -156,9 +124,7 @@
             text-align: center;
             text-align: center;
             padding-bottom: 3px;
             padding-bottom: 3px;
           "
           "
-        >
-          选择工具
-        </div>
+        >选择工具</div>
         <div
         <div
           style="
           style="
             display: flex;
             display: flex;
@@ -219,10 +185,7 @@
               <div>思维网格</div>
               <div>思维网格</div>
             </div>
             </div>
           </div>
           </div>
-          <div
-            v-if="tools[steps].tools && tools[steps].tools.indexOf(10) != -1"
-            class="toolCss"
-          >
+          <div v-if="tools[steps].tools && tools[steps].tools.indexOf(10) != -1" class="toolCss">
             <div class="toolImg" @click="timeDialogVisible = true">
             <div class="toolImg" @click="timeDialogVisible = true">
               <img src="../../assets/icon/thirdToolList/time.png" alt />
               <img src="../../assets/icon/thirdToolList/time.png" alt />
               <div>倒计时</div>
               <div>倒计时</div>
@@ -233,68 +196,34 @@
           <div class="nextStepOne" @click="isBlock = 0">关闭</div>
           <div class="nextStepOne" @click="isBlock = 0">关闭</div>
         </div>
         </div>
       </div>
       </div>
-      <div
-        class="answerBox tools_box"
-        :class="{ fullStyle: full }"
-        v-if="isBlock == 5"
-      >
+      <div class="answerBox tools_box" :class="{ fullStyle: full }" v-if="isBlock == 5">
         <div style="height: 100%; width: 100%">
         <div style="height: 100%; width: 100%">
           <div v-if="toolCount == 1" class="tools_child_box">
           <div v-if="toolCount == 1" class="tools_child_box">
             <div class="tools_title">
             <div class="tools_title">
               <span>电子白板</span>
               <span>电子白板</span>
               <div>
               <div>
-                <img
-                  src="../../assets/full.png"
-                  class="full"
-                  @click="fullTools"
-                />
-                <img
-                  src="../../assets/close1.png"
-                  class="closeImg"
-                  @click="closeTools"
-                />
+                <img src="../../assets/full.png" class="full" @click="fullTools" />
+                <img src="../../assets/close1.png" class="closeImg" @click="closeTools" />
               </div>
               </div>
             </div>
             </div>
-            <iframe
-              style="width: 100%; height: 100%; border: none"
-              src="https://iwb.cocorobo.cn/"
-            ></iframe>
+            <iframe style="width: 100%; height: 100%; border: none" src="https://iwb.cocorobo.cn/"></iframe>
           </div>
           </div>
           <div v-if="toolCount == 3" class="tools_child_box">
           <div v-if="toolCount == 3" class="tools_child_box">
             <div class="tools_title">
             <div class="tools_title">
               <span>思维导图</span>
               <span>思维导图</span>
               <div>
               <div>
-                <img
-                  src="../../assets/full.png"
-                  class="full"
-                  @click="fullTools"
-                />
-                <img
-                  src="../../assets/close1.png"
-                  class="closeImg"
-                  @click="closeTools"
-                />
+                <img src="../../assets/full.png" class="full" @click="fullTools" />
+                <img src="../../assets/close1.png" class="closeImg" @click="closeTools" />
               </div>
               </div>
             </div>
             </div>
-            <iframe
-              style="width: 100%; height: 100%; border: none"
-              src="https://cloud.cocorobo.cn/kityminder-editor/dist/index.html"
-            ></iframe>
+            <iframe style="width: 100%; height: 100%; border: none" src="//cloud.cocorobo.cn/mind/"></iframe>
           </div>
           </div>
           <div v-if="toolCount == 6" class="tools_child_box">
           <div v-if="toolCount == 6" class="tools_child_box">
             <div class="tools_title">
             <div class="tools_title">
               <span>协同文档</span>
               <span>协同文档</span>
               <div>
               <div>
-                <img
-                  src="../../assets/full.png"
-                  class="full"
-                  @click="fullTools"
-                />
-                <img
-                  src="../../assets/close1.png"
-                  class="closeImg"
-                  @click="closeTools"
-                />
+                <img src="../../assets/full.png" class="full" @click="fullTools" />
+                <img src="../../assets/close1.png" class="closeImg" @click="closeTools" />
               </div>
               </div>
             </div>
             </div>
             <iframe
             <iframe
@@ -306,16 +235,8 @@
             <div class="tools_title">
             <div class="tools_title">
               <span>思维网格</span>
               <span>思维网格</span>
               <div>
               <div>
-                <img
-                  src="../../assets/full.png"
-                  class="full"
-                  @click="fullTools"
-                />
-                <img
-                  src="../../assets/close1.png"
-                  class="closeImg"
-                  @click="closeTools"
-                />
+                <img src="../../assets/full.png" class="full" @click="fullTools" />
+                <img src="../../assets/close1.png" class="closeImg" @click="closeTools" />
               </div>
               </div>
             </div>
             </div>
             <iframe
             <iframe
@@ -324,7 +245,7 @@
             ></iframe>
             ></iframe>
           </div>
           </div>
           <div class="nextStepBox">
           <div class="nextStepBox">
-            <div class="nextStepOne" @click="isBlock = 2">返回</div>
+            <div class="nextStepOne" @click="isBlock = 2,full = false">返回</div>
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>
@@ -349,9 +270,7 @@
             height: 25px;
             height: 25px;
             line-height: 25px;
             line-height: 25px;
           "
           "
-        >
-          查看作业
-        </div>
+        >查看作业</div>
         <div class="workBox">
         <div class="workBox">
           <div class="works" v-for="(w, wIndex) in worksList" :key="wIndex">
           <div class="works" v-for="(w, wIndex) in worksList" :key="wIndex">
             <div class="workImg">
             <div class="workImg">
@@ -369,7 +288,7 @@
                 <div class="workName">{{ w.sName }}</div>
                 <div class="workName">{{ w.sName }}</div>
               </div>
               </div>
               <div class="workRight">{{ w.time }}</div>
               <div class="workRight">{{ w.time }}</div>
-              <div class="workBtn" @click="isBlock = 7">查看评价</div>
+              <!-- <div class="workBtn" @click="isBlock = 7">查看评价</div> -->
             </div>
             </div>
           </div>
           </div>
         </div>
         </div>
@@ -389,9 +308,7 @@
           margin: 10px 15px;
           margin: 10px 15px;
         "
         "
       >
       >
-        <div style="color: #bfbfbf; padding: 15px 0 15px 0; font-size: 20px">
-          课堂评价
-        </div>
+        <div style="color: #bfbfbf; padding: 15px 0 15px 0; font-size: 20px">课堂评价</div>
         <div>
         <div>
           <div class="score_box">
           <div class="score_box">
             <span>自我评价</span>
             <span>自我评价</span>
@@ -428,11 +345,7 @@
         </span>
         </span>
       </div>
       </div>
 
 
-      <div
-        class="answerBox tools_box"
-        v-if="isBlock == 8"
-        style="padding: 10px 0 0 25px"
-      >
+      <div class="answerBox tools_box" v-if="isBlock == 8" style="padding: 10px 0 0 25px">
         <div style="color: #d1d1d1; font-size: 24px">课堂实践</div>
         <div style="color: #d1d1d1; font-size: 24px">课堂实践</div>
         <div
         <div
           style="
           style="
@@ -442,9 +355,7 @@
             text-align: center;
             text-align: center;
             padding-bottom: 3px;
             padding-bottom: 3px;
           "
           "
-        >
-          选择附件
-        </div>
+        >选择附件</div>
         <div
         <div
           style="
           style="
             display: flex;
             display: flex;
@@ -455,27 +366,16 @@
             align-items: center;
             align-items: center;
           "
           "
         >
         >
-          <div
-            v-if="tools[steps].file && tools[steps].file.length"
-            class="fileBox"
-          >
-            <div
-              class="fileListCss"
-              v-for="(v, vIndex) in videoList"
-              :key="vIndex"
-            >
+          <div v-if="tools[steps].file && tools[steps].file.length" class="fileBox">
+            <div class="fileListCss" v-for="(v, vIndex) in videoList" :key="vIndex">
               <div class="fileCss" @click="playVideo(v.src, vIndex)">
               <div class="fileCss" @click="playVideo(v.src, vIndex)">
-                <img src="../../assets/uploadMp4.png" alt="" />
+                <img src="../../assets/uploadMp4.png" alt />
               </div>
               </div>
               <div>{{ v.name }}</div>
               <div>{{ v.name }}</div>
             </div>
             </div>
-            <div
-              class="fileListCss"
-              v-for="(f, fIndex) in fileList"
-              :key="fIndex"
-            >
+            <div class="fileListCss" v-for="(f, fIndex) in fileList" :key="fIndex">
               <div class="fileCss" @click="openFile(f.src)">
               <div class="fileCss" @click="openFile(f.src)">
-                <img src="../../assets/file.png" alt="" />
+                <img src="../../assets/file.png" alt />
               </div>
               </div>
               <div>{{ f.name }}</div>
               <div>{{ f.name }}</div>
             </div>
             </div>
@@ -485,11 +385,7 @@
           <div class="nextStepOne" @click="isBlock = 0">关闭</div>
           <div class="nextStepOne" @click="isBlock = 0">关闭</div>
         </div>
         </div>
       </div>
       </div>
-      <div
-        class="answerBox tools_box"
-        :class="{ fullStyle: full }"
-        v-if="isBlock == 9"
-      >
+      <div class="answerBox tools_box" :class="{ fullStyle: full }" v-if="isBlock == 9">
         <div style="height: 70%; width: 100%">
         <div style="height: 70%; width: 100%">
           <div class="wheel">
           <div class="wheel">
             <div class="workd_media" style="height: 100%">
             <div class="workd_media" style="height: 100%">
@@ -508,20 +404,10 @@
         </div>
         </div>
       </div>
       </div>
 
 
-      <div
-        class="answerBox tools_box"
-        :class="{ fullStyle: full }"
-        v-if="isBlock == 10"
-      >
+      <div class="answerBox tools_box" :class="{ fullStyle: full }" v-if="isBlock == 10">
         <div style="height: 70%; width: 100%">
         <div style="height: 70%; width: 100%">
-          <div
-            class="wheel"
-            style="height: 520px; width: 100%; margin: 0 0 20px 30px"
-          >
-            <iframe
-              style="width: 100%; height: 100%; border: none"
-              :src="pptImgUrl"
-            ></iframe>
+          <div class="wheel" style="height: 520px; width: 100%; margin: 0 0 20px 30px">
+            <iframe style="width: 100%; height: 100%; border: none" :src="pptImgUrl"></iframe>
           </div>
           </div>
           <div class="nextStepBox" style="margin-top: 5%">
           <div class="nextStepBox" style="margin-top: 5%">
             <div class="nextStepOne" @click="isBlock = 8">返回</div>
             <div class="nextStepOne" @click="isBlock = 8">返回</div>
@@ -536,44 +422,45 @@
           class="blackButton"
           class="blackButton"
           @click="showMember(0)"
           @click="showMember(0)"
           v-if="tools[steps].tools && tools[steps].tools.indexOf(9) != -1"
           v-if="tools[steps].tools && tools[steps].tools.indexOf(9) != -1"
-        >
-          开始答题
-        </div>
+        >开始答题</div>
         <div
         <div
           class="blackButton"
           class="blackButton"
           @click="isBlock = 2"
           @click="isBlock = 2"
           v-if="
           v-if="
-            (tools[steps].tools && tools[steps].tools.indexOf(3) != -1) ||
+            (tools[steps].tools && tools[steps].tools.indexOf(1) != -1) ||
             (tools[steps].tools && tools[steps].tools.indexOf(3) != -1) ||
             (tools[steps].tools && tools[steps].tools.indexOf(3) != -1) ||
             (tools[steps].tools && tools[steps].tools.indexOf(6) != -1) ||
             (tools[steps].tools && tools[steps].tools.indexOf(6) != -1) ||
             (tools[steps].tools && tools[steps].tools.indexOf(7) != -1) ||
             (tools[steps].tools && tools[steps].tools.indexOf(7) != -1) ||
             (tools[steps].tools && tools[steps].tools.indexOf(10) != -1) ||
             (tools[steps].tools && tools[steps].tools.indexOf(10) != -1) ||
             (tools[steps].tools && tools[steps].tools.indexOf(13) != -1)
             (tools[steps].tools && tools[steps].tools.indexOf(13) != -1)
           "
           "
-        >
-          查看工具
-        </div>
+        >查看工具</div>
         <div
         <div
           class="blackButton"
           class="blackButton"
           @click="checkStudentAnswer"
           @click="checkStudentAnswer"
           v-if="tools[steps].tools && tools[steps].tools.indexOf(12) != -1"
           v-if="tools[steps].tools && tools[steps].tools.indexOf(12) != -1"
-        >
-          选择学生回答
-        </div>
+        >选择学生回答</div>
         <div
         <div
           class="blackButton"
           class="blackButton"
-          @click="selectSWork"
-          v-if="tools[steps].tools && tools[steps].tools.indexOf(14) != -1"
-        >
-          查看作业
-        </div>
+          @click="selectSWork(4)"
+          v-if="  (tools[steps].tools && tools[steps].tools.indexOf(1) != -1) ||
+            (tools[steps].tools && tools[steps].tools.indexOf(3) != -1) ||
+            (tools[steps].tools && tools[steps].tools.indexOf(6) != -1) ||
+            (tools[steps].tools && tools[steps].tools.indexOf(7) != -1) ||
+            (tools[steps].tools && tools[steps].tools.indexOf(10) != -1) ||
+            (tools[steps].tools && tools[steps].tools.indexOf(16) != -1) ||
+            (tools[steps].tools && tools[steps].tools.indexOf(13) != -1)"
+        >查看作业</div>
+        <div
+          class="blackButton"
+          @click="selectSWork(6)"
+          v-if="(tools[steps].tools && tools[steps].tools.indexOf(14) != -1)"
+        >查看评价</div>
         <div
         <div
           class="blackButton"
           class="blackButton"
           @click="selectFile"
           @click="selectFile"
           v-if="tools[steps].file && tools[steps].file.length"
           v-if="tools[steps].file && tools[steps].file.length"
-        >
-          查看附件
-        </div>
+        >查看附件</div>
       </div>
       </div>
     </div>
     </div>
     <el-dialog
     <el-dialog
@@ -584,9 +471,9 @@
       :before-close="handleClose"
       :before-close="handleClose"
       class="dialog_diy"
       class="dialog_diy"
     >
     >
-      <div style="text-align: center; padding: 20px 0 50px 0; font-size: 18px">
-        是否让“{{ answerStudent }}”同学进行单独答题?
-      </div>
+      <div
+        style="text-align: center; padding: 20px 0 50px 0; font-size: 18px"
+      >是否让“{{ answerStudent }}”同学进行单独答题?</div>
       <div
       <div
         style="
         style="
           width: 200px;
           width: 200px;
@@ -600,9 +487,7 @@
           cursor: pointer;
           cursor: pointer;
         "
         "
         @click="dialogVisible = false"
         @click="dialogVisible = false"
-      >
-        确定
-      </div>
+      >确定</div>
     </el-dialog>
     </el-dialog>
     <el-dialog
     <el-dialog
       :visible.sync="dialogVisible1"
       :visible.sync="dialogVisible1"
@@ -611,9 +496,7 @@
       :before-close="handleClose"
       :before-close="handleClose"
       class="dialog_diy"
       class="dialog_diy"
     >
     >
-      <div style="text-align: center; padding: 20px 0 50px 0; font-size: 18px">
-        正在开发中!
-      </div>
+      <div style="text-align: center; padding: 20px 0 50px 0; font-size: 18px">正在开发中!</div>
       <div
       <div
         style="
         style="
           width: 200px;
           width: 200px;
@@ -627,9 +510,7 @@
           cursor: pointer;
           cursor: pointer;
         "
         "
         @click="dialogVisible1 = false"
         @click="dialogVisible1 = false"
-      >
-        确定
-      </div>
+      >确定</div>
     </el-dialog>
     </el-dialog>
     <el-dialog
     <el-dialog
       :visible.sync="dialogVisible2"
       :visible.sync="dialogVisible2"
@@ -638,9 +519,7 @@
       :before-close="handleClose"
       :before-close="handleClose"
       class="dialog_diy"
       class="dialog_diy"
     >
     >
-      <div style="text-align: center; padding: 20px 0 50px 0; font-size: 18px">
-        课程结束后才有报告!
-      </div>
+      <div style="text-align: center; padding: 20px 0 50px 0; font-size: 18px">课程结束后才有报告!</div>
       <div
       <div
         style="
         style="
           width: 200px;
           width: 200px;
@@ -654,9 +533,7 @@
           cursor: pointer;
           cursor: pointer;
         "
         "
         @click="dialogVisible2 = false"
         @click="dialogVisible2 = false"
-      >
-        确定
-      </div>
+      >确定</div>
     </el-dialog>
     </el-dialog>
     <el-dialog
     <el-dialog
       title="倒计时"
       title="倒计时"
@@ -778,7 +655,8 @@ export default {
           file: [
           file: [
             {
             {
               name: "视频1.mp4",
               name: "视频1.mp4",
-              src: "https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/%E5%AA%92%E4%BD%9311661413782505.mp4",
+              src:
+                "https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/%E5%AA%92%E4%BD%9311661413782505.mp4",
             },
             },
           ],
           ],
         },
         },
@@ -794,15 +672,16 @@ export default {
           file: [
           file: [
             {
             {
               name: "视频2.mp4",
               name: "视频2.mp4",
-              src: "https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/%E5%AA%92%E4%BD%9321661413797366.mp4",
+              src:
+                "https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/%E5%AA%92%E4%BD%9321661413797366.mp4",
             },
             },
           ],
           ],
         },
         },
         { tools: [9] },
         { tools: [9] },
         "",
         "",
         { tools: [3] },
         { tools: [3] },
-        "",
-        "",
+        { tools: [16] },
+        { tools: [14] },
         "",
         "",
         "",
         "",
         "",
         "",
@@ -878,14 +757,13 @@ export default {
     },
     },
     //uuid生成
     //uuid生成
     guid() {
     guid() {
-      return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(
-        /[xy]/g,
-        function (c) {
-          var r = (Math.random() * 16) | 0,
-            v = c == "x" ? r : (r & 0x3) | 0x8;
-          return v.toString(16);
-        }
-      );
+      return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (
+        c
+      ) {
+        var r = (Math.random() * 16) | 0,
+          v = c == "x" ? r : (r & 0x3) | 0x8;
+        return v.toString(16);
+      });
     },
     },
     time() {
     time() {
       if (!this.now) {
       if (!this.now) {
@@ -1010,11 +888,13 @@ export default {
           console.error(err);
           console.error(err);
         });
         });
     },
     },
-    selectSWork() {
+    selectSWork(type) {
       this.worksList = [];
       this.worksList = [];
       let params = {
       let params = {
         uid: "",
         uid: "",
         cid: this.cid,
         cid: this.cid,
+        p: this.steps - 1,
+        t: type,
       };
       };
       this.ajax
       this.ajax
         .get(this.$store.state.api + "selectSWork", params)
         .get(this.$store.state.api + "selectSWork", params)
@@ -1073,10 +953,10 @@ export default {
     },
     },
     onPlayerPlay() {},
     onPlayerPlay() {},
     previewImg(url) {
     previewImg(url) {
+      this.$hevueImgPreview(url);
       // this.$hevueImgPreview(url);
       // this.$hevueImgPreview(url);
-      // this.$hevueImgPreview(url);
-      this.drawShow = true;
-      this.bg = url;
+      // this.drawShow = true;
+      // this.bg = url;
       // this.setAvatarBase64(url, (base64) => {
       // this.setAvatarBase64(url, (base64) => {
       //   this.$nextTick(() => {
       //   this.$nextTick(() => {
       //     this.drawShow = true;
       //     this.drawShow = true;

Some files were not shown because too many files changed in this diff