From 32e005bbaf8cf7ac8251f9fb16c411c74c0d9f04 Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Fri, 6 Aug 2021 19:18:40 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8,?= =?UTF-8?q?=20=E9=A1=B9=E7=9B=AEurl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 +- src/App.vue | 20 ++- src/apis/plugin.js | 9 +- src/apis/project.js | 7 +- src/apis/role.js | 6 +- src/apis/{user.js => tall.js} | 3 + src/apis/task.js | 12 +- src/apis/wbs.js | 7 +- src/components/Projects/Projects.vue | 209 +++++++-------------------- src/components/Upload/Upload.vue | 44 ++---- src/main.js | 4 +- src/pages/index/index.vue | 68 ++++++++- src/pages/project/project.vue | 4 +- src/store/project/mutations.js | 13 ++ src/store/project/state.js | 1 + src/store/user/actions.js | 2 +- src/utils/tall.js | 1 + tailwind.config.js | 18 ++- 18 files changed, 188 insertions(+), 243 deletions(-) rename src/apis/{user.js => tall.js} (61%) diff --git a/CHANGELOG.md b/CHANGELOG.md index da9df3d..db03433 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 0.1.0 (2021-08-05) +# 0.1.0 (2021-08-06) ### 🌟 新功能 范围|描述|commitId @@ -18,6 +18,7 @@ - | 存token | b8a178d - | 定期任务面板骨架屏添加 | b2698c0 富文本插件 | 富文本插件demo测试 | ed3d644 + - | 导入wbs | 1224fcb - | 引入dayjs | 29b8b93 - | 提交到本地 | 9cbe411 - | 插件参数处理调整 | a3e68d3 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..60bdb92 100644 --- a/src/apis/plugin.js +++ b/src/apis/plugin.js @@ -1,12 +1,7 @@ -import domain from '@/config/domains'; -const apiUrl = process.env.VUE_APP_API_URL; -const mock = `${apiUrl}${domain}`; -const plugin = `${apiUrl}/pluginshop/plugin`; - 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.getPlugin = param => vm.$u.post(`${uni.$t.domain}/plugin`, param); + vm.$u.api.getOtherPlugin = param => vm.$u.post(`${uni.$t.domain}/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 c462488..a2eabf0 100644 --- a/src/apis/task.js +++ b/src/apis/task.js @@ -1,15 +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(`${task}/type`, 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 index ab60417..e9a13a5 100644 --- a/src/apis/wbs.js +++ b/src/apis/wbs.js @@ -1,12 +1,7 @@ -const apiUrl = process.env.VUE_APP_API_URL; -import domainPath from '@/config/domains'; -const tall = `${apiUrl}${domainPath}`; -const wbs = `${tall}/wbs`; - const install = (Vue, vm) => { vm.$u.api = { ...vm.$u.api } || {}; // 导入wbs - vm.$u.api.import = formData => vm.$t.chooseAndUpload(wbs, formData); + vm.$u.api.import = formData => vm.$t.chooseAndUpload(`${uni.$t.domain}/wbs`, formData); }; export default { install }; diff --git a/src/components/Projects/Projects.vue b/src/components/Projects/Projects.vue index 748ec0b..6c074bd 100644 --- a/src/components/Projects/Projects.vue +++ b/src/components/Projects/Projects.vue @@ -1,182 +1,71 @@ + + diff --git a/src/components/Upload/Upload.vue b/src/components/Upload/Upload.vue index 406732c..7006a76 100644 --- a/src/components/Upload/Upload.vue +++ b/src/components/Upload/Upload.vue @@ -1,48 +1,29 @@ + + diff --git a/src/main.js b/src/main.js index 8165c29..178ac27 100644 --- a/src/main.js +++ b/src/main.js @@ -28,7 +28,7 @@ App.mpType = 'app'; const app = new Vue({ ...App, store }); import request from '@/utils/request.js'; -import user from '@/apis/user.js'; +import tall from '@/apis/tall.js'; import project from '@/apis/project.js'; import task from '@/apis/task.js'; import plugin from '@/apis/plugin.js'; @@ -38,7 +38,7 @@ import wbs from '@/apis/wbs.js'; window.vm = app; Vue.use(request, app); -Vue.use(user, app); +Vue.use(tall, app); Vue.use(project, app); Vue.use(task, app); Vue.use(plugin, app); diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 534dead..7fa1d25 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -2,36 +2,90 @@ - + - + - + + + +