diff --git a/p__Classrooms__Overview__index.async.js b/p__Classrooms__Overview__index.async.js index c0eef21317..09b6529016 100644 --- a/p__Classrooms__Overview__index.async.js +++ b/p__Classrooms__Overview__index.async.js @@ -264,16 +264,20 @@ var Page = function Page(_ref3) { urlData = _useState2[0], setUrlData = _useState2[1]; var _useState3 = (0,_react_17_0_2_react.useState)({ - start_time: dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year()).startOf('year').valueOf()).format('YYYY-MM-DD'), - end_time: dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year() + 1).startOf('year').valueOf()).format('YYYY-MM-DD'), + start_time: dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')).format('YYYY-MM-DD'), + end_time: dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'), + // start_time: moment(moment().year(moment().year()).startOf('year').valueOf()).format('YYYY-MM-DD'), + // end_time: moment(moment().year(moment().year() + 1).startOf('year').valueOf()).format('YYYY-MM-DD'), data_type: "Course" }), _useState4 = slicedToArray_default()(_useState3, 2), statParams = _useState4[0], setStatParams = _useState4[1]; var _useState5 = (0,_react_17_0_2_react.useState)({ - start_time: dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year()).startOf('year')), - end_time: dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year() + 1).startOf('year')) + // start_time: moment(moment().year(moment().year()).startOf('year')), + //end_time: moment(moment().year(moment().year() + 1).startOf('year')), + start_time: dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')), + end_time: dayjs_min_default()(dayjs_min_default()()) }), _useState6 = slicedToArray_default()(_useState5, 2), defauleDate = _useState6[0], @@ -1049,22 +1053,22 @@ var Page = function Page(_ref3) { onChange: function onChange(key) { setPicker(key); if (key == 'year') { - statParams.start_time = dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year()).startOf('year').valueOf()).format('YYYY-MM-DD'); - statParams.end_time = dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year() + 1).startOf('year').valueOf()).format('YYYY-MM-DD'); - defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year()).startOf('year')); - defauleDate.end_time = dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year() + 1).startOf('year')); + statParams.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')).format('YYYY-MM-DD'); + statParams.end_time = dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'); + defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')); + defauleDate.end_time = dayjs_min_default()(); } if (key == 'month') { - statParams.start_time = dayjs_min_default()(dayjs_min_default()().month(dayjs_min_default()().month()).startOf('month').valueOf()).format('YYYY-MM-DD'); - statParams.end_time = dayjs_min_default()(dayjs_min_default()().month(dayjs_min_default()().month() + 1).startOf('month').valueOf()).format('YYYY-MM-DD'); - defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().month(dayjs_min_default()().month()).startOf('month')); - defauleDate.end_time = dayjs_min_default()(dayjs_min_default()().month(dayjs_min_default()().month() + 1).startOf('month')); + statParams.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'months')).format('YYYY-MM-DD'); + statParams.end_time = dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'); + defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'months')); + defauleDate.end_time = dayjs_min_default()(); } if (key == 'week') { - statParams.start_time = dayjs_min_default()(dayjs_min_default()().week(dayjs_min_default()().week()).startOf('week').valueOf()).format('YYYY-MM-DD'); - statParams.end_time = dayjs_min_default()(dayjs_min_default()().week(dayjs_min_default()().week() + 1).startOf('week').valueOf()).format('YYYY-MM-DD'); - defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().week(dayjs_min_default()().week()).startOf('week')); - defauleDate.end_time = dayjs_min_default()(dayjs_min_default()().week(dayjs_min_default()().week() + 1).startOf('week')); + statParams.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'weeks')).format('YYYY-MM-DD'); + statParams.end_time = dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'); + defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'weeks')); + defauleDate.end_time = dayjs_min_default()(); } setStatParams(objectSpread2_default()({}, statParams)); setDefaultDate(objectSpread2_default()({}, defauleDate)); @@ -1075,13 +1079,13 @@ var Page = function Page(_ref3) { children: "\u81EA\u5B9A\u4E49" }), /*#__PURE__*/(0,jsx_runtime.jsx)(Option, { value: "year", - children: "\u672C\u5E74" + children: "\u8FD1\u4E00\u5E74" }), /*#__PURE__*/(0,jsx_runtime.jsx)(Option, { value: "month", - children: "\u672C\u6708" + children: "\u8FD1\u4E00\u4E2A\u6708" }), /*#__PURE__*/(0,jsx_runtime.jsx)(Option, { value: "week", - children: "\u672C\u5468" + children: "\u8FD1\u4E00\u5468" })] }), /*#__PURE__*/(0,jsx_runtime.jsx)(RangePicker, { style: { diff --git a/p__Paths__Overview__index.async.js b/p__Paths__Overview__index.async.js index b8fd237eaf..2885417115 100644 --- a/p__Paths__Overview__index.async.js +++ b/p__Paths__Overview__index.async.js @@ -203,16 +203,16 @@ var Page = function Page(_ref) { urlData = _useState4[0], setUrlData = _useState4[1]; var _useState5 = (0,_react_17_0_2_react.useState)({ - start_time: dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year()).startOf('year').valueOf()).format('YYYY-MM-DD'), - end_time: dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year() + 1).startOf('year').valueOf()).format('YYYY-MM-DD'), + start_time: dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')).format('YYYY-MM-DD'), + end_time: dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'), data_type: "Subject" }), _useState6 = slicedToArray_default()(_useState5, 2), statParams = _useState6[0], setStatParams = _useState6[1]; var _useState7 = (0,_react_17_0_2_react.useState)({ - start_time: dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year()).startOf('year')), - end_time: dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year() + 1).startOf('year')) + start_time: dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')), + end_time: dayjs_min_default()(dayjs_min_default()()) }), _useState8 = slicedToArray_default()(_useState7, 2), defauleDate = _useState8[0], @@ -1114,22 +1114,22 @@ var Page = function Page(_ref) { onChange: function onChange(key) { setPicker(key); if (key == 'year') { - statParams.start_time = dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year()).startOf('year').valueOf()).format('YYYY-MM-DD'); - statParams.end_time = dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year() + 1).startOf('year').valueOf()).format('YYYY-MM-DD'); - defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year()).startOf('year')); - defauleDate.end_time = dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year() + 1).startOf('year')); + statParams.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')).format('YYYY-MM-DD'); + statParams.end_time = dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'); + defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')); + defauleDate.end_time = dayjs_min_default()(); } if (key == 'month') { - statParams.start_time = dayjs_min_default()(dayjs_min_default()().month(dayjs_min_default()().month()).startOf('month').valueOf()).format('YYYY-MM-DD'); - statParams.end_time = dayjs_min_default()(dayjs_min_default()().month(dayjs_min_default()().month() + 1).startOf('month').valueOf()).format('YYYY-MM-DD'); - defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().month(dayjs_min_default()().month()).startOf('month')); - defauleDate.end_time = dayjs_min_default()(dayjs_min_default()().month(dayjs_min_default()().month() + 1).startOf('month')); + statParams.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'months')).format('YYYY-MM-DD'); + statParams.end_time = dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'); + defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'months')); + defauleDate.end_time = dayjs_min_default()(); } if (key == 'week') { - statParams.start_time = dayjs_min_default()(dayjs_min_default()().week(dayjs_min_default()().week()).startOf('week').valueOf()).format('YYYY-MM-DD'); - statParams.end_time = dayjs_min_default()(dayjs_min_default()().week(dayjs_min_default()().week() + 1).startOf('week').valueOf()).format('YYYY-MM-DD'); - defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().week(dayjs_min_default()().week()).startOf('week')); - defauleDate.end_time = dayjs_min_default()(dayjs_min_default()().week(dayjs_min_default()().week() + 1).startOf('week')); + statParams.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'weeks')).format('YYYY-MM-DD'); + statParams.end_time = dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'); + defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'weeks')); + defauleDate.end_time = dayjs_min_default()(); } setStatParams(objectSpread2_default()({}, statParams)); setDefaultDate(objectSpread2_default()({}, defauleDate)); @@ -1140,13 +1140,13 @@ var Page = function Page(_ref) { children: "\u81EA\u5B9A\u4E49" }), /*#__PURE__*/(0,jsx_runtime.jsx)(Option, { value: "year", - children: "\u672C\u5E74" + children: "\u8FD1\u4E00\u5E74" }), /*#__PURE__*/(0,jsx_runtime.jsx)(Option, { value: "month", - children: "\u672C\u6708" + children: "\u8FD1\u4E00\u4E2A\u6708" }), /*#__PURE__*/(0,jsx_runtime.jsx)(Option, { value: "week", - children: "\u672C\u5468" + children: "\u8FD1\u4E00\u5468" })] }), /*#__PURE__*/(0,jsx_runtime.jsx)(RangePicker, { style: { diff --git a/p__Shixuns__Overview__index.async.js b/p__Shixuns__Overview__index.async.js index 491b190cdc..b094669a69 100644 --- a/p__Shixuns__Overview__index.async.js +++ b/p__Shixuns__Overview__index.async.js @@ -245,31 +245,31 @@ var Page = function Page(_ref3) { urlData = _useState2[0], setUrlData = _useState2[1]; var _useState3 = (0,_react_17_0_2_react.useState)({ - start_time: dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year()).startOf('year').valueOf()).format('YYYY-MM-DD'), - end_time: dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year() + 1).startOf('year').valueOf()).format('YYYY-MM-DD'), + start_time: dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')).format('YYYY-MM-DD'), + end_time: dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'), data_type: "Clearance" }), _useState4 = slicedToArray_default()(_useState3, 2), statParams = _useState4[0], setStatParams = _useState4[1]; var _useState5 = (0,_react_17_0_2_react.useState)({ - start_time: dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year()).startOf('year').valueOf()).format('YYYY-MM-DD'), - end_time: dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year() + 1).startOf('year').valueOf()).format('YYYY-MM-DD'), + start_time: dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')).format('YYYY-MM-DD'), + end_time: dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'), data_type: "Evaluation" }), _useState6 = slicedToArray_default()(_useState5, 2), statParams2 = _useState6[0], setStatParams2 = _useState6[1]; var _useState7 = (0,_react_17_0_2_react.useState)({ - start_time: dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year()).startOf('year')), - end_time: dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year() + 1).startOf('year')) + start_time: dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')), + end_time: dayjs_min_default()(dayjs_min_default()()) }), _useState8 = slicedToArray_default()(_useState7, 2), defauleDate = _useState8[0], setDefaultDate = _useState8[1]; var _useState9 = (0,_react_17_0_2_react.useState)({ - start_time: dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year()).startOf('year')), - end_time: dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year() + 1).startOf('year')) + start_time: dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')), + end_time: dayjs_min_default()(dayjs_min_default()()) }), _useState10 = slicedToArray_default()(_useState9, 2), defauleDate2 = _useState10[0], @@ -1167,22 +1167,22 @@ var Page = function Page(_ref3) { onChange: function onChange(key) { setPicker(key); if (key == 'year') { - statParams.start_time = dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year()).startOf('year').valueOf()).format('YYYY-MM-DD'); - statParams.end_time = dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year() + 1).startOf('year').valueOf()).format('YYYY-MM-DD'); - defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year()).startOf('year')); - defauleDate.end_time = dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year() + 1).startOf('year')); + statParams.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')).format('YYYY-MM-DD'); + statParams.end_time = dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'); + defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')); + defauleDate.end_time = dayjs_min_default()(); } if (key == 'month') { - statParams.start_time = dayjs_min_default()(dayjs_min_default()().month(dayjs_min_default()().month()).startOf('month').valueOf()).format('YYYY-MM-DD'); - statParams.end_time = dayjs_min_default()(dayjs_min_default()().month(dayjs_min_default()().month() + 1).startOf('month').valueOf()).format('YYYY-MM-DD'); - defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().month(dayjs_min_default()().month()).startOf('month')); - defauleDate.end_time = dayjs_min_default()(dayjs_min_default()().month(dayjs_min_default()().month() + 1).startOf('month')); + statParams.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'months')).format('YYYY-MM-DD'); + statParams.end_time = dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'); + defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'months')); + defauleDate.end_time = dayjs_min_default()(); } if (key == 'week') { - statParams.start_time = dayjs_min_default()(dayjs_min_default()().week(dayjs_min_default()().week()).startOf('week').valueOf()).format('YYYY-MM-DD'); - statParams.end_time = dayjs_min_default()(dayjs_min_default()().week(dayjs_min_default()().week() + 1).startOf('week').valueOf()).format('YYYY-MM-DD'); - defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().week(dayjs_min_default()().week()).startOf('week')); - defauleDate.end_time = dayjs_min_default()(dayjs_min_default()().week(dayjs_min_default()().week() + 1).startOf('week')); + statParams.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'weeks')).format('YYYY-MM-DD'); + statParams.end_time = dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'); + defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'weeks')); + defauleDate.end_time = dayjs_min_default()(); } setStatParams(objectSpread2_default()({}, statParams)); setDefaultDate(objectSpread2_default()({}, defauleDate)); @@ -1193,13 +1193,13 @@ var Page = function Page(_ref3) { children: "\u81EA\u5B9A\u4E49" }), /*#__PURE__*/(0,jsx_runtime.jsx)(Option, { value: "year", - children: "\u672C\u5E74" + children: "\u8FD1\u4E00\u5E74" }), /*#__PURE__*/(0,jsx_runtime.jsx)(Option, { value: "month", - children: "\u672C\u6708" + children: "\u8FD1\u4E00\u4E2A\u6708" }), /*#__PURE__*/(0,jsx_runtime.jsx)(Option, { value: "week", - children: "\u672C\u5468" + children: "\u8FD1\u4E00\u5468" })] }), /*#__PURE__*/(0,jsx_runtime.jsx)(RangePicker, { style: { @@ -1278,22 +1278,22 @@ var Page = function Page(_ref3) { onChange: function onChange(key) { setPicker2(key); if (key == 'year') { - statParams2.start_time = dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year()).startOf('year').valueOf()).format('YYYY-MM-DD'); - statParams2.end_time = dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year() + 1).startOf('year').valueOf()).format('YYYY-MM-DD'); - defauleDate2.start_time = dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year()).startOf('year')); - defauleDate2.end_time = dayjs_min_default()(dayjs_min_default()().year(dayjs_min_default()().year() + 1).startOf('year')); + statParams2.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')).format('YYYY-MM-DD'); + statParams2.end_time = dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'); + defauleDate2.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')); + defauleDate2.end_time = dayjs_min_default()(); } if (key == 'month') { - statParams2.start_time = dayjs_min_default()(dayjs_min_default()().month(dayjs_min_default()().month()).startOf('month').valueOf()).format('YYYY-MM-DD'); - statParams2.end_time = dayjs_min_default()(dayjs_min_default()().month(dayjs_min_default()().month() + 1).startOf('month').valueOf()).format('YYYY-MM-DD'); - defauleDate2.start_time = dayjs_min_default()(dayjs_min_default()().month(dayjs_min_default()().month()).startOf('month')); - defauleDate2.end_time = dayjs_min_default()(dayjs_min_default()().month(dayjs_min_default()().month() + 1).startOf('month')); + statParams2.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'months')).format('YYYY-MM-DD'); + statParams2.end_time = dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'); + defauleDate2.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'months')); + defauleDate2.end_time = dayjs_min_default()(); } if (key == 'week') { - statParams2.start_time = dayjs_min_default()(dayjs_min_default()().week(dayjs_min_default()().week()).startOf('week').valueOf()).format('YYYY-MM-DD'); - statParams2.end_time = dayjs_min_default()(dayjs_min_default()().week(dayjs_min_default()().week() + 1).startOf('week').valueOf()).format('YYYY-MM-DD'); - defauleDate2.start_time = dayjs_min_default()(dayjs_min_default()().week(dayjs_min_default()().week()).startOf('week')); - defauleDate2.end_time = dayjs_min_default()(dayjs_min_default()().week(dayjs_min_default()().week() + 1).startOf('week')); + statParams2.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'weeks')).format('YYYY-MM-DD'); + statParams2.end_time = dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'); + defauleDate2.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'weeks')); + defauleDate2.end_time = dayjs_min_default()(); } setStatParams2(objectSpread2_default()({}, statParams2)); setDefaultDate2(objectSpread2_default()({}, defauleDate2)); @@ -1304,13 +1304,13 @@ var Page = function Page(_ref3) { children: "\u81EA\u5B9A\u4E49" }), /*#__PURE__*/(0,jsx_runtime.jsx)(Option, { value: "year", - children: "\u672C\u5E74" + children: "\u8FD1\u4E00\u5E74" }), /*#__PURE__*/(0,jsx_runtime.jsx)(Option, { value: "month", - children: "\u672C\u6708" + children: "\u8FD1\u4E00\u4E2A\u6708" }), /*#__PURE__*/(0,jsx_runtime.jsx)(Option, { value: "week", - children: "\u672C\u5468" + children: "\u8FD1\u4E00\u5468" })] }), /*#__PURE__*/(0,jsx_runtime.jsx)(RangePicker, { style: {