xiao547607 пре 5 година
родитељ
комит
74bb544514
1 измењених фајлова са 11 додато и 9 уклоњено
  1. 11 9
      src/views/base/personDeviceLog-list.vue

+ 11 - 9
src/views/base/personDeviceLog-list.vue

@@ -33,7 +33,7 @@
             start-placeholder="开始日期"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
             end-placeholder="结束日期"
             :default-time="['12:00:00', '08:00:00']"
             :default-time="['12:00:00', '08:00:00']"
-          ></el-date-picker> -->
+          ></el-date-picker>-->
         </el-form-item>
         </el-form-item>
         <el-form-item label="人员姓名" prop="personName">
         <el-form-item label="人员姓名" prop="personName">
           <el-input type="text" size="mini" v-model="queryModel.personName"></el-input>
           <el-input type="text" size="mini" v-model="queryModel.personName"></el-input>
@@ -158,7 +158,7 @@ export default {
         temperatureBegin: "",
         temperatureBegin: "",
         temperatureEnd: "",
         temperatureEnd: "",
         temperatureRanges: "",
         temperatureRanges: "",
-        matchMsg:""
+        matchMsg: ""
       },
       },
       loading: false,
       loading: false,
       tableData: [],
       tableData: [],
@@ -175,7 +175,7 @@ export default {
       businessKey: "",
       businessKey: "",
       downloadLoading: false,
       downloadLoading: false,
       tableHeight: "",
       tableHeight: "",
-      timeRangesDefaultTime:[]
+      timeRangesDefaultTime: []
     };
     };
   },
   },
   created() {
   created() {
@@ -293,20 +293,22 @@ export default {
     getCurrentMonthFirst() {
     getCurrentMonthFirst() {
       var self = this;
       var self = this;
       var date = new Date();
       var date = new Date();
-      date.setDate(1);
+      //date.get(1);
       var month = parseInt(date.getMonth() + 1);
       var month = parseInt(date.getMonth() + 1);
-      var day = date.getDate();
+      var day = date.getDate() - 3;
       if (month < 10) month = "0" + month;
       if (month < 10) month = "0" + month;
       if (day < 10) day = "0" + day;
       if (day < 10) day = "0" + day;
-      var startTime = date.getFullYear() + "-" + month + "-" + day + " 00:00:00";
+      var startTime =
+        date.getFullYear() + "-" + month + "-" + day + " 00:00:00";
 
 
       var lastDate = new Date();
       var lastDate = new Date();
       lastDate.setMonth(date.getMonth() + 1);
       lastDate.setMonth(date.getMonth() + 1);
       //设置当前月份+1
       //设置当前月份+1
-      lastDate.setDate(0);
+      //lastDate.setDate(0);
       //获取上个月最后一天=本月最后一天
       //获取上个月最后一天=本月最后一天
-      var lastDay = lastDate.getDate();
-      var endTime = date.getFullYear() + "-" + month + "-" + lastDay + " 23:59:59";
+      var lastDay = lastDate.getDate() + 3;
+      var endTime =
+        date.getFullYear() + "-" + month + "-" + lastDay + " 23:59:59";
 
 
       self.queryModel.timeRanges = [startTime, endTime];
       self.queryModel.timeRanges = [startTime, endTime];
     }
     }