zengyicheng 1 year ago
parent
commit
b750879637
41 changed files with 88 additions and 39 deletions
  1. 0 0
      dist/css/100.530f7b97.css
  2. 0 0
      dist/css/173.51a6faf3.css
  3. 0 0
      dist/css/276.116fda79.css
  4. 0 0
      dist/css/586.b2918902.css
  5. 0 0
      dist/css/682.259bf395.css
  6. 0 0
      dist/css/app.28d9bcb6.css
  7. 0 0
      dist/css/app.3ebe307b.css
  8. 1 1
      dist/index.html
  9. 0 0
      dist/js/100.bf25893e.js
  10. 0 0
      dist/js/100.bf25893e.js.map
  11. 0 0
      dist/js/173.d4ab8949.js
  12. 0 0
      dist/js/173.d4ab8949.js.map
  13. 0 0
      dist/js/205.068b64e7.js
  14. 0 0
      dist/js/205.068b64e7.js.map
  15. 0 0
      dist/js/212.1c0449e7.js
  16. 0 0
      dist/js/212.1c0449e7.js.map
  17. 0 0
      dist/js/276.0d40ced6.js.map
  18. 0 0
      dist/js/297.6f7636f0.js
  19. 0 0
      dist/js/297.6f7636f0.js.map
  20. 0 0
      dist/js/617.b89da2fb.js
  21. 0 0
      dist/js/617.b89da2fb.js.map
  22. 0 0
      dist/js/682.6908db16.js
  23. 0 0
      dist/js/682.6908db16.js.map
  24. 0 0
      dist/js/732.de57a3cd.js
  25. 0 0
      dist/js/732.de57a3cd.js.map
  26. 0 0
      dist/js/837.414f0887.js
  27. 0 0
      dist/js/837.414f0887.js.map
  28. 0 0
      dist/js/970.e60f892c.js
  29. 0 0
      dist/js/970.e60f892c.js.map
  30. 0 0
      dist/js/app.169fe34f.js.map
  31. 0 0
      dist/js/app.40501688.js
  32. 0 0
      dist/js/app.40501688.js.map
  33. 0 0
      dist/js/chunk-vendors.c0eb00f6.js
  34. 0 0
      dist/js/chunk-vendors.c0eb00f6.js.map
  35. 10 0
      src/App.vue
  36. 1 1
      src/components/tool/pdf.js
  37. 36 1
      src/views/projectManage/ProjectManagement.vue
  38. 1 1
      src/views/projectManage/ProjectManagementMain.vue
  39. 37 31
      src/views/projectManage/components/Closingstatement.vue
  40. 1 2
      src/views/resultShow/components/resultDetail_MakerSpace.vue
  41. 1 2
      src/views/resultShow/components/resultDetail_student.vue

File diff suppressed because it is too large
+ 0 - 0
dist/css/100.530f7b97.css


File diff suppressed because it is too large
+ 0 - 0
dist/css/173.51a6faf3.css


File diff suppressed because it is too large
+ 0 - 0
dist/css/276.116fda79.css


File diff suppressed because it is too large
+ 0 - 0
dist/css/586.b2918902.css


File diff suppressed because it is too large
+ 0 - 0
dist/css/682.259bf395.css


File diff suppressed because it is too large
+ 0 - 0
dist/css/app.28d9bcb6.css


File diff suppressed because it is too large
+ 0 - 0
dist/css/app.3ebe307b.css


+ 1 - 1
dist/index.html

@@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>双创学院管理系统</title><script defer="defer" src="/js/chunk-vendors.5c81c983.js"></script><script defer="defer" src="/js/app.169fe34f.js"></script><link href="/css/chunk-vendors.0225060a.css" rel="stylesheet"><link href="/css/app.3ebe307b.css" rel="stylesheet"></head><body><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>双创学院管理系统</title><script defer="defer" src="/js/chunk-vendors.c0eb00f6.js"></script><script defer="defer" src="/js/app.40501688.js"></script><link href="/css/chunk-vendors.0225060a.css" rel="stylesheet"><link href="/css/app.28d9bcb6.css" rel="stylesheet"></head><body><div id="app"></div></body></html>

File diff suppressed because it is too large
+ 0 - 0
dist/js/100.bf25893e.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/100.bf25893e.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/173.d4ab8949.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/173.d4ab8949.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/205.068b64e7.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/205.068b64e7.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/212.1c0449e7.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/212.1c0449e7.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/276.0d40ced6.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/297.6f7636f0.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/297.6f7636f0.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/617.b89da2fb.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/617.b89da2fb.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/682.6908db16.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/682.6908db16.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/732.de57a3cd.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/732.de57a3cd.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/837.414f0887.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/837.414f0887.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/970.e60f892c.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/970.e60f892c.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.169fe34f.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.40501688.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.40501688.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/chunk-vendors.c0eb00f6.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/chunk-vendors.c0eb00f6.js.map


+ 10 - 0
src/App.vue

@@ -156,6 +156,16 @@ export default {
 </script>
 
 <style lang="less">
+.divCss {
+  width: 100%;
+  display: table-caption;
+  height: 1930px;
+  margin: 20px auto;
+}
+.divCss2 {
+  width: 100%;
+  display: table-caption;
+}
 * {
   margin: 0;
   padding: 0;

+ 1 - 1
src/components/tool/pdf.js

@@ -18,7 +18,7 @@ const canvas2PDF = (canvas, fileName) => {
     // 未生成pdf的html页面高度
     let leftHeight = contentHeight;
     // 页面偏移
-    let position = 10;
+    let position = -30;
     // html页面生成的canvas在pdf中图片的宽高(本例为:横向a4纸[841.89,592.28],纵向需调换尺寸)
     let imgWidth = 550;
     let imgHeight = 592.28 / contentWidth * contentHeight;

+ 36 - 1
src/views/projectManage/ProjectManagement.vue

@@ -467,7 +467,7 @@ import beUpload from "../../components/tool/beUpload";
 import Closingstatement from "./components/Closingstatement.vue";
 //下载pdf
 import { downloadPDF } from "@/components/tool/pdf";
-import html2pdf from 'html2pdf.js';
+import html2pdf from "html2pdf.js";
 export default {
   components: { beUpload, Closingstatement },
   data() {
@@ -937,6 +937,41 @@ export default {
         );
     },
     getWord() {
+      // let tableBox = this.$refs.finalClo.$refs.tableBox;
+      // let tableBox2 = this.$refs.finalClo.$refs.tableBox2;
+      // // let tableInnerHtml = "";
+      // let tableInnerHtml2 = "";
+      // let div = document.createElement('div');
+      // div.className = "divCss";
+      // let num = 0;
+      // for(var i = 0;i<tableBox.children.length;i++){
+      //   let child = tableBox.children[i];
+      //   let childHeight = child.offsetHeight;
+      //   if(childHeight < 1930 && (num + childHeight) < 1930){
+      //     // tableInnerHtml2 += child.innerHTML;
+      //     div.appendChild(child.cloneNode(true))
+      //     num += childHeight;
+      //   }else if(childHeight < 1930 && (num + childHeight) > 1930){
+      //     num = childHeight;
+      //     tableBox2.appendChild(div)
+      //     div = document.createElement('div');
+      //     div.className = "divCss";
+      //     div.appendChild(child.cloneNode(true))
+      //   }else if(childHeight > 1930){
+      //     num = childHeight;
+      //     tableBox2.appendChild(div)
+      //     div = document.createElement('div');
+      //     div.className = "divCss";
+      //     div.appendChild(child.cloneNode(true))
+      //   }else{
+      //     num = childHeight;
+      //     tableBox2.appendChild(div)
+      //     div = document.createElement('div');
+      //     div.className = "divCss";
+      //     div.appendChild(child.cloneNode(true))
+      //   }
+      // }
+      // tableBox2.innerHTML = tableInnerHtml;
       this.isDownPdf = true;
       this.$forceUpdate();
       setTimeout(() => {

+ 1 - 1
src/views/projectManage/ProjectManagementMain.vue

@@ -64,7 +64,7 @@
                 items:[
                     {tit:'项目详细',cl:'pr1TitBass'},
                     // {tit:'活动开展',cl:'pr1TitBass'},
-                    {tit:'项目结题',cl:'pr1TitBass'},
+                    {tit:'项目结题结果',cl:'pr1TitBass'},
                     {tit:'专家审核结果',cl:'pr1TitBass'},
                     {tit:'上传附件',cl:'pr1TitBass'},
                 ]

+ 37 - 31
src/views/projectManage/components/Closingstatement.vue

@@ -4,7 +4,7 @@
     <div class="onePage">
       <div class="titSchool">深圳技师学院</div>
       <div class="title">校级创客项目结题申请书</div>
-      <!-- <div class="basicInformation">
+      <div class="basicInformation">
         <span>项目名称</span>
         <div class="line">{{ myArrayProp[0].title }}</div>
       </div>
@@ -46,12 +46,12 @@
       </div>
       <div style="font-size: 22px; font-family: \4eff\5b8b; font-weight: bold">
         {{ nowTime }}
-      </div> -->
+      </div>
     </div>
-    <table border="1" cellspacing="0">
-      <tr v-show="false">
+    <table border="1" cellspacing="0" ref="tableBox">
+      <!-- <tr v-if="false">
         <td v-for="i in 8" :key="i">i</td>
-      </tr>
+      </tr> -->
       <tr>
         <td colspan="2">项目名称</td>
         <td colspan="6">
@@ -161,9 +161,9 @@
         <td>{{ myArrayProp[0].course_teacher.length }}</td>
       </tr>
       <tr>
-        <td style="font-size: 21px;">项目起始时间</td>
+        <td style="font-size: 21px">项目起始时间</td>
         <td colspan="2">{{ myArrayProp[0].begin_at }}</td>
-        <td style="font-size: 21px;">项目完成时间</td>
+        <td style="font-size: 21px">项目完成时间</td>
         <td colspan="2">{{ myArrayProp[0].plannedEnd_at }}</td>
         <td>预算经费</td>
         <td>元</td>
@@ -183,7 +183,7 @@
       <tr
         v-for="(item, index) in myArrayProp[0].course_student"
         :key="index + 'a'"
-        v-show="myArrayProp[0].typeid == '5e21b204-c206-11ed-a4cd-509a4c5b67cf'"
+        v-if="myArrayProp[0].typeid == '5e21b204-c206-11ed-a4cd-509a4c5b67cf'"
       >
         <td><span v-text="item.name"></span></td>
         <td colspan="2"><span v-html="item.collage"></span></td>
@@ -201,7 +201,7 @@
       <tr
         v-for="(item, index) in myArrayProp[0].course_teacher"
         :key="index + 'b'"
-        v-show="myArrayProp[0].typeid == '5e21b204-c206-11ed-a4cd-509a4c5b67cf'"
+        v-if="myArrayProp[0].typeid == '5e21b204-c206-11ed-a4cd-509a4c5b67cf'"
       >
         <td><span v-text="item.name"></span></td>
         <td colspan="2"><span v-html="item.collage"></span></td>
@@ -223,7 +223,7 @@
       <tr
         v-for="(item, index) in myArrayProp[0].course_student"
         :key="index + 'c'"
-        v-show="myArrayProp[0].typeid == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"
+        v-if="myArrayProp[0].typeid == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"
       >
         <td><span v-text="item.name"></span></td>
         <td><span v-html="item.class"></span></td>
@@ -248,7 +248,7 @@
       <tr
         v-for="(item, index) in myArrayProp[0].course_teacher"
         :key="index + 'd'"
-        v-show="myArrayProp[0].typeid == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"
+        v-if="myArrayProp[0].typeid == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"
       >
         <td><span v-text="item.name"></span></td>
         <td><span v-html="item.speciality"></span></td>
@@ -377,7 +377,7 @@
           <p>一、成果(名称、数量及形式,开发产品及取得的专利等)</p>
           <p>专利证书获得(提供专利申请或成果证书附件):</p>
           <beUpload
-            v-show="!isDownPdf"
+            v-if="!isDownPdf"
             style="position: absolute; right: 10px; top: 5px"
             @getFile="getFile"
             :navName="'上传文件'"
@@ -385,7 +385,7 @@
             :progress="progress7"
           ></beUpload>
           <el-progress
-            v-show="progress7.show"
+            v-if="progress7.show"
             :percentage="progress7.value"
             :format="ProgressFormatresultAccessory"
             style="width: 80%"
@@ -430,7 +430,7 @@
         <td colspan="7" style="height: 200px">
           <p>企业应用实证(提供企业证明或合作协议证明等附件):</p>
           <beUpload
-            v-show="!isDownPdf"
+            v-if="!isDownPdf"
             style="position: absolute; right: 10px; top: 5px"
             @getFile="getfirmAccessory"
             :navName="'上传文件'"
@@ -438,7 +438,7 @@
             :progress="progress1"
           ></beUpload>
           <el-progress
-            v-show="progress1.show"
+            v-if="progress1.show"
             :percentage="progress1.value"
             :format="ProgressFormatfirmAccessory"
             style="width: 80%"
@@ -484,7 +484,7 @@
         <td colspan="7" style="height: 200px">
           <p>双创竞赛成绩(提供参加师生名单、比赛取得的成绩等附件):</p>
           <beUpload
-            v-show="!isDownPdf"
+            v-if="!isDownPdf"
             style="position: absolute; right: 10px; top: 5px"
             @getFile="getcompetitionAccessory"
             :navName="'上传文件'"
@@ -492,7 +492,7 @@
             :progress="progress2"
           ></beUpload>
           <el-progress
-            v-show="progress2.show"
+            v-if="progress2.show"
             :percentage="progress2.value"
             :format="ProgressFormatcompetitionAccessory"
             style="width: 80%"
@@ -532,7 +532,7 @@
         <td colspan="7" style="height: 200px">
           <p>参展或交流活动(提供参加师生名单、活动方案及照片等附件):</p>
           <beUpload
-            v-show="!isDownPdf"
+            v-if="!isDownPdf"
             style="position: absolute; right: 10px; top: 5px"
             @getFile="getexchangeAccessory"
             :navName="'上传文件'"
@@ -540,7 +540,7 @@
             :progress="progress3"
           ></beUpload>
           <el-progress
-            v-show="progress3.show"
+            v-if="progress3.show"
             :percentage="progress3.value"
             :format="ProgressFormatexchangeAccessory"
             style="width: 80%"
@@ -580,7 +580,7 @@
         <td colspan="7" style="height: 200px">
           <p>创业公司转化(提供公司注册资料、营业执照等附件):</p>
           <beUpload
-            v-show="!isDownPdf"
+            v-if="!isDownPdf"
             style="position: absolute; right: 10px; top: 5px"
             @getFile="getconversionAccessory"
             :navName="'上传文件'"
@@ -588,7 +588,7 @@
             :progress="progress4"
           ></beUpload>
           <el-progress
-            v-show="progress4.show"
+            v-if="progress4.show"
             :percentage="progress4.value"
             :format="ProgressFormatconversionAccessory"
             style="width: 80%"
@@ -628,7 +628,7 @@
         <td colspan="7" style="height: 200px">
           <p>二、创客人才培养(提供成果、数量、学生名单等附件)</p>
           <beUpload
-            v-show="!isDownPdf"
+            v-if="!isDownPdf"
             style="position: absolute; right: 10px; top: 5px"
             @getFile="gettalentsAccessory"
             :navName="'上传文件'"
@@ -636,7 +636,7 @@
             :progress="progress5"
           ></beUpload>
           <el-progress
-            v-show="progress5.show"
+            v-if="progress5.show"
             :percentage="progress5.value"
             :format="ProgressFormattalentsAccessory"
             style="width: 80%"
@@ -722,7 +722,7 @@
         <td colspan="7" style="height: 200px">
           <p>附:课题研究报告、用户评价意见或专家鉴定意见、其它附件等等</p>
           <beUpload
-            v-show="!isDownPdf"
+            v-if="!isDownPdf"
             style="position: absolute; right: 10px; top: 5px"
             @getFile="gettaskAccessory"
             :navName="'上传文件'"
@@ -730,7 +730,7 @@
             :progress="progress6"
           ></beUpload>
           <el-progress
-            v-show="progress6.show"
+            v-if="progress6.show"
             :percentage="progress6.value"
             :format="ProgressFormattaskAccessory"
             style="width: 80%"
@@ -910,7 +910,7 @@
         <td colspan="3">论文版面费、专利及其他知识产权事务等费用。</td>
       </tr>
 
-      <tr style="height: 350px;">
+      <tr style="height: 350px">
         <td>
           所 <br />在 <br />学 <br />院/ <br />部 <br />门 <br />意 <br />见
         </td>
@@ -936,7 +936,7 @@
         </td>
       </tr> -->
 
-      <tr style="height: 350px;">
+      <tr style="height: 350px">
         <td>双 <br />创 <br />学 <br />院 <br />意 <br />见</td>
         <td colspan="7">
           <div style="width: 200px; float: right; margin: 10px 300px">
@@ -948,7 +948,7 @@
         </td>
       </tr>
 
-      <tr style="height: 350px;">
+      <tr style="height: 350px">
         <td>学 <br />校 <br />审 <br />批 <br />意 <br />见</td>
         <td colspan="7">
           <div style="width: 200px; float: right; margin: 10px 300px">
@@ -960,6 +960,9 @@
         </td>
       </tr>
     </table>
+    <!-- <table v-show="isDownPdf" border="1" cellspacing="0" ref="tableBox2">
+
+    </table> -->
     <div class="ending">
       <p>备注:1、本表一式三份,专家验收后交双创学院</p>
       <p style="text-indent: 3em">
@@ -1451,9 +1454,12 @@ export default {
 <style lang="less" scoped>
 .onePage {
   width: 100%;
-  // position: absolute;
+  height: 1900px;
   text-align: center;
-  // top: -750px;
+  margin: 20px auto;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
   .titSchool {
     font-weight: 600;
     font-size: 28px;
@@ -1493,7 +1499,7 @@ table {
   position: relative;
   color: black;
   width: 1200px;
-  margin: -65px auto 0;
+  margin: 0 auto;
   margin-bottom: 20px;
   font-size: 24px;
   font-family: \5b8b\4f53;

+ 1 - 2
src/views/resultShow/components/resultDetail_MakerSpace.vue

@@ -791,8 +791,7 @@ export default {
     }
   }
   .headerConcent {
-    width: 500px;
-    height: 130px;
+    line-height: 40px;
     display: flex;
     flex-direction: column;
     justify-content: space-between;

+ 1 - 2
src/views/resultShow/components/resultDetail_student.vue

@@ -932,8 +932,7 @@ export default {
     }
   }
   .headerConcent {
-    width: 500px;
-    height: 130px;
+    line-height: 40px;
     display: flex;
     flex-direction: column;
     justify-content: space-between;

Some files were not shown because too many files changed in this diff