XMLWAN 4 лет назад
Родитель
Сommit
c529ec8ed8
2 измененных файлов: 23 добавлений и 29 удалений
  1. 7 1
      src/store/modules/globalConfig.js
  2. 16 28
      src/xt_pages/workforce/appointment.vue

+ 7 - 1
src/store/modules/globalConfig.js Просмотреть файл

1820
     {
1820
     {
1821
       id: 27,
1821
       id: 27,
1822
       name: '万u'
1822
       name: '万u'
1823
-    },
1823
+    }, {
1824
+        id: 28,
1825
+        name: '片'
1826
+      },{
1827
+        id: 29,
1828
+        name: '只'
1829
+      },
1824
 
1830
 
1825
     ],
1831
     ],
1826
     body_fluid: [{
1832
     body_fluid: [{

+ 16 - 28
src/xt_pages/workforce/appointment.vue Просмотреть файл

544
        return jsonData.map(v => filterVal.map(j => v[j]))
544
        return jsonData.map(v => filterVal.map(j => v[j]))
545
       },
545
       },
546
 
546
 
547
-      //  formatJson(filterVal, jsonData) {
548
-      //    console.log("jsonData",jsonData)
549
-      //   return jsonData.map(v =>
550
-      //     filterVal.map(j => {
551
-      //       console.log("v",j)
552
-      //       console.log("8888888",v[j])
553
-      //       if (j === 'timestamp') {
554
-      //         return parseTime(v[j])
555
-      //       } else {
556
-      //         return v[j]
557
-      //       }
558
-      //     })
559
-      //   )
560
-      // },
547
+     
561
       printScheduleAction: function() {
548
       printScheduleAction: function() {
562
         var date = new Date().getTime()
549
         var date = new Date().getTime()
563
         if (this.activeName == 'lastWeek') {
550
         if (this.activeName == 'lastWeek') {
1970
        },
1957
        },
1971
 
1958
 
1972
 
1959
 
1973
-       getThreeWeekList(){
1960
+     getThreeWeekList(){
1974
           var params ={
1961
           var params ={
1975
               start_time:this.start_time,
1962
               start_time:this.start_time,
1976
               end_time:this.end_time,
1963
               end_time:this.end_time,
2105
 
2092
 
2106
 
2093
 
2107
                const start_time = moment().weekday(1).format('YYYY-MM-DD'); //本周一
2094
                const start_time = moment().weekday(1).format('YYYY-MM-DD'); //本周一
2108
-               var start = this.getTimestamp(start_time)
2095
+               var start = this.getTimestamp(start_time) - 28800
2109
                console.log("start",start)
2096
                console.log("start",start)
2110
-              const end_time = moment().weekday(7).format('YYYY-MM-DD');
2111
-              var end = this.getTimestamp(end_time)
2112
-
2113
-
2097
+               const end_time = moment().weekday(7).format('YYYY-MM-DD');
2098
+               var end = this.getTimestamp(end_time) - 28800
2114
               console.log("end",end)
2099
               console.log("end",end)
2115
               var scheduleList = response.data.data.list
2100
               var scheduleList = response.data.data.list
2116
              
2101
              
2118
               var nextWeek = []
2103
               var nextWeek = []
2119
               var lastWeek = []
2104
               var lastWeek = []
2120
               var next_start = this.getNextWeekOne(1)
2105
               var next_start = this.getNextWeekOne(1)
2121
-              var nextstart = this.getTimestamp(next_start)
2122
-              // console.log("下周开始时间",nextstart)
2106
+              var nextstart = this.getTimestamp(next_start) - 28800
2107
+              console.log("下周开始时间",nextstart)
2123
               var next_end = this.getNextWeek(1)
2108
               var next_end = this.getNextWeek(1)
2124
-              var nextend = this.getTimestamp(next_end)
2125
-              // console.log("下周结束时间",nextend)
2109
+              var nextend = this.getTimestamp(next_end) - 28800
2110
+              console.log("下周结束时间",nextend)
2126
               var last_start = this.getNextWeekOne(2)
2111
               var last_start = this.getNextWeekOne(2)
2127
               var last_end = this.getNextWeek(2)
2112
               var last_end = this.getNextWeek(2)
2128
-              var laststart = this.getTimestamp(last_start)
2129
-              // console.log("下下周数据时间",laststart)
2130
-              var lastend = this.getTimestamp(last_end)
2131
-              // console.log("下下周数据时间",lastend)
2113
+              var laststart = this.getTimestamp(last_start) - 28800
2114
+              console.log("下下周数据时间",laststart)
2115
+              var lastend = this.getTimestamp(last_end) - 28800
2116
+              console.log("下下周数据时间",lastend)
2132
 
2117
 
2133
               if(this.export_type == 0){
2118
               if(this.export_type == 0){
2134
                 for(let i = 0;i<scheduleList.length;i++){
2119
                 for(let i = 0;i<scheduleList.length;i++){
2583
     },
2568
     },
2584
     created() {
2569
     created() {
2585
      var start_time = moment().weekday(1).format('YYYY-MM-DD');
2570
      var start_time = moment().weekday(1).format('YYYY-MM-DD');
2571
+     console.log("开始时间",start_time)
2586
      this.start_time = start_time
2572
      this.start_time = start_time
2573
+    
2587
      var end_time = this.getNextWeek(2)
2574
      var end_time = this.getNextWeek(2)
2575
+     console.log("结束时间222222",end_time)
2588
      this.end_time = end_time
2576
      this.end_time = end_time
2589
       this.getWeekPanels()
2577
       this.getWeekPanels()
2590
       this.getInitDate()
2578
       this.getInitDate()