zengyicheng 1 ano atrás
pai
commit
38c974d7b5
59 arquivos alterados com 2108 adições e 1686 exclusões
  1. 0 0
      dist/css/245.72e191d0.css
  2. 0 0
      dist/css/381.e839fba8.css
  3. 0 0
      dist/css/424.03683df6.css
  4. 0 0
      dist/css/427.27325c48.css
  5. 0 0
      dist/css/503.4bd44906.css
  6. 0 0
      dist/css/520.c9bcaa0c.css
  7. 0 0
      dist/css/785.727f942a.css
  8. 0 0
      dist/css/876.2f6c8a71.css
  9. 0 0
      dist/css/93.af65a6c5.css
  10. 0 0
      dist/css/app.c1315931.css
  11. 0 0
      dist/css/app.c9daf444.css
  12. 1 1
      dist/index.html
  13. 0 0
      dist/js/245.a3320b34.js
  14. 0 0
      dist/js/245.a3320b34.js.map
  15. 0 0
      dist/js/251.9936e527.js
  16. 0 0
      dist/js/251.9936e527.js.map
  17. 0 0
      dist/js/32.d1f63499.js
  18. 0 0
      dist/js/32.d1f63499.js.map
  19. 0 0
      dist/js/37.b2439f69.js
  20. 0 0
      dist/js/37.b2439f69.js.map
  21. 0 0
      dist/js/381.2ce41bdb.js
  22. 0 0
      dist/js/381.2ce41bdb.js.map
  23. 0 0
      dist/js/424.5acbc6a1.js
  24. 0 0
      dist/js/424.5acbc6a1.js.map
  25. 0 0
      dist/js/427.c118d165.js
  26. 0 0
      dist/js/427.c118d165.js.map
  27. 0 0
      dist/js/503.6c89079f.js
  28. 0 0
      dist/js/503.6c89079f.js.map
  29. 0 0
      dist/js/520.f09dabae.js
  30. 0 0
      dist/js/520.f09dabae.js.map
  31. 0 0
      dist/js/596.595b7d2d.js
  32. 0 0
      dist/js/596.595b7d2d.js.map
  33. 0 0
      dist/js/639.89034f5c.js
  34. 1 1
      dist/js/685.b4b94147.js
  35. 0 0
      dist/js/685.b4b94147.js.map
  36. 0 0
      dist/js/785.57686368.js
  37. 0 0
      dist/js/785.57686368.js.map
  38. 0 0
      dist/js/876.d19c98ed.js
  39. 0 0
      dist/js/876.d19c98ed.js.map
  40. 0 0
      dist/js/93.5c4870cf.js
  41. 0 0
      dist/js/93.5c4870cf.js.map
  42. 0 0
      dist/js/app.10f0d52d.js
  43. 0 0
      dist/js/app.10f0d52d.js.map
  44. 0 0
      dist/js/app.684d5ed5.js
  45. 0 0
      dist/js/app.684d5ed5.js.map
  46. 6 3
      src/App.vue
  47. 8 8
      src/components/MakerSpaceWordPreview.vue
  48. 8 8
      src/components/MakerSpaceWordShow.vue
  49. 8 8
      src/views/commission/components/projectLookSpace.vue
  50. 8 8
      src/views/projectApply/components/MakerSpaceWordShow.vue
  51. 1 1
      src/views/projectManage/ProjectManagement.vue
  52. 2 2
      src/views/projectManage/components/Closingstatement.vue
  53. 8 8
      src/views/projectManage/components/MakerSpaceWordShow.vue
  54. 11 11
      src/views/projectManage/components/studentProjectWordShow.vue
  55. 8 8
      src/views/projectSettlement/components/MakerSpaceWordShow.vue
  56. 138 18
      src/views/projectSettlement/components/projectSettlementBook.vue
  57. 198 166
      src/views/projectSettlement/projectSettlementDetailMain.vue
  58. 1106 962
      src/views/resultShow/components/resultDetail_MakerSpace.vue
  59. 596 473
      src/views/resultShow/components/resultDetail_student.vue

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/css/245.72e191d0.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/css/381.e839fba8.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/css/424.03683df6.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/css/427.27325c48.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/css/503.4bd44906.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/css/520.c9bcaa0c.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/css/785.727f942a.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/css/876.2f6c8a71.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/css/93.af65a6c5.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/css/app.c1315931.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/css/app.c9daf444.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.c0eb00f6.js"></script><script defer="defer" src="/js/app.684d5ed5.js"></script><link href="/css/chunk-vendors.0225060a.css" rel="stylesheet"><link href="/css/app.c1315931.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.10f0d52d.js"></script><link href="/css/chunk-vendors.0225060a.css" rel="stylesheet"><link href="/css/app.c9daf444.css" rel="stylesheet"></head><body><div id="app"></div></body></html>

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/245.a3320b34.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/245.a3320b34.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/251.9936e527.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/251.9936e527.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/32.d1f63499.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/32.d1f63499.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/37.b2439f69.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/37.b2439f69.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/381.2ce41bdb.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/381.2ce41bdb.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/424.5acbc6a1.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/424.5acbc6a1.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/427.c118d165.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/427.c118d165.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/503.6c89079f.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/503.6c89079f.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/520.f09dabae.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/520.f09dabae.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/596.595b7d2d.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/596.595b7d2d.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/639.89034f5c.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
dist/js/685.b4b94147.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/685.b4b94147.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/785.57686368.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/785.57686368.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/876.d19c98ed.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/876.d19c98ed.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/93.5c4870cf.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/93.5c4870cf.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/app.10f0d52d.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/app.10f0d52d.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/app.684d5ed5.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/app.684d5ed5.js.map


+ 6 - 3
src/App.vue

@@ -275,6 +275,12 @@ hr {
     max-width: 100%;
     height: 300px;
     // white-space: nowrap;
+    p:first-child{
+      font-weight: 600;
+    }
+    div>p{
+      font-weight: unset !important;
+    }
     span {
       // white-space: nowrap
       word-wrap: break-word;
@@ -300,9 +306,6 @@ hr {
       min-width: 160px;
       box-sizing: border-box;
       padding: 5px;
-      p {
-        font-weight: 600;
-      }
       :deep(.el-select .el-input .el-select__caret) {
         display: none;
       }

+ 8 - 8
src/components/MakerSpaceWordPreview.vue

@@ -97,7 +97,7 @@
               </div>
               <div class="chaptersValue">
                 <span>建设内容(空间优化/场馆规划方面拟解决的关键问题及主要建设指标)</span><br/>
-                {{wordData['Construction']}}
+                <div v-html="wordData['Construction']"></div>
               </div>
           </div>
         </div>
@@ -108,7 +108,7 @@
           <div class="chaptersTable">
               <div class="chaptersValue">
                 <span>立项依据(说明本项目的目的、意义以及国内外高校现状、市场预测和发展趋势,预期达到的目标,研究的预期效果分析,成果受益面)</span><br/>
-                {{wordData['ProjectBasis']}}
+                <div v-html="wordData['ProjectBasis']"></div>
               </div>
           </div>
         </div>
@@ -119,23 +119,23 @@
           <div class="chaptersTable">
               <div class="chaptersValue">
                 <span>创客空间物理环境、制度建设及软件设施建设情况(环境优化/制度完善/设施改造)</span><br/>
-                {{wordData['development']}}
+                <div v-html="wordData['development']"></div>
               </div>
               <div class="chaptersValue">
                 <span>学生创客工作室建设情况(工作室数量及活动开展情况)</span><br/>
-                {{wordData['studio']}}
+                <div v-html="wordData['studio']"></div>
               </div>
               <div class="chaptersValue">
                 <span>学生创客团队(人才)培养预期成果、数量</span><br/>
-                {{wordData['studentTeam']}}
+                <div v-html="wordData['studentTeam']"></div>
               </div>
               <div class="chaptersValue">
                 <span>学生创客活动组织实施情况</span><br/>
-                {{wordData['studentActivities']}}
+                <div v-html="wordData['studentActivities']"></div>
               </div>
               <div class="chaptersValue">
                 <span>学生创客团队孵化、转化创业项目情况</span><br/>
-                {{wordData['Transforming']}}
+                <div v-html="wordData['Transforming']"></div>
               </div>
           </div>
         </div>
@@ -156,7 +156,7 @@
           <div class="chaptersTable">
               <div class="chaptersValue">
                 <span>基础条件(物理环境/设备设施/项目实施/活动开展/技术力量/社会资源)</span><br/>
-                {{wordData['condition']}}
+                <div v-html="wordData['condition']"></div>
               </div>
           </div>
         </div>

+ 8 - 8
src/components/MakerSpaceWordShow.vue

@@ -157,7 +157,7 @@
             <span
               >建设内容(空间优化/场馆规划方面拟解决的关键问题及主要建设指标)</span
             ><br />
-            <p v-text="wordData['Construction']"></p>
+            <p v-html="wordData['Construction']"></p>
             <!-- <el-input
                       type="textarea"
                       class="noCenter"
@@ -180,7 +180,7 @@
             <span
               >立项依据(说明本项目的目的、意义以及国内外高校现状、市场预测和发展趋势,预期达到的目标,研究的预期效果分析,成果受益面)</span
             ><br />
-            <p v-text="wordData['ProjectBasis']"></p>
+            <p v-html="wordData['ProjectBasis']"></p>
             <!-- <el-input
                       type="textarea"
                       class="noCenter"
@@ -203,7 +203,7 @@
             <span
               >创客空间物理环境、制度建设及软件设施建设情况(环境优化/制度完善/设施改造)</span
             ><br />
-            <p v-text="wordData['development']"></p>
+            <p v-html="wordData['development']"></p>
             <!-- <el-input
                       type="textarea"
                       class="noCenter"
@@ -215,7 +215,7 @@
           <div class="chaptersValue" id="eleven">
             <span>学生创客工作室建设情况(工作室数量及活动开展情况)</span
             ><br />
-            <p v-text="wordData['studio']"></p>
+            <p v-html="wordData['studio']"></p>
             <!-- <el-input
                       type="textarea"
                       class="noCenter"
@@ -226,7 +226,7 @@
           </div>
           <div class="chaptersValue" id="twelve">
             <span>学生创客团队(人才)培养预期成果、数量</span><br />
-            <p v-text="wordData['studentTeam']"></p>
+            <p v-html="wordData['studentTeam']"></p>
             <!-- <el-input
                       type="textarea"
                       class="noCenter"
@@ -237,7 +237,7 @@
           </div>
           <div class="chaptersValue" id="thirteen">
             <span>学生创客活动组织实施情况</span><br />
-            <p v-text="wordData['studentActivities']"></p>
+            <p v-html="wordData['studentActivities']"></p>
             <!-- <el-input
                       type="textarea"
                       class="noCenter"
@@ -248,7 +248,7 @@
           </div>
           <div class="chaptersValue" id="fourteen">
             <span>学生创客团队孵化、转化创业项目情况</span><br />
-            <p v-text="wordData['Transforming']"></p>
+            <p v-html="wordData['Transforming']"></p>
           </div>
         </div>
       </div>
@@ -271,7 +271,7 @@
             <span
               >基础条件(物理环境/设备设施/项目实施/活动开展/技术力量/社会资源)</span
             ><br />
-            <p v-text="wordData['condition']"></p>
+            <p v-html="wordData['condition']"></p>
             <!-- <el-input
                       type="textarea"
                       class="noCenter"

+ 8 - 8
src/views/commission/components/projectLookSpace.vue

@@ -148,7 +148,7 @@
             <span
               >建设内容(空间优化/场馆规划方面拟解决的关键问题及主要建设指标)</span
             ><br />
-            <p v-text="wordData['Construction']"></p>
+            <p v-html="wordData['Construction']"></p>
           </div>
         </div>
       </div>
@@ -164,7 +164,7 @@
             <span
               >立项依据(说明本项目的目的、意义以及国内外高校现状、市场预测和发展趋势,预期达到的目标,研究的预期效果分析,成果受益面)</span
             ><br />
-            <p v-text="wordData['ProjectBasis']"></p>
+            <p v-html="wordData['ProjectBasis']"></p>
           </div>
         </div>
       </div>
@@ -180,24 +180,24 @@
             <span
               >创客空间物理环境、制度建设及软件设施建设情况(环境优化/制度完善/设施改造)</span
             ><br />
-            <p v-text="wordData['development']"></p>
+            <p v-html="wordData['development']"></p>
           </div>
           <div class="chaptersValue" id="eleven">
             <span>学生创客工作室建设情况(工作室数量及活动开展情况)</span
             ><br />
-            <p v-text="wordData['studio']"></p>
+            <p v-html="wordData['studio']"></p>
           </div>
           <div class="chaptersValue" id="twelve">
             <span>学生创客团队(人才)培养预期成果、数量</span><br />
-            <p v-text="wordData['studentTeam']"></p>
+            <p v-html="wordData['studentTeam']"></p>
           </div>
           <div class="chaptersValue" id="thirteen">
             <span>学生创客活动组织实施情况</span><br />
-            <p v-text="wordData['studentActivities']"></p>
+            <p v-html="wordData['studentActivities']"></p>
           </div>
           <div class="chaptersValue" id="fourteen">
             <span>学生创客团队孵化、转化创业项目情况</span><br />
-            <p v-text="wordData['Transforming']"></p>
+            <p v-html="wordData['Transforming']"></p>
           </div>
         </div>
       </div>
@@ -220,7 +220,7 @@
             <span
               >基础条件(物理环境/设备设施/项目实施/活动开展/技术力量/社会资源)</span
             ><br />
-            <p v-text="wordData['condition']"></p>
+            <p v-html="wordData['condition']"></p>
           </div>
         </div>
       </div>

+ 8 - 8
src/views/projectApply/components/MakerSpaceWordShow.vue

@@ -426,7 +426,7 @@
           <p>建设内容(空间优化/场馆规划方面拟解决的关键问题及主要建设指标)</p>
           <div
             style="word-wrap: break-word; word-break: break-all"
-            v-text="wordData['Construction']"
+            v-html="wordData['Construction']"
           ></div>
         </td>
       </tr>
@@ -441,7 +441,7 @@
           </p>
           <div
             style="word-wrap: break-word; word-break: break-all"
-            v-text="wordData['ProjectBasis']"
+            v-html="wordData['ProjectBasis']"
           ></div>
         </td>
       </tr>
@@ -457,7 +457,7 @@
           </p>
           <div
             style="word-wrap: break-word; word-break: break-all"
-            v-text="wordData['development']"
+            v-html="wordData['development']"
           ></div>
         </td>
       </tr>
@@ -466,7 +466,7 @@
           <p>学生创客工作室建设情况(工作室数量及活动开展情况)</p>
           <div
             style="word-wrap: break-word; word-break: break-all"
-            v-text="wordData['studio']"
+            v-html="wordData['studio']"
           ></div>
         </td>
       </tr>
@@ -475,7 +475,7 @@
           <p>学生创客团队(人才)培养预期成果、数量</p>
           <div
             style="word-wrap: break-word; word-break: break-all"
-            v-text="wordData['studentTeam']"
+            v-html="wordData['studentTeam']"
           ></div>
         </td>
       </tr>
@@ -484,7 +484,7 @@
           <p>学生创客活动组织实施情况</p>
           <div
             style="word-wrap: break-word; word-break: break-all"
-            v-text="wordData['studentActivities']"
+            v-html="wordData['studentActivities']"
           ></div>
         </td>
       </tr>
@@ -493,7 +493,7 @@
           <p>学生创客团队孵化、转化创业项目情况</p>
           <div
             style="word-wrap: break-word; word-break: break-all"
-            v-text="wordData['Transforming']"
+            v-html="wordData['Transforming']"
           ></div>
         </td>
       </tr>
@@ -509,7 +509,7 @@
           </p>
           <div
             style="word-wrap: break-word; word-break: break-all"
-            v-text="wordData['condition']"
+            v-html="wordData['condition']"
           ></div>
         </td>
       </tr>

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

@@ -474,7 +474,7 @@ export default {
       table: {
         // 分页数据
         total: 0,
-        packageSize: 5,
+        packageSize: 10,
         currentPage: 1,
       },
       progress: {

+ 2 - 2
src/views/projectManage/components/Closingstatement.vue

@@ -193,7 +193,7 @@
         :key="index + 'a'"
       >
         <td><span v-text="item.name"></span></td>
-        <td><span v-text="item.class"></span></td>
+        <td><span v-html="item.collage"></span></td>
         <td colspan="5"><span v-text="item.work"></span></td>
       </tr>
 
@@ -208,7 +208,7 @@
         :key="index + 'b'"
       >
         <td><span v-text="item.name"></span></td>
-        <td></td>
+        <td><span v-html="item.collage"></span></td>
         <td colspan="5"><span v-text="item.work"></span></td>
       </tr>
 

+ 8 - 8
src/views/projectManage/components/MakerSpaceWordShow.vue

@@ -148,7 +148,7 @@
             <span
               >建设内容(空间优化/场馆规划方面拟解决的关键问题及主要建设指标)</span
             ><br />
-            <p v-text="wordData['Construction']"></p>
+            <p v-html="wordData['Construction']"></p>
           </div>
         </div>
       </div>
@@ -164,7 +164,7 @@
             <span
               >立项依据(说明本项目的目的、意义以及国内外高校现状、市场预测和发展趋势,预期达到的目标,研究的预期效果分析,成果受益面)</span
             ><br />
-            <p v-text="wordData['ProjectBasis']"></p>
+            <p v-html="wordData['ProjectBasis']"></p>
           </div>
         </div>
       </div>
@@ -180,24 +180,24 @@
             <span
               >创客空间物理环境、制度建设及软件设施建设情况(环境优化/制度完善/设施改造)</span
             ><br />
-            <p v-text="wordData['development']"></p>
+            <p v-html="wordData['development']"></p>
           </div>
           <div class="chaptersValue" id="eleven">
             <span>学生创客工作室建设情况(工作室数量及活动开展情况)</span
             ><br />
-            <p v-text="wordData['studio']"></p>
+            <p v-html="wordData['studio']"></p>
           </div>
           <div class="chaptersValue" id="twelve">
             <span>学生创客团队(人才)培养预期成果、数量</span><br />
-            <p v-text="wordData['studentTeam']"></p>
+            <p v-html="wordData['studentTeam']"></p>
           </div>
           <div class="chaptersValue" id="thirteen">
             <span>学生创客活动组织实施情况</span><br />
-            <p v-text="wordData['studentActivities']"></p>
+            <p v-html="wordData['studentActivities']"></p>
           </div>
           <div class="chaptersValue" id="fourteen">
             <span>学生创客团队孵化、转化创业项目情况</span><br />
-            <p v-text="wordData['Transforming']"></p>
+            <p v-html="wordData['Transforming']"></p>
           </div>
         </div>
       </div>
@@ -220,7 +220,7 @@
             <span
               >基础条件(物理环境/设备设施/项目实施/活动开展/技术力量/社会资源)</span
             ><br />
-            <p v-text="wordData['condition']"></p>
+            <p v-html="wordData['condition']"></p>
           </div>
         </div>
       </div>

+ 11 - 11
src/views/projectManage/components/studentProjectWordShow.vue

@@ -90,71 +90,71 @@
           <tr>
             <td style="text-align: left;" colspan="6" class="textLeft">
               <p>项目研发背景</p>
-              <span v-text="downWordData.introduce.back"></span>
+              <span v-html="downWordData.introduce.back"></span>
             </td>
           </tr>
           <tr>
             <td style="text-align: left;" colspan="6" class="textLeft">
               <p>项目创新点</p>
-              <span v-text="downWordData.introduce.innovate"></span>
+              <span v-html="downWordData.introduce.innovate"></span>
             </td>
           </tr>
           <tr>
             <td style="text-align: left;" colspan="6" class="textLeft">
               <p>技术研发路线</p>
-              <span v-text="downWordData.introduce.path"></span>
+              <span v-html="downWordData.introduce.path"></span>
             </td>
           </tr>
           <tr>
             <td style="text-align: left;" colspan="6" class="textLeft">
               <p>项目应用场景 </p>
-              <span v-text="downWordData.introduce.scene"></span>
+              <span v-html="downWordData.introduce.scene"></span>
             </td>
           </tr>
           <tr>
             <td>商业模式及社会价值</td>
             <td style="text-align: left;" colspan="6" class="textLeft">
               <p>项目商业模式/社会价值</p>
-              <span v-text="downWordData.introduce.worth"></span>
+              <span v-html="downWordData.introduce.worth"></span>
             </td>
           </tr>
           <tr>
             <td>团队优势</td>
             <td style="text-align: left;" colspan="6" class="textLeft">
               <p>团队构成及优势</p>
-              <span v-text='downWordData.introduce.team'></span>
+              <span v-html='downWordData.introduce.team'></span>
             </td>
           </tr>
           <tr>
             <td>研发成本</td>
             <td style="text-align: left;" colspan="6" class="textLeft">
               <p>研发成本来源及构成</p>
-              <span v-text="downWordData.introduce.cost"></span>
+              <span v-html="downWordData.introduce.cost"></span>
             </td>
           </tr>
           <tr>
             <td rowspan="3">预期成果</td>
             <td style="text-align: left;" colspan="6" class="textLeft">
               <p>项目预期成果、数量及形式(产品原型/发明专利/双创竞赛/成果转化/社会效益)</p>
-              <span v-text="downWordData.introduce.expectResults"></span>
+              <span v-html="downWordData.introduce.expectResults"></span>
             </td>
           </tr>
           <tr class="textLeft">
             <td style="text-align: left;" colspan="6">
               <p>学生创客人才培养预期成果、数量(教师填写)</p>
-              <span v-text="downWordData.introduce.expectResultsTeacher"></span>
+              <span v-html="downWordData.introduce.expectResultsTeacher"></span>
             </td>
           </tr>
           <tr class="textLeft">
             <td style="text-align: left;" colspan="6">
               <p>项目预期孵化、转化创业项目情况</p>
-              <span v-text="downWordData.introduce.expectConversion"></span>
+              <span v-html="downWordData.introduce.expectConversion"></span>
             </td>
           </tr>
           <tr>
             <td>实施计划</td>
             <td style="text-align: left;" colspan="6" class="textLeft">
-              <span v-text="downWordData.introduce.plan"></span>
+              <span v-html="downWordData.introduce.plan"></span>
             </td>
           </tr>
           <tr id="fund">

+ 8 - 8
src/views/projectSettlement/components/MakerSpaceWordShow.vue

@@ -148,7 +148,7 @@
             <span
               >建设内容(空间优化/场馆规划方面拟解决的关键问题及主要建设指标)</span
             ><br />
-            <p v-text="wordData['Construction']"></p>
+            <p v-html="wordData['Construction']"></p>
           </div>
         </div>
       </div>
@@ -164,7 +164,7 @@
             <span
               >立项依据(说明本项目的目的、意义以及国内外高校现状、市场预测和发展趋势,预期达到的目标,研究的预期效果分析,成果受益面)</span
             ><br />
-            <p v-text="wordData['ProjectBasis']"></p>
+            <p v-html="wordData['ProjectBasis']"></p>
           </div>
         </div>
       </div>
@@ -180,24 +180,24 @@
             <span
               >创客空间物理环境、制度建设及软件设施建设情况(环境优化/制度完善/设施改造)</span
             ><br />
-            <p v-text="wordData['development']"></p>
+            <p v-html="wordData['development']"></p>
           </div>
           <div class="chaptersValue" id="eleven">
             <span>学生创客工作室建设情况(工作室数量及活动开展情况)</span
             ><br />
-            <p v-text="wordData['studio']"></p>
+            <p v-html="wordData['studio']"></p>
           </div>
           <div class="chaptersValue" id="twelve">
             <span>学生创客团队(人才)培养预期成果、数量</span><br />
-            <p v-text="wordData['studentTeam']"></p>
+            <p v-html="wordData['studentTeam']"></p>
           </div>
           <div class="chaptersValue" id="thirteen">
             <span>学生创客活动组织实施情况</span><br />
-            <p v-text="wordData['studentActivities']"></p>
+            <p v-html="wordData['studentActivities']"></p>
           </div>
           <div class="chaptersValue" id="fourteen">
             <span>学生创客团队孵化、转化创业项目情况</span><br />
-            <p v-text="wordData['Transforming']"></p>
+            <p v-html="wordData['Transforming']"></p>
           </div>
         </div>
       </div>
@@ -220,7 +220,7 @@
             <span
               >基础条件(物理环境/设备设施/项目实施/活动开展/技术力量/社会资源)</span
             ><br />
-            <p v-text="wordData['condition']"></p>
+            <p v-html="wordData['condition']"></p>
           </div>
         </div>
       </div>

+ 138 - 18
src/views/projectSettlement/components/projectSettlementBook.vue

@@ -1,8 +1,15 @@
 <template>
   <!-- 结项书组件 -->
   <div>
-    <table border="1" cellspacing="0">
-      <div class="onePage">
+    <table
+      border="1"
+      cellspacing="0"
+      :class="$route.path != '/resultShowDetail' ? '' : 'tableWidth'"
+    >
+      <div
+        class="onePage"
+        :style="$route.path != '/resultShowDetail' ? '' : 'top: -750px;'"
+      >
         <div class="titSchool">深圳技师学院</div>
         <div class="title">校级创客项目结题申请书</div>
         <div class="basicInformation">
@@ -219,9 +226,21 @@
         </td>
       </tr>
       <tr>
-        <td colspan="7" style="height: 200px">
+        <td
+          colspan="7"
+          :style="
+            $route.path === '/resultShowDetail'
+              ? 'height:auto;text-align: left;'
+              : 'height: 200px'
+          "
+        >
           <p>一、项目研发内容简介(200字以内)</p>
+          <div
+            v-if="$route.path === '/resultShowDetail'"
+            v-text="myArrayProp[0].brief"
+          ></div>
           <el-input
+            v-else
             type="textarea"
             maxlength="200"
             show-word-limit
@@ -233,9 +252,21 @@
         </td>
       </tr>
       <tr>
-        <td colspan="7" style="height: 200px">
+        <td
+          colspan="7"
+          :style="
+            $route.path === '/resultShowDetail'
+              ? 'height:auto;text-align: left;'
+              : 'height: 200px'
+          "
+        >
           <p>目标计划:</p>
+          <div
+            v-if="$route.path === '/resultShowDetail'"
+            v-html="myArrayProp[0]['ClosingstatementData'].plan"
+          ></div>
           <el-input
+            v-else
             type="textarea"
             :autosize="{ minRows: 6 }"
             placeholder="请输入内容"
@@ -245,9 +276,21 @@
         </td>
       </tr>
       <tr>
-        <td colspan="7" style="height: 200px">
+        <td
+          colspan="7"
+          :style="
+            $route.path === '/resultShowDetail'
+              ? 'height:auto;text-align: left;'
+              : 'height: 200px'
+          "
+        >
           <p>二、拟解决的关键技术问题</p>
+          <div
+            v-if="$route.path === '/resultShowDetail'"
+            v-html="myArrayProp[0]['ClosingstatementData'].technology"
+          ></div>
           <el-input
+            v-else
             type="textarea"
             :autosize="{ minRows: 6 }"
             placeholder="请输入内容"
@@ -257,9 +300,21 @@
         </td>
       </tr>
       <tr>
-        <td colspan="7" style="height: 200px">
+        <td
+          colspan="7"
+          :style="
+            $route.path === '/resultShowDetail'
+              ? 'height:auto;text-align: left;'
+              : 'height: 200px'
+          "
+        >
           <p>三、项目的商业(公益)价值评估</p>
+          <div
+            v-if="$route.path === '/resultShowDetail'"
+            v-html="myArrayProp[0]['ClosingstatementData'].business"
+          ></div>
           <el-input
+            v-else
             type="textarea"
             :autosize="{ minRows: 6 }"
             placeholder="请输入内容"
@@ -269,9 +324,21 @@
         </td>
       </tr>
       <tr>
-        <td colspan="7" style="height: 200px">
+        <td
+          colspan="7"
+          :style="
+            $route.path === '/resultShowDetail'
+              ? 'height:auto;text-align: left;'
+              : 'height: 200px'
+          "
+        >
           <p>四、项目创新点评估</p>
+          <div
+            v-if="$route.path === '/resultShowDetail'"
+            v-html="myArrayProp[0]['ClosingstatementData'].innovate"
+          ></div>
           <el-input
+            v-else
             type="textarea"
             :autosize="{ minRows: 6 }"
             placeholder="请输入内容"
@@ -291,6 +358,7 @@
           <p>一、成果(名称、数量及形式,开发产品及取得的专利等)</p>
           <p>专利证书获得(提供专利申请或成果证书附件):</p>
           <beUpload
+            v-show="$route.path != '/resultShowDetail'"
             style="position: absolute; right: 10px; top: 5px"
             @getFile="getFile"
             :navName="'上传文件'"
@@ -318,6 +386,7 @@
                 {{ index + 1 + "、" + item.fileName }}
               </div>
               <div
+                v-show="$route.path != '/resultShowDetail'"
                 class="titDelete"
                 @click="
                   deleteFile(
@@ -342,6 +411,7 @@
         <td colspan="7">
           <p>企业应用实证(提供企业证明或合作协议证明等附件):</p>
           <beUpload
+            v-show="$route.path != '/resultShowDetail'"
             style="position: absolute; right: 10px; top: 5px"
             @getFile="getfirmAccessory"
             :navName="'上传文件'"
@@ -377,6 +447,7 @@
                 {{ index + 1 + "、" + item.fileName }}
               </div>
               <div
+                v-show="$route.path != '/resultShowDetail'"
                 class="titDelete"
                 @click="
                   deleteFile(
@@ -401,6 +472,7 @@
         <td colspan="7">
           <p>双创竞赛成绩(提供参加师生名单、比赛取得的成绩等附件):</p>
           <beUpload
+            v-show="$route.path != '/resultShowDetail'"
             style="position: absolute; right: 10px; top: 5px"
             @getFile="getcompetitionAccessory"
             :navName="'上传文件'"
@@ -436,6 +508,7 @@
                 {{ index + 1 + "、" + item.fileName }}
               </div>
               <div
+                v-show="$route.path != '/resultShowDetail'"
                 class="titDelete"
                 @click="
                   deleteFile(
@@ -454,6 +527,7 @@
         <td colspan="7">
           <p>参展或交流活动(提供参加师生名单、活动方案及照片等附件):</p>
           <beUpload
+            v-show="$route.path != '/resultShowDetail'"
             style="position: absolute; right: 10px; top: 5px"
             @getFile="getexchangeAccessory"
             :navName="'上传文件'"
@@ -489,6 +563,7 @@
                 {{ index + 1 + "、" + item.fileName }}
               </div>
               <div
+                v-show="$route.path != '/resultShowDetail'"
                 class="titDelete"
                 @click="
                   deleteFile(
@@ -507,6 +582,7 @@
         <td colspan="7">
           <p>创业公司转化(提供公司注册资料、营业执照等附件):</p>
           <beUpload
+            v-show="$route.path != '/resultShowDetail'"
             style="position: absolute; right: 10px; top: 5px"
             @getFile="getconversionAccessory"
             :navName="'上传文件'"
@@ -542,6 +618,7 @@
                 {{ index + 1 + "、" + item.fileName }}
               </div>
               <div
+                v-show="$route.path != '/resultShowDetail'"
                 class="titDelete"
                 @click="
                   deleteFile(
@@ -560,6 +637,7 @@
         <td colspan="7">
           <p>二、创客人才培养(提供成果、数量、学生名单等附件)</p>
           <beUpload
+            v-show="$route.path != '/resultShowDetail'"
             style="position: absolute; right: 10px; top: 5px"
             @getFile="gettalentsAccessory"
             :navName="'上传文件'"
@@ -595,6 +673,7 @@
                 {{ index + 1 + "、" + item.fileName }}
               </div>
               <div
+                v-show="$route.path != '/resultShowDetail'"
                 class="titDelete"
                 @click="
                   deleteFile(
@@ -610,9 +689,21 @@
         </td>
       </tr>
       <tr>
-        <td colspan="7" style="height: 200px">
+        <td
+          colspan="7"
+          :style="
+            $route.path === '/resultShowDetail'
+              ? 'height:auto;text-align: left;'
+              : 'height: 200px'
+          "
+        >
           <p>目标计划:</p>
+          <div
+            v-if="$route.path === '/resultShowDetail'"
+            v-html="myArrayProp[0]['ClosingstatementData'].targetPlan"
+          ></div>
           <el-input
+            v-else
             type="textarea"
             :autosize="{ minRows: 6 }"
             placeholder="请输入内容"
@@ -622,9 +713,21 @@
         </td>
       </tr>
       <tr>
-        <td colspan="7" style="height: 200px">
+        <td
+          colspan="7"
+          :style="
+            $route.path === '/resultShowDetail'
+              ? 'height:auto;text-align: left;'
+              : 'height: 200px'
+          "
+        >
           <p>实际结果:</p>
+          <div
+            v-if="$route.path === '/resultShowDetail'"
+            v-html="myArrayProp[0]['ClosingstatementData'].realityResult"
+          ></div>
           <el-input
+            v-else
             type="textarea"
             :autosize="{ minRows: 6 }"
             placeholder="请输入内容"
@@ -634,9 +737,21 @@
         </td>
       </tr>
       <tr>
-        <td colspan="7" style="height: 200px">
+        <td
+          colspan="7"
+          :style="
+            $route.path === '/resultShowDetail'
+              ? 'height:auto;text-align: left;'
+              : 'height: 200px'
+          "
+        >
           <p>三、社会价值(项目实践运用情况及效果评价)</p>
+          <div
+            v-if="$route.path === '/resultShowDetail'"
+            v-html="myArrayProp[0]['ClosingstatementData'].socialValue"
+          ></div>
           <el-input
+            v-else
             type="textarea"
             :autosize="{ minRows: 6 }"
             placeholder="请输入内容"
@@ -651,6 +766,7 @@
         <td colspan="7">
           <p>附:课题研究报告、用户评价意见或专家鉴定意见等其他文件</p>
           <beUpload
+            v-show="$route.path != '/resultShowDetail'"
             style="position: absolute; right: 10px; top: 5px"
             @getFile="gettaskAccessory"
             :navName="'上传文件'"
@@ -686,6 +802,7 @@
                 {{ index + 1 + "、" + item.fileName }}
               </div>
               <div
+                v-show="$route.path != '/resultShowDetail'"
                 class="titDelete"
                 @click="
                   deleteFile(
@@ -729,7 +846,7 @@
               知识产权事务费:Transaction   TransactionRemarks -->
       <tr>
         <td>小型仪器设备费</td>
-        <td></td>
+        <td>-</td>
         <td>{{ myArrayProp[0]["money"].device }}</td>
         <td colspan="3">
           项目开展所需的小型专用仪器设备、工具、配件购置或租赁费用。
@@ -737,7 +854,7 @@
       </tr>
       <tr>
         <td>材料费</td>
-        <td></td>
+        <td>-</td>
         <td>{{ myArrayProp[0]["money"].Material }}</td>
         <td colspan="3">
           项目开展需消耗的各种原材料、辅助材料等低值易耗品的采购费用。
@@ -745,7 +862,7 @@
       </tr>
       <tr>
         <td>测试化验加工费</td>
-        <td></td>
+        <td>-</td>
         <td>{{ myArrayProp[0]["money"].processing }}</td>
         <td colspan="3">
           项目开展过程中支付给外单位的检验、测试、化验、计算、分析及加工费等费用。
@@ -753,7 +870,7 @@
       </tr>
       <tr>
         <td>项目协作费</td>
-        <td></td>
+        <td>-</td>
         <td>{{ myArrayProp[0]["money"].Collaboration }}</td>
         <td colspan="3">按合同规定支付给协作单位的费用</td>
       </tr>
@@ -762,13 +879,13 @@
       </tr>
       <tr>
         <td>项目成果鉴定费</td>
-        <td></td>
+        <td>-</td>
         <td>{{ myArrayProp[0]["money"].APPRAISAL }}</td>
         <td colspan="3">学术会务费、评审费、鉴定费、成果集制作费等费用。</td>
       </tr>
       <tr>
         <td>参展参赛费</td>
-        <td></td>
+        <td>-</td>
         <td>{{ myArrayProp[0]["money"].entery }}</td>
         <td colspan="3">
           参加创客展会、竞赛等所需的报名费、展位费、布展费、宣传推广费及差旅费等费用。
@@ -776,7 +893,7 @@
       </tr>
       <tr>
         <td>创客交流活动费</td>
-        <td></td>
+        <td>-</td>
         <td>{{ myArrayProp[0]["money"].activities }}</td>
         <td colspan="3">
           创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。
@@ -784,7 +901,7 @@
       </tr>
       <tr>
         <td>知识产权事务费</td>
-        <td></td>
+        <td>-</td>
         <td>{{ myArrayProp[0]["money"].Transaction }}</td>
         <td colspan="3">论文版面费、专利及其他知识产权事务等费用。</td>
       </tr>
@@ -1313,6 +1430,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.tableWidth {
+  width: auto !important;
+}
 table {
   position: relative;
   color: black;

+ 198 - 166
src/views/projectSettlement/projectSettlementDetailMain.vue

@@ -1,178 +1,210 @@
 <template>
-    <!-- 项目结项 项目基本内容 -->
-      <div class="projectSettlement">
-  
-          <!-- 详情页 -->
-        <div class="vfpHeader">
-            <div class="titleOne">项目管理</div>
-            <div class="smallTitle" style="left: 100px;">项目详情</div>
-            <el-button type="primary" @click="$router.push('/projectSettlement')">返回</el-button>
-        </div>
-        <hr>
-        <div class="AppBar">
-            <div @click="pageState=0">项目详情<div v-if="pageState==0" class="pr1TitBass"></div></div>
-            <div @click="pageState=2">项目结项书<div v-if="pageState==2" class="pr1TitBass"></div></div>
-            <div @click="pageState=1">项目结题附件<div v-if="pageState==1" class="pr1TitBass"></div></div>
-            <!-- <div @click="pageState=2">项目附件<div v-if="pageState==2" class="pr1TitBass"></div></div> -->
-            <!-- <div @click="pageState=0">项目基本内容<div v-if="pageState==0" class="pr1TitBass"></div></div> -->
-            <!-- <div @click="pageState=4">结项评语<div v-if="pageState==4" class="pr1TitBass"></div></div> -->
-        </div>
-        <!-- 特色创客空间建设 -->
-        <MakerSpaceWordShowVue ref="maker" v-if="pageState==0 && $route.query['tid']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/>
-        <!-- <projectSettlementDetailBase_MakerSpace v-if="pageState==0 && $route.query['tid']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/> -->
-        <!-- <projectSettlementDetail_MakerSpace v-if="pageState==1 && $route.query['tid']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/> -->
-        
-        <!-- 项目结项书 -->
-        <projectSettlementBook v-if="pageState==2 && $route.query['tid']"></projectSettlementBook>
-
-        <!-- 学生创业项目 -->
-        <studentProjectWordShowNew ref="student" v-if="pageState==0 && $route.query['tid']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"/>
-        <!-- <studentProjectWordShow ref="student" v-if="pageState==0 && $route.query['tid']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"/> -->
-        <!-- <projectSettlementDetailBase_StudentVue v-if="pageState==0 && $route.query['tid']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'" ></projectSettlementDetailBase_StudentVue> -->
-        <!-- <projectSettlementDetail_Student v-if="pageState==1 && $route.query['tid']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"></projectSettlementDetail_Student> -->
-       
-        <!-- 下载PDF -->
-        <div class="downBtn">
-            <el-button v-if="pageState==0" type="primary" @click="getWord">下载表格</el-button>
-        </div>
-        <!-- 项目附件 -->
-        <!-- <projectSettlementDetailAnnex v-if="pageState==2"/> -->
-        <!-- 项目结题附件 -->
-        <projectSettlementDetailConclusion v-if="pageState==1"/>
-        <!-- 项目评语 -->
-        <!-- <projectSettlementDetailComment v-if="pageState==4"/> -->
+  <!-- 项目结项 项目基本内容 -->
+  <div class="projectSettlement">
+    <!-- 详情页 -->
+    <div class="vfpHeader">
+      <div class="titleOne">项目管理</div>
+      <div class="smallTitle" style="left: 100px">项目详情</div>
+      <el-button type="primary" @click="$router.push('/projectSettlement')"
+        >返回</el-button
+      >
+    </div>
+    <hr />
+    <div class="AppBar">
+      <div @click="pageState = 0">
+        项目详情
+        <div v-if="pageState == 0" class="pr1TitBass"></div>
+      </div>
+      <div @click="pageState = 2">
+        项目结项书
+        <div v-if="pageState == 2" class="pr1TitBass"></div>
+      </div>
+      <div @click="pageState = 1">
+        项目结题附件
+        <div v-if="pageState == 1" class="pr1TitBass"></div>
       </div>
-    </template>
+      <!-- <div @click="pageState=2">项目附件<div v-if="pageState==2" class="pr1TitBass"></div></div> -->
+      <!-- <div @click="pageState=0">项目基本内容<div v-if="pageState==0" class="pr1TitBass"></div></div> -->
+      <!-- <div @click="pageState=4">结项评语<div v-if="pageState==4" class="pr1TitBass"></div></div> -->
+    </div>
+    <!-- 特色创客空间建设 -->
+    <MakerSpaceWordShowVue
+      ref="maker"
+      v-if="
+        pageState == 0 &&
+        $route.query['tid'] == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'
+      "
+    />
+    <!-- <projectSettlementDetailBase_MakerSpace v-if="pageState==0 && $route.query['tid']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/> -->
+    <!-- <projectSettlementDetail_MakerSpace v-if="pageState==1 && $route.query['tid']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/> -->
+
+    <!-- 项目结项书 -->
+    <projectSettlementBook
+      v-if="pageState == 2 && $route.query['tid']"
+    ></projectSettlementBook>
+
+    <!-- 学生创业项目 -->
+    <studentProjectWordShowNew
+      ref="student"
+      v-if="
+        pageState == 0 &&
+        $route.query['tid'] == '5e21b204-c206-11ed-a4cd-509a4c5b67cf'
+      "
+    />
+    <!-- <studentProjectWordShow ref="student" v-if="pageState==0 && $route.query['tid']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"/> -->
+    <!-- <projectSettlementDetailBase_StudentVue v-if="pageState==0 && $route.query['tid']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'" ></projectSettlementDetailBase_StudentVue> -->
+    <!-- <projectSettlementDetail_Student v-if="pageState==1 && $route.query['tid']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"></projectSettlementDetail_Student> -->
+
+    <!-- 下载PDF -->
+    <div class="downBtn">
+      <el-button v-if="pageState == 0" type="primary" @click="getWord"
+        >下载表格</el-button
+      >
+    </div>
+    <!-- 项目附件 -->
+    <!-- <projectSettlementDetailAnnex v-if="pageState==2"/> -->
+    <!-- 项目结题附件 -->
+    <projectSettlementDetailConclusion v-if="pageState == 1" />
+    <!-- 项目评语 -->
+    <!-- <projectSettlementDetailComment v-if="pageState==4"/> -->
+  </div>
+</template>
     
     <script>
-    //学生创业项目
-    import studentProjectWordShow from './components/studentProjectWordShow.vue';
-    import studentProjectWordShowNew from './components/studentProjectWordShowNew.vue';
+//学生创业项目
+import studentProjectWordShow from "./components/studentProjectWordShow.vue";
+import studentProjectWordShowNew from "./components/studentProjectWordShowNew.vue";
 
-    // 结项书
-    import projectSettlementBook from './components/projectSettlementBook.vue';
+// 结项书
+import projectSettlementBook from "./components/projectSettlementBook.vue";
 
-    //特色创客空间建设项目
-    import MakerSpaceWordShowVue from './components/MakerSpaceWordShow.vue';
+//特色创客空间建设项目
+import MakerSpaceWordShowVue from "./components/MakerSpaceWordShow.vue";
 
-    //共同的项目附件
-    // import projectSettlementDetailAnnex from './components/projectSettlementDetailAnnex.vue';
-    import projectSettlementDetailConclusion from './components/projectSettlementDetailConclusion.vue';
-    // import projectSettlementDetailComment from './components/projectSettlementDetailComment.vue';
-    //下载pdf
-    import {downloadPDF} from '@/components/tool/pdf'
-        export default {
-        components:{
-          MakerSpaceWordShowVue,
-          studentProjectWordShow,
-          studentProjectWordShowNew,
-          projectSettlementBook,
-          // projectSettlementDetailBase_MakerSpace,
-          // projectSettlementDetail_MakerSpace,
-          // projectSettlementDetailAnnex,
-          projectSettlementDetailConclusion,
-          // projectSettlementDetailComment,
-          // projectSettlementDetailBase_StudentVue,
-          // projectSettlementDetail_Student
-        },
-        data() {
-          return {
-            pageState:0,
-          }
-        },
-        methods:{
-          getWord(){
-                if(this.$route.query['tid']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf')downloadPDF(this.$refs.student.$refs.downPDF,'附件2:2023年学生创客项目申报书模板');
-                if(this.$route.query['tid']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf')downloadPDF(this.$refs.maker.$refs.downPDF,'附件3:2023年二级学院特色创客空间建设项目申报书模板');                
-            }
-        },
-        mounted(){
-            console.log(this.$route)
-        }
-        }
-    </script>
+//共同的项目附件
+// import projectSettlementDetailAnnex from './components/projectSettlementDetailAnnex.vue';
+import projectSettlementDetailConclusion from "./components/projectSettlementDetailConclusion.vue";
+// import projectSettlementDetailComment from './components/projectSettlementDetailComment.vue';
+//下载pdf
+import { downloadPDF } from "@/components/tool/pdf";
+export default {
+  components: {
+    MakerSpaceWordShowVue,
+    studentProjectWordShow,
+    studentProjectWordShowNew,
+    projectSettlementBook,
+    // projectSettlementDetailBase_MakerSpace,
+    // projectSettlementDetail_MakerSpace,
+    // projectSettlementDetailAnnex,
+    projectSettlementDetailConclusion,
+    // projectSettlementDetailComment,
+    // projectSettlementDetailBase_StudentVue,
+    // projectSettlementDetail_Student
+  },
+  data() {
+    return {
+      pageState: 0,
+    };
+  },
+  methods: {
+    getWord() {
+      if (this.$route.query["tid"] == "5e21b204-c206-11ed-a4cd-509a4c5b67cf")
+        downloadPDF(
+          this.$refs.student.$refs.downPDF,
+          "附件2:2023年学生创客项目申报书模板"
+        );
+      if (this.$route.query["tid"] == "5f7a66d5-c206-11ed-a4cd-509a4c5b67cf")
+        downloadPDF(
+          this.$refs.maker.$refs.downPDF,
+          "附件3:2023年二级学院特色创客空间建设项目申报书模板"
+        );
+    },
+  },
+  mounted() {
+    console.log(this.$route);
+  },
+};
+</script>
     
     <style lang="less">
-    .projectSettlement{
-      .psSmallTit{
-          width: 100%;
-          margin: 15px 0px 20px 0px;
-          text-align: left;
-          font-size: 16px;
-      }
-      .downBtn{
-        width: 100%;
-        display: flex;
-        justify-content: center;
+.projectSettlement {
+  .psSmallTit {
+    width: 100%;
+    margin: 15px 0px 20px 0px;
+    text-align: left;
+    font-size: 16px;
+  }
+  .downBtn {
+    width: 100%;
+    display: flex;
+    justify-content: center;
+  }
+}
+.projectApplicationfundAddDialog {
+  .el-dialog__header {
+    background: #32455b;
+  }
+  .el-dialog {
+    border-radius: 5px;
+    overflow: hidden;
+  }
+
+  .deleteContent {
+    width: 100%;
+    text-align: center;
+    font-size: 22px;
+    color: #000;
+  }
+  .addDialogLogo {
+    width: 60px;
+    height: 30px;
+    border-radius: 5px;
+    display: flex;
+    justify-content: center;
+    line-height: 30px;
+    background: #f2f2f2;
+    position: absolute;
+    left: 20px;
+    top: 15px;
+  }
+
+  .el-dialog__title {
+    color: #fff;
+    display: flex;
+    justify-content: center;
+    font-size: 18px;
+    position: relative;
+    top: -2px;
+  }
+  .addDialogMid {
+    box-sizing: border-box;
+    padding: 0 60px 0 10px;
+    .addDialogTit {
+      display: flex;
+      span {
+        width: 80px;
+        line-height: 40px;
+        text-align: left;
       }
     }
-    .projectApplicationfundAddDialog{  
-   
-   .el-dialog__header{
-       background: #32455b;
-  
-   }
-   .el-dialog{
-     border-radius:5px ;
-     overflow: hidden;
-   }
-   
-   .deleteContent{
-     width: 100%;
-     text-align: center;
-     font-size: 22px;
-     color: #000;
-   }
-   .addDialogLogo{
-           width: 60px;
-           height: 30px;
-           border-radius: 5px;
-           display: flex;
-           justify-content: center;
-           line-height: 30px;
-           background: #f2f2f2;
-           position: absolute;
-           left: 20px; top: 15px; 
-   }
-  
-   .el-dialog__title{
-           color:#fff;
-           display: flex;
-           justify-content: center;
-           font-size: 18px;
-           position: relative;
-           top: -2px;
-   }
-   .addDialogMid{
-     box-sizing: border-box;
-     padding:0 60px 0 10px;
-     .addDialogTit{
-       display: flex;
-       span{
-         width: 80px;
-         line-height: 40px;
-         text-align: left;
-       }
-     }
-   .addDialogTit1{
-     display: flex;
-     justify-content: space-between;
-     margin-bottom: 15px;
-   }
-   .addDialogTit2{
-     margin-top: 10px;
-     font-size: 18px;
-     color: #000;
-     text-indent: 2em;
-   }
-   .addDialogCon{
-     margin-top: 20px;
-   }
-   }
-   .dialog-footer{
-   display: flex;
-   justify-content: center;
-  
-   }
+    .addDialogTit1 {
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 15px;
+    }
+    .addDialogTit2 {
+      margin-top: 10px;
+      font-size: 18px;
+      color: #000;
+      text-indent: 2em;
+    }
+    .addDialogCon {
+      margin-top: 20px;
+    }
+  }
+  .dialog-footer {
+    display: flex;
+    justify-content: center;
   }
-    </style>
+}
+</style>

+ 1106 - 962
src/views/resultShow/components/resultDetail_MakerSpace.vue

@@ -1,1020 +1,1164 @@
 <template>
-    <!-- 成果展示 项目成果展示 -->
-    <div class="rs1apply" v-loading="loading">
-        <!-- 头部展示区开始 -->
-        <div class="header">
-            <!-- <div class="imgBlock">
+  <!-- 成果展示 项目成果展示 -->
+  <div class="rs1apply" v-loading="loading">
+    <!-- 头部展示区开始 -->
+    <div class="header">
+      <!-- <div class="imgBlock">
                 <img :src="TitleMessage.image" alt="">
             </div> -->
-            <div class="headerConcent">
-                <div class="rsHead1Tit">项目名称:<span>{{ TitleMessage.title }}</span></div>
-                <div class="rsHead2Tit rsHead3Tit">
-                    <div>负责人:<span class="titleMessage">{{ TitleMessage.pro_leader }}</span></div>
-                    <div v-if="TitleMessage.lead_leader">学院牵头领导:<span class="titleMessage">{{ TitleMessage.lead_leader }}</span></div>
-                </div>
-                <div class="rsHead3Tit rsHead2Tit">
-                    <div>学院:<span class="titleMessage">{{ TitleMessage.ClassName }}</span></div>
-                    <div>分类:<span class="titleMessage">{{ TitleMessage.TypeName }} - {{ TitleMessage.tn2}}</span></div>
-                </div>
-      
-                <div class="rsHead2Tit personListUL">
-                   <!-- 老师 -->
-                   <img src="@/assets/img/doctorialHat.svg" style="margin-right: 10px;width:25px;height: 25px;">
-                    <el-tooltip class="item" effect="light" :content="TitleMessage.teacher.reduce((prev,cur)=>prev+=' '+cur.name,'')" placement="top-start">
-                        <div class="personListLI">
-                        <span v-for="(item,index) in TitleMessage.teacher" :key="index">{{ item.name }}</span>
-                    </div>
-                    </el-tooltip>
-                    
-                    <!-- 学生 -->
-                    <img src="@/assets/img/student.svg" style="margin: 0px 10px;width:25px;height: 25px;">
-                    <el-tooltip class="item" effect="light" :content="TitleMessage.student.reduce((prev,cur)=>prev+=' '+cur.name,'')" placement="top-start">
-                        <div class="personListLI">
-                            <span v-for="(item,index) in TitleMessage.student" :key="index">{{ item.name }}</span>
-                        </div>
-                    </el-tooltip>
-                    
-                </div>
-            </div>
-            <!-- <el-button class="backBtn" type="primary" @click="$router.back()">返回</el-button> -->
+      <div class="headerConcent">
+        <div class="rsHead1Tit">
+          项目名称:<span>{{ TitleMessage.title }}</span>
         </div>
-        <!-- 头部展示区结束 -->
-        <!--导航栏区域开始-->
-        <div id="Nav">
-            <div class="navLi" @click="pageState=0">
-                <img src="@/assets/anliDetail/proOver.png" alt="">
-                <span>项目基本内容</span>
-            </div>
-            <div class="navLi" @click="pageState=1">
-                <img src="@/assets/anliDetail/proOverTwo.png" alt="">
-                <span>项目详细</span>
-            </div>
-            <div  class="navLi" @click="pageState=2">
-                <i class="iconStyle iconfont icon-jiegou" style="color:#58c2fe;font-size:22px;margin-right: 7px;"></i>
-                <span>活动开展</span>
-            </div>
-            <div  class="navLi" @click="pageState=3">
-                <i class="iconStyle iconfont icon-wenjian" style="color:#58c2fe;font-size:22px;margin-right: 7px;"></i>
-                <span>项目附件</span>
-            </div>
-            <div  class="navLi" @click="pageState=4">
-                <i class="iconStyle iconfont icon-baogao" style="color:#58c2fe;font-size:22px;margin-right: 7px;"></i>
-                <span>项目结题报告</span>
-            </div>
+        <div class="rsHead2Tit rsHead3Tit">
+          <div>
+            负责人:<span class="titleMessage">{{
+              TitleMessage.pro_leader
+            }}</span>
+          </div>
+          <div v-if="TitleMessage.lead_leader">
+            学院牵头领导:<span class="titleMessage">{{
+              TitleMessage.lead_leader
+            }}</span>
+          </div>
+        </div>
+        <div class="rsHead3Tit rsHead2Tit">
+          <div>
+            学院:<span class="titleMessage">{{ TitleMessage.ClassName }}</span>
+          </div>
+          <div>
+            分类:<span class="titleMessage"
+              >{{ TitleMessage.TypeName }} - {{ TitleMessage.tn2 }}</span
+            >
+          </div>
         </div>
-        <!--导航栏区域结束-->
-        <!--内容区开始-->
-            <!--基础信息开始-->
-            <div class="BaseMessage" v-show="pageState==0">
-                <div class="BaseTitle">
-                    <span>项目基本内容</span>
-                </div>
-                <div class="brief">
-                    <div class="brief_title">
-                        <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                        <span>开始时间与结题时间</span>
-                    </div>
-                    <div class="beginTime_EndTime">
-                        <span>{{ TitleMessage.beginTime }}</span>
-                        <i class="el-icon-arrow-right"></i>
-                        <span>{{ TitleMessage.EndTime }}</span>
-                    </div>
-                </div>
-                <div class="brief">
-                    <div class="brief_title">
-                        <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                        <span>教师组</span>
-                    </div>
-                    <div class="projectStudent">
-                        <el-table
-                          :data="TitleMessage.teacher"
-                          border
-                          style="width: 100%">
-                          <el-table-column
-                            prop="name"
-                            label="姓名"
-                            align="center">
-                          </el-table-column>
-                          <el-table-column
-                            prop="speciality"
-                            label="专业"
-                            align="center">
-                          </el-table-column>
-                          <el-table-column
-                            prop="title"
-                            label="职称"
-                            align="center">
-                          </el-table-column>
-                          <el-table-column
-                            prop="education"
-                            align="center"
-                            label="学历">
-                          </el-table-column>
-                          <el-table-column
-                            prop="section"
-                            align="center"
-                            label="所在教研室">
-                          </el-table-column>
-                          <el-table-column
-                            prop="work"
-                            align="center"
-                            label="项目组任务分工">
-                          </el-table-column>
-                        </el-table>
-                    </div>
-                </div>
 
-                <!-- 学生组表格 -->
-                <div class="brief">
-                    <div class="brief_title">
-                        <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                        <span>学生组</span>
-                    </div>
-                    <div class="projectStudent">
-                        <el-table
-                          :data="TitleMessage.student"
-                          border
-                          style="width: 100%">
-                          <el-table-column
-                            prop="name"
-                            label="姓名"
-                            align="center">
-                          </el-table-column>
-                          <el-table-column
-                            prop="class"
-                            label="班级"
-                            align="center">
-                          </el-table-column>
-                          <el-table-column
-                            prop="age"
-                            label="年龄"
-                            align="center">
-                          </el-table-column>
-                          <el-table-column
-                            prop="work"
-                            align="center"
-                            label="项目组任务分工">
-                          </el-table-column>
-                        </el-table>
-                    </div>
-                </div>
+        <div class="rsHead2Tit personListUL">
+          <!-- 老师 -->
+          <img
+            src="@/assets/img/doctorialHat.svg"
+            style="margin-right: 10px; width: 25px; height: 25px"
+          />
+          <el-tooltip
+            class="item"
+            effect="light"
+            :content="
+              TitleMessage.teacher.reduce(
+                (prev, cur) => (prev += ' ' + cur.name),
+                ''
+              )
+            "
+            placement="top-start"
+          >
+            <div class="personListLI">
+              <span
+                v-for="(item, index) in TitleMessage.teacher"
+                :key="index"
+                >{{ item.name }}</span
+              >
+            </div>
+          </el-tooltip>
 
-                <div class="brief" v-if="TitleMessage.brief!=''">
-                    <div class="brief_title">
-                        <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                        <span>简介</span>
-                    </div>
-                    <div class="TextView" v-text="TitleMessage.brief">
-                    </div>
-                </div>
+          <!-- 学生 -->
+          <img
+            src="@/assets/img/student.svg"
+            style="margin: 0px 10px; width: 25px; height: 25px"
+          />
+          <el-tooltip
+            class="item"
+            effect="light"
+            :content="
+              TitleMessage.student.reduce(
+                (prev, cur) => (prev += ' ' + cur.name),
+                ''
+              )
+            "
+            placement="top-start"
+          >
+            <div class="personListLI">
+              <span
+                v-for="(item, index) in TitleMessage.student"
+                :key="index"
+                >{{ item.name }}</span
+              >
             </div>
-            <!--基础信息结束-->
-            <!--项目详细开始-->
-            <div class="BaseMessage" v-show="pageState==1">
-                <div class="BaseTitle" type="1">
-                    <span>项目详细</span>
-                </div>
+          </el-tooltip>
+        </div>
+      </div>
+      <!-- <el-button class="backBtn" type="primary" @click="$router.back()">返回</el-button> -->
+    </div>
+    <!-- 头部展示区结束 -->
+    <!--导航栏区域开始-->
+    <div id="Nav">
+      <div class="navLi" @click="pageState = 0">
+        <img src="@/assets/anliDetail/proOver.png" alt="" />
+        <span>项目基本内容</span>
+      </div>
+      <div class="navLi" @click="pageState = 1">
+        <img src="@/assets/anliDetail/proOverTwo.png" alt="" />
+        <span>项目详细</span>
+      </div>
+      <div class="navLi" @click="pageState = 2">
+        <i
+          class="iconStyle iconfont icon-jiegou"
+          style="color: #58c2fe; font-size: 22px; margin-right: 7px"
+        ></i>
+        <span>活动开展</span>
+      </div>
+      <div class="navLi" @click="pageState = 3">
+        <i
+          class="iconStyle iconfont icon-wenjian"
+          style="color: #58c2fe; font-size: 22px; margin-right: 7px"
+        ></i>
+        <span>项目附件</span>
+      </div>
+      <div class="navLi" @click="pageState = 4">
+        <i
+          class="iconStyle iconfont icon-baogao"
+          style="color: #58c2fe; font-size: 22px; margin-right: 7px"
+        ></i>
+        <span>项目结题报告</span>
+      </div>
+    </div>
+    <!--导航栏区域结束-->
+    <!--内容区开始-->
+    <!--基础信息开始-->
+    <div class="BaseMessage" v-show="pageState == 0">
+      <div class="BaseTitle">
+        <span>项目基本内容</span>
+      </div>
+      <div class="brief">
+        <div class="brief_title">
+          <img src="@/assets/anliDetail/jdTitle.png" alt="" />
+          <span>开始时间与结题时间</span>
+        </div>
+        <div class="beginTime_EndTime">
+          <span>{{ TitleMessage.beginTime }}</span>
+          <i class="el-icon-arrow-right"></i>
+          <span>{{ TitleMessage.EndTime }}</span>
+        </div>
+      </div>
+      <div class="brief">
+        <div class="brief_title">
+          <img src="@/assets/anliDetail/jdTitle.png" alt="" />
+          <span>教师组</span>
+        </div>
+        <div class="projectStudent">
+          <el-table :data="TitleMessage.teacher" border style="width: 100%">
+            <el-table-column prop="name" label="姓名" align="center">
+            </el-table-column>
+            <el-table-column prop="speciality" label="专业" align="center">
+            </el-table-column>
+            <el-table-column prop="title" label="职称" align="center">
+            </el-table-column>
+            <el-table-column prop="education" align="center" label="学历">
+            </el-table-column>
+            <el-table-column prop="section" align="center" label="所在教研室">
+            </el-table-column>
+            <el-table-column prop="work" align="center" label="项目组任务分工">
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
 
-                <div class="BaseTitle" type="1">
-                    <span>项目建设内容及目标</span>
-                </div>
-                <div class="brief">
-                    <div class="brief_title" type="1.1">
-                        <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                        <span>一、建设内容(空间优化/场馆规划方面拟解决的关键问题及主要建设指标)</span>
-                    </div>
-                    <div class="TextView" v-text="DetailMessage['Construction']"></div>
-                </div>
+      <!-- 学生组表格 -->
+      <div class="brief">
+        <div class="brief_title">
+          <img src="@/assets/anliDetail/jdTitle.png" alt="" />
+          <span>学生组</span>
+        </div>
+        <div class="projectStudent">
+          <el-table :data="TitleMessage.student" border style="width: 100%">
+            <el-table-column prop="name" label="姓名" align="center">
+            </el-table-column>
+            <el-table-column prop="class" label="班级" align="center">
+            </el-table-column>
+            <el-table-column prop="age" label="年龄" align="center">
+            </el-table-column>
+            <el-table-column prop="work" align="center" label="项目组任务分工">
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
 
-                <div class="BaseTitle" type="1">
-                    <span>预项目建设论证报告</span>
-                </div>
-                <div class="brief">
-                    <div class="brief_title" type="1.1">
-                        <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                        <span style="font-size: 16px;">一、立项依据 (说明本项目的目的、意义以及国内外高校现状、市场预测和发展趋势,预期达到的目标,研究的预期效果分析,成果受益面)</span>
-                    </div>
-                    <div class="TextView" v-text="DetailMessage['ProjectBasis']">
-                    </div>
-                </div>
+      <div class="brief" v-if="TitleMessage.brief != ''">
+        <div class="brief_title">
+          <img src="@/assets/anliDetail/jdTitle.png" alt="" />
+          <span>简介</span>
+        </div>
+        <div class="TextView" v-text="TitleMessage.brief"></div>
+      </div>
+    </div>
+    <!--基础信息结束-->
+    <!--项目详细开始-->
+    <div class="BaseMessage" v-show="pageState == 1">
+      <div class="BaseTitle" type="1">
+        <span>项目详细</span>
+      </div>
 
-                <div class="BaseTitle" type="1">
-                    <span>预期成果</span>
-                </div>
-                <div class="brief">
-                    <div class="brief_title" type="1.1">
-                        <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                        <span>一、创客空间物理环境、制度建设及软件设施建设情况(环境优化/制度完善/设施改造)</span>
-                    </div>
-                    <div class="TextView" v-text="DetailMessage['development']">
-                    </div>
-                </div>
-                <div class="brief">
-                    <div class="brief_title" type="1.1">
-                        <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                        <span>二、学生创客工作室建设情况(工作室数量及活动开展情况)</span>
-                    </div>
-                    <div class="TextView" v-text="DetailMessage['studio']">
-                    </div>
-                </div>
-                <div class="brief">
-                    <div class="brief_title" type="1.1">
-                        <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                        <span>三、学生创客团队(人才)培养预期成果、数量</span>
-                    </div>
-                    <div class="TextView" v-text="DetailMessage['studentTeam']">
-                    </div>
-                </div>
-                <div class="brief">
-                    <div class="brief_title" type="1.1">
-                        <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                        <span>四、学生创客活动组织实施情况</span>
-                    </div>
-                    <div class="TextView" v-text="DetailMessage['studentActivities']">
-                    </div>
-                </div>
-                <div class="brief">
-                    <div class="brief_title" type="1.1">
-                        <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                        <span>五、学生创客团队孵化、转化创业项目情况</span>
-                    </div>
-                    <div class="TextView" v-text="DetailMessage['Transforming']">
-                    </div>
-                </div>
+      <div class="BaseTitle" type="1">
+        <span>项目建设内容及目标</span>
+      </div>
+      <div class="brief">
+        <div class="brief_title" type="1.1">
+          <img src="@/assets/anliDetail/jdTitle.png" alt="" />
+          <span
+            >一、建设内容(空间优化/场馆规划方面拟解决的关键问题及主要建设指标)</span
+          >
+        </div>
+        <div class="TextView" v-text="DetailMessage['Construction']"></div>
+      </div>
 
-                <div class="BaseTitle" type="1">
-                    <span>立项基础及条件</span>
-                </div>
-                <div class="brief">
-                    <div class="brief_title" type="1.1">
-                        <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                        <span>一、基础条件(物理环境/设备设施/项目实施/活动开展/技术力量/社会资源)</span>
-                    </div>
-                    <div class="TextView" v-text="DetailMessage['condition']">
-                    </div>
-                </div>
-            </div>
-            <!-- 项目详细结束 -->
-            <!-- 活动开展开始 -->
-            <div class="BaseMessage" v-show="pageState==2">
+      <div class="BaseTitle" type="1">
+        <span>预项目建设论证报告</span>
+      </div>
+      <div class="brief">
+        <div class="brief_title" type="1.1">
+          <img src="@/assets/anliDetail/jdTitle.png" alt="" />
+          <span style="font-size: 16px"
+            >一、立项依据
+            (说明本项目的目的、意义以及国内外高校现状、市场预测和发展趋势,预期达到的目标,研究的预期效果分析,成果受益面)</span
+          >
+        </div>
+        <div class="TextView" v-text="DetailMessage['ProjectBasis']"></div>
+      </div>
 
-                <div class="BaseTitle" type="1">
-                    <span>活动开展</span>
-                </div>
+      <div class="BaseTitle" type="1">
+        <span>预期成果</span>
+      </div>
+      <div class="brief">
+        <div class="brief_title" type="1.1">
+          <img src="@/assets/anliDetail/jdTitle.png" alt="" />
+          <span
+            >一、创客空间物理环境、制度建设及软件设施建设情况(环境优化/制度完善/设施改造)</span
+          >
+        </div>
+        <div class="TextView" v-text="DetailMessage['development']"></div>
+      </div>
+      <div class="brief">
+        <div class="brief_title" type="1.1">
+          <img src="@/assets/anliDetail/jdTitle.png" alt="" />
+          <span>二、学生创客工作室建设情况(工作室数量及活动开展情况)</span>
+        </div>
+        <div class="TextView" v-text="DetailMessage['studio']"></div>
+      </div>
+      <div class="brief">
+        <div class="brief_title" type="1.1">
+          <img src="@/assets/anliDetail/jdTitle.png" alt="" />
+          <span>三、学生创客团队(人才)培养预期成果、数量</span>
+        </div>
+        <div class="TextView" v-text="DetailMessage['studentTeam']"></div>
+      </div>
+      <div class="brief">
+        <div class="brief_title" type="1.1">
+          <img src="@/assets/anliDetail/jdTitle.png" alt="" />
+          <span>四、学生创客活动组织实施情况</span>
+        </div>
+        <div class="TextView" v-text="DetailMessage['studentActivities']"></div>
+      </div>
+      <div class="brief">
+        <div class="brief_title" type="1.1">
+          <img src="@/assets/anliDetail/jdTitle.png" alt="" />
+          <span>五、学生创客团队孵化、转化创业项目情况</span>
+        </div>
+        <div class="TextView" v-text="DetailMessage['Transforming']"></div>
+      </div>
 
-                <div class="arrangement" v-for="(item,index) in AllActivity" :key="item.acId">
-                    <div class="arrangement_assignment">
-                        <div class="arrangement_assignment_title">
-                            <span>
-                                <img src="@/assets/anliDetail/jdNewTitle.png">
-                                <span>活动{{ index+1 }}:</span>
-                                <span>{{ item.title }}</span>
-                            </span>
-                        </div>
+      <div class="BaseTitle" type="1">
+        <span>立项基础及条件</span>
+      </div>
+      <div class="brief">
+        <div class="brief_title" type="1.1">
+          <img src="@/assets/anliDetail/jdTitle.png" alt="" />
+          <span
+            >一、基础条件(物理环境/设备设施/项目实施/活动开展/技术力量/社会资源)</span
+          >
+        </div>
+        <div class="TextView" v-text="DetailMessage['condition']"></div>
+      </div>
+    </div>
+    <!-- 项目详细结束 -->
+    <!-- 活动开展开始 -->
+    <div class="BaseMessage" v-show="pageState == 2">
+      <div class="BaseTitle" type="1">
+        <span>活动开展</span>
+      </div>
 
-                        <div class="brief">
-                            <div class="brief_title">
-                                <!-- <img src="@/assets/anliDetail/jdTitle.png" alt=""> -->
-                                <i class="el-icon-tickets"></i>
-                                <span>基础信息</span>
-                            </div>
-                            <div class="ActivityBaseMessage">
-                                <el-descriptions class="margin-top" :column="3" border>
-                                  <el-descriptions-item>
-                                    <template slot="label">
-                                      <i class="el-icon-s-custom"></i>
-                                      负责人
-                                    </template>
-                                    {{ item.pro_leader }}
-                                  </el-descriptions-item>
-                                  <el-descriptions-item>
-                                    <template slot="label">
-                                      <i class="el-icon-mobile-phone"></i>
-                                      联系电话
-                                    </template>
-                                    {{ item.phone }}
-                                  </el-descriptions-item>
-                                  <el-descriptions-item>
-                                    <template slot="label">
-                                      <i class="el-icon-coordinate"></i>
-                                      活动创建时间
-                                    </template>
-                                    {{item.create_at}}
-                                  </el-descriptions-item>
-                                  <el-descriptions-item>
-                                    <template slot="label">
-                                      <i class="el-icon-date"></i>
-                                      活动开展时间
-                                    </template>
-                                    {{ JSON.parse(item.begin_at)[0].split(' ')[0]+"\t至\t"+JSON.parse(item.begin_at)[1].split(" ")[0] }}
-                                  </el-descriptions-item>
-                                  <el-descriptions-item>
-                                    <template slot="label">
-                                      <i class="el-icon-coin"></i>
-                                      活动预算(元)
-                                    </template>
-                                    {{ item.money }}
-                                  </el-descriptions-item>
-                                  <el-descriptions-item>
-                                    <template slot="label">
-                                      <i class="el-icon-user"></i>
-                                      参与学生人数
-                                    </template>
-                                    {{ item.students }}
-                                  </el-descriptions-item>
-                                </el-descriptions>
-                            </div>
+      <div
+        class="arrangement"
+        v-for="(item, index) in AllActivity"
+        :key="item.acId"
+      >
+        <div class="arrangement_assignment">
+          <div class="arrangement_assignment_title">
+            <span>
+              <img src="@/assets/anliDetail/jdNewTitle.png" />
+              <span>活动{{ index + 1 }}:</span>
+              <span>{{ item.title }}</span>
+            </span>
+          </div>
 
-                            <div class="brief_title MarginTop30px">
-                                <!-- <img src="@/assets/anliDetail/jdTitle.png" alt=""> -->
-                                <i class="el-icon-user-solid"></i>
-                                <span>指导老师</span>
-                            </div>
-                            <div class="projectStudent">
-                                <el-table
-                                  :data="JSON.parse(item.course_teacher)"
-                                  border
-                                  style="width: 100%">
-                                  <el-table-column
-                                    prop="name"
-                                    label="姓名"
-                                    align="center">
-                                  </el-table-column>
-                                  <el-table-column
-                                    prop="work"
-                                    label="工作单位"
-                                    align="center">
-                                  </el-table-column>
-                                  <el-table-column
-                                    prop="collage"
-                                    align="center"
-                                    label="活动分工">
-                                  </el-table-column>
-                                </el-table>
-                            </div>
-                            <!-- <div class="brief_title MarginTop30px">
+          <div class="brief">
+            <div class="brief_title">
+              <!-- <img src="@/assets/anliDetail/jdTitle.png" alt=""> -->
+              <i class="el-icon-tickets"></i>
+              <span>基础信息</span>
+            </div>
+            <div class="ActivityBaseMessage">
+              <el-descriptions class="margin-top" :column="3" border>
+                <el-descriptions-item>
+                  <template slot="label">
+                    <i class="el-icon-s-custom"></i>
+                    负责人
+                  </template>
+                  {{ item.pro_leader }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label">
+                    <i class="el-icon-mobile-phone"></i>
+                    联系电话
+                  </template>
+                  {{ item.phone }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label">
+                    <i class="el-icon-coordinate"></i>
+                    活动创建时间
+                  </template>
+                  {{ item.create_at }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label">
+                    <i class="el-icon-date"></i>
+                    活动开展时间
+                  </template>
+                  {{
+                    JSON.parse(item.begin_at)[0].split(" ")[0] +
+                    "\t至\t" +
+                    JSON.parse(item.begin_at)[1].split(" ")[0]
+                  }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label">
+                    <i class="el-icon-coin"></i>
+                    活动预算(元)
+                  </template>
+                  {{ item.money }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label">
+                    <i class="el-icon-user"></i>
+                    参与学生人数
+                  </template>
+                  {{ item.students }}
+                </el-descriptions-item>
+              </el-descriptions>
+            </div>
+
+            <div class="brief_title MarginTop30px">
+              <!-- <img src="@/assets/anliDetail/jdTitle.png" alt=""> -->
+              <i class="el-icon-user-solid"></i>
+              <span>指导老师</span>
+            </div>
+            <div class="projectStudent">
+              <el-table
+                :data="JSON.parse(item.course_teacher)"
+                border
+                style="width: 100%"
+              >
+                <el-table-column prop="name" label="姓名" align="center">
+                </el-table-column>
+                <el-table-column prop="work" label="工作单位" align="center">
+                </el-table-column>
+                <el-table-column prop="collage" align="center" label="活动分工">
+                </el-table-column>
+              </el-table>
+            </div>
+            <!-- <div class="brief_title MarginTop30px">
                                 <img src="@/assets/anliDetail/proOverTwo.png" alt="">
                                 <span>活动简介</span>
                             </div>
                             <div class="TextView" v-text="item.brief"></div> -->
 
-                            <div class="brief_title MarginTop30px">
-                                <!-- <img src="@/assets/anliDetail/jdTitle.png" alt=""> -->
-                                <i class="el-icon-edit-outline"></i>
-                                <span>活动计划</span>
-                            </div>
-                            <div class="TextView" v-text="JSON.parse(item.chapters)['activityPlan']">
-                            </div>
-
-                            <div class="brief_title MarginTop30px">
-                                <i class="el-icon-data-line"></i>
-                                <span>预期目标</span>
-                            </div>
-                            <div class="TextView" v-text="JSON.parse(item.chapters)['expectations']">
-                            </div>
-
-                            <div class="brief_title MarginTop30px">
-                                <i class="el-icon-pie-chart"></i>
-                                <span>活动受面</span>
-                            </div>
-                            <div class="TextView" v-text="JSON.parse(item.chapters)['eventAudience']">
-                            </div>
+            <div class="brief_title MarginTop30px">
+              <!-- <img src="@/assets/anliDetail/jdTitle.png" alt=""> -->
+              <i class="el-icon-edit-outline"></i>
+              <span>活动计划</span>
+            </div>
+            <div
+              class="TextView"
+              v-text="JSON.parse(item.chapters)['activityPlan']"
+            ></div>
 
-                            <div class="brief_title MarginTop30px">
-                                <!-- <img src="@/assets/anliDetail/jdTitle.png" alt=""> -->
-                                <i class="el-icon-money"></i>
-                                <span>经费支出计划</span>
-                            </div>
-                            <div class="TextView" v-text="JSON.parse(item.chapters)['fundingPlan']">
-                            </div>
-                            <div class="brief_title MarginTop30px" v-if="ActivityLookFile[index].url!=''">
-                                <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                                <!-- <i class="el-icon-money"></i> -->
-                                <span>活动完结报告</span>
-                            </div>
-                            <div class="brief" v-if="ActivityLookFile[index].url!=''">
-                                <div class="material">
-                                    <div class="material_title">
-                                        <img src="@/assets/anliDetail/fileList.png" alt="">
-                                        <span>活动完结报告</span>
-                                    </div>
-                                    <div class="FileShowArea">
-                                        <div class="FileShowArea_Left">
-                                            <vword
-                                                style="width: 100%; height: 100%; overflow: auto"
-                                                class="fullStyle"
-                                                v-if="checkFileType(ActivityLookFile[index].url)['type']!='pdf'&&checkFileType(ActivityLookFile[index].url)['name']!='图片'"
-                                                :pdfUrl="'https://view.officeapps.live.com/op/view.aspx?src='+ActivityLookFile[index].url"
-                                            ></vword>
-                                            <vpdf
-                                                style="width: 100%; height: 100%; overflow: auto"
-                                                class="fullStyle"
-                                                :pdfUrl="ActivityLookFile[index].url"
-                                                v-if="checkFileType(ActivityLookFile[index].url)['type']=='pdf'"
-                                            ></vpdf>
-                                            <img :src="ActivityLookFile[index].url" alt="图片哦" v-if="checkFileType(ActivityLookFile[index].url)['name']=='图片'" style="width: 100%;height: 100%;">
-                                        </div>
-                                        <div class="FileShowArea_Right core_dialogue">
-                                            <div v-for="(i,index2) in item.reportFile" :key="i.url" @click="Object.assign(ActivityLookFile[index],i)" :class="['FileList',ActivityLookFile[index]['url']==i.url?'lookFile':'']"><span>{{ index2+1 }}.{{ checkFileType(i.url)["name"] }}</span><div>{{ i.fileName }}</div></div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
+            <div class="brief_title MarginTop30px">
+              <i class="el-icon-data-line"></i>
+              <span>预期目标</span>
+            </div>
+            <div
+              class="TextView"
+              v-text="JSON.parse(item.chapters)['expectations']"
+            ></div>
 
+            <div class="brief_title MarginTop30px">
+              <i class="el-icon-pie-chart"></i>
+              <span>活动受面</span>
+            </div>
+            <div
+              class="TextView"
+              v-text="JSON.parse(item.chapters)['eventAudience']"
+            ></div>
 
+            <div class="brief_title MarginTop30px">
+              <!-- <img src="@/assets/anliDetail/jdTitle.png" alt=""> -->
+              <i class="el-icon-money"></i>
+              <span>经费支出计划</span>
             </div>
-            <!-- 活动开展结束 -->
-            <!-- 项目附件开始 -->
-            <div class="BaseMessage" v-show="pageState==3">
-                <div class="BaseTitle" type="3">
-                    <span>项目附件</span>
+            <div
+              class="TextView"
+              v-text="JSON.parse(item.chapters)['fundingPlan']"
+            ></div>
+            <div
+              class="brief_title MarginTop30px"
+              v-if="ActivityLookFile[index].url != ''"
+            >
+              <img src="@/assets/anliDetail/jdTitle.png" alt="" />
+              <!-- <i class="el-icon-money"></i> -->
+              <span>活动完结报告</span>
+            </div>
+            <div class="brief" v-if="ActivityLookFile[index].url != ''">
+              <div class="material">
+                <div class="material_title">
+                  <img src="@/assets/anliDetail/fileList.png" alt="" />
+                  <span>活动完结报告</span>
                 </div>
-                <div class="brief" v-if="ProjectLookFile.url!=''">
-                    <div class="material">
-                        <div class="material_title">
-                            <img src="@/assets/anliDetail/fileList.png" alt="">
-                            <span>项目材料</span>
-                        </div>
-                        <div class="FileShowArea">
-                            <div class="FileShowArea_Left">
-                                <vword
-                                    style="width: 100%; height: 100%; overflow: auto"
-                                    class="fullStyle"
-                                    v-if="checkFileType(ProjectLookFile.url)['type']!='pdf'&&checkFileType(ProjectLookFile.url)['name']!='图片'"
-                                    :pdfUrl="'https://view.officeapps.live.com/op/view.aspx?src='+ProjectLookFile.url"
-                                ></vword>
-                                <vpdf
-                                    style="width: 100%; height: 100%; overflow: auto"
-                                    class="fullStyle"
-                                    :pdfUrl="ProjectLookFile.url"
-                                    v-if="checkFileType(ProjectLookFile.url)['type']=='pdf'"
-                                ></vpdf>
-                                <img :src="ProjectLookFile.url" alt="图片哦" v-if="checkFileType(ProjectLookFile.url)['name']=='图片'" style="width: 100%;height: 100%;">
-                            </div>
-                            <div class="FileShowArea_Right core_dialogue">
-                                <div v-for="(item,index) in ProjectFile" :key="item.url" @click="ProjectLookFile = item" :class="['FileList',ProjectLookFile['url']==item.url?'lookFile':'']"><span>{{ index+1 }}.{{ checkFileType(item.url)["name"] }}</span><div>{{ item.fileName }}</div></div>
-                            </div>
-                        </div>
+                <div class="FileShowArea">
+                  <div class="FileShowArea_Left">
+                    <vword
+                      style="width: 100%; height: 100%; overflow: auto"
+                      class="fullStyle"
+                      v-if="
+                        checkFileType(ActivityLookFile[index].url)['type'] !=
+                          'pdf' &&
+                        checkFileType(ActivityLookFile[index].url)['name'] !=
+                          '图片'
+                      "
+                      :pdfUrl="
+                        'https://view.officeapps.live.com/op/view.aspx?src=' +
+                        ActivityLookFile[index].url
+                      "
+                    ></vword>
+                    <vpdf
+                      style="width: 100%; height: 100%; overflow: auto"
+                      class="fullStyle"
+                      :pdfUrl="ActivityLookFile[index].url"
+                      v-if="
+                        checkFileType(ActivityLookFile[index].url)['type'] ==
+                        'pdf'
+                      "
+                    ></vpdf>
+                    <img
+                      :src="ActivityLookFile[index].url"
+                      alt="图片哦"
+                      v-if="
+                        checkFileType(ActivityLookFile[index].url)['name'] ==
+                        '图片'
+                      "
+                      style="width: 100%; height: 100%"
+                    />
+                  </div>
+                  <div class="FileShowArea_Right core_dialogue">
+                    <div
+                      v-for="(i, index2) in item.reportFile"
+                      :key="i.url"
+                      @click="Object.assign(ActivityLookFile[index], i)"
+                      :class="[
+                        'FileList',
+                        ActivityLookFile[index]['url'] == i.url
+                          ? 'lookFile'
+                          : '',
+                      ]"
+                    >
+                      <span
+                        >{{ index2 + 1 }}.{{
+                          checkFileType(i.url)["name"]
+                        }}</span
+                      >
+                      <div>{{ i.fileName }}</div>
                     </div>
+                  </div>
                 </div>
-                </div>
-            <!-- 项目附件结束 -->
-            <!-- 项目中期报告开始 -->
-            <div class="BaseMessage" v-show="pageState==4">
-                
-                <div class="BaseTitle" type="5">
-                    <span>项目结题报告</span>
-                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 活动开展结束 -->
+    <!-- 项目附件开始 -->
+    <div class="BaseMessage" v-show="pageState == 3">
+      <div class="BaseTitle" type="3">
+        <span>项目附件</span>
+      </div>
+      <div class="brief" v-if="ProjectLookFile.url != ''">
+        <div class="material">
+          <div class="material_title">
+            <img src="@/assets/anliDetail/fileList.png" alt="" />
+            <span>项目材料</span>
+          </div>
+          <div class="FileShowArea">
+            <div class="FileShowArea_Left">
+              <vword
+                style="width: 100%; height: 100%; overflow: auto"
+                class="fullStyle"
+                v-if="
+                  checkFileType(ProjectLookFile.url)['type'] != 'pdf' &&
+                  checkFileType(ProjectLookFile.url)['name'] != '图片'
+                "
+                :pdfUrl="
+                  'https://view.officeapps.live.com/op/view.aspx?src=' +
+                  ProjectLookFile.url
+                "
+              ></vword>
+              <vpdf
+                style="width: 100%; height: 100%; overflow: auto"
+                class="fullStyle"
+                :pdfUrl="ProjectLookFile.url"
+                v-if="checkFileType(ProjectLookFile.url)['type'] == 'pdf'"
+              ></vpdf>
+              <img
+                :src="ProjectLookFile.url"
+                alt="图片哦"
+                v-if="checkFileType(ProjectLookFile.url)['name'] == '图片'"
+                style="width: 100%; height: 100%"
+              />
+            </div>
+            <div class="FileShowArea_Right core_dialogue">
+              <div
+                v-for="(item, index) in ProjectFile"
+                :key="item.url"
+                @click="ProjectLookFile = item"
+                :class="[
+                  'FileList',
+                  ProjectLookFile['url'] == item.url ? 'lookFile' : '',
+                ]"
+              >
+                <span
+                  >{{ index + 1 }}.{{ checkFileType(item.url)["name"] }}</span
+                >
+                <div>{{ item.fileName }}</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 项目附件结束 -->
+    <!-- 项目中期报告开始 -->
+    <div class="BaseMessage" v-show="pageState == 4">
+      <div class="BaseTitle" type="5">
+        <span>项目结题报告</span>
+      </div>
 
-                <div class="brief">
-                    <div class="brief_title">
-                        <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                        <span>项目结题附件</span>
-                    </div>
-                    <div class="material" v-if="ProjectEndLookFile.url!=''">
-                        <div class="material_title">
-                            <img src="@/assets/anliDetail/fileList.png" alt="">
-                            <span>项目结题附件</span>
-                        </div>
-                        <div class="FileShowArea">
-                            <div class="FileShowArea_Left">
-                                <vword
-                                    style="width: 100%; height: 100%; overflow: auto"
-                                    class="fullStyle"
-                                    v-if="checkFileType(ProjectEndLookFile.url)['type']!='pdf'&&checkFileType(ProjectEndLookFile.url)['name']!='图片'"
-                                    :pdfUrl="'https://view.officeapps.live.com/op/view.aspx?src='+ProjectEndLookFile.url"
-                                ></vword>
-                                <vpdf
-                                    style="width: 100%; height: 100%; overflow: auto"
-                                    class="fullStyle"
-                                    :pdfUrl="ProjectEndLookFile.url"
-                                    v-if="checkFileType(ProjectEndLookFile.url)['type']=='pdf'"
-                                ></vpdf>
-                                <img :src="ProjectEndLookFile.url" alt="图片哦" v-if="checkFileType(ProjectEndLookFile.url)['name']=='图片'" style="width: 100%;height: 100%;">
-                            </div>
-                            <div class="FileShowArea_Right core_dialogue">
-                                <div v-for="(item,index) in ProjectEndFile" :key="item.url" @click="ProjectEndLookFile = item" :class="['FileList',ProjectEndLookFile['url']==item.url?'lookFile':'']"><span>{{ index+1 }}.{{ checkFileType(item.url)["name"] }}</span><div>{{ item.fileName }}</div></div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
+      <div class="brief">
+        <!-- 项目结项书 -->
+        <projectSettlementBook></projectSettlementBook>
+        <!-- <div class="brief_title">
+          <img src="@/assets/anliDetail/jdTitle.png" alt="" />
+          <span>项目结题附件</span>
+        </div>
+        <div class="material" v-if="ProjectEndLookFile.url != ''">
+          <div class="material_title">
+            <img src="@/assets/anliDetail/fileList.png" alt="" />
+            <span>项目结题附件</span>
+          </div>
+          <div class="FileShowArea">
+            <div class="FileShowArea_Left">
+              <vword
+                style="width: 100%; height: 100%; overflow: auto"
+                class="fullStyle"
+                v-if="
+                  checkFileType(ProjectEndLookFile.url)['type'] != 'pdf' &&
+                  checkFileType(ProjectEndLookFile.url)['name'] != '图片'
+                "
+                :pdfUrl="
+                  'https://view.officeapps.live.com/op/view.aspx?src=' +
+                  ProjectEndLookFile.url
+                "
+              ></vword>
+              <vpdf
+                style="width: 100%; height: 100%; overflow: auto"
+                class="fullStyle"
+                :pdfUrl="ProjectEndLookFile.url"
+                v-if="checkFileType(ProjectEndLookFile.url)['type'] == 'pdf'"
+              ></vpdf>
+              <img
+                :src="ProjectEndLookFile.url"
+                alt="图片哦"
+                v-if="checkFileType(ProjectEndLookFile.url)['name'] == '图片'"
+                style="width: 100%; height: 100%"
+              />
             </div>
-            <!--项目详结束-->
-        <!--内容区结束-->
+            <div class="FileShowArea_Right core_dialogue">
+              <div
+                v-for="(item, index) in ProjectEndFile"
+                :key="item.url"
+                @click="ProjectEndLookFile = item"
+                :class="[
+                  'FileList',
+                  ProjectEndLookFile['url'] == item.url ? 'lookFile' : '',
+                ]"
+              >
+                <span
+                  >{{ index + 1 }}.{{ checkFileType(item.url)["name"] }}</span
+                >
+                <div>{{ item.fileName }}</div>
+              </div>
+            </div>
+          </div>
+        </div> -->
+      </div>
     </div>
-  </template>
+    <!--项目详结束-->
+    <!--内容区结束-->
+  </div>
+</template>
   
   <script>
-    import vpdf from '@/components/vpdf.vue'
-    import vword from '@/components/vword.vue'
-    import { VueEditor } from "vue2-editor";
-      export default {
-        components:{vpdf,vword,VueEditor},
-        data() {
-          return {
-            pageState:0,
-            loading:false,
-            //头部信息   项目名称  负责人 学院牵头领导  封面图片  分类   所在部门  优先支持项目   联系电话   项目申请人   美丽校园改造项目 
-            TitleMessage:{title:"",pro_leader:"",lead_leader:"",image:"",TypeName:"",ClassName:"",tn2:0},
-            // TitleMessage:{ClassName:"",EndTime:"",TypeName:"",beginTime:"",brief:"",course_student:[],image:"",pro_leader:"",title:""},
-            DetailMessage:[],
-            ProjectFile:[],
-            ProjectLookFile:{url:"",type:""},
-            ProjectEndFile:[],
-            ProjectEndLookFile:{url:"",type:""},
-            AllActivity:[],
-            ActivityLookFile:[],
-            endProjectRemark:{kRem:"",bRem:"",xRem:""},
-            canonical:{
-                Image:/^https?:\/\/(.+\/)+.+(\.(gif|png|jpg|jpeg|webp|svg|psd|bmp|tif))$/i,
-                File:/^https?:\/\/(.+\/)+.+(\.(docx|xlsx|ppt|pdf))$/i
-            },
-          }
-        },
-        methods:{
-            getData(){
-                this.loading = true;
-                this.ActivityLookFile = [];
-                this.ajax.get(this.$store.state.api+"/GetProjectDetailIsConclusion",{
-                    uid:this.$store.state.userInfo.userid,
-                    pid:this.$route.query["pid"]
-                }).then(res=>{
-                    let FormData = res.data;
-                    console.log(FormData)
-                    //头部信息
-                    this.TitleMessage = FormData[0][0];
-                    // 教师表格
-                    this.TitleMessage['teacher'] = JSON.parse(this.TitleMessage['teacher']);
-                    // 学生表格
-                    this.TitleMessage['student'] = JSON.parse(this.TitleMessage['student']);
-                    //项目详细
-                    this.DetailMessage = JSON.parse(FormData[1][0]['chapters']);
-                    // //项目附件
-                    this.ProjectFile = JSON.parse(FormData[2][0]['projectFile'])
-                    if(this.ProjectFile!=null)this.ProjectLookFile = this.ProjectFile[0] 
-                    else this.ProjectLookFile = {url:'',type:""};
-                    //项目结题附件
-                    this.ProjectEndFile = FormData[3][0]['endFile']!=''?JSON.parse(FormData[3][0]['endFile']):'';
-                    if(this.ProjectEndFile!=null && this.ProjectEndFile!='')this.ProjectEndLookFile = this.ProjectEndFile[0];
-                    else this.ProjectEndLookFile = {url:"",type:""}
-                    console.log(FormData[4][0]);
-                    
-                    if(FormData[4][0]['title']!=null){
-                        this.AllActivity = FormData[4]
-                        this.AllActivity.forEach(item=>{
-                            if(item['reportFile']!=null&&item['reportFile']!=''){
-                                item['reportFile'] = JSON.parse(item['reportFile']);
-                                if(item['reportFile'].length!=0)this.ActivityLookFile.push({url:item['reportFile'][0].url,fileName:item['reportFile'][0].fileName})
-                                else this.ActivityLookFile.push({url:"",type:""})
-                            }else this.ActivityLookFile.push({url:"",type:""})
-                        })
-                    };
-                    // if(JSON.parse(FormData[5][0]['endProjectRemark'])!=null)this.endProjectRemark = JSON.parse(FormData[5][0]['endProjectRemark']);
-                    this.loading = false;
-                }).catch(err=>{
-                    console.log(err)
-                })
-            },
-            checkFileType(url){
-                if(typeof url=='undefined')return {type:"",name:""};
-                let urlSplit = url.split(".");
-                const type = urlSplit[urlSplit.length-1]
-                if(this.canonical.Image.test(url))return {type:type,name:"图片"}
-                if(this.canonical.File.test(url))return {type:type,name:"文档"}
-                else return {type:type,name:type}
-            },
-            ActivityChangeFileLook(index,item){
-                Object.assign(this.ActivityLookFile[index],item)
-            }
+import vpdf from "@/components/vpdf.vue";
+import vword from "@/components/vword.vue";
+import { VueEditor } from "vue2-editor";
+// 结项书
+import projectSettlementBook from "../../projectSettlement/components/projectSettlementBook.vue";
+export default {
+  components: { vpdf, vword, VueEditor, projectSettlementBook },
+  data() {
+    return {
+      pageState: 0,
+      loading: false,
+      //头部信息   项目名称  负责人 学院牵头领导  封面图片  分类   所在部门  优先支持项目   联系电话   项目申请人   美丽校园改造项目
+      TitleMessage: {
+        title: "",
+        pro_leader: "",
+        lead_leader: "",
+        image: "",
+        TypeName: "",
+        ClassName: "",
+        tn2: 0,
+      },
+      // TitleMessage:{ClassName:"",EndTime:"",TypeName:"",beginTime:"",brief:"",course_student:[],image:"",pro_leader:"",title:""},
+      DetailMessage: [],
+      ProjectFile: [],
+      ProjectLookFile: { url: "", type: "" },
+      ProjectEndFile: [],
+      ProjectEndLookFile: { url: "", type: "" },
+      AllActivity: [],
+      ActivityLookFile: [],
+      endProjectRemark: { kRem: "", bRem: "", xRem: "" },
+      canonical: {
+        Image:
+          /^https?:\/\/(.+\/)+.+(\.(gif|png|jpg|jpeg|webp|svg|psd|bmp|tif))$/i,
+        File: /^https?:\/\/(.+\/)+.+(\.(docx|xlsx|ppt|pdf))$/i,
+      },
+    };
+  },
+  methods: {
+    getData() {
+      this.loading = true;
+      this.ActivityLookFile = [];
+      this.ajax
+        .get(this.$store.state.api + "/GetProjectDetailIsConclusion", {
+          uid: this.$store.state.userInfo.userid,
+          pid: this.$route.query["pid"],
+        })
+        .then((res) => {
+          let FormData = res.data;
+          console.log(FormData);
+          //头部信息
+          this.TitleMessage = FormData[0][0];
+          // 教师表格
+          this.TitleMessage["teacher"] = JSON.parse(
+            this.TitleMessage["teacher"]
+          );
+          // 学生表格
+          this.TitleMessage["student"] = JSON.parse(
+            this.TitleMessage["student"]
+          );
+          //项目详细
+          this.DetailMessage = JSON.parse(FormData[1][0]["chapters"]);
+          // //项目附件
+          this.ProjectFile = JSON.parse(FormData[2][0]["projectFile"]);
+          if (this.ProjectFile != null)
+            this.ProjectLookFile = this.ProjectFile[0];
+          else this.ProjectLookFile = { url: "", type: "" };
+          //项目结题附件
+          this.ProjectEndFile =
+            FormData[3][0]["endFile"] != ""
+              ? JSON.parse(FormData[3][0]["endFile"])
+              : "";
+          if (this.ProjectEndFile != null && this.ProjectEndFile != "")
+            this.ProjectEndLookFile = this.ProjectEndFile[0];
+          else this.ProjectEndLookFile = { url: "", type: "" };
+          console.log(FormData[4][0]);
 
-        },
-        mounted(){
-            //监听元素滚动
-            document.querySelector(".core_dialogue").addEventListener("scroll",(e)=>{
-                let Nav = document.querySelector("#Nav");
-                let scrollTop = e.target.scrollTop;
-                if(scrollTop>=250){
-                    document.querySelector(".core_dialogue").querySelector('.el-header').style='position:fixed;z-index:10;width:100%'
-                    Nav.style = `width:100%;padding:0 20%;box-sizing: border-box;border-radius:0;display:flex;justify-content: space-around;position: fixed;top:calc(70px - 20px);z-index:99;align-items: center;box-shadow: 0 0 5px gray;`
-                }else if(scrollTop<=100){
-                    document.querySelector(".core_dialogue").querySelector('.el-header').style=''
-                    Nav.style = ``
-                }
+          if (FormData[4][0]["title"] != null) {
+            this.AllActivity = FormData[4];
+            this.AllActivity.forEach((item) => {
+              if (item["reportFile"] != null && item["reportFile"] != "") {
+                item["reportFile"] = JSON.parse(item["reportFile"]);
+                if (item["reportFile"].length != 0)
+                  this.ActivityLookFile.push({
+                    url: item["reportFile"][0].url,
+                    fileName: item["reportFile"][0].fileName,
+                  });
+                else this.ActivityLookFile.push({ url: "", type: "" });
+              } else this.ActivityLookFile.push({ url: "", type: "" });
             });
-            this.getData();
-        }
+          }
+          // if(JSON.parse(FormData[5][0]['endProjectRemark'])!=null)this.endProjectRemark = JSON.parse(FormData[5][0]['endProjectRemark']);
+          this.loading = false;
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
+    checkFileType(url) {
+      if (typeof url == "undefined") return { type: "", name: "" };
+      let urlSplit = url.split(".");
+      const type = urlSplit[urlSplit.length - 1];
+      if (this.canonical.Image.test(url)) return { type: type, name: "图片" };
+      if (this.canonical.File.test(url)) return { type: type, name: "文档" };
+      else return { type: type, name: type };
+    },
+    ActivityChangeFileLook(index, item) {
+      Object.assign(this.ActivityLookFile[index], item);
+    },
+  },
+  mounted() {
+    //监听元素滚动
+    document.querySelector(".core_dialogue").addEventListener("scroll", (e) => {
+      let Nav = document.querySelector("#Nav");
+      let scrollTop = e.target.scrollTop;
+      if (scrollTop >= 250) {
+        document
+          .querySelector(".core_dialogue")
+          .querySelector(".el-header").style =
+          "position:fixed;z-index:10;width:100%";
+        Nav.style = `width:100%;padding:0 20%;box-sizing: border-box;border-radius:0;display:flex;justify-content: space-around;position: fixed;top:calc(70px - 20px);z-index:99;align-items: center;box-shadow: 0 0 5px gray;`;
+      } else if (scrollTop <= 100) {
+        document
+          .querySelector(".core_dialogue")
+          .querySelector(".el-header").style = "";
+        Nav.style = ``;
       }
-  </script>
+    });
+    this.getData();
+  },
+};
+</script>
   
   <style lang="less" scoped>
-    .rs1apply{
-        width: 100%;
-        height: 100%;
-        // height: auto;
-        display: flex;
-        
-        flex-direction: column;
-        align-items: center;
-        background-color: #e6eaf0;
-        box-sizing: border-box;
-        padding-bottom: 50px;
-    }
-    .header{
-        width: 100%;
-        min-height: 200px;
-        background-color: white;
-        margin-top: 10px;
-        display: flex;
-        align-items: center;
-        box-sizing: border-box;
-        padding-left: 5%;
-        position: relative;
-        .imgBlock{
-            width: 230px;
-            height: 130px;
-            margin-right: 20px;
+.rs1apply {
+  width: 100%;
+  height: 100%;
+  // height: auto;
+  display: flex;
 
-            img{
-                width: 100%;
-                height: 100%;
-                object-fit: cover;
-            }
-        }
-        .headerConcent{
-            width: 500px;
-            height: 130px;
-            display: flex;
-            flex-direction: column;
-            justify-content: space-between;
-            // width: ;
-            .rsHead1Tit{
-                font-size: 22px;
-                font-weight: bold;
-            }
-            .rsHead2Tit{
-                font-size: 16px;
-            }
-            .rsHead3Tit{
-                display: flex;
-                div{
-                    margin-right: 30px;
-                }
-            }
-        }
-        .backBtn{
-            position: absolute;
-            right: 10%;
-            width:100px;
-            top: 10%;
-            box-sizing: border-box;
-            padding: 9px 0;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            font-size: 16px;
-            cursor: pointer;
-        }
+  flex-direction: column;
+  align-items: center;
+  background-color: #e6eaf0;
+  box-sizing: border-box;
+  padding-bottom: 50px;
+}
+.header {
+  width: 100%;
+  min-height: 200px;
+  background-color: white;
+  margin-top: 10px;
+  display: flex;
+  align-items: center;
+  box-sizing: border-box;
+  padding-left: 5%;
+  position: relative;
+  .imgBlock {
+    width: 230px;
+    height: 130px;
+    margin-right: 20px;
+
+    img {
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
     }
-    #Nav{
-        box-sizing: border-box;
-        padding: 0 80px 0 70px;
-        width: 60%;
-        min-height: 50px;
-        background-color: white;
-        margin-top: 20px;
-        border-radius: 5px;
-        display: flex;
-        justify-content: space-around;
-        align-items: center;
-        .navLi{
-            // width: 150px;
-            height: 100%;
-            display: flex;
-            justify-content: flex-start;
-            align-items: center;
-            font-size: 18px;
-            // margin-left: 20px;
-            cursor: pointer;
-            img{
-                height: 40px;
-            }
-        }
-        .navLi:hover span{
-            color: gray;
-        }
+  }
+  .headerConcent {
+    width: 500px;
+    height: 130px;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    // width: ;
+    .rsHead1Tit {
+      font-size: 22px;
+      font-weight: bold;
     }
-    .BaseMessage{
-        width: 60%;
-        position: relative;
-        box-sizing: border-box;
-        // margin-bottom: 20px;
-        .BaseTitle{
-            width: 100%;
-            height: 85px;
-            background-color: white;
-            border-radius: 5px;
-            margin-top: 20px;
-            display: flex;
-            align-items: center;
-            margin-bottom: 20px;
-            span{
-                display: flex;
-                align-items: center;
-                // width: 160px;
-
-                height: 50px;
-                box-sizing: border-box;
-                justify-content: center;
-                padding-right: 2%;
-                padding-left: 4%;
-                align-items: center;
-                background-image: url('@/assets/anliDetail/longNavBg.png');
-                background-size: 100% 100%;
-                margin-left: 20px;
-                color: white;
-                font-size: 18px;
-            }
-        }
-        .brief{
-            width: 100%;
-            height: auto;
-            border-radius: 5px;
-            box-sizing: border-box;
-            display: flex;
-            flex-direction: column;
-            align-items: center;
-            background-color: white;
-            padding: 10px 10px 20px 10px;
-            margin-bottom: 20px;
-            position: relative;
-        }
-        .brief_title{
-            width: 100%;
-            height: 40px;
-            display: flex;
-            align-items: center;
-            // margin-top: 10px;
-            font-size: 18px;
-            i{
-                width: 30px;
-                height: 30px;
-                font-size: 1.5em;
-                color: #50c5ff;
-            }
-            img{
-                width: 30px;
-                height: 30px;
-            }
-            span{
-                margin-left: 10px;
-                color: gray;
-            }
-            
-        }
-        .TextView{
-            width: 100%;
-            min-height: 200px;
-            box-sizing: border-box;
-            padding: 10px;
-            border-radius: 5px;
-            background-color: rgb(240, 240, 240);
-            line-height: 2em;
-        }
-        .FileView{
-            width: 100%;
-            box-sizing: border-box;
-            padding: 0px 10px 10px 10px;
-            border-radius:10px ;
-            background-color: rgb(240, 240, 240);
-            .FileList{
-                width: 100%;
-                height: 50px;
-                border-radius: 10px;
-                background-color: white;
-                display: flex;
-                overflow: hidden;
-                cursor: pointer;
-                box-shadow: 0px 0px 4px rgb(185, 185, 185);
-                margin-top: 10px;
-                .FileType{
-                    width: 15%;
-                    height: 100%;
-                    display: flex;
-                    justify-content: center;
-                    align-items: center;
-                    color: white;
-                    font-size: 18px;
-                    background-color:#0c74ab;
-                }
-                .FileTitle{
-                    display: flex;
-                    height: 100%;
-                    flex: 1;
-                    align-items: center;
-                    box-sizing: border-box;
-                    padding-left: 2%;
-                }
-            }
-        }
-        .FileShow{
-            width: 100%;
-            height: 200px;
-            background-color: gray;
-        }
+    .rsHead2Tit {
+      font-size: 16px;
     }
-    .material{
-        width: 100%;
-        height: 900px;
-        // height: 1000px;
-        margin-top: 20px;
-        border-radius: 5px;
-        box-sizing: border-box;
-        border: 1px solid #2f89dd;
-        overflow: hidden;
-        .material_title{
-            width: 100%;
-            height: 40px;
-            display: flex;
-            align-items: center;
-            box-sizing: border-box;
-            padding-left: 10px;
-            color: white;
-            background-color: #2f89dd;
-        }
-        .FileShowArea{
-            width: 100%;
-            height: calc(100% - 40px);
-            display: flex;
-            justify-content: space-around;
-            align-items: center;
-            .FileShowArea_Left{
-                width: 60%;
-                height: 95%;
-                background-color: white;
-            }
-            .FileShowArea_Right{
-                width: 35%;
-                height: 95%;
-                display: flex;
-                flex-direction: column;
-                align-items: center;
-                background-color: #f6f9fe;
-                border-radius: 5px;
-                .FileList{
-                    width: 95%;
-                    height: 45px;
-                    background-color: white;
-                    margin-top: 20px;
-                    border-radius: 10px;
-                    font-size: 18px;
-                    cursor: pointer;
-                    display: flex;
-                    align-items: center;
-                    overflow: hidden;
-                    div{
-                        height: auto;
-                        width: 70%;
-                        display: block;
-                        overflow: hidden;
-                        white-space: nowrap;
-                        text-overflow: ellipsis;
-                    }
-                    span{
-                        max-width: 20%;
-                        min-width: 20%;
-                        height: 100%;
-                        display: flex;
-                        align-items: center;
-                        justify-content: center;
-                        color: white;
-                        background-color: #0c74ab;
-                        margin-right: 10px;
-                        float: left;
-                    }
-                }
-                .FileList:hover{
-                    color: gray;
-                }
-            }
-
-        }
+    .rsHead3Tit {
+      display: flex;
+      div {
+        margin-right: 30px;
+      }
+    }
+  }
+  .backBtn {
+    position: absolute;
+    right: 10%;
+    width: 100px;
+    top: 10%;
+    box-sizing: border-box;
+    padding: 9px 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 16px;
+    cursor: pointer;
+  }
+}
+#Nav {
+  box-sizing: border-box;
+  padding: 0 80px 0 70px;
+  width: 60%;
+  min-height: 50px;
+  background-color: white;
+  margin-top: 20px;
+  border-radius: 5px;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  .navLi {
+    // width: 150px;
+    height: 100%;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    font-size: 18px;
+    // margin-left: 20px;
+    cursor: pointer;
+    img {
+      height: 40px;
     }
+  }
+  .navLi:hover span {
+    color: gray;
+  }
+}
+.BaseMessage {
+  width: 60%;
+  position: relative;
+  box-sizing: border-box;
+  // margin-bottom: 20px;
+  .BaseTitle {
+    width: 100%;
+    height: 85px;
+    background-color: white;
+    border-radius: 5px;
+    margin-top: 20px;
+    display: flex;
+    align-items: center;
+    margin-bottom: 20px;
+    span {
+      display: flex;
+      align-items: center;
+      // width: 160px;
 
-    .arrangement{
-        width: 100%;
-        margin-top: 10px;
-        background-color: white;
-        border-radius: 5px;
-        padding: 10 px;
-        box-sizing: border-box;
-        .arrangement_assignment_title{
-            width: 100%;
-            height: 50px;
-            display: flex;
-            box-sizing: border-box;
-            padding: 0px 20px 0px 10px;
-            justify-content: space-between;
-            font-size: 18px;
-            align-items: center;
-            span{
-                display: flex;
-                align-items: center;
-                color: black;
-                font-weight: 600;
-                span:nth-of-type(2){
-                    margin-left: 10px;
-                }
-                img{
-                    width: 30px;
-                    height: 30px;
-                    margin-right: 10px;
-                }
-            }
-        }
-        .assignment{
-            width: 100%;
-            display: flex;
-            box-sizing: border-box;
-            padding: 0px 20px 0px 20px;
-            justify-content: center;
-            font-size: 18px;
-            align-items: space-between;
-            flex-direction: column;
-            span{
-                display: flex;
-                align-items: center;
-                color: gray;
-                img{
-                    width: 30px;
-                    height: 30px;
-                    margin-right: 10px;
-                }
-            }
-            .assignment_message{
-                width: 100%;
-            }
-        }
+      height: 50px;
+      box-sizing: border-box;
+      justify-content: center;
+      padding-right: 2%;
+      padding-left: 4%;
+      align-items: center;
+      background-image: url("@/assets/anliDetail/longNavBg.png");
+      background-size: 100% 100%;
+      margin-left: 20px;
+      color: white;
+      font-size: 18px;
     }
-    .fullStyle {
-      width: 100% !important;
-      max-width: 100% !important;
-      height: 100% !important;
-      margin: 0 !important;
+  }
+  .brief {
+    width: 100%;
+    height: auto;
+    border-radius: 5px;
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    background-color: white;
+    padding: 10px 10px 20px 10px;
+    margin-bottom: 20px;
+    position: relative;
+  }
+  .brief_title {
+    width: 100%;
+    height: 40px;
+    display: flex;
+    align-items: center;
+    // margin-top: 10px;
+    font-size: 18px;
+    i {
+      width: 30px;
+      height: 30px;
+      font-size: 1.5em;
+      color: #50c5ff;
     }
-    .personListUL{
-        width: 100%;
-        display: flex;
-        align-items: center;
-        .personListLI{
-            width: 80%;
-            text-overflow: ellipsis;
-            overflow: hidden;
-            white-space: nowrap;
-            span{
-                margin-right: 10px;
-                color: darkgray;
-            }
-        }
+    img {
+      width: 30px;
+      height: 30px;
     }
-    .titleMessage{
-        color: darkgray;
+    span {
+      margin-left: 10px;
+      color: gray;
     }
-    .projectStudent{
-        width:100%;
-        cursor: default;
-    }
-    .beginTime_EndTime{
-        width: 100%;
-        height: 40px;
+  }
+  .TextView {
+    width: 100%;
+    min-height: 200px;
+    box-sizing: border-box;
+    padding: 10px;
+    border-radius: 5px;
+    background-color: rgb(240, 240, 240);
+    line-height: 2em;
+  }
+  .FileView {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 0px 10px 10px 10px;
+    border-radius: 10px;
+    background-color: rgb(240, 240, 240);
+    .FileList {
+      width: 100%;
+      height: 50px;
+      border-radius: 10px;
+      background-color: white;
+      display: flex;
+      overflow: hidden;
+      cursor: pointer;
+      box-shadow: 0px 0px 4px rgb(185, 185, 185);
+      margin-top: 10px;
+      .FileType {
+        width: 15%;
+        height: 100%;
         display: flex;
+        justify-content: center;
         align-items: center;
+        color: white;
         font-size: 18px;
+        background-color: #0c74ab;
+      }
+      .FileTitle {
+        display: flex;
+        height: 100%;
+        flex: 1;
+        align-items: center;
         box-sizing: border-box;
-        padding-left: 20px;
-        i{
-            margin: 0 20px 0 20px;
-            font-size:22px;
-        }
-        // background-color: red;
+        padding-left: 2%;
+      }
     }
-    /deep/ .ql-toolbar{
-        display: none !important;
+  }
+  .FileShow {
+    width: 100%;
+    height: 200px;
+    background-color: gray;
+  }
+}
+.material {
+  width: 100%;
+  height: 900px;
+  // height: 1000px;
+  margin-top: 20px;
+  border-radius: 5px;
+  box-sizing: border-box;
+  border: 1px solid #2f89dd;
+  overflow: hidden;
+  .material_title {
+    width: 100%;
+    height: 40px;
+    display: flex;
+    align-items: center;
+    box-sizing: border-box;
+    padding-left: 10px;
+    color: white;
+    background-color: #2f89dd;
+  }
+  .FileShowArea {
+    width: 100%;
+    height: calc(100% - 40px);
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    .FileShowArea_Left {
+      width: 60%;
+      height: 95%;
+      background-color: white;
     }
-    /deep/ .ql-container.ql-snow{
-        border:none !important;
+    .FileShowArea_Right {
+      width: 35%;
+      height: 95%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      background-color: #f6f9fe;
+      border-radius: 5px;
+      .FileList {
+        width: 95%;
+        height: 45px;
+        background-color: white;
+        margin-top: 20px;
+        border-radius: 10px;
+        font-size: 18px;
+        cursor: pointer;
+        display: flex;
+        align-items: center;
+        overflow: hidden;
+        div {
+          height: auto;
+          width: 70%;
+          display: block;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+        span {
+          max-width: 20%;
+          min-width: 20%;
+          height: 100%;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          color: white;
+          background-color: #0c74ab;
+          margin-right: 10px;
+          float: left;
+        }
+      }
+      .FileList:hover {
+        color: gray;
+      }
     }
-    .lookFile{
-        color: grey;
+  }
+}
+
+.arrangement {
+  width: 100%;
+  margin-top: 10px;
+  background-color: white;
+  border-radius: 5px;
+  padding: 10 px;
+  box-sizing: border-box;
+  .arrangement_assignment_title {
+    width: 100%;
+    height: 50px;
+    display: flex;
+    box-sizing: border-box;
+    padding: 0px 20px 0px 10px;
+    justify-content: space-between;
+    font-size: 18px;
+    align-items: center;
+    span {
+      display: flex;
+      align-items: center;
+      color: black;
+      font-weight: 600;
+      span:nth-of-type(2) {
+        margin-left: 10px;
+      }
+      img {
+        width: 30px;
+        height: 30px;
+        margin-right: 10px;
+      }
+    }
+  }
+  .assignment {
+    width: 100%;
+    display: flex;
+    box-sizing: border-box;
+    padding: 0px 20px 0px 20px;
+    justify-content: center;
+    font-size: 18px;
+    align-items: space-between;
+    flex-direction: column;
+    span {
+      display: flex;
+      align-items: center;
+      color: gray;
+      img {
+        width: 30px;
+        height: 30px;
+        margin-right: 10px;
+      }
     }
-    .ActivityBaseMessage{
-        width: 100%;
-        height: auto;
+    .assignment_message {
+      width: 100%;
     }
-    .MarginTop30px{
-        margin-top: 30px;
+  }
+}
+.fullStyle {
+  width: 100% !important;
+  max-width: 100% !important;
+  height: 100% !important;
+  margin: 0 !important;
+}
+.personListUL {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  .personListLI {
+    width: 80%;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    span {
+      margin-right: 10px;
+      color: darkgray;
     }
-  </style>
+  }
+}
+.titleMessage {
+  color: darkgray;
+}
+.projectStudent {
+  width: 100%;
+  cursor: default;
+}
+.beginTime_EndTime {
+  width: 100%;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  font-size: 18px;
+  box-sizing: border-box;
+  padding-left: 20px;
+  i {
+    margin: 0 20px 0 20px;
+    font-size: 22px;
+  }
+  // background-color: red;
+}
+/deep/ .ql-toolbar {
+  display: none !important;
+}
+/deep/ .ql-container.ql-snow {
+  border: none !important;
+}
+.lookFile {
+  color: grey;
+}
+.ActivityBaseMessage {
+  width: 100%;
+  height: auto;
+}
+.MarginTop30px {
+  margin-top: 30px;
+}
+</style>

Diferenças do arquivo suprimidas por serem muito extensas
+ 596 - 473
src/views/resultShow/components/resultDetail_student.vue


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff