yuanyiming 1 年之前
父節點
當前提交
13d86e6def
共有 2 個文件被更改,包括 132 次插入70 次删除
  1. 6 6
      src/router/index.js
  2. 126 64
      src/views/resultShow/components/resultDetail_student.vue

+ 6 - 6
src/router/index.js

@@ -186,12 +186,12 @@ const routes = [{
             //     component: () =>import ('@/views/projectManage/ProjectManagement4.vue'),
             //     meta: { isAuth: true }
             // },
-            // {
-            //     name: 'ProjectManagement3_1',
-            //     path: '/ProjectManagement3_1',
-            //     component: () =>import ('@/views/projectManage/ProjectManagement3_1.vue'),
-            //     meta: { isAuth: true }
-            // },
+            {
+                name: 'ProjectManagement3_1',
+                path: '/ProjectManagement3_1',
+                component: () =>import ('@/views/projectManage/ProjectManagement3_1.vue'),
+                meta: { isAuth: true }
+            },
             // { //项目管理
             //     name: 'ProjectManagement5',
             //     path: '/ProjectManagement5',

+ 126 - 64
src/views/resultShow/components/resultDetail_student.vue

@@ -75,6 +75,18 @@
                         <span>{{ TitleMessage.EndTime }}</span>
                     </div>
                 </div>
+                <div class="brief">
+                    <div class="brief_title">
+                        <img src="@/assets/anliDetail/jdTitle.png" alt="">
+                        <span>项目基础信息</span>
+                    </div>
+                    <el-descriptions>
+                        <el-descriptions-item label="优先支持项目">{{ TitleMessage.multiSelectProject }}</el-descriptions-item>
+                        <el-descriptions-item label="美丽校园改造项目">{{ TitleMessage.schoolRemould }}</el-descriptions-item>
+                        <el-descriptions-item label="项目申请人">{{ TitleMessage.projectApplyperson }}</el-descriptions-item>
+                        <el-descriptions-item label="联系电话">{{ TitleMessage.phone }}</el-descriptions-item>
+                    </el-descriptions>
+                </div>
                 <div class="brief">
                     <div class="brief_title">
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
@@ -91,30 +103,15 @@
                             align="center">
                           </el-table-column>
                           <el-table-column
-                            prop="speciality"
-                            label="专业"
+                            prop="class"
+                            label="学院/班级/姓名"
                             align="center">
                           </el-table-column>
                           <el-table-column
-                            prop="title"
-                            label="职称"
+                            prop="division"
+                            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>
@@ -141,15 +138,10 @@
                             align="center">
                           </el-table-column>
                           <el-table-column
-                            prop="age"
-                            label="年龄"
+                            prop="division"
+                            label="活动分工"
                             align="center">
-                          </el-table-column>
-                          <el-table-column
-                            prop="work"
-                            align="center"
-                            label="项目组任务分工">
-                          </el-table-column>
+                          </el-table-column>                        
                         </el-table>
                     </div>
                 </div>
@@ -168,58 +160,128 @@
             <!--项目详细开始-->
             <div class="BaseMessage" v-show="pageState==1">
                 <div class="BaseTitle" type="1">
-                    <span>项目详细</span>
+                    <span>研发内容</span>
                 </div>
 
                 <div class="brief">
                     <div class="brief_title" type="1.1">
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                        
-                        <span>项目创新点</span>
+                        <span>一、项目研发背景</span>
+                    </div>
+                    <div class="TextView" >
+                        <VueEditor v-model="DetailMessage['back']" :disabled="true"></VueEditor>
+                    </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" >
+                        <VueEditor v-model="DetailMessage['innovate']" :disabled="true"></VueEditor>
+                    </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" >
+                        <VueEditor v-model="DetailMessage['path']" :disabled="true"></VueEditor>
+                    </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" >
+                        <VueEditor v-model="DetailMessage['scene']" :disabled="true"></VueEditor>
+                    </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" >
-                        <VueEditor v-model="DetailMessage[0]" :disabled="true"></VueEditor>
+                        <VueEditor v-model="DetailMessage['worth']" :disabled="true"></VueEditor>
                     </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" >
+                        <VueEditor v-model="DetailMessage['team']" :disabled="true"></VueEditor>
+                    </div>
+                </div>
 
                 <div class="BaseTitle" type="1">
-                    <span>预期取得成果</span>
+                    <span>研发成本</span>
                 </div>
                 <div class="brief">
                     <div class="brief_title" type="1.1">
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                        <span>一、项目预期成果、数量及形式</span>
+                        <span>一、研发成本来源及构成</span>
                     </div>
                     <div class="TextView" >
-                        <VueEditor v-model="DetailMessage[1]" :disabled="true"></VueEditor>
+                        <VueEditor v-model="DetailMessage['cost']" :disabled="true"></VueEditor>
                     </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>
+                        <span>一、项目预期成果、数量及形式(产品原型/发明专利/双创竞赛/成果转化/社会效益)</span>
                     </div>
                     <div class="TextView" >
-                        <VueEditor v-model="DetailMessage[2]" :disabled="true"></VueEditor>
+                        <VueEditor v-model="DetailMessage['expectResults']" :disabled="true"></VueEditor>
                     </div>
                 </div>
                 <div class="brief">
                     <div class="brief_title" type="1.1">
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                        <span>三、项目预期孵化、转化创业项目情况</span>
+                        <span>二、学生创客人才培养预期成果、数量(教师填写)</span>
                     </div>
                     <div class="TextView" >
-                        <VueEditor v-model="DetailMessage[3]" :disabled="true"></VueEditor>
+                        <VueEditor v-model="DetailMessage['expectResultsTeacher']" :disabled="true"></VueEditor>
                     </div>
                 </div>
                 <div class="brief">
                     <div class="brief_title" type="1.1">
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                        <span>项目实施计划</span>
+                        <span>三、项目预期孵化、转化创业项目情况</span>
+                    </div>
+                    <div class="TextView" >
+                        <VueEditor v-model="DetailMessage['expectConversion']" :disabled="true"></VueEditor>
                     </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" >
-                        <VueEditor v-model="DetailMessage[4]" :disabled="true"></VueEditor>
+                        <VueEditor v-model="DetailMessage['plan']" :disabled="true"></VueEditor>
                     </div>
                 </div>
             </div>
@@ -560,31 +622,31 @@
                     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'])[0];
-                //     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.TitleMessage['teacher'] = JSON.parse(this.TitleMessage['teacher'])
+                    // 学生表格
+                    this.TitleMessage['student'] = JSON.parse(this.TitleMessage['student'])
+                    this.DetailMessage= JSON.parse(FormData[1][0]['chapters']);
+                    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)
+                }).catch(err=>{
+                    console.log(err)
                 })
                 
             },