导出

src/store/modules/globalConfig.js

@@ -1820,7 +1820,13 @@ const global_config = {
     {
       id: 27,
       name: '万u'
-    },
+    }, {
+        id: 28,
+        name: '片'
+      },{
+        id: 29,
+        name: '只'
+      },
 
     ],
     body_fluid: [{

src/xt_pages/workforce/appointment.vue

@@ -544,20 +544,7 @@
        return jsonData.map(v => filterVal.map(j => v[j]))
       },
 
-      //  formatJson(filterVal, jsonData) {
-      //    console.log("jsonData",jsonData)
-      //   return jsonData.map(v =>
-      //     filterVal.map(j => {
-      //       console.log("v",j)
-      //       console.log("8888888",v[j])
-      //       if (j === 'timestamp') {
-      //         return parseTime(v[j])
-      //       } else {
-      //         return v[j]
-      //       }
-      //     })
-      //   )
-      // },
+     
       printScheduleAction: function() {
         var date = new Date().getTime()
         if (this.activeName == 'lastWeek') {
@@ -1970,7 +1957,7 @@
        },
 
 
-       getThreeWeekList(){
+     getThreeWeekList(){
           var params ={
               start_time:this.start_time,
               end_time:this.end_time,
@@ -2105,12 +2092,10 @@
 
 
                const start_time = moment().weekday(1).format('YYYY-MM-DD'); //本周一
-               var start = this.getTimestamp(start_time)
+               var start = this.getTimestamp(start_time) - 28800
                console.log("start",start)
-              const end_time = moment().weekday(7).format('YYYY-MM-DD');
-              var end = this.getTimestamp(end_time)
-
-
+               const end_time = moment().weekday(7).format('YYYY-MM-DD');
+               var end = this.getTimestamp(end_time) - 28800
               console.log("end",end)
               var scheduleList = response.data.data.list
              
@@ -2118,17 +2103,17 @@
               var nextWeek = []
               var lastWeek = []
               var next_start = this.getNextWeekOne(1)
-              var nextstart = this.getTimestamp(next_start)
-              // console.log("下周开始时间",nextstart)
+              var nextstart = this.getTimestamp(next_start) - 28800
+              console.log("下周开始时间",nextstart)
               var next_end = this.getNextWeek(1)
-              var nextend = this.getTimestamp(next_end)
-              // console.log("下周结束时间",nextend)
+              var nextend = this.getTimestamp(next_end) - 28800
+              console.log("下周结束时间",nextend)
               var last_start = this.getNextWeekOne(2)
               var last_end = this.getNextWeek(2)
-              var laststart = this.getTimestamp(last_start)
-              // console.log("下下周数据时间",laststart)
-              var lastend = this.getTimestamp(last_end)
-              // console.log("下下周数据时间",lastend)
+              var laststart = this.getTimestamp(last_start) - 28800
+              console.log("下下周数据时间",laststart)
+              var lastend = this.getTimestamp(last_end) - 28800
+              console.log("下下周数据时间",lastend)
 
               if(this.export_type == 0){
                 for(let i = 0;i<scheduleList.length;i++){
@@ -2583,8 +2568,11 @@
     },
     created() {
      var start_time = moment().weekday(1).format('YYYY-MM-DD');
+     console.log("开始时间",start_time)
      this.start_time = start_time
+    
      var end_time = this.getNextWeek(2)
+     console.log("结束时间222222",end_time)
      this.end_time = end_time
       this.getWeekPanels()
       this.getInitDate()