+
+
@@ -332,7 +333,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 +352,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() {
@@ -366,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),
})
@@ -418,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: taskIds ? taskIds : 0, // 项目、路径图或开课的Id
+ chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, // 关卡或者阶段Id 关卡Id不允许为空
assessmentId: courseId,
- taskId,
+ taskId: taskIds ? taskIds : 0,
type,
result: JSON.stringify(data.value),
}).then(() => {
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,
+ },
+ }
+ }
})
)
返回
- 
-