PDF导出时间问题 loading问题

src/views/learning/item-course-analysis.vue

@@ -197,10 +197,7 @@ export default {
         pageNo: vm.pageNo,
         pageSize: vm.pageSize,
       };
-      // console.log("3 req", req);
-      // openLoading(vm);
       vm.POST("stats/report/course", req).then(res => {
-        // closeLoading(vm);
         if (res.code == "000000") {
           if (type !== 2) {
             vm.setCardData(res.data);

src/views/learning/item-crowd-analysis.vue

@@ -193,10 +193,7 @@ export default {
         regionId: vm.formInline.region[vm.formInline.region.length - 1],
         timeFlag: vm.formInline.timeFlag
       };
-      // console.log("2 req", req);
-      // openLoading(vm);
       vm.POST("stats/report/userAnalysis_pc/"+vm.radio, req).then(res => {
-        // closeLoading(vm);
         if (res.code == "000000") {
           // if(res.data.educationList.length == 0 && res.data.jobTitle.length == 0 ) {
           //   vm.$message("没有相关数据，请重新选择查询范围");

src/views/learning/item-data-all.vue

@@ -82,7 +82,7 @@
         </div>
       </div>
       <div class="spacing"></div>
-      <div class="chart-title">证书级别按学历发布情况</div>
+      <div class="chart-title">证书级别按学历分布情况</div>
       <div class="overflow-chart">
       <div v-if="showRecordChart === true" class="chart-recordChart">
         <div class="recordChart" id="recordChart" ref="recordChart"></div>
@@ -298,7 +298,7 @@
             </div>
           </el-table>
         </div>
-        <div class="chart-remarks">注：本报表数据来源仅包括有摸底考的课程培训。</div>
+        <div class="chart-remarks">注：成绩=完成项目要求的所有考试平均分（不包含摸底考试）</div>
         <div class="pagination">
           <el-pagination
             class="pagination"
@@ -531,9 +531,7 @@ export default {
       let reqInfo = {
         projectId: vm.projectId,
       };
-      openLoading(vm);
       vm.GET("stats/region/info", reqInfo).then(res => {
-        closeLoading(vm);
         if (res.code == "000000") {
           vm.certFlag = res.data.certFlag;
           vm.containOfficialFlag = res.data.containOfficialFlag;
@@ -582,10 +580,7 @@ export default {
         req.hospitalIdList = [];
         req.hospitalIdList[0] = vm.hospitalCutList[0].hospitalId;
       }
-      openLoading(vm);
-      // console.log("0 req", req);
       vm.POST("stats/report/generalPersonal/"+vm.tableType, req).then(res => {
-        closeLoading(vm);
         if (res.code == "000000") {
           if(type != 1) {
             vm.initCard(res.data.percentData);
@@ -610,10 +605,7 @@ export default {
         regionId: vm.formInline.region[vm.formInline.region.length - 1],
         timeFlag: vm.formInline.timeFlag,
       };
-      openLoading(vm);
-      // console.log("0 req", req);
       vm.POST("stats/report/general_pc", req).then(res => {
-        closeLoading(vm);
         if (res.code == "000000") {
           vm.initCard(res.data.percentData);
           if(vm.certFlag !== 0) {
@@ -659,12 +651,7 @@ export default {
           pageSize: vm.formDwmy.pageSize,
         };
       }
-      // openLoading(vm);
-      // if(req.regionId == '000') {
-      //   req.regionId = '0';
-      // }
       vm.POST("stats/dwmy/", req).then(res => {
-        // closeLoading(vm);
         if (res.code == "000000") {
           vm.tableDateTime = res.data.list;
           vm.totalCount = res.data.totalCount;

src/views/learning/item-examination-analysis.vue

@@ -243,10 +243,7 @@ export default {
         regionId: vm.formInline.region[vm.formInline.region.length - 1],
         timeFlag: vm.formInline.timeFlag
       };
-      // console.log("4 req", req);
-      // openLoading(vm);
       vm.POST("stats/report/exam", req).then(res => {
-        // closeLoading(vm);
         if (res.code == "000000") {
           vm.examData = res.data;
           vm.setCardData(res.data);

src/views/learning/item-learning-effect.vue

@@ -16,7 +16,7 @@
     <div v-if="showChartEdu === false" class="empty-img">
       <img src="../../assets/image/noData.png" />
     </div>
-    <div class="chart-remarks">注：本报表数据来源仅仅统计同时包含摸底考和正式考的课程培训。</div>
+    <div class="chart-remarks">注：本报表数据来源仅统计同时包含摸底考和正式考的课程培训。</div>
     <div class="spacing"></div>
     <div class="chart-title">培训前后知识点掌握情况</div>
     <div v-if="showChartLearn === true" class="overflow-chart">
@@ -25,7 +25,7 @@
     <div v-if="showChartLearn === false" class="empty-img">
       <img src="../../assets/image/noData.png" />
     </div>
-    <div class="chart-remarks">注：本报表数据来源仅仅统计同时包含摸底考和正式考的课程培训。</div>
+    <div class="chart-remarks">注：本报表数据来源仅统计同时包含摸底考和正式考的课程培训。</div>
   </div>
 </template>
 
@@ -106,9 +106,7 @@ export default {
         regionId: vm.formInline.region[vm.formInline.region.length - 1],
         timeFlag: vm.formInline.timeFlag
       };
-      // openLoading(vm);
       vm.POST("stats/report/studyEffect", req).then(res => {
-        // closeLoading(vm);
         if (res.code == "000000") {
           vm.initCard(res.data);
           setTimeout(function() {

src/views/learning/item-list.vue

@@ -428,9 +428,7 @@ export default {
       let reqInfo = {
         projectId: vm.projectId,
       };
-      openLoading(vm);
       vm.GET("stats/region/info", reqInfo).then(res => {
-        // closeLoading(vm);
         if (res.code == "000000") {
           vm.showOriginal = res.data.status;
           vm.roleType = res.data.roleType;
@@ -592,9 +590,7 @@ export default {
       let req = {
         projectId: vm.projectId,
       };
-      openLoading(vm);
       vm.GET("stats/region", req).then(res => {
-        closeLoading(vm);
         if (res.code == "000000") {
           vm.formInline.region = [];
           vm.formInline.region[0] = res.data.list[0].id;
@@ -627,9 +623,7 @@ export default {
         projectId: vm.projectId,
         regionId : regionId
       };
-      openLoading(vm);
       vm.GET("stats/region/hospital", req).then(res => {
-        closeLoading(vm);
         if (res.code == "000000") {
           this.organizationList = operationData.getLearnOrganization(
             res.data.list
@@ -862,19 +856,18 @@ export default {
       if(element == null) {
         return
       }
-      let opts = {
-        scale:window.devicePixelRatio, // 添加的scale 参数
-        logging: true, //日志开关
-        width:element.offsetWidth, //dom 原始宽度
-        height:element.offsetHeight, //dom 原始高度
-        useCORS: true,
-        taintTest: true, //是否在渲染前测试图片
-        dpi:300
-      };
+      // let opts = {
+      //   scale:window.devicePixelRatio, // 添加的scale 参数
+      //   logging: true, //日志开关
+      //   width:element.offsetWidth, //dom 原始宽度
+      //   height:element.offsetHeight, //dom 原始高度
+      //   useCORS: true,
+      //   taintTest: true, //是否在渲染前测试图片
+      //   dpi:300
+      // };
       vm.showRadio = 1;
-      console.log('导出参数opts',opts);
       setTimeout(() => {
-        html2Canvas(element,opts).then(function(canvas) {
+        html2Canvas(element).then(function(canvas) {
           let contentWidth = canvas.width;
           let contentHeight = canvas.height;
 
@@ -888,13 +881,13 @@ export default {
           let imgWidth = 595.28;
           let imgHeight = 592.28 / contentWidth * contentHeight;
 
-          // let pageData = canvas.toDataURL('image/jpeg', 1.0);
-          let pageData = canvas.toDataURL('image/png');
+          let pageData = canvas.toDataURL('image/jpeg', 1.0);
+          // let pageData = canvas.toDataURL('image/png');
 
           let pdf = new JsPDF('', 'pt', [contentWidth*0.8,contentHeight*0.8]);
           
-          // pdf.addImage(pageData, 'JPEG', 0, position, contentWidth*0.8, contentHeight*0.8)
-          pdf.addImage(pageData, 'PNG', 0, position, contentWidth*0.8, contentHeight*0.8)
+          pdf.addImage(pageData, 'JPEG', 0, position, contentWidth*0.8, contentHeight*0.8)
+          // pdf.addImage(pageData, 'PNG', 0, position, contentWidth*0.8, contentHeight*0.8)
 
           let title = "导出学情报告";
           pdf.save(title + '.pdf');

src/views/learning/report-list.vue

@@ -133,9 +133,9 @@ export default {
     search() {
       let req = {};
       req = this.formData;
-      openLoading(vm);
+
       vm.GET("portal/portalInfo/getPortalReportProject", req).then(res => {
-        closeLoading(vm);
+
         if (res.code == "000000") {
           if(res.data.totalRows == 0) {
             vm.$message("没有找到符合的结果");