Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

config/sit.env.js

@@ -1,8 +1,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   ENV_CONFIG: '"sit"',
-  BASE_API: '"http://new_mobile.xt.api.sgjyun.com"',
-  // BASE_API:'"https://api.xt.test.sgjyun.com"',
+  // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"',
+  BASE_API:'"https://api.xt.test.sgjyun.com"',
   SSO_HOST: '"https://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"https://xt.test.sgjyun.com"',

src/xt_pages/workforce/appointment.vue

@@ -333,7 +333,8 @@ export default {
         this.showtable=true
         this.showtableOne=false
         this.$nextTick(() => {
-          this.$refs.tableDataZero.getgetSchedules()
+
+          this.$refs.tableDataZero.start()
         })
         console.log('12343545',this.$refs.tableDataZero);
       }else{
@@ -341,10 +342,6 @@ export default {
         this.showtableOne=true
       }
 
-      // if(e.name == 'thisWeek'){
-      //    this.$refs.tableData.getWeekPanels()
-      // }
-      // console.log(getgetSchedules);
     },
     dragstart(event, item) {
       // console.log('start的索引',item.moveIndex)
@@ -439,7 +436,7 @@ export default {
         this.theWeek.lastWeek = response.data.data.theLastWeek
         this.theWeek.nextWeek = response.data.data.theNextWeek
         this.theWeek.nextTwoWeek = response.data.data.theNextSecWeek
-        // this.theWeek.historyWeek = response.data.data.theWeek - 2
+        this.theWeek.historyWeek = response.data.data.theWeek - 2
         // 在控制变量改变的时候进行 强制渲染更新
         let childrenRefs = this.$refs.elTabs.$children
         this.$nextTick(() => {

src/xt_pages/workforce/components/historyWeekTable.vue

@@ -5,11 +5,12 @@
       <el-date-picker
             v-model="weekTime"
             type="week"
-            format="yyyy 第 WW 周"
-            placeholder="选择周"
-            :picker-options="{'firstDayOfWeek': 1}"
+            format="第 WW 周"
+            placeholder="选择周"  
+            :picker-options="pickerBeginDateBefore"
             @change="changeWeek"
         >
+        <!-- "{'firstDayOfWeek': 1}" -->
         </el-date-picker>
     </div>
     <!--   -->
@@ -533,10 +534,10 @@ export default {
       dafault: []
     },
     // 分区
-    partitionsProp: {
-      type: Object,
-      dafault: {}
-    },
+    // partitionsProp: {
+    //   type: Object,
+    //   dafault: {}
+    // },
     config: {
       type: Object,
       dafault: {}
@@ -545,6 +546,12 @@ export default {
   },
   data() {
     return {
+      // 禁选当前之后的日期
+      pickerBeginDateBefore: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        }
+      },
       tableContainHeight:null,
       value1:false,
       modename_value:true,
@@ -616,6 +623,7 @@ export default {
       },
       start_time:'',//开始时间
       end_time:'',//结束时间
+      lastweek:{},//上两周的第一天和最后一天
       tiaozhengclass: "tiaozhengclass",
       changeRules: {
         mode_id: [{ required: true, message: "请选择模式", trigger: "blur" }],
@@ -739,20 +747,17 @@ export default {
         this.isShowSix = true
         this.isShowSeven = true
       }
-
-
-
     },
     weekTime: function() {
       var theType = this.weekType(this.weekTime);
       // console.log("999999999",theType)
       this.theType = theType
-      this.getgetSchedules()
+      this.getSchedules()
     },
     scheduleZoneRow: function() {
       var theType = this.weekType(this.weekTime);
       this.theType = theType
-      this.getgetSchedules()
+      this.getSchedules()
     },
     tableHeight(val) {
       if (!this.timer) {
@@ -789,7 +794,7 @@ export default {
     rowNumber = 0;
     this.modeOptions = this.$store.getters.treatment_mode;
 
-    this.partitions = this.partitionsProp;
+    // this.partitions = this.partitionsProp;
 
 
     var contagions = this.$store.getters.contagions;
@@ -823,273 +828,274 @@ export default {
           return a - b; //升序
       }
      },
-    //  getWeekPanels() {
-    //      this.scheduleZone=[]
-    //      var partionStr = this.partition_id
-    //      var arr = this.zoneIdList.join(',')
-
-    //      var str = ""
-    //      if(partionStr == 0){
-    //         str = arr
-    //      }
-    //      if(partionStr != 0){
-    //         str = partionStr.join(',')
-    //      }
-    //     // 第几周，星期几
-    //     getWeekPanelsOne(1,str).then(response => {
-    //       console.log('wertwetr',response.data.data);
-    //       if (response.data.state == 0) {
-    //         return false
-    //       }
-    //       var partitions = response.data.data.partitions
-    //       this.theWeek.thisWeek = response.data.data.theWeek
-    //       this.theWeek.historyWeek = this.theWeek.thisWeek -2
-    //       this.theWeek.lastWeek = this.theWeek.thisWeek - 1
-    //       this.theWeek.nextWeek = this.theWeek.thisWeek + 1
-    //       this.theWeek.nextTwoWeek = this.theWeek.thisWeek + 2
-    //       var that = this
-    //       if (partitions.length > 0) {
-    //         partitions.forEach(function(partition) {
-    //           if (partition.jihaos.length == 0) {
-    //             return false
-    //           }
-    //           that.scheduleZoneRow.push(partition.jihaos.length)
-
-    //           that.partitions[partition.id] = partition
-
-    //           partition.jihaos.forEach(function(jihao) {
-    //             var thisPa = {
-    //               area: partition.name,
-    //               zone_id: partition.id,
-    //               zone_type: partition.type,
-    //               cut: jihao.number,
-    //               jihao_id: jihao.id,
-    //               sort:jihao.sort,
-
-    //               Mon_M: {
-    //                 schedule_id: 0,
-    //                 mode_id: 0,
-    //                 mode_name: '',
-    //                 patient_id: 0,
-    //                 patient: '',
-    //                 dialysis_machine_name:'',
-    //                 schedule_date:"",
-    //                 Count:0,
-    //               },
-    //               Mon_A: {
-    //                 schedule_id: 0,
-    //                 mode_id: 0,
-    //                 mode_name: '',
-    //                 patient_id: 0,
-    //                 patient: '',
-    //                 dialysis_machine_name:'',
-    //                 schedule_date:"",
-    //                 Count:0,
-    //               },
-    //               Mon_N: {
-    //                 schedule_id: 0,
-    //                 mode_id: 0,
-    //                 mode_name: '',
-    //                 patient_id: 0,
-    //                 patient: '',
-    //                 dialysis_machine_name:'',
-    //                 schedule_date:"",
-    //                 Count:0,
-    //               },
-    //               Tue_M: {
-    //                 schedule_id: 0,
-    //                 mode_id: 0,
-    //                 mode_name: '',
-    //                 patient_id: 0,
-    //                 patient: '',
-    //                 dialysis_machine_name:'',
-    //                 schedule_date:"",
-    //                 Count:0,
-    //               },
-    //               Tue_A: {
-    //                 schedule_id: 0,
-    //                 mode_id: 0,
-    //                 mode_name: '',
-    //                 patient_id: 0,
-    //                 patient: '',
-    //                 dialysis_machine_name:'',
-    //                 schedule_date:"",
-    //                 Count:0,
-    //               },
-    //               Tue_N: {
-    //                 schedule_id: 0,
-    //                 mode_id: 0,
-    //                 mode_name: '',
-    //                 patient_id: 0,
-    //                 patient: '',
-    //                 dialysis_machine_name:'',
-    //                 schedule_date:"",
-    //                 Count:0,
-    //               },
-    //               Wed_M: {
-    //                 schedule_id: 0,
-    //                 mode_id: 0,
-    //                 mode_name: '',
-    //                 patient_id: 0,
-    //                 patient: '',
-    //                 dialysis_machine_name:'',
-    //                 schedule_date:"",
-    //                 Count:0,
-    //               },
-    //               Wed_A: {
-    //                 schedule_id: 0,
-    //                 mode_id: 0,
-    //                 mode_name: '',
-    //                 patient_id: 0,
-    //                 patient: '',
-    //                 dialysis_machine_name:'',
-    //                 schedule_date:"",
-    //                 Count:0,
-    //               },
-    //               Wed_N: {
-    //                 schedule_id: 0,
-    //                 mode_id: 0,
-    //                 mode_name: '',
-    //                 patient_id: 0,
-    //                 patient: '',
-    //                 dialysis_machine_name:'',
-    //                 schedule_date:"",
-    //                 Count:0,
-    //               },
-    //               Thurs_M: {
-    //                 schedule_id: 0,
-    //                 mode_id: 0,
-    //                 mode_name: '',
-    //                 patient_id: 0,
-    //                 patient: '',
-    //                 dialysis_machine_name:'',
-    //                 schedule_date:"",
-    //                 Count:0,
-    //               },
-    //               Thurs_A: {
-    //                 schedule_id: 0,
-    //                 mode_id: 0,
-    //                 mode_name: '',
-    //                 patient_id: 0,
-    //                 patient: '',
-    //                 dialysis_machine_name:'',
-    //                 schedule_date:"",
-    //                 Count:0,
-    //               },
-    //               Thurs_N: {
-    //                 schedule_id: 0,
-    //                 mode_id: 0,
-    //                 mode_name: '',
-    //                 patient_id: 0,
-    //                 patient: '',
-    //                 dialysis_machine_name:'',
-    //                 schedule_date:"",
-    //                 Count:0,
-    //               },
-    //               Fri_M: {
-    //                 schedule_id: 0,
-    //                 mode_id: 0,
-    //                 mode_name: '',
-    //                 patient_id: 0,
-    //                 patient: '',
-    //                 dialysis_machine_name:'',
-    //                 schedule_date:"",
-    //                 Count:0,
-    //               },
-    //               Fri_A: {
-    //                 schedule_id: 0,
-    //                 mode_id: 0,
-    //                 mode_name: '',
-    //                 patient_id: 0,
-    //                 patient: '',
-    //                 dialysis_machine_name:'',
-    //                 schedule_date:"",
-    //                 Count:0,
-    //               },
-    //               Fri_N: {
-    //                 schedule_id: 0,
-    //                 mode_id: 0,
-    //                 mode_name: '',
-    //                 patient_id: 0,
-    //                 patient: '',
-    //                 dialysis_machine_name:'',
-    //                 schedule_date:"",
-    //                 Count:0,
-    //               },
-    //               Sat_M: {
-    //                 schedule_id: 0,
-    //                 mode_id: 0,
-    //                 mode_name: '',
-    //                 patient_id: 0,
-    //                 patient: '',
-    //                 dialysis_machine_name:'',
-    //                 schedule_date:"",
-    //                 Count:0,
-    //               },
-    //               Sat_A: {
-    //                 schedule_id: 0,
-    //                 mode_id: 0,
-    //                 mode_name: '',
-    //                 patient_id: 0,
-    //                 patient: '',
-    //                 dialysis_machine_name:'',
-    //                 schedule_date:"",
-    //                 Count:0,
-    //               },
-    //               Sat_N: {
-    //                 schedule_id: 0,
-    //                 mode_id: 0,
-    //                 mode_name: '',
-    //                 patient_id: 0,
-    //                 patient: '',
-    //                 dialysis_machine_name:'',
-    //                 schedule_date:"",
-    //                 Count:0,
-    //               },
-    //               Sun_A: {
-    //                 schedule_id: 0,
-    //                 mode_id: 0,
-    //                 mode_name: '',
-    //                 patient_id: 0,
-    //                 patient: '',
-    //                 dialysis_machine_name:'',
-    //                 schedule_date:"",
-    //                 Count:0,
-    //               },
-    //               Sun_N: {
-    //                 schedule_id: 0,
-    //                 mode_id: 0,
-    //                 mode_name: '',
-    //                 patient_id: 0,
-    //                 patient: '',
-    //                 dialysis_machine_name:'',
-    //                 schedule_date:"",
-    //                 Count:0,
-    //               },
-    //               Sun_M: {
-    //                 schedule_id: 0,
-    //                 mode_id: 0,
-    //                 mode_name: '',
-    //                 patient_id: 0,
-    //                 patient: '',
-    //                 dialysis_machine_name:'',
-    //                 schedule_date:"",
-    //                 Count:0,
-    //               },
-    //               total: 0
-    //             }
-
-    //             that.scheduleZone.push(thisPa)
-
-    //           })
-    //         })
-    //       }
-
-    //       this.scheduleZone.sort(this.compare('sort'))
-    //       this.source_scheduleZone = this.scheduleZone
-    //       console.log("34455555566666",this.source_scheduleZone)
-    //     })
-    //  },
+     getWeekPanels() {
+         this.scheduleZone=[]
+         var partionStr = this.partition_id
+         var arr = this.zoneIdList.join(',')
+
+         var str = ""
+         if(partionStr == 0){
+            str = arr
+         }
+         if(partionStr != 0){
+            str = partionStr.join(',')
+         }
+        // 第几周，星期几
+        getWeekPanelsOne(1,str).then(response => {
+          console.log('wertwetr',response.data.data);
+          if (response.data.state == 0) {
+            return false
+          }
+          var partitions = response.data.data.partitions
+          this.theWeek.thisWeek = response.data.data.theWeek
+          this.theWeek.historyWeek = this.theWeek.thisWeek -2
+          this.theWeek.lastWeek = this.theWeek.thisWeek - 1
+          this.theWeek.nextWeek = this.theWeek.thisWeek + 1
+          this.theWeek.nextTwoWeek = this.theWeek.thisWeek + 2
+          var that = this
+          if (partitions.length > 0) {
+            partitions.forEach(function(partition) {
+              if (partition.jihaos.length == 0) {
+                return false
+              }
+              that.scheduleZoneRow.push(partition.jihaos.length)
+
+              that.partitions[partition.id] = partition
+
+              partition.jihaos.forEach(function(jihao) {
+                var thisPa = {
+                  area: partition.name,
+                  zone_id: partition.id,
+                  zone_type: partition.type,
+                  cut: jihao.number,
+                  jihao_id: jihao.id,
+                  sort:jihao.sort,
+
+                  Mon_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Mon_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Mon_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Tue_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Tue_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Tue_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Wed_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Wed_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Wed_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Thurs_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Thurs_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Thurs_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Fri_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Fri_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Fri_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Sat_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Sat_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Sat_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Sun_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Sun_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Sun_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  total: 0
+                }
+
+                that.scheduleZone.push(thisPa)
+
+              })
+            })
+          }
+
+          this.scheduleZone.sort(this.compare('sort'))
+          this.source_scheduleZone = this.scheduleZone
+          console.log("34455555566666",this.source_scheduleZone)
+          this.getSchedules()
+        })
+     },
 
     cellClass({ row, column, rowIndex, columnIndex }) {
 
@@ -2781,7 +2787,7 @@ export default {
     getAllZones() {
       getAllZones().then(response => {
         if (response.data.state == 1) {
-          console.log('getAllZones的数据',response.data.data);
+          // console.log('getAllZones的数据',response.data.data);
           var zones = response.data.data.zones
           for (let i = 0; i < zones.length; i++) {
             this.zoneIdList.push(zones[i].id)
@@ -2791,7 +2797,6 @@ export default {
 
           this.strArr = strArr
           this.getWeekPanels()
-          this.getgetSchedules()
         }
       })
     },
@@ -2800,13 +2805,18 @@ export default {
       this.partition_id = val
       this.getWeekPanels()
 
-      this.getgetSchedules()
+      // this.getSchedules()
+      // this.getWeekPanels()
+
+     
     },
     changeSchedule_type(val) {
       this.$emit('event2', val)
       this.schedule_type = val
 
-      this.getgetSchedules()
+      this.getSchedules()
+
+     
     },
     changeWeekDay(val) {
       this.$emit('event3', val)
@@ -2819,20 +2829,53 @@ export default {
     },
     changeWeek(val) {
       console.log('11111',val)
-      this.start_time = ""
-      this.end_time = ""
       this.newDay = []
       var start = this.getTimestamp(val) - 86400
       var end = start + 518400
-      console.log('222222',start)
-      console.log('333333',end )
+
       this.start_time = this.getTime(start)
       this.end_time = this.getTime(end)
+
+      this.newDay.push(this.start_time)
+      this.newDay.push(this.end_time)
+
       console.log('44444',this.start_time)
       console.log('555555',this.end_time )
-      this.getgetSchedules()
+      console.log('666666',this.newDay);
+      this.getSchedules()
+    },
+    // 选择周次
+    start(){
+      var thisweek = {};
+      var date = new Date();
+    // 本周一的日期
+      date.setDate(date.getDate() - date.getDay() + 1);
+      thisweek.start_day = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate() ;
+
+    // 本周日的日期
+      date.setDate(date.getDate() + 6);
+      thisweek.end_day = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate();
+      console.log('asdfgdsafg',thisweek.start_day,thisweek.end_day);
+
+      var date = new Date();
+      // 上上周一的日期
+      date.setDate(date.getDate()-14 - date.getDay() + 1);
+      var month=(date.getMonth() + 1)<10 ? "0"+(date.getMonth()+1):(date.getMonth()+1)
+      var day=(date.getDate())<10 ? "0"+(date.getDate()):(date.getDate())
+      console.log('wqertwetwe',month);
+      this.start_time = date.getFullYear() + "-" + month + "-" + day + " 00:00:00";
+
+      // 上上周日的日期
+      date.setDate(date.getDate() + 6);
+      var month=(date.getMonth() + 1)<10 ? "0"+(date.getMonth()+1):(date.getMonth()+1)
+      var day=(date.getDate())<10 ? "0"+(date.getDate()):(date.getDate())
+      this.end_time = date.getFullYear() + "-" + month + "-" + day + ' 23:59:59';
+      console.log('1234566',this.lastweek.start_day,this.lastweek.end_day) ;
+      this.getAllZones()
+      // this.getSchedules()
     },
-    getgetSchedules(){
+    getSchedules(){
+
       var partionStr = this.partition_id
       var arr = this.zoneIdList.join(',')
       var str = ""
@@ -2844,20 +2887,68 @@ export default {
       }
       const params = {
         is_before:1,
-        // start_time: this.start_time + " 00:00:00",
-        // end_time:this.end_time + ' 23:59:59',
-        start_time: '2023-03-20' + " 00:00:00",
-        end_time:'2023-03-26' + ' 23:59:59',
+        start_time: this.start_time  ,
+        end_time:this.end_time  ,
+        // start_time: this.lastweek.start_day + " 00:00:00",
+        // end_time: this.lastweek.end_day + ' 23:59:59',
         weekTime: this.theType,
         patitionid: str,
         schedule_type: this.schedule_type,
       }
-
+     console.log("str--------",str)
       getSchedulesOne(params).then(response => {
+        console.log('getSchedulesOne',response.data.data);
         if (response.data.state == 1) {
           this.weekTitle = response.data.data.weekTitle;
+          this.weekTitle = []
+
+
+
+
+          var first = this.getTimestamp(this.start_time)
+          var first_day =  this.getTime(first, "{y}-{m}-{d}")
+          this.weekTitle.push(first_day)
+
+
+          var second = this.getTimestamp(this.start_time) + 86400
+          var soncond_day =  this.getTime(second, "{y}-{m}-{d}")
+           this.weekTitle.push(soncond_day)
+
+          var three = this.getTimestamp(this.start_time) + 172800
+          var three_day =  this.getTime(three, "{y}-{m}-{d}")
+          this.weekTitle.push(three_day)
+
+
+          var four = this.getTimestamp(this.start_time) + 259200
+          var four_day =  this.getTime(four, "{y}-{m}-{d}")
+
+           this.weekTitle.push(four_day)
+
+          var five = this.getTimestamp(this.start_time) + 345600
+          var five_day =  this.getTime(five, "{y}-{m}-{d}")
+
+          this.weekTitle.push(five_day)
+
+          var six = this.getTimestamp(this.start_time) + 432000
+          var six_day =  this.getTime(six, "{y}-{m}-{d}")
+
+          this.weekTitle.push(six_day)
+
+
+          var seven = this.getTimestamp(this.start_time) + 518400
+          var seven_day =  this.getTime(seven, "{y}-{m}-{d}")
+
+          this.weekTitle.push(seven_day)
+
+
+
+
+          console.log("this.weekTitle",this.weekTitle)
+
+
 
           this.weekDays = response.data.data.days;
+
           this.toDay = response.data.data.today;
           var theSchedules = response.data.data.schdules;
           var schedulesGroup = response.data.data.schedulesGroup
@@ -2865,7 +2956,10 @@ export default {
 
           var that = this;
 
-          this.scheduleZone.forEach(function (zone, index) {
+       
+
+
+         this.scheduleZone.forEach(function (zone, index) {
 
             that.scheduleZone[index].Mon_M = {
               mode_id: 0,
@@ -3101,6 +3195,26 @@ export default {
         }
       });
     },
+    getTimestamp(time) {
+      //把时间日期转成时间戳
+      console.log("日期", new Date(time));
+      return new Date(time).getTime() / 1000;
+    },
+
+    getTimestampToTime (timestamp) {
+      let date = new Date(timestamp)
+      let Y = date.getFullYear() + '-'
+      let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'
+      let D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate())
+      let time = Y + M + D
+      return time
+   },
+    getTime(value, temp) {
+      if (value != undefined) {
+        return uParseTime(value, temp)
+      }
+      return ''
+    },
   },
   components: {
     ScheduleItem