Q-ABAB 2 年之前
父節點
當前提交
253994d5ac

+ 2 - 1
src/views/projectManage/components/ProjectManagementEndProjectFile.vue

@@ -68,10 +68,11 @@
             title="展示文件"
             :visible.sync="showFile"
             width="80vw"
+            top="1vh"
             class="addDialog showDialog"
           >
       
-      <div class="showFileArea">
+      <div class="showFileArea" style="height: 80vh;">
         <!-- <vpdf v-if="/^\s*$/g.test(showFileUrl)&&showFileUrl.split('.')[showFileUrl.split('.').length-1]=='pdf'" :pdfUrl="showFileUrl"></vpdf> -->
         <vword
             style="width: 100%; height: 100%; overflow: auto"

+ 4 - 3
src/views/projectManage/components/ProjectManagementProjectFile.vue

@@ -29,7 +29,7 @@
 
         <el-table-column
           prop="fileName"
-          label="项目中期报告"
+          label="文件名称"
           align="center"
          >
         </el-table-column>
@@ -43,7 +43,7 @@
        
         <el-table-column
           prop="uploadTime"
-          label="时间"
+          label="上传时间"
           align="center"
           >
         </el-table-column>
@@ -67,11 +67,12 @@
       <el-dialog
             title="展示文件"
             :visible.sync="showFile"
+            top="1vh"
             width="80vw"
             class="addDialog showDialog"
           >
       
-      <div class="showFileArea">
+      <div class="showFileArea" style="height: 80vh;">
         <!-- <vpdf v-if="/^\s*$/g.test(showFileUrl)&&showFileUrl.split('.')[showFileUrl.split('.').length-1]=='pdf'" :pdfUrl="showFileUrl"></vpdf> -->
         <vword
             style="width: 100%; height: 100%; overflow: auto"

+ 6 - 8
src/views/resultShow/components/resultDetail_MakerSpace.vue

@@ -53,10 +53,10 @@
                 <i class="iconStyle iconfont icon-jiegou" style="color:#58c2fe;font-size:22px;margin-right: 7px;"></i>
                 <span>活动开展</span>
             </div>
-            <!-- <div  class="navLi" @click="pageState=3">
+            <div  class="navLi" @click="pageState=3">
                 <i class="iconStyle iconfont icon-wenjian" style="color:#58c2fe;font-size:22px;margin-right: 7px;"></i>
                 <span>项目附件</span>
-            </div> -->
+            </div>
             <div  class="navLi" @click="pageState=4">
                 <i class="iconStyle iconfont icon-baogao" style="color:#58c2fe;font-size:22px;margin-right: 7px;"></i>
                 <span>项目结题报告</span>
@@ -183,9 +183,7 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>一、建设内容(空间优化/场馆规划方面拟解决的关键问题及主要建设指标)</span>
                     </div>
-                    <div class="TextView" v-text="DetailMessage['Construction']">
-                        <!-- <VueEditor v-model="DetailMessage['Construction']" :disabled="true"></VueEditor> -->
-                    </div>
+                    <div class="TextView" v-text="DetailMessage['Construction']"></div>
                 </div>
 
                 <div class="BaseTitle" type="1">
@@ -431,7 +429,7 @@
             </div>
             <!-- 活动开展结束 -->
             <!-- 项目附件开始 -->
-            <!-- <div class="BaseMessage" v-show="pageState==3">
+            <div class="BaseMessage" v-show="pageState==3">
                 <div class="BaseTitle" type="3">
                     <span>项目附件</span>
                 </div>
@@ -463,7 +461,7 @@
                         </div>
                     </div>
                 </div>
-                </div> -->
+                </div>
             <!-- 项目附件结束 -->
             <!-- 项目中期报告开始 -->
             <div class="BaseMessage" v-show="pageState==4">
@@ -556,7 +554,7 @@
                     //项目详细
                     this.DetailMessage = JSON.parse(FormData[1][0]['chapters']);
                     // //项目附件
-                    // this.ProjectFile = JSON.parse(FormData[2][0]['projectFile'])
+                    this.ProjectFile = JSON.parse(FormData[2][0]['projectFile'])
                     if(this.ProjectFile!=null)this.ProjectLookFile = this.ProjectFile[0] 
                     else this.ProjectLookFile = {url:'',type:""};
                     //项目结题附件

+ 7 - 7
src/views/resultShow/components/resultDetail_student.vue

@@ -50,10 +50,10 @@
                 <i class="iconStyle iconfont icon-jiegou" style="color:#58c2fe;font-size:22px;margin-right: 7px;"></i>
                 <span>活动开展</span>
             </div>
-            <!-- <div  class="navLi" @click="pageState=3">
+            <div  class="navLi" @click="pageState=3">
                 <i class="iconStyle iconfont icon-wenjian" style="color:#58c2fe;font-size:22px;margin-right: 7px;"></i>
                 <span>项目附件</span>
-            </div> -->
+            </div>
             <div  class="navLi" @click="pageState=4">
                 <i class="iconStyle iconfont icon-baogao" style="color:#58c2fe;font-size:22px;margin-right: 7px;"></i>
                 <span>项目结题报告</span>
@@ -468,7 +468,7 @@
             </div>
             <!-- 活动开展结束 -->
             <!-- 项目附件开始 -->
-            <!-- <div class="BaseMessage" v-show="pageState==3">
+            <div class="BaseMessage" v-show="pageState==3">
                 <div class="BaseTitle" type="3">
                     <span>项目附件</span>
                 </div>
@@ -500,7 +500,7 @@
                         </div>
                     </div>
                 </div>
-                </div> -->
+                </div>
 
             <!-- 项目中期报告开始 -->
             <div class="BaseMessage" v-show="pageState==4">
@@ -659,9 +659,9 @@
                 //    this.loading = false;
 
                     //项目附件
-                    // this.ProjectFile = JSON.parse(FormData[2][0]['projectFile'])
-                    // if(this.ProjectFile!=null)this.ProjectLookFile = this.ProjectFile[0] 
-                    // else this.ProjectLookFile = {url:'',type:""};
+                    this.ProjectFile = JSON.parse(FormData[2][0]['projectFile'])
+                    if(this.ProjectFile!=null)this.ProjectLookFile = this.ProjectFile[0] 
+                    else this.ProjectLookFile = {url:'',type:""};
                     //项目结题附件
                     this.ProjectEndFile = FormData[3][0]['endFile']!=''?JSON.parse(FormData[3][0]['endFile']):'';
                     if(this.ProjectEndFile!=null && this.ProjectEndFile!='')this.ProjectEndLookFile = this.ProjectEndFile[0];