홈 탐색 도움말
로그인
CocoRoboLabs
/
pbl-student-table
3
0
포크 0
파일 이슈 0 풀 리퀘스트 0 위키
소스 검색

截图

lsc 2 년 전
부모
b6db4f7222
커밋
d8f264f17f
7개의 변경된 파일과 133개의 추가작업 그리고 123개의 파일을 삭제
분할 보기 변경상태 보기
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.a5b647b81050105536728f2c63763c6c.css
  3. 0 0
      dist/static/css/app.a5b647b81050105536728f2c63763c6c.css.map
  4. 0 0
      dist/static/js/app.5e5f7874910d0ca87eba.js
  5. 0 0
      dist/static/js/app.b13f42bb3a5b0188b65e.js
  6. 79 72
      src/common/jietu.js
  7. 53 50
      src/components/liveProjectDetail.vue

+ 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.b1b48dab680f33a8adb4306e480c136b.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.22a27a37f4a3610ee2e4.js></script><script type=text/javascript src=./static/js/app.5e5f7874910d0ca87eba.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.a5b647b81050105536728f2c63763c6c.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.22a27a37f4a3610ee2e4.js></script><script type=text/javascript src=./static/js/app.b13f42bb3a5b0188b65e.js></script></body></html><script>document.domain = "cocorobo.cn"</script>

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/css/app.a5b647b81050105536728f2c63763c6c.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/css/app.a5b647b81050105536728f2c63763c6c.css.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/app.5e5f7874910d0ca87eba.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/app.b13f42bb3a5b0188b65e.js


+ 79 - 72
src/common/jietu.js
파일 보기 

@@ -1,87 +1,94 @@
 
 function jietu_shishi(uid, cid) {
 
-    html2canvas($("body")[0]).then(function (canvas) {
 
-        //获取截取图片路径
 
+  html2canvas($("body")[0]).then(function (canvas) {
 
+    //获取截取图片路径
 
 
-        var base64Url = canvas.toDataURL('image/png');
 
-        //后台操作处理
 
+    var base64Url = canvas.toDataURL('image/png');
 
+    //后台操作处理
 
 
-        var base64 = "<img src=" + base64Url + " />"
 
-        var file = dataURLtoFile_shishi(base64Url, "截图")
 
-        beforeUpload_shishi(file, uid, cid)
 
-        $("body")[0].innerHTML = base64
 
-    });
 
+    var base64 = "<img src=" + base64Url + " />"
 
+    var file = dataURLtoFile_shishi(base64Url, "截图")
 
+    beforeUpload_shishi(file, uid, cid)
 
+    // $("body")[0].innerHTML = base64
 
+  });
 
 }
 
 
 function dataURLtoFile_shishi(dataurl, filename) {
 
-    let arr = dataurl.split(","),
 
-        mime = arr[0].match(/:(.*?);/)[1],
 
-        bstr = atob(arr[1]),
 
-        n = bstr.length,
 
-        u8arr = new Uint8Array(n);
 
-    while (n--) {
 
-        u8arr[n] = bstr.charCodeAt(n);
 
-    }
 
-    return new File([u8arr], filename, {
 
-        type: mime
 
-    });
 
+  let arr = dataurl.split(","),
 
+    mime = arr[0].match(/:(.*?);/)[1],
 
+    bstr = atob(arr[1]),
 
+    n = bstr.length,
 
+    u8arr = new Uint8Array(n);
 
+  while (n--) {
 
+    u8arr[n] = bstr.charCodeAt(n);
 
+  }
 
+  return new File([u8arr], filename, {
 
+    type: mime
 
+  });
 
 }
 
 
 
 function beforeUpload_shishi(nfile, uid, cid) {
 
-    var file = nfile;
 
-    var credentials = {
 
-        accessKeyId: "AKIATLPEDU37QV5CHLMH",
 
-        secretAccessKey: "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",
 
-    }; //秘钥形式的登录上传
 
-    window.AWS.config.update(credentials);
 
-    window.AWS.config.region = "cn-northwest-1"; //设置区域
 
-
 
-    var bucket = new window.AWS.S3({
 
-        params: {
 
-            Bucket: "ccrb"
 
-        }
 
-    }); //选择桶
 
+  var file = nfile;
 
+  var credentials = {
 
+    accessKeyId: "AKIATLPEDU37QV5CHLMH",
 
+    secretAccessKey: "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",
 
+  }; //秘钥形式的登录上传
 
+  window.AWS.config.update(credentials);
 
+  window.AWS.config.region = "cn-northwest-1"; //设置区域
 
 
-    if (file) {
 
-        var params = {
 
-            Key: file.name.split(".")[0] + new Date().getTime() + "." + "png",
 
-            ContentType: file.type,
 
-            Body: file,
 
-            "Access-Control-Allow-Credentials": "*",
 
-            ACL: "public-read",
 
-        }; //key可以设置为桶的相抵路径，Body为文件， ACL最好要设置
 
-        var options = {
 
-            partSize: 2048 * 1024 * 1024,
 
-            queueSize: 2,
 
-            leavePartsOnError: true,
 
-        };
 
-        bucket.upload(params, options)
 
-            .on("httpUploadProgress", function (evt) {
 
-                //这里可以写进度条
 
-                // console.log("Uploaded : " + parseInt((evt.loaded * 80) / evt.total) + '%');
 
-            }).send(function (err, data) {
 
-                console.log(data.Location);
 
-                addSWork_shishi(uid, cid, data.Location)
 
-            });
 
+  var bucket = new window.AWS.S3({
 
+    params: {
 
+      Bucket: "ccrb"
 
     }
 
-}
 
+  }); //选择桶
 
 
-function addSWork_shishi(uid, cid, a) {
 
-    let params = {
 
-        uid: uid,
 
-        cid: cid,
 
-        upload: JSON.stringify([{
 
-            a: a
 
-        }]),
 
-        // upload: JSON.stringify(this.imgFileUp),
 
+  if (file) {
 
+    var params = {
 
+      Key: file.name.split(".")[0] + new Date().getTime() + "." + "png",
 
+      ContentType: file.type,
 
+      Body: file,
 
+      "Access-Control-Allow-Credentials": "*",
 
+      ACL: "public-read",
 
+    }; //key可以设置为桶的相抵路径，Body为文件， ACL最好要设置
 
+    var options = {
 
+      partSize: 2048 * 1024 * 1024,
 
+      queueSize: 2,
 
+      leavePartsOnError: true,
 
     };
 
-    $.ajax({
 
-        type: 'GET',
 
-        url: 'https://pbl.cocorobo.cn/api/pbl/insertSWork',
 
-        data: params,
 
-        dataType: "json",
 
-        success: (data) => {
 
-            console.log("截图上传成功");
 
+    bucket.upload(params, options)
 
+      .on("httpUploadProgress", function (evt) {
 
+        //这里可以写进度条
 
+        // console.log("Uploaded : " + parseInt((evt.loaded * 80) / evt.total) + '%');
 
+      }).send(function (err, data) {
 
+        console.log(data.Location);
 
+        var a = {
 
+          name: file.name,
 
+          url: data.Location,
 
+          uid: file.uid,
 
         }
 
-    })
 
-}
 
+        addSWork_shishi(uid, cid, a)
 
+      });
 
+  }
 
+}
 
+
 
+function addSWork_shishi(uid, cid, a) {
 
+  let params = {
 
+    uid: uid,
 
+    cid: cid,
 
+    upload: JSON.stringify([{
 
+      upImg: [a],
 
+      upVedio: [],
 
+      upIntro: "",
 
+    }]),
 
+    // upload: JSON.stringify(this.imgFileUp),
 
+  };
 
+  $.ajax({
 
+    type: 'GET',
 
+    url: 'https://pbl.cocorobo.cn/api/pbl/insertSWork',
 
+    data: params,
 
+    dataType: "json",
 
+    success: (data) => {
 
+      console.log("截图上传成功");
 
+    }
 
+  })
 
+}

+ 53 - 50
src/components/liveProjectDetail.vue
파일 보기 

@@ -1142,9 +1142,36 @@ export default {
 
       iframeIh.innerHTML = this.iframeInnerHtml;
 
       this.$forceUpdate();
 
       console.log(iframeIh);
 
+
 
       // var iframeHtml = this.$refs.whiteBoard;
 
 
-      iframeHtml.contentWindow.jietu_shishi(this.userid, this.cid);
 
+      var _ajs = iframeHtml.contentWindow.document.createElement("script");
 
+      _ajs.type = "text/javascript";
 
+      _ajs.innerHTML =
 
+        'var _js = document.createElement("script");\n' +
 
+        '_js.type="text/javascript";\n' +
 
+        '_js.src="https://html2canvas.hertzen.com/dist/html2canvas.min.js";\n' +
 
+        "_js.onload = function(){\n" +
 
+        " html2canvas(document.body).then(canvas => {\n" +
 
+        '  var base64Url = canvas.toDataURL("image/png");\n' +
 
+        'var base64 = "<img src=" + base64Url + " />"\n' +
 
+        'var file = dataURLtoFile_shishi(base64Url, "截图")\n' +
 
+        "beforeUpload_shishi(file," +
 
+        "'" +
 
+        this.userid +
 
+        "'" +
 
+        ", " +
 
+        "'" +
 
+        this.cid +
 
+        "'" +
 
+        ")\n" +
 
+        " });\n" +
 
+        "}\n" +
 
+        "document.head.appendChild(_js);\n";
 
+      iframeHtml.contentWindow.document.head.appendChild(_ajs);
 
+
 
+      // iframeHtml.contentWindow.jietu_shishi(this.userid, this.cid);
 
+
 
       // 第一个参数是需要生成截图的元素,第二个是自己需要配置的参数,宽高等
 
       // html2canvas(iframeBody, {
 
       //   allowTaint: true,
 
@@ -1257,74 +1284,43 @@ export default {
 
     checkTools(tcount) {
 
       this.isBlock = 2;
 
       this.toolCount = tcount;
 
-      this.$forceUpdate();
 
       let _this = this;
 
       _this.$nextTick(() => {
 
         setTimeout(() => {
 
+          const script1 = document.createElement("script");
 
+          script1.type = "text/javascript";
 
+          script1.src =
 
+            "https://pbl.cocorobo.cn/pbl-student-table/dist/jquery-3.6.0.min.js";
 
+          const script2 = document.createElement("script");
 
+          script2.type = "text/javascript";
 
+          script2.src =
 
+            "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";
 
+          const script4 = document.createElement("script");
 
+          script4.type = "text/javascript";
 
+          script4.src = "https://pbl.cocorobo.cn/pbl-student-table/dist/jietu.js";
 
+
 
           if (_this.toolCount == 1) {
 
-            const script1 = document.createElement("script");
 
-            script1.type = "text/javascript";
 
-            script1.src =
 
-              "https://pbl.cocorobo.cn/pbl-student-table/dist/jquery-3.6.0.min.js";
 
-            const script2 = document.createElement("script");
 
-            script2.type = "text/javascript";
 
-            script2.src =
 
-              "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://pbl.cocorobo.cn/pbl-student-table/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";
 
             _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(script3);
 
+              // _this.$refs.whiteBoard.contentWindow.document.body.appendChild(script3);
 
               _this.$refs.whiteBoard.contentWindow.document.body.appendChild(script4);
 
             };
 
           } else if (_this.toolCount == 3) {
 
-            const script1 = document.createElement("script");
 
-            script1.type = "text/javascript";
 
-            script1.src =
 
-              "https://pbl.cocorobo.cn/pbl-student-table/dist/jquery-3.6.0.min.js";
 
-            const script2 = document.createElement("script");
 
-            script2.type = "text/javascript";
 
-            script2.src =
 
-              "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://pbl.cocorobo.cn/pbl-student-table/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";
 
             _this.$refs.mind.onload = () => {
 
               _this.$refs.mind.contentWindow.document.body.appendChild(script1);
 
               _this.$refs.mind.contentWindow.document.body.appendChild(script2);
 
-              _this.$refs.mind.contentWindow.document.body.appendChild(script3);
 
+              // _this.$refs.mind.contentWindow.document.body.appendChild(script3);
 
               _this.$refs.mind.contentWindow.document.body.appendChild(script4);
 
             };
 
           } else if (_this.toolCount == 7) {
 
-            const script1 = document.createElement("script");
 
-            script1.type = "text/javascript";
 
-            script1.src =
 
-              "https://pbl.cocorobo.cn/pbl-student-table/dist/jquery-3.6.0.min.js";
 
-            const script2 = document.createElement("script");
 
-            script2.type = "text/javascript";
 
-            script2.src =
 
-              "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://pbl.cocorobo.cn/pbl-student-table/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";
 
             _this.$refs.grid.onload = () => {
 
               _this.$refs.grid.contentWindow.document.body.appendChild(script1);
 
               _this.$refs.grid.contentWindow.document.body.appendChild(script2);
 
-              _this.$refs.grid.contentWindow.document.body.appendChild(script3);
 
+              // _this.$refs.grid.contentWindow.document.body.appendChild(script3);
 
               _this.$refs.grid.contentWindow.document.body.appendChild(script4);
 
             };
 
           }
 
@@ -1335,6 +1331,7 @@ export default {
 
   beforeDestroy() {
 
     clearInterval(this.timer);
 
     this.timer = null;
 
+    // window.removeEventListener("message");
 
   },
 
   created() {
 
     // this.selectSWork();
 
@@ -1342,6 +1339,12 @@ export default {
 
     this.timer = setInterval(() => {
 
       _this.setPage();
 
     }, 1000);
 
+    // window.addEventListener("message", function (e) {
 
+    //   // 监听 message 事件
 
+    //   if (e.data.type && e.data.type == "shishi_canvas") {
 
+    //     console.log(e.data.data);
 
+    //   }
 
+    // });
 
   },
 
 };
 
 </script>

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.