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

src/views/projectManage/ProjectManagement.vue

@@ -206,7 +206,7 @@
 
 <script>
 import beUpload from '../../components/tool/beUpload'
-
+import { getNowDate } from '@/components/tool/Date';
     export default {
       components:{beUpload},
       data() {
@@ -264,7 +264,7 @@ import beUpload from '../../components/tool/beUpload'
             sort:'',
             state:'',
             leader:'',
-            year:"",
+            year:new Date().getFullYear().toString(),
           },
           file:[],
           checkActivityFinishData:[],

src/views/resultShow/resultsShow.vue

@@ -144,7 +144,7 @@
             value1:0,
             value2:0,
             value3:'',
-            value4:'',
+            value4:new Date().getFullYear().toString(),
           },
           Page:{
             currentPage:1,