#

src/assets/icon/exportPdfworks/title.svg

@@ -0,0 +1,14 @@
+<svg width="368" height="57" viewBox="0 0 368 57" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M117.688 46.777V55.9473H63.2007V46.8143H86.2352V36.8798H66.4718V27.6443H86.2258V17.0264H74.4741C74.21 18.4212 73.9522 19.8347 73.6757 21.245C73.4055 22.6367 73.6353 22.3726 72.284 22.382C69.569 22.4006 66.8508 22.3882 64.1358 22.3882H63.1728C64.4061 15.5757 65.6238 8.86576 66.8477 2.11853H77.1332C76.7946 4.00726 76.4653 5.84628 76.1267 7.75054H86.2724V0.0527344H96.6076V7.7785H115.392V16.955H96.707V27.5977H115.094V36.8363H96.7101V46.777H117.697H117.688Z" fill="#5C5046"/>
+<path d="M280.989 56.286H270.872V0.959961H305.307C305.307 1.24265 305.307 1.51602 305.307 1.79249C305.307 4.86478 305.403 7.94328 305.273 11.0094C305.192 12.926 304.779 14.8303 304.487 16.7377C304.462 16.9023 304.213 17.1602 304.07 17.1602C300.84 17.185 297.612 17.1788 294.36 17.1788C294.708 14.8272 295.046 12.544 295.4 10.1706H281.005V19.4248H305.574C305.602 19.6453 305.639 19.7913 305.639 19.9373C305.642 22.7518 305.652 25.5662 305.633 28.3807C305.633 28.7845 305.512 29.1946 305.4 29.586C304.279 33.556 303.135 37.5199 302.033 41.493C301.918 41.9093 301.918 42.4188 302.048 42.8319C303.353 47.0163 304.695 51.1914 306.027 55.3696C306.111 55.6337 306.189 55.9039 306.288 56.227H296.015C295.379 54.2109 294.735 52.1793 294.092 50.1445C294.037 50.1383 293.978 50.129 293.922 50.1228C293.366 52.1389 292.813 54.1519 292.244 56.2146H282.182C282.241 55.935 282.291 55.6678 282.356 55.4038C283.412 51.2784 284.484 47.1592 285.512 43.0276C285.634 42.5399 285.627 41.9528 285.475 41.4744C284.431 38.1536 283.335 34.8483 282.257 31.5368C282.164 31.2448 282.083 30.9497 281.98 30.6049H292.35C292.763 31.804 293.173 32.9876 293.58 34.1742C293.639 34.1804 293.701 34.1836 293.76 34.1898C294.288 32.3849 294.813 30.5801 295.357 28.7193H280.993V56.2922L280.989 56.286Z" fill="#5C5046"/>
+<path d="M31.7636 44.9415C31.7636 46.3922 31.6797 47.7621 31.7822 49.1135C31.9499 51.2911 31.4902 53.2606 30.434 55.1804C29.9556 56.0471 29.5207 56.3826 28.5204 56.3546C25.6749 56.2738 22.8294 56.3267 19.9808 56.3267H18.9805C19.3688 55.5221 19.6515 54.7859 20.0584 54.1242C21.2513 52.1889 21.7266 50.12 21.506 47.8584C21.4159 46.9389 21.4905 46.007 21.4905 45.0005H0V35.8396H21.4625C21.3383 35.0692 21.8539 34.8362 22.3479 34.5535C25.2493 32.9102 28.1414 31.2513 31.0366 29.5987C31.2789 29.4589 31.5212 29.3129 31.7387 29.0271H4.46088V19.9189H50.4303C50.452 20.0805 50.4955 20.2513 50.4955 20.4222C50.4986 23.0565 50.4862 25.6907 50.511 28.325C50.5141 28.791 50.3278 28.9991 49.9457 29.201C46.0781 31.2265 42.2199 33.2705 38.3586 35.3083C38.1411 35.4233 37.9299 35.5538 37.7466 35.8116H55.5777V44.9353H31.7636V44.9415Z" fill="#5C5046"/>
+<path d="M144.199 56.2363C144.908 54.7732 145.616 53.4001 146.237 51.9898C146.476 51.4461 146.619 50.8186 146.638 50.2253C146.691 48.5012 146.657 46.774 146.657 44.9754H125.163V35.8144H146.585C146.539 35.7368 146.489 35.6622 146.442 35.5846C146.75 35.2739 147.004 34.8763 147.371 34.6619C150.341 32.9347 153.332 31.2417 156.318 29.5394C156.516 29.4244 156.709 29.3002 157.113 29.0548H129.63V19.9062H175.668C175.668 20.1983 175.668 20.4716 175.668 20.745C175.668 23.1991 175.646 25.6501 175.683 28.1042C175.693 28.6944 175.528 29.0113 174.987 29.294C171.226 31.2417 167.485 33.2268 163.736 35.2025C163.466 35.3454 163.205 35.5007 162.959 35.7927H180.753V44.9381H156.945C156.945 46.1807 156.945 47.3363 156.945 48.495C156.945 48.5975 156.933 48.7031 156.945 48.8056C157.296 51.3498 156.566 53.6424 155.268 55.7859C155.122 56.0251 154.792 56.3015 154.547 56.3046C151.211 56.3388 147.871 56.3264 144.535 56.3202C144.46 56.3202 144.386 56.286 144.196 56.2363H144.199Z" fill="#5C5046"/>
+<path d="M367.997 27.9863H314.013V18.8906H336.994V13.3984H324.901C324.575 14.7218 324.236 16.0855 323.898 17.4585H313.23C314.591 11.8452 315.939 6.28461 317.287 0.720936H327.948C327.694 1.84547 327.448 2.9172 327.184 4.07591H337.013V0.236328H347.336V4.12562H366.18V13.3176H347.417V18.8471H368V27.9863H367.997Z" fill="#5C5046"/>
+<path d="M316.036 32.2451H365.466V55.9443H316.036V32.2451ZM326.303 46.7585H355.14V41.403H326.303V46.7585Z" fill="#5C5046"/>
+<path d="M190.414 10.8794V1.67188H241.776C241.776 1.96078 241.776 2.23725 241.776 2.51062C241.776 14.7998 241.816 27.092 241.736 39.3812C241.723 41.3973 241.198 43.4103 240.878 45.4233C240.31 48.9895 239.719 52.5526 239.129 56.1747H228.8C229.235 53.3758 229.667 50.6048 230.102 47.837C230.534 45.0847 230.975 42.3354 231.403 39.5831C231.447 39.3035 231.453 39.0177 231.453 38.7351C231.453 29.6984 231.453 20.6617 231.453 11.625C231.453 11.3982 231.431 11.1714 231.416 10.8825H190.411L190.414 10.8794Z" fill="#5C5046"/>
+<path d="M252.643 56.2025C253.811 50.8408 255.37 45.5101 254.544 39.875C253.025 40.3006 251.44 40.7448 249.778 41.2108C249.778 38.9741 249.778 36.8338 249.778 34.6965C249.778 33.8454 249.806 32.9911 249.769 32.1399C249.744 31.6273 249.934 31.4254 250.425 31.3043C251.68 30.9936 252.925 30.6426 254.159 30.2574C254.376 30.1891 254.671 29.8753 254.674 29.6734C254.705 26.3153 254.693 22.9603 254.687 19.6022C254.687 19.5308 254.649 19.4593 254.606 19.3071H249.847V9.81999H254.693V0.112305H264.941V9.81689H269.411V19.2698H265.009V27.1851C266.488 26.7844 267.926 26.3961 269.427 25.9922C269.442 26.3091 269.464 26.5359 269.464 26.7626C269.464 29.4994 269.449 32.2393 269.48 34.9761C269.486 35.5291 269.303 35.7372 268.787 35.8583C267.756 36.1006 266.749 36.4517 265.715 36.6816C265.127 36.812 264.935 37.0605 264.947 37.6694C264.988 39.8905 264.922 42.1116 264.975 44.3328C265.025 46.383 264.851 48.3929 264.36 50.3904C263.931 52.1455 263.633 53.9286 263.229 55.69C263.173 55.9354 262.86 56.3051 262.661 56.3051C259.427 56.3392 256.193 56.3268 252.959 56.3175C252.888 56.3175 252.817 56.2709 252.643 56.2088V56.2025Z" fill="#5C5046"/>
+<path d="M125.853 17.94V5.30917H131.829C131.466 3.4981 131.127 1.79887 130.776 0.0499314H141.316C141.664 1.7678 142.009 3.47946 142.363 5.23151H147.383C147.048 3.51363 146.716 1.80508 146.364 0.0126539C147.045 0.0126539 147.685 0.0126539 148.325 0.0126539C150.962 0.0126539 153.603 0.0250798 156.24 0.000228079C156.771 -0.00598484 157.007 0.112061 157.104 0.683649C157.358 2.20581 157.697 3.71245 158.014 5.2781C159.71 5.2781 161.362 5.29674 163.012 5.25325C163.205 5.24704 163.481 4.92086 163.565 4.68788C164.065 3.30861 164.503 1.90759 165.006 0.531433C165.087 0.313981 165.404 0.0375056 165.612 0.0375056C169.026 0.00954746 172.443 0.0188668 175.857 0.0250798C175.926 0.0250798 175.997 0.0623573 176.121 0.0965284C175.54 1.78644 174.969 3.46393 174.351 5.25947H178.697V17.9431H168.451V14.4857H136.126V17.9431H125.853V17.94Z" fill="#5C5046"/>
+<path d="M0.698792 17.9462V5.28737H6.64766C6.29042 3.49494 5.94871 1.79881 5.59147 0.012597C6.21586 0.012597 6.75328 0.012597 7.2907 0.012597C10.0057 0.012597 12.7239 0.0281293 15.4389 0.000171205C15.9919 -0.00604171 16.1938 0.155494 16.287 0.705338C16.5417 2.20576 16.8741 3.69375 17.1817 5.23145H22.2017C21.8662 3.50426 21.5369 1.82056 21.1921 0.0685133C21.4468 0.0498746 21.6674 0.0157035 21.888 0.0157035C24.9416 0.012597 27.9921 0.0312358 31.0458 0.000171205C31.636 -0.00604171 31.8379 0.183452 31.9374 0.751935C32.1952 2.24925 32.5245 3.73414 32.8351 5.28115C34.5312 5.28115 36.1808 5.29669 37.8334 5.2563C38.0136 5.2532 38.2621 4.93944 38.346 4.71888C38.8523 3.34272 39.3059 1.94792 39.8215 0.574866C39.9054 0.348095 40.2036 0.0436617 40.4025 0.0405552C43.8413 0.012597 47.2833 0.0250229 50.7252 0.0312358C50.7718 0.0312358 50.8184 0.0654069 50.9365 0.11511C50.3587 1.80813 49.7746 3.50736 49.1627 5.29669H53.49V17.9462H43.2946V14.4856H10.9594V17.9524H0.698792V17.9462Z" fill="#5C5046"/>
+<path d="M189.907 52.1267V51.2351C189.907 48.2405 189.926 45.2459 189.892 42.2512C189.885 41.6362 190.081 41.3504 190.64 41.1112C200.211 37.0417 209.776 32.9505 219.341 28.8655C222.096 27.6882 224.849 26.5108 227.604 25.3366C227.859 25.2278 228.123 25.1346 228.433 25.0166C228.452 25.2527 228.474 25.4235 228.474 25.5975C228.474 28.7723 228.468 31.9471 228.483 35.125C228.483 35.5661 228.365 35.7991 227.933 35.9824C215.464 41.2851 203.001 46.6034 190.535 51.9154C190.373 51.9838 190.202 52.0273 189.904 52.1298L189.907 52.1267Z" fill="#5C5046"/>
+<path d="M199.568 14.7871H210.292C211.643 19.6301 212.998 24.4917 214.371 29.4154C214.107 29.4403 213.914 29.4776 213.718 29.4776C210.562 29.4807 207.406 29.4776 204.253 29.4838C203.874 29.4838 203.582 29.4869 203.448 28.9961C202.178 24.3674 200.883 19.745 199.596 15.1195C199.568 15.0232 199.578 14.9176 199.568 14.7871Z" fill="#5C5046"/>
+</svg>

src/components/pages/components/exjsmind.vue

@@ -24,7 +24,6 @@ export default {
   },
   mounted() {
     console.log('treeData',this.treeData);
-    
     this.createMindMap();
   },
   watch: {
@@ -75,6 +74,9 @@ export default {
 
 
       elements.style.height = `${jm.view.size.h}px`;
+      window.onresize = () => {
+        jm.resize();
+      };
       // elements.style.width = `${jm.view.size.w * sw}px`;
 
       // jm.view.minZoom = sw; 

src/components/pages/components/exportDataDialog.vue

@@ -30,7 +30,7 @@
           <div class="coverPageFromTit">
             <img
               style="width: 90%;"
-              src="../../../assets/icon/exportPdfworks/title.png"
+              src="../../../assets/icon/exportPdfworks/title.svg"
               alt=""
             />
           </div>
@@ -70,7 +70,11 @@
             </div>
             <div>
               <span>指导老师:</span>
-              <div class="txt" style="transform: translate(-2em, 0px);">{{ worksDialogCon2.uname }}</div>
+              <div class="txt">
+                <div style="transform: translate(-1em, 0px);">
+                  {{ worksDialogCon2.uname }}
+                </div>
+              </div>
             </div>
           </div>
         </div>
@@ -436,7 +440,10 @@
             v-for="(l, lind) in k.toolEList"
             :key="lind + 'l'"
           >
-            <div style="padding: 10px 16px;box-sizing: border-box;" v-if="l.content && l.content.length">
+            <div
+              style="padding: 10px 16px;box-sizing: border-box;"
+              v-if="l.content && l.content.length"
+            >
               <div v-if="l.tool[0] == 15">
                 <div class="toolBlk">
                   <img
@@ -529,6 +536,7 @@
                 <img
                   @click.stop="previewImg(l.content[0])"
                   style="max-width: 200px"
+                  v-if="isDown"
                   :src="l.content[0]"
                   alt=""
                 />
@@ -642,6 +650,7 @@
                               @click.stop="previewImg(item2.src)"
                             >
                               <img
+                                v-if="isDown"
                                 style="display: block"
                                 :src="item2.src"
                                 alt=""
@@ -681,6 +690,7 @@
                                 @click.stop="previewImg(item2.src)"
                               >
                                 <img
+                                  v-if="isDown"
                                   style="display: block"
                                   :src="item2.src"
                                   alt=""
@@ -710,6 +720,7 @@
                 </div>
 
                 <img
+                  v-if="isDown"
                   @click.stop="previewImg(l.selectJson.url)"
                   style="max-width: 200px"
                   :src="l.selectJson.url"
@@ -929,7 +940,7 @@ export default {
     "worksDialogCon",
     "digNum"
   ],
-  // digNum0  导出单个作业集 digNum1导出所有任务
+  // digNum0  导出单个作业集 digNum1导出所有任务 digNum2查看
   components: {
     exjsmind
   },
@@ -948,7 +959,6 @@ export default {
       studyTime: "",
       // 登录时长
       loginTime: "",
-      suImg: "",
 
       canvasLing: [false, false, false, false, false, false, false],
       // 编辑图表分析
@@ -1069,7 +1079,7 @@ export default {
         }
       ],
       schoolImg: {},
-      treeData: '',
+      treeData: "",
       languageSetting: "",
       polygonData: [],
       polygonData2: [],
@@ -1590,7 +1600,6 @@ export default {
       // console.log('tar',JSON.parse(JSON.stringify(tar)));
       // console.log('data4Copy',JSON.parse(JSON.stringify(data4Copy)));
 
-      
       tar.forEach((k, ki) => {
         data4Copy.forEach((e, ei) => {
           if (ki == e.task) {
@@ -1771,8 +1780,6 @@ export default {
         children: tarListCopy
       };
 
-      
-
       setTimeout(() => {
         this.moreRenderChart();
       }, 500);
@@ -1824,35 +1831,32 @@ export default {
     async getPdf() {
       this.isDown = false;
 
-      let domHeight = this.$refs.reportPdf.offsetHeight;
+      const content = this.$refs.reportPdf;
 
-      let maxHeight = 64257;
-      html2canvas(this.$refs.reportPdf, {
-        useCORS: true, // 如果截图的内容里有图片,可能会有跨域的情况,加上这个参数,解决文件跨域问题
-        scale: maxHeight / domHeight > 1 ? 1 : maxHeight / domHeight
-      })
+      html2canvas(content)
         .then(canvas => {
-          const contentWidth = canvas.width;
-          const contentHeight = canvas.height;
-
-          var pageData = canvas.toDataURL("image/jpeg", 1.0);
-
-          var pdf = new jspdf("", "pt", [contentWidth, contentHeight]);
-
-          //有两个高度需要区分，一个是html页面的实际高度，和生成pdf的页面高度(841.89)
-          //当内容未超过pdf一页显示的范围，无需分页
-          // if (leftHeight < pageHeight) {
-          pdf.addImage(pageData, "JPEG", 0, 0, contentWidth, contentHeight);
-
+          const imgData = canvas.toDataURL("image/png");
+          const pdf = new jspdf("p", "pt", [
+            content.offsetWidth,
+            content.offsetHeight
+          ]);
+
+          pdf.addImage(
+            imgData,
+            "PNG",
+            0,
+            0,
+            content.offsetWidth,
+            content.offsetHeight
+          );
           pdf.save(
             this.worksDialogCon2.course +
               "-学生成长报告-" +
               this.worksDialogCon2.sName +
               ".pdf"
           );
-          // setTimeout(() => {
+
           this.isDown = true;
-          // }, 500);
         })
         .catch(err => {
           console.log(err);
@@ -2144,11 +2148,6 @@ export default {
     },
     // 处理学习分析报告
     async updateFx() {
-      console.log("this.suImg", this.suImg);
-
-      // _fileid = await this.createFileid(this.suImg);
-      // if (_fileid == 1) _fileid = "";
-
       // 素养发展数据
       let poy = "";
       this.polygonData.forEach(e => {
@@ -2311,8 +2310,7 @@ export default {
     },
     // 处理学习行为记录ai分析数据
     async getAiAnalysisCon2() {
-      // if (!this.suImg.length) return 
-      this.$message.info("开始分析中...")
+      this.$message.info("开始分析中...");
       let realData = [
         { per: "", cla: "", nam: "zy" },
         { per: "", cla: "", nam: "zb" },
@@ -2658,7 +2656,7 @@ export default {
     },
     // 重新生成
     async agAnl(val, mc) {
-      this.$message.info("重新生成中...")
+      this.$message.info("重新生成中...");
 
       this.canvasLing.splice(val, 1, true);
       let realData = [
@@ -3208,7 +3206,7 @@ export default {
             },
             data: [
               {
-                value:  this.polygonData.map(category => category.sco),
+                value: this.polygonData.map(category => category.sco),
                 name: "素养平均分"
               }
             ]
@@ -3256,7 +3254,7 @@ export default {
             labelLine: {
               show: false
             },
-            center: ["35%", "50%"], // 控制饼图的位置
+            center: ["50%", "50%"], // 控制饼图的位置
 
             data: this.toolRatio
           }
@@ -3332,6 +3330,10 @@ export default {
       };
 
       chart.setOption(option);
+
+      window.onresize = () => {
+        jm.resize();
+      };
     },
     // 分组工具占比
     initChart3() {
@@ -4597,7 +4599,7 @@ export default {
 
 .stageCon {
   background-color: #fff;
-  padding: 30px 110px;
+  padding: 30px 110px 100px;
   box-sizing: border-box;
   margin-bottom: 10px;
   border-radius: 8px;

src/components/pages/components/exportWorksDialog.vue

@@ -8,14 +8,15 @@
         }"
       >
         <div class="coverPageLogo">
-          <img :src="schoolImg.logo ? schoolImg.logo : ''" alt="" />
+            
+          <img style="height: 50px;" :src="schoolImg.logo ? schoolImg.logo : ''" alt="" />
         </div>
         <div class="coverPageFrom" style="z-index: 10;">
           <div class="coverPageFromTit">{{ worksDialogCon2.course }}</div>
 
           <div
             style="
-                  font-size: 36px;
+                  font-size: 45px;
                   font-weight: 600;
                   color:rgba(176, 123, 0, 1);
                   margin: 20px 0;
@@ -43,7 +44,7 @@
             </div>
             <div>
               <span>指导老师:</span>
-              <div class="txt">{{ worksDialogCon2.uname }}</div>
+              <div class="txt"><div style="transform: translate(-1em, 0px);">{{ worksDialogCon2.uname }}</div></div>
             </div>
           </div>
         </div>
@@ -685,65 +686,126 @@ export default {
 
   methods: {
     // 下载pdf文件
-    async getPdf() {
-      let domHeight = this.$refs.reportPdf.offsetHeight;
-      // console.log('this.$refs.reportPdf',this.$refs.reportPdf.offsetHeight);
-      let maxHeight = 64257;
-      return new Promise((resolve, reject) => {
-        html2canvas(this.$refs.reportPdf, {
-          useCORS: true, // 如果截图的内容里有图片,可能会有跨域的情况,加上这个参数,解决文件跨域问题
-          scale: maxHeight / domHeight > 1 ? 1 : maxHeight / domHeight
-        })
-          .then(canvas => {
-            const contentWidth = canvas.width;
-            const contentHeight = canvas.height;
-
-            var pageData = canvas.toDataURL("image/jpeg", 1.0);
-
-            var pdf = new jspdf("", "pt", [contentWidth, contentHeight]);
-
-            //有两个高度需要区分，一个是html页面的实际高度，和生成pdf的页面高度(841.89)
-            //当内容未超过pdf一页显示的范围，无需分页
-            // if (leftHeight < pageHeight) {
-            pdf.addImage(pageData, "JPEG", 0, 0, contentWidth, contentHeight);
-
-            pdf.save(
-              this.worksDialogCon2.course +
+     getPdf() {
+
+      const content = this.$refs.reportPdf;
+
+      html2canvas(content)
+        .then(canvas => {
+          const imgData = canvas.toDataURL("image/png");
+          const pdf = new jspdf("p", "pt", [
+            content.offsetWidth,
+            content.offsetHeight
+          ]);
+
+          pdf.addImage(
+            imgData,
+            "PNG",
+            0,
+            0,
+            content.offsetWidth,
+            content.offsetHeight
+          );
+          pdf.save(
+            this.worksDialogCon2.course +
                 "-作业集-" +
                 this.worksDialogCon2.sName +
                 ".pdf"
-            );
-            return resolve();
-          })
-          .catch(err => {
-            console.log(err);
-          });
-      });
+          );
+        })
+
+      // let domHeight = this.$refs.reportPdf.offsetHeight;
+      // // console.log('this.$refs.reportPdf',this.$refs.reportPdf.offsetHeight);
+      // let maxHeight = 64257;
+      //   html2canvas(this.$refs.reportPdf, {
+      //     useCORS: true, // 如果截图的内容里有图片,可能会有跨域的情况,加上这个参数,解决文件跨域问题
+      //     scale: maxHeight / domHeight > 1 ? 1 : maxHeight / domHeight
+      //   })
+      //     .then(canvas => {
+      //       const contentWidth = canvas.width;
+      //       const contentHeight = canvas.height;
+
+      //       var pageData = canvas.toDataURL("image/jpeg", 1.0);
+
+      //       var pdf = new jspdf("", "pt", [contentWidth, contentHeight]);
+
+      //       //有两个高度需要区分，一个是html页面的实际高度，和生成pdf的页面高度(841.89)
+      //       //当内容未超过pdf一页显示的范围，无需分页
+      //       // if (leftHeight < pageHeight) {
+      //       pdf.addImage(pageData, "JPEG", 0, 0, contentWidth, contentHeight);
+
+      //       pdf.save(
+      //         this.worksDialogCon2.course +
+      //           "-作业集-" +
+      //           this.worksDialogCon2.sName +
+      //           ".pdf"
+      //       );
+      //       return resolve();
+      //     })
+      //     .catch(err => {
+      //       console.log(err);
+      //     });
     },
 
     // 压缩pdf
     async getPdf2() {
-      let domHeight = this.$refs.reportPdf.offsetHeight;
-      // console.log('this.$refs.reportPdf',this.$refs.reportPdf.offsetHeight);
-      let maxHeight = 64257;
-      return new Promise((resolve, reject) => {
-        html2canvas(this.$refs.reportPdf, {
-          useCORS: true, // 如果截图的内容里有图片,可能会有跨域的情况,加上这个参数,解决文件跨域问题
-          scale: maxHeight / domHeight > 1 ? 1 : maxHeight / domHeight
-        })
-          .then(canvas => {
-            const contentWidth = canvas.width;
-            const contentHeight = canvas.height;
-
-            var pageData = canvas.toDataURL("image/jpeg", 1.0);
 
-            var pdf = new jspdf("", "pt", [contentWidth, contentHeight]);
 
-            //有两个高度需要区分，一个是html页面的实际高度，和生成pdf的页面高度(841.89)
-            //当内容未超过pdf一页显示的范围，无需分页
-            // if (leftHeight < pageHeight) {
-            pdf.addImage(pageData, "JPEG", 0, 0, contentWidth, contentHeight);
+// html2canvas(content)
+//   .then(canvas => {
+//     const imgData = canvas.toDataURL("image/png");
+//     const pdf = new jspdf("p", "pt", [
+//       content.offsetWidth,
+//       content.offsetHeight
+//     ]);
+
+//     pdf.addImage(
+//       imgData,
+//       "PNG",
+//       0,
+//       0,
+//       content.offsetWidth,
+//       content.offsetHeight
+//     );
+//     pdf.save(
+//       this.worksDialogCon2.course +
+//           "-作业集-" +
+//           this.worksDialogCon2.sName +
+//           ".pdf"
+//     );
+//   })
+      // let domHeight = this.$refs.reportPdf.offsetHeight;
+      // let maxHeight = 64257;
+      const content = this.$refs.reportPdf;
 
+      return new Promise((resolve, reject) => {
+        html2canvas(content)
+          .then(canvas => {
+            // const contentWidth = canvas.width;
+            // const contentHeight = canvas.height;
+
+            // var pageData = canvas.toDataURL("image/jpeg", 1.0);
+
+            // var pdf = new jspdf("", "pt", [contentWidth, contentHeight]);
+
+            // //有两个高度需要区分，一个是html页面的实际高度，和生成pdf的页面高度(841.89)
+            // //当内容未超过pdf一页显示的范围，无需分页
+            // // if (leftHeight < pageHeight) {
+            // pdf.addImage(pageData, "JPEG", 0, 0, contentWidth, contentHeight);
+            const imgData = canvas.toDataURL("image/png");
+            const pdf = new jspdf("p", "pt", [
+              content.offsetWidth,
+              content.offsetHeight
+            ]);
+
+            pdf.addImage(
+              imgData,
+              "PNG",
+              0,
+              0,
+              content.offsetWidth,
+              content.offsetHeight
+            );
             var pdfData = {
               pdfName:
                 this.worksDialogCon2.course +
@@ -1154,7 +1216,8 @@ export default {
   background: #32455b !important;
 }
 .coverPage {
-  height: 840pt;
+  /* height: 840pt; */
+  padding: 185px 15% 0;
   background-color: #ccc;
   position: relative;
   background-image: url("../../../assets/icon/exportPdfworks/bcg1.svg"),
@@ -1167,13 +1230,16 @@ export default {
   background-repeat: no-repeat, no-repeat;
 }
 .coverPageLogo {
-  padding: 40px;
+  /* padding: 40px;
   height: 120px;
   width: 100%;
   display: flex;
   justify-content: flex-end;
   box-sizing: border-box;
-  margin-bottom: 45px;
+  margin-bottom: 45px; */
+  position: absolute;
+  top: 30px;
+  right: 6%;
 }
 .coverPageFrom {
   display: flex;
@@ -1183,7 +1249,7 @@ export default {
   margin: 0 auto;
 }
 .coverPageFromTit {
-  font-size: 48px;
+  font-size: 72px;
   color: rgba(92, 80, 70, 1);
   font-weight: 600;
   text-align: center;
@@ -1225,7 +1291,7 @@ export default {
   display: flex;
   flex-direction: column;
   align-items: center;
-  padding: 0 30px;
+  padding: 0 100px 80px;
   box-sizing: border-box;
 }
 .stageCon {
@@ -1337,7 +1403,7 @@ export default {
   width: 50%;
   white-space: nowrap;
   overflow: hidden;
-  font-size: 12px;
+  font-size: 14px;
   text-overflow: ellipsis;
 }
 .score_box {
@@ -1395,14 +1461,14 @@ export default {
 .stageTit {
   text-align: left;
   font-weight: 600;
-  font-size: 20px;
+  font-size: 22px;
   margin-bottom: 20px;
   color: rgba(242, 161, 75, 1);
   border-left: 5px rgba(242, 161, 75, 1) solid;
   padding-left: 5px;
 }
 .taskTitInd {
-  font-size: 14px;
+  font-size: 16px;
   display: flex;
   align-items: center;
 }
@@ -1432,7 +1498,7 @@ export default {
   line-height: 20px;
   box-sizing: border-box;
   font-weight: PingFang SC;
-  font-size: 12px;
+  font-size: 14px;
   font-weight: 400;
   border-radius: 4px;
 }
@@ -1466,7 +1532,7 @@ export default {
   color: rgba(0, 0, 0, 0.9);
 }
 .answerTxt {
-  font-size: 12px;
+  font-size: 14px;
   color: rgba(0, 0, 0, 0.6);
   font-weight: 400;
   line-height: 30px;
@@ -1505,7 +1571,7 @@ export default {
 .taskScoConTit {
   text-align: left;
   font-weight: 600;
-  font-size: 12px;
+  font-size: 14px;
   margin-bottom: 10px;
   color: rgba(0, 0, 0, 0.9);
   border-left: 5px rgba(242, 161, 75, 1) solid;
@@ -1517,7 +1583,7 @@ export default {
   box-sizing: border-box;
   border-radius: 8px;
   font-family: PingFang SC;
-  font-size: 12px;
+  font-size: 14px;
   line-height: 20px;
   font-weight: 400;
   flex: 1;
@@ -1547,7 +1613,7 @@ export default {
 }
 .termC {
   margin: 15px auto 10px;
-  font-size: 18px;
+  font-size: 22px;
   color: rgba(92, 80, 70, 1);
   display: flex;
   justify-content: space-between;

src/components/pages/components/lookWork.vue

@@ -12,7 +12,7 @@
         <span>{{ courseName }}</span>
       </div>
 
-      <div>
+      <div v-if="isStu">
         <el-button type="primary" @click="upPer" size="small" v-if="positP > 0"
           >上一个</el-button
         >
@@ -105,7 +105,7 @@
                 :key="lind + 'l'"
                 class="toolEListCon"
               >
-                <div style="flex: 1" v-if="l.content && l.content.length">
+                <div v-if="l.content && l.content.length">
                   <div v-if="l.tool[0] == 15">
                     <div class="toolBlk">
                       <img
@@ -197,7 +197,12 @@
                         </div>
                       </div>
                     </div>
-                    <img style="max-width: 200px" :src="l.content[0]" alt="" />
+                    <img
+                      @click.stop="previewImg(l.content[0])"
+                      style="max-width: 200px"
+                      :src="l.content[0]"
+                      alt=""
+                    />
                     <div>{{ l.content[0] }}</div>
                   </div>
                   <div v-if="l.tool[0] == 48">
@@ -378,6 +383,7 @@
                       </div>
                     </div>
                     <img
+                      @click.stop="previewImg(l.selectJson.url)"
                       style="max-width: 200px"
                       :src="l.selectJson.url"
                       alt=""
@@ -476,7 +482,7 @@
                 </div>
 
                 <!-- 作业得分  -->
-                <div class="taskSco" v-if="l.content && l.content.length">
+                <div class="taskSco" v-if="l.content && l.content.length && TeaStuInt.includes(l.tool[0])">
                   <div class="taskScoTit">
                     <div>
                       作业得分：<span style="color: rgba(242, 161, 75, 1)">{{
@@ -493,13 +499,13 @@
                     <div
                       v-if="l.eList"
                       style="
-                          flex: 1;
+                          width: 48%;
                           justify-content: space-between;
                           display: flex;
                           flex-wrap: wrap;
                         "
                     >
-                      <div style="width: 250px; margin: 0 20px 10px 0">
+                      <div style="width: 46%; margin: 0 20px 10px 0">
                         <div class="taskScoConTit">分数详情</div>
                         <div
                           v-for="(wItem, ind) in l.eList"
@@ -535,7 +541,7 @@
                         </div>
                       </div>
 
-                      <div v-if="l.eList" style="width: 250px">
+                      <div v-if="l.eList" style="width: 46%;">
                         <div class="taskScoConTit">素养</div>
                         <div class="WorkConSY">
                           <div v-for="(wItem, ind) in l.eList" :key="ind + 's'">
@@ -557,7 +563,7 @@
                     <!-- 评语 -->
                     <div
                       style="
-                          flex: 1;
+                          width: 48%;
                           flex-shrink: 0;
                           display: flex;
                           flex-direction: column;
@@ -587,10 +593,14 @@ export default {
     id: {
       type: String
     },
-		studentId:{
-			type:String,
-			default:""
-		},
+    studentId: {
+      type: String,
+      default: ""
+    },
+    isStu: {
+      type: Number,
+      default: 0
+    }
   },
   data() {
     return {
@@ -611,10 +621,12 @@ export default {
       workList: [],
       state: 0,
       tableData: [],
-      loading: false
+      loading: false,
+      // 师生互动工具list
+      TeaStuInt: [7, 1, 52, 3, 48, 15, 16, 50, 57]
     };
   },
-  
+
   computed: {
     isStage() {
       return function(val) {
@@ -668,17 +680,24 @@ export default {
     this.cid = JSON.parse(JSON.stringify(this.id));
     this.uid = JSON.parse(JSON.stringify(this.studentId));
 
-    this.getWorks1();
+    if (this.isStu == 0) {
+      this.getWorks1();
+    } else {
+      this.exportPdfSet();
+    }
   },
   watch: {
-    
-    studentId(newL,oldL){
-      console.log('6666666666666666666666666666666666666666');
+    studentId(newL, oldL) {
+      console.log("6666666666666666666666666666666666666666");
 
       this.cid = JSON.parse(JSON.stringify(this.id));
       this.uid = JSON.parse(JSON.stringify(this.studentId));
 
-      this.getWorks1();
+      if (this.isStu == 0) {
+        this.getWorks1();
+      } else {
+        this.exportPdfSet();
+      }
     }
   },
   methods: {
@@ -739,7 +758,9 @@ export default {
           console.error(err);
         });
     },
-
+    previewImg(url) {
+      this.$hevueImgPreview(url);
+    },
     // 获取作业信息
     async exportPdfSet(uid, con) {
       this.loading = true;
@@ -957,7 +978,7 @@ export default {
       } else {
         this.$message.error("该任务暂时没提交作业");
       }
-    },
+    }
   }
 };
 </script>
@@ -996,14 +1017,15 @@ export default {
   border-radius: 50%;
 }
 .toolEListCon {
-  display: flex;
-  justify-content: space-between;
-  flex-shrink: 1;
+  width: 100%;
+  /* display: flex; */
+  /* justify-content: space-between; */
+  /* flex-shrink: 1; */
 }
 .pageCon {
   display: flex;
   height: calc(100% - 60px);
-  padding-bottom: 50px;
+  padding-bottom: 30px;
   box-sizing: border-box;
 }
 .rightBar {
@@ -1193,7 +1215,7 @@ export default {
   text-overflow: ellipsis;
 }
 .RootImgBlockSy {
-  width: 300px;
+  /* width: 300px; */
   white-space: nowrap;
   overflow: hidden;
   font-size: 12px;
@@ -1305,14 +1327,14 @@ export default {
   color: rgba(0, 0, 0, 0.6);
   font-weight: 400;
   line-height: 30px;
+  padding: 0 10px;
 }
 .taskSco {
   background-color: rgba(253, 247, 243, 1);
   border-radius: 8px;
   padding: 10px 15px;
   box-sizing: border-box;
-  margin: 15px 0 8px 25px;
-  width: 550px;
+  margin: 10px 0 20px;
 }
 .taskScoTit {
   display: flex;

src/components/pages/components/studentWorksDetail.vue

@@ -188,7 +188,6 @@
         </el-table>
 
         <el-dialog
-          title="查看作业"
           :visible.sync="dialogVisible3"
           :append-to-body="true"
           :before-close="handleClose"
@@ -200,7 +199,10 @@
           <div slot="title" class="header-title">
             <div style="color: #fff">查看&批改</div>
           </div>
-          <div class="zyBoxC" ref="reportPdf">
+
+          <LookWorks v-if="DState == 5" :id="cid" :isStu="1" :studentId="studentId" :key="studentId"></LookWorks>
+
+          <div v-else class="zyBoxC" ref="reportPdf">
             <div class="courseTitle" v-if="allWorks.course">
               <div class="txName">
                 <div class="tx"><img :src="tx" alt="" /></div>
@@ -1614,8 +1616,39 @@
         style="height: 95%;"
       ></iframe>
     </el-dialog>
+
     <div class="report_box" v-if="reportVisible">
+      <el-dialog
+        v-if="exportData.state == 5"
+        :visible.sync="reportVisible"
+        width="100%"
+        :before-close="handleClose"
+        class="full_diy"
+        :append-to-body="true"
+      >
+      <div slot="title" class="header-title">
+        <div style="color: #fff">查看作业</div>
+      </div>
+    </el-dialog>
+
+    <el-dialog
+      v-if="exportData.state == 5"
+      :visible.sync="reportVisible"
+      :before-close="handleClose"
+      class="worksDialogCSSExp"
+      style="overflow: hidden;"
+      :append-to-body="true"
+      :fullscreen="true"
+    >
+      <div slot="title" class="header-title">
+        <div style="color: #fff">查看报告</div>
+      </div>
+      <exportDataDialog  :key="checkStudent" :digNum="'2'" :oid="oid" :worksDialogCon="exportData" :cid="checkCourse"></exportDataDialog>
+
+    </el-dialog>
+
       <studentReport
+        v-else
         :checkCourse="checkCourse"
         :checkStudent="checkStudent"
         @cancelR="cancelR"
@@ -1623,9 +1656,7 @@
         :typeNum = "1"
       ></studentReport>
     </div>
-    <!-- <div class="cancelbox" v-if="reportVisible">
-      <el-button @click="cancelR" type="primary" size="small">返回</el-button>
-    </div> -->
+   
   </div>
 </template>
 
@@ -1635,11 +1666,17 @@ import studentReport from "./studentReport.vue";
 import htmlDocx from "html-docx-js/dist/html-docx";
 import saveAs from "file-saver";
 import html2canvas from "html2canvas";
+import LookWorks from "./lookWork.vue";
+import exportDataDialog from "./exportDataDialog.vue";
+
 import jspdf from "jspdf";
 export default {
   components: {
     StudentData,
-    studentReport
+    studentReport,
+    LookWorks,
+    exportDataDialog
+
   },
   props: ["uid", "ooid", "oorg","username","dialogVisibleS"],
   data() {
@@ -1866,7 +1903,9 @@ export default {
       classAarray: [],
       uClass:'',
       checkJson: [],
-      worksLoading: false
+      worksLoading: false,
+      exportData:'',
+      DState:''
     };
   },
   mounted() {
@@ -1970,9 +2009,17 @@ export default {
       this.page = val;
       this.getWorks();
     },
-    lookWork(cid, uid) {
+    lookWork(cid, uid,worksData) {
       this.cid = cid
       this.studentId = uid;
+      this.DState = worksData.state
+
+      if (this.DState == 5) {
+        this.$nextTick(()=>{
+          this.dialogVisible3 = true
+        })
+        return
+      }
 
       let params = {
         cid: cid,
@@ -2747,6 +2794,15 @@ export default {
           console.error(err);
         });
     },
+    // 查看报告
+    getReport(row) {
+      console.log('row',row);
+      
+      this.checkStudent = row.userid;
+      this.checkCourse = row.courseid;
+      this.exportData = row
+      this.reportVisible = true;
+    },
     lookWork2(id, uid) {
       // this.scopeId = id;
       let params = {
@@ -3588,11 +3644,7 @@ export default {
       this.checkCourse = "";
       this.reportVisible = false;
     },
-    getReport(row) {
-      this.checkStudent = row.userid;
-      this.checkCourse = row.courseid;
-      this.reportVisible = true;
-    },
+
     switchVideo(media, index) {
       this.playerO = {};
       this.playerOptions.poster = "";
@@ -5441,4 +5493,21 @@ ol {
     overflow: hidden;
     text-overflow: ellipsis;
 }
+.worksDialogCSSExp>>> .el-dialog__header {
+  /* padding: 9px 20px 10px; */
+  background: #32455b !important;
+}
+
+.worksDialogCSSExp >>> .el-dialog__wrapper{
+  overflow: hidden !important;
+}
+.worksDialogCSSExp >>> .el-dialog__body {
+  width: 100% !important;
+  padding: 0 !important;
+  height: 100%;
+  overflow: auto;
+}
+.worksDialogCSSExp >>> .el-dialog.is-fullscreen {
+  overflow: hidden;
+}
 </style>

src/components/pages/components/workData.vue

@@ -167,7 +167,7 @@
               <span style="margin: 0 5px;">
                 <i class="el-icon-arrow-right"></i>
               </span>
-              <div style="font-weight: 600;color: rgba(0, 0, 0, 0.9);">{{ dataJson.title }}</div>
+              <div style="font-weight: 600;color: rgba(0, 0, 0, 0.9);">{{ dataJson.title }}-查看作业</div>
             </div>
             <div class="JsonTit">
               <div style="width:94%;margin: 0 auto;font-size: 26px;">{{ dataJson.title }}</div>

src/components/pages/components/worksDetail2.vue

@@ -1555,6 +1555,8 @@
       :before-close="handleClose"
       class="worksDialogCSSExp"
       :append-to-body="true"
+      :fullscreen="true"
+
     >
       <div slot="title" class="header-title">
         <div style="color: #fff">导出作业集</div>
@@ -1579,7 +1581,7 @@ export default {
     StudentData,
     LookWork,
     pdf,
-    exportWorksDialog
+    exportWorksDialog,
   },
   props: ["cid", "uid", "ooid","DState"],
   data() {
@@ -4645,12 +4647,17 @@ export default {
   background: #32455b !important;
 }
 
+.worksDialogCSSExp >>> .el-dialog__wrapper{
+  overflow: hidden !important;
+}
 .worksDialogCSSExp >>> .el-dialog__body {
-  /* width: 100% !important; */
+  width: 100% !important;
   padding: 0 !important;
+  height: 100%;
+  overflow: auto;
 }
-.worksDialogCSSExp >>> .el-dialog {
-  width: 594pt !important;
+.worksDialogCSSExp >>> .el-dialog.is-fullscreen {
+  overflow: hidden;
 }
 
 .worksDialogCSS >>> .el-dialog__header {

src/components/pages/works.vue

@@ -271,7 +271,7 @@
           </el-table>
          
         </div>
-        <div class="student_page">
+        <div v-if="!isLoading" class="student_page">
           <el-pagination
             background
             layout="prev, pager, next"