Browse Source

整理没改的

yuanyiming 1 năm trước cách đây
mục cha
commit
d9e887ee40

+ 2 - 1
src/views/projectApply/components/projectApplicationDetails.vue

@@ -762,7 +762,8 @@
                     if(JSON.parse(param[i]).length<5)return this.$message.error("需要学生团队5人以上")
                     break;
                   case 'bri':
-                    if(param[i].length<200 || param[i]>=300)return this.$message.error("项目简介需要200-300字")
+                    console.log();
+                    if(param[i].length<200 || param[i].length>300)return this.$message.error("项目简介需要200-300字")
                     break;
                 }
               }

+ 1 - 1
src/views/projectApply/projectApplicationApplyMain.vue

@@ -400,7 +400,7 @@
                     if(JSON.parse(param[i]).length<5)return this.$message.error("需要学生团队5人以上")
                     break;
                   case 'con':
-                    if(param[i].length<200 || param[i]>=300)return this.$message.error("项目简介需要200-300字")
+                    if(param[i].length<200 || param[i].length>=300)return this.$message.error("项目简介需要200-300字")
                     break;
                 }
               }

+ 1 - 1
src/views/projectManage/components/ProjectManagement1.vue

@@ -763,7 +763,7 @@
                     if(JSON.parse(param[i]).length<5)return this.$message.error("需要学生团队5人以上")
                     break;
                   case 'bri':
-                    if(param[i].length<200 || param[i]>=300)return this.$message.error("项目简介需要200-300字")
+                    if(param[i].length<200 || param[i].length>=300)return this.$message.error("项目简介需要200-300字")
                     break;
                 }
               }

+ 0 - 2
src/views/projectManage/components/ProjectManagement4.vue

@@ -357,8 +357,6 @@
       justify-content: flex-end;
 
       .btn{
-        // height: 30px;
-        // background: blue;
         width: 120px;
         font-size: 16px !important;
         margin-left: 10px;

+ 0 - 1
src/views/projectManage/components/ProjectManagement5.vue

@@ -377,7 +377,6 @@
       display: flex;  
       justify-content: flex-end;
       .btn{
-        // height: 30px;
         width: 120px;
         font-size: 16px;
         border: none;

+ 1 - 1
src/views/projectSettlement/components/projectSettlementDetailBase_Student.vue

@@ -766,7 +766,7 @@
                     if(JSON.parse(param[i]).length<5)return this.$message.error("需要学生团队5人以上")
                     break;
                   case 'bri':
-                    if(param[i].length<200 || param[i]>=300)return this.$message.error("项目简介需要200-300字")
+                    if(param[i].length<200 || param[i].length>=300)return this.$message.error("项目简介需要200-300字")
                     break;
                 }
               }

+ 3 - 3
src/views/projectSettlement/projectSettlement.vue

@@ -155,7 +155,7 @@
                         <el-button type="info"  disabled v-if="scope.row.isupload==2" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"  size="mini">已审核</el-button>
                         <!-- <el-button type="primary" disabled v-if="scope.row.isupload==0" style="width: 73.3px;background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"  @click="audit(scope.row.courseId,scope.row.title)" size="mini">审核</el-button> -->
 
-                        <el-button v-show="scope.row.isupload==2" type="primary" size="mini" @click="edit(scope.row.courseId)">成果查看</el-button>
+                        <el-button v-show="scope.row.isupload==2" type="primary" size="mini" @click="edit(scope.row.courseId,scope.row.typeid)">成果查看</el-button>
                         <el-button v-show="scope.row.isupload!=2" type="info" disabled="" size="mini">成果查看</el-button>
               </div>
           </template>
@@ -303,9 +303,9 @@
                 console.log(err);
               })  
         },
-        edit(rowId){
+        edit(cid,tid){
           // console.log(rowId)
-          window.open(`/#/resultShowDetail?Id=${rowId}`)
+          window.open(`/#/resultShowDetail?pid=${cid}&tid=${tid}`)
         },
         details(val){
           this.$router.push(`/projectSettlementDetailMain?pid=${val['courseId']}&tid=${val['typeid']}`);

+ 4 - 4
src/views/resultShow/components/resultDetail_student.vue

@@ -115,12 +115,12 @@
                           </el-table-column>
                           <el-table-column
                             prop="class"
-                            label="学院/班级/姓名"
+                            label="所在学院/部门/专业"
                             align="center">
                           </el-table-column>
                           <el-table-column
                             prop="division"
-                            label="活动分工"
+                            label="项目组角色分工"
                             align="center">
                           </el-table-column>
                         </el-table>
@@ -145,12 +145,12 @@
                           </el-table-column>
                           <el-table-column
                             prop="class"
-                            label="班级"
+                            label="所在学院/部门/专业"
                             align="center">
                           </el-table-column>
                           <el-table-column
                             prop="division"
-                            label="活动分工"
+                            label="项目组角色分工"
                             align="center">
                           </el-table-column>                        
                         </el-table>