zengyicheng 2 years ago
parent
commit
502ae803c8

+ 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.1d01a752a1c40034c741eb935310d835.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.ad3e423827c099209651.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.d1fc717b314708ca577df62fe140013b.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.f9b1ec33a931cb37377a.js></script></body></html><script>document.domain = "cocorobo.cn"</script>

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


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


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


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


+ 20 - 18
src/components/liveProjectDetail.vue

@@ -1214,24 +1214,26 @@ export default {
       }
       iframeBody = iframeHtml.contentWindow.document.body;
       // 第一个参数是需要生成截图的元素,第二个是自己需要配置的参数,宽高等
-      html2canvas(iframeBody, {
-        backgroundColor: null, //画出来的图片有白色的边框,不要可设置背景为透明色(null)
-        useCORS: true, //支持图片跨域
-        scale: 1, //设置放大的倍数
-      }).then((canvas) => {
-        // 把生成的base64位图片上传到服务器,生成在线图片地址
-        let url = canvas.toDataURL("image/png"); // toDataURL: 图片格式转成 base64
-        this.imgUrl = url; //将图片下载到本地
-        let a = document.createElement("a"); // 生成一个a元素
-        let event = new MouseEvent("click"); // 创建一个单击事件
-        a.download = "作业"; // 设置图片名称没有设置则为默认
-        a.href = this.imgUrl; // 将生成的URL设置为a.href属性
-        a.dispatchEvent(event); // 触发a的单击事件
-        let file = this.dataURLtoFile(url, "作业");
-        this.imgFile = file;
-        this.beforeUpload2(this.imgFile);
-        this.addSWork();
-        console.log(this.imgFile);
+      return new Promise(function (resolve, reject) {
+        html2canvas(iframeBody, {
+          backgroundColor: null, //画出来的图片有白色的边框,不要可设置背景为透明色(null)
+          useCORS: true, //支持图片跨域
+          scale: 1, //设置放大的倍数
+        }).then((canvas) => {
+          // 把生成的base64位图片上传到服务器,生成在线图片地址
+          let url = canvas.toDataURL("image/png"); // toDataURL: 图片格式转成 base64
+          this.imgUrl = url; //将图片下载到本地
+          let a = document.createElement("a"); // 生成一个a元素
+          let event = new MouseEvent("click"); // 创建一个单击事件
+          a.download = "作业"; // 设置图片名称没有设置则为默认
+          a.href = this.imgUrl; // 将生成的URL设置为a.href属性
+          a.dispatchEvent(event); // 触发a的单击事件
+          let file = this.dataURLtoFile(url, "作业");
+          this.imgFile = file;
+          this.beforeUpload2(this.imgFile);
+          this.addSWork();
+          console.log(this.imgFile);
+        });
       });
     },
     dataURLtoFile(dataurl, filename) {

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