|
|
@@ -33,7 +33,7 @@
|
|
|
start-placeholder="开始日期"
|
|
|
end-placeholder="结束日期"
|
|
|
:default-time="['12:00:00', '08:00:00']"
|
|
|
- ></el-date-picker> -->
|
|
|
+ ></el-date-picker>-->
|
|
|
</el-form-item>
|
|
|
<el-form-item label="人员姓名" prop="personName">
|
|
|
<el-input type="text" size="mini" v-model="queryModel.personName"></el-input>
|
|
|
@@ -158,7 +158,7 @@ export default {
|
|
|
temperatureBegin: "",
|
|
|
temperatureEnd: "",
|
|
|
temperatureRanges: "",
|
|
|
- matchMsg:""
|
|
|
+ matchMsg: ""
|
|
|
},
|
|
|
loading: false,
|
|
|
tableData: [],
|
|
|
@@ -175,7 +175,7 @@ export default {
|
|
|
businessKey: "",
|
|
|
downloadLoading: false,
|
|
|
tableHeight: "",
|
|
|
- timeRangesDefaultTime:[]
|
|
|
+ timeRangesDefaultTime: []
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
@@ -293,20 +293,22 @@ export default {
|
|
|
getCurrentMonthFirst() {
|
|
|
var self = this;
|
|
|
var date = new Date();
|
|
|
- date.setDate(1);
|
|
|
+ //date.get(1);
|
|
|
var month = parseInt(date.getMonth() + 1);
|
|
|
- var day = date.getDate();
|
|
|
+ var day = date.getDate() - 3;
|
|
|
if (month < 10) month = "0" + month;
|
|
|
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();
|
|
|
lastDate.setMonth(date.getMonth() + 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];
|
|
|
}
|
xiao547607