Browse Source

feat: 时间轴优化

test2
xuesinan 3 years ago
parent
commit
1fe5eb6d6c
  1. 3
      CHANGELOG.md
  2. 1362
      components/PrettyExchange/PrettyExchange.vue
  3. 1
      components/Render/Render.vue
  4. 2
      components/TimeLine/TimeLine.vue
  5. 1
      components/Upload/Upload.vue
  6. 407
      hooks/project/useGetTasks - 最新的.js
  7. 295
      hooks/project/useGetTasks.js
  8. 80
      hooks/project/useInit.js
  9. 19
      pages/index/index.vue
  10. 56
      pages/project/project.vue
  11. 30
      store/task/mutations.js
  12. 11
      store/task/state.js

3
CHANGELOG.md

@ -1,4 +1,4 @@
# 1.0.0 (2022-07-19)
# 1.0.0 (2022-07-26)
### 🌟 新功能
范围|描述|commitId
@ -43,6 +43,7 @@
- | 交付物2 | [864b080](https://101.201.226.163:50022/ccsens_tall/TALL-MUI-4/commits/864b080)
- | 解决时间轴日常任务不显示问题 | [c532a93](https://101.201.226.163:50022/ccsens_tall/TALL-MUI-4/commits/c532a93)
- | 刻度模式时间轴 | [a9bc53a](https://101.201.226.163:50022/ccsens_tall/TALL-MUI-4/commits/a9bc53a)
- | 切换时间轴模式按钮变小 | [f8a333d](https://101.201.226.163:50022/ccsens_tall/TALL-MUI-4/commits/f8a333d)
- | 日历页首页 | [561c8e6](https://101.201.226.163:50022/ccsens_tall/TALL-MUI-4/commits/561c8e6)
- | 日历页添加 | [1b46a91](https://101.201.226.163:50022/ccsens_tall/TALL-MUI-4/commits/1b46a91)
- | 删除项目 | [f43d4ba](https://101.201.226.163:50022/ccsens_tall/TALL-MUI-4/commits/f43d4ba)

1362
components/PrettyExchange/PrettyExchange.vue

File diff suppressed because it is too large

1
components/Render/Render.vue

@ -18,7 +18,6 @@
:prop="pluginInfo"
:change:prop="projectRender.renderDom"
:data-url="domain"
:data-tTime="task.planStart"
:data-longitude="longitude"
:data-latitude="latitude"
></view>

2
components/TimeLine/TimeLine.vue

@ -61,6 +61,7 @@ async function handleScrollTop() {
store.commit('task/updateTasks', props.tasks)
console.warn('滚动到顶部: ');
getTasksHook.setPrevPlaceholderTasks(); //
let params = { pageNum: upNextPage.value, queryType: 0, triggerType: 0 };
getTasksHook.dataRender(params);
}
@ -72,6 +73,7 @@ async function handleScrollBottom() {
store.commit('task/updateTasks', props.tasks);
console.warn('滚动到底部: ');
getTasksHook.setNextPlaceholderTasks(); //
let params = { pageNum: downNextPage.value, queryType: 1, triggerType: 0 };
getTasksHook.dataRender(params);
}

1
components/Upload/Upload.vue

@ -88,5 +88,6 @@
bottom: 0;
transform: translate3d(0, 50%, 0);
color: $uni-color-primary !important;
z-index: 9;
}
</style>

407
hooks/project/useGetTasks - 最新的.js

@ -0,0 +1,407 @@
import { computed, nextTick, watch } from 'vue';
import { useStore } from 'vuex';
import { flatten } from 'lodash';
import dayjs from 'dayjs';
export default function useGetTasks() {
const store = useStore();
const tasks = computed(() => store.state.task.tasks);
const timeLineType = computed(() => store.state.task.timeLineType); // 时间轴模式
const realTasks = computed(() => store.state.task.realTasks); // 真实任务
const downNextPage = computed(() => store.state.task.downNextPage); // 下一页
const upNextPage = computed(() => store.state.task.upNextPage); // 下一页
const currUpTimeNode = computed(() => store.state.task.currUpTimeNode); // 当前查询的时间
const currDownTimeNode = computed(() => store.state.task.currDownTimeNode); // 当前查询的时间
const roleId = computed(() => store.state.role.roleId);
const timeNode = computed(() => store.state.task.timeNode);
const timeUnit = computed(() => store.state.task.timeUnit);
const visibleRoles = computed(() => store.state.role.visibleRoles);
const allTasks = computed(() => store.state.task.allTasks);
const roleIndex = computed(() => store.state.role.roleIndex);
const projectId = computed(() => store.getters['project/projectId']);
const timeGranularity = computed(() => store.getters['task/timeGranularity']);
const remindData = computed(() => store.state.socket.remindData); // 小红点
const currRoleRealTasks = computed(() => store.state.task.currRoleRealTasks); // 当前角色的真实任务数据
const currRoleShowTasks = computed(() => store.state.task.currRoleShowTasks); // 当前角色的展示任务数据
const currLocationTaskId = computed(() => store.state.socket.currLocationTaskId);
const businessCode = computed(() => store.state.task.businessCode);
// 初始化 定期任务
async function initPlanTasks() {
uni.$ui.showLoading();
await getTasks({}); // 获取初始数据
}
/**
* 生成getTasks所用的参数
* @param {object} query getTasks传递的参数
*/
function generateGetTaskParam(query) {
return {
roleId: roleId.value,
timeNode: query.timeNode || timeNode.value,
timeUnit: query.timeUnit || timeUnit.value,
queryType: query.queryType === 0 ? 0 : 1,
pageNum: query.pageNum || 1,
pageSize: query.pageSize || uni.$taskConfig.pageCount,
taskId: query.taskId || currLocationTaskId.value,
businessCode: query.businessCode || businessCode.value,
triggerType: query.triggerType || 1
};
}
/**
* 根据时间基准点和角色查找定期任务
* @param {object} query
* @param {string} query.roleId 角色id
* @param {string} query.timeNode 时间基准点 默认当前
* @param {string} query.timeUnit 时间颗粒度 默认天
* @param {string} query.queryNum 查找颗粒度数量 默认3个
* @param {number} query.queryType 0向上查找 1向下查找(默认) 下查包含自己上查不包含
*/
function getTasks(query) {
uni.$ui.showLoading();
store.commit('task/setShowSkeleton', false);
if (businessCode.value === 'ZERO' && currRoleRealTasks.value.length > 0) {
let needTask = query.queryType === 0 ? currRoleRealTasks.value[0] : currRoleRealTasks.value[currRoleRealTasks.value.length - 1];
query.taskId = needTask.id;
query.timeNode = needTask.planStart;
query.businessCode = needTask.businessCode;
}
const params = generateGetTaskParam(query);
uni.$catchReq.getTaskByNum(params, (err, data) => {
store.commit('task/setShowSkeleton', false);
if (err) {
// TODO: 提示错误
console.error('err: ', err);
} else {
store.commit('task/setShowScrollTo', true);
params.queryType === 0 ? store.commit('task/setUpRealTasks', data.list) : store.commit('task/setDownRealTasks', data.list);
const index = visibleRoles.value.findIndex(role => role.id === roleId.value);
const arr = [...allTasks.value];
arr[index].realTasks = [...realTasks.value];
arr[index].upNextPage = params.queryType === 0 ? data.nextPage : 1;
arr[index].downNextPage = params.queryType === 1 ? data.nextPage : 1;
store.commit('task/setAllTasks', arr);
store.commit('task/setCurrRoleRealTasks', arr[index].realTasks); // 设置当前角色的真实任务数据
if (businessCode.value === 'ZERO' && data.list.length < params.pageSize) {
params.queryType === 0 ? store.commit('task/setUpNextPage', 0) : store.commit('task/setDownNextPage', 0); // 下一页
} else if (businessCode.value !== 'ZERO') {
params.queryType === 0 ? store.commit('task/setUpNextPage', arr[index].upNextPage) : store.commit('task/setDownNextPage', arr[index].downNextPage); // 下一页
}
// 数据处理
dataRender(params);
}
});
}
function dataRender(params) {
timeLineType.value === 1 ? renderScaleTask(params) : renderConTask(params);
}
// 刻度模式数据处理
async function renderScaleTask(query) {
const params = generateGetTaskParam(query);
let centerData = await showTaskTime(params, currRoleShowTasks.value, currRoleRealTasks.value) || [];
await handleTasksData(params, centerData, currRoleRealTasks.value);
}
// 已显示的任务第一个时间和最后一个时间
async function showTaskTime(params, showTasks, realTasks) {
/**
* 1判断显示任务中是否有真实任务
* 1-1根据id查找任务
* 1-2根据时间查找任务
* 2查找15个任务
*/
// 初始值
// 显示任务中没有真实任务数据
let centerData = [];
if (realTasks.length > params.pageSize && params.queryType === 0) {
centerData = realTasks.slice(realTasks.length - params.pageSize);
} else {
centerData = realTasks.slice(0, params.pageSize);
}
const firstDetailIndex = showTasks.findIndex(task => task.detailId);
if (firstDetailIndex > -1) {
// 显示任务中有真实任务数据
const firstId = showTasks[firstDetailIndex].id;
let lastDetailIndex = -1;
showTasks.forEach((item, index) => {
if (item.detailId) {
lastDetailIndex = index;
}
})
const lastId = showTasks[lastDetailIndex].id;
realTasks.forEach((item, index) => {
if (params.queryType === 1 && item.id === lastId) {
centerData = realTasks.slice(index + 1, index + 1 + params.pageSize);
} else if (params.queryType === 0 && item.id === firstId) {
centerData = index >= params.pageSize ? realTasks.slice(index - params.pageSize, index) : realTasks.slice(0, index);
}
})
}
return centerData;
}
async function handleTasksData(params, centerData, realTasks) {
let showTasks = currRoleShowTasks.value; // 显示的数据
let firstTime = showTasks.length > 0 ? showTasks[0].planStart : new Date().getTime(); // 显示的数据第一个数据的时间
let lastTime = showTasks.length > 0 ? dayjs(+showTasks[showTasks.length - 1].planStart).add(1, timeGranularity.value) : new Date().getTime(); // 显示的数据最后一个数据的时间
let upTargetTime = dayjs(+firstTime).subtract(params.pageSize, timeGranularity.value);
let downTargetTime = dayjs(+lastTime).add(params.pageSize - 1, timeGranularity.value);
const nextPage = params.queryType === 0 ? upNextPage.value : downNextPage.value; // 下一页的值
// 双击小红点
if (currLocationTaskId.value) {
lastTime = centerData.length ? centerData[0].planStart : new Date().getTime();
}
if (centerData.length) {
let arr = [];
centerData.forEach(v => {
let centerTime = '', // 中间数据+/-15后的数据
isExceed = false; // 时间跨度是否大于15
if (params.queryType) {
isExceed = dayjs(+downTargetTime).isAfter(+v.planStart, timeGranularity.value)
} else {
isExceed = dayjs(+upTargetTime).isBefore(+v.planStart, timeGranularity.value)
}
if (isExceed) {
arr.push(v);
}
})
if (!arr.length) {
params.queryType === 0 ? setPrevPlaceholderTasks(params) : setNextPlaceholderTasks(params);
} else {
if (arr.length === centerData.length && centerData.length < params.pageSize && nextPage > 0) {
getTasks({pageNum: nextPage, queryType: params.queryType});
} else {
let cycleIndex = params.pageSize;
let newArr = [];
let breakTime = ''; // 循环结束时间
let continueTime = ''; // 第一个数据的时间
// 循环开始时间
let currTime = params.queryType === 0 ? upTargetTime : lastTime;
// 符合条件的数据 < centerData的数据
// 或者
// centerData的数据全部符合条件,但是 < 15,而且没有下一页,不能向下查
// 数据需要补齐15天的刻度
// 所以循环长度为params.pageSize
// centerData的数据全部显示,且数量 = 15
// 需要补齐数据中间的空刻度
// 循环长度为 结束时间到开始时间的差
// 当循环到的时间 = 数据最后一条的时间,则跳出循环
if (arr.length === centerData.length && centerData.length === params.pageSize) {
if (params.queryType === 0) {
continueTime = arr[0].planStart;
} else {
breakTime = arr[arr.length - 1].planStart;
}
}
// if (arr.length < centerData.length || (arr.length === centerData.length && centerData.length < params.pageSize && nextPage === 0)) {
const startTime = params.queryType === 0 ? firstTime : dayjs(+lastTime).subtract(1, timeGranularity.value);
let firstArr = arr.filter(item => dayjs(+item.planStart).isSame(+startTime, timeGranularity.value));
if (firstArr.length && params.queryType === 1) {
newArr = [...newArr, ...firstArr];
}
// }
for (let i = 0; i < params.pageSize; i++) {
if (continueTime && dayjs(+currTime).isBefore(+continueTime, timeGranularity.value)) {
currTime = dayjs(+currTime).add(1, timeGranularity.value);
continue;
} else {
let termArr = arr.filter(item => dayjs(+item.planStart).isSame(+currTime, timeGranularity.value));
if (termArr.length === 0) {
const newTasks = uni.$task.setPlaceholderTasks(+currTime, false, timeGranularity.value, 1);
newArr = [...newArr, ...newTasks];
} else {
newArr = [...newArr, ...termArr];
}
if (breakTime && dayjs(+currTime).isSame(+breakTime, timeGranularity.value)) {
break;
} else {
currTime = dayjs(+currTime).add(1, timeGranularity.value);
}
}
}
if (firstArr.length && params.queryType === 0) {
newArr = [...newArr, ...firstArr];
}
const repeatTime = params.queryType === 0 ? newArr[newArr.length - 1].planStart : newArr[0].planStart;
const repeatTimeArr = showTasks.filter(item => dayjs(+item.planStart).isSame(+repeatTime, timeGranularity.value));
if (repeatTimeArr.length) {
const index = repeatTimeArr.findIndex(item => item.detailId);
if (index > -1) {
showTasks = params.queryType === 0 ? [...newArr, ...showTasks] : [...showTasks, ...newArr];
} else {
showTasks = params.queryType === 0 ? showTasks.slice(1) : showTasks.slice(0, showTasks.length - 2);
showTasks = params.queryType === 0 ? [...newArr, ...showTasks] : [...showTasks, ...newArr];
}
} else {
showTasks = params.queryType === 0 ? [...newArr, ...showTasks] : [...showTasks, ...newArr];
}
}
showTasks = flatten(showTasks); // 1维拍平
store.commit('task/clearTasks');
params.queryType === 0 ? store.commit('task/setUpTasks', showTasks) : store.commit('task/setDownTasks', showTasks);
}
} else {
if (nextPage > 0) {
getTasks({pageNum: nextPage, queryType: params.queryType});
} else {
params.queryType === 0 ? setPrevPlaceholderTasks(params) : setNextPlaceholderTasks(params);
}
}
uni.$ui.hideLoading();
// if (showTasks.length > 30) {
// showTasks = params.queryType === 0 ? showTasks.slice(0, 80) : showTasks.slice(showTasks.length - 80);
// }
}
// 任务模式
async function renderConTask(params) {
let nextPage = params.queryType === 0 ? upNextPage.value : downNextPage.value; // 下一页的值
let showTasks = currRoleShowTasks.value;
let centerData = await showTaskTime(params, showTasks, currRoleRealTasks.value) || [];
if (centerData.length < 15 && nextPage > 0) {
getTasks({pageNum: nextPage, queryType: params.queryType});
} else {
if (params.queryType === 0) {
showTasks = [...centerData, ...showTasks];
} else {
showTasks = [...showTasks, ...centerData];
}
}
if (showTasks.length < 15 && nextPage === 0 && params.queryType === 1) {
getTasks({pageNum: 1, queryType: 0});
}
// if (showTasks.length > 80) {
// showTasks = params.queryType === 0 ? showTasks.slice(0, 80) : showTasks.slice(showTasks.length - 80);
// }
store.commit('task/clearTasks');
params.queryType === 0 ? store.commit('task/setUpTasks', showTasks) : store.commit('task/setDownTasks', showTasks);
}
// 设置时间轴向上的空数据
function setPrevPlaceholderTasks() {
store.commit('task/setTopEnd', true);
let startTime = '';
if (!currRoleShowTasks.value || !currRoleShowTasks.value.length) {
startTime = Date.now(); // 没有任务就应该是时间基准点
} else {
startTime = currRoleShowTasks.value[0].planStart - 0; // 有任务就是第一个任务的计划开始时间
}
const placeholderTasks = uni.$task.setPlaceholderTasks(startTime, true, timeGranularity.value);
store.commit('task/setCurrUpTimeNode', startTime);
store.commit('task/setUpTasks', placeholderTasks);
}
// 设置时间轴向下的空数据
function setNextPlaceholderTasks(params) {
// store.commit('task/setBottomEnd', true);
let startTime = '';
if (!currRoleShowTasks.value || !currRoleShowTasks.value.length) {
startTime = Date.now();
} else {
startTime = dayjs(+currRoleShowTasks.value[currRoleShowTasks.value.length - 1].planStart).add(1, timeGranularity.value).valueOf();
}
// if (params.taskId) {
// currRoleRealTasks.value.forEach(item => {
// if (item.id === params.taskId) {
// startTime = Number(item.planStart);
// }
// })
// }
const initData = uni.$task.setPlaceholderTasks(startTime, false, timeGranularity.value);
store.commit('task/setCurrDownTimeNode', startTime);
store.commit('task/setDownTasks', initData);
}
/**
* 当日常任务发生变化时
* 将新获取到的日常任务放在allTasks里
*/
watch(tasks, () => {
// 添加到allTasks里
const index = visibleRoles.value.findIndex(role => role.id === roleId.value);
const arr = [...allTasks.value];
if (arr.length && index > -1) {
if (remindData.value) {
tasks.value.forEach(task => {
task.remindNum = 0;
task.msgId = '';
if (task.plugins && task.plugins.length) {
task.plugins.forEach(pluginArr => {
pluginArr.forEach(plugin => {
plugin.remindNum = 0;
remindData.value.forEach(remind => {
const remind_data = JSON.parse(remind.data);
if (projectId.value === remind_data.data.projectId && roleId.value === remind_data.data.roleId) {
if (remind_data.data.taskId === task.id) {
task.remindNum++;
task.msgId = remind.id;
}
if (remind_data.data.taskId === task.id && remind_data.data.pluginId === plugin.pluginTaskId) {
plugin.remindNum++;
}
}
});
});
});
}
})
}
arr[index].task = [...tasks.value];
store.commit('task/setCurrRoleShowTasks', arr[index].task); // 设置当前角色的展示任务数据
}
store.commit('task/setAllTasks', arr);
});
return {
initPlanTasks,
getTasks,
dataRender
}
}

295
hooks/project/useGetTasks.js

@ -5,34 +5,39 @@ import dayjs from 'dayjs';
export default function useGetTasks() {
const store = useStore();
const tasks = computed(() => store.state.task.tasks);
const tasks = computed(() => store.state.task.tasks); // 当前角色显示任务
const timeLineType = computed(() => store.state.task.timeLineType); // 时间轴模式
const realTasks = computed(() => store.state.task.realTasks); // 真实任务
const downNextPage = computed(() => store.state.task.downNextPage); // 下一页
const upNextPage = computed(() => store.state.task.upNextPage); // 下一页
const currUpTimeNode = computed(() => store.state.task.currUpTimeNode); // 当前查询的时间
const currDownTimeNode = computed(() => store.state.task.currDownTimeNode); // 当前查询的时间
const roleId = computed(() => store.state.role.roleId);
const timeNode = computed(() => store.state.task.timeNode);
const timeUnit = computed(() => store.state.task.timeUnit);
const visibleRoles = computed(() => store.state.role.visibleRoles);
const allTasks = computed(() => store.state.task.allTasks);
const roleIndex = computed(() => store.state.role.roleIndex);
const realTasks = computed(() => store.state.task.realTasks); // 当前角色真实任务
const downNextPage = computed(() => store.state.task.downNextPage); // 当前角色下一页 - 向下
const upNextPage = computed(() => store.state.task.upNextPage); // 当前角色下一页 - 向下
// const currUpTimeNode = computed(() => store.state.task.currUpTimeNode); // 当前查询的时间
// const currDownTimeNode = computed(() => store.state.task.currDownTimeNode); // 当前查询的时间
const roleId = computed(() => store.state.role.roleId); // 当前角色id
const timeNode = computed(() => store.state.task.timeNode); // 当前时间节点
const timeUnit = computed(() => store.state.task.timeUnit); // 当前时间单位
const visibleRoles = computed(() => store.state.role.visibleRoles); // 角色列表
const allTasks = computed(() => store.state.task.allTasks); // 所有任务
const roleIndex = computed(() => store.state.role.roleIndex); // 当前角色位置
const projectId = computed(() => store.getters['project/projectId']);
const timeGranularity = computed(() => store.getters['task/timeGranularity']);
const remindData = computed(() => store.state.socket.remindData); // 小红点
const currRoleRealTasks = computed(() => store.state.task.currRoleRealTasks); // 当前角色的真实任务数据
const currRoleShowTasks = computed(() => store.state.task.currRoleShowTasks); // 当前角色的展示任务数据
const currLocationTaskId = computed(() => store.state.socket.currLocationTaskId);
// const currRoleRealTasks = computed(() => store.state.task.currRoleRealTasks); // 当前角色的真实任务数据
// const currRoleShowTasks = computed(() => store.state.task.currRoleShowTasks); // 当前角色的展示任务数据
const currLocationTaskId = computed(() => store.state.socket.currLocationTaskId); // 当前定位的任务id
const businessCode = computed(() => store.state.task.businessCode);
const businessCode = computed(() => store.state.task.businessCode); // 服务名
const scaleTasksStartTime = computed(() => store.state.task.scaleTasksStartTime); // 空时间刻度开始时间
const scaleTasksEndTime = computed(() => store.state.task.scaleTasksEndTime); // 空时间刻度结束时间
// 初始化 定期任务
async function initPlanTasks() {
uni.$ui.showLoading();
// uni.$ui.showLoading();
if (timeLineType.value === 1) setNextPlaceholderTasks();
await getTasks({}); // 获取初始数据
}
@ -67,8 +72,8 @@ export default function useGetTasks() {
uni.$ui.showLoading();
store.commit('task/setShowSkeleton', false);
if (businessCode.value === 'ZERO' && currRoleRealTasks.value.length > 0) {
let needTask = query.queryType === 0 ? currRoleRealTasks.value[0] : currRoleRealTasks.value[currRoleRealTasks.value.length - 1];
if (businessCode.value === 'ZERO' && realTasks.value.length > 0) {
let needTask = query.queryType === 0 ? realTasks.value[0] : realTasks.value[realTasks.value.length - 1];
query.taskId = needTask.id;
query.timeNode = needTask.planStart;
query.businessCode = needTask.businessCode;
@ -82,22 +87,24 @@ export default function useGetTasks() {
console.error('err: ', err);
} else {
store.commit('task/setShowScrollTo', true);
params.queryType === 0 ? store.commit('task/setUpRealTasks', data.list) : store.commit('task/setDownRealTasks', data.list);
const index = visibleRoles.value.findIndex(role => role.id === roleId.value);
const arr = [...allTasks.value];
arr[index].realTasks = [...realTasks.value];
arr[index].upNextPage = params.queryType === 0 ? data.nextPage : 1;
arr[index].downNextPage = params.queryType === 1 ? data.nextPage : 1;
store.commit('task/setAllTasks', arr);
store.commit('task/setCurrRoleRealTasks', arr[index].realTasks); // 设置当前角色的真实任务数据
// 存储当前查询的真实任务
params.queryType === 0 ? store.commit('task/setUpRealTasks', data.list) : store.commit('task/setDownRealTasks', data.list);
if (businessCode.value === 'ZERO' && data.list.length < params.pageSize) {
// 下一页
if (data.list.length < params.pageSize) {
params.queryType === 0 ? store.commit('task/setUpNextPage', 0) : store.commit('task/setDownNextPage', 0); // 下一页
} else if (businessCode.value !== 'ZERO') {
params.queryType === 0 ? store.commit('task/setUpNextPage', arr[index].upNextPage) : store.commit('task/setDownNextPage', arr[index].downNextPage); // 下一页
} else {
params.queryType === 0 ? store.commit('task/setUpNextPage', 1) : store.commit('task/setDownNextPage', 1); // 下一页
}
// 将真实任务存储到allTasks中对应的角色下
const arr = [...allTasks.value];
arr[roleIndex.value].realTasks = [...realTasks.value];
arr[roleIndex.value].upNextPage = upNextPage.value; // 存储下一页(向上)
arr[roleIndex.value].downNextPage = downNextPage.value; // 存储下一页(向下)
store.commit('task/setAllTasks', arr);
// 数据处理
dataRender(params);
}
@ -111,44 +118,34 @@ export default function useGetTasks() {
// 刻度模式数据处理
async function renderScaleTask(query) {
const params = generateGetTaskParam(query);
let centerData = await showTaskTime(params, currRoleShowTasks.value, currRoleRealTasks.value) || [];
await handleTasksData(params, centerData, currRoleRealTasks.value);
let centerData = await showTaskTime(params, tasks.value, realTasks.value) || [];
await handleTasksData(params, centerData);
}
// 已显示的任务第一个时间和最后一个时间
// 当前需要处理的真实任务
async function showTaskTime(params, showTasks, realTasks) {
/**
* 1判断显示任务中是否有真实任务
* 1-1根据id查找任务
* 1-2根据时间查找任务
* 2查找15个任务
* 1初始时显示15个真实任务
* 2再次取值获取显示任务最后一条真实任务的id从下一条开始查找15条不够15条全部查询
*/
// 初始值
// 显示任务中没有真实任务数据
let centerData = [];
if (realTasks.length > params.pageSize && params.queryType === 0) {
centerData = realTasks.slice(realTasks.length - params.pageSize);
centerData = realTasks.slice(realTasks.length - params.pageSize); // 上且数据>15 -- 从最后取15个数据
} else {
centerData = realTasks.slice(0, params.pageSize);
centerData = realTasks.slice(0, params.pageSize); // 上且数据<15,下 -- 从开始取15个数据
}
const firstDetailIndex = showTasks.findIndex(task => task.detailId);
if (firstDetailIndex > -1) {
// 显示任务中有真实任务数据
const firstId = showTasks[firstDetailIndex].id;
let lastDetailIndex = -1;
showTasks.forEach((item, index) => {
if (item.detailId) {
lastDetailIndex = index;
}
})
const lastId = showTasks[lastDetailIndex].id;
const arr = showTasks.filter(item => item.detailId); // 所有的真实数据
// 显示任务中有真实任务数据
if (arr.length > 0) {
realTasks.forEach((item, index) => {
if (params.queryType === 1 && item.id === lastId) {
if (params.queryType === 1 && item.id === arr[arr.length - 1].id) {
centerData = realTasks.slice(index + 1, index + 1 + params.pageSize);
} else if (params.queryType === 0 && item.id === firstId) {
} else if (params.queryType === 0 && item.id === arr[0].id) {
centerData = index >= params.pageSize ? realTasks.slice(index - params.pageSize, index) : realTasks.slice(0, index);
}
})
@ -157,144 +154,58 @@ export default function useGetTasks() {
return centerData;
}
async function handleTasksData(params, centerData, realTasks) {
let showTasks = currRoleShowTasks.value; // 显示的数据
let firstTime = showTasks.length > 0 ? showTasks[0].planStart : new Date().getTime(); // 显示的数据第一个数据的时间
let lastTime = showTasks.length > 0 ? dayjs(+showTasks[showTasks.length - 1].planStart).add(1, timeGranularity.value) : new Date().getTime(); // 显示的数据最后一个数据的时间
let upTargetTime = dayjs(+firstTime).subtract(params.pageSize, timeGranularity.value);
let downTargetTime = dayjs(+lastTime).add(params.pageSize - 1, timeGranularity.value);
const nextPage = params.queryType === 0 ? upNextPage.value : downNextPage.value; // 下一页的值
// 双击小红点
if (currLocationTaskId.value) {
lastTime = centerData.length ? centerData[0].planStart : new Date().getTime();
}
if (centerData.length) {
let arr = [];
centerData.forEach(v => {
let centerTime = '', // 中间数据+/-15后的数据
isExceed = false; // 时间跨度是否大于15
if (params.queryType) {
isExceed = dayjs(+downTargetTime).isAfter(+v.planStart, timeGranularity.value)
} else {
isExceed = dayjs(+upTargetTime).isBefore(+v.planStart, timeGranularity.value)
}
async function handleTasksData(params, centerData) {
let oldTasks = tasks.value;
if (isExceed) {
arr.push(v);
}
})
// 符合条件的数据
const newTasks = centerData.filter(item => dayjs(+scaleTasksStartTime.value).isBefore(+item.planStart, timeGranularity.value) && dayjs(+scaleTasksEndTime.value).isAfter(+item.planStart, timeGranularity.value))
if (!arr.length) {
params.queryType === 0 ? setPrevPlaceholderTasks(params) : setNextPlaceholderTasks(params);
// 查找下一页 -- 全部数据符合条件,数据量<15,有下一页
const isNextPage = params.queryType === 1 && downNextPage.value === 1 || params.queryType === 0 && upNextPage.value === 1;
if (newTasks.length === centerData.length && centerData.length < params.pageSize && isNextPage) {
if (centerData.length > 0) {
const taskId = params.queryType === 1 ? centerData[centerData.length - 1].id : centerData[0].id;
getTasks({taskId: taskId, queryType: params.queryType});
} else {
if (arr.length === centerData.length && centerData.length < params.pageSize && nextPage > 0) {
getTasks({pageNum: nextPage, queryType: params.queryType});
} else {
let cycleIndex = params.pageSize;
let newArr = [];
let breakTime = ''; // 循环结束时间
let continueTime = ''; // 第一个数据的时间
// 循环开始时间
let currTime = params.queryType === 0 ? upTargetTime : lastTime;
// 符合条件的数据 < centerData的数据
// 或者
// centerData的数据全部符合条件,但是 < 15,而且没有下一页,不能向下查
// 数据需要补齐15天的刻度
// 所以循环长度为params.pageSize
// centerData的数据全部显示,且数量 = 15
// 需要补齐数据中间的空刻度
// 循环长度为 结束时间到开始时间的差
// 当循环到的时间 = 数据最后一条的时间,则跳出循环
if (arr.length === centerData.length && centerData.length === params.pageSize) {
if (params.queryType === 0) {
continueTime = arr[0].planStart;
} else {
breakTime = arr[arr.length - 1].planStart;
}
}
// if (arr.length < centerData.length || (arr.length === centerData.length && centerData.length < params.pageSize && nextPage === 0)) {
const startTime = params.queryType === 0 ? firstTime : dayjs(+lastTime).subtract(1, timeGranularity.value);
let firstArr = arr.filter(item => dayjs(+item.planStart).isSame(+startTime, timeGranularity.value));
if (firstArr.length && params.queryType === 1) {
newArr = [...newArr, ...firstArr];
}
// }
for (let i = 0; i < params.pageSize; i++) {
if (continueTime && dayjs(+currTime).isBefore(+continueTime, timeGranularity.value)) {
currTime = dayjs(+currTime).add(1, timeGranularity.value);
continue;
} else {
let termArr = arr.filter(item => dayjs(+item.planStart).isSame(+currTime, timeGranularity.value));
if (termArr.length === 0) {
const newTasks = uni.$task.setPlaceholderTasks(+currTime, false, timeGranularity.value, 1);
newArr = [...newArr, ...newTasks];
} else {
newArr = [...newArr, ...termArr];
}
if (breakTime && dayjs(+currTime).isSame(+breakTime, timeGranularity.value)) {
break;
} else {
currTime = dayjs(+currTime).add(1, timeGranularity.value);
}
}
}
if (firstArr.length && params.queryType === 0) {
newArr = [...newArr, ...firstArr];
}
const repeatTime = params.queryType === 0 ? newArr[newArr.length - 1].planStart : newArr[0].planStart;
const repeatTimeArr = showTasks.filter(item => dayjs(+item.planStart).isSame(+repeatTime, timeGranularity.value));
if (repeatTimeArr.length) {
const index = repeatTimeArr.findIndex(item => item.detailId);
if (index > -1) {
showTasks = params.queryType === 0 ? [...newArr, ...showTasks] : [...showTasks, ...newArr];
} else {
showTasks = params.queryType === 0 ? showTasks.slice(1) : showTasks.slice(0, showTasks.length - 2);
showTasks = params.queryType === 0 ? [...newArr, ...showTasks] : [...showTasks, ...newArr];
}
getTasks({queryType: params.queryType});
}
} else {
// 用真实任务数据替换空刻度,不需要继续查找下一页
// 1、一部分数据符合
// 2、全部数据符合条件,
// 2-1、数据量15 -- 需要删除多余的空数据
// 2-2、数据量<15,但是没有下一页
oldTasks.forEach((task, index) => {
let arr = centerData.filter(item => dayjs(+item.planStart).isSame(+task.planStart, timeGranularity.value));
if (arr && arr.length > 0) {
if (task.detailId) {
params.queryType === 1 ? [...oldTasks, ...arr] : [...arr, ...oldTasks];
} else {
showTasks = params.queryType === 0 ? [...newArr, ...showTasks] : [...showTasks, ...newArr];
oldTasks.splice(index, 1, [...arr]);
}
}
})
showTasks = flatten(showTasks); // 1维拍平
store.commit('task/clearTasks');
params.queryType === 0 ? store.commit('task/setUpTasks', showTasks) : store.commit('task/setDownTasks', showTasks);
}
} else {
if (nextPage > 0) {
getTasks({pageNum: nextPage, queryType: params.queryType});
} else {
params.queryType === 0 ? setPrevPlaceholderTasks(params) : setNextPlaceholderTasks(params);
// 全部数据符合条件,数据量15,删除多余的空数据
if (newTasks.length === centerData.length && centerData.length === params.pageSize) {
const lastIndex = oldTasks.findIndex(item => item.id === centerData[centerData.length - 1].id);
oldTasks.slice(0, lastIndex);
}
oldTasks = flatten(oldTasks); // 1维拍平
store.commit('task/clearTasks');
params.queryType === 0 ? store.commit('task/setUpTasks', oldTasks) : store.commit('task/setDownTasks', oldTasks);
}
uni.$ui.hideLoading();
// if (showTasks.length > 30) {
// showTasks = params.queryType === 0 ? showTasks.slice(0, 80) : showTasks.slice(showTasks.length - 80);
// }
}
// 任务模式
async function renderConTask(params) {
let nextPage = params.queryType === 0 ? upNextPage.value : downNextPage.value; // 下一页的值
let showTasks = currRoleShowTasks.value;
let centerData = await showTaskTime(params, showTasks, currRoleRealTasks.value) || [];
let showTasks = tasks.value;
let centerData = await showTaskTime(params, showTasks, realTasks.value) || [];
if (centerData.length < 15 && nextPage > 0) {
getTasks({pageNum: nextPage, queryType: params.queryType});
@ -320,38 +231,34 @@ export default function useGetTasks() {
// 设置时间轴向上的空数据
function setPrevPlaceholderTasks() {
store.commit('task/setTopEnd', true);
// store.commit('task/setTopEnd', true);
let startTime = '';
if (!currRoleShowTasks.value || !currRoleShowTasks.value.length) {
if (!tasks.value || !tasks.value.length) {
startTime = Date.now(); // 没有任务就应该是时间基准点
} else {
startTime = currRoleShowTasks.value[0].planStart - 0; // 有任务就是第一个任务的计划开始时间
startTime = tasks.value[0].planStart - 0; // 有任务就是第一个任务的计划开始时间
}
const placeholderTasks = uni.$task.setPlaceholderTasks(startTime, true, timeGranularity.value);
store.commit('task/setCurrUpTimeNode', startTime);
store.commit('task/setScaleTasksStartTime', placeholderTasks[0].planStart);
store.commit('task/setScaleTasksEndTime', placeholderTasks[placeholderTasks.length - 1].planStart);
// store.commit('task/setCurrUpTimeNode', startTime);
store.commit('task/setUpTasks', placeholderTasks);
}
// 设置时间轴向下的空数据
function setNextPlaceholderTasks(params) {
// store.commit('task/setBottomEnd', true);
function setNextPlaceholderTasks() {
let startTime = '';
if (!currRoleShowTasks.value || !currRoleShowTasks.value.length) {
if (!tasks.value || !tasks.value.length) {
startTime = Date.now();
} else {
startTime = dayjs(+currRoleShowTasks.value[currRoleShowTasks.value.length - 1].planStart).add(1, timeGranularity.value).valueOf();
startTime = dayjs(+tasks.value[tasks.value.length - 1].planStart).add(1, timeGranularity.value).valueOf();
}
// if (params.taskId) {
// currRoleRealTasks.value.forEach(item => {
// if (item.id === params.taskId) {
// startTime = Number(item.planStart);
// }
// })
// }
const initData = uni.$task.setPlaceholderTasks(startTime, false, timeGranularity.value);
store.commit('task/setCurrDownTimeNode', startTime);
store.commit('task/setScaleTasksStartTime', initData[0].planStart);
store.commit('task/setScaleTasksEndTime', initData[initData.length - 1].planStart);
// store.commit('task/setCurrDownTimeNode', startTime);
store.commit('task/setDownTasks', initData);
}
@ -402,6 +309,8 @@ export default function useGetTasks() {
return {
initPlanTasks,
getTasks,
dataRender
dataRender,
setPrevPlaceholderTasks,
setNextPlaceholderTasks
}
}

80
hooks/project/useInit.js

@ -17,6 +17,37 @@ export default function useInit() {
}
});
/**
* 初始化
* @param {object | null} options
*/
function init(options) {
// 参数里有项目名称 就设置标题里的项目名称
options && options.pname && store.commit('project/setProjectName', options.pname);
if (!options || !options.p) {
uni.$ui.showToast('缺少项目信息参数'); // 没有项目id参数
} else {
if (options.p !== uni.$storage.getStorageSync('projectId')) {
console.log('options', options)
store.commit('project/setProject', options);
store.commit('role/setRoleId', '');
uni.$storage.setStorageSync('roleId', options.roleId || '');
uni.$storage.setStorageSync('projectId', options.p || '');
store.commit('task/setAllTasks', []);
store.commit('task/setBusinessCode', options.businessCode || '');
store.commit('task/setTargetTaskId', options.taskId || '');
}
// 根据项目id获取项目信息
const params = { projectId: options.p, num: 0 };
getProjectById(params);
// 根据项目id获取角色列表
getRoles(params);
// 根据项目id获取成员列表
store.dispatch('role/getAllMembers', { projectId: options.p });
}
}
/**
* 通过项目id获取项目信息
* @param {object} params 提交的参数
@ -30,18 +61,6 @@ export default function useInit() {
}
}
// 获取到角色列表,设置所有任务对应的角色
function setAllTasksByRoles(roles) {
const arr = allTasks.value;
if (roles && roles.length) {
roles.forEach(role => {
const item = { role };
arr.push(item);
});
}
store.commit('task/setAllTasks', arr);
}
/**
* 通过项目id获取角色信息
* @param {string} projectId
@ -76,35 +95,16 @@ export default function useInit() {
uni.$storage.setStorageSync('roleId', '');
}
/**
* 初始化
* @param {object | null} options
*/
function init(options) {
// 参数里有项目名称 就设置标题里的项目名称
options && options.pname && store.commit('project/setProjectName', options.pname);
if (!options || !options.p) {
uni.$ui.showToast('缺少项目信息参数'); // 没有项目id参数
} else {
if (options.p !== uni.$storage.getStorageSync('projectId')) {
console.log('options', options)
store.commit('project/setProject', options);
store.commit('role/setRoleId', '');
uni.$storage.setStorageSync('roleId', options.roleId || '');
uni.$storage.setStorageSync('projectId', options.p || '');
store.commit('task/setAllTasks', []);
store.commit('task/setBusinessCode', options.businessCode || '');
store.commit('task/setTargetTaskId', options.taskId || '');
}
// 根据项目id获取项目信息
const params = { projectId: options.p, num: 0 };
getProjectById(params);
// 根据项目id获取角色列表
getRoles(params);
// 根据项目id获取成员列表
store.dispatch('role/getAllMembers', { projectId: options.p });
// 获取到角色列表,设置所有任务对应的角色
function setAllTasksByRoles(roles) {
const arr = allTasks.value;
if (roles && roles.length) {
roles.forEach(role => {
const item = { role };
arr.push(item);
});
}
store.commit('task/setAllTasks', arr);
}
// 分享链接来的初始化

19
pages/index/index.vue

@ -30,11 +30,6 @@
<!-- 项目列表 -->
<Projects @getProjects="getProjects" class="flex-1 overflow-y-auto" />
<view class="version-box">
<view>版本号1.0.10</view>
<view>2022.04.06</view>
</view>
<view class="login-box absolute" @click="toLogin">
<text v-if="!userInfo || !userInfo.id">游客</text>
<image v-else src="../../static/headimg4.png" mode=""></image>
@ -238,18 +233,4 @@
object-fit: cover;
}
}
.version-box {
padding: 10px 0;
width: 100%;
height: 60px;
text-align: center;
background-color: #FFFFFF;
color: #999;
font-size: 13px;
view {
line-height: 20px;
}
}
</style>

56
pages/project/project.vue

@ -78,8 +78,6 @@ if (!userInfo.value) {
onUnmounted(() => {
console.log('卸载组件实例后调用');
clearTasksData();
store.commit('task/setCurrRoleRealTasks', []); //
store.commit('task/setCurrRoleShowTasks', []); //
store.commit('socket/setCurrLocationTaskId', '');
});
@ -169,25 +167,11 @@ watch(remindData, () => {
watch(roleId, () => {
if (roleId.value) {
// allTasks
if (
allTasks.value.length
&& allTasks.value[roleIndex.value]
&& allTasks.value[roleIndex.value].global
&& allTasks.value[roleIndex.value].task
if (allTasks.value.length && allTasks.value[roleIndex.value] &&
allTasks.value[roleIndex.value].global && allTasks.value[roleIndex.value].task
) return;
store.commit('task/setTimeNode', Date.now());
let currRoleRealTasks = [];
let currRoleShowTasks = [];
if (allTasks.value.length) {
const index = visibleRoles.value.findIndex(role => role.id === roleId.value);
currRoleRealTasks = allTasks.value[index].realTasks || [];
currRoleShowTasks = allTasks.value[index].task || [];
}
store.commit('socket/setCurrLocationTaskId', '');
store.commit('task/setCurrRoleRealTasks', currRoleRealTasks); //
store.commit('task/setCurrRoleShowTasks', currRoleShowTasks); //
}
});
@ -273,6 +257,21 @@ watch(globals, () => {
store.commit('task/setAllTasks', arr);
});
// tabsswiper
function tabsChange(e) {
const { id } = visibleRoles.value[e.detail.current]; // id
store.commit('role/setRoleIndex', e.detail.current); //
store.commit('role/setRoleId', id);
const index = e.detail.current;
const arr = [...allTasks.value];
store.commit('task/updateTasks', arr[index].task || []); //
store.commit('task/updateRealTasks', arr[index].realTasks || []); //
store.commit('task/setUpNextPage', arr[index].upNextPage || 1); //
store.commit('task/setDownNextPage', arr[index].downNextPage || 1); //
store.commit('socket/setCurrLocationTaskId', '');
}
//
function getGlobalData() {
if (!allTasks.value[roleIndex] && roleId.value) {
@ -312,27 +311,6 @@ function clearTasksData() {
store.commit('task/clearEndFlag');
}
// function getTasks(params) {
// getTasksHook.getTasks(params); //
// }
// tabsswiper
function tabsChange(e) {
const { id } = visibleRoles.value[e.detail.current];
store.commit('role/setRoleIndex', e.detail.current);
store.commit('role/setRoleId', id);
const index = visibleRoles.value.findIndex(role => role.id === id);
const arr = [...allTasks.value];
store.commit('task/updateTasks', arr[index].task || []); // store
store.commit('task/updateRealTasks', arr[index].realTasks || []); // store
store.commit('task/setCurrRoleRealTasks', arr[index].realTasks || []); //
store.commit('task/setCurrRoleShowTasks', arr[index].task || []); //
store.commit('task/setUpNextPage', arr[index].upNextPage || 1); //
store.commit('task/setDownNextPage', arr[index].downNextPage || 1); //
store.commit('socket/setCurrLocationTaskId', '');
}
//
function setScrollPosition() {
// storagetaskId id

30
store/task/mutations.js

@ -385,13 +385,13 @@ const mutations = {
* @param {Object} state
* @param {Array} data 服务端返回的模板数组
*/
setCurrRoleRealTasks(state, data) {
state.currRoleRealTasks = data || [];
},
// setCurrRoleRealTasks(state, data) {
// state.currRoleRealTasks = data || [];
// },
setCurrRoleShowTasks(state, data) {
state.currRoleShowTasks = data || [];
},
// setCurrRoleShowTasks(state, data) {
// state.currRoleShowTasks = data || [];
// },
/**
* 当前打开的项目的所属服务
@ -409,6 +409,24 @@ const mutations = {
*/
setTargetTaskId(state, data) {
state.targetTaskId = data;
},
/**
* 空时间刻度开始时间
* @param {Object} state
* @param {Object} data
*/
setScaleTasksStartTime(state, data) {
state.scaleTasksStartTime = data;
},
/**
* 空时间刻度结束时间
* @param {Object} state
* @param {Object} data
*/
setScaleTasksEndTime(state, data) {
state.scaleTasksEndTime = data;
}
};

11
store/task/state.js

@ -32,12 +32,15 @@ const state = {
allTasks: [], // 所有任务
hasPermanent: false, // 永久的日常任务是否加载过
currRoleRealTasks: [], // 当前角色真实任务
currRoleShowTasks: [], // 当前角色展示任务
// currRoleRealTasks: [], // 当前角色真实任务
// currRoleShowTasks: [], // 当前角色展示任务
businessCode: '' ,// 当前打开的项目的所属服务
targetTaskId: '', // 任务id
scaleTasksStartTime: '', // 空时间刻度开始时间
scaleTasksEndTime: '', // 空时间刻度结束时间
};
export default state;

Loading…
Cancel
Save