diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f5ae2b..6f8015e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,69 +1,112 @@ -# 0.1.0 (2021-08-10) +# 0.1.0 (2021-08-11) ### 🌟 新功能 范围|描述|commitId --|--|-- - - | 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) - - | 引入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) - - | 面变化首页变化 | [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) + 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 + - | 任务进行中状态数字 | 27b7326 + - | 全局插件及默认插件位置修改 | 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 ### 🎨 代码样式 范围|描述|commitId --|--|-- - - | 代码格式细节调整 | [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) - - | 删除没用代码 | [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) + - | calendar注释 | a2ec112 + - | 代码格式细节调整 | cb2532b + - | 任务快捷方式图标增加 | 4aba872 + - | 修改角色样式 | 73e268e + - | 删除calendar中多余的console | e339eec + - | 删除console.log | 5064a38 + - | 删除index中没用的alert代码 | 9c9eec7 + - | 删除mock,console;upload添加loading | 99d42e2 + - | 删除多余字段 | 5ae3973 + - | 删除插件携带的多余文件 | 0f392bb + - | 删除没用代码 | 34b20e1 + - | 图标修改 | 54bca09 + - | 无基本变化 | 21ac4bb + - | 日常任务修改 | dfa7ee2 + - | 更新代码 | 8c27e68 + - | 更新代码 | 1f40a76 + - | 格式细节调整 | b907a03 + - | 添加插件数据 | 2f11b42 + - | 组件新建 | 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 + - | 切换日历时查询小红点 | 7091789 + - | 定期任务接口 | 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) @@ -78,6 +121,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) @@ -100,65 +144,66 @@ ### 📝 文档 范围|描述|commitId --|--|-- - - | README.md | [ab0eb05](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ab0eb05) + - | README.md | ab0eb05 ### 🔧 测试 范围|描述|commitId --|--|-- - - | 禁用任务开始操作 | [b5425db](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b5425db) + - | 禁用任务开始操作 | b5425db ### 🔨 代码重构 范围|描述|commitId --|--|-- - 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) - - | 删除多余的技术验证界面 | [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) + 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 ### 🚀 性能优化 范围|描述|commitId --|--|-- - - | 插件查询及展示 | [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) + - | 修改定期任务骨架屏高度 | 909a734 + - | 插件查询及展示 | 4dba770 + - | 日历的更改 | 7353ac8 + - | 测试接口 | 215e074 + - | 组件文件夹新建 | 22bfe7b + - | 组件文件夹新建 | 17bb8c9 + - | 组件文件夹新建 | 1421504 + - | 角色栏文字颜色修改 | 215c6b3 + - | 解决警告 | c932b09 ### chore 范围|描述|commitId --|--|-- - - | 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) + - | 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 范围|描述|commitId --|--|-- - - | 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) - + - | style:index | 978f272 + - | !2 基础模板v1.1.0 | f5e61dd + - | init | c0f1deb diff --git a/src/apis/tall.js b/src/apis/tall.js index 5edb9d4..121373b 100644 --- a/src/apis/tall.js +++ b/src/apis/tall.js @@ -7,6 +7,8 @@ const install = (Vue, vm) => { 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 }); + // 查询日历是否有小红点 + vm.$u.api.findRedPoint = (startTime, endTime) => vm.$u.post(`${tall}/project/day`, { startTime, endTime }); }; export default { install }; diff --git a/src/components/Calendar/Calendar.vue b/src/components/Calendar/Calendar.vue index c7765d6..8dcd9d7 100644 --- a/src/components/Calendar/Calendar.vue +++ b/src/components/Calendar/Calendar.vue @@ -39,7 +39,7 @@ {{ item.time.getDate() }} - + -mb-3 + diff --git a/src/components/Tips/Tips.vue b/src/components/Tips/Tips.vue index 3f139b4..4c1aa27 100644 --- a/src/components/Tips/Tips.vue +++ b/src/components/Tips/Tips.vue @@ -80,7 +80,8 @@ export default { location.reload(); // this.$router.go(0); } catch (error) { - console.log(error); + console.error(error); + this.$t.ui.showToast(error.msg || '操作失败'); } }, diff --git a/src/components/Upload/Upload.vue b/src/components/Upload/Upload.vue index 7006a76..240985d 100644 --- a/src/components/Upload/Upload.vue +++ b/src/components/Upload/Upload.vue @@ -1,23 +1,33 @@ `, - ], - }, - }); - }, - }, - //根据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/index/index.vue b/src/pages/index/index.vue index 7fa1d25..74dcc1f 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -1,46 +1,30 @@ + + 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/plugins/p-wbs-import/p-wbs-import.vue b/src/plugins/p-wbs-import/p-wbs-import.vue index 6ea90fb..0e37dd2 100644 --- a/src/plugins/p-wbs-import/p-wbs-import.vue +++ b/src/plugins/p-wbs-import/p-wbs-import.vue @@ -1,3 +1,86 @@ + + diff --git a/src/store/project/mutations.js b/src/store/project/mutations.js index 925c7b7..c208b5f 100644 --- a/src/store/project/mutations.js +++ b/src/store/project/mutations.js @@ -29,6 +29,15 @@ const mutations = { setProjectName(state, data) { state.project.name = data; }, + + /** + * 设置小红点 + * @param { object } state + * @param { string } data + */ + setDotList(state, data) { + state.dotList = data; + }, }; export default mutations; diff --git a/src/store/project/state.js b/src/store/project/state.js index 23f467f..d33be86 100644 --- a/src/store/project/state.js +++ b/src/store/project/state.js @@ -2,6 +2,7 @@ const state = { project: { name: '加载中...' }, // 当前项目信息 projects: [], // 项目列表 + dotList: [], // 小红点 }; export default state; diff --git a/src/utils/tall.js b/src/utils/tall.js index 7bf177b..8594b15 100644 --- a/src/utils/tall.js +++ b/src/utils/tall.js @@ -7,6 +7,8 @@ import time from '@/utils/time.js'; import ui from '@/utils/ui.js'; import upload from '@/utils/upload.js'; +const gateway = process.env.VUE_APP_API_URL; + const $t = { zIndex, // 定位元素层级 app, // app级别的相关配置 @@ -16,7 +18,7 @@ const $t = { timeConfig, // 时间相关配置 ui, // ui界面提示相关 chooseAndUpload: upload.chooseAndUpload, // 选择并上传单个文件相关的封装 - domain: 'https://www.tall.wiki/tall3/v3.0.0/defaultwbs', + domain: `${gateway}/defaultwbs`, }; uni.$t = $t; 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/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..537a82a 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,24 +34,30 @@ export default { formData, header: { Authorization: `Bearer ${token}` }, success: ({ data, statusCode }) => { - console.log('data, statusCode: ', data, statusCode); + clearTimeout(timer); + uni.hideLoading(); + if (statusCode === 200 && data) { const { code, msg } = JSON.parse(data); if (code !== 200) { reject(msg); } else { - resolve(data.data); + resolve(JSON.parse(data).data); } } else { reject('上传失败'); } }, fail: error => { + clearTimeout(timer); + uni.hideLoading(); reject(error); }, }); }, fail: error => { + clearTimeout(timer); + uni.hideLoading(); reject(error); }, });