hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-15 05:46:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/zcwy_0712' into zcwy_0827_pingcode817

Browse Source
This commit is contained in:
zhangsir
2024-09-27 16:11:23 +08:00
parent 0ee26671ce 1be2e48b8b
commit 18e69264c7
10 changed files with 54 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/request.js
View File

@@ -374,7 +374,9 @@ 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();
@@ -498,6 +500,9 @@ 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')

2
src/components/BreadCrumb.vue
View File

@@ -491,7 +491,7 @@
{
name: "感恩教师",
}, {
name:'认证讲师库（2023）'
name:'认证讲师库'
}
];
}

4
src/components/NavLeft.vue
View File

@@ -394,7 +394,7 @@
circle: selectedKeys[0] === 'sub22-4' ? false : true,
}"
></span>
<router-link to="/teachertopic">认证讲师库（2023）</router-link>
<router-link to="/teachertopic">认证讲师库</router-link>
</a-menu-item>
<a-menu-item key="sub22-5" v-if="checkMenu('tooldown')">
<span
@@ -935,7 +935,7 @@ export default {
href: "/teachertopic",
openKeys: "sub22",
selectedKeys: "sub22-4",
pagename: "认证讲师库（2023）",
pagename: "认证讲师库",
},
{
href: "/tooldown",

22
src/components/drawers/AddOpenCourse.vue
View File

@@ -487,17 +487,19 @@ const columns = ref([
key: "teacher",
width: "20%",
align: "center",
ellipsis: true,
customRender: ({ record }) => {
const teachers = record.offteachers;
return teachers.map((teacher, index) => {
// 如果需要显示为列表形式
return (
<div key={index}>
{teacher.teacherName}
{index !== teachers.length - 1 && ', '}
</div>
);
});
// const teachers = record.offteachers;
// return teachers.map((teacher, index) => {
// // 如果需要显示为列表形式
// return (
// <div key={index}>
// {teacher.teacherName}
// {index !== teachers.length - 1 && ', '}
// </div>
// );
// });
return record.offteachers.map(item=>item.teacherName).join(',')
},
},

9
src/components/drawers/project/ProjectOnlineManage.vue
View File

@@ -189,7 +189,7 @@ export default {
pageSize: 10,
currentPage: 1,
tableDataTotal: 0,
projectName: undefined,
projectName: null,
projectNameListNot: [
{
id: 1,
@@ -377,7 +377,7 @@ export default {
ctx.emit("update:Tvisible", false);
state.currentPage = 1;
state.name = "";
state.projectName = undefined;
state.projectName = null;
state.tabledata = [];
};
const afterVisibleChange = (bol) => {
@@ -389,6 +389,9 @@ export default {
};
const selectProjectName = (value) => {
state.projectName = value;
if(value === undefined){
state.projectName = null;
}
};
//催促
const godie = () => {
@@ -515,7 +518,7 @@ export default {
state.tableDataTotalLoading = true;
state.currentPage = 1;
state.name = "";
state.projectName = "";
state.projectName = null;
getData();
}

9
src/components/drawers/router/RouterCommonManage.vue
View File

@@ -192,7 +192,7 @@ export default {
pageSize: 10,
currentPage: 1,
tableDataTotal: 0,
projectName: undefined,
projectName: null,
projectNameListNot: [
{
id: 1,
@@ -384,7 +384,7 @@ export default {
ctx.emit("update:CommonModelVisible", false);
state.currentPage = 1;
state.name = "";
state.projectName = undefined;
state.projectName = null;
state.tabledata = [];
};
const afterVisibleChange = (bol) => {
@@ -396,6 +396,9 @@ export default {
};
const selectProjectName = (value) => {
state.projectName = value;
if(value === undefined){
state.projectName = null;
}
};
//催促
const godie = () => {
@@ -523,7 +526,7 @@ export default {
state.tableDataTotalLoading = true;
state.currentPage = 1;
state.name = "";
state.projectName = undefined;
state.projectName = null;
getData();
}

4
src/components/drawers/router/RouterExaminationManage.vue
View File

@@ -442,6 +442,10 @@ 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}`)

2
src/components/student/TableStudent.vue
View File

@@ -618,7 +618,7 @@ function exportTaskStu() {
window.open(
`${
process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?type=${1}&pid=${props.id}`
}/admin/student/exportTaskStudent?type=${1}&pid=${props.id}&studentName=${tableParam.value.studentName === null ?'':tableParam.value.studentName}&studentDepartName=${tableParam.value.studentDepartName===null?'':tableParam.value.studentDepartName}&topFlag=${tableParam.value.topFlag===null?'':tableParam.value.topFlag}`
);
}

24
src/views/courselibrary/CoursewareManage.vue
View File

@@ -2001,16 +2001,17 @@ const columns6 = [
align: "center",
ellipsis: true,
customRender: ({ record }) => {
const teachers = record.offteachers;
return teachers.map((teacher, index) => {
// 如果需要显示为列表形式
return (
<div key={index}>
{teacher.teacherName}
{index !== teachers.length - 1 && ', '}
</div>
);
});
// const teachers = record.offteachers;
// return teachers.map((teacher, index) => {
// // 如果需要显示为列表形式
// return (
// <div key={index}>
// {teacher.teacherName}
// {index !== teachers.length - 1 && ', '}
// </div>
// );
// });
return record.offteachers.map(item=>item.teacherName).join(',')
}
},
@@ -2277,6 +2278,7 @@ export default defineComponent({
const durationText = computed(() => state.xjkkinputV3?.length?dayjs(state.xjkkinputV3[1]).diff(dayjs(state.xjkkinputV3[0]),'minute'):'请输入持续时间');
const state = reactive({
tableCoursePlanLoading: false,
permissions:null,
createId:null,
workInfo: {},
@@ -3581,6 +3583,7 @@ function onFocusEnd(){
// 渲染开课操作
const getTableDate3 = async (type) => {
state.tableLoading = true;
state.tableCoursePlanLoading = true
// let datas = state.tableData6;
let beginTime = "";
let endTime = "";
@@ -3635,6 +3638,7 @@ function onFocusEnd(){
itm.pageNo = pageNo;
});
state.tableData6 = datas;
state.tableCoursePlanLoading = false
console.log("state.tableData6", state.tableData6);
};

2
src/views/report/Operational.vue
View File

@@ -1635,7 +1635,7 @@ export default {
var day = dayjs(new Date()).date();
console.log("initTime year:",year,"month:",month,"day:",day);
var year1 = year;
var month1 = parseInt(month) - 5;
var month1 = parseInt(month) - 1;
if(month1<=0){
year1 = parseInt(year1) - 1;
month1 = 12 - (Math.abs(month1)%12);