lsc 2 years ago
parent
commit
7a92209e58

+ 1 - 1
dist/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>pbl-student</title><link href=./static/css/app.4bbe3a6119f78109aa722f2ff5850610.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.17ca74dd45d81e40ec58.js></script><script type=text/javascript src=./static/js/app.f9c9e373f8b39f7654e1.js></script></body></html><script>document.domain = "cocorobo.cn"</script>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>pbl-student</title><link href=./static/css/app.fa5563d3f854e67d3bc3f15466c1d136.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.17ca74dd45d81e40ec58.js></script><script type=text/javascript src=./static/js/app.d1c9fcae1e0e7e5bf577.js></script></body></html><script>document.domain = "cocorobo.cn"</script>

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


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


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


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


+ 71 - 152
src/components/liveProjectDetail.vue

@@ -194,12 +194,9 @@
                 <!-- <iframe
             style="width: 100%; height: 100%; border: none"
             src="https://iwb.cocorobo.cn/"
-          ></iframe> -->
+                ></iframe>-->
                 <div class="toolImg">
-                  <img
-                    src="../assets/icon/secondToolList/whiteBoard.png"
-                    alt=""
-                  />
+                  <img src="../assets/icon/secondToolList/whiteBoard.png" alt />
                   <div>电子白板</div>
                 </div>
               </div>
@@ -211,9 +208,9 @@
                 <!-- <iframe
             style="width: 100%; height: 100%; border: none"
             src="https://iwb.cocorobo.cn/"
-          ></iframe> -->
+                ></iframe>-->
                 <div class="toolImg">
-                  <img src="../assets/icon/secondToolList/note.png" alt="" />
+                  <img src="../assets/icon/secondToolList/note.png" alt />
                   <div>便签</div>
                 </div>
               </div>
@@ -225,12 +222,9 @@
                 <!-- <iframe
             style="width: 100%; height: 100%; border: none"
             src="https://cloud.cocorobo.cn/kityminder-editor/dist/index.html"
-          ></iframe> -->
+                ></iframe>-->
                 <div class="toolImg">
-                  <img
-                    src="../assets/icon/secondToolList/mindMapping.png"
-                    alt=""
-                  />
+                  <img src="../assets/icon/secondToolList/mindMapping.png" alt />
                   <div>思维导图</div>
                 </div>
               </div>
@@ -242,9 +236,9 @@
                 <!-- <iframe
             style="width: 100%; height: 100%; border: none"
             src="https://cloud.cocorobo.cn/kityminder-editor/dist/index.html"
-          ></iframe> -->
+                ></iframe>-->
                 <div class="toolImg">
-                  <img src="../assets/icon/thirdToolList/ask.png" alt="" />
+                  <img src="../assets/icon/thirdToolList/ask.png" alt />
                   <div>问卷调查</div>
                 </div>
               </div>
@@ -256,9 +250,9 @@
                 <!-- <iframe
             style="width: 100%; height: 100%; border: none"
             src="https://cloud.cocorobo.cn/kityminder-editor/dist/index.html"
-          ></iframe> -->
+                ></iframe>-->
                 <div class="toolImg">
-                  <img src="../assets/icon/secondToolList/doc.png" alt="" />
+                  <img src="../assets/icon/secondToolList/doc.png" alt />
                   <div>协同文档</div>
                 </div>
               </div>
@@ -270,12 +264,9 @@
                 <!-- <iframe
             style="width: 100%; height: 100%; border: none"
             src="https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/Grid"
-          ></iframe> -->
+                ></iframe>-->
                 <div class="toolImg">
-                  <img
-                    src="../assets/icon/secondToolList/mindNetwork.png"
-                    alt=""
-                  />
+                  <img src="../assets/icon/secondToolList/mindNetwork.png" alt />
                   <div>思维网格</div>
                 </div>
               </div>
@@ -287,9 +278,9 @@
                 <!-- <iframe
             style="width: 100%; height: 100%; border: none"
             src="https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/Grid"
-          ></iframe> -->
+                ></iframe>-->
                 <div class="toolImg">
-                  <img src="../assets/icon/secondToolList/library.png" alt="" />
+                  <img src="../assets/icon/secondToolList/library.png" alt />
                   <div>素材库</div>
                 </div>
               </div>
@@ -297,7 +288,7 @@
                 <!-- <iframe
             style="width: 100%; height: 100%; border: none"
             src="https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/Grid"
-          ></iframe> -->
+                ></iframe>-->
                 <div class="toolImg">
                   <div>倒计时</div>
                 </div>
@@ -306,7 +297,7 @@
                 <!-- <iframe
             style="width: 100%; height: 100%; border: none"
             src="https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/Grid"
-          ></iframe> -->
+                ></iframe>-->
                 <div class="toolImg">
                   <div>问答题</div>
                 </div>
@@ -315,7 +306,7 @@
                 <!-- <iframe
             style="width: 100%; height: 100%; border: none"
             src="https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/Grid"
-          ></iframe> -->
+                ></iframe>-->
                 <div class="toolImg">
                   <div>分小组</div>
                 </div>
@@ -324,7 +315,7 @@
                 <!-- <iframe
             style="width: 100%; height: 100%; border: none"
             src="https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/Grid"
-          ></iframe> -->
+                ></iframe>-->
                 <div class="toolImg">
                   <div>作业评价</div>
                 </div>
@@ -342,11 +333,7 @@
                 <div class="tools_title">
                   <span>电子白板</span>
                   <div>
-                    <img
-                      src="../assets/full.png"
-                      class="full"
-                      @click="fullTools"
-                    />
+                    <img src="../assets/full.png" class="full" @click="fullTools" />
                   </div>
                 </div>
                 <iframe
@@ -355,18 +342,11 @@
                   ref="whiteBoard"
                 ></iframe>
               </div>
-              <div
-                v-if="toolsList[0].tools[howTools] == 2"
-                class="tools_child_box"
-              >
+              <div v-if="toolsList[0].tools[howTools] == 2" class="tools_child_box">
                 <div class="tools_title">
                   <span>便签</span>
                   <div>
-                    <img
-                      src="../assets/full.png"
-                      class="full"
-                      @click="fullTools"
-                    />
+                    <img src="../assets/full.png" class="full" @click="fullTools" />
                   </div>
                 </div>
                 <iframe
@@ -378,11 +358,7 @@
                 <div class="tools_title">
                   <span>思维导图</span>
                   <div>
-                    <img
-                      src="../assets/full.png"
-                      class="full"
-                      @click="fullTools"
-                    />
+                    <img src="../assets/full.png" class="full" @click="fullTools" />
                   </div>
                 </div>
                 <iframe
@@ -391,18 +367,11 @@
                   ref="mind"
                 ></iframe>
               </div>
-              <div
-                v-if="toolsList[0].tools[howTools] == 4"
-                class="tools_child_box"
-              >
+              <div v-if="toolsList[0].tools[howTools] == 4" class="tools_child_box">
                 <div class="tools_title">
                   <span>问卷调查</span>
                   <div>
-                    <img
-                      src="../assets/full.png"
-                      class="full"
-                      @click="fullTools"
-                    />
+                    <img src="../assets/full.png" class="full" @click="fullTools" />
                   </div>
                 </div>
                 <iframe
@@ -410,18 +379,11 @@
                   src="https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/ask"
                 ></iframe>
               </div>
-              <div
-                v-if="toolsList[0].tools[howTools] == 6"
-                class="tools_child_box"
-              >
+              <div v-if="toolsList[0].tools[howTools] == 6" class="tools_child_box">
                 <div class="tools_title">
                   <span>协同文档</span>
                   <div>
-                    <img
-                      src="../assets/full.png"
-                      class="full"
-                      @click="fullTools"
-                    />
+                    <img src="../assets/full.png" class="full" @click="fullTools" />
                   </div>
                 </div>
                 <iframe
@@ -433,11 +395,7 @@
                 <div class="tools_title">
                   <span>思维网格</span>
                   <div>
-                    <img
-                      src="../assets/full.png"
-                      class="full"
-                      @click="fullTools"
-                    />
+                    <img src="../assets/full.png" class="full" @click="fullTools" />
                   </div>
                 </div>
                 <iframe
@@ -446,18 +404,11 @@
                   ref="grid"
                 ></iframe>
               </div>
-              <div
-                v-if="toolsList[0].tools[howTools] == 8"
-                class="tools_child_box"
-              >
+              <div v-if="toolsList[0].tools[howTools] == 8" class="tools_child_box">
                 <div class="tools_title">
                   <span>素材库</span>
                   <div>
-                    <img
-                      src="../assets/full.png"
-                      class="full"
-                      @click="fullTools"
-                    />
+                    <img src="../assets/full.png" class="full" @click="fullTools" />
                   </div>
                 </div>
                 <iframe
@@ -465,66 +416,38 @@
                   src="https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/library"
                 ></iframe>
               </div>
-              <div
-                v-if="toolsList[0].tools[howTools] == 9"
-                class="tools_child_box"
-              >
+              <div v-if="toolsList[0].tools[howTools] == 9" class="tools_child_box">
                 <div class="tools_title">
                   <span>选择题</span>
                   <div>
-                    <img
-                      src="../assets/full.png"
-                      class="full"
-                      @click="fullTools"
-                    />
+                    <img src="../assets/full.png" class="full" @click="fullTools" />
                   </div>
                 </div>
                 <div>选择题</div>
               </div>
-              <div
-                v-if="toolsList[0].tools[howTools] == 10"
-                class="tools_child_box"
-              >
+              <div v-if="toolsList[0].tools[howTools] == 10" class="tools_child_box">
                 <div class="tools_title">
                   <span>倒计时</span>
                   <div>
-                    <img
-                      src="../assets/full.png"
-                      class="full"
-                      @click="fullTools"
-                    />
+                    <img src="../assets/full.png" class="full" @click="fullTools" />
                   </div>
                 </div>
                 <div>倒计时</div>
               </div>
-              <div
-                v-if="toolsList[0].tools[howTools] == 11"
-                class="tools_child_box"
-              >
+              <div v-if="toolsList[0].tools[howTools] == 11" class="tools_child_box">
                 <div class="tools_title">
                   <span>问答题</span>
                   <div>
-                    <img
-                      src="../assets/full.png"
-                      class="full"
-                      @click="fullTools"
-                    />
+                    <img src="../assets/full.png" class="full" @click="fullTools" />
                   </div>
                 </div>
                 <div>问答题</div>
               </div>
-              <div
-                v-if="toolsList[0].tools[howTools] == 13"
-                class="tools_child_box"
-              >
+              <div v-if="toolsList[0].tools[howTools] == 13" class="tools_child_box">
                 <div class="tools_title">
                   <span>分小组</span>
                   <div>
-                    <img
-                      src="../assets/full.png"
-                      class="full"
-                      @click="fullTools"
-                    />
+                    <img src="../assets/full.png" class="full" @click="fullTools" />
                   </div>
                 </div>
                 <div>分小组</div>
@@ -543,7 +466,7 @@
                   v-if="howTools != toolsList[0].tools.length - 1"
                 >
                   下一步
-                </div> -->
+                </div>-->
                 <div class="nextStepOne" @click="isBlock = 4">返回</div>
               </div>
               <!-- <div
@@ -553,7 +476,7 @@
                 v-if="toolCount == 1 || toolCount == 3 || toolCount == 7"
               >
                 截图
-              </div> -->
+              </div>-->
               <div
                 class="nextStepOne"
                 style="float: right"
@@ -563,7 +486,7 @@
                 上传文件
                 <input
                   type="file"
-                  accept="image/png,image/gif,image/jpeg"
+                  accept="image/png, image/gif, image/jpeg"
                   style="display: none"
                   @change="beforeUpload1($event, 1)"
                 />
@@ -621,11 +544,7 @@
             </div>-->
             <!-- <div class="nextStepOne" @click="nextTool">下一步</div> -->
           </div>
-          <div
-            class="answerBox"
-            v-if="isBlock == 3"
-            style="padding: 0 0 0 25px"
-          >
+          <div class="answerBox" v-if="isBlock == 3" style="padding: 0 0 0 25px">
             <div>
               <div class="score_box">
                 <span>自我评价</span>
@@ -651,17 +570,10 @@
             <span
               slot="footer"
               class="dialog-footer sztFooter"
-              style="
-                padding: 0 0 30px 0px;
-                position: absolute;
-                right: 20px;
-                bottom: 0;
-              "
+              style="padding: 0 0 30px 0px; position: absolute; right: 20px; bottom: 0"
             >
               <el-button @click="isBlock = 0">取消</el-button>
-              <el-button type="primary" @click="dialogVisible = true"
-                >确定</el-button
-              >
+              <el-button type="primary" @click="dialogVisible = true">确定</el-button>
             </span>
           </div>
         </div>
@@ -790,9 +702,7 @@
     <div class="blackBottomB"></div>
     <div v-if="proVisible" class="mask">
       <div class="progressBox">
-        <div class="lbox">
-          <img src="../assets/loading.gif" />上传中,请稍后
-        </div>
+        <div class="lbox"><img src="../assets/loading.gif" />上传中,请稍后</div>
         <el-progress
           :text-inside="true"
           :stroke-width="20"
@@ -886,12 +796,12 @@ export default {
         "",
         "",
         { tools: [9] }, //选择题
-        { tools: [10] }, //倒计时
-        { tools: [11] }, //问答题
-        { tools: [11] }, //问答题
+        "", //倒计时
+        "", //问答题
+        "", //问答题
         { tools: [3, 1] }, //思维导图/电子白板
         { tools: [12] }, //选人回答
-        { tools: [10, 13] }, //倒计时、分小组
+        "", //倒计时、分小组
         { tools: [3, 1, 7] }, //思维导图/电子白板/思维网格
         { tools: [14] }, //查看作业
         { tools: [14] }, //查看作业
@@ -941,14 +851,11 @@ export default {
     },
     //uuid生成
     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() {
       if (!this.now) {
@@ -1271,6 +1178,9 @@ export default {
     },
     search() {},
     howPage(page) {
+      if (!this.pageTotal) {
+        return;
+      }
       if (page == this.pageTotal) {
         this.isBlock = 3;
       } else {
@@ -1286,11 +1196,13 @@ export default {
         this.full = false;
         this.howTools = 0;
         this.toolCount = 0;
-        if (this.toolsList.length > 0) {
+        if (this.toolsList.length > 0 && this.ppage > 2 && this.tools[page - 1].tools) {
           this.toolsList = [];
           this.toolsList.push({ tools: this.tools[page - 1].tools });
-        } else {
+        } else if (this.ppage > 2 && this.tools[page - 1].tools) {
           this.toolsList.push({ tools: this.tools[page - 1].tools });
+        } else {
+          this.toolsList[0].tools = [];
         }
         if (
           this.toolsList[0].tools &&
@@ -1299,12 +1211,19 @@ export default {
           this.isBlock = 0;
         }
         if (
-          this.toolsList[0].tools.indexOf(1) != -1 ||
-          this.toolsList[0].tools.indexOf(3) != -1 ||
-          this.toolsList[0].tools.indexOf(7) != -1
+          this.toolsList[0].tools &&
+          (this.toolsList[0].tools.indexOf(1) != -1 ||
+            this.toolsList[0].tools.indexOf(3) != -1 ||
+            this.toolsList[0].tools.indexOf(7) != -1)
         ) {
           this.isBlock = 4;
         }
+        if (this.toolsList[0].tools && this.toolsList[0].tools.length > 1) {
+          this.isBlock = 4;
+        }
+        if (this.toolsList[0].tools && !this.toolsList[0].tools.length) {
+          this.isBlock = 0;
+        }
       }
     },
 
@@ -1323,7 +1242,7 @@ export default {
           }
         })
         .catch((err) => {
-          this.$message.error("查询失败");
+          // this.$message.error("查询失败");
           console.error(err);
         });
     },

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