diff --git a/src/api/request.js b/src/api/request.js index 7a3b42bd..0a6584b0 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -374,9 +374,7 @@ export function usePage(_url, params, init = true,listing = false) { state.totalPage = r.data.total/10 || 1; state.total = r.data.total; state.loading = false; - }).catch(err => { - state.loading = false; - }) + }); } init && fetch(); @@ -500,9 +498,6 @@ export async function request(_url, params) { if (res.code === 0 || res.code === 200) { return res; } - if (res.code === 4 ){ - return Promise.reject(res); - } if (res.code === 1000 || res.code === 1002) { window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath) localStorage.removeItem('refreshPage') diff --git a/src/components/drawers/AddOpenCourse.vue b/src/components/drawers/AddOpenCourse.vue index b5e80e40..54941def 100644 --- a/src/components/drawers/AddOpenCourse.vue +++ b/src/components/drawers/AddOpenCourse.vue @@ -487,20 +487,18 @@ const columns = ref([ key: "teacher", width: "20%", align: "center", - ellipsis: true, customRender: ({ record }) => { - // const teachers = record.offteachers; - // return teachers.map((teacher, index) => { - // // 如果需要显示为列表形式 - // return ( - //
- // {teacher.teacherName} - // {index !== teachers.length - 1 && ', '} - //
- // ); - // }); - return record.offteachers.map(item=>item.teacherName).join(',') - }, + const teachers = record.offteachers; + return teachers.map((teacher, index) => { + // 如果需要显示为列表形式 + return ( +
+ {teacher.teacherName} + {index !== teachers.length - 1 && ', '} +
+ ); + }); + }, }, { diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue index e24bef5b..88ba7427 100644 --- a/src/components/drawers/project/ProjectOnlineManage.vue +++ b/src/components/drawers/project/ProjectOnlineManage.vue @@ -189,7 +189,7 @@ export default { pageSize: 10, currentPage: 1, tableDataTotal: 0, - projectName: null, + projectName: undefined, projectNameListNot: [ { id: 1, @@ -377,7 +377,7 @@ export default { ctx.emit("update:Tvisible", false); state.currentPage = 1; state.name = ""; - state.projectName = null; + state.projectName = undefined; state.tabledata = []; }; const afterVisibleChange = (bol) => { @@ -389,9 +389,6 @@ export default { }; const selectProjectName = (value) => { state.projectName = value; - if(value === undefined){ - state.projectName = null; - } }; //催促 const godie = () => { @@ -518,7 +515,7 @@ export default { state.tableDataTotalLoading = true; state.currentPage = 1; state.name = ""; - state.projectName = null; + state.projectName = ""; getData(); } diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue index 3cc3ec1c..4a4778c3 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -192,7 +192,7 @@ export default { pageSize: 10, currentPage: 1, tableDataTotal: 0, - projectName: null, + projectName: undefined, projectNameListNot: [ { id: 1, @@ -384,7 +384,7 @@ export default { ctx.emit("update:CommonModelVisible", false); state.currentPage = 1; state.name = ""; - state.projectName = null; + state.projectName = undefined; state.tabledata = []; }; const afterVisibleChange = (bol) => { @@ -396,9 +396,6 @@ export default { }; const selectProjectName = (value) => { state.projectName = value; - if(value === undefined){ - state.projectName = null; - } }; //催促 const godie = () => { @@ -526,7 +523,7 @@ export default { state.tableDataTotalLoading = true; state.currentPage = 1; state.name = ""; - state.projectName = null; + state.projectName = undefined; getData(); } diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue index 24726938..8f3fc07d 100644 --- a/src/components/drawers/router/RouterExaminationManage.vue +++ b/src/components/drawers/router/RouterExaminationManage.vue @@ -442,10 +442,6 @@ export default { {/* 导出数据 */ } function exportData() { - if(state.tabledata.length==0){ - message.error("没有数据可以导出"); - return - } // window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.chapterId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&type=${1}`) window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?currentStageId=${props.datasource.chapterId}&type=${1}&pid=${props.datasource.routerId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&taskType=${props.datasource.type}`) diff --git a/src/components/project/ProjectNumber.vue b/src/components/project/ProjectNumber.vue deleted file mode 100644 index 86973067..00000000 --- a/src/components/project/ProjectNumber.vue +++ /dev/null @@ -1,48 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/components/student/OnlineClassModelStudent.vue b/src/components/student/OnlineClassModelStudent.vue index c6ed39aa..fc4dd63f 100644 --- a/src/components/student/OnlineClassModelStudent.vue +++ b/src/components/student/OnlineClassModelStudent.vue @@ -91,11 +91,6 @@ 导出 - - - 导出详细学习记录 - -
{ - resolveBlob(res, mimeMap.xlsx,filename) - }) -} + const baseUrl = process.env.VUE_APP_ACT_API export function downLoadZip(str, filename) { var url = baseUrl + str diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 80223014..cac253e2 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1993,17 +1993,16 @@ const columns6 = [ align: "center", ellipsis: true, customRender: ({ record }) => { - // const teachers = record.offteachers; - // return teachers.map((teacher, index) => { - // // 如果需要显示为列表形式 - // return ( - //
- // {teacher.teacherName} - // {index !== teachers.length - 1 && ', '} - //
- // ); - // }); - return record.offteachers.map(item=>item.teacherName).join(',') + const teachers = record.offteachers; + return teachers.map((teacher, index) => { + // 如果需要显示为列表形式 + return ( +
+ {teacher.teacherName} + {index !== teachers.length - 1 && ', '} +
+ ); + }); } }, diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index 0273ce63..cf96826d 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -147,13 +147,6 @@
-
-
项目编号:
-
- - -
-
@@ -276,7 +269,7 @@ import * as api2 from "../../api/indexAudit"; import {validateName} from "@/api/index1"; import dayjs from "dayjs"; import {scrollLoad} from "@/api/method"; -import ProjectNumber from "@/components/project/ProjectNumber"; + export default { name: "projectAdd", components: { @@ -286,7 +279,6 @@ export default { TrainClass, NameInput, OrgClass, - ProjectNumber }, setup() { const store = useStore(); @@ -342,12 +334,6 @@ export default { state.projectInfo.parentName = routers.query.parentName; state.projectInfo.parentId = routers.query.parentId; }); - watch(()=>state.projectInfo.boeFlag,(val)=>{ - if(!val){ - state.projectInfo.numValue = '' - state.projectInfo.numLabel = '' - } - }) function getProjectInfo() { state.projectInfo.parentName = routers.query.parentName; @@ -786,20 +772,6 @@ export default { } } - .num{ - display: flex; - justify-content: center; - align-items: center; - .num_text{ - color: #6f6f6f; - font-size: 14px; - // margin-right: 7px; - } - .num_input{ - width: 184px; - } - } - .filebox { margin-left: 14px; flex: 1;