diff --git a/App.vue b/App.vue
index a526b47..0368041 100644
--- a/App.vue
+++ b/App.vue
@@ -43,19 +43,18 @@ export default {
if (token && tokenIsAvailable) {
// 1.1 store里有token 且没过期直接:使用store的token
return token;
- } else {
- // 2. 根据userId获取token
- if (userId) {
- try {
- const { token } = await this.$store.dispatch('user/getTokenByUserId', userId);
- return token;
- } catch (error) {
- console.error('error: ', error);
- return null;
- }
- } else {
+ }
+ // 2. 根据userId获取token
+ if (userId) {
+ try {
+ const { token } = await this.$store.dispatch('user/getTokenByUserId', userId);
+ return token;
+ } catch (error) {
+ console.error('error: ', error);
return null;
}
+ } else {
+ return null;
}
},
@@ -166,4 +165,5 @@ export default {
page {
height: 100%;
}
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d8db55..2dd4768 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,83 +1,84 @@
# 1.0.0 (2022-01-12)
### 🌟 新功能
-范围|描述|commitId
---|--|--
- - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a)
- - | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de)
- project | 日常任务面板添加 | [b3f16ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b3f16ff)
- theme | theme demo | [9175758](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9175758)
- - | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad)
- - | 使用uview完成api请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8)
- - | 手机号登录 | [8f455da](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f455da)
- - | 手机号登录 | [565585b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/565585b)
- - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91)
- - | 日历页首页 | [561c8e6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/561c8e6)
- - | 时间轴展示 | [8b1b380](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8b1b380)
- - | 时间轴接口 | [a95d005](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a95d005)
- - | 时间轴页面 | [e926b75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e926b75)
- - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc)
- - | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b)
- - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e)
- - | 账户名密码登录 | [ebf456e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf456e)
- - | 项目列表 | [a52e6d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a52e6d5)
- - | 项目列表新 | [88cf48d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/88cf48d)
- - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e)
+| 范围 | 描述 | commitId |
+| ------- | ------------------------ | ------------------------------------------------------------------------ |
+| - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a) |
+| - | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de) |
+| project | 日常任务面板添加 | [b3f16ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b3f16ff) |
+| theme | theme demo | [9175758](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9175758) |
+| - | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad) |
+| - | 使用 uview 完成 api 请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8) |
+| - | 手机号登录 | [8f455da](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f455da) |
+| - | 手机号登录 | [565585b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/565585b) |
+| - | 插件面板分开显示 | [fb5e86b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fb5e86b) |
+| - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91) |
+| - | 日历页首页 | [561c8e6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/561c8e6) |
+| - | 时间轴展示 | [8b1b380](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8b1b380) |
+| - | 时间轴接口 | [a95d005](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a95d005) |
+| - | 时间轴页面 | [e926b75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e926b75) |
+| - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc) |
+| - | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b) |
+| - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e) |
+| - | 账户名密码登录 | [ebf456e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf456e) |
+| - | 项目列表 | [a52e6d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a52e6d5) |
+| - | 项目列表新 | [88cf48d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/88cf48d) |
+| - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e) |
### 🎨 代码样式
-范围|描述|commitId
---|--|--
- - | calender格式及细节调整 | [db9602b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/db9602b)
- - | 细节调整 | [bdd5f87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bdd5f87)
+| 范围 | 描述 | commitId |
+| ---- | ----------------------- | ------------------------------------------------------------------------ |
+| - | calender 格式及细节调整 | [db9602b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/db9602b) |
+| - | 细节调整 | [bdd5f87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bdd5f87) |
### 🐛 Bug 修复
-范围|描述|commitId
---|--|--
- app.vue | 修复获取token报错的问题 | [9120d54](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9120d54)
- createTask | 修复createTask v-model的问题 | [b20d3f0](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b20d3f0)
- - | defineExpose, defineEmits不需要引入 | [902cacc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/902cacc)
- - | 修复一些内容 | [3cdb1ce](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3cdb1ce)
- - | 删除多余的引入 | [050b12a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/050b12a)
- - | 插件接口修改 | [53c6b90](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/53c6b90)
- - | 时间轴任务 | [98abdf6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/98abdf6)
- - | 解决warning | [dcb0079](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/dcb0079)
+| 范围 | 描述 | commitId |
+| ---------- | ------------------------------------ | ------------------------------------------------------------------------ |
+| app.vue | 修复获取 token 报错的问题 | [9120d54](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9120d54) |
+| createTask | 修复 createTask v-model 的问题 | [b20d3f0](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b20d3f0) |
+| - | defineExpose, defineEmits 不需要引入 | [902cacc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/902cacc) |
+| - | 修复一些内容 | [3cdb1ce](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3cdb1ce) |
+| - | 删除多余的引入 | [050b12a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/050b12a) |
+| - | 插件接口修改 | [53c6b90](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/53c6b90) |
+| - | 时间轴任务 | [98abdf6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/98abdf6) |
+| - | 解决 warning | [dcb0079](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/dcb0079) |
### 📦 持续集成
-范围|描述|commitId
---|--|--
- - | drone | [8cddc7b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8cddc7b)
- - | 修改.drone.yml | [f5b52e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f5b52e3)
- - | 更新drone.yml | [63ec5a3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/63ec5a3)
- - | 更新drone.yml | [a57d598](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a57d598)
- - | 测试ci | [6ab95f8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/6ab95f8)
- - | 测试ci' | [d25f2a7](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d25f2a7)
- - | 添加drone.yml | [9fbae89](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9fbae89)
+| 范围 | 描述 | commitId |
+| ---- | -------------- | ------------------------------------------------------------------------ |
+| - | drone | [8cddc7b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8cddc7b) |
+| - | 修改.drone.yml | [f5b52e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f5b52e3) |
+| - | 更新 drone.yml | [63ec5a3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/63ec5a3) |
+| - | 更新 drone.yml | [a57d598](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a57d598) |
+| - | 测试 ci | [6ab95f8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/6ab95f8) |
+| - | 测试 ci' | [d25f2a7](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d25f2a7) |
+| - | 修改.drone.yml | [f5b52e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f5b52e3) |
+| - | 添加 drone.yml | [9fbae89](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9fbae89) |
### 🔨 代码重构
-范围|描述|commitId
---|--|--
- - | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87)
- - | 重构project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df)
- - | 项目列表 | [0486e98](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0486e98)
+| 范围 | 描述 | commitId |
+| ---- | ---------------------- | ------------------------------------------------------------------------ |
+| - | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87) |
+| - | 重构 project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df) |
+| - | 项目列表 | [0486e98](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0486e98) |
### 🚀 性能优化
-范围|描述|commitId
---|--|--
- - | 更新代码 | [0dd443b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0dd443b)
+| 范围 | 描述 | commitId |
+| ---- | -------- | ------------------------------------------------------------------------ |
+| - | 更新代码 | [0dd443b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0dd443b) |
### chore
-范围|描述|commitId
---|--|--
- - | editorconfig update | [0c08089](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0c08089)
+| 范围 | 描述 | commitId |
+| ---- | ------------------- | ------------------------------------------------------------------------ |
+| - | editorconfig update | [0c08089](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0c08089) |
-范围|描述|commitId
---|--|--
- - | Initial commit | [52b8f49](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/52b8f49)
-
+| 范围 | 描述 | commitId |
+| ---- | -------------- | ------------------------------------------------------------------------ |
+| - | Initial commit | [52b8f49](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/52b8f49) |
diff --git a/common/styles/theme/default.scss b/common/styles/theme/default.scss
index f851f5a..038cb4a 100644
--- a/common/styles/theme/default.scss
+++ b/common/styles/theme/default.scss
@@ -1,7 +1,7 @@
// 默认主题文件
.theme-default {
background-color: #007aff;
- color: #fff;
+ // color: #fff;
.u-card {
font-size: 24px !important;
color: #0f0;
@@ -13,4 +13,7 @@
color: #fff !important;
}
}
+ button{
+ border: none!important;
+ }
}
diff --git a/components/Plugin/Plugin.vue b/components/Plugin/Plugin.vue
index d740eca..c343551 100644
--- a/components/Plugin/Plugin.vue
+++ b/components/Plugin/Plugin.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/components/Render/Render.vue b/components/Render/Render.vue
index 5f83039..a88b66e 100644
--- a/components/Render/Render.vue
+++ b/components/Render/Render.vue
@@ -1,8 +1,9 @@
-
+
+
+
diff --git a/components/TimeLine/component/TimeBox.vue b/components/TimeLine/component/TimeBox.vue
index e82a89b..b40e172 100644
--- a/components/TimeLine/component/TimeBox.vue
+++ b/components/TimeLine/component/TimeBox.vue
@@ -15,13 +15,14 @@
-
+
+
-
-
-
-
-
-
-
+ -->
+
+
+
+
+
-
-
+
+
+
@@ -65,7 +68,6 @@ import TimeStatus from './TimeStatus.vue';
import TaskTools from './TaskTools.vue';
import Skeleton from '@/components/Skeleton/Skeleton.vue';
-
const data = reactive({
currentComponent: '',
styleType: 0,
diff --git a/pages/project/project.vue b/pages/project/project.vue
index aaa1cc0..2584a2f 100644
--- a/pages/project/project.vue
+++ b/pages/project/project.vue
@@ -1,5 +1,5 @@
-
+
@@ -16,7 +16,7 @@
测试切换主题
-
+
-
+
diff --git a/plugins/p-deliver/p-deliver.vue b/plugins/p-deliver/p-deliver.vue
index 1e501b0..a005c2f 100644
--- a/plugins/p-deliver/p-deliver.vue
+++ b/plugins/p-deliver/p-deliver.vue
@@ -1,9 +1,18 @@
+
p-deliver
+
-
+
diff --git a/plugins/p-delivery-history/p-delivery-history.vue b/plugins/p-delivery-history/p-delivery-history.vue
index 928fd6b..3ced255 100644
--- a/plugins/p-delivery-history/p-delivery-history.vue
+++ b/plugins/p-delivery-history/p-delivery-history.vue
@@ -1,5 +1,6 @@
+
@@ -39,6 +40,7 @@
+
-
+
+
diff --git a/plugins/p-delivery-history/p-delivery-history1.vue b/plugins/p-delivery-history/p-delivery-history1.vue
deleted file mode 100644
index f97cb1c..0000000
--- a/plugins/p-delivery-history/p-delivery-history1.vue
+++ /dev/null
@@ -1,149 +0,0 @@
-
-
-
-
-
-
- {{ list.name }}
- {{ $moment(+list.time).format('YYYY-MM-DD HH:mm:ss') }}
-
-
- {{
- list.content
- }}
- {{ list.content }}
-
-
-
-
- {{ checker.checkerName }}
- (我)
-
-
- 通过
- 驳回
- {{ checker.score }}分
- 未审核
-
-
- 通过
-
- 驳回
-
-
-
- {{ checker.remark }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/p-manage-member/p-manage-member.vue b/plugins/p-manage-member/p-manage-member.vue
index 220e966..26a6d83 100644
--- a/plugins/p-manage-member/p-manage-member.vue
+++ b/plugins/p-manage-member/p-manage-member.vue
@@ -1,6 +1,17 @@
+
成员管理
+
+
+
diff --git a/plugins/p-manage-project/p-manage-project.vue b/plugins/p-manage-project/p-manage-project.vue
index 65a16bb..9b305cd 100644
--- a/plugins/p-manage-project/p-manage-project.vue
+++ b/plugins/p-manage-project/p-manage-project.vue
@@ -1,6 +1,17 @@
+
项目管理
+
+
+
diff --git a/plugins/p-manage-role/p-manage-role.vue b/plugins/p-manage-role/p-manage-role.vue
index 51558a0..1567a21 100644
--- a/plugins/p-manage-role/p-manage-role.vue
+++ b/plugins/p-manage-role/p-manage-role.vue
@@ -1,6 +1,17 @@
+
角色管理
+
+
+
diff --git a/plugins/p-manage-task/p-manage-task.vue b/plugins/p-manage-task/p-manage-task.vue
index 575e828..73a4a39 100644
--- a/plugins/p-manage-task/p-manage-task.vue
+++ b/plugins/p-manage-task/p-manage-task.vue
@@ -1,6 +1,17 @@
+
任务管理
+
+
+
diff --git a/plugins/p-subproject/p-subproject.vue b/plugins/p-subproject/p-subproject.vue
index a53419c..2228352 100644
--- a/plugins/p-subproject/p-subproject.vue
+++ b/plugins/p-subproject/p-subproject.vue
@@ -1,6 +1,6 @@
-
+
{{ item.name }}
@@ -51,4 +51,11 @@ function openProject(project) {
}
-
+
diff --git a/plugins/p-subtasks/p-subtasks.vue b/plugins/p-subtasks/p-subtasks.vue
index 1edc4e0..b9b8a36 100644
--- a/plugins/p-subtasks/p-subtasks.vue
+++ b/plugins/p-subtasks/p-subtasks.vue
@@ -1,5 +1,5 @@
-
+
{{ item.name }}
@@ -28,4 +28,11 @@ async function getSonTask() {
getSonTask();
-
+
diff --git a/plugins/p-task-countdown/p-task-countdown.vue b/plugins/p-task-countdown/p-task-countdown.vue
index ee7bf8f..a334968 100644
--- a/plugins/p-task-countdown/p-task-countdown.vue
+++ b/plugins/p-task-countdown/p-task-countdown.vue
@@ -1,10 +1,19 @@
+
任务倒计时插件
+
-
+
diff --git a/plugins/p-task-description/p-task-description.vue b/plugins/p-task-description/p-task-description.vue
index bd4bdc9..8b37892 100644
--- a/plugins/p-task-description/p-task-description.vue
+++ b/plugins/p-task-description/p-task-description.vue
@@ -1,9 +1,20 @@
+
{{ task.description }}
+
+
+
diff --git a/plugins/p-task-duration-delay/p-task-duration-delay.vue b/plugins/p-task-duration-delay/p-task-duration-delay.vue
index ab9aba4..8495b4f 100644
--- a/plugins/p-task-duration-delay/p-task-duration-delay.vue
+++ b/plugins/p-task-duration-delay/p-task-duration-delay.vue
@@ -1,5 +1,5 @@
-
+
@@ -21,3 +21,12 @@ const realDuration = computed(() => props.task.realDuration);
const planDuration = computed(() => props.task.planDuration);
+
+
diff --git a/plugins/p-task-start-time-delay/p-task-start-time-delay.vue b/plugins/p-task-start-time-delay/p-task-start-time-delay.vue
index df4daeb..4a05c20 100644
--- a/plugins/p-task-start-time-delay/p-task-start-time-delay.vue
+++ b/plugins/p-task-start-time-delay/p-task-start-time-delay.vue
@@ -1,10 +1,12 @@
+
{{ $time.formatDuration(+realStart - +planStart) }}
+
+
+
diff --git a/plugins/p-task-title/p-task-title.vue b/plugins/p-task-title/p-task-title.vue
index 2cf8195..53f259f 100644
--- a/plugins/p-task-title/p-task-title.vue
+++ b/plugins/p-task-title/p-task-title.vue
@@ -1,10 +1,19 @@
-
+
{{ task.name }}
-
+
+
+
diff --git a/plugins/p-upload-deliverable/p-upload-deliverable.vue b/plugins/p-upload-deliverable/p-upload-deliverable.vue
index 951ab3f..64309af 100644
--- a/plugins/p-upload-deliverable/p-upload-deliverable.vue
+++ b/plugins/p-upload-deliverable/p-upload-deliverable.vue
@@ -1,6 +1,6 @@
-
+
@@ -87,4 +87,11 @@ async function submit() {
}
-
+
diff --git a/plugins/p-wbs-import/p-wbs-import.vue b/plugins/p-wbs-import/p-wbs-import.vue
index 8b1b9de..9f04c8d 100644
--- a/plugins/p-wbs-import/p-wbs-import.vue
+++ b/plugins/p-wbs-import/p-wbs-import.vue
@@ -1,5 +1,5 @@
-
+
{{ task.name }}
{{ task.name }}
@@ -69,3 +69,12 @@ async function handleUpload() {
}
}
+
+