3月25日杨青

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/components/historyWeekTable.vue

@@ -6,10 +6,11 @@
             v-model="weekTime"
             type="week"
             format="第 WW 周"
-            placeholder="选择周"
-            :picker-options="{'firstDayOfWeek': 1}"
+            placeholder="选择周"  
+            :picker-options="pickerBeginDateBefore"
             @change="changeWeek"
         >
+        <!-- "{'firstDayOfWeek': 1}" -->
         </el-date-picker>
     </div>
     <!--   -->
@@ -545,6 +546,12 @@ export default {
   },
   data() {
     return {
+      // 禁选当前之后的日期
+      pickerBeginDateBefore: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        }
+      },
       tableContainHeight:null,
       value1:false,
       modename_value:true,
@@ -2824,27 +2831,12 @@ export default {
       console.log('11111',val)
       this.newDay = []
       var start = this.getTimestamp(val) - 86400
-      // var next = start + 86400
-      // var last_days =start + 172800
-      // var tuesdays = start + 259200
-      // var fivdays = start + 345600
-      // var sixdays = start + 432000
       var end = start + 518400
 
       this.start_time = this.getTime(start)
-      // var nest_day = this.getTime(next)
-      // var last_day = this.getTime(last_days)
-      // var tuesday = this.getTime(tuesdays)
-      // var fiveday = this.getTime(fivdays)
-      // var sixday = this.getTime(sixdays)
       this.end_time = this.getTime(end)
 
       this.newDay.push(this.start_time)
-      // this.newDay.push(nest_day)
-      // this.newDay.push(last_day)
-      // this.newDay.push(tuesday)
-      // this.newDay.push(fiveday)
-      // this.newDay.push(sixday)
       this.newDay.push(this.end_time)
 
       console.log('44444',this.start_time)
@@ -2871,14 +2863,14 @@ export default {
       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;
+      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;
-      console.log('1234566',this.lastweek.start_day,this.lastweek.end_day);
+      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()
     },
@@ -2895,8 +2887,8 @@ 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: 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,