瀏覽代碼

Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl-student-table

zengyicheng 3 年之前
父節點
當前提交
7f73cba132

+ 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.a4d03f021441050078f4a5f13459b7d3.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.58e4d5b3fd0c569e76aa.js></script><script type=text/javascript src=./static/js/app.1b2c2d8dd2397762f6a4.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.c9f19c180052b1f7a424d3df21d9e420.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.58e4d5b3fd0c569e76aa.js></script><script type=text/javascript src=./static/js/app.7564153348f1f219092b.js></script></body></html><script>document.domain = "cocorobo.cn"</script>

文件差異過大導致無法顯示
+ 0 - 0
dist/static/css/app.a4d03f021441050078f4a5f13459b7d3.css.map


文件差異過大導致無法顯示
+ 0 - 0
dist/static/css/app.c9f19c180052b1f7a424d3df21d9e420.css


文件差異過大導致無法顯示
+ 0 - 0
dist/static/css/app.c9f19c180052b1f7a424d3df21d9e420.css.map


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/app.1b2c2d8dd2397762f6a4.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/app.1b2c2d8dd2397762f6a4.js.map


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/app.7564153348f1f219092b.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/app.7564153348f1f219092b.js.map


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 16 - 0
src/common/jietu.js

@@ -88,6 +88,22 @@ function addSWork_shishi(uid, cid, a) {
     data: params,
     dataType: "json",
     success: (data) => {
+      var _a = document.getElementsByTagName("img")
+      for (var i = 0; i < _a.length; i++) {
+        _a[i].removeAttribute("crossorigin")
+      }
+      top.document.getElementById("shishi_loading").children[0].style.display = "none"
+      let _div = document.createElement('div')
+      _div.style = "width:100%;height:100%;background:#0000008f;position:fixed;top:0;left:0;z-index:99999999999999;display: flex;justify-content: center;align-items: center;"
+      let _inner = document.createElement('div')
+      _inner.style = "color: #fff;padding: 15px;background: #00000070;border-radius: 5px;font-size: 18px;"
+      _inner.innerHTML = "截图上传成功"
+      _div.appendChild(_inner)
+      document.body.appendChild(_div)
+      setTimeout(() => {
+        //  document.body.removeChild(_loading)
+        document.body.removeChild(_div)
+      }, 2000);
       console.log("截图上传成功");
     }
   })

+ 161 - 37
src/components/liveProjectDetail.vue

@@ -224,7 +224,10 @@
             src="https://cloud.cocorobo.cn/kityminder-editor/dist/index.html"
                 ></iframe>-->
                 <div class="toolImg">
-                  <img src="../assets/icon/secondToolList/mindMapping.png" alt />
+                  <img
+                    src="../assets/icon/secondToolList/mindMapping.png"
+                    alt
+                  />
                   <div>思维导图</div>
                 </div>
               </div>
@@ -266,7 +269,10 @@
             src="https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/Grid"
                 ></iframe>-->
                 <div class="toolImg">
-                  <img src="../assets/icon/secondToolList/mindNetwork.png" alt />
+                  <img
+                    src="../assets/icon/secondToolList/mindNetwork.png"
+                    alt
+                  />
                   <div>思维网格</div>
                 </div>
               </div>
@@ -333,7 +339,11 @@
                 <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
@@ -342,11 +352,18 @@
                   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
@@ -358,7 +375,11 @@
                 <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
@@ -367,11 +388,18 @@
                   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
@@ -379,11 +407,18 @@
                   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
@@ -395,7 +430,11 @@
                 <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
@@ -404,11 +443,18 @@
                   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
@@ -416,42 +462,90 @@
                   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>
               </div>
+              <div
+                id="shishi_loading"
+                style="
+                  width: 100%;
+                  height: 100%;
+                  background: #0000008f;
+                  position: absolute;
+                  top: 0;
+                  left: 0;
+                  z-index: 99999999999999;
+                  display: none;
+                  justify-content: center;
+                  align-items: center;
+                "
+              >
+              <div style="color: #fff;padding: 15px;background: #00000070;border-radius: 5px;font-size: 18px;display:flex;align-items:center;">
+                <img src="https://pbl.cocorobo.cn/pbl-student-table/dist/js/loading.gif" alt="" style="width: 26px;margin-right: 10px;">
+                <span>上传中...</span>
+              </div>
+              </div>
               <div class="nextStepBox" v-if="toolsList[0].tools.length > 1">
                 <!-- <div
                   class="nextStepOne"
@@ -544,7 +638,11 @@
             </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>
@@ -570,10 +668,17 @@
             <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>
@@ -702,7 +807,9 @@
     <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"
@@ -851,11 +958,14 @@ 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) {
@@ -1144,7 +1254,7 @@ export default {
       console.log(iframeIh);
 
       // var iframeHtml = this.$refs.whiteBoard;
-
+      document.getElementById("shishi_loading").style.display="flex"
       var _ajs = iframeHtml.contentWindow.document.createElement("script");
       _ajs.type = "text/javascript";
       _ajs.innerHTML =
@@ -1152,6 +1262,8 @@ export default {
         '_js.type="text/javascript";\n' +
         '_js.src="https://html2canvas.hertzen.com/dist/html2canvas.min.js";\n' +
         "_js.onload = function(){\n" +
+        ' var a = document.getElementsByTagName("img")\n' +
+        ' for(var i = 0;i<a.length;i++){a[i].crossOrigin="anonymous"}\n' +
         " html2canvas(document.body).then(canvas => {\n" +
         '  var base64Url = canvas.toDataURL("image/png");\n' +
         'var base64 = "<img src=" + base64Url + " />"\n' +
@@ -1225,7 +1337,11 @@ export default {
         this.full = false;
         this.howTools = 0;
         this.toolCount = 0;
-        if (this.toolsList.length > 0 && this.ppage > 2 && this.tools[page - 1].tools) {
+        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 if (this.ppage > 2 && this.tools[page - 1].tools) {
@@ -1297,17 +1413,25 @@ export default {
             "https://pbl.cocorobo.cn/pbl-student-table/dist/aws-sdk-2.235.1.min.js";
           const script3 = document.createElement("script");
           script3.type = "text/javascript";
-          script3.src = "https://html2canvas.hertzen.com/dist/html2canvas.min.js";
+          script3.src =
+            "https://html2canvas.hertzen.com/dist/html2canvas.min.js";
           const script4 = document.createElement("script");
           script4.type = "text/javascript";
-          script4.src = "https://pbl.cocorobo.cn/pbl-student-table/dist/jietu.js";
+          script4.src =
+            "https://pbl.cocorobo.cn/pbl-student-table/dist/jietu.js";
 
           if (_this.toolCount == 1) {
             _this.$refs.whiteBoard.onload = () => {
-              _this.$refs.whiteBoard.contentWindow.document.body.appendChild(script1);
-              _this.$refs.whiteBoard.contentWindow.document.body.appendChild(script2);
+              _this.$refs.whiteBoard.contentWindow.document.body.appendChild(
+                script1
+              );
+              _this.$refs.whiteBoard.contentWindow.document.body.appendChild(
+                script2
+              );
               // _this.$refs.whiteBoard.contentWindow.document.body.appendChild(script3);
-              _this.$refs.whiteBoard.contentWindow.document.body.appendChild(script4);
+              _this.$refs.whiteBoard.contentWindow.document.body.appendChild(
+                script4
+              );
             };
           } else if (_this.toolCount == 3) {
             _this.$refs.mind.onload = () => {

+ 1 - 1
src/components/study.vue

@@ -2235,7 +2235,7 @@ export default {
             file.name.split(".")[0] +
             new Date().getTime() +
             "." +
-            file.name.split(".")[1],
+            file.name.split(".")[file.name.split(".").length-1],
           ContentType: file.type,
           Body: file,
           "Access-Control-Allow-Credentials": "*",

部分文件因文件數量過多而無法顯示