Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/views/resultShow/resultShowDetail.vue

@@ -13,7 +13,7 @@
                 </div>
                 <div class="rsHead3Tit rsHead2Tit">
                     <div>学院：<span class="titleMessage">{{ TitleMessage.ClassName }}</span></div>
-                    <div>分类：<span class="titleMessage">{{ TitleMessage.TypeName }}</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>
@@ -387,7 +387,7 @@
 
             <!-- 项目中期报告开始 -->
             <div class="BaseMessage" v-show="pageState==4">
-                <div class="BaseTitle">
+                <!-- <div class="BaseTitle">
                     <span>结项评价</span>
                 </div>
                 <div class="brief">
@@ -399,7 +399,6 @@
                         <div class="TextView">
                             {{ endProjectRemark['kRem'] }}
                         </div>
-                        <!-- <VueEditor v-model="DetailMessage[0]" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
                 <div class="brief">
@@ -411,7 +410,6 @@
                         <div class="TextView">
                             {{ endProjectRemark["bRem"] }}
                         </div>
-                        <!-- <VueEditor v-model="DetailMessage[0]" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
                 <div class="brief">
@@ -423,9 +421,8 @@
                         <div class="TextView">
                             {{ endProjectRemark["xRem"] }}
                         </div>
-                        <!-- <VueEditor v-model="DetailMessage[0]" :disabled="true"></VueEditor> -->
                     </div>
-                </div>
+                </div> -->
                 
                 <div class="BaseTitle" type="5">
                     <span>项目结题报告</span>
@@ -503,6 +500,7 @@
                     pid:this.$route.query["Id"]
                 }).then(res=>{
                     let FormData = res.data;
+                    console.log(FormData)
                     this.TitleMessage = FormData[0][0]
                     this.TitleMessage['course_student'] = JSON.parse(this.TitleMessage['course_student']);
                     this.DetailMessage= JSON.parse(FormData[1][0]['chapters'])[0];
@@ -512,7 +510,6 @@
                     this.ProjectEndFile = JSON.parse(FormData[3][0]['endFile']);
                     if(this.ProjectEndFile!=null)this.ProjectEndLookFile = this.ProjectEndFile[0];
                     else this.ProjectEndLookFile = {url:"",type:""}
-                    console.log(FormData[4])
                     if(FormData[4][0]['title']!=null){
                         this.AllActivity = FormData[4]
                         this.AllActivity.forEach(item=>{
@@ -594,7 +591,7 @@
             }
         }
         .headerConcent{
-            width: 400px;
+            width: 500px;
             height: 130px;
             display: flex;
             flex-direction: column;