--fix bug

This commit is contained in:
yuping
2023-05-15 14:14:23 +08:00
parent 387363fbd8
commit aa3fa30436
3 changed files with 165 additions and 157 deletions

View File

@@ -1,11 +1,13 @@
import router from "@/router"; import router from "@/router";
import { reactive, ref, toRefs, watch } from "vue"; import {reactive, toRefs, watch} from "vue";
import axios from 'axios'; import axios from 'axios';
import { getCookie, delCookie } from "@/api/utils"; import {delCookie, getCookie} from "@/api/utils";
import JSONBigInt from 'json-bigint'; import JSONBigInt from 'json-bigint';
import {ElMessageBox} from 'element-plus'
const JSONBigIntStr = JSONBigInt({ storeAsString: true }); const JSONBigIntStr = JSONBigInt({ storeAsString: true });
export function usePage(_url, param, callback) { export function usePage(_url, param, callback) {
const state = reactive({ const state = reactive({
@@ -101,7 +103,12 @@ export async function request(_url, params) {
delCookie(); 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') (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 === 2002) router.push({ path: '/FaceTeachNoCommon', query: { courseId: router.currentRoute.value.query.courseId, type: 3 } })
else if (response.code === 9000) router.replace({ path: '/noData'}) else if (response.code === 9000) router.replace({ path: '/noData'})
// if (import.meta.env.DEV && response.code === 1000) { // if (import.meta.env.DEV && response.code === 1000) {

View File

@@ -365,7 +365,7 @@ const {
query: { courseId, type, id: taskId, projectStatus, projectEndTime }, query: { courseId, type, id: taskId, projectStatus, projectEndTime },
} = useRoute(); } = 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 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"))); 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")));

View File

@@ -6,171 +6,172 @@
* @FilePath: /stu_h5/vite.config.js * @FilePath: /stu_h5/vite.config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
import { defineConfig, loadEnv } from 'vite' import {defineConfig, loadEnv} from "vite";
import vue from '@vitejs/plugin-vue' import vue from "@vitejs/plugin-vue";
import legacy from '@vitejs/plugin-legacy' import legacy from "@vitejs/plugin-legacy";
import topLevelAwait from "vite-plugin-top-level-await"; 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 }) => export default defineConfig(({ command, mode }) =>
({ ({
host: "192.158.3.51",
base: loadEnv(mode, process.cwd()).VITE_BASE, base: loadEnv(mode, process.cwd()).VITE_BASE,
build: { build: {
outDir: loadEnv(mode, process.cwd()).VITE_OUTPUT_DIR, outDir: loadEnv(mode, process.cwd()).VITE_OUTPUT_DIR,
}, },
plugins: [ plugins: [
vue(), vue(),
legacy({ legacy({
targets: ['chrome 52', 'defaults', 'not IE 11'] targets: ["chrome 52", "defaults", "not IE 11"]
}), }),
// viteMockServe({ // viteMockServe({
// mockPath: './src/mock/mocks', // mockPath: './src/mock/mocks',
// }) // })
topLevelAwait({ topLevelAwait({
promiseExportName: '__tla', promiseExportName: "__tla",
promiseImportName: i => `__tla_${i}` promiseImportName: i => `__tla_${i}`
}), }),
], ],
resolve: { resolve: {
alias: [ alias: [
{ find: '@', replacement: path.resolve(__dirname, 'src') } { find: "@", replacement: path.resolve(__dirname, "src") }
] ]
}, },
server: { server: {
proxy: { host: "192.168.3.51",
'/file/upload': { proxy: {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, "/file/upload": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, changeOrigin: true,
'/file/img': { },
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, "/file/img": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, changeOrigin: true,
'/stu': { },
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, "/stu": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, changeOrigin: true,
'/queryVoteSubmitDetailById': { },
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, "/queryVoteSubmitDetailById": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, changeOrigin: true,
'/work': { },
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, "/work": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, changeOrigin: true,
'/discuss': { },
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, "/discuss": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, changeOrigin: true,
'/discussSubmit': { },
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, "/discussSubmit": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, changeOrigin: true,
'/comment': { },
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, "/comment": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, changeOrigin: true,
'/vote': { },
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, "/vote": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, changeOrigin: true,
'/admin': { },
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, "/admin": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, '/activity': { changeOrigin: true,
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, }, "/activity": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, '/liveBroadcast': { changeOrigin: true,
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, }, "/liveBroadcast": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, '/examination': { changeOrigin: true,
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, }, "/examination": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, '/assessment': { changeOrigin: true,
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, }, "/assessment": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, '/workSubmit': { changeOrigin: true,
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, }, "/workSubmit": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, '/userbasic': { changeOrigin: true,
target: 'https://u-pre.boe.com', }, "/userbasic": {
changeOrigin: true, target: "https://u-pre.boe.com",
}, '/link': { changeOrigin: true,
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, }, "/link": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, '/onlineClasses/queryOnlineClassesStudyDetail': { changeOrigin: true,
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, }, "/onlineClasses/queryOnlineClassesStudyDetail": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, changeOrigin: true,
'/evaluation/queryEvaluationDetailById': { },
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, "/evaluation/queryEvaluationDetailById": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, changeOrigin: true,
'/external/exam/queryExternalExam': { },
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, "/external/exam/queryExternalExam": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, changeOrigin: true,
'/evaluation/evaluationToLearn': { },
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, "/evaluation/evaluationToLearn": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, changeOrigin: true,
'/evaluation/queryEvaluationTaskStatusOne': { },
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, "/evaluation/queryEvaluationTaskStatusOne": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, changeOrigin: true,
'/statement/add': { },
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, "/statement/add": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, '/statement/collection': { changeOrigin: true,
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, }, "/statement/collection": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, '/statement/delete': { changeOrigin: true,
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, }, "/statement/delete": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, '/statement/praise': { changeOrigin: true,
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, }, "/statement/praise": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, '/statement/update': { changeOrigin: true,
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, }, "/statement/update": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, '/statement/list': { changeOrigin: true,
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, }, "/statement/list": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, '/stu/externalExam/submitExternalExam': { changeOrigin: true,
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, }, "/stu/externalExam/submitExternalExam": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, '/comment/list': { changeOrigin: true,
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, }, "/comment/list": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, '/comment/add': { changeOrigin: true,
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, }, "/comment/add": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, '/comment/praise': { changeOrigin: true,
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, }, "/comment/praise": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, '/comment/collection': { changeOrigin: true,
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, }, "/comment/collection": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, '/statement/info': { changeOrigin: true,
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, }, "/statement/info": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, '/statement/getComments': { changeOrigin: true,
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, }, "/statement/getComments": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, '/statement/getMoreComments': { changeOrigin: true,
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, }, "/statement/getMoreComments": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, changeOrigin: true,
'/voteSubmit': { },
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, "/voteSubmit": {
changeOrigin: true, target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
}, changeOrigin: true,
},
}
}
} }
}) })
) );