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

src/views/projectManage/ProjectManagement.vue

@@ -210,7 +210,7 @@
           this.ajax    
             .get(this.$store.state.api+'/SelectAllProject',param)
               .then(res=>{
-                console.log(res);
+                // console.log(res);
                 let data=res.data;
                 // console.log(res);
                 let a=this.options;

src/views/projectManage/ProjectManagement3.vue

@@ -132,9 +132,9 @@
               page:this.table.currentPage,
               lim:this.table.packageSize
             }
+            console.log(param);
             this.ajax
                   .get(this.$store.state.api+'/GetAllActivity',param)
-
                   .then(res=>{
                     console.log(res.data);
                     this.tableData=res.data[0]