Q-ABAB vor 2 Jahren
Ursprung
Commit
86f90896d1

+ 28 - 147
src/views/resultShow/components/resultDetail_MakerSpace.vue

@@ -75,48 +75,6 @@
                         <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="">
@@ -201,8 +159,7 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>简介</span>
                     </div>
-                    <div class="TextView">
-                        {{ TitleMessage.brief }}
+                    <div class="TextView" v-text="TitleMessage.brief">
                     </div>
                 </div>
             </div>
@@ -221,8 +178,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>一、建设内容(空间优化/场馆规划方面拟解决的关键问题及主要建设指标)</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['Construction']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['Construction']">
+                        <!-- <VueEditor v-model="DetailMessage['Construction']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -234,8 +191,8 @@
                         <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 class="TextView" v-text="DetailMessage['ProjectBasis']">
+                        <!-- <VueEditor v-model="DetailMessage['ProjectBasis']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -247,8 +204,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>一、创客空间物理环境、制度建设及软件设施建设情况(环境优化/制度完善/设施改造)</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['development']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['development']">
+                        <!-- <VueEditor v-model="DetailMessage['development']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
                 <div class="brief">
@@ -256,8 +213,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>二、学生创客工作室建设情况(工作室数量及活动开展情况)</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['studio']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['studio']">
+                        <!-- <VueEditor v-model="DetailMessage['studio']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
                 <div class="brief">
@@ -265,8 +222,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>三、学生创客团队(人才)培养预期成果、数量</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['studentTeam']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['studentTeam']">
+                        <!-- <VueEditor v-model="DetailMessage['studentTeam']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
                 <div class="brief">
@@ -274,8 +231,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>四、学生创客活动组织实施情况</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['studentActivities']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['studentActivities']">
+                        <!-- <VueEditor v-model="DetailMessage['studentActivities']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
                 <div class="brief">
@@ -283,8 +240,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>五、学生创客团队孵化、转化创业项目情况</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['Transforming']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['Transforming']">
+                        <!-- <VueEditor v-model="DetailMessage['Transforming']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -296,51 +253,10 @@
                         <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>
-                    </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage[1]" :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[2]" :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[3]" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['condition']">
+                        <!-- <VueEditor v-model="DetailMessage['condition']" :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[4]" :disabled="true"></VueEditor>
-                    </div>
-                </div> -->
             </div>
             <!-- 项目详细结束 -->
             <!-- 活动开展开始 -->
@@ -444,8 +360,8 @@
                                 <img src="@/assets/anliDetail/proOverTwo.png" alt="">
                                 <span>活动简介</span>
                             </div>
-                            <div class="TextView">
-                                {{ item.brief }}
+                            <div class="TextView" v-text="item.brief">
+                                <!-- {{ item.brief }} -->
                             </div>
 
                             <div class="brief_title MarginTop30px">
@@ -453,8 +369,8 @@
                                 <i class="el-icon-edit-outline"></i>
                                 <span>活动计划</span>
                             </div>
-                            <div class="TextView" >
-                                <VueEditor v-model="JSON.parse(item.chapters)[0]" :disabled="true"></VueEditor>
+                            <div class="TextView" v-text="JSON.parse(item.chapters)[0]">
+                                <!-- <VueEditor v-model="JSON.parse(item.chapters)[0]" :disabled="true"></VueEditor> -->
                             </div>
 
                             <div class="brief_title MarginTop30px">
@@ -462,8 +378,8 @@
                                 <i class="el-icon-data-line"></i>
                                 <span>预期目标</span>
                             </div>
-                            <div class="TextView" >
-                                <VueEditor v-model="JSON.parse(item.chapters)[1]" :disabled="true"></VueEditor>
+                            <div class="TextView" v-text="JSON.parse(item.chapters)[1]">
+                                <!-- <VueEditor v-model="JSON.parse(item.chapters)[1]" :disabled="true"></VueEditor> -->
                             </div>
 
                             <div class="brief_title MarginTop30px">
@@ -471,8 +387,8 @@
                                 <i class="el-icon-pie-chart"></i>
                                 <span>活动受面</span>
                             </div>
-                            <div class="TextView" >
-                                <VueEditor v-model="JSON.parse(item.chapters)[2]" :disabled="true"></VueEditor>
+                            <div class="TextView" v-text="JSON.parse(item.chapters)[2]">
+                                <!-- <VueEditor v-model="JSON.parse(item.chapters)[2]" :disabled="true"></VueEditor> -->
                             </div>
 
                             <div class="brief_title MarginTop30px">
@@ -480,8 +396,8 @@
                                 <i class="el-icon-money"></i>
                                 <span>经费支出计划</span>
                             </div>
-                            <div class="TextView" >
-                                <VueEditor v-model="JSON.parse(item.chapters)[3]" :disabled="true"></VueEditor>
+                            <div class="TextView" v-text="JSON.parse(item.chapters)[3]">
+                                <!-- <VueEditor v-model="JSON.parse(item.chapters)[3]" :disabled="true"></VueEditor> -->
                             </div>
                             <div class="brief_title MarginTop30px" v-if="ActivityLookFile[index].url!=''">
                                 <img src="@/assets/anliDetail/jdTitle.png" alt="">
@@ -561,42 +477,6 @@
 
             <!-- 项目中期报告开始 -->
             <div class="BaseMessage" v-show="pageState==4">
-                <!-- <div class="BaseTitle">
-                    <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" >
-                        <div class="TextView">
-                            {{ endProjectRemark['kRem'] }}
-                        </div>
-                    </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" >
-                        <div class="TextView">
-                            {{ endProjectRemark["bRem"] }}
-                        </div>
-                    </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" >
-                        <div class="TextView">
-                            {{ endProjectRemark["xRem"] }}
-                        </div>
-                    </div>
-                </div> -->
                 
                 <div class="BaseTitle" type="5">
                     <span>项目结题报告</span>
@@ -904,6 +784,7 @@
         }
         .TextView{
             width: 100%;
+            min-height: 200px;
             box-sizing: border-box;
             padding: 10px;
             border-radius: 5px;

+ 35 - 34
src/views/resultShow/components/resultDetail_student.vue

@@ -162,8 +162,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>简介</span>
                     </div>
-                    <div class="TextView">
-                        {{ TitleMessage.brief }}
+                    <div class="TextView" v-text="TitleMessage.brief">
+                        <!-- {{ TitleMessage.brief }} -->
                     </div>
                 </div>
             </div>
@@ -179,8 +179,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>一、项目研发背景</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['back']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['back']">
+                        <!-- <VueEditor v-model="DetailMessage['back']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -189,8 +189,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>二、项目创新点</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['innovate']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['innovate']">
+                        <!-- <VueEditor v-model="DetailMessage['innovate']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -199,8 +199,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>三、技术研发路线</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['path']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['path']">
+                        <!-- <VueEditor v-model="DetailMessage['path']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -209,8 +209,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>四、项目应用场景</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['scene']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['scene']">
+                        <!-- <VueEditor v-model="DetailMessage['scene']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -222,8 +222,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>一、项目商业模式/社会价值</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['worth']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['worth']">
+                        <!-- <VueEditor v-model="DetailMessage['worth']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -235,8 +235,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>一、团队构成及优势</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['team']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['team']">
+                        <!-- <VueEditor v-model="DetailMessage['team']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -248,8 +248,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>一、研发成本来源及构成</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['cost']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['cost']">
+                        <!-- <VueEditor v-model="DetailMessage['cost']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -261,8 +261,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>一、项目预期成果、数量及形式(产品原型/发明专利/双创竞赛/成果转化/社会效益)</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['expectResults']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['expectResults']">
+                        <!-- <VueEditor v-model="DetailMessage['expectResults']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
                 <div class="brief">
@@ -270,8 +270,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>二、学生创客人才培养预期成果、数量(教师填写)</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['expectResultsTeacher']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['expectResultsTeacher']">
+                        <!-- <VueEditor v-model="DetailMessage['expectResultsTeacher']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
                 <div class="brief">
@@ -279,8 +279,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>三、项目预期孵化、转化创业项目情况</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['expectConversion']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['expectConversion']">
+                        <!-- <VueEditor v-model="DetailMessage['expectConversion']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
                 <div class="BaseTitle" type="1">
@@ -291,8 +291,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>三、项目预期孵化、转化创业项目情况</span>
                     </div> -->
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['plan']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['plan']">
+                        <!-- <VueEditor v-model="DetailMessage['plan']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
             </div>
@@ -398,8 +398,8 @@
                                 <img src="@/assets/anliDetail/proOverTwo.png" alt="">
                                 <span>活动简介</span>
                             </div>
-                            <div class="TextView">
-                                {{ item.brief }}
+                            <div class="TextView" v-text="item.brief">
+                                <!-- {{ item.brief }} -->
                             </div>
 
                             <div class="brief_title MarginTop30px">
@@ -407,8 +407,8 @@
                                 <i class="el-icon-edit-outline"></i>
                                 <span>活动计划</span>
                             </div>
-                            <div class="TextView" >
-                                <VueEditor v-model="JSON.parse(item.chapters)[0]" :disabled="true"></VueEditor>
+                            <div class="TextView" v-text="JSON.parse(item.chapters)[0]">
+                                <!-- <VueEditor v-model="JSON.parse(item.chapters)[0]" :disabled="true"></VueEditor> -->
                             </div>
 
                             <div class="brief_title MarginTop30px">
@@ -416,8 +416,8 @@
                                 <i class="el-icon-data-line"></i>
                                 <span>预期目标</span>
                             </div>
-                            <div class="TextView" >
-                                <VueEditor v-model="JSON.parse(item.chapters)[1]" :disabled="true"></VueEditor>
+                            <div class="TextView" v-text="JSON.parse(item.chapters)[1]">
+                                <!-- <VueEditor v-model="JSON.parse(item.chapters)[1]" :disabled="true"></VueEditor> -->
                             </div>
 
                             <div class="brief_title MarginTop30px">
@@ -425,8 +425,8 @@
                                 <i class="el-icon-pie-chart"></i>
                                 <span>活动受面</span>
                             </div>
-                            <div class="TextView" >
-                                <VueEditor v-model="JSON.parse(item.chapters)[2]" :disabled="true"></VueEditor>
+                            <div class="TextView" v-text="JSON.parse(item.chapters)[2]">
+                                <!-- <VueEditor v-model="JSON.parse(item.chapters)[2]" :disabled="true"></VueEditor> -->
                             </div>
 
                             <div class="brief_title MarginTop30px">
@@ -434,8 +434,8 @@
                                 <i class="el-icon-money"></i>
                                 <span>经费支出计划</span>
                             </div>
-                            <div class="TextView" >
-                                <VueEditor v-model="JSON.parse(item.chapters)[3]" :disabled="true"></VueEditor>
+                            <div class="TextView" v-text="JSON.parse(item.chapters)[3]">
+                                <!-- <VueEditor v-model="JSON.parse(item.chapters)[3]" :disabled="true"></VueEditor> -->
                             </div>
                             <div class="brief_title MarginTop30px" v-if="ActivityLookFile[index].url!=''">
                                 <img src="@/assets/anliDetail/jdTitle.png" alt="">
@@ -861,6 +861,7 @@
         }
         .TextView{
             width: 100%;
+            min-height: 200px;
             box-sizing: border-box;
             padding: 10px;
             border-radius: 5px;