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

2023-02-17bug修复

Browse Source
This commit is contained in:
李东进1
2023-02-17 00:50:24 +08:00
parent c62b2c1591
commit da6ccbad1c
13 changed files with 13148 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13150
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
src/components/drawers/ActiveAttendance.vue
View File

@@ -428,8 +428,8 @@ export default {
console.log("1111333", endTime);
}
state.beginTime = toDate(beginTime / 1000, "Y/M/D h:m:s");
state.endTime = toDate(endTime / 1000, "Y/M/D h:m:s");
state.beginTime = toDate(beginTime / 1000, "Y/M/D h:m");
state.endTime = toDate(endTime / 1000, "Y/M/D h:m");
console.log("beginTime,endTime", state.beginTime, state.endTime);
};

2
src/components/drawers/CourseOwner.vue
View File

@@ -985,7 +985,7 @@ export default {
// console.log(text.record.checked1);
return (
<div class="racona">
<span> {toDate(Number(text.record.time), "Y-M-D h:m:s")}</span>
<span> {toDate(Number(text.record.time), "Y-M-D h:m")}</span>
</div>
);
},

2
src/components/drawers/CourseView.vue
View File

@@ -984,7 +984,7 @@ export default {
// console.log(text.record.checked1);
return (
<div class="racona">
<span> {toDate(Number(text.record.time), "Y-M-D h:m:s")}</span>
<span> {toDate(Number(text.record.time), "Y-M-D h:m")}</span>
</div>
);
},

2
src/components/drawers/ManageRight.vue
View File

@@ -991,7 +991,7 @@ export default {
// console.log(text.record.checked1);
return (
<div class="racona">
<span> {toDate(Number(text.record.time), "Y-M-D h:m:s")}</span>
<span> {toDate(Number(text.record.time), "Y-M-D h:m")}</span>
</div>
);
},

2
src/components/drawers/ProjManagePower.vue
View File

@@ -985,7 +985,7 @@ export default {
// console.log(text.record.checked1);
return (
<div class="racona">
<span> {toDate(Number(text.record.time), "Y-M-D h:m:s")}</span>
<span> {toDate(Number(text.record.time), "Y-M-D h:m")}</span>
</div>
);
},

2
src/components/drawers/QueryRight.vue
View File

@@ -985,7 +985,7 @@ export default {
// console.log(text.record.checked1);
return (
<div class="racona">
<span> {toDate(Number(text.record.time), "Y-M-D h:m:s")}</span>
<span> {toDate(Number(text.record.time), "Y-M-D h:m")}</span>
</div>
);
},

60
src/components/drawers/TaskFaceIn.vue
View File

@@ -30,65 +30,7 @@
<div class="tip">点击或将文件拖拽到此处上传</div>
<div class="tipz">支持扩展名：.xls/.xlsx</div>
</div>
<div class="loadstate">
<div class="loadborder">
<div class="content">
<div class="img"></div>
<div class="timebox">
<div class="timetop">
<div class="tit">京东方商业模型.xls</div>
<div class="stateloading">正在上传</div>
</div>
<div class="prog">
<div class="inprogloading"></div>
</div>
</div>
<div class="curloading">
<div class="cur">55%</div>
<div class="cancel" style="margin-left: 20px">暂停</div>
<div class="cancel" style="margin-left: 15px">取消</div>
</div>
</div>
</div>
<div class="loadborder">
<div class="content">
<div class="img"></div>
<div class="timebox">
<div class="timetop">
<div class="tit">京东方商业模型.xls</div>
<div class="statedefeat">上传失败</div>
</div>
<div class="prog">
<div class="inprogdefeat"></div>
</div>
</div>
<div class="curloading">
<div class="cur">55%</div>
<div class="cancel" style="margin-left: 20px">暂停</div>
<div class="cancel" style="margin-left: 15px">取消</div>
</div>
<div class="defeat">下载失败数据</div>
</div>
</div>
<div class="loadborder">
<div class="content">
<div class="img"></div>
<div class="timebox">
<div class="timetop">
<div class="tit">京东方商业模型.xls</div>
<div class="statesucce">上传成功</div>
</div>
<div class="prog">
<div class="inprogsucce"></div>
</div>
</div>
<div class="curloading">
<div class="cur">100%</div>
<div class="cancel" style="margin-left: 20px">删除</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

2
src/components/drawers/pathStuAdd.vue
View File

@@ -984,7 +984,7 @@ import { toDate } from "../../api/method";
// console.log(text.record.checked1);
return (
<div class="racona">
<span> {toDate(Number(text.record.time), "Y-M-D h:m:s")}</span>
<span> {toDate(Number(text.record.time), "Y-M-D h:m")}</span>
</div>
);
},

4
src/components/drawers/project/ProjectFaceStu.vue
View File

@@ -918,8 +918,8 @@ export default {
console.log("1111333");
}
state.beginTime = toDate(beginTime / 1000, "Y/M/D h:m:s");
state.endTime = toDate(endTime / 1000, "Y/M/D h:m:s");
state.beginTime = toDate(beginTime / 1000, "Y/M/D h:m");
state.endTime = toDate(endTime / 1000, "Y/M/D h:m");
console.log("beginTime,endTime", state.beginTime, state.endTime);
};
return {

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

@@ -893,8 +893,8 @@ export default {
console.log("1111333", endTime);
}
state.beginTime = toDate(beginTime / 1000, "Y/M/D h:m:s");
state.endTime = toDate(endTime / 1000, "Y/M/D h:m:s");
state.beginTime = toDate(beginTime / 1000, "Y/M/D h:m");
state.endTime = toDate(endTime / 1000, "Y/M/D h:m");
console.log("beginTime,endTime", state.beginTime, state.endTime);
};

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

@@ -444,7 +444,7 @@ const tablecolumns = ref([
title: "所属小组",
dataIndex: "groupName",
key: "groupName",
width: "20%",
width: props.type===1?100:0,
align: "center",
className: "h",
ellipsis: true,
@@ -726,11 +726,15 @@ const exportHomeWorkShow = () => {
// };
//导出
const exportStu = () => {
console.log("props.datasource", props);
if (props.id!=undefined) {
window.open(
`${
process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?type=${3}&pid=${props.id}&thirdType=2`
);
}
};
//批量操作 结业、通过、拒绝等

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

@@ -3624,8 +3624,8 @@ export default defineComponent({
let startTime,
endTime = 0;
if (state.xjkkinputV3) {
startTime = dayjs(state.xjkkinputV3[0]).format('YYYY-MM-DD HH:mm:ss') //parseInt(state.xjkkinputV3[0].$d.getTime() / 1000);
endTime = dayjs(state.xjkkinputV3[1]).format('YYYY-MM-DD HH:mm:ss') //parseInt(state.xjkkinputV3[1].$d.getTime() / 1000);
startTime = dayjs(state.xjkkinputV3[0]).format('YYYY-MM-DD HH:mm') //parseInt(state.xjkkinputV3[0].$d.getTime() / 1000);
endTime = dayjs(state.xjkkinputV3[1]).format('YYYY-MM-DD HH:mm') //parseInt(state.xjkkinputV3[1].$d.getTime() / 1000);
}
let t = state.signCom ? "1," : "0,";
let p = state.comLeave ? "1" : "0";
@@ -4044,6 +4044,7 @@ export default defineComponent({
};
const openMessage = () => {
console.log(122222)
let startTime = "";
let endTime = "";
if (state.projectTime) {
@@ -4097,19 +4098,19 @@ export default defineComponent({
// commonExport(heads,list,"课程导出")
// })
// window.open(
// `${process.env.VUE_APP_BASE_API}/admin/offcourse/export?pageNo=${
// state.currentPage1
// }&pageSize=${state.pageSize1}&auditStatus=${
// state.auditStatus ? state.auditStatus : ""
// }&sysTypeId=${state.sysTypeId ? state.sysTypeId : ""}&projectName=${
// state.projectName ? state.projectName : ""
// }&name=${state.name ? state.name : ""}&createName=${
// state.createName ? state.createName : ""
// }&endTime=${endTime ? endTime : ""}&beginTime=${
// startTime ? startTime : ""
// }&type=3`
// );
window.open(
`${process.env.VUE_APP_BASE_API}/admin/offcourse/export?pageNo=${
state.currentPage1
}&pageSize=${state.pageSize1}&auditStatus=${
state.auditStatus ? state.auditStatus : ""
}&sysTypeId=${state.sysTypeId ? state.sysTypeId : ""}&projectName=${
state.projectName ? state.projectName : ""
}&name=${state.name ? state.name : ""}&createName=${
state.createName ? state.createName : ""
}&endTime=${endTime ? endTime : ""}&beginTime=${
startTime ? startTime : ""
}&type=3`
);
// {
// /* exportP({