Ver Fonte

Merge branch 'http_mock' of git.xiaojukeji.com:jacklijiajia/thoth-frontend into http_mock

qinzhipeng_v há 5 anos atrás
pai
commit
68ede4ffaf

+ 4 - 4
src/views/Platform/presentation/Templates/DailyReport.vue

@@ -179,9 +179,9 @@ export default {
         var ele = this.preview
         setTimeout(() => {
           const targetDom = document.getElementById('Gambol')
-          var copyDom = targetDom.cloneNode(true)
-          document.querySelector('body').appendChild(copyDom)
-          html2canvas(document.getElementsByClassName('reportContent')[1], { useCORS: true }).then(canvas => {
+          // var copyDom = targetDom.cloneNode(true)
+          // document.querySelector('body').appendChild(copyDom)
+          html2canvas(document.getElementsByClassName('reportContent')[0], { useCORS: true }).then(canvas => {
             var url = canvas.toDataURL('image/png', 1)
             url = url.toString().substring(url.indexOf(',') + 1)
             var postData = { 'reportId': ele.id, 'imgStr': url, 'url': window.location.href, 'emailUser': e.name, 'copyTo': e.names }
@@ -189,7 +189,7 @@ export default {
               res.code === 200 ? this.$message({ type: 'success', message: '发送测试报告成功' }) : this.$message({ type: 'error', message: '发送测试报告失败,请联系管理员!' })
               this.send = false
               this.handleClose()
-              document.querySelector('body').removeChild(copyDom)
+              // document.querySelector('body').removeChild(copyDom)
               loading.close()
             })
           })

+ 2 - 2
src/views/Platform/presentation/testPresenyL.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 日报预览 -->
-  <div class="reportContent">
-    <el-form :model="fromCreat" class="from-creat">
+  <div>
+    <el-form :model="fromCreat" class="from-creat reportContent">
       <div style="display: flex; white-space: nowrap; font-family:SimSuncss">
         <span style="flex:1;font-weight: bold;font-size: 24px;color: #3a8ee6">{{ fromCreat.reportName }}</span>
         <span style="flex:2;margin: 0.5% 0 0 20px;font-size: 17px;">by {{ fromCreat.ownner }}</span>