Merge remote-tracking branch 'origin/master' into master

frontend_web/src/views/duty/components/dutyEdit.vue

@@ -101,14 +101,14 @@ export default {
   },
   created () {
     var myDate = new Date()
-    var year = myDate.getFullYear()// 获取当前年
+    var year = myDate.getFullYear() + 1 // 获取下一年
     this.initSelectYear(year)
     this.getData()
   },
   methods: {
     initSelectYear (year) {
       this.years = []
-      for (let i = 0; i < 30; i++) {
+      for (let i = 0; i < 5; i++) {
         this.years.push({ value: (year - i), label: (year - i) + '年' })
       }
     },

frontend_web/src/views/duty/index.vue

@@ -190,7 +190,7 @@ export default {
     this.getStatus()
     this.initDatas()
     var myDate = new Date()
-    var year = myDate.getFullYear() +1 // 获取下年
+    var year = myDate.getFullYear() + 1 // 获取下年
     this.initSelectYear(year)
   },
   methods: {