|
@@ -140,25 +140,29 @@ export class QvEvent {
|
|
let BABYLON = objThreeWorldEventMain.BABYLON;
|
|
let BABYLON = objThreeWorldEventMain.BABYLON;
|
|
let ChengGuangYuanJing = objIframe.ChengGuangYuanJing;
|
|
let ChengGuangYuanJing = objIframe.ChengGuangYuanJing;
|
|
|
|
|
|
- objIframe.html2canvas(
|
|
|
|
- objIframe.$(objHtml),
|
|
|
|
- {
|
|
|
|
- allowTaint: true,
|
|
|
|
- taintTest: false,
|
|
|
|
- onrendered: function(canvas) {
|
|
|
|
-
|
|
|
|
- canvas.id = "mycanvas";
|
|
|
|
- // 生成base64图片数据
|
|
|
|
- var dataUrl = canvas.toDataURL();
|
|
|
|
- // console.log(
|
|
|
|
- // "生成的图片", dataUrl
|
|
|
|
- // );
|
|
|
|
-
|
|
|
|
- thisClass.callbackScreenshot(dataUrl);
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- );
|
|
|
|
|
|
+ // 优先将三维里面进行截图
|
|
|
|
+ let screenshotIframe = ChengGuangYuanJing.CommonVal.find().screenshot();
|
|
|
|
+ thisClass.callbackScreenshot(screenshotIframe);
|
|
|
|
+
|
|
|
|
+ // objIframe.html2canvas(
|
|
|
|
+ // objIframe.$(objHtml),
|
|
|
|
+ // {
|
|
|
|
+ // allowTaint: true,
|
|
|
|
+ // taintTest: false,
|
|
|
|
+ // onrendered: function(canvas) {
|
|
|
|
+
|
|
|
|
+ // canvas.id = "mycanvas";
|
|
|
|
+ // // 生成base64图片数据
|
|
|
|
+ // var dataUrl = canvas.toDataURL();
|
|
|
|
+ // // console.log(
|
|
|
|
+ // // "生成的图片", dataUrl
|
|
|
|
+ // // );
|
|
|
|
+
|
|
|
|
+ // thisClass.callbackScreenshot(dataUrl);
|
|
|
|
+
|
|
|
|
+ // }
|
|
|
|
+ // }
|
|
|
|
+ // );
|
|
|
|
|
|
return thisClass;
|
|
return thisClass;
|
|
|
|
|