diff --git a/CHANGELOG.md b/CHANGELOG.md index 8df8523..70b5f82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ -# 0.1.0 (2021-08-03) +# 0.1.0 (2021-08-09) +# 0.1.0 (2021-08-06) ### 🌟 新功能 范围|描述|commitId @@ -9,12 +10,16 @@ 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 - | 引入dayjs | 29b8b93 - | 提交到本地 | 9cbe411 - | 插件参数处理调整 | a3e68d3 @@ -31,24 +36,55 @@ - | 角色栏实现 | 94cd671 - | 距调整pc端 | 5069aa1 - | 配置默认插件接口 | f0c177d + - | 面变化首页变化 | 5e860f1 + - | 项目列表, 项目url | 32e005b + - | 首页项目样式改变 | 8514c85 + - | db store | [6414c4f](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/6414c4f) + - | 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) + - | ws storage | [21b3a06](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/21b3a06) + - | 全局插件及默认插件位置修改 | [6c80d08](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/6c80d08) + - | 字体大小更改 | [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) + - | 引入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) + - | 日常任务插件调整 | [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) + - | 角色栏实现 | [94cd671](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/94cd671) + - | 距调整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) ### 🎨 代码样式 范围|描述|commitId --|--|-- - - | 代码格式细节调整 | cb2532b - - | 任务快捷方式图标增加 | 4aba872 - - | 修改角色样式 | 73e268e - - | 删除多余字段 | 5ae3973 - - | 删除插件携带的多余文件 | 0f392bb - - | 图标修改 | 54bca09 - - | 无基本变化 | 21ac4bb - - | 日常任务修改 | dfa7ee2 - - | 更新代码 | 8c27e68 - - | 更新代码 | 1f40a76 - - | 格式细节调整 | b907a03 - - | 添加插件数据 | 2f11b42 - - | 组件新建 | 89c0035 + - | 代码格式细节调整 | [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) + - | 删除多余字段 | [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) + - | 图标修改 | [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 修复 @@ -69,6 +105,7 @@ - | 修改角色栏组件 | a54c601 - | 定期任务接口 | aa4981c - | 定期任务插件 | 92b3254 + - | 平车演示临时去掉项目快捷方式的toast提示 | e0b2c23 - | 提示信息显示bug及日常任务收缩问题 | f2f06c5 - | 插件bug解决 | 41257eb - | 日常任务html数据查验 | 880ce5c @@ -81,60 +118,114 @@ - | 角色栏修改 | 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) + - | 修改角色栏组件 | [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) + - | 手动展开日常任务 | [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](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 - | 删除多余的技术验证界面 | 542ae5b - | 界面样式调整 | 4367249 - | 重构store分层 | 5f6fff8 + - | 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) + - | 删除多余的技术验证界面 | [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 --|--|-- - | 插件查询及展示 | 4dba770 + - | 日历的更改 | 7353ac8 - | 测试接口 | 215e074 - | 组件文件夹新建 | 22bfe7b - | 组件文件夹新建 | 17bb8c9 - | 组件文件夹新建 | 1421504 - | 角色栏文字颜色修改 | 215c6b3 - | 解决警告 | c932b09 + - | 插件查询及展示 | [4dba770](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4dba770) + - | 测试接口 | [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 - 信息配置 | 配置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) + 信息配置 | 配置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/README.md b/README.md index 17525e9..83bd0d8 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ yarn dev:h5 ``` 浏览器输入网址: -127.0.0.1:8080/#/?u=xxx&p=x&r=x&pn=x +127.0.0.1:8080/#/?u=1217647686598135808&p=1420652719055839232 - u: userId - p: projectId - r: roleId diff --git a/package.json b/package.json index 432ebdd..240011d 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "compression-webpack-plugin": "^5.0.1", "conventional-changelog-cli": "^2.0.28", "core-js": "^3.15.2", - "cross-env": "^7.0.2", + "cross-env": "^7.0.3", "eslint": "^6.7.2", "eslint-plugin-prettier": "^3.3.1", "eslint-plugin-vue": "^6.2.2", diff --git a/public/index.html b/public/index.html index f3b1b9a..37ae61b 100644 --- a/public/index.html +++ b/public/index.html @@ -8,9 +8,9 @@ <%= htmlWebpackPlugin.options.title %> diff --git a/src/App.vue b/src/App.vue index 61991a6..84b8cf9 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,7 +1,19 @@ diff --git a/src/apis/plugin.js b/src/apis/plugin.js index 0bc9630..e8ea541 100644 --- a/src/apis/plugin.js +++ b/src/apis/plugin.js @@ -1,12 +1,10 @@ -import domain from '@/config/domains'; -const apiUrl = process.env.VUE_APP_API_URL; -const mock = `${apiUrl}${domain}`; -const plugin = `${apiUrl}/pluginshop/plugin`; +// 插件的地址是固定的 +const url = process.env.VUE_APP_API_URL; const install = (Vue, vm) => { vm.$u.api = { ...vm.$u.api } || {}; - vm.$u.api.getPlugin = param => vm.$u.post(`${mock}/plugin`, param); - vm.$u.api.getOtherPlugin = param => vm.$u.post(`${plugin}/query`, param); + // 获取插件信息 + vm.$u.api.getOtherPlugin = param => vm.$u.post(`${url}/pluginshop/plugin/query`, param); }; export default { install }; diff --git a/src/apis/project.js b/src/apis/project.js index 03b9cb0..4832fa4 100644 --- a/src/apis/project.js +++ b/src/apis/project.js @@ -1,12 +1,7 @@ -const apiUrl = process.env.VUE_APP_API_URL; -import domainPath from '@/config/domains'; -const tall = `${apiUrl}${domainPath}`; -const project = `${tall}/project`; - const install = (Vue, vm) => { vm.$u.api = { ...vm.$u.api } || {}; //根据id获取项目信息 - vm.$u.api.findProjectById = param => vm.$u.post(`${project}/findProjectById`, param); + vm.$u.api.findProjectById = param => vm.$u.post(`${uni.$t.domain}/project/findProjectById`, param); }; export default { install }; diff --git a/src/apis/role.js b/src/apis/role.js index 275aae6..1e1d5be 100644 --- a/src/apis/role.js +++ b/src/apis/role.js @@ -1,11 +1,7 @@ -const apiUrl = process.env.VUE_APP_API_URL; -import domain from '@/config/domains'; -const role = `${apiUrl}${domain}/role`; - const install = (Vue, vm) => { vm.$u.api = { ...vm.$u.api } || {}; //根据时间基准点和角色查找定期任务 - vm.$u.api.findShowRole = param => vm.$u.post(`${role}/show`, param); + vm.$u.api.findShowRole = param => vm.$u.post(`${uni.$t.domain}/role/show`, param); }; export default { install }; diff --git a/src/apis/user.js b/src/apis/tall.js similarity index 61% rename from src/apis/user.js rename to src/apis/tall.js index fead1f4..5ff9784 100644 --- a/src/apis/user.js +++ b/src/apis/tall.js @@ -3,7 +3,10 @@ const tall = `${apiUrl}/tall/v1.0`; const install = (Vue, vm) => { vm.$u.api = { ...vm.$u.api } || {}; + // 根据userId获取token vm.$u.api.getToken = userId => vm.$u.get(`${tall}/users/userId`, { userId }); + // 获取项目列表 + vm.$u.api.getProjects = (startTime, endTime) => vm.$u.post(`${tall}/project/query`, { startTime, endTime }); }; export default { install }; diff --git a/src/apis/task.js b/src/apis/task.js index 9dfe9bb..a2eabf0 100644 --- a/src/apis/task.js +++ b/src/apis/task.js @@ -1,13 +1,11 @@ -const apiUrl = process.env.VUE_APP_API_URL; -import domain from '@/config/domains'; -const task = `${apiUrl}${domain}/task`; - const install = (Vue, vm) => { vm.$u.api = { ...vm.$u.api } || {}; - vm.$u.api.getGlobal = param => vm.$u.post(`${task}/global`, param); - vm.$u.api.getPermanent = param => vm.$u.post(`${task}/permanent`, param); + vm.$u.api.getGlobal = param => vm.$u.post(`${uni.$t.domain}/task/global`, param); + vm.$u.api.getPermanent = param => vm.$u.post(`${uni.$t.domain}/task/permanent`, param); //根据时间基准点和角色查找定期任务 - vm.$u.api.getRegularTask = param => vm.$u.post(`${task}/regular`, param); + vm.$u.api.getRegularTask = param => vm.$u.post(`${uni.$t.domain}/task/regular`, param); + //修改任务状态 + vm.$u.api.updateTaskType = param => vm.$u.post(`${uni.$t.domain}/task/type`, param); }; export default { install }; diff --git a/src/apis/wbs.js b/src/apis/wbs.js new file mode 100644 index 0000000..e9a13a5 --- /dev/null +++ b/src/apis/wbs.js @@ -0,0 +1,7 @@ +const install = (Vue, vm) => { + vm.$u.api = { ...vm.$u.api } || {}; + // 导入wbs + vm.$u.api.import = formData => vm.$t.chooseAndUpload(`${uni.$t.domain}/wbs`, formData); +}; + +export default { install }; diff --git a/src/components/Calendar/Calendar.vue b/src/components/Calendar/Calendar.vue new file mode 100644 index 0000000..cb8e040 --- /dev/null +++ b/src/components/Calendar/Calendar.vue @@ -0,0 +1,472 @@ + +mb-3 + + + diff --git a/src/components/Calendar/generateDates.js b/src/components/Calendar/generateDates.js new file mode 100644 index 0000000..c08fc6a --- /dev/null +++ b/src/components/Calendar/generateDates.js @@ -0,0 +1,136 @@ +/* + *此函数的作用是根据传入的一个日期，返回这一周的日期或者这一个月的日期， + * 如果是月的话注意还包含上个月和下个月的日期，月的话总共数据有 6 * 7 = 42个 + * + */ +/* + * 时间格式化函数 + * 重要提示，微信小程序new Date('2020-04-16')在ios中无法获取时间对象 + * 解决方式: 建议将时间都格式化成'2020/04/16 00:00:00'的格式 + * 函数示例: formatDate(new Date(), 'YYYY/MM/dd hh:mm:ss') + */ +export const formatDate = (date, fmt) => { + if (/(y+)/.test(fmt)) { + fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length)); + } + let o = { + 'M+': date.getMonth() + 1, + 'd+': date.getDate(), + 'h+': date.getHours(), + 'm+': date.getMinutes(), + 's+': date.getSeconds(), + }; + for (let k in o) { + if (new RegExp(`(${k})`).test(fmt)) { + let str = o[k] + ''; + fmt = fmt.replace(RegExp.$1, RegExp.$1.length === 1 ? str : padLeftZero(str)); + } + } + return fmt; +}; +const padLeftZero = str => { + return ('00' + str).substr(str.length); +}; + +// 判断是不是date对象 +export const judgeType = s => { + // 函数返回数据的具体类型 + return Object.prototype.toString.call(s).slice(8, -1); +}; + +export const equalDate = (d1, d2) => { + let result = false; + if (d1.getFullYear() === d2.getFullYear() && d1.getMonth() === d2.getMonth() && d1.getDate() === d2.getDate()) { + result = true; + } + return result; +}; + +/* 比较时间,时间格式为2020-04-04 + */ +export const dateEqual = (before, after) => { + before = new Date(before.replace('-', '/').replace('-', '/')); + after = new Date(after.replace('-', '/').replace('-', '/')); + if (before.getTime() - after.getTime() === 0) { + return true; + } else { + return false; + } +}; + +export const gegerateDates = (date = new Date(), type = 'week') => { + const result = []; + if (judgeType(date) === 'Date') { + // 年，月，日 + const y = date.getFullYear(); + const m = date.getMonth(); + const d = date.getDate(); + const days = new Date(y, m + 1, 0).getDate(); + // 获取日期是星期几 + // let weekIndex = date.getDay() === 0 ? 7 : date.getDay(); + let weekIndex = date.getDay(); + if (type === 'month') { + const dobj = new Date(y, m, 1); + // weekIndex = dobj.getDay() === 0 ? 7 : dobj.getDay(); + weekIndex = dobj.getDay(); + } + if (type === 'week') { + for (let i = weekIndex; i > 0; i--) { + const dtemp = new Date(y, m, d); + dtemp.setDate(dtemp.getDate() - i); + result.push({ + time: dtemp, + show: true, + fullDate: formatDate(dtemp, 'yyyy-MM-dd'), + isToday: equalDate(new Date(), dtemp), + }); + } + for (let i = 0; i <= 7 - weekIndex; i++) { + const dtemp = new Date(y, m, d); + dtemp.setDate(dtemp.getDate() + i); + result.push({ + time: dtemp, + show: true, + fullDate: formatDate(dtemp, 'yyyy-MM-dd'), + isToday: equalDate(new Date(), dtemp), + }); + } + } else if (type === 'month') { + // 上个月 + for (let i = weekIndex; i > 0; i--) { + const dtemp = new Date(y, m, 1); + dtemp.setDate(dtemp.getDate() - i); + result.push({ + time: dtemp, + show: false, + fullDate: formatDate(dtemp, 'yyyy-MM-dd'), + isToday: equalDate(new Date(), dtemp), + }); + } + // 这个月的日期 + for (let i = 0; i < days; i++) { + const dtemp = new Date(y, m, 1); + dtemp.setDate(dtemp.getDate() + i); + result.push({ + time: dtemp, + show: true, + fullDate: formatDate(dtemp, 'yyyy-MM-dd'), + isToday: equalDate(new Date(), dtemp), + }); + } + const len = 42 - result.length; + // 下个月的日期 + for (let i = 1; i <= len; i++) { + const dtemp = new Date(y, m + 1, 0); + dtemp.setDate(dtemp.getDate() + i); + result.push({ + time: dtemp, + show: false, + fullDate: formatDate(dtemp, 'yyyy-MM-dd'), + isToday: equalDate(new Date(), dtemp), + }); + } + } + } + return result; +}; diff --git a/src/components/Globals/Globals.vue b/src/components/Globals/Globals.vue index bc32a54..bda592f 100644 --- a/src/components/Globals/Globals.vue +++ b/src/components/Globals/Globals.vue @@ -1,8 +1,15 @@ diff --git a/src/components/Projects/Projects.vue b/src/components/Projects/Projects.vue new file mode 100644 index 0000000..39f1d5f --- /dev/null +++ b/src/components/Projects/Projects.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/src/components/Skeleton/wisdomcar_mobile b/src/components/Skeleton/wisdomcar_mobile new file mode 160000 index 0000000..2603a0b --- /dev/null +++ b/src/components/Skeleton/wisdomcar_mobile @@ -0,0 +1 @@ +Subproject commit 2603a0bc8b5036c399a5f28b93586072c4850c4b diff --git a/src/components/TimeLine/TimeLine.vue b/src/components/TimeLine/TimeLine.vue index 8abf9d8..ef33b32 100644 --- a/src/components/TimeLine/TimeLine.vue +++ b/src/components/TimeLine/TimeLine.vue @@ -45,7 +45,6 @@ export default { }, methods: { - ...mapMutations('role', ['setRoleId']), ...mapMutations('task', ['setScrollTop', 'setShrink', 'setUpTasks', 'setDownTasks']), // 滚动 diff --git a/src/components/TimeLine/component/TimeBox.vue b/src/components/TimeLine/component/TimeBox.vue index e630361..0afaad2 100644 --- a/src/components/TimeLine/component/TimeBox.vue +++ b/src/components/TimeLine/component/TimeBox.vue @@ -2,7 +2,7 @@ - + {{ $moment(+task.planStart).format(startTimeFormat) }} diff --git a/src/components/TimeLine/component/TimeStatus.vue b/src/components/TimeLine/component/TimeStatus.vue index 7b5a6a0..b6487b9 100644 --- a/src/components/TimeLine/component/TimeStatus.vue +++ b/src/components/TimeLine/component/TimeStatus.vue @@ -1,7 +1,13 @@