Home Esplora Aiuto
Accedi
CocoRoboLabs
/
ssti-CollegeManage
3
0
Forka 0
File Problemi 0 Pull Requests 0 Wiki
Sfoglia il codice sorgente

update

SanHQin 1 anno fa
parent
3cd1ac4592
commit
4ee67e153a
27 ha cambiato i file con 19 aggiunte e 17 eliminazioni
Visualizzazione separata Mostra Diff Stats
  1. 0 0
      dist/css/210.e839fba8.css
  2. 0 1
      dist/css/415.cf44651d.css
  3. 0 0
      dist/css/420.7131a577.css
  4. 1 0
      dist/css/652.6378db59.css
  5. 0 0
      dist/css/8.8ef56efc.css
  6. 1 1
      dist/index.html
  7. 0 0
      dist/js/210.3a5144eb.js
  8. 0 0
      dist/js/210.3a5144eb.js.map
  9. 0 0
      dist/js/210.6689b254.js
  10. 0 0
      dist/js/210.6689b254.js.map
  11. 0 0
      dist/js/415.162751ec.js
  12. 0 0
      dist/js/415.162751ec.js.map
  13. 0 0
      dist/js/420.fe9e209f.js
  14. 0 0
      dist/js/420.fe9e209f.js.map
  15. 0 0
      dist/js/595.8443ed27.js
  16. 0 0
      dist/js/595.8443ed27.js.map
  17. 0 0
      dist/js/652.d3950023.js
  18. 0 0
      dist/js/652.d3950023.js.map
  19. 0 0
      dist/js/8.026c9adf.js
  20. 0 0
      dist/js/8.026c9adf.js.map
  21. 0 0
      dist/js/8.753c4517.js
  22. 0 0
      dist/js/8.753c4517.js.map
  23. 0 0
      dist/js/app.756dbd2d.js
  24. 0 0
      dist/js/app.756dbd2d.js.map
  25. 6 9
      src/views/commission/commission.vue
  26. 4 4
      src/views/commission/components/projectBook.vue
  27. 7 2
      src/views/commission/components/projectLookstudnt.vue

+ 0 - 0
dist/css/8.e839fba8.css → dist/css/210.e839fba8.css
Vedi File


+ 0 - 1
dist/css/415.cf44651d.css
Vedi File 

@@ -1 +0,0 @@
 
-[data-v-4b4af58f] .el-table__row .el-table__cell{cursor:pointer}[data-v-4b4af58f] .el-table__row .el-table__cell:last-child{cursor:default}

File diff suppressed because it is too large
+ 0 - 0
dist/css/420.7131a577.css


+ 1 - 0
dist/css/652.6378db59.css
Vedi File 

@@ -0,0 +1 @@
 
+[data-v-4f900a3b] .el-table__row .el-table__cell{cursor:pointer}[data-v-4f900a3b] .el-table__row .el-table__cell:last-child{cursor:default}

+ 0 - 0
dist/css/595.8ef56efc.css → dist/css/8.8ef56efc.css
Vedi File


+ 1 - 1
dist/index.html
Vedi File 

@@ -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.45150633.js"></script><script defer="defer" src="/js/app.48061bef.js"></script><link href="/css/chunk-vendors.0225060a.css" rel="stylesheet"><link href="/css/app.431d2a6a.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.45150633.js"></script><script defer="defer" src="/js/app.756dbd2d.js"></script><link href="/css/chunk-vendors.0225060a.css" rel="stylesheet"><link href="/css/app.431d2a6a.css" rel="stylesheet"></head><body><div id="app"></div></body></html>

File diff suppressed because it is too large
+ 0 - 0
dist/js/210.3a5144eb.js


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


File diff suppressed because it is too large
+ 0 - 0
dist/js/210.6689b254.js


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


File diff suppressed because it is too large
+ 0 - 0
dist/js/415.162751ec.js


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


File diff suppressed because it is too large
+ 0 - 0
dist/js/420.fe9e209f.js


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


File diff suppressed because it is too large
+ 0 - 0
dist/js/595.8443ed27.js


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


File diff suppressed because it is too large
+ 0 - 0
dist/js/652.d3950023.js


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


File diff suppressed because it is too large
+ 0 - 0
dist/js/8.026c9adf.js


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


File diff suppressed because it is too large
+ 0 - 0
dist/js/8.753c4517.js


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


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


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


+ 6 - 9
src/views/commission/commission.vue
Vedi File 

@@ -84,16 +84,16 @@
 
         <!-- <div class="selectsBlock">
 
           <span class="selectLabel">状态</span>
 
           <el-select
 
-            v-model="pavalues.value2"
 
+            v-model="pavalues.value5"
 
             @change="getData"
 
             placeholder="请选择"
 
           >
 
             <el-option label="所有分类" value="" />
 
             <el-option
 
-              v-for="item in options5"
 
-              :key="item.typeid"
 
-              :label="item.name"
 
-              :value="item.typeid"
 
+              v-for="(item,index) in options5"
 
+              :key="index"
 
+              :label="item.label"
 
+              :value="item.value"
 
             >
 
             </el-option>
 
           </el-select>
 
@@ -284,10 +284,6 @@ export default {
 
       options3: [],
 
       options4: [],
 
 			options5:[//状态
 
-          {
 
-            value: "",
 
-            label: "全部",
 
-          },
 
           {
 
             value: 0,
 
             label: "未审核",
 
@@ -316,6 +312,7 @@ export default {
 
         value3: "",
 
         // value4: new Date().getFullYear().toString(),
 
         value4: "",
 
+				value5:"",
 
       },
 
       Page: {
 
         currentPage: 1,

+ 4 - 4
src/views/commission/components/projectBook.vue
Vedi File 

@@ -208,15 +208,15 @@
 
         
         	  <div class="flowBottom">
 
         	    <div class="flowText" v-if="qpList.filter(i=>i.type==item.key)[0].isAgree == 1">
 
-								{{ typeListStatus.find(i=>i.key==item.key).tit }}审核，拟通过
 
+								{{ typeListStatus.find(i=>i.key==item.key).tit }}<br/>审核，拟通过
 
 								<!-- {{typeListStatus[qpList.filter(i=>i.type==item.key)[0].type]}}审核，拟通过。 -->
 
         	    </div>
 
-        	    <div class="flowText" v-else>{{ qpList.filter(i=>i.type==item.key)[0].bm }}审核，不通过。</div>
 
+        	    <div class="flowText" v-else>{{ typeListStatus.find(i=>i.key==item.key).tit }}<br/>审核，不通过。</div>
 
         	    <div class="flowReason" v-if="qpList.filter(i=>i.type==item.key)[0].isAgree == 2">{{ qpList.filter(i=>i.type==item.key)[0].text }}</div>
 
         	  </div>
 
 						<div class="flowTop">
 
         	    <div class="flowTime">{{ qpList.filter(i=>i.type==item.key)[0].lcTime }}</div>
 
-        	    <div class="flowPeople">{{ qpList.filter(i=>i.type==item.key)[0].bm }}{{ qpList.filter(i=>i.type==item.key)[0].username }}</div>
 
+        	    <div class="flowPeople">{{ qpList.filter(i=>i.type==item.key)[0].bm?qpList.filter(i=>i.type==item.key)[0].bm+'-':'' }}{{ qpList.filter(i=>i.type==item.key)[0].username }}</div>
 
         	  </div>
 
         	</div>
 
 				</div>
 
@@ -333,7 +333,7 @@ export default {
 
 				{tit:"学校终审意见",key:'3'},
 
 				// {tit:"专家意见",key:'5'},
 
 				{tit:"创新创业学院审核",key:'0'},
 
-				{tit:"所在学院/部门",key:'4'},
 
+				{tit:"所在学院/部门审核",key:'4'},
 
 			]
 
 			// typeListStatus:{
 
 			// 	"5":"评审委员会意见",

+ 7 - 2
src/views/commission/components/projectLookstudnt.vue
Vedi File 

@@ -92,7 +92,10 @@
 
             <td>参与教师人数</td><td v-text="downWordData.teacherS.length"></td>
 
           </tr>
 
           <tr id="studentS">
 
-            <td :rowspan="downWordData.studentS.length+1" ref="studentS">项目组学生成员<br/>（至少2个学院以上学生构成，团队5人以上）</td><td>姓名</td><td colspan="2">所在学院/部门/专业</td><td colspan="3">项目组角色分工</td>
 
+            <td :rowspan="downWordData.studentS.length+1" ref="studentS"><span class="jc">项目学生成员</span><br />
 
+					（至少2个学院以上学生构成，其中：
 
+1.创新项目、创业训练项目人数为5+3组成，其中不超过5名学生为项目主要成员，由初起二、三、四年级（高起一、二年级）学生组成，3名学生作为后备成员由一、二年级学生组成。
 
+2.创业实践项目人数为6+3组成，其中不超过6名学生为初起三、四、五年级（高起二、三年级）学生，3名学生作为后备成员由一、二年级学生组成。</td><td>姓名</td><td colspan="2">所在学院/部门/专业</td><td colspan="3">项目组角色分工</td>
 
           </tr>
 
           <tr style="position: relative;" v-for="(item,index) in downWordData.studentS" :key="index+'a'">
 
             <td v-text="item.name"></td>
 
@@ -100,7 +103,9 @@
 
             <td colspan="3" v-text="item.work"></td>
 
           </tr>
 
           <tr id="teacherS">
 
-            <td :rowspan="downWordData.teacherS.length+1" ref="teacherS">项目组指导教师<br/>（2个学院以上，团队2-3人）</td><td>姓名</td><td colspan="2">所在学院/部门/专业</td><td colspan="3">项目组角色分工</td>
 
+            <td :rowspan="downWordData.teacherS.length+1" ref="teacherS">
 
+							<span class="jc">项目组指导教师</span><br />
 
+          （2个学院以上， 2-4名指导教师，指导教师须有中级以上职称或研究生以上学历，创业实践项目除配备2名以上校内指导教师外，还须配备1名企业指导教师。）</td><td>姓名</td><td colspan="2">所在学院/部门/专业</td><td colspan="3">项目组角色分工</td>
 
           </tr>
 
           <tr style="position: relative !important;" v-for="(item,index) in downWordData.teacherS" :key="index+'b'">
 
             <td v-text="item.name"></td>

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