From 866bef6dd17065471668cc18da3d8b055c0c0963 Mon Sep 17 00:00:00 2001 From: xuesinan <1404152492@qq.com> Date: Thu, 25 Nov 2021 18:16:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20"=E5=B1=95=E7=A4=BA=E9=A1=B5=E9=9D=A2"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 21 +++++ src/apis/index.js | 4 + src/components/tall/center/ProjectDetail.vue | 4 - src/components/tall/left/Projects.vue | 4 - src/components/tall/right/Intro.vue | 31 +++++-- .../tall/task/CheckSubjectProgress.vue | 23 ----- .../tall/task/MeetingManagement.vue | 87 +++++++++++++++++++ src/views/detail/Test.vue | 39 ++++++++- 8 files changed, 172 insertions(+), 41 deletions(-) diff --git a/src/App.vue b/src/App.vue index eda03f6..684366d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -103,4 +103,25 @@ body, flex: 0 0 400px !important; background: #fff; } + +.color-3 { + color: #333; +} + +.color-6 { + color: #666; +} + +.border-radius-10 { + border-radius: 10px; +} + +.ant-form label { + display: block; + margin-bottom: 5px; +} + +::-webkit-scrollbar { + width: 0 !important; +} diff --git a/src/apis/index.js b/src/apis/index.js index 1106153..eccab61 100644 --- a/src/apis/index.js +++ b/src/apis/index.js @@ -6,6 +6,7 @@ const apiUrl = import.meta.env.VITE_API_URL; const users = `${apiUrl}/gateway/tall3/v3.0/users`; const tall = `${apiUrl}/gateway/tall3/v3.0`; const experiment = `${apiUrl}/gateway/experiment`; +const defaultwbs = `${apiUrl}/gateway/sports`; // 根据userId 获取token // eslint-disable-next-line import/prefer-default-export @@ -62,3 +63,6 @@ export const importWbs = async e => { // 新建课题 -- 根据模板新建课题 export const create = param => http.post(`${experiment}/experiment/create`, { params: { param } }); + +// 上传文件 +export const uploadImg = `${defaultwbs}/file/upload`; diff --git a/src/components/tall/center/ProjectDetail.vue b/src/components/tall/center/ProjectDetail.vue index dd4ccfd..c3fe21e 100644 --- a/src/components/tall/center/ProjectDetail.vue +++ b/src/components/tall/center/ProjectDetail.vue @@ -320,8 +320,4 @@ function toDetail(item) { :deep(.ant-checkbox + span) { color: #607d8b; } - -::-webkit-scrollbar { - width: 0 !important; -} diff --git a/src/components/tall/left/Projects.vue b/src/components/tall/left/Projects.vue index 5ffa651..6e083e1 100644 --- a/src/components/tall/left/Projects.vue +++ b/src/components/tall/left/Projects.vue @@ -234,8 +234,4 @@ async function deleteProject(param) { width: 14px; margin-left: 30px; } - -::-webkit-scrollbar { - width: 0 !important; -} diff --git a/src/components/tall/right/Intro.vue b/src/components/tall/right/Intro.vue index f51b2b0..a72f8c4 100644 --- a/src/components/tall/right/Intro.vue +++ b/src/components/tall/right/Intro.vue @@ -1,12 +1,18 @@ @@ -16,12 +22,25 @@ padding: 16px; width: 100%; height: 100%; + overflow-y: auto; } +/* .intro-flex>img { + max-width: 100%; + max-height: 100%; +} */ + .intro-wrap { + padding: 30px 0; width: calc((100% - 32px) / 3); height: 100%; border-radius: 10px; + overflow-y: auto; +} + +.intro-wrap img { + width: 80%; + margin: 0 auto; } .intro-wrap.left { diff --git a/src/components/tall/task/CheckSubjectProgress.vue b/src/components/tall/task/CheckSubjectProgress.vue index 2062e12..ebd5c36 100644 --- a/src/components/tall/task/CheckSubjectProgress.vue +++ b/src/components/tall/task/CheckSubjectProgress.vue @@ -119,29 +119,6 @@ const colorList = ref([ { color: '#FF9191', bgColor: 'rgba(255, 145, 145, 0.2)' }, { color: '#FF934B', bgColor: 'rgba(255, 147, 75, 0.2)' }, ]); - -// const signInFormRef = ref(null); -// const signInForm = ref({ -// username: '', -// password: '', -// }); - -// const rules = ref({ -// username: [ -// { -// required: true, -// message: '请输入账号', -// trigger: 'blur', -// }, -// ], -// password: [ -// { -// required: true, -// message: '请输入密码', -// trigger: 'blur', -// }, -// ], -// }); diff --git a/src/views/detail/Test.vue b/src/views/detail/Test.vue index 774ed48..c31d769 100644 --- a/src/views/detail/Test.vue +++ b/src/views/detail/Test.vue @@ -61,12 +61,43 @@ watch(taskDetail, () => { overflow-y: auto; } -::-webkit-scrollbar { - width: 0 !important; -} - .task-con { width: 100%; min-height: 500px; } + +.task-form { + padding: 24px; + display: flex; + justify-content: center; +} + +.task-form :deep(.ant-form) { + width: 80%; + max-width: 680px; +} + +:deep(.ant-input) { + height: 38px; + border: 1px solid #cccccc; + border-radius: 4px; +} + +:deep(.ant-btn-primary) { + max-width: 180px; + height: 38px; + font-size: 16px; + border-radius: 6px; +} + +:deep(.ant-space) { + width: 100%; +} + +:deep(.ant-picker) { + height: 38px; + width: 100%; + border: 1px solid #cccccc; + border-radius: 4px; +}