Q-ABAB пре 1 година
родитељ
комит
a987f376db

+ 1 - 0
src/assets/img/doctorialHat.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1683188526679" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1190" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M945.08544 366.6432l-425.97376-183.1936a20.5312 20.5312 0 0 0-8.12544-1.6896c-2.7648 0-5.52448 0.5632-8.14592 1.6896L76.87168 366.6432c-8.98048 3.84512-14.92992 13.65504-14.92992 24.59136 0 10.9568 5.94944 20.74112 14.92992 24.60672L502.8352 599.04a20.29056 20.29056 0 0 0 16.27136 0l331.1872-142.43328v145.7152c-17.75104 9.40032-30.08512 29.8496-30.08512 53.62688 0 23.7824 12.33408 44.22656 30.08512 53.62688v50.83136h43.6224v-50.82112c17.76128-9.40032 30.1056-29.8496 30.1056-53.63712s-12.34432-44.2368-30.1056-53.63712V437.84704l51.16416-22.00576c8.97536-3.8656 14.9248-13.65504 14.9248-24.60672 0-10.93632-5.94944-20.74624-14.9248-24.59136z m-434.0992 269.16352a47.96928 47.96928 0 0 1-19.03104-3.95776L226.4064 517.632v157.70112c0 129.16224 193.65888 167.936 254.208 167.936h60.69248c45.35808 0 254.22848-38.77376 254.22848-167.936v-157.696l-265.55904 114.21184a47.76448 47.76448 0 0 1-18.9952 3.95776z" fill="#1296db" p-id="1191"></path></svg>

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
src/assets/img/student.svg


+ 7 - 0
src/views/projectApply/projectApplicationMakerSpaceDetails.vue

@@ -138,6 +138,13 @@
           align="center"
           >
         </el-table-column>
+
+        <el-table-column
+          prop="work"
+          label="项目组任务分工"
+          align="center"
+          >
+        </el-table-column>
         
         <el-table-column
           prop="operation"

+ 7 - 0
src/views/projectManage/ProjectManagement1_MakerSpace.vue

@@ -139,6 +139,13 @@
           align="center"
           >
         </el-table-column>
+
+        <el-table-column
+          prop="work"
+          label="项目组任务分工"
+          align="center"
+          >
+        </el-table-column>
         
         <el-table-column
           prop="operation"

+ 7 - 0
src/views/projectSettlement/components/projectSettlementDetailBase_MakerSpace.vue

@@ -143,6 +143,13 @@
           align="center"
           >
         </el-table-column>
+
+        <el-table-column
+          prop="work"
+          label="项目组任务分工"
+          align="center"
+          >
+        </el-table-column>
         
         <el-table-column
           prop="operation"

+ 84 - 30
src/views/resultShow/components/resultDetail_MakerSpace.vue

@@ -16,11 +16,19 @@
                     <div>学院:<span class="titleMessage">{{ TitleMessage.ClassName }}</span></div>
                     <div>分类:<span class="titleMessage">{{ TitleMessage.TypeName }} - {{ TitleMessage.TypeName=="学生创客项目"?TitleMessage.tn2==0?"创意组":"初创组":TitleMessage.tn2==0?"已建设":"待建设"}}</span></div>
                 </div>
+      
                 <div class="rsHead2Tit personListUL">
-                    <i class="iconfont icon-duoren1" style="margin-right: 10px;color: #3a78fc;"></i>
+                    <!-- 老师 -->
+                    <img src="@/assets/img/doctorialHat.svg" style="margin-right: 10px;width:25px;height: 25px;">
                     <div class="personListLI">
                         <span v-for="(item,index) in TitleMessage.teacher" :key="index">{{ item.name }}</span>
                     </div>
+                    <!-- 学生 -->
+                    <img src="@/assets/img/student.svg" style="margin: 0px 10px;width:25px;height: 25px;">
+                    <div class="personListLI">
+                        <span v-for="(item,index) in TitleMessage.student" :key="index">{{ item.name }}</span>
+                    </div>
+                    
                 </div>
             </div>
             <!-- <el-button class="backBtn" type="primary" @click="$router.back()">返回</el-button> -->
@@ -52,7 +60,7 @@
         <!--导航栏区域结束-->
         <!--内容区开始-->
             <!--基础信息开始-->
-            <!-- <div class="BaseMessage" v-show="pageState==0">
+            <div class="BaseMessage" v-show="pageState==0">
                 <div class="BaseTitle">
                     <span>项目基本内容</span>
                 </div>
@@ -70,11 +78,56 @@
                 <div class="brief">
                     <div class="brief_title">
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                        <span>成员</span>
+                        <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.course_student"
+                          :data="TitleMessage.student"
                           border
                           style="width: 100%">
                           <el-table-column
@@ -88,18 +141,19 @@
                             align="center">
                           </el-table-column>
                           <el-table-column
-                            prop="phone"
-                            align="center"
-                            label="联系电话">
+                            prop="age"
+                            label="年龄"
+                            align="center">
                           </el-table-column>
                           <el-table-column
-                            prop="score"
+                            prop="work"
                             align="center"
-                            label="学分">
+                            label="项目组任务分工">
                           </el-table-column>
                         </el-table>
                     </div>
                 </div>
+
                 <div class="brief" v-if="TitleMessage.brief!=''">
                     <div class="brief_title">
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
@@ -109,7 +163,7 @@
                         {{ TitleMessage.brief }}
                     </div>
                 </div>
-            </div> -->
+            </div>
             <!--基础信息结束-->
             <!--项目详细开始-->
             <div class="BaseMessage" v-show="pageState==1">
@@ -506,28 +560,28 @@
                     console.log(FormData)
                     //头部信息
                     this.TitleMessage = FormData[0][0]
+                    // 教师表格
                     this.TitleMessage['teacher'] = JSON.parse(this.TitleMessage['teacher'])
-
-
-                    // this.TitleMessage = FormData[0][0]
-                    // this.TitleMessage['course_student'] = JSON.parse(this.TitleMessage['course_student']);
+                    // 学生表格
+                    this.TitleMessage['student'] = JSON.parse(this.TitleMessage['student'])
                     // this.DetailMessage= JSON.parse(FormData[1][0]['chapters'])[0];
-                    // this.ProjectFile = JSON.parse(FormData[2][0]['projectFile'])
-                    // if(this.ProjectFile!=null)this.ProjectLookFile = this.ProjectFile[0] 
-                    // else this.ProjectLookFile = {url:'',type:""};
-                    // this.ProjectEndFile = JSON.parse(FormData[3][0]['endFile']);
-                    // if(this.ProjectEndFile!=null)this.ProjectEndLookFile = this.ProjectEndFile[0];
-                    // else this.ProjectEndLookFile = {url:"",type:""}
-                    // 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']);
-                    //             this.ActivityLookFile.push({url:item['reportFile'][0].url,fileName:item['reportFile'][0].fileName})
-                    //         }else this.ActivityLookFile.push({url:"",type:""})
-                    //     })
-                    // };
-                    // if(JSON.parse(FormData[5][0]['endProjectRemark'])!=null)this.endProjectRemark = JSON.parse(FormData[5][0]['endProjectRemark']);
+                    console.log(FormData[1][0])
+                    this.ProjectFile = JSON.parse(FormData[2][0]['projectFile'])
+                    if(this.ProjectFile!=null)this.ProjectLookFile = this.ProjectFile[0] 
+                    else this.ProjectLookFile = {url:'',type:""};
+                    this.ProjectEndFile = JSON.parse(FormData[3][0]['endFile']);
+                    if(this.ProjectEndFile!=null)this.ProjectEndLookFile = this.ProjectEndFile[0];
+                    else this.ProjectEndLookFile = {url:"",type:""}
+                    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']);
+                                this.ActivityLookFile.push({url:item['reportFile'][0].url,fileName:item['reportFile'][0].fileName})
+                            }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)

Неке датотеке нису приказане због велике количине промена