#

src/components/studentMakerProjectPreview.vue

@@ -3,7 +3,7 @@
       <div id="title">
         <div class="school">深圳技师学院</div>
         <div class="wordTitle">学 生 创 客 项 目 申 报 书</div>
-        <div class="date">申请日期：年 月 {{wordData['day']}}日</div>
+        <div class="date">申请日期：{{wordData['year']}}年 {{wordData['month']}}月 {{wordData['day']}}日</div>
       </div>
       <div id="table">
         <div class="han">
@@ -57,9 +57,9 @@
           <div class="label">计划完成时间</div><div class="value" style="width: 20%;">{{ wordData.plannedEnd_at }}</div>
         </div>
         <div class="han">
-          <div class="label">项 目 组 人 数</div><div class="value">{{ wordData.studentNum }}</div>
-          <div class="label">参与学生人数</div><div class="value">{{ wordData.plannedEnd_at }}</div>
-          <div class="label">参与教师人数</div><div class="value">{{ wordData.plannedEnd_at }}</div>
+          <div class="label">项 目 组 人 数</div><div class="value">{{ wordData.studentNum + wordData.teacherNum }}</div>
+          <div class="label">参与学生人数</div><div class="value">{{ wordData.studentNum }}</div>
+          <div class="label">参与教师人数</div><div class="value">{{ wordData.teacherNum }}</div>
         </div>
         <div class="member">
           <div class="memberLabel">
@@ -72,10 +72,10 @@
               <div class="memberValue">所在学院/部门/专业</div>
               <div class="memberValue">项目组角色分工</div>
             </div>
-            <div class="memberHan" v-for="(item,index) in 2" :key="index">
-              <div class="memberValue" style="width: 9.2%;">nihao</div>
-              <div class="memberValue"></div>
-              <div class="memberValue"></div>
+            <div class="memberHan" v-for="(item,index) in wordData.teacher" :key="index">
+              <div class="memberValue" style="width: 9.2%;">{{ item.name }}</div>
+              <div class="memberValue">{{ item.class }}</div>
+              <div class="memberValue">{{ item.division }}</div>
             </div>
             <!-- <div class="memberHan" v-for="(item,index) in wordData['teacher']" :key="index">
               <div class="memberValue">{{item['name']}}</div>
@@ -98,10 +98,10 @@
               <div class="memberValue">所在学院/部门/专业</div>
               <div class="memberValue">项目组角色分工</div>
             </div>
-            <div class="memberHan" v-for="(item,index) in 2" :key="index">
-              <div class="memberValue" style="width: 9.2%;">nihao</div>
-              <div class="memberValue"></div>
-              <div class="memberValue"></div>
+            <div class="memberHan" v-for="(item,index) in wordData.student" :key="index">
+              <div class="memberValue" style="width: 9.2%;">{{ item.name }}</div>
+              <div class="memberValue">{{ item.class }}</div>
+              <div class="memberValue">{{ item.division }}</div>
             </div>
 
             <!-- <div class="memberHan" v-for="(item,index) in wordData['student']" :key="index">
@@ -119,23 +119,23 @@
           <div class="chaptersTable">
               <div class="chaptersValue">
                 <span>项目简介(200-300字)</span><br/>
-                
+                {{ wordData.brief }}
               </div>
               <div class="chaptersValue">
                 <span>项目研发背景</span><br/>
-
+                {{ wordData.back }}
               </div>
               <div class="chaptersValue">
                 <span>项目创新点</span><br/>
-
+                {{ wordData.innovate }}
               </div>
               <div class="chaptersValue">
                 <span>技术研发路线</span><br/>
-
+                {{ wordData.path }}
               </div>
               <div class="chaptersValue">
                 <span>项目应用场景</span><br/>
-
+                {{ wordData.scene }}
               </div>
           </div>
         </div>
@@ -146,7 +146,7 @@
           <div class="chaptersTable">
               <div class="chaptersValue">
                 <span>项目商业模式/社会价值</span><br/>
-                
+                {{ wordData.worth }}
               </div>
           </div>
         </div>
@@ -157,7 +157,7 @@
           <div class="chaptersTable">
               <div class="chaptersValue">
                 <span>团队构成及优势</span><br/>
-                
+                {{ wordData.team }}
               </div>
           </div>
         </div>
@@ -168,7 +168,7 @@
           <div class="chaptersTable">
               <div class="chaptersValue">
                 <span>研发成本来源及构成</span><br/>
-                
+                {{ wordData.cost }}
               </div>
           </div>
         </div>
@@ -179,23 +179,19 @@
           <div class="chaptersTable">
               <div class="chaptersValue">
                 <span>项目预期成果、数量及形式（产品原型/发明专利/双创竞赛/成果转化/社会效益</span><br/>
-                
-              </div>
-              <div class="chaptersValue">
-                <span>学生创客工作室建设情况（工作室数量及活动开展情况）</span><br/>
-                
+                {{ wordData.expectResults }}
               </div>
               <div class="chaptersValue">
                 <span>学生创客人才培养预期成果、数量（教师填写）</span><br/>
-                
+                {{ wordData.expectResultsTeacher }}
               </div>
               <div class="chaptersValue">
                 <span>学生创客活动组织实施情况</span><br/>
-               
+                {{ wordData.brief }}
               </div>
               <div class="chaptersValue">
                 <span>项目预期孵化、转化创业项目情况</span><br/>
-               
+                {{ wordData.expectConversion }}
               </div>
           </div>
         </div>
@@ -206,20 +202,20 @@
           <div class="chaptersTable">
               <div class="chaptersValue">
                 <span>实施计划</span><br/>
-                
+                {{ wordData.plan }}
               </div>
           </div>
         </div>
 
         <!-- <div class="fund" v-for="(item,index) in wordData['fund']" :key="index"> -->
-        <div class="fund">
+        <div class="fund" v-if="wordData.fund[0]">
           <div class="fundTitle">
             预算<br/>经费
           </div>
           <div class="fundTable">
             <div class="fundTotal">
               <div class="fundLabel">总经费</div>
-              <div class="fundValue">元</div>
+              <div class="fundValue">{{ wordData.fund[0].total }}元</div>
             </div>
             <div class="fundHeader">
               <div class="HeaderLabel">支出类别</div>
@@ -232,26 +228,26 @@
               <div class="fundDataHan">
                 <div class="fundDataLie">
                   <div class="fundDataValue">小型仪器设备费</div>
-                  <div class="fundDataValue"></div>
-                  <div class="fundDataValue"></div>
+                  <div class="fundDataValue">{{ wordData.fund[0].device }}</div>
+                  <div class="fundDataValue">{{ wordData.fund[0].deviceRemarks }}</div>
                 </div>
 
                 <div class="fundDataLie">
                   <div class="fundDataValue">材料费</div>
-                  <div class="fundDataValue"></div>
-                  <div class="fundDataValue"></div>
+                  <div class="fundDataValue">{{ wordData.fund[0].Material }}</div>
+                  <div class="fundDataValue">{{ wordData.fund[0].MaterialRemarks }}</div>
                 </div>
 
                 <div class="fundDataLie">
                   <div class="fundDataValue">测试化验加工费</div>
-                  <div class="fundDataValue"></div>
-                  <div class="fundDataValue"></div>
+                  <div class="fundDataValue">{{ wordData.fund[0].processing }}</div>
+                  <div class="fundDataValue">{{ wordData.fund[0].processingRemarks }}</div>
                 </div>
 
                 <div class="fundDataLie">
                   <div class="fundDataValue">项目协作费</div>
-                  <div class="fundDataValue"></div>
-                  <div class="fundDataValue"></div>
+                  <div class="fundDataValue">{{ wordData.fund[0].Collaboration }}</div>
+                  <div class="fundDataValue">{{ wordData.fund[0].CollaborationRemarks }}</div>
                 </div>
                
               </div>
@@ -262,26 +258,26 @@
               <div class="fundDataHan">
                 <div class="fundDataLie">
                   <div class="fundDataValue">项目成果鉴定费</div>
-                  <div class="fundDataValue"></div>
-                  <div class="fundDataValue"></div>
+                  <div class="fundDataValue">{{ wordData.fund[0].APPRAISAL }}</div>
+                  <div class="fundDataValue">{{ wordData.fund[0].APPRAISALRemarks }}</div>
                 </div>
 
                 <div class="fundDataLie">
                   <div class="fundDataValue">参展参赛费</div>
-                  <div class="fundDataValue"></div>
-                  <div class="fundDataValue"></div>
+                  <div class="fundDataValue">{{ wordData.fund[0].entery }}</div>
+                  <div class="fundDataValue">{{ wordData.fund[0].enteryRemarks }}</div>
                 </div>
 
                 <div class="fundDataLie">
                   <div class="fundDataValue">创客交流活动费</div>
-                  <div class="fundDataValue"></div>
-                  <div class="fundDataValue"></div>
+                  <div class="fundDataValue">{{ wordData.fund[0].activitiesRemarks }}</div>
+                  <div class="fundDataValue">{{ wordData.fund[0].activitiesRemarks }}</div>
                 </div>
 
                 <div class="fundDataLie">
                   <div class="fundDataValue">知识产权事务费</div>
-                  <div class="fundDataValue"></div>
-                  <div class="fundDataValue"></div>
+                  <div class="fundDataValue">{{ wordData.fund[0].Transaction }}</div>
+                  <div class="fundDataValue">{{ wordData.fund[0].TransactionRemarks }}</div>
                 </div>
                
               </div>
@@ -336,9 +332,9 @@ export default {
     return {
       // data:{},
       wordData:{
-        // year:"",  //申请日期年
-        // month:"",   //申请日期月
-        // day:"",     //申请日期日
+        year:"",  //申请日期年
+        month:"",   //申请日期月
+        day:"",     //申请日期日
         ing:"", //创意组
         ed:"",  //初创组
         projectName:"",//项目名称
@@ -356,7 +352,19 @@ export default {
         studentNum:"",//参与学生人数
         teacher:[],   //教师组//name：姓名  speciality：专业  title：职称 education：学历    section：所在教研室    work：项目组角色分工
         student:[],   //学生组//name：姓名    class：班级 age：年龄   work：项目组任务分工
-        // brief:"",//项目简介
+        brief:"",//项目简介
+        back:'',
+        innovate:'',
+        path:'',
+        scene:'',
+        worth:'',
+        team:'',
+        cost:'',
+        expectResults:'',
+        expectResultsTeacher:'',
+        expectConversion:'',
+        plan:'',
+
         // Construction:"",//建设内容
         // ProjectBasis:"",//立项依据
         // development:"",//创客空间物理环境、制度建设及软件设施建设情况
@@ -365,7 +373,7 @@ export default {
         // studentActivities:"",//学生创客活动组织实施情况
         // Transforming:"",//学生创客团队孵化、转化创业项目情况
         // condition:"",//立 项基 础及条 件
-        // fund:[],//预算经费
+        fund:[],//预算经费
         //total：总经费     
         //小型仪器设备费：device        deviceRemarks
         //材料费：Material             MaterialRemarks
@@ -383,96 +391,97 @@ export default {
       //处理项目数据
       // return console.log(this.data);
       let data = this.data[0];
-      console.log(this.data);
+      // console.log(data);
 
       let nowDate = getNowDate().split(' ')[0]
-      // console.log(nowDate);
+      console.log(nowDate);
       // return console.log(data);
-      // let fund = this.data[1];
-      // data['chapters'] = JSON.parse(data['chapters']);
-      data['course_teacher'] = JSON.parse(data['course_teacher']);
+      let fund = this.data[1];
+      console.log(fund);
+      data['chapters'] = JSON.parse(data['chapters']);
       data['course_student'] = JSON.parse(data['course_student']);
+      data['course_teacher'] = JSON.parse(data['course_teacher']);
       //处理资金使用情况
-      // let fundDataArray = [];
-      //       fund.forEach(item=>{
-      //           let fundData = {
-      //               total:"",
-      //               device:"",deviceRemarks:"",
-      //               Material:"",MaterialRemarks:"",
-      //               processing:"",processingRemarks:"",
-      //               Collaboration:"",CollaborationRemarks:"",
-      //               APPRAISAL:"",APPRAISALRemarks:"",
-      //               entery:"",enteryRemarks:"",
-      //               activities:"",activitiesRemarks:"",
-      //               Transaction:"",TransactionRemarks:""
-      //           }
-      //           //直接经费
-      //           let direct = JSON.parse(item['directFund']);
-      //           //间接经费
-      //           let indirect = JSON.parse(item['indirectFund']);
+      let fundDataArray = [];
+            fund.forEach(item=>{
+                let fundData = {
+                    total:"",
+                    device:"",deviceRemarks:"",
+                    Material:"",MaterialRemarks:"",
+                    processing:"",processingRemarks:"",
+                    Collaboration:"",CollaborationRemarks:"",
+                    APPRAISAL:"",APPRAISALRemarks:"",
+                    entery:"",enteryRemarks:"",
+                    activities:"",activitiesRemarks:"",
+                    Transaction:"",TransactionRemarks:""
+                }
+                //直接经费
+                let direct = JSON.parse(item['directFund']);
+                //间接经费
+                let indirect = JSON.parse(item['indirectFund']);
     
-      //           direct.forEach(item2=>{
-      //               if (item2['directFundData']==1) {
-      //                   fundData['device'] = direct.filter(item=>item['directFundData']==1)[0]['budget'];
-      //                   // console.log(fundData['device']);
-      //                   fundData['deviceRemarks'] = direct.filter(item=>item['directFundData']==1)[0]['reason'];
-      //               }
+                direct.forEach(item2=>{
+                    if (item2['directFundData']==1) {
+                        fundData['device'] = direct.filter(item=>item['directFundData']==1)[0]['budget'];
+                        // console.log(fundData['device']);
+                        fundData['deviceRemarks'] = direct.filter(item=>item['directFundData']==1)[0]['reason'];
+                    }
     
-      //               if (item2['directFundData']==2) {
-      //                   fundData['Material'] = direct.filter(item=>item['directFundData']==2)[0]['budget']
-      //                   fundData['MaterialRemarks'] = direct.filter(item=>item['directFundData']==2)[0]['reason'];
-      //               }
+                    if (item2['directFundData']==2) {
+                        fundData['Material'] = direct.filter(item=>item['directFundData']==2)[0]['budget']
+                        fundData['MaterialRemarks'] = direct.filter(item=>item['directFundData']==2)[0]['reason'];
+                    }
                     
-      //               if (item2['directFundData']==3) {
-      //                   fundData['processing'] = direct.filter(item=>item['directFundData']==3)[0]['budget']
-      //                   fundData['processingRemarks'] = direct.filter(item=>item['directFundData']==3)[0]['reason'];
-      //               }
+                    if (item2['directFundData']==3) {
+                        fundData['processing'] = direct.filter(item=>item['directFundData']==3)[0]['budget']
+                        fundData['processingRemarks'] = direct.filter(item=>item['directFundData']==3)[0]['reason'];
+                    }
                     
         
-      //               if (item2['directFundData']==4) {
-      //                   fundData['Collaboration'] = direct.filter(item=>item['directFundData']==4)[0]['budget']
-      //                   fundData['CollaborationRemarks'] = direct.filter(item=>item['directFundData']==4)[0]['reason'];
-      //               }
+                    if (item2['directFundData']==4) {
+                        fundData['Collaboration'] = direct.filter(item=>item['directFundData']==4)[0]['budget']
+                        fundData['CollaborationRemarks'] = direct.filter(item=>item['directFundData']==4)[0]['reason'];
+                    }
     
-      //           })
+                })
                 
-      //           indirect.forEach(item3=>{
-      //               if (item3['indirectFundData']==1) {
-      //                   fundData['APPRAISAL'] = indirect.filter(item=>item['indirectFundData']==1)[0]['budget']
-      //                   fundData['APPRAISALRemarks'] = indirect.filter(item=>item['indirectFundData']==1)[0]['reason'];
-      //               }
+                indirect.forEach(item3=>{
+                    if (item3['indirectFundData']==1) {
+                        fundData['APPRAISAL'] = indirect.filter(item=>item['indirectFundData']==1)[0]['budget']
+                        fundData['APPRAISALRemarks'] = indirect.filter(item=>item['indirectFundData']==1)[0]['reason'];
+                    }
     
-      //               if (item3['indirectFundData']==2) {
-      //                   fundData['entery'] = indirect.filter(item=>item['indirectFundData']==2)[0]['budget']
-      //                   fundData['enteryRemarks'] = indirect.filter(item=>item['indirectFundData']==2)[0]['reason'];
-      //               }
+                    if (item3['indirectFundData']==2) {
+                        fundData['entery'] = indirect.filter(item=>item['indirectFundData']==2)[0]['budget']
+                        fundData['enteryRemarks'] = indirect.filter(item=>item['indirectFundData']==2)[0]['reason'];
+                    }
     
-      //               if (item3['indirectFundData']==3) {
-      //                   fundData['activities'] = indirect.filter(item=>item['indirectFundData']==3)[0]['budget']
-      //                   fundData['activitiesRemarks'] = indirect.filter(item=>item['indirectFundData']==3)[0]['reason'];
-      //               }
+                    if (item3['indirectFundData']==3) {
+                        fundData['activities'] = indirect.filter(item=>item['indirectFundData']==3)[0]['budget']
+                        fundData['activitiesRemarks'] = indirect.filter(item=>item['indirectFundData']==3)[0]['reason'];
+                    }
     
-      //               if (item3['indirectFundData']==4) {
-      //                   fundData['Transaction'] = indirect.filter(item=>item['indirectFundData']==4)[0]['budget']
-      //                   fundData['TransactionRemarks'] = indirect.filter(item=>item['indirectFundData']==4)[0]['reason'];
+                    if (item3['indirectFundData']==4) {
+                        fundData['Transaction'] = indirect.filter(item=>item['indirectFundData']==4)[0]['budget']
+                        fundData['TransactionRemarks'] = indirect.filter(item=>item['indirectFundData']==4)[0]['reason'];
         
-      //               }
-      //           })
+                    }
+                })
     
-      //           fundData['total'] = Number(fundData['device'])+Number(fundData['Material'])+Number(fundData['processing'])+Number(fundData['Collaboration'])+Number(fundData['APPRAISAL'])+Number(fundData['entery'])+Number(fundData['activities'])+Number(fundData['Transaction']);
+                fundData['total'] = Number(fundData['device'])+Number(fundData['Material'])+Number(fundData['processing'])+Number(fundData['Collaboration'])+Number(fundData['APPRAISAL'])+Number(fundData['entery'])+Number(fundData['activities'])+Number(fundData['Transaction']);
     
-      //           fundDataArray.push(fundData);
-      //       })
+                fundDataArray.push(fundData);
+            })
             
       //       //去除标签
-      //       for(let i in data['chapters']){
-      //           data['chapters'][i]=data['chapters'][i].replace(/<[^>]+>/g,"");
-      //       }
+            for(let i in data['chapters']){
+                data['chapters'][i]=data['chapters'][i].replace(/<[^>]+>/g,"");
+            }
 
             this.wordData = {
-                // year:nowDate.split('-')[0],  //申请日期年
-                // month:nowDate.split('-')[1],   //申请日期月
-                // day:nowDate.split('-')[2],     //申请日期日
+                year:nowDate.split('-')[0],  //申请日期年
+                month:nowDate.split('-')[1],   //申请日期月
+                day:nowDate.split('-')[2],     //申请日期日
                 ing:data['typeName']=='ed917c55-f51d-11ed-a3f6-509a4c5b67cf'?"√":"□", //创意组
                 ed:data['typeName']=='f3068e26-f51d-11ed-a3f6-509a4c5b67cf'?"√":"□",  //初创组
                 projectName:data['title'],//项目名称
@@ -494,7 +503,18 @@ export default {
                 studentNum:data['course_student'].length,//参与学生人数
                 teacher:data['course_teacher'],   //教师组//name：姓名  speciality：专业  title：职称 education：学历    section：所在教研室    work：项目组角色分工
                 student:data['course_student'],   //学生组//name：姓名    class：班级 age：年龄   work：项目组任务分工
-                // brief:data['brief'],//项目简介
+                brief:data['brief'],//项目简介
+                back:data.chapters.back,
+                innovate:data.chapters.innovate,
+                path:data.chapters.path,
+                scene:data.chapters.scene,
+                worth:data.chapters.worth,
+                team:data.chapters.team,
+                cost:data.chapters.cost,
+                expectResults:data.chapters.expectResults,
+                expectResultsTeacher:data.chapters.expectResultsTeacher,
+                expectConversion:data.chapters.expectConversion,
+                plan:data.chapters.plan,
                 // Construction:data['chapters']['Construction'],//建设内容
                 // ProjectBasis:data['chapters']['ProjectBasis'],//立项依据
                 // development:data['chapters']['development'],//创客空间物理环境、制度建设及软件设施建设情况
@@ -503,7 +523,7 @@ export default {
                 // studentActivities:data['chapters']['studentActivities'],//学生创客活动组织实施情况
                 // Transforming:data['chapters']['Transforming'],//学生创客团队孵化、转化创业项目情况
                 // condition:data['chapters']['condition'],//立 项基 础及条 件
-                // fund:fundDataArray,//预算经费
+                fund:fundDataArray,//预算经费
                     //total：总经费     
                     //小型仪器设备费：device        deviceRemarks
                     //材料费：Material             MaterialRemarks

src/components/tool/getWord.js

@@ -193,9 +193,9 @@ function MakerStudentWord(data,fund){
             const doc = new Docxtemplater().loadZip(zip);
             //处理项目数据
             // console.log(111);
-            data['chapters'] = JSON.parse(data['chapters']);
-            data['course_teacher'] = JSON.parse(data['course_teacher']);
-            data['course_student'] = JSON.parse(data['course_student']);
+            // data['chapters'] = data['chapters'];
+            // data['course_teacher'] = JSON.parse(data['course_teacher']);
+            // data['course_student'] = JSON.parse(data['course_student']);
             // return console.log(data['chapters'],data['course_teacher'],data['course_student']);
             //处理资金使用情况
             let fundDataArray = [];

src/views/projectApply/components/projectApplication2.vue

@@ -89,8 +89,8 @@
             </div>
       <div class="baseBtn">
         <div class="blockWidth">
-          <el-button type="primary" v-show="apIsupload==0"  @click="audit">立即修改</el-button>
-          <el-button type="primary" v-show="apIsupload==1" class="disa">立即修改</el-button>
+          <el-button type="primary" v-show="isupload==0" @click="audit">立即修改</el-button>
+          <el-button type="primary" v-show="isupload!=0"  class="disa">立即修改</el-button>
 
         </div>
       </div>

src/views/projectApply/components/projectApplicationDetails.vue

@@ -352,8 +352,8 @@
             
     <div class="baseBtn">
       <div class="blockWidth">
-        <el-button type="primary" v-show="apIsupload==0" @click="audit">立即修改</el-button>
-        <el-button type="primary" class="disa" v-show="apIsupload==1">立即修改</el-button>
+        <el-button type="primary" v-show="isupload==0" @click="audit">立即修改</el-button>
+        <el-button type="primary" v-show="isupload!=0"  class="disa">立即修改</el-button>
       </div>
     </div>
 
@@ -680,7 +680,6 @@
                         this.pageType=[data.typeid,data.typeName]
                         this.isupload=data.isupload
                         this.endProject=data.endProject
-                        this.apIsupload=data.apIsupload
                         // console.log(this.content);
                         // console.log(this.apIsupload);
                     },err=>{

src/views/projectApply/projectApplication.vue

@@ -151,10 +151,12 @@
                     <!-- {{scope.row.name + (scope.row.status==0?"":"(已屏蔽)")}} -->
                     <!-- {{ (scope.row.isupload==0?"未审核": scope.row.data==1?"正在审核":"已审核")  }} -->
 
-                    <span v-if="scope.row.isupload==0 && scope.row.apIsupload==0">未审核</span>
-                    <span v-if="scope.row.isupload==0 && scope.row.apIsupload==1">待审核</span>
+                    <span v-if="scope.row.isupload==0">未审核</span>
                     <span v-if="scope.row.isupload==1">审核中</span>
                     <span v-if="scope.row.isupload==2">已审核</span>
+                    <span v-if="scope.row.isupload==3">待结项</span>
+                    <span v-if="scope.row.isupload==4">已结项</span>
+
                 </div>
             </template>
         </el-table-column>
@@ -282,15 +284,15 @@
         width="60%"
         class="pageSubmitData">
         <div class="addDialogLogo">LOGO</div>
-        <MakerSpaceWordPreview v-if="PreviewTid == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'" :data="PreviewData"/>
-        <studentMakerProjectPreview v-if="PreviewTid == '5e21b204-c206-11ed-a4cd-509a4c5b67cf'" :data="PreviewData"/>
+        <MakerSpaceWordPreview v-if="PreviewTid == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf' && WordPreview " :data="PreviewData"/>
+        <studentMakerProjectPreview v-if="PreviewTid == '5e21b204-c206-11ed-a4cd-509a4c5b67cf' && WordPreview" :data="PreviewData"/>
         <span slot="footer" class="dialog-footer">
           <el-button type="primary" @click="downWord" class="AllDialogBtn">下载文档</el-button>
           <el-button @click="WordPreview = false" class="AllDialogBtn" >取消</el-button>
         </span>
         </el-dialog>
         
-      <el-dialog
+      <!-- <el-dialog
       title="文档预览"
       :visible.sync="WordPreview"
       width="60%"
@@ -302,7 +304,7 @@
         <el-button type="primary" @click="downWord" class="AllDialogBtn">下载文档</el-button>
         <el-button @click="WordPreview = false" class="AllDialogBtn" >取消</el-button>
       </span>
-      </el-dialog>
+      </el-dialog> -->
       <!-- 文档预览结束 -->
   </div>
 </template>
@@ -382,6 +384,7 @@ import studentMakerProjectPreview from '@/components/studentMakerProjectPreview.
           if(this.PreviewTid=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'){
             MakerSpaceWord(this.PreviewData[0],this.PreviewData[1]);
           }else{
+            console.log(11);
             MakerStudentWord(this.PreviewData[0],this.PreviewData[1]);
           }
         },