发送邮件（日报优化）

src/views/Platform/presentation/DailyNewsAdded.vue

@@ -256,6 +256,8 @@ export default {
 
     // 更新bug提交
     getQueryData(ele) {
+      debugger
+      console.log(ele)
       this.fromCreateData = ele
       this.fromCreateData.taskId === 0 ? this.fromCreateData.taskId = '' : ''
       this.fromCreateData.projectId === 0 ? this.fromCreateData.projectId = '' : ''

src/views/Platform/presentation/testPresenyL.vue

@@ -4,11 +4,11 @@
     <div style="height:100%;width:94%; background:#ffffff; margin: 3% 3% 8% 3%; border-radius: 8px; overflow: hidden;">
       <el-form :model="fromCreat" style="margin:2% 9%">
         <div>
-          <div style="display: flex; font-size: 19px;  white-space: nowrap; font-weight: bold;">
-            <span style="flex:1;">{{ fromCreat.reportName }}</span>
-            <span style="flex:1;">by : {{ fromCreat.ownner }}
-              <el-button v-show="btn" type="primary" size="mini" style="margin:0 2% 0 15%;" @click="dialogTableVisible = true, setdia">发送报告</el-button>
-              <el-button v-show="btn" size="mini" @click="download()">下载测试报告</el-button>
+          <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 }}
+              <el-button v-show="btn" type="primary" size="mini" style="margin:0 2% 0 5%;" @click="dialogTableVisible = true">发送报告</el-button>
+              <el-button v-show="btn" size="mini" @click="dialogTableVisible = true">下载测试报告</el-button>
             </span>
           </div>
           <div style="font-size:15px;color:#606266;" class="rich" v-html="projectProgress" />
@@ -17,7 +17,6 @@
           <!-- <div style="font-size:15px;color:#606266;" class="rich" v-html="TestProgress" /> -->
 
           <div class="titleStyle">三. bug情况</div>
-
           <div style="border: 1px,solid #ccc;font-size:14px;color:#606266;">
             <div style="margin: 1%;">1、bug统计</div>
             <div style="display:flex;">
@@ -32,34 +31,33 @@
         <el-button v-show="btn" style="float:right; margin:2% 50%;" @click="$router.go(-1)"> 返 回 </el-button>
       </el-form>
     </div>
-    <el-dialog title="收货地址" :visible.sync="dialogTableVisible">
+    <el-dialog title="邮件预览" width="70%" center :visible.sync="dialogTableVisible" @open="dasd()">
+      <div align="center">
+        <el-button type="primary" size="mini" @click="promptEmail(fromCreat)">确定发送</el-button>
+        <el-button size="mini" @click="download()">确定下载</el-button>
+      </div>
       <div id="Gambol" class="eleStyle">
         <div style="height:100%;width:94%; background:#ffffff; margin: 3% 3% 8% 3%; border-radius: 8px; overflow: hidden;">
           <el-form :model="fromCreat" style="margin:2% 9%">
             <div>
-              <div style="display: flex; font-size: 19px;  white-space: nowrap; font-weight: bold;">
-                <span style="flex:1;">{{ fromCreat.reportName }}</span>
-                <span style="flex:1;">by : {{ fromCreat.ownner }}
-                  <el-button v-show="btn" type="primary" size="mini" style="margin:0 2% 0 15%;" @click="promptEmail(fromCreat)">发送报告</el-button>
-                  <el-button v-show="btn" size="mini" @click="download()">下载测试报告</el-button>
+              <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:1% 0 0 20px;font-size: 17px;">by {{ fromCreat.ownner }}
                 </span>
               </div>
               <div style="font-size:15px;color:#606266;" class="rich" v-html="projectProgress" />
-
               <div class="titleStyle">三. bug情况</div>
-
               <div style="border: 1px,solid #ccc;font-size:14px;color:#606266;">
                 <div style="margin: 1%;">1、bug统计</div>
                 <div style="display:flex;">
-                  <div id="lineShow" style="flex:2; width: 800px;height:400px;" />
+                  <div id="lineShow1" style="flex:2; width: 800px;height:400px;" />
                   <div style="flex:1; width: 400px;height:400px;" />
-                  <div id="barShow" style="flex:2; width: 800px;height:400px;" />
+                  <div id="barShow1" style="flex:2; width: 800px;height:400px;" />
                 </div>
                 <div style="margin: 1%;">2、bug说明</div>
                 {{ bugshow }}
               </div>
             </div>
-            <el-button v-show="btn" style="float:right; margin:2% 50%;" @click="$router.go(-1)"> 返 回 </el-button>
           </el-form>
         </div>
       </div>
@@ -97,13 +95,10 @@ export default {
   },
   created() {
     this.idGet()
-    window.pageYOffset = 0
-    document.documentElement.scrollTop = 0
-    document.body.scrollTop = 0
   },
   methods: {
-    setdia() {
-      this.promptEmail(this.fromCreat)
+    dasd() {
+      this.idGet()
     },
     idGet() {
       dailyReport({ id: this.$route.query.id }).then((res) => {
@@ -141,6 +136,27 @@ export default {
             yAxis: [{}],
             series: this.statusMap
           })
+          if (document.getElementById('lineShow1')) {
+            echarts.init(document.getElementById('lineShow1')).setOption({
+              title: { left: 'center', text: 'bug数量汇总' },
+              tooltip: { trigger: 'axis' },
+              legend: { top: 30, data: this.bugName },
+              grid: { left: '5%', right: '25%', bottom: '12%', containLabel: true },
+              xAxis: { type: 'category', boundaryGap: true, data: this.dateList },
+              yAxis: { type: 'value' },
+              series: this.numList
+            })
+            echarts.init(document.getElementById('barShow1')).setOption({
+              title: { text: 'bug状态汇总', x: 'center' },
+              color: ['#003366', '#006699', '#4cabce', '#e5323e'],
+              tooltip: { trigger: 'axis' },
+              legend: { top: 30, data: this.statusMap },
+              grid: { left: '5%', right: '25%', bottom: '12%', containLabel: true },
+              xAxis: [{ data: this.statusList }],
+              yAxis: [{}],
+              series: this.statusMap
+            })
+          }
         })
       })
     },
@@ -162,14 +178,12 @@ export default {
       var node = document.getElementById('Gambol')
       setTimeout(() => {
         var that = this
-        that.btn = false
         html2canvas(node, { useCORS: true }).then(function(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 }
           dailyReportSendmail(postData).then(res => {
             res.code === 200 ? that.$message({ type: 'success', message: '发送测试报告成功' }) : that.$message({ type: 'error', message: '发送测试报告失败，请联系管理员！' })
-            that.btn = true
           })
         })
       }, 1000)
@@ -187,7 +201,7 @@ export default {
   }
   .titleStyle {
     color: #333B4A;
-    margin: 3% 0 1% 0;
+    margin: 1% 0 1% 0;
     font-size: 19px;
     font-weight: bold;
   }