M#

src/router/index.js

@@ -155,13 +155,13 @@ const routes = [{
             },
  
             
-            { //项目资金管理
-                name: 'ProjectManagementFundDetail',
-                path: '/ProjectManagementFundDetail',
-                component: () =>import ('@/views/projectManage/ProjectManagementFundDetail.vue'),
-                meta: { isAuth: true }
+            // { //项目资金管理
+            //     name: 'ProjectManagementFundDetail',
+            //     path: '/ProjectManagementFundDetail',
+            //     component: () =>import ('@/views/projectManage/ProjectManagementFundDetail.vue'),
+            //     meta: { isAuth: true }
 
-            },
+            // },
             // { //项目资金管理
             //     name: 'ProjectManagementFund2',
             //     path: '/ProjectManagementFund2',

src/views/fundManage/newMarkerfundApply.vue

@@ -177,13 +177,14 @@ export default {
             //知识产权事务费：Transaction   TransactionRemarks
             let param={
                 uid:this.$store.state.userInfo.userid,
-                fid:this.projectName,
+                aid:this.projectName,
             }
             this.ajax
             .get(this.$store.state.api+'/selectMarkerFundData',param)
             .then(res=>{
                 console.log(res.data);
                 let data=JSON.parse(res.data[0][0]['fund']);
+                let usedFund=JSON.parse(res.data[0][0]['usedFund']);
                 // console.log(data);
                 this.fundList[0].budget=data.device
                 this.fundList[1].budget=data.Material
@@ -193,6 +194,20 @@ export default {
                 this.fundList[5].budget=data.entery 
                 this.fundList[6].budget=data.activities 
                 this.fundList[7].budget=data.Transaction
+
+                if (res.data[0][0]['usedFund']!==null) {
+                    this.fundList[0].havePaid=usedFund.device
+                    this.fundList[1].havePaid=usedFund.Material
+                    this.fundList[2].havePaid=usedFund.processing 
+                    this.fundList[3].havePaid=usedFund.Collaboration 
+                    this.fundList[4].havePaid=usedFund.APPRAISAL
+                    this.fundList[5].havePaid=usedFund.entery 
+                    this.fundList[6].havePaid=usedFund.activities 
+                    this.fundList[7].havePaid=usedFund.Transaction
+                }
+                
+
+
                 this.allFund=res.data[0][0]['money']
             },err=>{
                 console.log(err);
@@ -245,6 +260,7 @@ export default {
                     if(res.data==1){
                         this.$message.success('提交成功')
                         this.submitDataDig=false
+                        this.$router.push('/makerfund')
                     }else{
                         this.$message.error('提交失败')
                     }

src/views/fundManage/newMarkerfundDetails.vue

@@ -40,7 +40,7 @@
             <td>
                {{ item.thisApply }}
             </td>
-            <td>
+            <td v-if="!state">
                 <el-input
                 type="number"
                 autosize
@@ -51,6 +51,9 @@
                 v-model="item.actualuse">
                 </el-input>
             </td>
+            <td v-if="state>0">
+                {{ item.actualuse }}
+            </td>
             <td>
                 {{ item.budget-item.havePaid-item.actualuse }}
             </td>
@@ -79,7 +82,8 @@
     <div class="baseBtn">
         <div class="blockWidth">
             <el-button type="primary" @click="download">生成表单</el-button>
-            <el-button type="primary" @click="submitData">提交</el-button>
+            <el-button type="primary" v-if="!state" @click="submitData">提交</el-button>
+            <el-button type="primary" v-if="state>0" class="disa">提交</el-button>
         </div>
     </div>
 
@@ -148,6 +152,7 @@ export default {
             ],
             haveFund:{}, //已支付经费
             intro:'',   //事由
+            state:0,
         }
     },
     methods:{
@@ -171,7 +176,7 @@ export default {
             .get(this.$store.state.api+'/selectActivityFundDetail',param)
             .then(res=>{
                 let data=res.data[0][0]
-                console.log(data);
+                // return console.log(data);
                 let applyfund=JSON.parse(data['applyfund'])
                 let fund=JSON.parse(data['fund'])
                 let actualuse=JSON.parse(data['actualuse'])
@@ -186,16 +191,16 @@ export default {
                 this.fundList[6].budget=fund.activities 
                 this.fundList[7].budget=fund.Transaction
 
-
-
-                this.fundList[0].havePaid=usedFund.device
-                this.fundList[1].havePaid=usedFund.Material
-                this.fundList[2].havePaid=usedFund.processing
-                this.fundList[3].havePaid=usedFund.Collaboration
-                this.fundList[4].havePaid=usedFund.APPRAISAL
-                this.fundList[5].havePaid=usedFund.entery
-                this.fundList[6].havePaid=usedFund.activities 
-                this.fundList[7].havePaid=usedFund.Transaction
+                if (data['usedFund']!=null) {
+                    this.fundList[0].havePaid=usedFund.device
+                    this.fundList[1].havePaid=usedFund.Material
+                    this.fundList[2].havePaid=usedFund.processing
+                    this.fundList[3].havePaid=usedFund.Collaboration
+                    this.fundList[4].havePaid=usedFund.APPRAISAL
+                    this.fundList[5].havePaid=usedFund.entery
+                    this.fundList[6].havePaid=usedFund.activities 
+                    this.fundList[7].havePaid=usedFund.Transaction
+                }
 
                 this.fundList[0].thisApply=applyfund.device
                 this.fundList[1].thisApply=applyfund.Material
@@ -206,16 +211,20 @@ export default {
                 this.fundList[6].thisApply=applyfund.activities 
                 this.fundList[7].thisApply=applyfund.Transaction
 
-                this.fundList[0].actualuse=actualuse.device
-                this.fundList[1].actualuse=actualuse.Material
-                this.fundList[2].actualuse=actualuse.processing
-                this.fundList[3].actualuse=actualuse.Collaboration
-                this.fundList[4].actualuse=actualuse.APPRAISAL
-                this.fundList[5].actualuse=actualuse.entery
-                this.fundList[6].actualuse=actualuse.activities 
-                this.fundList[7].actualuse=actualuse.Transaction
+                if (data['actualuse']!=null) {
+                    this.fundList[0].actualuse=actualuse.device
+                    this.fundList[1].actualuse=actualuse.Material
+                    this.fundList[2].actualuse=actualuse.processing
+                    this.fundList[3].actualuse=actualuse.Collaboration
+                    this.fundList[4].actualuse=actualuse.APPRAISAL
+                    this.fundList[5].actualuse=actualuse.entery
+                    this.fundList[6].actualuse=actualuse.activities
+                    this.fundList[7].actualuse=actualuse.Transaction
+                }
+                
 
                 this.intro=data.intro
+                this.state=data.state
                 this.allFund=data.money
 
 
@@ -238,7 +247,7 @@ export default {
             let arr=[this.fundList[0].actualuse,this.fundList[1].actualuse,this.fundList[2].actualuse,this.fundList[3].actualuse,this.fundList[4].actualuse,this.fundList[5].actualuse,this.fundList[6].actualuse,this.fundList[7].actualuse]
             let arr2=[this.fundList[0].havePaid,this.fundList[1].havePaid,this.fundList[2].havePaid,this.fundList[3].havePaid,this.fundList[4].havePaid,this.fundList[5].havePaid,this.fundList[6].havePaid,this.fundList[7].havePaid]
             
-            console.log(arr);
+            // console.log(arr);
             let fund=arr.reduce((prev,cur,index,arr) => {
                 return prev + cur*1;
             },0); 
@@ -284,6 +293,7 @@ export default {
                     if(res.data==1){
                         this.$message.success('提交成功')
                         this.submitDataDig=false
+                        this.$router.push('/makerfund')
                     }else{
                         this.$message.error('提交失败')
                     }

src/views/projectApply/components/MakerSpaceWordShow.vue

@@ -252,13 +252,7 @@
                     <div class="fundDataLie">
                       <div class="fundDataValue">小型仪器设备费</div>
                       <div class="fundDataValue" v-text="wordData['fund']['device']">
-                        <!-- <el-input
-                          type="textarea"
-                          autosize
-                          resize="none"
-                          placeholder="小型仪器设备费"
-                          v-model.number="wordData['fund']['device']"
-                          @change="convertNumber('device',wordData['fund']['device'])"></el-input> -->
+                      
                       </div>
                       <div class="fundDataValue"><span>项目开展所需的小型专用仪器设备、工具、配件购置或租赁费用。</span></div>
                     </div>
@@ -266,13 +260,7 @@
                     <div class="fundDataLie">
                       <div class="fundDataValue">材料费</div>
                       <div class="fundDataValue" v-text="wordData['fund']['Material']">
-                        <!-- <el-input
-                          type="textarea"
-                          autosize
-                          resize="none"
-                          placeholder="材料费"
-                          v-model.number="wordData['fund']['Material']"
-                          @change="convertNumber('Material',wordData['fund']['Material'])"></el-input> -->
+                        
                       </div>
                       <div class="fundDataValue"><span>项目开展需消耗的各种原材料、辅助材料等低值易耗品的采购费用。</span></div>
                     </div>
@@ -280,13 +268,7 @@
                     <div class="fundDataLie">
                       <div class="fundDataValue">测试化验加工费</div>
                       <div class="fundDataValue" v-text="wordData['fund']['processing']">
-                        <!-- <el-input
-                          type="textarea"
-                          autosize
-                          resize="none"
-                          placeholder="测试化验加工费"
-                          v-model.number="wordData['fund']['processing']"
-                          @change="convertNumber('processing',wordData['fund']['processing'])"></el-input> -->
+                       
                       </div>
                       <div class="fundDataValue"><span>项目开展过程中支付给外单位的检验、测试、化验、计算、分析及加工费等费用。</span></div>
                     </div>
@@ -294,13 +276,7 @@
                     <div class="fundDataLie">
                       <div class="fundDataValue">项目协作费</div>
                       <div class="fundDataValue" v-text="wordData['fund']['Collaboration']">
-                        <!-- <el-input
-                          type="textarea"
-                          autosize
-                          resize="none"
-                          placeholder="项目协作费"
-                          v-model.number="wordData['fund']['Collaboration']"
-                          @change="convertNumber('Collaboration',wordData['fund']['Collaboration'])"></el-input> -->
+                       
                       </div>
                       <div class="fundDataValue"><span>按合同规定支付给协作单位的费用</span></div>
                     </div>
@@ -314,13 +290,7 @@
                     <div class="fundDataLie">
                       <div class="fundDataValue">项目成果鉴定费</div>
                       <div class="fundDataValue" v-text="wordData['fund']['APPRAISAL']">
-                        <!-- <el-input
-                          type="textarea"
-                          autosize
-                          resize="none"
-                          placeholder="项目成果鉴定费"
-                          v-model.number="wordData['fund']['APPRAISAL']"
-                          @change="convertNumber('APPRAISAL',wordData['fund']['APPRAISAL'])"></el-input> -->
+                       
                       </div>
                       <div class="fundDataValue"><span>学术会务费、评审费、鉴定费、成果集制作费等费用。</span></div>
                     </div>
@@ -328,13 +298,7 @@
                     <div class="fundDataLie">
                       <div class="fundDataValue">参展参赛费</div>
                       <div class="fundDataValue" v-text="wordData['fund']['entery']">
-                        <!-- <el-input
-                          type="textarea"
-                          autosize
-                          resize="none"
-                          placeholder="参展参赛费"
-                          v-model.number="wordData['fund']['entery']"
-                          @change="convertNumber('entery',wordData['fund']['entery'])"></el-input> -->
+                        
                       </div>
                       <div class="fundDataValue"><span>参加创客展会、竞赛等所需的报名费、展位费、布展费、宣传推广费及差旅费等费用。</span></div>
                     </div>
@@ -342,13 +306,7 @@
                     <div class="fundDataLie">
                       <div class="fundDataValue">创客交流活动费</div>
                       <div class="fundDataValue" v-text="wordData['fund']['activities']">
-                        <!-- <el-input
-                          type="textarea"
-                          autosize
-                          resize="none"
-                          placeholder="创客交流活动费"
-                          v-model.number="wordData['fund']['activities']"
-                          @change="convertNumber('activities',wordData['fund']['activities'])"></el-input> -->
+                        
                       </div>
                       <div class="fundDataValue"><span>创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。</span></div>
                     </div>
@@ -356,14 +314,7 @@
                     <div class="fundDataLie">
                       <div class="fundDataValue">知识产权事务费</div>
                       <div class="fundDataValue" v-text="wordData['fund']['Transaction']">
-                        <!-- <el-input
-                          type="textarea"
-                          autosize
-                          resize="none"
-                          placeholder="知识产权事务费"
-                          v-model.number="wordData['fund']['Transaction']"
-                          @change="convertNumber('Transaction',wordData['fund']['Transaction'])">
-                        </el-input> -->
+                        
                       </div>
                       <div class="fundDataValue"><span>论文版面费、专利及其他知识产权事务等费用。</span></div>
                     </div>

src/views/projectApply/components/studentProjectWordShow.vue

@@ -320,9 +320,11 @@
               position: relative;
               max-width:100% ;
               height: 200px;
-              white-space: nowrap;
+              // white-space: nowrap;
               span{
-                white-space: nowrap
+                // white-space: nowrap
+                word-wrap: break-word;
+                word-break: break-all;
               }
               :deep(.el-textarea__inner){
                 border: none ;

src/views/projectManage/ProjectManagementFund2.vue

@@ -1,245 +0,0 @@
-<template>
-  <!-- 项目管理 资金申报明细 -->
-    <div class="ProjectManagementFund2" v-loading="loading">
-        <div class="vfpHeader">
-            <div class="titleOne">预算经费</div>
-            <el-button type="primary" @click="$router.push('/ProjectManagement')">返回</el-button>
-        </div>
-          <hr>
-         <!-- 跳转导航开始 -->
-         <div class="AppBar">
-              <div @click="content">项目资金使用详情</div>
-              <div @click="remark" class="AppBarActive">
-                资金申报明细
-                <div class='pr1TitBass'></div>
-              </div>
-          </div>
-          <!-- 跳转导航结束 -->
-              
-
-      <!-- 表格开始 -->
-      <el-table
-        ref="multipleTable"
-        :data="tableData"
-        tooltip-effect="dark"
-        stripe
-        class="fontSize"
-        :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
-        >
-        
-        <el-table-column
-          prop="title"
-          align="center"
-          label="活动名称"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="pro_leader"
-          align="center"
-          label="负责人"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="type"
-          align="center"
-
-          label="项目类型"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="fund"
-          align="center"
-          label="申请经费(元)"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="name"
-          align="center"
-          label="所在部门"
-          >
-        </el-table-column>
-
-        <el-table-column
-          prop="dateTime"
-          align="center"
-          label="申请时间"
-         >
-        </el-table-column>
-      </el-table>
-      <!-- 表格结束 -->
-
-
-        <el-pagination
-        background
-        class="paginations"
-        layout="prev, pager, next"
-        :total="1">
-        </el-pagination>
-
-  </div>
-  </template>
-  
-  <script>
-      export default {
-        data() {
-          return {
-            tableData:[],
-            loading:false,
-          }
-        },
-        methods:{
-          content(){
-            this.$router.push(`/ProjectManagementFund1?pid=${this.$route.query['pid']}`)
-          },
-          remark(){
-            this.$router.push(`/ProjectManagementFund2?pid=${this.$route.query['pid']}`)
-          },
-          getData(){
-            this.loading = true;
-            let param={
-              uid:this.$store.state.userInfo.userid,
-              cid:this.$route.query['pid']
-            }
-            // console.log(param);
-            // return
-            this.ajax
-                .get(this.$store.state.api+'/SelectFundDetail',param)
-                .then(res=>{
-                    console.log(res.data[0]);
-                    this.tableData=res.data[0]
-                    this.loading = false;
-                },err=>{
-                    console.log(err);
-                })
-          },
-        },
-        mounted(){
-          this.getData()
-        }
-      }
-  </script>
-  
-  <style lang="less">
-  .ProjectManagementFund2{
- 
-     .right{
-      width: 100%;
-     }
-    .pmFund1Footer{   //分页
-       display: flex;
-       justify-content: flex-end;
-       margin: 20px 50px 0 0;
-    }
-
-
-  .projectApplicationfundAddDialog2{
-
-
-    .el-header {
-      background-color: #3d67bc;
-      color: #333;
-      text-align: center;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-    }
-    .el-select-dropdown__item{
-      text-align: left;
-    }
-    .el-dialog__title{
-      color:#fff;
-        display: flex;
-        justify-content: center;
-        font-size: 18px;
-        position: relative;
-        top: -2px;
-    }
-    font-size: 16px !important;
-    .el-dialog__header{
-      display: flex;
-      font-weight: bold;
-      justify-content: flex-start;
-    }
-    .el-dialog__body{
-      padding-top: 0px;
-    }
-    .dagSpan{
-      min-width: 65px;
-      max-width: 65px;
-      display: flex;
-      justify-content:flex-end;
-      margin-right: 9px;
-      align-items: center;
-      font-size: 16px;
-    }
-    .deleteContent1{
-      width: 55%;
-      margin-bottom: 10px;
-      display: flex;
-    }
-
-    .dagRemark{
-      display: flex;
-      margin: 20px 0px;
-      font-size: 16px;
-      font-weight: 550;
-    }
-    .dagInpS{
-      // width: 100%;
-      display: flex;
-      font-size: 16px;
-
-      justify-content: space-between;
-      .dagInpS1{
-        display: flex;
-        min-width: 23%;
-        max-width: 23%;
-        font-size: 16px;
-
-      }
-      .dagInpS1:nth-child(1){
-        min-width: 30%;
-        max-width: 30%;
-        .dagSpan{
-          font-size: 16px;
-          display: inline-block;
-          text-align: justify;
-          text-justify:distribute-all-lines;
-          text-align-last: justify;
-          transform: translate(0,22%);
-        }
-      }
-      .dagInpSf1:nth-child(n+2) .dagSpan{
-        font-size: 16px;
-        min-width: 50px;
-        max-width: 50px;
-
-      }
-    }
-    .dagInpS2{
-        margin:20px 0 20px 0;
-        display: flex;
-        font-size: 16px;
-
-        .dagSpan2{
-          font-size: 16px;
-
-          max-width: 65px;
-          min-width: 65px;
-          margin-right: 10px;
-          // text-align: right;
-          display: inline-block;
-          text-align: justify;
-          text-justify:distribute-all-lines;
-          text-align-last: justify;
-        }
-    }
-  }
-
-  .newWidth{
-    width: 150px;
-  }
-
-
-  }
-  </style>

src/views/projectManage/ProjectManagementFundDetail.vue

@@ -1,75 +0,0 @@
-<template>
-  <!-- 项目管理 项目资金使用情况 -->
-  <div class="ProjectManagementFundDetail" v-loading="loading">
-        <div class="vfpHeader">
-            <div class="titleOne">预算经费</div>
-            <el-button type="primary" @click="back">返回</el-button>
-        </div>
-          <hr>
-          <!-- 跳转导航开始 -->
-          <div class="AppBar">
-              <div @click="state=0" class="AppBarActive">项目资金使用详情<div v-if="state==0" class='pr1TitBass'></div></div>
-              <div @click="state=1">资金申报明细<div v-if="state==1" class='pr1TitBass'></div></div>
-          </div>
-          <div id="ShowArea">
-            <fundDetail v-if="state==0"/>
-          </div>
-
-         
-</div>
-</template>
-
-<script>
-import fundDetail from './components/FundDetail.vue'
-    export default {
-      components:{fundDetail},
-      data() {
-        return {
-          state:0,
-          loading:false,
-        }
-      },
-      methods:{
-        // getData(){   //初始化完成获取基本数据进行填充
-        //   this.loading = true;
-        //     let param={
-        //       uid:this.$store.state.userInfo.userid,
-        //       pid:this.$route.query['pid']
-        //     }
-        //       this.ajax
-        //             .get(this.$store.state.api+'/GetProjectDetailMessage',param)
-        //             .then(res=>{
-        //               let data = res.data[0][0]
-        //               let fund = JSON.parse(data['money'])
-        //               this.tableData = fund['tableData']
-        //               this.tableData2 = fund['tableData2']
-        //               this.allFund = data['fund']
-        //               this.tableData2.forEach((e)=>{
-        //                 this.useFund=this.useFund+e.fund
-        //               })
-        //               this.useFund=this.useFund / 10000
-        //               this.remainFund=this.allFund - this.useFund
-        //               this.loading = false;
-        //             },err=>{
-        //               console.log(err);
-        //             })
-        //   },
-        back(){
-          this.$router.push('/ProjectManagement')
-        }
-      },
-      mounted(){
-        // this.getData()
-      }
-    }
-</script>
-
-<style lang="less">
-.ProjectManagementFundDetail{
-  width: 100%;
-  height: 100%;
-  #ShowArea{
-    width: 100%;
-  }
-}
-</style>

src/views/projectManage/ProjectManagementMain.vue

@@ -21,7 +21,7 @@
         <!-- 活动开展 -->
         <ProjectManagement3 :changeShow="goto" v-if="show==1"></ProjectManagement3>
         <!-- 活动开展详细 -->
-        <ProjectManagement3_1 v-if="show==5"/>
+        <!-- <ProjectManagement3_1 v-if="show==5"/> -->
         <!-- 项目附件 -->
         <!-- <ProjectManagement4 v-if="show==2"></ProjectManagement4> -->
         <!-- 项目结题文件 -->
@@ -32,7 +32,7 @@
 <script>
 
     import ProjectManagement3 from './components/ProjectManagement3.vue'
-    import ProjectManagement3_1 from './components/ProjectManagement3_1.vue'
+    // import ProjectManagement3_1 from './components/ProjectManagement3_1.vue'
     // import ProjectManagement4 from './components/ProjectManagement4.vue'
     import ProjectManagement5 from './components/ProjectManagement5.vue'
 
@@ -46,7 +46,7 @@
             // ProjectManagement1,
             // ProjectManagement2,
             ProjectManagement3,
-            ProjectManagement3_1,
+            // ProjectManagement3_1,
             // ProjectManagement4,
             ProjectManagement5,
             studentProjectWordShow,

src/views/projectManage/components/studentProjectWordShow.vue

@@ -90,7 +90,9 @@
           <tr id="brief">
             <td rowspan="5" ref="brief">研发内容</td><td colspan="6" class="textLeft">
               <p>项目简介（200-300字）</p>
-              <span v-text="downWordData.brief"></span>
+              <span>
+                {{ downWordData.brief }}
+              </span>
             </td>
           </tr>
           <tr>
@@ -393,6 +395,7 @@
         }
         .table{
             border: none;
+            width: 100%;
             border-top: solid 1px black;
             border-right:  solid 1px black;
             border-left:  solid 1px black;
@@ -402,9 +405,11 @@
               position: relative;
               max-width:100% ;
               height: 200px;
-              white-space: nowrap;
+              // white-space: nowrap;
               span{
-                white-space: nowrap
+                // white-space: nowrap;
+                word-wrap: break-word;
+                word-break: break-all;
               }
               :deep(.el-textarea__inner){
                 border: none ;
@@ -422,7 +427,7 @@
                 height: 50px;
                 text-align: center;
                 line-height: 30px;
-                min-width: 80px;
+                width: 70px;
                 box-sizing: border-box;
                 padding: 5px;
               p{

src/views/projectSettlement/components/studentProjectWordShow.vue

@@ -402,9 +402,11 @@
               position: relative;
               max-width:100% ;
               height: 200px;
-              white-space: nowrap;
+              // white-space: nowrap;
               span{
-                white-space: nowrap
+                // white-space: nowrap
+                word-wrap: break-word;
+                word-break: break-all;
               }
               :deep(.el-textarea__inner){
                 border: none ;

src/views/resultShow/components/resultDetail_student.vue

@@ -1,11 +1,9 @@
 <template>
     <!-- 成果展示 项目成果展示 -->
-    <div class="rs1apply" v-loading="loading">
+    <div class="rs1apply">
         <!-- 头部展示区开始 -->
         <div class="header">
-            <div class="imgBlock">
-                <img :src="TitleMessage.image" alt="">
-            </div>
+
             <div class="headerConcent">
                 <div class="rsHead1Tit">项目名称：<span>{{ TitleMessage.title }}</span></div>
                 <div class="rsHead2Tit rsHead3Tit">
@@ -82,10 +80,10 @@
                     </div>
                     <el-descriptions style="width: 100%;" :column="2" border>
                         <el-descriptions-item label="优先支持项目">
-                            {{ TitleMessage.multiSelectProject.indexOf(0)!=-1?'大赛选拔项目':'' }}
-                            {{ TitleMessage.multiSelectProject.indexOf(1)!=-1?'落地注册项目':'' }}
-                            {{ TitleMessage.multiSelectProject.indexOf(2)!=-1?'社会征集项目':'' }}
-                            {{ TitleMessage.multiSelectProject.indexOf(3)!=-1?'产业命题项目':'' }}
+                            {{ TitleMessage.multiSelectProject.indexOf('0')!=-1?'大赛选拔项目':'' }}
+                            {{ TitleMessage.multiSelectProject.indexOf('1')!=-1?'落地注册项目':'' }}
+                            {{ TitleMessage.multiSelectProject.indexOf('2')!=-1?'社会征集项目':'' }}
+                            {{ TitleMessage.multiSelectProject.indexOf('3')!=-1?'产业命题项目':'' }}
 
                         </el-descriptions-item>
                         <el-descriptions-item label="美丽校园改造项目">
@@ -114,12 +112,12 @@
                             align="center">
                           </el-table-column>
                           <el-table-column
-                            prop="class"
+                            prop="collage"
                             label="所在学院/部门/专业"
                             align="center">
                           </el-table-column>
                           <el-table-column
-                            prop="division"
+                            prop="work"
                             label="项目组角色分工"
                             align="center">
                           </el-table-column>
@@ -144,12 +142,12 @@
                             align="center">
                           </el-table-column>
                           <el-table-column
-                            prop="class"
+                            prop="collage"
                             label="所在学院/部门/专业"
                             align="center">
                           </el-table-column>
                           <el-table-column
-                            prop="division"
+                            prop="work"
                             label="项目组角色分工"
                             align="center">
                           </el-table-column>                        
@@ -162,12 +160,14 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>简介</span>
                     </div>
-                    <div class="TextView" v-text="TitleMessage.brief">
-                        <!-- {{ TitleMessage.brief }} -->
+                    <div class="TextView" style="display: block;">
+                        {{ TitleMessage.brief }}
                     </div>
                 </div>
             </div>
             <!--基础信息结束-->
+
+
             <!--项目详细开始-->
             <div class="BaseMessage" v-show="pageState==1">
                 <div class="BaseTitle" type="1">
@@ -180,7 +180,6 @@
                         <span>一、项目研发背景</span>
                     </div>
                     <div class="TextView" v-text="DetailMessage['back']">
-                        <!-- <VueEditor v-model="DetailMessage['back']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -190,7 +189,6 @@
                         <span>二、项目创新点</span>
                     </div>
                     <div class="TextView" v-text="DetailMessage['innovate']">
-                        <!-- <VueEditor v-model="DetailMessage['innovate']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -200,7 +198,6 @@
                         <span>三、技术研发路线</span>
                     </div>
                     <div class="TextView" v-text="DetailMessage['path']">
-                        <!-- <VueEditor v-model="DetailMessage['path']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -210,7 +207,6 @@
                         <span>四、项目应用场景</span>
                     </div>
                     <div class="TextView" v-text="DetailMessage['scene']">
-                        <!-- <VueEditor v-model="DetailMessage['scene']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -223,7 +219,6 @@
                         <span>一、项目商业模式/社会价值</span>
                     </div>
                     <div class="TextView" v-text="DetailMessage['worth']">
-                        <!-- <VueEditor v-model="DetailMessage['worth']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -236,7 +231,6 @@
                         <span>一、团队构成及优势</span>
                     </div>
                     <div class="TextView" v-text="DetailMessage['team']">
-                        <!-- <VueEditor v-model="DetailMessage['team']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -249,7 +243,6 @@
                         <span>一、研发成本来源及构成</span>
                     </div>
                     <div class="TextView" v-text="DetailMessage['cost']">
-                        <!-- <VueEditor v-model="DetailMessage['cost']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -262,7 +255,6 @@
                         <span>一、项目预期成果、数量及形式（产品原型/发明专利/双创竞赛/成果转化/社会效益）</span>
                     </div>
                     <div class="TextView" v-text="DetailMessage['expectResults']">
-                        <!-- <VueEditor v-model="DetailMessage['expectResults']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
                 <div class="brief">
@@ -271,7 +263,6 @@
                         <span>二、学生创客人才培养预期成果、数量（教师填写）</span>
                     </div>
                     <div class="TextView" v-text="DetailMessage['expectResultsTeacher']">
-                        <!-- <VueEditor v-model="DetailMessage['expectResultsTeacher']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
                 <div class="brief">
@@ -280,7 +271,6 @@
                         <span>三、项目预期孵化、转化创业项目情况</span>
                     </div>
                     <div class="TextView" v-text="DetailMessage['expectConversion']">
-                        <!-- <VueEditor v-model="DetailMessage['expectConversion']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
                 <div class="BaseTitle" type="1">
@@ -292,7 +282,6 @@
                         <span>三、项目预期孵化、转化创业项目情况</span>
                     </div> -->
                     <div class="TextView" v-text="DetailMessage['plan']">
-                        <!-- <VueEditor v-model="DetailMessage['plan']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
             </div>
@@ -304,7 +293,7 @@
                     <span>活动开展</span>
                 </div>
 
-                <div class="arrangement" v-for="(item,index) in AllActivity" :key="item.acId">
+                <div class="arrangement" v-for="(item,index) in AllActivity" :key="index">
                     <div class="arrangement_assignment">
                         <div class="arrangement_assignment_title">
                             <span>
@@ -378,7 +367,7 @@
                                   border
                                   style="width: 100%">
                                   <el-table-column
-                                    prop="Name"
+                                    prop="name"
                                     label="姓名"
                                     align="center">
                                   </el-table-column>
@@ -388,7 +377,7 @@
                                     align="center">
                                   </el-table-column>
                                   <el-table-column
-                                    prop="takeCharge"
+                                    prop="work"
                                     align="center"
                                     label="活动分工">
                                   </el-table-column>
@@ -399,7 +388,6 @@
                                 <span>活动简介</span>
                             </div>
                             <div class="TextView" v-text="item.brief">
-                                <!-- {{ item.brief }} -->
                             </div>
 
                             <div class="brief_title MarginTop30px">
@@ -407,8 +395,7 @@
                                 <i class="el-icon-edit-outline"></i>
                                 <span>活动计划</span>
                             </div>
-                            <div class="TextView" v-text="JSON.parse(item.chapters)[0]">
-                                <!-- <VueEditor v-model="JSON.parse(item.chapters)[0]" :disabled="true"></VueEditor> -->
+                            <div class="TextView" v-text="JSON.parse(item.chapters).activityPlan">
                             </div>
 
                             <div class="brief_title MarginTop30px">
@@ -416,8 +403,7 @@
                                 <i class="el-icon-data-line"></i>
                                 <span>预期目标</span>
                             </div>
-                            <div class="TextView" v-text="JSON.parse(item.chapters)[1]">
-                                <!-- <VueEditor v-model="JSON.parse(item.chapters)[1]" :disabled="true"></VueEditor> -->
+                            <div class="TextView" v-text="JSON.parse(item.chapters).expectations">
                             </div>
 
                             <div class="brief_title MarginTop30px">
@@ -425,8 +411,7 @@
                                 <i class="el-icon-pie-chart"></i>
                                 <span>活动受面</span>
                             </div>
-                            <div class="TextView" v-text="JSON.parse(item.chapters)[2]">
-                                <!-- <VueEditor v-model="JSON.parse(item.chapters)[2]" :disabled="true"></VueEditor> -->
+                            <div class="TextView" v-text="JSON.parse(item.chapters).eventAudience">
                             </div>
 
                             <div class="brief_title MarginTop30px">
@@ -434,8 +419,7 @@
                                 <i class="el-icon-money"></i>
                                 <span>经费支出计划</span>
                             </div>
-                            <div class="TextView" v-text="JSON.parse(item.chapters)[3]">
-                                <!-- <VueEditor v-model="JSON.parse(item.chapters)[3]" :disabled="true"></VueEditor> -->
+                            <div class="TextView" v-text="JSON.parse(item.chapters).fundingPlan">
                             </div>
                             <div class="brief_title MarginTop30px" v-if="ActivityLookFile[index].url!=''">
                                 <img src="@/assets/anliDetail/jdTitle.png" alt="">
@@ -630,6 +614,8 @@
                     pid:this.$route.query["pid"]
                 }).then(res=>{
                     let FormData = res.data;
+
+       console.log(FormData);
                 //    return console.log(FormData)
                 //     //头部信息
                     this.TitleMessage = FormData[0][0]
@@ -867,6 +853,8 @@
             border-radius: 5px;
             background-color: rgb(240, 240, 240);
             line-height: 2em;
+            word-wrap: break-word;
+            word-break: break-all;
         }
         .FileView{
             width: 100%;