This commit is contained in:
yuping
2023-01-13 02:51:05 +08:00
parent 83f4c53ad8
commit b85a353f2b
7 changed files with 20 additions and 16 deletions

1
.env
View File

@@ -1,6 +1,7 @@
VITE_BASE=/fe-student VITE_BASE=/fe-student
VITE_BASE_API= VITE_BASE_API=
VITE_OUTPUT_DIR=./dist VITE_OUTPUT_DIR=./dist
VITE_FILE_PATH=/upload/
VITE_BASE_LOGIN_URL=https://u-pre.boe.com/web/ VITE_BASE_LOGIN_URL=https://u-pre.boe.com/web/
VITE_PROXY_URL=http://111.231.196.214/manageApi VITE_PROXY_URL=http://111.231.196.214/manageApi

3
src/api/CONST.js Normal file
View File

@@ -0,0 +1,3 @@
export const PROJECT = 1;
export const ROUTER = 2;
export const COURSE = 3;

View File

@@ -9,7 +9,7 @@
export const LOGIN = '/admin/CheckUser/userLogin post' export const LOGIN = '/admin/CheckUser/userLogin post'
export const USER_INFO = '/admin/CheckUser/userInfo' export const USER_INFO = '/admin/CheckUser/userInfo'
// export const FILE_UPLOAD = 'http://111.231.196.214:30001/file/upload' // export const FILE_UPLOAD = 'http://111.231.196.214:30001/file/upload'
export const FILE_UPLOAD = import.meta.env.VITE_BASE_API + '/file/upload' export const FILE_UPLOAD = import.meta.env.VITE_BASE_API + '/file/uploadFile'
export const COMMON_TOKEN = 'https://upload-z2.qiniup.com' export const COMMON_TOKEN = 'https://upload-z2.qiniup.com'
export const ROUTER_CHAPTER_LIST = '/stu/router/chapterList' export const ROUTER_CHAPTER_LIST = '/stu/router/chapterList'
export const ROUTER_LIST = '/stu/router/list post' export const ROUTER_LIST = '/stu/router/list post'

View File

@@ -346,12 +346,13 @@ function toSurvery() {
router.push({ router.push({
path: "/surveydetail", path: "/surveydetail",
query: { query: {
id:taskId,
courseId: data.value.planDto.evaluateId, courseId: data.value.planDto.evaluateId,
pName: "面授课", pName: "面授课",
infoId: data.value.planDto.offcoursePlanId, infoId: data.value.planDto.offcoursePlanId,
chapterOrStageId: 0, chapterOrStageId: 0,
sName: data.value.planDto.name, sName: data.value.planDto.name,
type: 3 type
}, },
}); });
} }

View File

@@ -197,10 +197,7 @@
</div> </div>
<div class="content3"> <div class="content3">
<div><span style="margin-left: 10px"> <div><span style="margin-left: 10px">
<el-link target="_blank" type="primary" :href="value.workUploadAddress?.split(',')[0] || ''">{{ <el-link target="_blank" type="primary" :href="fielPath+value.workUploadAddress?.split(',')[0] || ''">{{value.workUploadAddress?.split(',')[0] }}</el-link>
value.workUploadAddress?.split(',')[0].split('/').at(-1) ||
''
}}</el-link>
</span> </span>
</div> </div>
</div> </div>
@@ -281,6 +278,7 @@ import { ElMessage } from "element-plus";
//import AlertSuccess from "@/components/alert/AlertSuccess.vue"; //import AlertSuccess from "@/components/alert/AlertSuccess.vue";
const fileList = ref([]); const fileList = ref([]);
const fielPath = ref(import.meta.env.VITE_FILE_PATH);
const uploadRef = ref(); const uploadRef = ref();
const centerDialogVisible = ref(false); const centerDialogVisible = ref(false);
@@ -293,7 +291,7 @@ const returnclick = () => {
router.back(); router.back();
}; };
const { const {
query: { courseId: workId, type, id: taskId, pName, sName, projectStatus, projectEndTime}, query: { courseId: workId, type, id: taskId, pName, sName, projectStatus, projectEndTime,infoId},
} = useRoute(); } = useRoute();
const { data } = taskId && taskId !== 'undefined' ? useRequest(TASK_WORK_DETAIL, { workId, taskId }) : useRequest(TASK_WORK_DETAIL, { workId }); const { data } = taskId && taskId !== 'undefined' ? useRequest(TASK_WORK_DETAIL, { workId, taskId }) : useRequest(TASK_WORK_DETAIL, { workId });
@@ -315,18 +313,17 @@ const showFileList = computed(() => {
const handleClick = () => { const handleClick = () => {
console.log(fileList.value, uploadRef.value) console.log(fileList.value, uploadRef.value)
if (!sbValue.value.content) { if (!sbValue.value.content) {
if (fileList.value.length == 0) { if (fileList.value.length === 0) {
return ElMessage.warning("请输入作业内容"); return ElMessage.warning("请输入作业内容");
} }
} }
request(TASK_WORK_COMMIT, { request(TASK_WORK_COMMIT, {
projectOrRouterLogo: type, projectOrRouterLogo: type,
workUploadContent: sbValue.value.content, workUploadContent: sbValue.value.content,
workUploadAddress: fileList.value.map((e) => e.url).join(",") || "", workUploadAddress: fileList.value.map((e) => e.url).join(",") || "",
workId, workId,
type, type,
taskId, taskId:taskId || infoId,
}).then((res) => { }).then((res) => {
console.log(res); console.log(res);
submitList.value.unshift(res.data); submitList.value.unshift(res.data);

View File

@@ -287,6 +287,7 @@ import {
import { useRoute, useRouter } from "vue-router"; import { useRoute, useRouter } from "vue-router";
import store from "@/store"; import store from "@/store";
import { ElMessage } from "element-plus"; import { ElMessage } from "element-plus";
import {PROJECT} from "@/api/CONST";
const { const {
query: { courseId, projectId }, query: { courseId, projectId },
@@ -505,7 +506,7 @@ function toFinish(d, sName, chapterOrStageId) {
d.status!==1 && request(STUDY_RECORD, { d.status!==1 && request(STUDY_RECORD, {
studentId: data.value.userInfoBo.userId, studentId: data.value.userInfoBo.userId,
targetId: data.value.routerId, targetId: data.value.routerId,
logo: 2, logo: PROJECT,
stageOrChapterId: chapterOrStageId, stageOrChapterId: chapterOrStageId,
taskId: d.projectTaskId, taskId: d.projectTaskId,
}); });
@@ -521,7 +522,7 @@ function toFinish(d, sName, chapterOrStageId) {
path: types.value.path[d.type], path: types.value.path[d.type],
query: { query: {
id: d.projectTaskId, id: d.projectTaskId,
type: 2, type: PROJECT,
infoId: data.value.projectId, infoId: data.value.projectId,
courseId: d.courseId, courseId: d.courseId,
pName: data.value.name, pName: data.value.name,

View File

@@ -282,6 +282,7 @@ import { ROUTER_PROCESS, LINK_DETAILS, STUDY_RECORD } from "@/api/api";
import { useRoute, useRouter } from "vue-router"; import { useRoute, useRouter } from "vue-router";
import { ElMessage } from "element-plus"; import { ElMessage } from "element-plus";
import store from "@/store"; import store from "@/store";
import {ROUTER} from "@/api/CONST";
const { const {
query: { routerId, routerName }, query: { routerId, routerName },
@@ -445,7 +446,7 @@ function toFinish(d) {
d.status!==1 && request(STUDY_RECORD, { d.status!==1 && request(STUDY_RECORD, {
studentId: userInfo.value.id, studentId: userInfo.value.id,
targetId: data.value.routerId, targetId: data.value.routerId,
logo: 1, logo: ROUTER,
stageOrChapterId: data.value.currentStageId, stageOrChapterId: data.value.currentStageId,
taskId: d.routerTaskId, taskId: d.routerTaskId,
}); });
@@ -460,7 +461,7 @@ function toFinish(d) {
path: types.value.path[d.type], path: types.value.path[d.type],
query: { query: {
id: d.routerTaskId, id: d.routerTaskId,
type: 1, type: ROUTER,
infoId: routerId, infoId: routerId,
courseId: d.courseId, courseId: d.courseId,
pName: data.value.name, pName: data.value.name,