wally
/
tall-mui-3-project
forked from ccsens_fe/tall-mui-3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/lucky' into temp

pull/1/head
wally 4 years ago
parent
a2ec112355 9316bcbb36
commit
886b597f94
12 changed files with 316 additions and 148 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 189
      CHANGELOG.md
  2. 2
      src/apis/tall.js
  3. 38
      src/components/Calendar/Calendar.vue
  4. 86
      src/components/TimeLine/component/TimeBox.vue
  5. 20
      src/components/TimeLine/component/TimeStatus.vue
  6. 1
      src/components/Tips/Tips.vue
  7. 2
      src/components/Upload/Upload.vue
  8. 36
      src/pages/index/index.vue
  9. 13
      src/pages/project/project.vue
  10. 39
      src/plugins/p-wbs-import/p-wbs-import.vue
  11. 30
      src/store/project/mutations.js
  12. 8
      src/store/project/state.js

189
CHANGELOG.md
View File

@ -43,6 +43,43 @@
- | 项目api url设置 | 6cd5245 - | 项目api url设置 | 6cd5245
- | 项目列表, 项目url | 32e005b - | 项目列表, 项目url | 32e005b
- | 首页项目样式改变 | 8514c85 - | 首页项目样式改变 | 8514c85
- | 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)
### 🎨 代码样式 ### 🎨 代码样式
@ -64,105 +101,121 @@
- | 格式细节调整 | b907a03 - | 格式细节调整 | b907a03
- | 添加插件数据 | 2f11b42 - | 添加插件数据 | 2f11b42
- | 组件新建 | 89c0035 - | 组件新建 | 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)
- | 删除console.log | [5064a38](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5064a38)
- | 删除多余字段 | [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 修复 ### 🐛 Bug 修复
范围|描述|commitId 范围|描述|commitId
--|--|-- --|--|--
ID1000343 | 解决向下预加载查询参数时间没+1颗粒度;以及滚动加载颗粒度写死的问题 | 940603a, closes #ID1000343 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 plugin | 插件解析机制完善 | [0f5a27d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0f5a27d)
project title | 项目标题修改; 切换角色移除script | 5c20017 project title | 项目标题修改; 切换角色移除script | [5c20017](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5c20017)
roles | 修复默认显示不是我的角色的问题 | b69f94f roles | 修复默认显示不是我的角色的问题 | [b69f94f](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b69f94f)
role | 切换角色的逻辑修正完善 | 4ae534f role | 切换角色的逻辑修正完善 | [4ae534f](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4ae534f)
task任务逻辑完善 | 减少初始global及regular的不必要请求 | bd4bd38 task任务逻辑完善 | 减少初始global及regular的不必要请求 | [bd4bd38](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/bd4bd38)
- | 上下滑动加载定期任务 | 4090d89 - | 上下滑动加载定期任务 | [4090d89](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4090d89)
- | 上下滚动时间轴 | d533a01 - | 上下滚动时间轴 | [d533a01](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/d533a01)
- | 下拉加载定期任务传参，时间格式化修改 | 0b95a0e - | 下拉加载定期任务传参，时间格式化修改 | [0b95a0e](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0b95a0e)
- | 任务开始时间延迟插件 | 992a313 - | 任务开始时间延迟插件 | [992a313](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/992a313)
- | 修改main | 749ae9a - | 修改main | [749ae9a](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/749ae9a)
- | 修改报错 | 531c14d - | 修改报错 | [531c14d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/531c14d)
- | 修改接口路径 | df6acf2 - | 修改接口路径 | [df6acf2](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/df6acf2)
- | 修改角色栏组件 | a54c601 - | 修改角色栏组件 | [a54c601](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a54c601)
- | 定期任务接口 | aa4981c - | 定期任务接口 | [aa4981c](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/aa4981c)
- | 定期任务插件 | 92b3254 - | 定期任务插件 | [92b3254](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/92b3254)
- | 平车演示临时去掉项目快捷方式的toast提示 | e0b2c23 - | 定期任务未加载时,显示空的时间轴并能上下滑动 | [ce38093](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ce38093)
- | 手动展开日常任务 | 0a4a622 - | 平车演示临时去掉项目快捷方式的toast提示 | [e0b2c23](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e0b2c23)
- | 提示信息显示bug及日常任务收缩问题 | f2f06c5 - | 手动展开日常任务 | [0a4a622](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0a4a622)
- | 插件bug解决 | 41257eb - | 提示信息显示bug及日常任务收缩问题 | [f2f06c5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/f2f06c5)
- | 日常任务html数据查验 | 880ce5c - | 插件bug解决 | [41257eb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/41257eb)
- | 日常任务插件遍历时的key值修改 | cd26285 - | 日常任务html数据查验 | [880ce5c](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/880ce5c)
- | 日常任务插件面板高度修改 | 249f9e4 - | 日常任务插件遍历时的key值修改 | [cd26285](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/cd26285)
- | 时间轴上下滑动 | 4d0ae46 - | 日常任务插件面板高度修改 | [249f9e4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/249f9e4)
- | 时间轴上下滚动数据加载bug修改 | e82ede4 - | 时间轴上下滑动 | [4d0ae46](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4d0ae46)
- | 时间轴插件 | 225d3cc - | 时间轴上下滚动数据加载bug修改 | [e82ede4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e82ede4)
- | 时间轴骨架屏修改 | ca78d02 - | 时间轴插件 | [225d3cc](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/225d3cc)
- | 角色栏修改 | 19228d6 - | 时间轴骨架屏修改 | [ca78d02](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ca78d02)
- | 解决时间轴报错 | da1eece - | 角色栏修改 | [19228d6](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/19228d6)
- | 骨架屏替换 | e9fdd71 - | 解决时间轴报错 | [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 范围|描述|commitId
--|--|-- --|--|--
- | README.md | ab0eb05 - | README.md | [ab0eb05](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ab0eb05)
### 🔧 测试 ### 🔧 测试
范围|描述|commitId 范围|描述|commitId
--|--|-- --|--|--
- | 禁用任务开始操作 | b5425db - | 禁用任务开始操作 | [b5425db](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b5425db)
### 🔨 代码重构 ### 🔨 代码重构
范围|描述|commitId 范围|描述|commitId
--|--|-- --|--|--
calendar | 日历细节调整 | 1a8d6bf calendar | 日历细节调整 | [1a8d6bf](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/1a8d6bf)
- | project 代码健壮性完善 | a3202c5 - | project 代码健壮性完善 | [a3202c5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a3202c5)
store/home | 删除store/home | db8a3b4 store/home | 删除store/home | [db8a3b4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/db8a3b4)
task beginTime | 格式化任务开始时间 | fbc0301 task beginTime | 格式化任务开始时间 | [fbc0301](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/fbc0301)
template | eslint prettier sass uview tailwindcss | 9c966a1 template | eslint prettier sass uview tailwindcss | [9c966a1](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/9c966a1)
tips | 修改任务状态方法重构 | b57d3ac tips | 修改任务状态方法重构 | [b57d3ac](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b57d3ac)
tip | 任务状态显示及tip组件数据的重构 | 78a5750 tip | 任务状态显示及tip组件数据的重构 | [78a5750](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/78a5750)
- | 下滑时间轴添加备注 | 4fd20e3 - | 下滑时间轴添加备注 | [4fd20e3](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4fd20e3)
- | 任务状态重构 | 4693655 - | 任务状态重构 | [4693655](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4693655)
- | 删除多余的技术验证界面 | 542ae5b - | 删除多余的技术验证界面 | [542ae5b](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/542ae5b)
- | 界面样式调整 | 4367249 - | 界面样式调整 | [4367249](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4367249)
- | 重构store分层 | 5f6fff8 - | 重构store分层 | [5f6fff8](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5f6fff8)
### 🚀 性能优化 ### 🚀 性能优化
范围|描述|commitId 范围|描述|commitId
--|--|-- --|--|--
- | 插件查询及展示 | 4dba770 - | 修改定期任务骨架屏高度 | [909a734](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/909a734)
- | 日历的更改 | 7353ac8 - | 插件查询及展示 | [4dba770](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4dba770)
- | 测试接口 | 215e074 - | 日历的更改 | [7353ac8](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7353ac8)
- | 组件文件夹新建 | 22bfe7b - | 测试接口 | [215e074](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/215e074)
- | 组件文件夹新建 | 17bb8c9 - | 组件文件夹新建 | [22bfe7b](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/22bfe7b)
- | 组件文件夹新建 | 1421504 - | 组件文件夹新建 | [17bb8c9](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/17bb8c9)
- | 角色栏文字颜色修改 | 215c6b3 - | 组件文件夹新建 | [1421504](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/1421504)
- | 解决警告 | c932b09 - | 角色栏文字颜色修改 | [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 ### chore
范围|描述|commitId 范围|描述|commitId
--|--|-- --|--|--
- | api 封装 | 8dcb8a2 - | api 封装 | [8dcb8a2](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/8dcb8a2)
- | env host修改 | a79a4a5 - | env host修改 | [a79a4a5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a79a4a5)
- | merge globals | b0957cc - | merge globals | [b0957cc](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b0957cc)
- | merge wrr | 5ccc7a5 - | merge wrr | [5ccc7a5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5ccc7a5)
- | mock | 51c24a5 - | mock | [51c24a5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/51c24a5)
package manifest | 去掉了摇树 | f7c1dd4 package manifest | 去掉了摇树 | [f7c1dd4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/f7c1dd4)
pwa 小程序 | 移除了pwa，alloyFinger添加平台判断 | 875fab4 pwa 小程序 | 移除了pwa，alloyFinger添加平台判断 | [875fab4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/875fab4)
- | uview-ui | a9ea34b - | 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 v3.0.1 | tall api 地址从1.0改成了3.0 | [db5afd5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/db5afd5)
信息配置 | 配置eslint等配置 | 7421443 信息配置 | 配置eslint等配置 | [7421443](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7421443)
- | 修复不能build的问题 | 0b7b91e - | 修复不能build的问题 | [0b7b91e](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0b7b91e)
- | 删除多余的构建的命令 | 3f4eb2f - | 删除多余的构建的命令 | [3f4eb2f](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/3f4eb2f)
范围|描述|commitId 范围|描述|commitId
--|--|-- --|--|--
- | style:index | 978f272 - | style:index | [978f272](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/978f272)
- | !2 基础模板v1.1.0 | f5e61dd - | !2 基础模板v1.1.0 | [f5e61dd](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/f5e61dd)
- | init | c0f1deb - | init | [c0f1deb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c0f1deb)

2
src/apis/tall.js
View File

@ -7,6 +7,8 @@ const install = (Vue, vm) => {
vm.$u.api.getToken = userId => vm.$u.get(`${tall}/users/userId`, { userId }); 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.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 }; export default { install };

38
src/components/Calendar/Calendar.vue
View File

@ -39,7 +39,7 @@
<view class="date" :class="[item.isToday ? todayClass : '', item.fullDate === selectedDate ? checkedClass : '']"> <view class="date" :class="[item.isToday ? todayClass : '', item.fullDate === selectedDate ? checkedClass : '']">
{{ item.time.getDate() }} {{ item.time.getDate() }}
</view> </view>
<view class="dot-show" v-if="item.info" :style="dotStyle"> </view> <view class="dot-show" v-if="item.info === '1'" :style="dotStyle"> </view>
</view> </view>
</template> </template>
<template v-else> <template v-else>
@ -86,9 +86,10 @@
<view class="flex justify-center u-font-18" style="color: #3b82f6" @click="goToday"> 今日 </view> <view class="flex justify-center u-font-18" style="color: #3b82f6" @click="goToday"> 今日 </view>
</view> </view>
</template> </template>
mb-3
<script> <script>
import { gegerateDates, dateEqual, formatDate } from './generateDates.js'; import { mapState } from 'vuex';
import { gegerateDates, formatDate } from './generateDates.js';
export default { export default {
props: { props: {
@ -113,11 +114,12 @@ export default {
watch: { watch: {
dotList: function (newvalue) { dotList: function (newvalue) {
const days = this.days.slice(0); const days = this.days.slice(0);
newvalue.forEach(item => { days.forEach((day, i) => {
const index = days.findIndex(ditem => ditem.fullDate === item.date); newvalue.forEach((item, j) => {
if (index > 0) { if (i === j) {
days[index].info = item; day.info = item;
} }
});
}); });
this.days = days; this.days = days;
}, },
@ -131,14 +133,14 @@ export default {
currentMonth: '', currentMonth: '',
currentDate: '', currentDate: '',
days: [], days: [],
weekMode: false, // false -> 月 true -> 显示周 // weekMode: false, // false -> 月 true -> 显示周
swiper: [0, 1, 2], swiper: [0, 1, 2],
// dotList: [], // 打点的日期列表
selectedDate: formatDate(new Date(), 'yyyy-MM-dd'), // 当前选中的日期 selectedDate: formatDate(new Date(), 'yyyy-MM-dd'), // 当前选中的日期
}; };
}, },
computed: { computed: {
...mapState('project', ['dotList', 'weekMode']),
sheight() { sheight() {
// 根据年月判断有多少行 // 根据年月判断有多少行
// 判断该月有多少天 // 判断该月有多少天
@ -257,13 +259,13 @@ export default {
// this.selectedDate = formatDate(new Date(this.currentYear, this.currentMonth-1,1), 'yyyy-MM-dd') // this.selectedDate = formatDate(new Date(this.currentYear, this.currentMonth-1,1), 'yyyy-MM-dd')
// } // }
} }
days.forEach(day => { // 设置小红点
const dot = this.dotList.find(item => { days.forEach((day, i) => {
return dateEqual(item.date, day.fullDate); this.dotList.forEach((item, j) => {
if (i === j) {
day.info = item;
}
}); });
if (dot) {
day.info = dot;
}
}); });
this.days = days; this.days = days;
// 派发事件,时间发生改变 // 派发事件,时间发生改变
@ -448,8 +450,8 @@ export default {
border-radius: 25px; border-radius: 25px;
} }
.dot-show { .dot-show {
width: 8px; width: 6px;
height: 8px; height: 6px;
// background: red; // background: red;
border-radius: 5px; border-radius: 5px;
position: absolute; position: absolute;

86
src/components/TimeLine/component/TimeBox.vue
View File

@ -1,55 +1,61 @@
<template> <template>
<view class="column"> <view class="column">
<view :key="index" v-for="(task, index) in tasks"> <view v-if="tasks && tasks.length">
<view class="flex"> <view :key="index" v-for="(task, index) in tasks">
<TimeStatus :task="task" /> <view class="flex">
<TimeStatus :task="task" />
<view class="flex items-center justify-between flex-1 ml-2 task-column"> <view class="flex items-center justify-between flex-1 ml-2 task-column">
<view>{{ $moment(+task.planStart).format(startTimeFormat) }}</view> <view>{{ $moment(+task.planStart).format(startTimeFormat) }}</view>
<!-- 任务功能菜单 --> <!-- 任务功能菜单 -->
<TaskTools /> <TaskTools />
</view>
</view> </view>
</view> <view class="border-l-2 border-gray-300 plugin">
<view class="border-l-2 border-gray-300 plugin"> <view class="ml-3 overflow-hidden shadow-lg task-box">
<view class="ml-3 overflow-hidden shadow-lg task-box"> <u-card
<u-card :show-foot="false"
:show-foot="false" :show-head="false"
:show-head="false" :style="{ height: setHeight(task.panel) }"
:style="{ height: setHeight(task.panel) }" @click="onClickTask(+task.planStart)"
@click="onClickTask(+task.planStart)" class="h-16"
class="h-16" margin="0"
margin="0" >
v-if="task.plugins && task.plugins.length" <!-- v-if="task.plugins && task.plugins.length" -->
> <!-- 任务面板插件 -->
<!-- 任务面板插件 --> <view slot="body">
<view slot="body"> <!-- TODO: 逻辑不完善 -->
<!-- TODO: 逻辑不完善 --> <view v-if="!task.plugins.length">
<view v-if="!task.plugins.length"> <skeleton :banner="false" :loading="true" :row="4" animate class="mt-2 u-line-2 skeleton"></skeleton>
<skeleton :banner="false" :loading="true" :row="4" animate class="mt-2 u-line-2 skeleton"></skeleton> </view>
</view>
<view class="p-0 u-col-between" v-else> <view class="p-0 u-col-between" v-else>
<view :key="pIndex" v-for="(row, pIndex) in task.plugins"> <view :key="pIndex" v-for="(row, pIndex) in task.plugins">
<view class="grid gap-2" v-if="row.length"> <view class="grid gap-2" v-if="row.length">
<Plugin <Plugin
:class="getClass(plugin.col, plugin.row)" :class="getClass(plugin.col, plugin.row)"
:task="task" :task="task"
:key="plugin.pluginTaskId" :key="plugin.pluginTaskId"
:plugin-task-id="plugin.pluginTaskId" :plugin-task-id="plugin.pluginTaskId"
:plugin-id="plugin.pluginId" :plugin-id="plugin.pluginId"
:param="plugin.param" :param="plugin.param"
:style-type="styleType || 0" :style-type="styleType || 0"
v-for="plugin in row" v-for="plugin in row"
/> />
</view>
</view> </view>
</view> </view>
</view> </view>
</view> </u-card>
</u-card> </view>
</view> </view>
</view> </view>
</view> </view>
<view v-else class="flex flex-row items-center ml-1">
<u-icon name="plus-circle" color="#2979ff" size="40" class="mr-2"></u-icon>
新建任务
</view>
<!-- 局部弹框操作栏 --> <!-- 局部弹框操作栏 -->
<Tips /> <Tips />
</view> </view>

20
src/components/TimeLine/component/TimeStatus.vue
View File

@ -92,17 +92,17 @@ export default {
* 点击了图标 修改任务状态 * 点击了图标 修改任务状态
* @param {object} event * @param {object} event
*/ */
changeStatus() { changeStatus(event) {
return false; // return false;
// const { status, taskId, taskName, tip } = this; const { status, taskId, taskName, tip } = this;
// tip.status = status; tip.status = status;
// tip.taskId = taskId; tip.taskId = taskId;
// tip.left = event.target.x; tip.left = event.target.x;
// tip.top = event.target.y; tip.top = event.target.y;
// tip.show = true; tip.show = true;
// tip.text = this.genetateTips(status, taskName); tip.text = this.genetateTips(status, taskName);
// this.setTip(tip); this.setTip(tip);
}, },
// 计算圆环的弧度百分比 // 计算圆环的弧度百分比

1
src/components/Tips/Tips.vue
View File

@ -81,6 +81,7 @@ export default {
// this.$router.go(0); // this.$router.go(0);
} catch (error) { } catch (error) {
console.error(error); console.error(error);
this.$t.ui.showToast(error.msg || '操作失败');
} }
}, },

2
src/components/Upload/Upload.vue
View File

@ -10,7 +10,7 @@ import { mapGetters } from 'vuex';
export default { export default {
computed: mapGetters('user', ['userId']), computed: mapGetters('user', ['userId']),
methods: { methods: {
// 倒入wbs // 导入wbs
async handleUpload() { async handleUpload() {
try { try {
const data = await this.$u.api.import(); const data = await this.$u.api.import();

36
src/pages/index/index.vue
View File

@ -2,7 +2,7 @@
<view class="bg-gray-50" @touchmove="onMove"> <view class="bg-gray-50" @touchmove="onMove">
<view class="relative"> <view class="relative">
<!-- 日历 --> <!-- 日历 -->
<Calendar @selected-change="onDateChange" :show-back="true" :dot-list="days" ref="calendar" /> <Calendar @selected-change="onDateChange" :show-back="true" ref="calendar" />
<!-- 上传 导入wbs --> <!-- 上传 导入wbs -->
<Upload @success="onUploadSuccess" @error="onUploadError" /> <Upload @success="onUploadSuccess" @error="onUploadError" />
</view> </view>
@ -23,13 +23,8 @@ let prevY = 0;
export default { export default {
data() { data() {
return { return {
days: [
{ date: '2020-08-14' },
{ date: '2020-08-27' },
{ date: '2020-08-09' },
// {date: '2020-08-16'}
],
calendar: null, calendar: null,
days: [],
}; };
}, },
@ -39,12 +34,23 @@ export default {
token(value) { token(value) {
if (!value) return; if (!value) return;
this.getProjects(); this.getProjects();
this.handleFindPoint();
}, },
}, },
onShow() { onShow() {
if (!this.token) return; if (!this.token) return;
this.getProjects(); this.getProjects();
this.handleFindPoint();
},
onPageScroll(res) {
// console.log('页面滚动了', res.scrollTop);
if (res.scrollTop > 0) {
this.setWeekMode(true);
} else {
this.setWeekMode(false);
}
}, },
onReady() { onReady() {
@ -52,7 +58,7 @@ export default {
}, },
methods: { methods: {
...mapMutations('project', ['setProjects']), ...mapMutations('project', ['setProjects', 'setDotList', 'setWeekMode']),
// 获取项目列表 // 获取项目列表
async getProjects(start = this.$moment().startOf('day').valueOf(), end = this.$moment().endOf('day').valueOf()) { async getProjects(start = this.$moment().startOf('day').valueOf(), end = this.$moment().endOf('day').valueOf()) {
@ -64,8 +70,18 @@ export default {
} }
}, },
changeList() { /**
this.days = [{ date: '2021-08-03' }, { date: '2021-08-04' }, { date: '2021-08-06' }]; * 查询小红点
* @param { string } endTime 结束时间
* @param { string } startTime 开始时间
*/
async handleFindPoint(start = this.$moment().startOf('month').valueOf(), end = this.$moment().endOf('month').valueOf()) {
try {
const data = await this.$u.api.findRedPoint(start, end);
this.setDotList(data);
} catch (error) {
console.log('error: ', error);
}
}, },
// 点击了某个日期 // 点击了某个日期

13
src/pages/project/project.vue
View File

@ -1,5 +1,17 @@
<template> <template>
<view :style="{ height: height }" class="flex flex-col overflow-hidden u-font-14"> <view :style="{ height: height }" class="flex flex-col overflow-hidden u-font-14">
<!-- 全局提示框 -->
<u-alert-tips
class="top-0 -inset-x-0"
style="position: fixed !important; z-index: 999"
type="error"
:close-able="true"
:title="alert.title"
:show="alert.show"
:description="alert.description"
@close="alert.show = false"
></u-alert-tips>
<!-- 标题栏 --> <!-- 标题栏 -->
<Title /> <Title />
@ -28,6 +40,7 @@ export default {
...mapState('user', ['user', 'token']), ...mapState('user', ['user', 'token']),
...mapState('role', ['visibleRoles', 'roleId']), ...mapState('role', ['visibleRoles', 'roleId']),
...mapState('task', ['timeNode', 'timeUnit', 'tasks']), ...mapState('task', ['timeNode', 'timeUnit', 'tasks']),
...mapState('project', ['alert']),
...mapGetters('task', ['timeGranularity']), ...mapGetters('task', ['timeGranularity']),
}, },

39
src/plugins/p-wbs-import/p-wbs-import.vue
View File

@ -1,3 +1,40 @@
<template> <template>
<view>导入wbs</view> <view>
<view @tap="handleUpload">{{ task.name }}</view>
</view>
</template> </template>
<script>
import { mapState, mapMutations } from 'vuex';
export default {
name: 'p-wbs-import',
props: {
task: {
type: Object,
default: () => {},
},
},
data() {
return {};
},
computed: mapState('project', ['alert']),
methods: {
...mapMutations('project', ['setShowAlert']),
// 导入wbs
async handleUpload() {
try {
const data = await this.$u.api.import();
// 导入WBS成功后
// 直接打开导入的项目
console.log('data: ', data);
} catch (error) {
this.setShowAlert(error);
}
},
},
};
</script>

30
src/store/project/mutations.js
View File

@ -29,6 +29,36 @@ const mutations = {
setProjectName(state, data) { setProjectName(state, data) {
state.project.name = data; state.project.name = data;
}, },
/**
* 设置alert展示消息
* @param { object } state
* @param { Boolean } event
*/
setShowAlert(state, event) {
state.alert.description = event || '发生了点小意外';
state.alert.show = true;
setTimeout(() => (state.alert.show = false), 10000);
},
/**
* 设置小红点
* @param { object } state
* @param { string } data
*/
setDotList(state, data) {
state.dotList = data;
},
/**
* 设置日历是否展开收缩
* @param { object } state
* @param { boolean } show
*/
setWeekMode(state, show) {
state.weekMode = show;
},
}; };
export default mutations; export default mutations;

8
src/store/project/state.js
View File

@ -2,6 +2,14 @@
const state = { const state = {
project: { name: '加载中...' }, // 当前项目信息 project: { name: '加载中...' }, // 当前项目信息
projects: [], // 项目列表 projects: [], // 项目列表
alert: {
// 全局提示框
show: false,
title: '',
description: '',
},
dotList: [], // 小红点
weekMode: false, // 日历展开收缩
}; };
export default state; export default state;

Write Preview
Loading…
Cancel
Save