coys 2 年之前
父节点
当前提交
5140f2662d
共有 3 个文件被更改,包括 23 次插入3 次删除
  1. 1 1
      src/views/home/menu.vue
  2. 21 1
      src/views/menu/drillStatistics/index.vue
  3. 1 1
      src/views/menu/rehearsalTask/index.vue

+ 1 - 1
src/views/home/menu.vue

@@ -73,7 +73,7 @@ export default {
     getTheWeather() {
       getTheAreaWeather(this.orgId).then(res => {
         console.log(res)
-        this.list = res.data
+        this.list = res.data||[]
         this.list.forEach(item => {
           if (item.alarmLevel == '橙色') {
             item.bgc = '#fa8e00'

+ 21 - 1
src/views/menu/drillStatistics/index.vue

@@ -97,7 +97,7 @@ export default {
   },
   data() {
     return {
-      active: '01-01',
+      active: '',
       cascaderValue: '',
       showStatus: false, //状态显示隐藏
       yearColumns: [],
@@ -136,12 +136,32 @@ export default {
   created() {
     this.presentDate = new Date(newDateYear())
     this.yearData()
+    this.getNewMonth()
   },
   mounted() {
     this.initData()
   },
   computed: {},
   methods: {
+    getNewMonth() {
+      //获取当前月份
+      let date = new Date().getMonth() + 1
+     
+      //默认填充当前季度
+      if (date > 7 && date < 10) {
+        this.active='07-01'
+        //三季度
+      }else if(date > 4 && date < 7){
+        //二季度
+        this.active='04-01'
+      }else if(date > 1 && date < 4){
+        //一季度
+        this.active='01-01'
+      }else{
+        this.active='10-01'
+        // 四季度
+      }
+    },
     initData() {
       this.cascaderValue = JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID')) + ''
 

+ 1 - 1
src/views/menu/rehearsalTask/index.vue

@@ -206,7 +206,7 @@ export default {
     getNewMonth() {
       //获取当前月份
       let date = new Date().getMonth() + 1
-      console.log(date)
+     
       //默认填充当前季度
       if (date > 7 && date < 10) {
         this.active='07-01'