Merge branch 'master' into 8001-expeditionGrafanaHotFix
gitea/salix-front/pipeline/pr-master This commit looks good
Details
gitea/salix-front/pipeline/pr-master This commit looks good
Details
This commit is contained in:
commit
65b9da7b54
|
@ -345,7 +345,7 @@ const getMailStates = async (date) => {
|
||||||
const prevMonth = month == 1 ? 12 : month - 1;
|
const prevMonth = month == 1 ? 12 : month - 1;
|
||||||
const params = {
|
const params = {
|
||||||
month,
|
month,
|
||||||
year: selectedDateYear.value,
|
year: date.getFullYear(),
|
||||||
};
|
};
|
||||||
|
|
||||||
const curMonthStates = (await axios.get(url, { params })).data;
|
const curMonthStates = (await axios.get(url, { params })).data;
|
||||||
|
|
|
@ -102,8 +102,7 @@ const getWorkWeekElements = () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const paintWorkWeeks = async () => {
|
const paintWorkWeeks = async () => {
|
||||||
for (var i = 0; i < workWeeksElements.value.length; i++) {
|
for (const element of workWeeksElements.value) {
|
||||||
const element = workWeeksElements.value[i];
|
|
||||||
const week = Number(element.innerHTML);
|
const week = Number(element.innerHTML);
|
||||||
const weekState = workerTimeControlMailsMap.value.get(week);
|
const weekState = workerTimeControlMailsMap.value.get(week);
|
||||||
const { className, title } = stateClasses[weekState] || {};
|
const { className, title } = stateClasses[weekState] || {};
|
||||||
|
|
Loading…
Reference in New Issue