|
|
@@ -2729,9 +2729,9 @@
|
|
|
layer.add(backgroup);
|
|
|
backgroup.zIndex(0)
|
|
|
layer.batchDraw();
|
|
|
- var snippingPage = JSON.parse(localStorage.getItem('slide'))
|
|
|
- var dataURL = stage.toDataURL();
|
|
|
- that.$store.state.imgArr[snippingPage - 1] = dataURL
|
|
|
+ //var snippingPage = JSON.parse(localStorage.getItem('slide'))
|
|
|
+ //var dataURL = stage.toDataURL();
|
|
|
+ //that.$store.state.imgArr[snippingPage - 1] = dataURL
|
|
|
}
|
|
|
promiseArr.push(that.doRender(stage, layer, trx, res.item, callUrl, spacename));
|
|
|
//处理超过尺寸背景图END
|
|
|
@@ -2846,13 +2846,13 @@
|
|
|
var filelength = this.$store.state.imgArr.length
|
|
|
console.log(filelength,'数组长度')
|
|
|
console.log(spacename, '命名空间')
|
|
|
- //if (slidePage == 1) {
|
|
|
- // if (spacename == 'container') { this.prestrain() }
|
|
|
- //} else if (slidePage === filelength){
|
|
|
- // if (spacename == 'container') { this.prestrain() }
|
|
|
- //}else{
|
|
|
- // if (spacename == 'container' || spacename == 'nextPagebox') { this.prestrain() }
|
|
|
- //}
|
|
|
+ if (slidePage == 1) {
|
|
|
+ if (spacename == 'container') { this.prestrain() }
|
|
|
+ } else if (slidePage === filelength){
|
|
|
+ if (spacename == 'container') { this.prestrain() }
|
|
|
+ }else{
|
|
|
+ if (spacename == 'container' || spacename == 'nextPagebox') { this.prestrain() }
|
|
|
+ }
|
|
|
console.log(this.$store.state.imgArr)
|
|
|
console.log(res)
|
|
|
that.$refs.Pdf.$refs.pdfPreview.simgs('1')
|
|
|
@@ -2979,18 +2979,20 @@
|
|
|
console.log(res)
|
|
|
r(200)
|
|
|
console.log('可以验证截图')
|
|
|
- var snippingPage = JSON.parse(localStorage.getItem('slide'))
|
|
|
- var dataURL = stage.toDataURL();
|
|
|
- //console.log(dataURL, '截图')
|
|
|
- console.log(snippingPage,'页数！！！！')
|
|
|
- //console.log(that.$store.state.imgArr)
|
|
|
- if (spacename === 'container') {
|
|
|
- that.$store.state.imgArr[snippingPage - 1] = dataURL
|
|
|
- } else if (spacename === 'nextPagebox') {
|
|
|
- that.$store.state.imgArr[snippingPage] = dataURL
|
|
|
- } else if (spacename === 'lastPagebox') {
|
|
|
- that.$store.state.imgArr[snippingPage - 2] = dataURL
|
|
|
- }
|
|
|
+ setTimeout(() => {
|
|
|
+ var snippingPage = JSON.parse(localStorage.getItem('slide'))
|
|
|
+ var dataURL = stage.toDataURL();
|
|
|
+ //console.log(dataURL, '截图')
|
|
|
+ console.log(snippingPage, '页数！！！！')
|
|
|
+ //console.log(that.$store.state.imgArr)
|
|
|
+ if (spacename === 'container') {
|
|
|
+ that.$store.state.imgArr[snippingPage - 1] = dataURL
|
|
|
+ } else if (spacename === 'nextPagebox') {
|
|
|
+ that.$store.state.imgArr[snippingPage] = dataURL
|
|
|
+ } else if (spacename === 'lastPagebox') {
|
|
|
+ that.$store.state.imgArr[snippingPage - 2] = dataURL
|
|
|
+ }
|
|
|
+ },1500)
|
|
|
//that.$refs.Pdf.$refs.pdfPreview.simgs('1')
|
|
|
})
|
|
|
}
|
