Skip to content

S
SuperMan
Commit 6862e954 authored by 黄奎's avatar 黄奎
Browse files
Options

11

parent fce87c62
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
src/components/rank/dataCount.vue
View file @ 6862e954
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
@change="handleDateChange()" @change="handleDateChange()"
multiple multiple
filterable filterable
collapse-tags
> >
<el-option <el-option
v-for="(x, i) in empList" v-for="(x, i) in empList"
...@@ -642,7 +643,7 @@ export default { ...@@ -642,7 +643,7 @@ export default {
const end = new Date(); const end = new Date();
const start = new Date(); const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 8); start.setTime(start.getTime() - 3600 * 1000 * 24 * 8);
end.setTime(end.getTime() - 3600 * 1000 * 24 * 1); end.setTime(end.getTime());
picker.$emit("pick", [start, end]); picker.$emit("pick", [start, end]);
} }
}, },
...@@ -652,7 +653,7 @@ export default { ...@@ -652,7 +653,7 @@ export default {
const end = new Date(); const end = new Date();
const start = new Date(); const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 31); start.setTime(start.getTime() - 3600 * 1000 * 24 * 31);
end.setTime(end.getTime() - 3600 * 1000 * 24 * 1); end.setTime(end.getTime());
picker.$emit("pick", [start, end]); picker.$emit("pick", [start, end]);
} }
}, },
...@@ -662,13 +663,13 @@ export default { ...@@ -662,13 +663,13 @@ export default {
const end = new Date(); const end = new Date();
const start = new Date(); const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 91); start.setTime(start.getTime() - 3600 * 1000 * 24 * 91);
end.setTime(end.getTime() - 3600 * 1000 * 24 * 1); end.setTime(end.getTime());
picker.$emit("pick", [start, end]); picker.$emit("pick", [start, end]);
} }
} }
], ],
disabledDate(time) { disabledDate(time) {
return time.getTime() > new Date(Date.now() - 3600 * 1000 * 24); return time.getTime() > new Date(Date.now() );
} }
}, },
menus: [ menus: [
...@@ -853,7 +854,7 @@ export default { ...@@ -853,7 +854,7 @@ export default {
const end = new Date(); const end = new Date();
const start = new Date(); const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
end.setTime(end.getTime() - 3600 * 1000 * 24); end.setTime(end.getTime());
this.parameters.dateRange = [ this.parameters.dateRange = [
start.toLocaleString().split(" ")[0], start.toLocaleString().split(" ")[0],
end.toLocaleString().split(" ")[0] end.toLocaleString().split(" ")[0]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment