diff --git a/src/App.vue b/src/App.vue index 6672195..8f5eb2e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -26,7 +26,7 @@ import {GET_USER_INFO} from "@/api/ThirdApi"; import {USER_INFO} from "@/api/api"; -console.log("版本3.0.1------------"); +console.log("版本3.0.4------------"); const store = useStore(); onMounted(() => { diff --git a/src/api/request.js b/src/api/request.js index 132ac7d..18ee983 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -1,11 +1,13 @@ import router from "@/router"; -import { reactive, ref, toRefs, watch } from "vue"; +import {reactive, toRefs, watch} from "vue"; import axios from 'axios'; -import { getCookie, delCookie } from "@/api/utils"; +import {delCookie, getCookie} from "@/api/utils"; import JSONBigInt from 'json-bigint'; +import {ElMessageBox} from 'element-plus' const JSONBigIntStr = JSONBigInt({ storeAsString: true }); + export function usePage(_url, param, callback) { const state = reactive({ @@ -101,7 +103,12 @@ export async function request(_url, params) { delCookie(); (import.meta.env.MODE === 'development' || import.meta.env.MODE === 'test') ? router.push({ path: '/login', query: { returnUrl: router.currentRoute.value.fullPath } }) : window.open(window.location.protocol + import.meta.env.VITE_BASE_LOGIN_URL + encodeURIComponent(window.location.protocol + import.meta.env.VITE_BOE_BASE_URL + import.meta.env.VITE_BASE + router.currentRoute.value.fullPath), '_top') } - else if (response.code === 2001) router.push({ path: '/FaceTeachSignUp', query: { courseId: router.currentRoute.value.query.courseId, type: 3 } }) + else if (response.code === 2001) { + ElMessageBox.alert('抱歉,您不再本次参训名单中,请您联系管理员', '提示', { + confirmButtonText: '确定', + callback: () => router.push({ path: '/FaceTeachSignUp', query: { courseId: router.currentRoute.value.query.courseId, type: 3 } }) + }) + } else if (response.code === 2002) router.push({ path: '/FaceTeachNoCommon', query: { courseId: router.currentRoute.value.query.courseId, type: 3 } }) else if (response.code === 9000) router.replace({ path: '/noData'}) // if (import.meta.env.DEV && response.code === 1000) { diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index 77025db..61221ca 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -365,7 +365,7 @@ const { query: { courseId, type, id: taskId, projectStatus, projectEndTime }, } = useRoute(); -const { data } = useRequest(STU_OFFCOURSE_DETAIL, { courseId }); +const { data } = useRequest(STU_OFFCOURSE_DETAIL, { courseId,usePermission:true }); const teacherInfo = useUserInfo(computed(() => data.value?.planDto?.teacherId)); const isAllowSign = computed(() => dayjs().isBetween(dayjs(data.value.planDto?.beginTime).subtract(data.value.planDto?.beforeStart || 0, "minute"), dayjs(data.value.planDto?.afterStart ? data.value.planDto?.beginTime : data.value.planDto?.endTime).add(data.value.planDto?.afterStart || 0, "minute"))); diff --git a/vite.config.js b/vite.config.js index 377b14d..39f4c2d 100644 --- a/vite.config.js +++ b/vite.config.js @@ -6,171 +6,172 @@ * @FilePath: /stu_h5/vite.config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ -import { defineConfig, loadEnv } from 'vite' -import vue from '@vitejs/plugin-vue' -import legacy from '@vitejs/plugin-legacy' +import {defineConfig, loadEnv} from "vite"; +import vue from "@vitejs/plugin-vue"; +import legacy from "@vitejs/plugin-legacy"; import topLevelAwait from "vite-plugin-top-level-await"; -import { viteMockServe } from 'vite-plugin-mock' +import {viteMockServe} from "vite-plugin-mock"; -const path = require('path') +const path = require("path"); export default defineConfig(({ command, mode }) => -({ + ({ + host: "192.158.3.51", base: loadEnv(mode, process.cwd()).VITE_BASE, build: { - outDir: loadEnv(mode, process.cwd()).VITE_OUTPUT_DIR, + outDir: loadEnv(mode, process.cwd()).VITE_OUTPUT_DIR, }, plugins: [ - vue(), - legacy({ - targets: ['chrome 52', 'defaults', 'not IE 11'] - }), - // viteMockServe({ - // mockPath: './src/mock/mocks', - // }) - topLevelAwait({ - promiseExportName: '__tla', - promiseImportName: i => `__tla_${i}` - }), + vue(), + legacy({ + targets: ["chrome 52", "defaults", "not IE 11"] + }), + // viteMockServe({ + // mockPath: './src/mock/mocks', + // }) + topLevelAwait({ + promiseExportName: "__tla", + promiseImportName: i => `__tla_${i}` + }), ], resolve: { - alias: [ - { find: '@', replacement: path.resolve(__dirname, 'src') } - ] + alias: [ + { find: "@", replacement: path.resolve(__dirname, "src") } + ] }, server: { - proxy: { - '/file/upload': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, - '/file/img': { - 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, - }, - '/evaluation/queryEvaluationDetailById': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, - '/external/exam/queryExternalExam': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, - '/evaluation/evaluationToLearn': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, - '/evaluation/queryEvaluationTaskStatusOne': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, - '/statement/add': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, '/statement/collection': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, '/statement/delete': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, '/statement/praise': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, '/statement/update': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, '/statement/list': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, '/stu/externalExam/submitExternalExam': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, '/comment/list': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, '/comment/add': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, '/comment/praise': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, '/comment/collection': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, '/statement/info': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, '/statement/getComments': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, '/statement/getMoreComments': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, - '/voteSubmit': { - target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, - }, + host: "192.168.3.51", + proxy: { + "/file/upload": { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, + "/file/img": { + 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, + }, + "/evaluation/queryEvaluationDetailById": { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, + "/external/exam/queryExternalExam": { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, + "/evaluation/evaluationToLearn": { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, + "/evaluation/queryEvaluationTaskStatusOne": { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, + "/statement/add": { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, "/statement/collection": { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, "/statement/delete": { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, "/statement/praise": { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, "/statement/update": { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, "/statement/list": { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, "/stu/externalExam/submitExternalExam": { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, "/comment/list": { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, "/comment/add": { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, "/comment/praise": { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, "/comment/collection": { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, "/statement/info": { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, "/statement/getComments": { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, "/statement/getMoreComments": { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, + "/voteSubmit": { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, + }, - - } + } } -}) -) + }) +);