From 1218253ff9dae1e3d66937e2e351b36d79faed03 Mon Sep 17 00:00:00 2001 From: wuyx Date: Fri, 23 Dec 2022 20:34:53 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/faceteach/FaceTeach.vue | 3 + src/views/liveBroadcast/LiveBroadcast.vue | 12 ++ src/views/survey/SurveyDetail.vue | 5 +- vite.config.js | 163 +++++++++++----------- 4 files changed, 101 insertions(+), 82 deletions(-) diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index 22098fe..fd6fe76 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -400,6 +400,9 @@ function toWork() { query: { courseId: data.value.workDto.workId, id: taskId, + taskId: taskId, + taskIds: taskId, + chapterOrStageId: 0, type, pName: "面授课", sName: data.value.planDto.name, diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue index 837e3e7..d716410 100644 --- a/src/views/liveBroadcast/LiveBroadcast.vue +++ b/src/views/liveBroadcast/LiveBroadcast.vue @@ -206,10 +206,22 @@ const commitClick = () => { return; } + console.log({ + courseId: data.value.assessmentId, + taskIds: taskId, + chapterOrStageId: 0, + pName: "直播", + sName: data.value.liveName, + type: 4 + }) + router.push({ path: "/surveydetail", query: { courseId: data.value.assessmentId, + taskId: taskId, + taskIds: taskId, + chapterOrStageId: 0, pName: "直播", sName: data.value.liveName, type: 4 diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue index ff5cea4..bdd06ba 100644 --- a/src/views/survey/SurveyDetail.vue +++ b/src/views/survey/SurveyDetail.vue @@ -332,7 +332,7 @@ import { ElMessage } from "element-plus"; import { ref } from "vue"; const { - query: { courseId, id: taskId, type, pName, sName, chapterOrStageId }, + query: { courseId, id: taskId, taskIds, type, pName, sName, chapterOrStageId }, } = useRoute(); const router = useRouter(); const returnclick = () => { @@ -351,7 +351,8 @@ function formateArr(arr1) { return newarr } -const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, chapterOrStageId, targetId: taskId }); +const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, chapterOrStageId, targetId: taskIds ? taskIds : 0 }); +console.log('我是查询评估的参数', { id: courseId, type, chapterOrStageId, targetId: taskIds ? taskIds : 0 }) console.log('我是需要排序得题目', data) function goHome() { diff --git a/vite.config.js b/vite.config.js index 9ecb0b7..f6d6081 100644 --- a/vite.config.js +++ b/vite.config.js @@ -13,85 +13,88 @@ const path = require('path') export default defineConfig(({ command, mode }) => ({ - base: loadEnv(mode, process.cwd()).VITE_BASE, - plugins: [ - vue(), - // legacy({ - // targets: ['chrome 64', 'defaults', 'not IE 11'] - // }), - topLevelAwait({ - promiseExportName: '__tla', - promiseImportName: i => `__tla_${i}` - }), - // viteMockServe({ - // mockPath: './src/mock/mocks', - // }) - ], - resolve: { - alias: [ - { find: '@', replacement: path.resolve(__dirname, 'src') } - ] - }, - server: { - proxy: { - '/file/upload': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, - '/stu': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, - '/queryVoteSubmitDetailById': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, - '/work': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, - '/discuss': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, - '/discussSubmit': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, - '/comment': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, - '/vote': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, - '/admin': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, '/activity': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, '/liveBroadcast': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, '/examination': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, '/assessment': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, '/workSubmit': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, '/userbasic': { - target: 'https://u-pre.boe.com', - changeOrigin: true, - }, '/link': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, - } - } + base: loadEnv(mode, process.cwd()).VITE_BASE, + plugins: [ + vue(), + // legacy({ + // targets: ['chrome 64', 'defaults', 'not IE 11'] + // }), + topLevelAwait({ + promiseExportName: '__tla', + promiseImportName: i => `__tla_${i}` + }), + // viteMockServe({ + // mockPath: './src/mock/mocks', + // }) + ], + resolve: { + alias: [ + { find: '@', replacement: path.resolve(__dirname, 'src') } + ] + }, + server: { + proxy: { + '/file/upload': { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, + '/stu': { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, + '/queryVoteSubmitDetailById': { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, + '/work': { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, + '/discuss': { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, + '/discussSubmit': { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, + '/comment': { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, + '/vote': { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, + '/admin': { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, '/activity': { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, '/liveBroadcast': { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, '/examination': { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, '/assessment': { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, '/workSubmit': { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, '/userbasic': { + target: 'https://u-pre.boe.com', + changeOrigin: true, + }, '/link': { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, '/onlineClasses/queryOnlineClassesStudyDetail': { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, + } + } }) ) From 6ded0b99ac64de3d89ce389c1ef8f6ca8343d7a9 Mon Sep 17 00:00:00 2001 From: wuyx Date: Fri, 23 Dec 2022 20:52:51 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=9D=A2=E6=8E=88?= =?UTF-8?q?=E8=AF=BE=E4=BC=A0=E9=80=92=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/faceteach/FaceTeach.vue | 140 ++++++++++++------------------ src/views/survey/SurveyDetail.vue | 36 ++++---- 2 files changed, 75 insertions(+), 101 deletions(-) diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index fd6fe76..9fc1790 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -5,11 +5,12 @@
课程列表
/
课程详情
- +
- 返回 + 返回
@@ -50,94 +51,62 @@ - -
-
-
-
-
- -
课程详情
-
-
-
-
-
-
-
-
- - -
+
+
+
+
+ +
课程详情
+
+
+
+
+
+
+
+
+ + +
- 此课程无附件 -
-
-
-
- -
{{ el.name }}
-
-
- -
- 下载 -
-
-
- -
- 下载 -
-
-
-
- - -
+ 此课程无附件 +
+
+
+
+ +
{{ el.name }}
+
+
+ +
+ 下载 +
+
+
+ +
+ 下载 +
+
+
+
+ + +
--> -
+
- 返回 + 返回
-
- - -
【评估】{{data.assessmentName}}
- - -
-
- + +
【评估】{{ data.assessmentName }}
+ + +
+
+ @@ -367,10 +368,10 @@ function submit() { if (1 > 0) { console.log(data) console.log('我是提交的数据', { - targetId: taskId, // 项目、路径图或开课的Id - chapterOrStageId: chapterOrStageId, // 关卡或者阶段Id 关卡Id不允许为空 + targetId: taskId ? taskId : taskIds ? taskIds : 0, // 项目、路径图或开课的Id + chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, // 关卡或者阶段Id 关卡Id不允许为空 assessmentId: courseId, - taskId, + taskId: taskId ? taskId : taskIds ? taskIds : 0, type, result: JSON.stringify(data.value), }) @@ -419,12 +420,13 @@ function submit() { return ElMessage.warning("您有未填写的评估题干"); } } + data.value.isSubmit = !data.value.isSubmit; request(ASSESSMENT_SUBMIT, { - targetId: taskId, // 项目、路径图或开课的Id - chapterOrStageId: chapterOrStageId, // 关卡或者阶段Id 关卡Id不允许为空 + targetId: taskId ? taskId : taskIds ? taskIds : 0, // 项目、路径图或开课的Id + chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, // 关卡或者阶段Id 关卡Id不允许为空 assessmentId: courseId, - taskId, + taskId: taskId ? taskId : taskIds ? taskIds : 0, type, result: JSON.stringify(data.value), }).then(() => { From 2871128f4afda8cd6bb2052539f4e1f6e4a265a4 Mon Sep 17 00:00:00 2001 From: wuyx Date: Fri, 23 Dec 2022 21:19:32 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=E8=B7=AF=E5=BE=84=E5=9B=BE/=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=B7=B3=E8=BD=AC=E8=AF=84=E4=BC=B0=E4=BC=A0=E9=80=92?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/ProjectDetails.vue | 5 +- src/views/roadmap/PathDetails.vue | 95 +++++++++++++--------------- 2 files changed, 47 insertions(+), 53 deletions(-) diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index ebded70..b6ea950 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -8,7 +8,8 @@
- 返回 + 返回
@@ -468,6 +469,8 @@ function toFinish(d, sName, chapterOrStageId) { query: { id: d.projectTaskId, type: 2, + taskId: projectId, + taskIds: projectId, courseId: d.courseId, pName: data.value.name, sName, diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 338c838..dd10934 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -8,62 +8,51 @@
- 返回 + 返回
- -
- -
- {{ userInfo.bandDesc }} - - - -
- - -
-
-
-
-
{{ data.currentStageName }}
-
- -
- {{ data.currentChapterCnt ? '进行中' : '未开始' }} -
-
-
-
-
-
{{ value.name }}
-
-
- 必修 -
-
- 选修 -
-
- {{ types.typeName[value.type] || "" }} -
+
+ + +
+ {{ userInfo.bandDesc }} + + + +
+ + +
+
+
+
+
{{ data.currentStageName }}
+
+ +
+ {{ data.currentChapterCnt ? '进行中' : '未开始' }} +
+
+
+
+
+
{{ value.name }}
+
+
+ 必修 +
+
+ 选修 +
+
+ {{ types.typeName[value.type] || "" }} +
@@ -408,6 +397,8 @@ function toFinish(d) { // id: d.routerTaskId, id: routerId, type: 1, + taskId: routerId, + taskIds: routerId, courseId: d.courseId, pName: data.value.name, sName: data.value.currentStageName, From ccc5c237efc8f0782a0166e0eb1b86144aa1c177 Mon Sep 17 00:00:00 2001 From: wuyx Date: Fri, 23 Dec 2022 21:29:15 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=E6=97=A0=E9=98=B6=E6=AE=B5=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=8F=82=E6=95=B0=E4=BC=A0=E9=80=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/ProjectDetails.vue | 4 ++-- src/views/survey/SurveyDetail.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index b6ea950..2de4e4e 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -469,8 +469,8 @@ function toFinish(d, sName, chapterOrStageId) { query: { id: d.projectTaskId, type: 2, - taskId: projectId, - taskIds: projectId, + taskId: data.value.projectId, + taskIds: data.value.projectId, courseId: d.courseId, pName: data.value.name, sName, diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue index 8b91a81..4800a2a 100644 --- a/src/views/survey/SurveyDetail.vue +++ b/src/views/survey/SurveyDetail.vue @@ -423,10 +423,10 @@ function submit() { data.value.isSubmit = !data.value.isSubmit; request(ASSESSMENT_SUBMIT, { - targetId: taskId ? taskId : taskIds ? taskIds : 0, // 项目、路径图或开课的Id + targetId: taskIds ? taskIds : 0, // 项目、路径图或开课的Id chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, // 关卡或者阶段Id 关卡Id不允许为空 assessmentId: courseId, - taskId: taskId ? taskId : taskIds ? taskIds : 0, + taskId: taskIds ? taskIds : 0, type, result: JSON.stringify(data.value), }).then(() => { From 194dea7c2b0e31a1e7c70807419b52763eda78fa Mon Sep 17 00:00:00 2001 From: wuyx Date: Fri, 23 Dec 2022 21:40:31 +0800 Subject: [PATCH 5/5] =?UTF-8?q?style:=E9=A1=B9=E7=9B=AE=E6=97=A0=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=E6=97=B6=EF=BC=8C=E7=9B=B4=E6=92=AD/=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E9=9D=A2=E5=8C=85=E5=B1=91=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/liveBroadcast/LiveBroadcast.vue | 11 ++++++----- src/views/survey/SurveyDetail.vue | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue index d716410..760cb57 100644 --- a/src/views/liveBroadcast/LiveBroadcast.vue +++ b/src/views/liveBroadcast/LiveBroadcast.vue @@ -5,7 +5,7 @@
{{ pName }}
/
{{ sName }}
-
/
+
/
直播详情
-
+
- 返回 + 返回
-
- +
+
diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue index 4800a2a..10e0821 100644 --- a/src/views/survey/SurveyDetail.vue +++ b/src/views/survey/SurveyDetail.vue @@ -6,7 +6,7 @@
{{ pName }}
/
{{ sName }}
-
/
+
/
评估详情