diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 5f8fd451..ba53f46c 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -196,7 +196,7 @@
:data-source="tableData.list"
:pagination="stuPagination"
:loading="tableData.loading"
- :scroll="{ x: 'max-content' }"
+ :scroll="{ x: 1350 }"
row-key="id"
:row-selection="stuRowSelection"
>
@@ -467,7 +467,7 @@ const tablecolumns = ref([
title: "姓名",
dataIndex: "studentName",
key: "studentName",
- width: "160px",
+ width: "80px",
align: "left",
className: "h",
ellipsis: true,
@@ -496,7 +496,7 @@ const tablecolumns = ref([
title: "工号",
dataIndex: "studentUserNo",
key: "studentUserNo",
- width: "120px",
+ width: "60px",
align: "center",
className: "h",
ellipsis: true,
@@ -505,7 +505,7 @@ const tablecolumns = ref([
title: "部门",
dataIndex: "studentDepartName",
key: "studentDepartName",
- width: "200px",
+ width: "120px",
align: "center",
className: "h",
customCell :() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer'}}},
@@ -525,9 +525,8 @@ const tablecolumns = ref([
title: "加入方式",
dataIndex: "source",
key: "source",
- width: "120px",
+ width: "60px",
align: "center",
- ellipsis: true,
customRender: ({ record: { source } }) =>
// ({ 1: "快速添加", 2: "组织", 3: "受众", 4: "报名" }[source]),
({
@@ -545,7 +544,7 @@ const tablecolumns = ref([
title: "操作",
dataIndex: "operation",
key: "operation",
- width: '260px',
+ width: '120px',
fixed: "right",
align: "center",
slots: { customRender: "action" },
@@ -561,7 +560,10 @@ function allDepartShow(a, b) {
: a;
let depart = b == "" || b == null || b == undefined ? (b = "") : b;
let allname = org == "" && depart == "" ? "-" : org + depart;
- return allname;
+ const parts = allname.split('/');
+ const reversedParts = parts.reverse();
+ const reversedStr = reversedParts.join('/');
+ return reversedStr;
}
const tableParam = ref({
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 192e016f..ee204816 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -879,7 +879,7 @@
@@ -3672,7 +3672,21 @@ function onFocusEnd(){
offcourseId: state.offcourseId,
};
console.log("获取开obj", obj, state.selectTime);
- let res = await planList(obj);
+ let res = null
+ await planList(obj).then(rs=>{
+ res = rs
+ }).catch(err=>{
+ message.error(err.message=='timeout of 15000ms exceeded'?'系统超时,请稍后再试':err.message)
+ state.tableCoursePlanLoading = false
+ res ={
+ data:{data:{
+ "pageNo": "1",
+ "pageSize": "10",
+ "total": "0",
+ "pages": "0",
+ "rows": []
+ }}}
+ })
state.tableLoading = false;
console.log("开课res", res);
const { rows, total, pageNo } = res.data.data;
@@ -4049,7 +4063,7 @@ function onFocusEnd(){
message.error('请填写结业时间')
return
}
- if(state.checked4 && !state.assessmentId){
+ if(state.checked4 && (!state.assessmentId || state.assessmentId == '0')){
return message.error('请选择评估');
}
console.log(postData,'传输的数据')
@@ -4140,48 +4154,47 @@ function onFocusEnd(){
console.log("itm", itm);
//新加
state.stuColumns = [
- {
- title: "岗位",
- width: "160px",
- dataIndex: "studentJobName",
- key: "7",
- align: "center",
- customRender: (text) => {
- return (
-
-
- {text && text.record.studentJobName
- ? text.record.studentJobName
- : "-"}
-
-
- );
- },
- },
- {
- title: "Band",
- width: "120px",
- dataIndex: "studentBandDesc",
- key: "7",
- align: "center",
- ellipsis: true,
- customRender: (text) => {
- return (
-
-
- {text.record.studentBandDesc ? text.record.studentBandDesc : "-"}
-
-
- );
- },
- },
+ // {
+ // title: "岗位",
+ // width: "100px",
+ // dataIndex: "studentJobName",
+ // key: "7",
+ // align: "center",
+ // customRender: (text) => {
+ // return (
+ //
+ //
+ // {text && text.record.studentJobName
+ // ? text.record.studentJobName
+ // : "-"}
+ //
+ //
+ // );
+ // },
+ // },
+ // {
+ // title: "Band",
+ // width: "80px",
+ // dataIndex: "studentBandDesc",
+ // key: "7",
+ // align: "center",
+ // ellipsis: true,
+ // customRender: (text) => {
+ // return (
+ //
+ //
+ // {text.record.studentBandDesc ? text.record.studentBandDesc : "-"}
+ //
+ //
+ // );
+ // },
+ // },
{
title: "报名状态",
- width: "120px",
+ width: "60px",
dataIndex: "status",
key: "5",
align: "center",
- ellipsis: true,
customRender: ({ record }) => {
switch (String(record.status)) {
case "0":
@@ -4196,27 +4209,25 @@ function onFocusEnd(){
{
title: "签到状态",
- width: "120px",
+ width: "60px",
dataIndex: "signstatus",
key: "7",
align: "center",
- ellipsis: true,
customRender: ({ record }) =>
record.signStatus ? "已签到" : "未签到",
},
{
title: "评估状态",
- width: "120px",
+ width: "60px",
dataIndex: "evastatus",
key: "8",
align: "center",
- ellipsis: true,
customRender: ({ record }) =>
state.isAssessmentId&&state.isAssessmentId!='0' ? record.assessmentStatus?"已评估" : "未评估":'-',
},
{
title: "评分",
- width: "120px",
+ width: "60px",
dataIndex: "studentScore",
key: "8",
align: "center",
@@ -4284,11 +4295,10 @@ function onFocusEnd(){
// },
{
title: "作业状态",
- width: "120px",
+ width: "60px",
dataIndex: "workStatus",
key: "5",
align: "center",
- ellipsis: true,
customRender: ({ record }) => {
// switch (String(record.workStatus)) {
// case "null":
@@ -4310,19 +4320,17 @@ function onFocusEnd(){
},
{
title: "考试成绩",
- width: "120px",
+ width: "60px",
dataIndex: "examinationScore",
key: "8",
align: "center",
- ellipsis: true,
},
{
title: "结业状态",
- width: "120px",
+ width: "60px",
dataIndex: "completionStatus",
key: "8",
align: "center",
- ellipsis: true,
customRender: ({ record }) => {
return (
@@ -7613,7 +7621,7 @@ function onFocusEnd(){
.stmm_i5 {
// display: flex;
// justify-content: space-between;
- margin-right: 20px;
+ // margin-right: 6px;
}
.stmm_i6 {