|
@@ -107,7 +107,7 @@ export default defineComponent({
|
|
|
let myTimeArr: any = [];
|
|
|
let timerArr: any = getTimers();
|
|
|
let nowTimerArr: any = [];
|
|
|
- let nowData: any = [];
|
|
|
+ let nowData: any = {};
|
|
|
let redUrl: any = `${parseImgUrl("ipdImages", "time-check.svg")}`;
|
|
|
let bgRed: any = `linear-gradient(0deg, rgba(255, 0, 0, 0.2), rgba(255, 0, 0, 0.2)), url(${redUrl})`;
|
|
|
const userInfo: any = getUserInfo();
|
|
@@ -685,14 +685,12 @@ export default defineComponent({
|
|
|
timerArr: timerArr,
|
|
|
});
|
|
|
}
|
|
|
- if (!(proxyData.nowData && proxyData.nowData.length)) {
|
|
|
- proxyData.dateArr.map((item: any, index: any) => {
|
|
|
- if (item.week === "今天") {
|
|
|
- proxyData.checkDate(item, index);
|
|
|
- return;
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
+ proxyData.dateArr.map((item: any, index: any) => {
|
|
|
+ if (index === proxyData.activeIndex) {
|
|
|
+ proxyData.checkDate(item, index);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ });
|
|
|
},
|
|
|
clearTimerBoxStyle() {
|
|
|
proxyData.dateArr.map((elItem: any) => {
|
|
@@ -709,33 +707,39 @@ export default defineComponent({
|
|
|
/**
|
|
|
* 切换日期
|
|
|
*/
|
|
|
+ activeIndex: 0,
|
|
|
checkDate(item: any, index: any) {
|
|
|
proxyData.clearTimerBoxStyle();
|
|
|
item.isActive = true;
|
|
|
+ proxyData.activeIndex = index;
|
|
|
proxyData.nowTimerArr = proxyData.dateArr[index].timerArr;
|
|
|
proxyData.nowData = proxyData.dateArr[index];
|
|
|
- // dom元素宽高调整
|
|
|
nextTick(() => {
|
|
|
proxyData.setOptionnalTime(proxyData.nowTimerArr);
|
|
|
- console.log(item);
|
|
|
- let index: any = proxyData.getNowIndex();
|
|
|
- proxyData.setPastTime(index);
|
|
|
+ let nowIndex: any = proxyData.getNowIndex();
|
|
|
+ proxyData.setPastTime(nowIndex);
|
|
|
// // 已经被选择的时间
|
|
|
proxyData.setCheckTimeStyle();
|
|
|
// // 固定服务时间
|
|
|
proxyData.setServiceTimerStyle();
|
|
|
- if (proxyData.nowData.week === "今天") {
|
|
|
- proxyData.changeEl();
|
|
|
- }
|
|
|
+ // dom元素宽高调整
|
|
|
+ proxyData.changeEl();
|
|
|
});
|
|
|
},
|
|
|
/**
|
|
|
* dom的滚动功能设置
|
|
|
*/
|
|
|
+ flag: false,
|
|
|
changeEl() {
|
|
|
proxyData.setScreennWidth();
|
|
|
proxyData.sliderSwiper();
|
|
|
proxyData.endBoxSwiper();
|
|
|
+ // if (!proxyData.flag) {
|
|
|
+ // proxyData.setScreennWidth();
|
|
|
+ // proxyData.sliderSwiper();
|
|
|
+ // proxyData.endBoxSwiper();
|
|
|
+ // proxyData.flag = true;
|
|
|
+ // }
|
|
|
},
|
|
|
// 加班数据格式化=》后台需要的数据结构(添加加班逻辑)
|
|
|
formateAddTimer() {
|
|
@@ -994,6 +998,7 @@ export default defineComponent({
|
|
|
watch(props, (newProps: any) => {
|
|
|
proxyData.workkArr = newProps.workkArr;
|
|
|
proxyData.projectId = newProps.projectId;
|
|
|
+ // proxyData.setWorkTimeList();
|
|
|
// proxyData.getWorkTimeList();
|
|
|
});
|
|
|
onMounted(() => {
|