From 99d42e2887f8978fa1e5e6bf3f7e1e43e51669c7 Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Tue, 10 Aug 2021 14:40:31 +0800 Subject: [PATCH 01/15] =?UTF-8?q?style:=20=E5=88=A0=E9=99=A4mock,console;u?= =?UTF-8?q?pload=E6=B7=BB=E5=8A=A0loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + src/components/Plugin/Plugin.vue | 4 - src/components/Roles/Roles.vue | 5 +- src/components/TimeLine/TimeLine.vue | 4 +- .../TimeLine/component/TimeStatus.vue | 1 - src/components/Tips/Tips.vue | 2 +- src/components/Upload/Upload.vue | 14 +- src/mock/mock.js | 401 ------------------ src/pages/project/project.vue | 2 +- src/utils/tall.js | 2 +- src/utils/ui.js | 2 +- src/utils/upload.js | 19 +- 12 files changed, 38 insertions(+), 419 deletions(-) delete mode 100644 src/mock/mock.js diff --git a/CHANGELOG.md b/CHANGELOG.md index f2ffe47..935d1d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ - | 距调整pc端 | 5069aa1 - | 配置默认插件接口 | f0c177d - | 面变化首页变化 | 5e860f1 + - | 项目api url设置 | 6cd5245 - | 项目列表, 项目url | 32e005b - | 首页项目样式改变 | 8514c85 diff --git a/src/components/Plugin/Plugin.vue b/src/components/Plugin/Plugin.vue index a49bf66..88a6b41 100644 --- a/src/components/Plugin/Plugin.vue +++ b/src/components/Plugin/Plugin.vue @@ -87,7 +87,6 @@ export default { }); if (!data || !data.id) return; const reg = /data-root=["|']?(\w+)["|']?/gi; - // console.log(data.html); let uuid = ''; // FIXME: 没有兼容 只有js, 没有html的情况 if (data.html) { @@ -95,8 +94,6 @@ export default { if (reg.test(data.html)) { uuid = RegExp.$1; - // console.log('uuid: ', uuid, `p${this.pluginTaskId}`); - const str = data.html.replace(new RegExp(uuid, 'g'), `p${this.pluginTaskId}`); this.pluginContent = str; } else { @@ -106,7 +103,6 @@ export default { const str = data.js.replace(new RegExp(uuid, 'g'), `p${this.pluginTaskId}`); this.handleDom(str); } - // console.log(this.pluginContent); // if (data.js) { // if (reg.test(data.js)) { diff --git a/src/components/Roles/Roles.vue b/src/components/Roles/Roles.vue index d2d1183..aebf966 100644 --- a/src/components/Roles/Roles.vue +++ b/src/components/Roles/Roles.vue @@ -111,13 +111,12 @@ export default { this.clearEndFlag(); }); } catch (error) { - console.log('role.vue changeRole error: ', error); + console.error('role.vue changeRole error: ', error); } }, // 清除插件script clearPluginScript() { - console.log('clearPluginScript: '); try { const scripts = document.querySelectorAll('script[data-type=plugin]'); @@ -125,7 +124,7 @@ export default { document.body.removeChild(scripts[i]); } } catch (error) { - console.log('clearPluginScript error: ', error); + console.error('clearPluginScript error: ', error); } }, diff --git a/src/components/TimeLine/TimeLine.vue b/src/components/TimeLine/TimeLine.vue index ef33b32..9b85f91 100644 --- a/src/components/TimeLine/TimeLine.vue +++ b/src/components/TimeLine/TimeLine.vue @@ -60,7 +60,7 @@ export default { const startTime = this.tasks[0].planStart - 0; if (this.tasks[0].plugins && this.tasks[0].plugins.length === 0 && !this.topEnd) { // 没有数据时 自动加载数据 - console.log('没有数据时: '); + console.warn('没有数据时: '); const addTasks = [ { panel: {}, @@ -81,7 +81,7 @@ export default { this.setUpTasks([...addTasks.concat(this.tasks)]); } else { // 有数据时 - console.log('有数据时: '); + console.warn('有数据时: '); const upQuery = { timeNode: startTime, queryType: 0, diff --git a/src/components/TimeLine/component/TimeStatus.vue b/src/components/TimeLine/component/TimeStatus.vue index 08ca698..ef6fced 100644 --- a/src/components/TimeLine/component/TimeStatus.vue +++ b/src/components/TimeLine/component/TimeStatus.vue @@ -109,7 +109,6 @@ export default { computeCyclePersent() { if (!this.task || !this.task.realStart || !this.task.planDuration) return 100; const { realStart, planDuration } = this.task; - console.log((((Date.now() - +realStart) * 100) / +planDuration).toFixed(2)); return (((Date.now() - +realStart) * 100) / +planDuration).toFixed(2); }, diff --git a/src/components/Tips/Tips.vue b/src/components/Tips/Tips.vue index 3f139b4..036a804 100644 --- a/src/components/Tips/Tips.vue +++ b/src/components/Tips/Tips.vue @@ -80,7 +80,7 @@ export default { location.reload(); // this.$router.go(0); } catch (error) { - console.log(error); + console.error(error); } }, diff --git a/src/components/Upload/Upload.vue b/src/components/Upload/Upload.vue index 7006a76..7d0a100 100644 --- a/src/components/Upload/Upload.vue +++ b/src/components/Upload/Upload.vue @@ -1,22 +1,30 @@ `, - ], - }, - }); - }, - }, - //根据id获取token - { - path: '/tall/v1.0/users/userId', - handler: (req, res) => { - return res.json({ - code: 200, - msg: 'ok', - success: true, - data: { - account: 'wally', - id: 123, - phone: '18603454788', - refresh_token: 'string', - token: 'string', - wxInfo: { - city: 'string', - country: 'string', - headImgUrl: 'string', - language: 'string', - nickname: 'string', - province: 'string', - sex: 0, - }, - }, - }); - }, - }, - //根据id获取项目信息 - { - path: '/defaultwbs/project/findProjectById', - method: 'post', - handler: (req, res) => { - return res.json({ - code: 200, - msg: 'ok', - success: true, - data: { - name: '默认项目', - projectId: 1235555, - }, - }); - }, - }, - //查询角色栏展示的角色 - { - path: '/defaultwbs/role/show', - method: 'post', - handler: (req, res) => { - return res.json({ - code: 200, - msg: 'ok', - success: true, - data: { - //不展示的角色 - invisibleList: [ - { - id: 123456789, - mine: 1, - name: 'string', - pm: 0, - sequence: 33, - }, - ], //展示的角色 - visibleList: [ - { - id: 1, - name: '项目经理', - mine: 0, - pm: 1, - sequence: 1, - }, - { - id: 2, - name: '运维', - mine: 0, - pm: 0, - sequence: 2, - }, - { - id: 3, - name: '导师一', - mine: 1, - pm: 0, - sequence: 3, - }, - { - id: 4, - name: '导师二', - mine: 1, - pm: 0, - sequence: 4, - }, - { - id: 5, - name: '导师三', - mine: 1, - pm: 0, - sequence: 5, - }, - ], - }, - }); - }, - }, - //配置角色栏展示的角色 - { - path: '/defaultwbs/role/updateShow', - method: 'post', - handler: (req, res) => { - return res.json({ - code: 200, - msg: 'ok', - success: true, - data: { description: 'data数据' }, - }); - }, - }, - //根据角色查找永久的日常任务 - { - path: '/defaultwbs/task/permanent', - method: 'post', - handler: (req, res) => { - return res.json({ - code: 200, - msg: 'ok', - success: true, - data: [ - { - description: 'string', - detailId: 147258, - id: 258147, - name: 'string', - panel: { - backgroundColor: 'string', - border: 'string', - borderRadius: 'string', - col: 132, - height: 'string', - row: 147, - shadow: 'string', - width: 'string', - }, - planDuration: 123, - planStart: 123456789, - plugins: [ - [ - { - col: 1, - colspan: 123, - param: 123, - pluginId: 13, - row: 2, - rowspan: 123, - }, - ], - ], - process: 0, - realDuration: 123456789, - realStart: 123456789, - skip: -1, - skipTaskId: 123456789, - }, - ], - }); - }, - }, - //根据时间和角色查找日常任务 - { - path: '/defaultwbs/task/global', - method: 'post', - handler: (req, res) => { - return res.json({ - code: 200, - msg: 'ok', - success: true, - data: [ - { - description: 'string', - detailId: 147258, - id: 258147, - name: 'string', - panel: { - backgroundColor: 'string', - border: 'string', - borderRadius: 'string', - col: 132, - height: 'string', - row: 147, - shadow: 'string', - width: 'string', - }, - planDuration: 123, - planStart: 123456789, - plugins: [ - [ - { - col: 1, - colspan: 123, - param: 123, - pluginId: 13, - row: 1, - rowspan: 123, - }, - ], - ], - process: 0, - realDuration: 123456789, - realStart: 123456789, - skip: -1, - skipTaskId: 123456789, - }, - ], - }); - }, - }, - //根据时间基准点和角色查找定期任务 - { - path: '/defaultwbs/task/regular', - method: 'post', - handler: (req, res) => { - return res.json({ - code: 200, - msg: 'ok', - success: true, - data: [ - { - description: 'string', - detailId: 147258, - id: 258147, - name: 'string', - panel: { - backgroundColor: 'string', - border: 'string', - borderRadius: 'string', - col: 132, - height: '100', - row: 147, - shadow: 'string', - width: 'string', - }, - planDuration: 123, - planStart: 123456789, - plugins: [ - [ - { - col: 123, - colspan: 123, - param: 123, - pluginId: 1, - row: 123, - rowspan: 123, - }, - ], - ], - process: 0, - realDuration: 123456789, - realStart: 123456789, - skip: -1, - skipTaskId: 123456789, - }, - { - description: 'string', - detailId: 147258, - id: 254565, - name: 'string', - panel: { - backgroundColor: 'string', - border: 'string', - borderRadius: 'string', - col: 132, - height: '100', - row: 147, - shadow: 'string', - width: 'string', - }, - planDuration: 123, - planStart: 123456789, - plugins: [ - [ - { - col: 123, - colspan: 123, - param: 123, - pluginId: 2, - row: 123, - rowspan: 123, - }, - ], - ], - process: 0, - realDuration: 123456789, - realStart: 123456789, - skip: -1, - skipTaskId: 123456789, - }, - { - description: 'string', - detailId: 147258, - id: 111125, - name: 'string', - panel: { - backgroundColor: 'string', - border: 'string', - borderRadius: 'string', - col: 132, - height: '100', - row: 147, - shadow: 'string', - width: 'string', - }, - planDuration: 123, - planStart: 123456789, - plugins: [ - [ - { - col: 123, - colspan: 123, - param: 123, - pluginId: 3, - row: 123, - rowspan: 123, - }, - ], - ], - process: 0, - realDuration: 123456789, - realStart: 123456789, - skip: -1, - skipTaskId: 123456789, - }, - ], - }); - }, - }, - //修改任务状态 - { - path: '/defaultwbs/task/type', - method: 'post', - handler: (req, res) => { - return res.json({ - code: 200, - msg: 'ok', - success: true, - data: { description: 'data数据' }, - }); - }, - }, - //根据id查询插件信息 - { - path: '/defaultwbs/plugin', - method: 'post', - handler: (req, res) => { - return res.json({ - code: 200, - msg: 'ok', - success: true, - data: { - html: '
', - id: 13, - intro: 'string', - js: 'string', - name: 'string', - styleType: -1, - version: 'string', - }, - }); - }, - }, -]; diff --git a/src/pages/project/project.vue b/src/pages/project/project.vue index 42fe18e..e5c9975 100644 --- a/src/pages/project/project.vue +++ b/src/pages/project/project.vue @@ -161,7 +161,7 @@ export default { await this.getRegulars(params); } catch (error) { - console.log('error: ', error); + console.error('error: ', error); } }, diff --git a/src/utils/tall.js b/src/utils/tall.js index 7bf177b..5088746 100644 --- a/src/utils/tall.js +++ b/src/utils/tall.js @@ -16,7 +16,7 @@ const $t = { timeConfig, // 时间相关配置 ui, // ui界面提示相关 chooseAndUpload: upload.chooseAndUpload, // 选择并上传单个文件相关的封装 - domain: 'https://www.tall.wiki/tall3/v3.0.0/defaultwbs', + domain: 'https://www.tall.wiki/gateway/defaultwbs', }; uni.$t = $t; diff --git a/src/utils/ui.js b/src/utils/ui.js index ab54252..1de1476 100644 --- a/src/utils/ui.js +++ b/src/utils/ui.js @@ -22,7 +22,7 @@ export default { * 显示加载雪花 * @param {string} title */ - showLoading(title) { + showLoading(title = '玩命加载中...') { return uni.showLoading({ title, mask: true, diff --git a/src/utils/upload.js b/src/utils/upload.js index a9b1cf0..1eebe8b 100644 --- a/src/utils/upload.js +++ b/src/utils/upload.js @@ -8,6 +8,9 @@ export default { * @returns */ chooseAndUpload(url, formData = {}, extension = ['.xls', '.xlsx'], name = 'param') { + uni.hideLoading(); + clearTimeout(timer); + let timer = null; return new Promise((resolve, reject) => { const token = uni.$t.storage.getStorageSync(uni.$t.app.tokenKey); if (!token) { @@ -17,6 +20,13 @@ export default { count: 1, //默认100 extension, success: res => { + if (!timer) { + timer = setTimeout(() => { + uni.$t.ui.showLoading('正在上传...'); + timer = null; + }, 800); + } + // 开始上传 uni.uploadFile({ url, filePath: res.tempFilePaths[0], @@ -24,7 +34,10 @@ export default { formData, header: { Authorization: `Bearer ${token}` }, success: ({ data, statusCode }) => { - console.log('data, statusCode: ', data, statusCode); + console.log('s'); + clearTimeout(timer); + uni.hideLoading(); + if (statusCode === 200 && data) { const { code, msg } = JSON.parse(data); if (code !== 200) { @@ -37,11 +50,15 @@ export default { } }, fail: error => { + clearTimeout(timer); + uni.hideLoading(); reject(error); }, }); }, fail: error => { + clearTimeout(timer); + uni.hideLoading(); reject(error); }, }); From c458385ca5ead811aecf9d15e9be0995144221c3 Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Tue, 10 Aug 2021 15:59:11 +0800 Subject: [PATCH 02/15] =?UTF-8?q?feat:=20=E7=82=B9=E5=87=BB=E6=97=A5?= =?UTF-8?q?=E5=8E=86=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + src/pages/index/index.vue | 10 ++++++---- src/utils/upload.js | 1 - 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 935d1d0..2fbb2a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,7 @@ - | 代码格式细节调整 | cb2532b - | 任务快捷方式图标增加 | 4aba872 - | 修改角色样式 | 73e268e + - | 删除mock,console;upload添加loading | 99d42e2 - | 删除多余字段 | 5ae3973 - | 删除插件携带的多余文件 | 0f392bb - | 删除没用代码 | 34b20e1 diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 7fa1d25..855ae00 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -54,7 +54,6 @@ export default { }, onShow() { - console.log('index onShow'); if (!this.token) return; this.getProjects(); }, @@ -76,15 +75,18 @@ export default { this.days = [{ date: '2021-08-03' }, { date: '2021-08-04' }, { date: '2021-08-06' }]; }, + // 点击了某个日期 onDateChange(event) { - console.log(event); + const day = this.$moment(event.fullDate); + const start = day.startOf('date').valueOf(); + const end = day.endOf('date').valueOf(); + this.getProjects(start, end); }, - // 受到展示alert的消息 + // 收到展示alert的消息 onShowAlert(event) { this.alert.description = event || '发生了点小意外'; this.alert.show = true; - setTimeout(() => (this.alert.show = false), 10000); }, }, diff --git a/src/utils/upload.js b/src/utils/upload.js index 1eebe8b..1a20a91 100644 --- a/src/utils/upload.js +++ b/src/utils/upload.js @@ -34,7 +34,6 @@ export default { formData, header: { Authorization: `Bearer ${token}` }, success: ({ data, statusCode }) => { - console.log('s'); clearTimeout(timer); uni.hideLoading(); From 5064a382e5b3e4059a069aa38ec2c88dcc3d93ab Mon Sep 17 00:00:00 2001 From: binbin0314 Date: Tue, 10 Aug 2021 16:01:32 +0800 Subject: [PATCH 03/15] =?UTF-8?q?style:=20=E5=88=A0=E9=99=A4console.log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + src/components/TimeLine/TimeLine.vue | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f5ae2b..568be45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -129,6 +129,7 @@ ### 🚀 性能优化 范围|描述|commitId --|--|-- + - | 修改定期任务骨架屏高度 | [909a734](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/909a734) - | 插件查询及展示 | [4dba770](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4dba770) - | 日历的更改 | [7353ac8](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7353ac8) - | 测试接口 | [215e074](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/215e074) diff --git a/src/components/TimeLine/TimeLine.vue b/src/components/TimeLine/TimeLine.vue index d4d82f2..ce81ed5 100644 --- a/src/components/TimeLine/TimeLine.vue +++ b/src/components/TimeLine/TimeLine.vue @@ -56,12 +56,10 @@ export default { // 滚动到顶部 async handleScrollTop() { - console.log('this.topEnd: ', this.topEnd); if (this.topEnd) return; const startTime = this.tasks[0].planStart - 0; if (this.tasks[0].plugins && this.tasks[0].plugins.length === 0 && !this.topEnd) { // 没有数据时 自动加载数据 - console.log('没有数据时: '); const addTasks = [ { panel: {}, @@ -82,7 +80,6 @@ export default { this.setUpTasks([...addTasks.concat(this.tasks)]); } else { // 有数据时 - console.log('有数据时: '); const upQuery = { timeNode: startTime, queryType: 0, From 364e25d9dc4919bf57a308629bcfd6d5e90a6b27 Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Wed, 11 Aug 2021 15:15:59 +0800 Subject: [PATCH 04/15] =?UTF-8?q?feat(calendar,=20tall.js):=20=E4=B8=8A?= =?UTF-8?q?=E4=B8=8B=E6=BB=91=E5=8A=A8=E5=88=87=E6=8D=A2=E6=97=A5=E5=8E=86?= =?UTF-8?q?=E7=9A=84=E6=A8=A1=E5=BC=8F,tall.js=E4=B8=ADdomain=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 ++- src/components/Calendar/Calendar.vue | 36 ++++++++++------------------ src/components/Projects/Projects.vue | 2 +- src/pages/index/index.vue | 24 +++++++++++++++++-- src/utils/tall.js | 4 +++- 5 files changed, 40 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fbb2a9..bb2dc2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 0.1.0 (2021-08-10) +# 0.1.0 (2021-08-11) ### 🌟 新功能 范围|描述|commitId @@ -33,6 +33,7 @@ - | 标题栏角色栏全局任务组件新建 | 0500cb4 - | 模拟接口测试 | 69e7931 - | 添加时间轴上下滚动 | 2b81bbc + - | 点击日历日期查询项目列表 | c458385 - | 角色栏实现 | 94cd671 - | 距调整pc端 | 5069aa1 - | 配置默认插件接口 | f0c177d diff --git a/src/components/Calendar/Calendar.vue b/src/components/Calendar/Calendar.vue index c7765d6..9db5af9 100644 --- a/src/components/Calendar/Calendar.vue +++ b/src/components/Calendar/Calendar.vue @@ -92,31 +92,19 @@ import { gegerateDates, dateEqual, formatDate } from './generateDates.js'; export default { props: { - duration: { - type: Number, - default: 500, - }, - dotList: { - type: Array, /// 打点日期列表 - default() { - return []; - }, - }, - showBack: { - type: Boolean, // 是否返回今日 - default: false, - }, - todayClass: { - type: String, // 今日的自定义样式class - default: 'is-today', - }, - checkedClass: { - type: String, // 选中日期的样式class - default: 'is-checked', - }, + duration: { type: Number, default: 500 }, + // 打点日期列表 + dotList: { type: Array, default: () => [] }, + // 是否返回今日 + showBack: { type: Boolean, default: false }, + // 今日的自定义样式class + todayClass: { type: String, default: 'is-today' }, + // 选中日期的样式class + checkedClass: { type: String, default: 'is-checked' }, + // 打点日期的自定义样式 dotStyle: { - type: Object, // 打点日期的自定义样式 - default() { + type: Object, + default: () => { return { background: '#FF0000' }; }, }, diff --git a/src/components/Projects/Projects.vue b/src/components/Projects/Projects.vue index 39f1d5f..6338842 100644 --- a/src/components/Projects/Projects.vue +++ b/src/components/Projects/Projects.vue @@ -1,5 +1,5 @@ mb-3 @@ -231,6 +231,7 @@ export default { let date = ''; if (cur) { date = new Date(cur); + console.log('date: ', date); } else { date = new Date(); } @@ -330,7 +331,8 @@ export default { }, // 返回 - goback() { + goToday() { + console.log(1); const d = new Date(); this.initDate(d); }, diff --git a/src/components/Upload/Upload.vue b/src/components/Upload/Upload.vue index 7d0a100..3487143 100644 --- a/src/components/Upload/Upload.vue +++ b/src/components/Upload/Upload.vue @@ -1,31 +1,33 @@ + + diff --git a/src/store/project/state.js b/src/store/project/state.js index d68ccd8..11c2632 100644 --- a/src/store/project/state.js +++ b/src/store/project/state.js @@ -9,7 +9,6 @@ const state = { description: '', }, dotList: [], // 小红点 - weekMode: false, // 日历展开收缩 }; export default state; From 0841fe08acc31159024ffefbc2cf974e423c0a21 Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Wed, 11 Aug 2021 16:38:42 +0800 Subject: [PATCH 10/15] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E7=9A=84weekmode=20store=E9=87=8C=E7=9A=84=E4=B8=9C?= =?UTF-8?q?=E8=A5=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + src/pages/index/index.vue | 11 +---------- src/store/project/mutations.js | 9 --------- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f07c2c..178da44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ - | 提交到本地 | 9cbe411 - | 插件参数处理调整 | a3e68d3 - | 插件数据获取 | 5b91bdc + - | 日历定位;合并 | ea3f937 - | 日常任务插件调整 | c1881f9 - | 时间基准线，默认插件 | a33ba1e - | 时间轴修改状态时提示框增加 | e841392 diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 5d2928d..c40a82a 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -44,21 +44,12 @@ export default { this.handleFindPoint(); }, - onPageScroll(res) { - // console.log('页面滚动了', res.scrollTop); - if (res.scrollTop > 0) { - this.setWeekMode(true); - } else { - this.setWeekMode(false); - } - }, - onReady() { this.calendar = this.$refs.calendar; }, methods: { - ...mapMutations('project', ['setProjects', 'setDotList', 'setWeekMode']), + ...mapMutations('project', ['setProjects', 'setDotList']), // 获取项目列表 async getProjects(start = this.$moment().startOf('day').valueOf(), end = this.$moment().endOf('day').valueOf()) { diff --git a/src/store/project/mutations.js b/src/store/project/mutations.js index 8b2d5d9..f7c20ef 100644 --- a/src/store/project/mutations.js +++ b/src/store/project/mutations.js @@ -50,15 +50,6 @@ const mutations = { setDotList(state, data) { state.dotList = data; }, - - /** - * 设置日历是否展开收缩 - * @param { object } state - * @param { boolean } show - */ - setWeekMode(state, show) { - state.weekMode = show; - }, }; export default mutations; From e339eece4edf5a733ad41f6ea634dab6abbcf028 Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Wed, 11 Aug 2021 16:43:03 +0800 Subject: [PATCH 11/15] =?UTF-8?q?style:=20=E5=88=A0=E9=99=A4calendar?= =?UTF-8?q?=E4=B8=AD=E5=A4=9A=E4=BD=99=E7=9A=84console?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + src/components/Calendar/Calendar.vue | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 178da44..af1de9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -130,6 +130,7 @@ tip | 任务状态显示及tip组件数据的重构 | 78a5750 - | 下滑时间轴添加备注 | 4fd20e3 - | 任务状态重构 | 4693655 + - | 删除多余的weekmode store里的东西 | 0841fe0 - | 删除多余的技术验证界面 | 542ae5b - | 界面样式调整 | 4367249 - | 重构store分层 | 5f6fff8 diff --git a/src/components/Calendar/Calendar.vue b/src/components/Calendar/Calendar.vue index efb4eba..0a56307 100644 --- a/src/components/Calendar/Calendar.vue +++ b/src/components/Calendar/Calendar.vue @@ -231,7 +231,6 @@ export default { let date = ''; if (cur) { date = new Date(cur); - console.log('date: ', date); } else { date = new Date(); } @@ -332,7 +331,6 @@ export default { // 返回 goToday() { - console.log(1); const d = new Date(); this.initDate(d); }, From 7091789e8009a3b7fbe909b3650353354442b0ca Mon Sep 17 00:00:00 2001 From: song Date: Wed, 11 Aug 2021 17:20:06 +0800 Subject: [PATCH 12/15] =?UTF-8?q?fix:=20=E5=88=87=E6=8D=A2=E6=97=A5?= =?UTF-8?q?=E5=8E=86=E6=97=B6=E6=9F=A5=E8=AF=A2=E5=B0=8F=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 261 ++++++++++++++------------- src/components/Calendar/Calendar.vue | 10 + src/pages/index/index.vue | 8 +- 3 files changed, 146 insertions(+), 133 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af1de9a..7e165fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,173 +3,174 @@ ### 🌟 新功能 范围|描述|commitId --|--|-- - calendar, tall.js | 上下滑动切换日历的模式,tall.js中domain根据环境变量切换 | 364e25d - - | db store | 6414c4f - default plugin | 添加默认插件;项目列表;全局项目最大高度设置 | ed1d87b - - | indexedDB | 687394e - pinch | alloy finger实现图片的pinch放大缩小 | de01343 - plugin | 插件添加了token及param参数 | aeb0292 - - | post 封装 | da52e94 - - | tall插件封装 | 1bcb920 - task status | 任务状态切换未完 | 7ffd135 - - | ws storage | 21b3a06 - - | 上传逻辑变化 | 3ff1dc2 - - | 全局插件及默认插件位置修改 | 6c80d08 - - | 向右箭头图标变化 | 8e9ca55 - - | 字体大小更改 | 82cfdd4 - - | 存token | b8a178d - - | 定期任务面板骨架屏添加 | b2698c0 - 富文本插件 | 富文本插件demo测试 | ed3d644 - - | 导入wbs | 1224fcb - - | 导入项目后提示并打开项目详情页 | 410f527 - - | 引入dayjs | 29b8b93 - - | 提交到本地 | 9cbe411 - - | 插件参数处理调整 | a3e68d3 - - | 插件数据获取 | 5b91bdc - - | 日历定位;合并 | ea3f937 - - | 日常任务插件调整 | c1881f9 - - | 时间基准线，默认插件 | a33ba1e - - | 时间轴修改状态时提示框增加 | e841392 - - | 时间轴界面 | 33927e9 - - | 标题栏变化 | 3898cfe - - | 标题栏变化 | c0fcd9d - - | 标题栏角色栏全局任务组件新建 | 0500cb4 - - | 模拟接口测试 | 69e7931 - - | 添加时间轴上下滚动 | 2b81bbc - - | 点击日历日期查询项目列表 | c458385 - - | 角色栏实现 | 94cd671 - - | 设置小红点 | 9316bcb - - | 距调整pc端 | 5069aa1 - - | 配置默认插件接口 | f0c177d - - | 面变化首页变化 | 5e860f1 - - | 项目api url设置 | 6cd5245 - - | 项目列表, 项目url | 32e005b - - | 首页项目样式改变 | 8514c85 + calendar, tall.js | 上下滑动切换日历的模式,tall.js中domain根据环境变量切换 | [364e25d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/364e25d) + - | db store | [6414c4f](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/6414c4f) + default plugin | 添加默认插件;项目列表;全局项目最大高度设置 | [ed1d87b](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ed1d87b) + - | indexedDB | [687394e](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/687394e) + pinch | alloy finger实现图片的pinch放大缩小 | [de01343](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/de01343) + plugin | 插件添加了token及param参数 | [aeb0292](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/aeb0292) + - | post 封装 | [da52e94](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/da52e94) + - | tall插件封装 | [1bcb920](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/1bcb920) + task status | 任务状态切换未完 | [7ffd135](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7ffd135) + - | ws storage | [21b3a06](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/21b3a06) + - | 上传逻辑变化 | [3ff1dc2](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/3ff1dc2) + - | 全局插件及默认插件位置修改 | [6c80d08](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/6c80d08) + - | 向右箭头图标变化 | [8e9ca55](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/8e9ca55) + - | 字体大小更改 | [82cfdd4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/82cfdd4) + - | 存token | [b8a178d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b8a178d) + - | 定期任务面板骨架屏添加 | [b2698c0](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b2698c0) + 富文本插件 | 富文本插件demo测试 | [ed3d644](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ed3d644) + - | 导入wbs | [1224fcb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/1224fcb) + - | 导入项目后提示并打开项目详情页 | [410f527](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/410f527) + - | 引入dayjs | [29b8b93](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/29b8b93) + - | 提交到本地 | [9cbe411](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/9cbe411) + - | 插件参数处理调整 | [a3e68d3](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a3e68d3) + - | 插件数据获取 | [5b91bdc](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5b91bdc) + - | 日历定位;合并 | [ea3f937](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ea3f937) + - | 日常任务插件调整 | [c1881f9](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c1881f9) + - | 时间基准线，默认插件 | [a33ba1e](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a33ba1e) + - | 时间轴修改状态时提示框增加 | [e841392](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e841392) + - | 时间轴界面 | [33927e9](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/33927e9) + - | 标题栏变化 | [3898cfe](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/3898cfe) + - | 标题栏变化 | [c0fcd9d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c0fcd9d) + - | 标题栏角色栏全局任务组件新建 | [0500cb4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0500cb4) + - | 模拟接口测试 | [69e7931](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/69e7931) + - | 添加时间轴上下滚动 | [2b81bbc](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/2b81bbc) + - | 点击日历日期查询项目列表 | [c458385](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c458385) + - | 角色栏实现 | [94cd671](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/94cd671) + - | 设置小红点 | [9316bcb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/9316bcb) + - | 距调整pc端 | [5069aa1](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5069aa1) + - | 配置默认插件接口 | [f0c177d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/f0c177d) + - | 面变化首页变化 | [5e860f1](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5e860f1) + - | 项目api url设置 | [6cd5245](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/6cd5245) + - | 项目列表, 项目url | [32e005b](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/32e005b) + - | 首页项目样式改变 | [8514c85](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/8514c85) ### 🎨 代码样式 范围|描述|commitId --|--|-- - - | calendar注释 | a2ec112 - - | 代码格式细节调整 | cb2532b - - | 任务快捷方式图标增加 | 4aba872 - - | 修改角色样式 | 73e268e - - | 删除console.log | 5064a38 - - | 删除index中没用的alert代码 | 9c9eec7 - - | 删除mock,console;upload添加loading | 99d42e2 - - | 删除多余字段 | 5ae3973 - - | 删除插件携带的多余文件 | 0f392bb - - | 删除没用代码 | 34b20e1 - - | 图标修改 | 54bca09 - - | 无基本变化 | 21ac4bb - - | 日常任务修改 | dfa7ee2 - - | 更新代码 | 8c27e68 - - | 更新代码 | 1f40a76 - - | 格式细节调整 | b907a03 - - | 添加插件数据 | 2f11b42 - - | 组件新建 | 89c0035 + - | calendar注释 | [a2ec112](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a2ec112) + - | 代码格式细节调整 | [cb2532b](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/cb2532b) + - | 任务快捷方式图标增加 | [4aba872](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4aba872) + - | 修改角色样式 | [73e268e](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/73e268e) + - | 删除calendar中多余的console | [e339eec](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e339eec) + - | 删除console.log | [5064a38](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5064a38) + - | 删除index中没用的alert代码 | [9c9eec7](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/9c9eec7) + - | 删除mock,console;upload添加loading | [99d42e2](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/99d42e2) + - | 删除多余字段 | [5ae3973](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5ae3973) + - | 删除插件携带的多余文件 | [0f392bb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0f392bb) + - | 删除没用代码 | [34b20e1](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/34b20e1) + - | 图标修改 | [54bca09](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/54bca09) + - | 无基本变化 | [21ac4bb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/21ac4bb) + - | 日常任务修改 | [dfa7ee2](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/dfa7ee2) + - | 更新代码 | [8c27e68](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/8c27e68) + - | 更新代码 | [1f40a76](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/1f40a76) + - | 格式细节调整 | [b907a03](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b907a03) + - | 添加插件数据 | [2f11b42](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/2f11b42) + - | 组件新建 | [89c0035](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/89c0035) ### 🐛 Bug 修复 范围|描述|commitId --|--|-- - ID1000343 | 解决向下预加载查询参数时间没+1颗粒度;以及滚动加载颗粒度写死的问题 | 940603a, closes #ID1000343 - plugin | 插件解析机制完善 | 0f5a27d - project title | 项目标题修改; 切换角色移除script | 5c20017 - roles | 修复默认显示不是我的角色的问题 | b69f94f - role | 切换角色的逻辑修正完善 | 4ae534f - task任务逻辑完善 | 减少初始global及regular的不必要请求 | bd4bd38 - - | 上下滑动加载定期任务 | 4090d89 - - | 上下滚动时间轴 | d533a01 - - | 下拉加载定期任务传参，时间格式化修改 | 0b95a0e - - | 任务开始时间延迟插件 | 992a313 - - | 修改main | 749ae9a - - | 修改报错 | 531c14d - - | 修改接口路径 | df6acf2 - - | 修改角色栏组件 | a54c601 - - | 定期任务接口 | aa4981c - - | 定期任务插件 | 92b3254 - - | 定期任务未加载时,显示空的时间轴并能上下滑动 | ce38093 - - | 平车演示临时去掉项目快捷方式的toast提示 | e0b2c23 - - | 手动展开日常任务 | 0a4a622 - - | 提示信息显示bug及日常任务收缩问题 | f2f06c5 - - | 插件bug解决 | 41257eb - - | 日常任务html数据查验 | 880ce5c - - | 日常任务插件遍历时的key值修改 | cd26285 - - | 日常任务插件面板高度修改 | 249f9e4 - - | 时间轴上下滑动 | 4d0ae46 - - | 时间轴上下滚动数据加载bug修改 | e82ede4 - - | 时间轴插件 | 225d3cc - - | 时间轴骨架屏修改 | ca78d02 - - | 角色栏修改 | 19228d6 - - | 解决时间轴报错 | da1eece - - | 骨架屏替换 | e9fdd71 + ID1000343 | 解决向下预加载查询参数时间没+1颗粒度;以及滚动加载颗粒度写死的问题 | [940603a](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/940603a), closes [#ID1000343](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/issues/ID1000343) + plugin | 插件解析机制完善 | [0f5a27d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0f5a27d) + project title | 项目标题修改; 切换角色移除script | [5c20017](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5c20017) + roles | 修复默认显示不是我的角色的问题 | [b69f94f](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b69f94f) + role | 切换角色的逻辑修正完善 | [4ae534f](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4ae534f) + task任务逻辑完善 | 减少初始global及regular的不必要请求 | [bd4bd38](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/bd4bd38) + - | 上下滑动加载定期任务 | [4090d89](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4090d89) + - | 上下滚动时间轴 | [d533a01](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/d533a01) + - | 下拉加载定期任务传参，时间格式化修改 | [0b95a0e](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0b95a0e) + - | 任务开始时间延迟插件 | [992a313](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/992a313) + - | 修改main | [749ae9a](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/749ae9a) + - | 修改报错 | [531c14d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/531c14d) + - | 修改接口路径 | [df6acf2](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/df6acf2) + - | 修改角色栏组件 | [a54c601](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a54c601) + - | 定期任务接口 | [aa4981c](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/aa4981c) + - | 定期任务插件 | [92b3254](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/92b3254) + - | 定期任务未加载时,显示空的时间轴并能上下滑动 | [ce38093](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ce38093) + - | 平车演示临时去掉项目快捷方式的toast提示 | [e0b2c23](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e0b2c23) + - | 手动展开日常任务 | [0a4a622](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0a4a622) + - | 提示信息显示bug及日常任务收缩问题 | [f2f06c5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/f2f06c5) + - | 插件bug解决 | [41257eb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/41257eb) + - | 日常任务html数据查验 | [880ce5c](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/880ce5c) + - | 日常任务插件遍历时的key值修改 | [cd26285](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/cd26285) + - | 日常任务插件面板高度修改 | [249f9e4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/249f9e4) + - | 时间轴上下滑动 | [4d0ae46](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4d0ae46) + - | 时间轴上下滚动数据加载bug修改 | [e82ede4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e82ede4) + - | 时间轴插件 | [225d3cc](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/225d3cc) + - | 时间轴骨架屏修改 | [ca78d02](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ca78d02) + - | 角色栏修改 | [19228d6](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/19228d6) + - | 解决时间轴报错 | [da1eece](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/da1eece) + - | 骨架屏替换 | [e9fdd71](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e9fdd71) ### 📝 文档 范围|描述|commitId --|--|-- - - | README.md | ab0eb05 + - | README.md | [ab0eb05](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ab0eb05) ### 🔧 测试 范围|描述|commitId --|--|-- - - | 禁用任务开始操作 | b5425db + - | 禁用任务开始操作 | [b5425db](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b5425db) ### 🔨 代码重构 范围|描述|commitId --|--|-- - calendar | 日历细节调整 | 1a8d6bf - - | project 代码健壮性完善 | a3202c5 - store/home | 删除store/home | db8a3b4 - task beginTime | 格式化任务开始时间 | fbc0301 - template | eslint prettier sass uview tailwindcss | 9c966a1 - tips | 修改任务状态方法重构 | b57d3ac - tip | 任务状态显示及tip组件数据的重构 | 78a5750 - - | 下滑时间轴添加备注 | 4fd20e3 - - | 任务状态重构 | 4693655 - - | 删除多余的weekmode store里的东西 | 0841fe0 - - | 删除多余的技术验证界面 | 542ae5b - - | 界面样式调整 | 4367249 - - | 重构store分层 | 5f6fff8 + calendar | 日历细节调整 | [1a8d6bf](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/1a8d6bf) + - | project 代码健壮性完善 | [a3202c5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a3202c5) + store/home | 删除store/home | [db8a3b4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/db8a3b4) + task beginTime | 格式化任务开始时间 | [fbc0301](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/fbc0301) + template | eslint prettier sass uview tailwindcss | [9c966a1](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/9c966a1) + tips | 修改任务状态方法重构 | [b57d3ac](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b57d3ac) + tip | 任务状态显示及tip组件数据的重构 | [78a5750](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/78a5750) + - | 下滑时间轴添加备注 | [4fd20e3](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4fd20e3) + - | 任务状态重构 | [4693655](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4693655) + - | 删除多余的weekmode store里的东西 | [0841fe0](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0841fe0) + - | 删除多余的技术验证界面 | [542ae5b](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/542ae5b) + - | 界面样式调整 | [4367249](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4367249) + - | 重构store分层 | [5f6fff8](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5f6fff8) ### 🚀 性能优化 范围|描述|commitId --|--|-- - - | 修改定期任务骨架屏高度 | 909a734 - - | 插件查询及展示 | 4dba770 - - | 日历的更改 | 7353ac8 - - | 测试接口 | 215e074 - - | 组件文件夹新建 | 22bfe7b - - | 组件文件夹新建 | 17bb8c9 - - | 组件文件夹新建 | 1421504 - - | 角色栏文字颜色修改 | 215c6b3 - - | 解决警告 | c932b09 + - | 修改定期任务骨架屏高度 | [909a734](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/909a734) + - | 插件查询及展示 | [4dba770](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4dba770) + - | 日历的更改 | [7353ac8](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7353ac8) + - | 测试接口 | [215e074](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/215e074) + - | 组件文件夹新建 | [22bfe7b](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/22bfe7b) + - | 组件文件夹新建 | [17bb8c9](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/17bb8c9) + - | 组件文件夹新建 | [1421504](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/1421504) + - | 角色栏文字颜色修改 | [215c6b3](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/215c6b3) + - | 解决警告 | [c932b09](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c932b09) ### chore 范围|描述|commitId --|--|-- - - | api 封装 | 8dcb8a2 - - | env host修改 | a79a4a5 - - | merge globals | b0957cc - - | merge wrr | 5ccc7a5 - - | mock | 51c24a5 - package manifest | 去掉了摇树 | f7c1dd4 - pwa 小程序 | 移除了pwa，alloyFinger添加平台判断 | 875fab4 - - | uview-ui | a9ea34b - v3.0.1 | tall api 地址从1.0改成了3.0 | db5afd5 - 信息配置 | 配置eslint等配置 | 7421443 - - | 修复不能build的问题 | 0b7b91e - - | 删除多余的构建的命令 | 3f4eb2f + - | api 封装 | [8dcb8a2](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/8dcb8a2) + - | env host修改 | [a79a4a5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a79a4a5) + - | merge globals | [b0957cc](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b0957cc) + - | merge wrr | [5ccc7a5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5ccc7a5) + - | mock | [51c24a5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/51c24a5) + package manifest | 去掉了摇树 | [f7c1dd4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/f7c1dd4) + pwa 小程序 | 移除了pwa，alloyFinger添加平台判断 | [875fab4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/875fab4) + - | uview-ui | [a9ea34b](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a9ea34b) + v3.0.1 | tall api 地址从1.0改成了3.0 | [db5afd5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/db5afd5) + 信息配置 | 配置eslint等配置 | [7421443](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7421443) + - | 修复不能build的问题 | [0b7b91e](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0b7b91e) + - | 删除多余的构建的命令 | [3f4eb2f](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/3f4eb2f) 范围|描述|commitId --|--|-- - - | style:index | 978f272 - - | !2 基础模板v1.1.0 | f5e61dd - - | init | c0f1deb + - | style:index | [978f272](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/978f272) + - | !2 基础模板v1.1.0 | [f5e61dd](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/f5e61dd) + - | init | [c0f1deb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c0f1deb) diff --git a/src/components/Calendar/Calendar.vue b/src/components/Calendar/Calendar.vue index 0a56307..8dcd9d7 100644 --- a/src/components/Calendar/Calendar.vue +++ b/src/components/Calendar/Calendar.vue @@ -134,6 +134,8 @@ export default { weekMode: false, // false -> 月 true -> 显示周 swiper: [0, 1, 2], selectedDate: formatDate(new Date(), 'yyyy-MM-dd'), // 当前选中的日期 + start: '', + end: '', }; }, @@ -202,6 +204,8 @@ export default { created() { this.initDate(); + this.start = this.$moment().startOf('month').valueOf(); + this.end = this.$moment().endOf('month').valueOf(); }, methods: { @@ -220,9 +224,15 @@ export default { if (current - pre === 1 || current - pre === -2) { // 下一个月 或 下一周 this.daysNext(); + this.start = this.$t.time.add(this.start, 1, 'month').valueOf(); + this.end = this.$t.time.add(this.end, 1, 'month').valueOf(); + this.$emit('handleFindPoint', this.start, this.end); } else { // 上一个月 或 上一周 this.daysPre(); + this.start = this.$t.time.add(this.start, -1, 'month').valueOf(); + this.end = this.$t.time.add(this.end, -1, 'month').valueOf(); + this.$emit('handleFindPoint', this.start, this.end); } }, diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index c40a82a..74dcc1f 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -2,7 +2,7 @@ - + @@ -66,9 +66,11 @@ export default { * @param { string } endTime 结束时间 * @param { string } startTime 开始时间 */ - async handleFindPoint(start = this.$moment().startOf('month').valueOf(), end = this.$moment().endOf('month').valueOf()) { + async handleFindPoint(start, end) { try { - const data = await this.$u.api.findRedPoint(start, end); + const startTime = start || this.$moment().startOf('month').valueOf(); + const endTime = end || this.$moment().endOf('month').valueOf(); + const data = await this.$u.api.findRedPoint(startTime, endTime); this.setDotList(data); } catch (error) { console.log('error: ', error); From 27b7326441be14093b7cf487db8206b91a8f46fd Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Wed, 11 Aug 2021 17:39:59 +0800 Subject: [PATCH 13/15] =?UTF-8?q?feat:=20=E4=BB=BB=E5=8A=A1=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E4=B8=AD=E7=8A=B6=E6=80=81=E6=95=B0=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + .../TimeLine/component/TimeStatus.vue | 35 ++++++++++++++++++- src/utils/time.js | 2 ++ src/utils/upload.js | 1 - 4 files changed, 37 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af1de9a..ab4d6a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -54,6 +54,7 @@ - | 代码格式细节调整 | cb2532b - | 任务快捷方式图标增加 | 4aba872 - | 修改角色样式 | 73e268e + - | 删除calendar中多余的console | e339eec - | 删除console.log | 5064a38 - | 删除index中没用的alert代码 | 9c9eec7 - | 删除mock,console;upload添加loading | 99d42e2 diff --git a/src/components/TimeLine/component/TimeStatus.vue b/src/components/TimeLine/component/TimeStatus.vue index 53f06b2..62bb82c 100644 --- a/src/components/TimeLine/component/TimeStatus.vue +++ b/src/components/TimeLine/component/TimeStatus.vue @@ -12,7 +12,7 @@ - + @@ -127,6 +127,39 @@ export default { return `是否要重新开始此任务`; } }, + + // 计算进行中状态剩余时间 + // 预计结束时间 = realStart(实际开始) + planDuration(计划时长) + // 剩余时间 = 预计结束时间 - 当前时间 + // 剩余时间 = realStart + planDuration - Date.now() + computeDurationText() { + try { + const { realStart, planDuration } = this.task; + const leftTime = +realStart + +planDuration - Date.now(); // 剩余时间 + console.log('leftTime: ', leftTime, this.$moment.duration(leftTime)); + if (leftTime < 0) return '0'; + const { years, months, days, hours, minutes, seconds, milliseconds } = this.$moment.duration(leftTime); + let num = 0; + let time = 'seconds'; + if (years > 0) { + num = years; + } else if (months > 0) { + num = months; + } else if (days > 0) { + num = days; + } else if (hours > 0) { + num = hours; + } else if (minutes > 0) { + num = minutes; + } else if (seconds > 0) { + num = seconds; + } else if (milliseconds > 0) { + num = milliseconds; + } + } catch (e) { + //TODO handle the exception + } + }, }, }; diff --git a/src/utils/time.js b/src/utils/time.js index 00b8567..46fa0df 100644 --- a/src/utils/time.js +++ b/src/utils/time.js @@ -2,9 +2,11 @@ import dayjs from 'dayjs'; const advancedFormat = require('dayjs/plugin/advancedFormat'); const weekOfYear = require('dayjs/plugin/weekOfYear'); +const duration = require('dayjs/plugin/duration'); dayjs.extend(advancedFormat); dayjs.extend(weekOfYear); +dayjs.extend(duration); /** * 格式化数字 diff --git a/src/utils/upload.js b/src/utils/upload.js index 88b2550..537a82a 100644 --- a/src/utils/upload.js +++ b/src/utils/upload.js @@ -42,7 +42,6 @@ export default { if (code !== 200) { reject(msg); } else { - console.log('data.data: ', JSON.parse(data).data); resolve(JSON.parse(data).data); } } else { From 5e06adf5a37db436568ee8dd207bc4347efd97b7 Mon Sep 17 00:00:00 2001 From: song Date: Wed, 11 Aug 2021 18:19:59 +0800 Subject: [PATCH 14/15] =?UTF-8?q?feat:=20=E5=AF=BC=E5=85=A5=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE,=E6=9B=B4=E6=96=B0=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + src/pages/project/project.vue | 13 ------ src/plugins/p-wbs-import/p-wbs-import.vue | 54 +++++++++++++++++++++-- src/store/project/mutations.js | 12 ----- src/store/project/state.js | 6 --- 5 files changed, 51 insertions(+), 35 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e165fb..e78cb32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -88,6 +88,7 @@ - | 修改报错 | [531c14d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/531c14d) - | 修改接口路径 | [df6acf2](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/df6acf2) - | 修改角色栏组件 | [a54c601](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a54c601) + - | 切换日历时查询小红点 | [7091789](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7091789) - | 定期任务接口 | [aa4981c](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/aa4981c) - | 定期任务插件 | [92b3254](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/92b3254) - | 定期任务未加载时,显示空的时间轴并能上下滑动 | [ce38093](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ce38093) diff --git a/src/pages/project/project.vue b/src/pages/project/project.vue index 89bb87d..e5c9975 100644 --- a/src/pages/project/project.vue +++ b/src/pages/project/project.vue @@ -1,17 +1,5 @@