首页 发现 帮助
登录
CocoRoboLabs
/
ssti-CollegeManage
3
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

build

zengyicheng 1 年之前
父节点
950a8539dd
当前提交
859fe3d99e
共有 33 个文件被更改，包括 129 次插入 和 19 次删除
合并视图 显示文件统计
  1. 0 0
      dist/css/375.09b7db4e.css
  2. 0 0
      dist/css/378.8885b8a7.css
  3. 0 0
      dist/css/586.b2918902.css
  4. 0 0
      dist/css/81.f6e8c80f.css
  5. 1 1
      dist/index.html
  6. 0 0
      dist/js/251.8a137b4f.js
  7. 0 0
      dist/js/251.8a137b4f.js.map
  8. 0 0
      dist/js/283.4dccc9a0.js
  9. 0 0
      dist/js/283.4dccc9a0.js.map
  10. 0 0
      dist/js/375.f44fcd5d.js
  11. 0 0
      dist/js/375.f44fcd5d.js.map
  12. 0 0
      dist/js/378.ae387941.js
  13. 0 0
      dist/js/378.ae387941.js.map
  14. 0 0
      dist/js/379.7bb7e32d.js
  15. 0 0
      dist/js/379.7bb7e32d.js.map
  16. 0 0
      dist/js/520.f09dabae.js
  17. 0 0
      dist/js/520.f09dabae.js.map
  18. 0 0
      dist/js/586.7ef00c99.js
  19. 0 0
      dist/js/586.7ef00c99.js.map
  20. 0 0
      dist/js/732.0433319f.js
  21. 0 0
      dist/js/732.0433319f.js.map
  22. 0 0
      dist/js/81.d526acd4.js
  23. 0 0
      dist/js/81.d526acd4.js.map
  24. 0 0
      dist/js/879.ee4d6cbf.js
  25. 0 0
      dist/js/879.ee4d6cbf.js.map
  26. 0 0
      dist/js/app.1d5bc039.js
  27. 0 0
      dist/js/app.1d5bc039.js.map
  28. 0 0
      dist/js/app.206845e2.js
  29. 1 1
      src/views/projectManage/ProjectManagement.vue
  30. 1 1
      src/views/projectManage/ProjectManagementMain.vue
  31. 61 4
      src/views/projectManage/components/Closingstatement.vue
  32. 57 4
      src/views/projectSettlement/components/projectSettlementBook.vue
  33. 8 8
      src/views/resultShow/components/resultDetail_MakerSpace.vue

文件差异内容过多而无法显示
+ 0 - 0
dist/css/375.09b7db4e.css


文件差异内容过多而无法显示
+ 0 - 0
dist/css/378.8885b8a7.css


文件差异内容过多而无法显示
+ 0 - 0
dist/css/586.b2918902.css


文件差异内容过多而无法显示
+ 0 - 0
dist/css/81.f6e8c80f.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.206845e2.js"></script><link href="/css/chunk-vendors.0225060a.css" rel="stylesheet"><link href="/css/app.3ebe307b.css" rel="stylesheet"></head><body><div id="app"></div></body></html>
 
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>双创学院管理系统</title><script defer="defer" src="/js/chunk-vendors.c0eb00f6.js"></script><script defer="defer" src="/js/app.1d5bc039.js"></script><link href="/css/chunk-vendors.0225060a.css" rel="stylesheet"><link href="/css/app.3ebe307b.css" rel="stylesheet"></head><body><div id="app"></div></body></html>

文件差异内容过多而无法显示
+ 0 - 0
dist/js/251.8a137b4f.js


文件差异内容过多而无法显示
+ 0 - 0
dist/js/251.8a137b4f.js.map


文件差异内容过多而无法显示
+ 0 - 0
dist/js/283.4dccc9a0.js


文件差异内容过多而无法显示
+ 0 - 0
dist/js/283.4dccc9a0.js.map


文件差异内容过多而无法显示
+ 0 - 0
dist/js/375.f44fcd5d.js


文件差异内容过多而无法显示
+ 0 - 0
dist/js/375.f44fcd5d.js.map


文件差异内容过多而无法显示
+ 0 - 0
dist/js/378.ae387941.js


文件差异内容过多而无法显示
+ 0 - 0
dist/js/378.ae387941.js.map


文件差异内容过多而无法显示
+ 0 - 0
dist/js/379.7bb7e32d.js


文件差异内容过多而无法显示
+ 0 - 0
dist/js/379.7bb7e32d.js.map


文件差异内容过多而无法显示
+ 0 - 0
dist/js/520.f09dabae.js


文件差异内容过多而无法显示
+ 0 - 0
dist/js/520.f09dabae.js.map


文件差异内容过多而无法显示
+ 0 - 0
dist/js/586.7ef00c99.js


文件差异内容过多而无法显示
+ 0 - 0
dist/js/586.7ef00c99.js.map


文件差异内容过多而无法显示
+ 0 - 0
dist/js/732.0433319f.js


文件差异内容过多而无法显示
+ 0 - 0
dist/js/732.0433319f.js.map


文件差异内容过多而无法显示
+ 0 - 0
dist/js/81.d526acd4.js


文件差异内容过多而无法显示
+ 0 - 0
dist/js/81.d526acd4.js.map


文件差异内容过多而无法显示
+ 0 - 0
dist/js/879.ee4d6cbf.js


文件差异内容过多而无法显示
+ 0 - 0
dist/js/879.ee4d6cbf.js.map


文件差异内容过多而无法显示
+ 0 - 0
dist/js/app.1d5bc039.js


文件差异内容过多而无法显示
+ 0 - 0
dist/js/app.1d5bc039.js.map


文件差异内容过多而无法显示
+ 0 - 0
dist/js/app.206845e2.js


+ 1 - 1
src/views/projectManage/ProjectManagement.vue
查看文件 

@@ -250,7 +250,7 @@
 
                 type="primary"
 
                 type="primary"
 
                 @click="scheduleDetail(scope.row.courseId, scope.row.typeid)"
 
                 @click="scheduleDetail(scope.row.courseId, scope.row.typeid)"
 
                 size="mini"
 
                 size="mini"
 
-                >进度详情</el-button
 
+                >项目详情</el-button
 
               >
 
               >
 
               <!-- <el-button
 
               <!-- <el-button
 
                 type="primary"
 
                 type="primary"

+ 1 - 1
src/views/projectManage/ProjectManagementMain.vue
查看文件 

@@ -2,7 +2,7 @@
 
     <div id="ProjectManagementMain">
 
     <div id="ProjectManagementMain">
 
         <div class="vfpHeader">
 
         <div class="vfpHeader">
 
             <div class="titleOne">项目管理</div>
 
             <div class="titleOne">项目管理</div>
 
-            <div class="smallTitle" style="left: 100px;">项目进展详情</div>
 
+            <div class="smallTitle" style="left: 100px;">项目详情</div>
 
             <el-button type="primary" @click="$router.push('/ProjectManagement')">返回</el-button>
 
             <el-button type="primary" @click="$router.push('/ProjectManagement')">返回</el-button>
 
         </div>
 
         </div>
 
         <hr>
 
         <hr>

+ 61 - 4
src/views/projectManage/components/Closingstatement.vue
查看文件 

@@ -179,7 +179,10 @@
 
         <td>预算经费</td>
 
         <td>预算经费</td>
 
         <td>元</td>
 
         <td>元</td>
 
       </tr>
 
       </tr>
 
-      <tr>
 
+      <!-- 学生创客项目 -->
 
+      <tr
 
+        v-if="myArrayProp[0].typeid == '5e21b204-c206-11ed-a4cd-509a4c5b67cf'"
 
+      >
 
         <td :rowspan="myArrayProp[0].course_student.length + 1">
 
         <td :rowspan="myArrayProp[0].course_student.length + 1">
 
           学<br />生<br />
 
           学<br />生<br />
 
           团 <br />队 <br />成 <br />员
 
           团 <br />队 <br />成 <br />员
 
@@ -191,24 +194,78 @@
 
       <tr
 
       <tr
 
         v-for="(item, index) in myArrayProp[0].course_student"
 
         v-for="(item, index) in myArrayProp[0].course_student"
 
         :key="index + 'a'"
 
         :key="index + 'a'"
 
+        v-show="myArrayProp[0].typeid == '5e21b204-c206-11ed-a4cd-509a4c5b67cf'"
 
       >
 
       >
 
         <td><span v-text="item.name"></span></td>
 
         <td><span v-text="item.name"></span></td>
 
-        <td><span v-html="item.collage"></span></td>
 
+        <td ><span v-html="item.collage"></span></td>
 
         <td colspan="5"><span v-text="item.work"></span></td>
 
         <td colspan="5"><span v-text="item.work"></span></td>
 
       </tr>
 
       </tr>
 
 
 
-      <tr>
 
+      <tr
 
+        v-if="myArrayProp[0].typeid == '5e21b204-c206-11ed-a4cd-509a4c5b67cf'"
 
+      >
 
+        <td :rowspan="myArrayProp[0].course_teacher.length + 1">
 
+          项<br />目<br />
 
+          指 <br />导 <br />教 <br />师
 
+        </td>
 
+      </tr>
 
+      <tr
 
+        v-for="(item, index) in myArrayProp[0].course_teacher"
 
+        :key="index + 'b'"
 
+        v-show="myArrayProp[0].typeid == '5e21b204-c206-11ed-a4cd-509a4c5b67cf'"
 
+      >
 
+        <td><span v-text="item.name"></span></td>
 
+        <td ><span v-html="item.collage"></span></td>
 
+        <td colspan="5"><span v-text="item.work"></span></td>
 
+      </tr>
 
+      <!-- 特色创客空间建设项目 -->
 
+      <tr
 
+        v-if="myArrayProp[0].typeid == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"
 
+      >
 
+        <td :rowspan="myArrayProp[0].course_student.length + 1">
 
+          学<br />生<br />
 
+          团 <br />队 <br />成 <br />员
 
+        </td>
 
+        <td>姓名</td>
 
+        <td>所在学院及专业</td>
 
+        <td>年龄</td>
 
+        <td colspan="5">项目组任务分工</td>
 
+      </tr>
 
+      <tr
 
+        v-for="(item, index) in myArrayProp[0].course_student"
 
+        :key="index + 'a'"
 
+        v-show="myArrayProp[0].typeid == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"
 
+      >
 
+        <td><span v-text="item.name"></span></td>
 
+        <td ><span v-html="item.class"></span></td>
 
+        <td ><span v-html="item.age"></span></td>
 
+        <td colspan="5"><span v-text="item.work"></span></td>
 
+      </tr>
 
+
 
+      <tr
 
+        v-if="myArrayProp[0].typeid == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"
 
+      >
 
         <td :rowspan="myArrayProp[0].course_teacher.length + 1">
 
         <td :rowspan="myArrayProp[0].course_teacher.length + 1">
 
           项<br />目<br />
 
           项<br />目<br />
 
           指 <br />导 <br />教 <br />师
 
           指 <br />导 <br />教 <br />师
 
         </td>
 
         </td>
 
+        <td>姓名</td>
 
+        <td>专业</td>
 
+        <td>职称</td>
 
+        <td>学历</td>
 
+        <td>所在教研室</td>
 
+        <td colspan="5">项目角色分工</td>
 
       </tr>
 
       </tr>
 
       <tr
 
       <tr
 
         v-for="(item, index) in myArrayProp[0].course_teacher"
 
         v-for="(item, index) in myArrayProp[0].course_teacher"
 
         :key="index + 'b'"
 
         :key="index + 'b'"
 
+        v-show="myArrayProp[0].typeid == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"
 
       >
 
       >
 
         <td><span v-text="item.name"></span></td>
 
         <td><span v-text="item.name"></span></td>
 
-        <td><span v-html="item.collage"></span></td>
 
+        <td ><span v-html="item.speciality"></span></td>
 
+        <td ><span v-html="item.title"></span></td>
 
+        <td ><span v-html="item.education"></span></td>
 
+        <td ><span v-html="item.section"></span></td>
 
         <td colspan="5"><span v-text="item.work"></span></td>
 
         <td colspan="5"><span v-text="item.work"></span></td>
 
       </tr>
 
       </tr>

+ 57 - 4
src/views/projectSettlement/components/projectSettlementBook.vue
查看文件 

@@ -186,7 +186,8 @@
 
         <td>预算经费</td>
 
         <td>预算经费</td>
 
         <td>元</td>
 
         <td>元</td>
 
       </tr>
 
       </tr>
 
-      <tr>
 
+      <!-- 学生创客项目 -->
 
+      <tr v-if="myArrayProp[0].typeid == '5e21b204-c206-11ed-a4cd-509a4c5b67cf'">
 
         <td :rowspan="myArrayProp[0].course_student.length + 1">
 
         <td :rowspan="myArrayProp[0].course_student.length + 1">
 
           学<br />生<br />
 
           学<br />生<br />
 
           团 <br />队 <br />成 <br />员
 
           团 <br />队 <br />成 <br />员
 
@@ -198,24 +199,76 @@
 
       <tr
 
       <tr
 
         v-for="(item, index) in myArrayProp[0].course_student"
 
         v-for="(item, index) in myArrayProp[0].course_student"
 
         :key="index + 'a'"
 
         :key="index + 'a'"
 
+        v-show="myArrayProp[0].typeid == '5e21b204-c206-11ed-a4cd-509a4c5b67cf'"
 
       >
 
       >
 
         <td><span v-text="item.name"></span></td>
 
         <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>
 
         <td colspan="5"><span v-text="item.work"></span></td>
 
       </tr>
 
       </tr>
 
 
 
-      <tr>
 
+      <tr v-if="myArrayProp[0].typeid == '5e21b204-c206-11ed-a4cd-509a4c5b67cf'">
 
+        <td :rowspan="myArrayProp[0].course_teacher.length + 1">
 
+          项<br />目<br />
 
+          指 <br />导 <br />教 <br />师
 
+        </td>
 
+      </tr>
 
+      <tr
 
+        v-for="(item, index) in myArrayProp[0].course_teacher"
 
+        :key="index + 'b'"
 
+        v-show="myArrayProp[0].typeid == '5e21b204-c206-11ed-a4cd-509a4c5b67cf'"
 
+      >
 
+        <td><span v-text="item.name"></span></td>
 
+        <td><span v-html="item.collage"></span></td>
 
+        <td colspan="5"><span v-text="item.work"></span></td>
 
+      </tr>
 
+      <!-- 特色创客空间建设项目 -->
 
+      <tr
 
+        v-if="myArrayProp[0].typeid == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"
 
+      >
 
+        <td :rowspan="myArrayProp[0].course_student.length + 1">
 
+          学<br />生<br />
 
+          团 <br />队 <br />成 <br />员
 
+        </td>
 
+        <td>姓名</td>
 
+        <td>所在学院及专业</td>
 
+        <td>年龄</td>
 
+        <td colspan="5">项目组任务分工</td>
 
+      </tr>
 
+      <tr
 
+        v-for="(item, index) in myArrayProp[0].course_student"
 
+        :key="index + 'a'"
 
+        v-show="myArrayProp[0].typeid == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"
 
+      >
 
+        <td><span v-text="item.name"></span></td>
 
+        <td ><span v-html="item.class"></span></td>
 
+        <td ><span v-html="item.age"></span></td>
 
+        <td colspan="5"><span v-text="item.work"></span></td>
 
+      </tr>
 
+
 
+      <tr
 
+        v-if="myArrayProp[0].typeid == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"
 
+      >
 
         <td :rowspan="myArrayProp[0].course_teacher.length + 1">
 
         <td :rowspan="myArrayProp[0].course_teacher.length + 1">
 
           项<br />目<br />
 
           项<br />目<br />
 
           指 <br />导 <br />教 <br />师
 
           指 <br />导 <br />教 <br />师
 
         </td>
 
         </td>
 
+        <td>姓名</td>
 
+        <td>专业</td>
 
+        <td>职称</td>
 
+        <td>学历</td>
 
+        <td>所在教研室</td>
 
+        <td colspan="5">项目角色分工</td>
 
       </tr>
 
       </tr>
 
       <tr
 
       <tr
 
         v-for="(item, index) in myArrayProp[0].course_teacher"
 
         v-for="(item, index) in myArrayProp[0].course_teacher"
 
         :key="index + 'b'"
 
         :key="index + 'b'"
 
+        v-show="myArrayProp[0].typeid == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"
 
       >
 
       >
 
         <td><span v-text="item.name"></span></td>
 
         <td><span v-text="item.name"></span></td>
 
-        <td></td>
 
+        <td ><span v-html="item.speciality"></span></td>
 
+        <td ><span v-html="item.title"></span></td>
 
+        <td ><span v-html="item.education"></span></td>
 
+        <td ><span v-html="item.section"></span></td>
 
         <td colspan="5"><span v-text="item.work"></span></td>
 
         <td colspan="5"><span v-text="item.work"></span></td>
 
       </tr>
 
       </tr>

+ 8 - 8
src/views/resultShow/components/resultDetail_MakerSpace.vue
查看文件 

@@ -206,7 +206,7 @@
 
             >一、建设内容（空间优化/场馆规划方面拟解决的关键问题及主要建设指标）</span
 
             >一、建设内容（空间优化/场馆规划方面拟解决的关键问题及主要建设指标）</span
 
           >
 
           >
 
         </div>
 
         </div>
 
-        <div class="TextView" v-text="DetailMessage['Construction']"></div>
 
+        <div class="TextView" v-html="DetailMessage['Construction']"></div>
 
       </div>
 
       </div>
 
 
 
       <div class="BaseTitle" type="1">
 
       <div class="BaseTitle" type="1">
 
@@ -220,7 +220,7 @@
 
             （说明本项目的目的、意义以及国内外高校现状、市场预测和发展趋势，预期达到的目标，研究的预期效果分析，成果受益面）</span
 
             （说明本项目的目的、意义以及国内外高校现状、市场预测和发展趋势，预期达到的目标，研究的预期效果分析，成果受益面）</span
 
           >
 
           >
 
         </div>
 
         </div>
 
-        <div class="TextView" v-text="DetailMessage['ProjectBasis']"></div>
 
+        <div class="TextView" v-html="DetailMessage['ProjectBasis']"></div>
 
       </div>
 
       </div>
 
 
 
       <div class="BaseTitle" type="1">
 
       <div class="BaseTitle" type="1">
 
@@ -233,35 +233,35 @@
 
             >一、创客空间物理环境、制度建设及软件设施建设情况（环境优化/制度完善/设施改造）</span
 
             >一、创客空间物理环境、制度建设及软件设施建设情况（环境优化/制度完善/设施改造）</span
 
           >
 
           >
 
         </div>
 
         </div>
 
-        <div class="TextView" v-text="DetailMessage['development']"></div>
 
+        <div class="TextView" v-html="DetailMessage['development']"></div>
 
       </div>
 
       </div>
 
       <div class="brief">
 
       <div class="brief">
 
         <div class="brief_title" type="1.1">
 
         <div class="brief_title" type="1.1">
 
           <img src="@/assets/anliDetail/jdTitle.png" alt="" />
 
           <img src="@/assets/anliDetail/jdTitle.png" alt="" />
 
           <span>二、学生创客工作室建设情况（工作室数量及活动开展情况）</span>
 
           <span>二、学生创客工作室建设情况（工作室数量及活动开展情况）</span>
 
         </div>
 
         </div>
 
-        <div class="TextView" v-text="DetailMessage['studio']"></div>
 
+        <div class="TextView" v-html="DetailMessage['studio']"></div>
 
       </div>
 
       </div>
 
       <div class="brief">
 
       <div class="brief">
 
         <div class="brief_title" type="1.1">
 
         <div class="brief_title" type="1.1">
 
           <img src="@/assets/anliDetail/jdTitle.png" alt="" />
 
           <img src="@/assets/anliDetail/jdTitle.png" alt="" />
 
           <span>三、学生创客团队（人才）培养预期成果、数量</span>
 
           <span>三、学生创客团队（人才）培养预期成果、数量</span>
 
         </div>
 
         </div>
 
-        <div class="TextView" v-text="DetailMessage['studentTeam']"></div>
 
+        <div class="TextView" v-html="DetailMessage['studentTeam']"></div>
 
       </div>
 
       </div>
 
       <div class="brief">
 
       <div class="brief">
 
         <div class="brief_title" type="1.1">
 
         <div class="brief_title" type="1.1">
 
           <img src="@/assets/anliDetail/jdTitle.png" alt="" />
 
           <img src="@/assets/anliDetail/jdTitle.png" alt="" />
 
           <span>四、学生创客活动组织实施情况</span>
 
           <span>四、学生创客活动组织实施情况</span>
 
         </div>
 
         </div>
 
-        <div class="TextView" v-text="DetailMessage['studentActivities']"></div>
 
+        <div class="TextView" v-html="DetailMessage['studentActivities']"></div>
 
       </div>
 
       </div>
 
       <div class="brief">
 
       <div class="brief">
 
         <div class="brief_title" type="1.1">
 
         <div class="brief_title" type="1.1">
 
           <img src="@/assets/anliDetail/jdTitle.png" alt="" />
 
           <img src="@/assets/anliDetail/jdTitle.png" alt="" />
 
           <span>五、学生创客团队孵化、转化创业项目情况</span>
 
           <span>五、学生创客团队孵化、转化创业项目情况</span>
 
         </div>
 
         </div>
 
-        <div class="TextView" v-text="DetailMessage['Transforming']"></div>
 
+        <div class="TextView" v-html="DetailMessage['Transforming']"></div>
 
       </div>
 
       </div>
 
 
 
       <div class="BaseTitle" type="1">
 
       <div class="BaseTitle" type="1">
 
@@ -274,7 +274,7 @@
 
             >一、基础条件（物理环境/设备设施/项目实施/活动开展/技术力量/社会资源）</span
 
             >一、基础条件（物理环境/设备设施/项目实施/活动开展/技术力量/社会资源）</span
 
           >
 
           >
 
         </div>
 
         </div>
 
-        <div class="TextView" v-text="DetailMessage['condition']"></div>
 
+        <div class="TextView" v-html="DetailMessage['condition']"></div>
 
       </div>
 
       </div>
 
     </div>
 
     </div>
 
     <!-- 项目详细结束 -->
 
     <!-- 项目详细结束 -->

部分文件因为文件数量过多而无法显示