成果展示完成

src/views/resultShow/components/resultDetail_MakerSpace.vue

@@ -75,6 +75,48 @@
                         <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 style="width: 100%;margin-top: 10px;" :column="3" border>
+                      <el-descriptions-item>
+                        <template slot="label">
+                          
+                        </template>
+                        {{ TitleMessage['beginTime'] }}
+                      </el-descriptions-item>
+                      <el-descriptions-item>
+                        <template slot="label">
+                          <i class="el-icon-mobile-phone"></i>
+                          手机号
+                        </template>
+                        18100000000
+                      </el-descriptions-item>
+                      <el-descriptions-item>
+                        <template slot="label">
+                          <i class="el-icon-location-outline"></i>
+                          居住地
+                        </template>
+                        苏州市
+                      </el-descriptions-item>
+                      <el-descriptions-item>
+                        <template slot="label">
+                          <i class="el-icon-tickets"></i>
+                          备注
+                        </template>
+                        <el-tag size="small">学校</el-tag>
+                      </el-descriptions-item>
+                      <el-descriptions-item>
+                        <template slot="label">
+                          <i class="el-icon-office-building"></i>
+                          联系地址
+                        </template>
+                        江苏省苏州市吴中区吴中大道 1188 号
+                      </el-descriptions-item>
+                    </el-descriptions>
+                </div> -->
                 <div class="brief">
                     <div class="brief_title">
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
@@ -171,22 +213,99 @@
                     <span>项目详细</span>
                 </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[0]" :disabled="true"></VueEditor>
+                        <VueEditor v-model="DetailMessage['Construction']" :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 style="font-size: 16px;">一、立项依据 （说明本项目的目的、意义以及国内外高校现状、市场预测和发展趋势，预期达到的目标，研究的预期效果分析，成果受益面）</span>
+                    </div>
+                    <div class="TextView" >
+                        <VueEditor v-model="DetailMessage['ProjectBasis']" :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>
+                    </div>
+                    <div class="TextView" >
+                        <VueEditor v-model="DetailMessage['development']" :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['studio']" :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['studentTeam']" :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['studentActivities']" :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['Transforming']" :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['condition']" :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>
@@ -221,7 +340,7 @@
                     <div class="TextView" >
                         <VueEditor v-model="DetailMessage[4]" :disabled="true"></VueEditor>
                     </div>
-                </div>
+                </div> -->
             </div>
             <!-- 项目详细结束 -->
             <!-- 活动开展开始 -->
@@ -559,13 +678,13 @@
                     let FormData = res.data;
                     console.log(FormData)
                     //头部信息
-                    this.TitleMessage = FormData[0][0]
+                    this.TitleMessage = FormData[0][0];
                     // 教师表格
-                    this.TitleMessage['teacher'] = JSON.parse(this.TitleMessage['teacher'])
+                    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.TitleMessage['student'] = JSON.parse(this.TitleMessage['student']);
+                    //项目详细
+                    this.DetailMessage = JSON.parse(FormData[1][0]['chapters']);
                     this.ProjectFile = JSON.parse(FormData[2][0]['projectFile'])
                     if(this.ProjectFile!=null)this.ProjectLookFile = this.ProjectFile[0] 
                     else this.ProjectLookFile = {url:'',type:""};