diff --git a/CHANGELOG.md b/CHANGELOG.md index 17eed93..c4fe18f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 0.1.0 (2021-11-17) +# 0.1.0 (2021-11-18) ### 🌟 新功能 范围|描述|commitId @@ -48,6 +48,7 @@ - | 项目创建分享链接 | eb2c4ba - | 项目列表, 项目url | 32e005b - | 项目api url设置 | 6cd5245 + - | 新建任务 | 59897c2 - | 新建任务 部分提交参数 | 25c78b8 - | 新建任务 部分提交参数 | 6a422f6 - | 新建任务,分享项目弹出层样式修改 | efbc679 diff --git a/src/pages/project/project.vue b/src/pages/project/project.vue index 3de4cc9..6486047 100644 --- a/src/pages/project/project.vue +++ b/src/pages/project/project.vue @@ -74,7 +74,6 @@ export default { }, onLoad(options) { - console.log('options: ', options); if (options.share && options.share === '1') { this.shareInit(options); } else { @@ -89,7 +88,6 @@ export default { * 永久日常任务不发生改变 */ timeNode(val) { - console.log('切换角色', val); if (val && this.roleId) { this.clearTasksData(); this.getGlobalData(); // 查可变日常任务 @@ -185,12 +183,9 @@ export default { // 切换了 颗粒度 || 角色时候 获取初始定期任务 getInitTasks() { - console.log('切换角色'); // 预加载 上下的定期任务 function preloadFn(that) { const detailId = that.tasks.findIndex(task => task.detailId); - console.log('预加载', that, detailId); - const arr = []; that.tasks.forEach(task => { if (task.detailId) { @@ -233,7 +228,6 @@ export default { * @param {number} query.queryType 0向上查找 1向下查找(默认) 下查包含自己,上查不包含 */ getTasks(query, fn) { - console.log('根据时间基准点和角色查找定期任务', query, fn); this.setShowSkeleton(false); const params = this.generateGetTaskParam(query); @@ -437,17 +431,9 @@ export default { if (err) { console.error('err: ', err || '获取角色信息失败'); } else { - console.log('data', data, params); this.setInvisibleRoles(data ? data.invisibleList : []); this.setVisibleRoles(data ? data.visibleList : []); this.setInitialRoleId(data ? data.visibleList : []); - - let obj = {}; - obj.visible = data.visibleList; - obj.invisible = data ? data.invisibleList : []; - this.$t.storage.setStorageSync('roles_' + params.projectId, obj); - let roles = this.$t.storage.getStorageSync('roles_' + params.projectId); - console.log(JSON.parse(roles)); } }); }, diff --git a/src/store/index.js b/src/store/index.js index 26bc284..acddb3c 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -1,16 +1,16 @@ import Vue from 'vue'; import Vuex from 'vuex'; -import user from './user/index'; import messages from './messages/index'; -import socket from './socket/index'; import project from './project/index'; import role from './role/index'; +import socket from './socket/index'; import task from './task/index'; +import user from './user/index'; // 不属于具体模块的 应用级的 store内容 const state = { networkConnected: true, // 网络是否连接 - forceUseStorage: false, // 强制启用storage + forceUseStorage: true, // 强制启用storage }; const getters = { diff --git a/src/store/task/mutations.js b/src/store/task/mutations.js index e465507..01d9dd7 100644 --- a/src/store/task/mutations.js +++ b/src/store/task/mutations.js @@ -82,6 +82,22 @@ const mutations = { state.tasks = [...data]; // 原来没有数据 } else { state.tasks = [...data, ...state.tasks]; + + let arr = [], + flag = false; + state.tasks.forEach(task => { + arr.forEach(item => { + if (task.id == item.id) { + flag = true; + } + }); + + if (!flag) { + arr.push(task); + } + }); + + state.tasks = [...arr]; // state.tasks = [...data.concat(state.tasks)]; } }, @@ -96,6 +112,22 @@ const mutations = { state.tasks = [...data]; } else { state.tasks = [...state.tasks, ...data]; + + let arr = [], + flag = false; + state.tasks.forEach(task => { + arr.forEach(item => { + if (task.id == item.id) { + flag = true; + } + }); + + if (!flag) { + arr.push(task); + } + }); + + state.tasks = [...arr]; // state.tasks = [...state.tasks.concat(data)]; } },