From b4dc52f61f37d888240f3417248536b9b99af11f Mon Sep 17 00:00:00 2001 From: xuesinan <1404152492@qq.com> Date: Mon, 29 Nov 2021 02:07:37 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20"=E9=A1=B5=E9=9D=A2"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintrc.js | 1 + src/App.vue | 4 + src/apis/index.js | 12 + src/components/tall/left/Index.vue | 5 +- src/components/tall/left/Projects.vue | 18 +- .../tall/task/AssignmentExperiment.vue | 108 +++++++++ .../tall/task/AssignmentSubject.vue | 220 ++++++++++++++++++ src/components/tall/task/Conclusion.vue | 142 +++++++++++ .../tall/task/ContractManagement.vue | 154 ++++++++++++ src/components/tall/task/DataUnlock.vue | 117 ++++++++++ src/components/tall/task/ExperimentalCode.vue | 84 +++++++ src/components/tall/task/ExperimentalData.vue | 84 +++++++ .../tall/task/ExperimentalResult.vue | 78 +++++++ .../tall/task/InterimInspection.vue | 142 +++++++++++ src/components/tall/task/LabReport.vue | 125 ++++++++++ .../tall/task/MeetingManagement.vue | 4 +- src/components/tall/task/MemberManagement.vue | 103 ++++++-- src/components/tall/task/PlanAssignment.vue | 14 +- src/components/tall/task/Procedure.vue | 148 ++++++++++++ src/components/tall/task/Result.vue | 148 ++++++++++++ src/components/tall/task/SubConclusion.vue | 142 +++++++++++ .../tall/task/SubInterimInspection.vue | 142 +++++++++++ .../tall/task/SubMeetingManagement.vue | 122 ++++++++++ src/components/tall/task/SubResult.vue | 142 +++++++++++ .../tall/task/SubSubjectProgress.vue | 206 ++++++++++++++++ src/components/tall/top/Navbar.vue | 2 +- src/store/tall/layout/mutations.js | 6 + src/store/tall/layout/state.js | 2 + src/views/detail/Test.vue | 81 ++++++- 29 files changed, 2523 insertions(+), 33 deletions(-) create mode 100644 src/components/tall/task/AssignmentExperiment.vue create mode 100644 src/components/tall/task/AssignmentSubject.vue create mode 100644 src/components/tall/task/Conclusion.vue create mode 100644 src/components/tall/task/ContractManagement.vue create mode 100644 src/components/tall/task/DataUnlock.vue create mode 100644 src/components/tall/task/ExperimentalCode.vue create mode 100644 src/components/tall/task/ExperimentalData.vue create mode 100644 src/components/tall/task/ExperimentalResult.vue create mode 100644 src/components/tall/task/InterimInspection.vue create mode 100644 src/components/tall/task/LabReport.vue create mode 100644 src/components/tall/task/Procedure.vue create mode 100644 src/components/tall/task/Result.vue create mode 100644 src/components/tall/task/SubConclusion.vue create mode 100644 src/components/tall/task/SubInterimInspection.vue create mode 100644 src/components/tall/task/SubMeetingManagement.vue create mode 100644 src/components/tall/task/SubResult.vue create mode 100644 src/components/tall/task/SubSubjectProgress.vue diff --git a/.eslintrc.js b/.eslintrc.js index 49e9e64..7f0b2e1 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -31,6 +31,7 @@ module.exports = { 'no-shadow': ['error', { builtinGlobals: false, hoist: 'functions', allow: [] }], 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off', 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off', + 'array-callback-return': 'off', 'no-param-reassign': 'off', 'max-len': [ 'error', diff --git a/src/App.vue b/src/App.vue index 7323aa2..af5322c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -116,6 +116,10 @@ body, color: #666 !important; } +.color-9 { + color: #999 !important; +} + .color-c { color: #cccccc !important; } diff --git a/src/apis/index.js b/src/apis/index.js index ee4280a..1f388a3 100644 --- a/src/apis/index.js +++ b/src/apis/index.js @@ -69,3 +69,15 @@ export const uploadImg = `${filedeal}/file/upload/multiple`; // 添加/编辑计划任务书 export const savePlanTask = params => http.post(`${experiment}/experiment/savePlanTask`, params); + +// 分配子课题 +export const saveSubExperiment = params => http.post(`${experiment}/experiment/saveSubExperiment`, params); + +// 查询成员 +export const memberQuery = params => http.post(`${experiment}/organization/query`, params); + +// 添加成员 +export const saveMember = params => http.post(`${experiment}/organization/save`, params); + +// 分配实验 +export const createExperiment = params => http.post(`${experiment}/subExperiment/create`, params); diff --git a/src/components/tall/left/Index.vue b/src/components/tall/left/Index.vue index f8d986a..7e4005b 100644 --- a/src/components/tall/left/Index.vue +++ b/src/components/tall/left/Index.vue @@ -116,8 +116,9 @@ async function createExperiment() { // getProjectsList(dayjs().startOf('day').format('x'), dayjs().endOf('day').format('x')); -function changeTime() { - // getProjectsList(data.startTime, data.endTime); +function changeTime(data) { + console.log(data); + store.commit('layout/setSelectTime', data); } diff --git a/src/components/tall/left/Projects.vue b/src/components/tall/left/Projects.vue index 503b3b1..741d13d 100644 --- a/src/components/tall/left/Projects.vue +++ b/src/components/tall/left/Projects.vue @@ -81,12 +81,18 @@ const visible = ref(false); const deleteId = ref(null); const projectId = sessionStorage.getItem('projectId'); const newProject = computed(() => store.state.projects.newProject); // 新建项目 - -watch(newProject, () => { - getProjectsList(dayjs().startOf('day').format('x'), dayjs().endOf('day').format('x')); +const startTime = computed(() => store.state.layout.startTime); // 当前选择时间 +const endTime = computed(() => store.state.layout.endTime); // 当前选择时间 +let start = startTime.value ? startTime.value : dayjs().startOf('day').format('x'); +let end = endTime.value ? endTime.value : dayjs().startOf('day').format('x'); + +watch([newProject, startTime, endTime], () => { + start = startTime.value ? startTime.value : dayjs().startOf('day').format('x'); + end = endTime.value ? endTime.value : dayjs().startOf('day').format('x'); + getProjectsList(start, end); }); -getProjectsList(dayjs().startOf('day').format('x'), dayjs().endOf('day').format('x')); +getProjectsList(start, end); // 点击操作面试显示隐藏 const showActionCard = item => { @@ -95,9 +101,9 @@ const showActionCard = item => { }; // 获取项目列表 -async function getProjectsList(startTime, endTime) { +async function getProjectsList(startData, endData) { try { - const data = await getProjects(startTime, endTime); + const data = await getProjects(startData, endData); projects.projects = []; data.forEach(item => { item.show = false; diff --git a/src/components/tall/task/AssignmentExperiment.vue b/src/components/tall/task/AssignmentExperiment.vue new file mode 100644 index 0000000..3d2a104 --- /dev/null +++ b/src/components/tall/task/AssignmentExperiment.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/src/components/tall/task/AssignmentSubject.vue b/src/components/tall/task/AssignmentSubject.vue new file mode 100644 index 0000000..9d64754 --- /dev/null +++ b/src/components/tall/task/AssignmentSubject.vue @@ -0,0 +1,220 @@ + + + + + diff --git a/src/components/tall/task/Conclusion.vue b/src/components/tall/task/Conclusion.vue new file mode 100644 index 0000000..cdea0f9 --- /dev/null +++ b/src/components/tall/task/Conclusion.vue @@ -0,0 +1,142 @@ + + + + + diff --git a/src/components/tall/task/ContractManagement.vue b/src/components/tall/task/ContractManagement.vue new file mode 100644 index 0000000..90d08d4 --- /dev/null +++ b/src/components/tall/task/ContractManagement.vue @@ -0,0 +1,154 @@ + + + + + diff --git a/src/components/tall/task/DataUnlock.vue b/src/components/tall/task/DataUnlock.vue new file mode 100644 index 0000000..5d77c0c --- /dev/null +++ b/src/components/tall/task/DataUnlock.vue @@ -0,0 +1,117 @@ + + + diff --git a/src/components/tall/task/ExperimentalCode.vue b/src/components/tall/task/ExperimentalCode.vue new file mode 100644 index 0000000..28d271d --- /dev/null +++ b/src/components/tall/task/ExperimentalCode.vue @@ -0,0 +1,84 @@ + + + + + diff --git a/src/components/tall/task/ExperimentalData.vue b/src/components/tall/task/ExperimentalData.vue new file mode 100644 index 0000000..fd9bd54 --- /dev/null +++ b/src/components/tall/task/ExperimentalData.vue @@ -0,0 +1,84 @@ + + + + + diff --git a/src/components/tall/task/ExperimentalResult.vue b/src/components/tall/task/ExperimentalResult.vue new file mode 100644 index 0000000..e2c5bf5 --- /dev/null +++ b/src/components/tall/task/ExperimentalResult.vue @@ -0,0 +1,78 @@ + + + + + diff --git a/src/components/tall/task/InterimInspection.vue b/src/components/tall/task/InterimInspection.vue new file mode 100644 index 0000000..86605b2 --- /dev/null +++ b/src/components/tall/task/InterimInspection.vue @@ -0,0 +1,142 @@ + + + + + diff --git a/src/components/tall/task/LabReport.vue b/src/components/tall/task/LabReport.vue new file mode 100644 index 0000000..d019102 --- /dev/null +++ b/src/components/tall/task/LabReport.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/src/components/tall/task/MeetingManagement.vue b/src/components/tall/task/MeetingManagement.vue index b264238..78a3a4d 100644 --- a/src/components/tall/task/MeetingManagement.vue +++ b/src/components/tall/task/MeetingManagement.vue @@ -71,12 +71,12 @@

点击或拖拽文件到区域内上传交付物

-

格式:pdf

+

格式:jpg、jpeg、rar、zip

- 上传会议记录 + 上传会议资料 diff --git a/src/components/tall/task/MemberManagement.vue b/src/components/tall/task/MemberManagement.vue index 6225efd..9412840 100644 --- a/src/components/tall/task/MemberManagement.vue +++ b/src/components/tall/task/MemberManagement.vue @@ -1,27 +1,41 @@