|
|
@ -30,8 +30,8 @@ export default function useGetTasks() { |
|
|
|
|
|
|
|
|
// 初始化 定期任务
|
|
|
// 初始化 定期任务
|
|
|
async function initPlanTasks() { |
|
|
async function initPlanTasks() { |
|
|
// if (timeLineType.value === 1) setNextPlaceholderTasks({});
|
|
|
if (timeLineType.value === 1) setNextPlaceholderTasks({}); |
|
|
console.log('查询定期任务11111111111111111'); |
|
|
console.log('查询定期任务'); |
|
|
await getTasks({}); // 获取初始数据
|
|
|
await getTasks({}); // 获取初始数据
|
|
|
// await dataRender({});
|
|
|
// await dataRender({});
|
|
|
} |
|
|
} |
|
|
@ -62,7 +62,6 @@ export default function useGetTasks() { |
|
|
* @param {number} query.queryType 0向上查找 1向下查找(默认) 下查包含自己，上查不包含 |
|
|
* @param {number} query.queryType 0向上查找 1向下查找(默认) 下查包含自己，上查不包含 |
|
|
*/ |
|
|
*/ |
|
|
function getTasks(query) { |
|
|
function getTasks(query) { |
|
|
uni.$ui.showLoading(); |
|
|
|
|
|
store.commit('task/setShowSkeleton', false); |
|
|
store.commit('task/setShowSkeleton', false); |
|
|
|
|
|
|
|
|
const params = generateGetTaskParam(query); |
|
|
const params = generateGetTaskParam(query); |
|
|
@ -90,17 +89,12 @@ export default function useGetTasks() { |
|
|
params.queryType === 0 ? store.commit('task/setUpNextPage', arr[index].upNextPage) : store.commit('task/setDownNextPage', arr[index].downNextPage); // 下一页
|
|
|
params.queryType === 0 ? store.commit('task/setUpNextPage', arr[index].upNextPage) : store.commit('task/setDownNextPage', arr[index].downNextPage); // 下一页
|
|
|
|
|
|
|
|
|
// 如果第一次渲染但没有空数据则加载空数据
|
|
|
// 如果第一次渲染但没有空数据则加载空数据
|
|
|
// if (!currRoleShowTasks.value || !currRoleShowTasks.value.length && timeLineType.value === 1) {
|
|
|
if (!currRoleShowTasks.value || !currRoleShowTasks.value.length && timeLineType.value === 1) { |
|
|
// setNextPlaceholderTasks(params);
|
|
|
setNextPlaceholderTasks(params); |
|
|
// }
|
|
|
} |
|
|
|
|
|
|
|
|
// 数据处理
|
|
|
// 数据处理
|
|
|
dataRender(params); |
|
|
dataRender(params); |
|
|
|
|
|
|
|
|
// nextTick(() => {
|
|
|
|
|
|
// uni.$ui.hideLoading();
|
|
|
|
|
|
// console.log('-------------------------------')
|
|
|
|
|
|
// });
|
|
|
|
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
@ -177,72 +171,66 @@ export default function useGetTasks() { |
|
|
* 3-2-2-1、否。查找下一页数据并重复上述步骤 |
|
|
* 3-2-2-1、否。查找下一页数据并重复上述步骤 |
|
|
*/ |
|
|
*/ |
|
|
let showTasks = currRoleShowTasks.value; // 显示的数据
|
|
|
let showTasks = currRoleShowTasks.value; // 显示的数据
|
|
|
let firstTime = showTasks.length > 0 ? showTasks[0].planStart : new Date().getTime(); // 显示的数据第一个数据的时间
|
|
|
|
|
|
let lastTime = showTasks.length > 0 ? showTasks[showTasks.length - 1].planStart : new Date().getTime(); // 显示的数据最后一个数据的时间
|
|
|
|
|
|
const nextPage = params.queryType === 0 ? upNextPage.value : downNextPage.value; // 下一页的值
|
|
|
const nextPage = params.queryType === 0 ? upNextPage.value : downNextPage.value; // 下一页的值
|
|
|
if (centerData.length) { |
|
|
if (centerData.length) { |
|
|
let addNum = 0; |
|
|
let centerDataTime = '', // 中间数据的时间
|
|
|
centerData.forEach(v => { |
|
|
scaleTime = '', // 空时间节点的开始时间
|
|
|
let showFirstTime = showTasks.length > 0 ? showTasks[0].planStart : new Date().getTime(); // 显示的数据第一个数据的时间
|
|
|
centerTime = '', // 中间数据+/-15后的数据
|
|
|
let showLastTime = new Date().getTime(); // 显示的数据最后一个数据的时间
|
|
|
|
|
|
|
|
|
|
|
|
if (showTasks.length) { |
|
|
|
|
|
showLastTime = dayjs(+showTasks[showTasks.length - 1].planStart).add(1, timeGranularity.value); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
let dayNum = 0; // 两个日期中间相差的天数
|
|
|
|
|
|
let centerTime = '', // 中间数据+/-15后的数据
|
|
|
|
|
|
isExceed = false; // 时间跨度是否大于15
|
|
|
isExceed = false; // 时间跨度是否大于15
|
|
|
|
|
|
|
|
|
if (params.queryType) { |
|
|
if (params.queryType) { |
|
|
dayNum = dayjs(+v.planStart).diff(+showLastTime, timeGranularity.value, true); |
|
|
centerDataTime = centerData[centerData.length - 1].planStart; |
|
|
// if (!showTasks.length) dayNum++;
|
|
|
scaleTime = currDownTimeNode.value; |
|
|
centerTime = dayjs(+v.planStart).subtract(params.pageSize, timeGranularity.value); |
|
|
centerTime = dayjs(+centerDataTime).subtract(params.pageSize, timeGranularity.value); |
|
|
isExceed = dayjs(+centerTime).isAfter(+showLastTime, timeGranularity.value) |
|
|
isExceed = dayjs(+centerTime).isSame(+scaleTime, timeGranularity.value) || dayjs(+centerTime).isAfter(+scaleTime, timeGranularity.value) |
|
|
} else { |
|
|
} else { |
|
|
dayNum = dayjs(+v.planStart).diff(+showFirstTime, timeGranularity.value); |
|
|
centerDataTime = centerData[0].planStart; |
|
|
centerTime = dayjs(+v.planStart).add(params.pageSize, timeGranularity.value); |
|
|
scaleTime = currUpTimeNode.value; |
|
|
isExceed = dayjs(+centerTime).isBefore(+showFirstTime, timeGranularity.value) |
|
|
centerTime = dayjs(+centerDataTime).add(params.pageSize, timeGranularity.value); |
|
|
|
|
|
isExceed = dayjs(+centerTime).isSame(+scaleTime, timeGranularity.value) || dayjs(+centerTime).isBefore(+scaleTime, timeGranularity.value) |
|
|
} |
|
|
} |
|
|
dayNum = dayjs(+'1647513785000').get('month'); |
|
|
|
|
|
console.log(dayNum, v.planStart, showLastTime); |
|
|
|
|
|
|
|
|
|
|
|
if (!isExceed) { |
|
|
const firstDetailIndex = showTasks.findIndex(task => task.detailId); // 显示任务中存在真实任务
|
|
|
addNum++; |
|
|
const firstId = firstDetailIndex > -1 ? showTasks[firstDetailIndex].id : ''; |
|
|
let time = params.queryType === 0 ? showFirstTime : showLastTime; |
|
|
let lastDetailIndex = -1; |
|
|
const newTasks = uni.$task.setPlaceholderTasks(+time, !params.queryType, timeGranularity.value, dayNum); |
|
|
showTasks.forEach((item, index) => { |
|
|
params.queryType === 0 ? showTasks.splice(0, 0, newTasks) : showTasks.splice(showTasks.length, 0, newTasks); |
|
|
if (item.detailId) { |
|
|
params.queryType === 0 ? showTasks.splice(0, 0, v) : showTasks.splice(showTasks.length, 0, v); |
|
|
lastDetailIndex = index; |
|
|
// showTasks = flatten(showTasks); // 1维拍平
|
|
|
|
|
|
console.log('isExceed', showTasks, v) |
|
|
|
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|
|
|
|
const lastId = lastDetailIndex > -1 ? showTasks[lastDetailIndex].id : ''; |
|
|
showTasks = flatten(showTasks); // 1维拍平
|
|
|
|
|
|
|
|
|
showTasks.forEach((task, index) => { |
|
|
if (!addNum) { |
|
|
const arr = centerData.filter(item => dayjs(+item.planStart).isSame(+task.planStart, timeGranularity.value)); |
|
|
params.queryType === 0 ? setPrevPlaceholderTasks(params) : setNextPlaceholderTasks(params); |
|
|
if (arr.length) { |
|
|
|
|
|
if (params.queryType === 1 && task.id === lastId) { |
|
|
|
|
|
showTasks.splice(index + 1, 0, [...arr]) |
|
|
|
|
|
} else if (params.queryType === 0 && task.id === firstId) { |
|
|
|
|
|
showTasks.splice(index, 0, [...arr]) |
|
|
} else { |
|
|
} else { |
|
|
if (addNum === centerData.length && centerData.length < params.pageSize && nextPage > 0) { |
|
|
showTasks.splice(index, 1, [...arr]) |
|
|
getTasks({pageNum: nextPage, queryType: params.queryType}); |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
}) |
|
|
|
|
|
|
|
|
if (addNum < centerData.length || (addNum === centerData.length && centerData.length < params.pageSize && nextPage === 0)) { |
|
|
showTasks = flatten(showTasks); // 1维拍平
|
|
|
// 补齐刻度
|
|
|
|
|
|
// const obj = { tasks: showTasks, data, timeGranularity: timeGranularity.value };
|
|
|
if (!isExceed) { |
|
|
// showTasks = fillPlaceholderTask(obj);
|
|
|
if (centerData.length >= params.pageSize) { |
|
|
let num = ''; |
|
|
let len = -1; |
|
|
if (params.queryType === 0) { |
|
|
let data = params.queryType === 0 ? centerData[0] : centerData[centerData.length - 1]; |
|
|
num = dayjs(+showTasks[0].planStart).diff(+firstTime, timeGranularity.value); |
|
|
showTasks.forEach((item, index) => { |
|
|
} else { |
|
|
if (item.id === data.id) { |
|
|
num = dayjs(+showTasks[showTasks.length - 1].planStart).diff(+lastTime, timeGranularity.value); |
|
|
len = index; |
|
|
} |
|
|
} |
|
|
console.log('2222222222', firstTime, lastTime, num) |
|
|
}) |
|
|
|
|
|
|
|
|
if (addNum < centerData.length) { |
|
|
if (len > -1) { |
|
|
console.log('11111111111111111') |
|
|
showTasks = params.queryType === 0 ? showTasks.slice(len) : showTasks.slice(0, len + 1); |
|
|
renderScaleTask(params); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
} else if (nextPage > 0) { |
|
|
|
|
|
console.log('数据不为空，时间跨度小于15') |
|
|
|
|
|
getTasks({pageNum: nextPage, queryType: params.queryType}); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
@ -282,30 +270,14 @@ export default function useGetTasks() { |
|
|
getTasks({pageNum: 1, queryType: 0}); |
|
|
getTasks({pageNum: 1, queryType: 0}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// if (showTasks.length > 80) {
|
|
|
if (showTasks.length > 80) { |
|
|
// showTasks = params.queryType === 0 ? showTasks.slice(0, 80) : showTasks.slice(showTasks.length - 80);
|
|
|
showTasks = params.queryType === 0 ? showTasks.slice(0, 80) : showTasks.slice(showTasks.length - 80); |
|
|
// }
|
|
|
} |
|
|
|
|
|
|
|
|
store.commit('task/clearTasks'); |
|
|
store.commit('task/clearTasks'); |
|
|
params.queryType === 0 ? store.commit('task/setUpTasks', showTasks) : store.commit('task/setDownTasks', showTasks); |
|
|
params.queryType === 0 ? store.commit('task/setUpTasks', showTasks) : store.commit('task/setDownTasks', showTasks); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* 超出旧数据上、下限 补齐时间刻度到新数据的起始时间颗粒度 |
|
|
|
|
|
*/ |
|
|
|
|
|
function fillPlaceholderTask(obj) { |
|
|
|
|
|
const { prev, next } = uni.$task.computeFillPlaceholderTaskCount(obj); |
|
|
|
|
|
if (prev) { |
|
|
|
|
|
const newTasks = uni.$task.setPlaceholderTasks(+obj.tasks[0].planStart, true, obj.timeGranularity, prev); |
|
|
|
|
|
store.commit('task/setUpTasks', newTasks); |
|
|
|
|
|
} |
|
|
|
|
|
if (next) { |
|
|
|
|
|
const newTasks = uni.$task.setPlaceholderTasks(+obj.tasks[obj.tasks.length - 1].planStart, false, obj.timeGranularity, next); |
|
|
|
|
|
store.commit('task/setDownTasks', newTasks); |
|
|
|
|
|
} |
|
|
|
|
|
return tasks.value; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 设置时间轴向上的空数据
|
|
|
// 设置时间轴向上的空数据
|
|
|
function setPrevPlaceholderTasks() { |
|
|
function setPrevPlaceholderTasks() { |
|
|
store.commit('task/setTopEnd', true); |
|
|
store.commit('task/setTopEnd', true); |
|
|
@ -330,13 +302,13 @@ export default function useGetTasks() { |
|
|
startTime = dayjs(+currRoleShowTasks.value[currRoleShowTasks.value.length - 1].planStart).add(1, timeGranularity.value).valueOf(); |
|
|
startTime = dayjs(+currRoleShowTasks.value[currRoleShowTasks.value.length - 1].planStart).add(1, timeGranularity.value).valueOf(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// if (params.taskId) {
|
|
|
if (params.taskId) { |
|
|
// currRoleRealTasks.value.forEach(item => {
|
|
|
currRoleRealTasks.value.forEach(item => { |
|
|
// if (item.id === params.taskId) {
|
|
|
if (item.id === params.taskId) { |
|
|
// startTime = Number(item.planStart);
|
|
|
startTime = Number(item.planStart); |
|
|
// }
|
|
|
} |
|
|
// })
|
|
|
}) |
|
|
// }
|
|
|
} |
|
|
|
|
|
|
|
|
const initData = uni.$task.setPlaceholderTasks(startTime, false, timeGranularity.value); |
|
|
const initData = uni.$task.setPlaceholderTasks(startTime, false, timeGranularity.value); |
|
|
store.commit('task/setCurrDownTimeNode', startTime); |
|
|
store.commit('task/setCurrDownTimeNode', startTime); |
