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

src/views/projectApply/projectApplication.vue

@@ -127,13 +127,13 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="money"
+          prop="fund"
           label="预算(万)"
           align="center"
           min-width="8%">
         </el-table-column>
         <el-table-column
-          prop="time"
+          prop="time[0]"
           align="center"
           label="开始时间"
           min-width="11%">
@@ -492,6 +492,7 @@ import downloadFile from '@/components/tool/downloadFile.js';
             .get(this.$store.state.api+'/SelectAllProject',param)
               .then(res=>{
                 console.log(res);
+                // this.loading = false;
                 let data=res.data;
                 if (data[0].length==0 && data[5][0]['total'] != 0) {
                   this.table.currentPage=1
@@ -505,6 +506,13 @@ import downloadFile from '@/components/tool/downloadFile.js';
                 a.sort=data[3];
                 a.person=data[4];
                 this.table.total=data[5][0].total
+                this.tableData.forEach(item=>{
+                  if(item['time']!=null&&item['time']!=''){
+                    item['time']=JSON.parse(item['time'])
+                  }else{
+                    item['time'] = []
+                  }
+                })
                 this.loading = false;
 
                 // console.log(this.tableData)
@@ -558,7 +566,7 @@ import downloadFile from '@/components/tool/downloadFile.js';
           // }
       },
       mounted(){      //跳转到此页面立刻获取数据
-        // this.getData();     //获取表格数据
+        this.getData();     //获取表格数据
       }
 
     }

src/views/projectApply/projectApplicationApplyMain.vue

@@ -571,7 +571,7 @@
               this.ajax.post(this.$store.state.api+"/InsertProjectMakerSpace",param).then(res=>{
                 if(res.data==1){
                   this.$message.success("提交成功")
-                  this.$route.push('/projectApplication')
+                  this.$router.push('/projectApplication')
                 }else{
                   this.$message.error("提交失败")
                 }