diff --git a/src/components/TwoDimensionalCodeNew.vue b/src/components/TwoDimensionalCodeNew.vue new file mode 100644 index 00000000..600d1028 --- /dev/null +++ b/src/components/TwoDimensionalCodeNew.vue @@ -0,0 +1,342 @@ + + + diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index 1f3fb378..5f8fd451 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: 1500 }" + :scroll="{ x: 'max-content' }" row-key="id" :row-selection="stuRowSelection" > @@ -467,7 +467,7 @@ const tablecolumns = ref([ title: "姓名", dataIndex: "studentName", key: "studentName", - width: "10%", + width: "160px", align: "left", className: "h", ellipsis: true, @@ -496,7 +496,7 @@ const tablecolumns = ref([ title: "工号", dataIndex: "studentUserNo", key: "studentUserNo", - width: "20%", + width: "120px", align: "center", className: "h", ellipsis: true, @@ -505,12 +505,12 @@ const tablecolumns = ref([ title: "部门", dataIndex: "studentDepartName", key: "studentDepartName", - width: "15%", + width: "200px", align: "center", className: "h", - ellipsis: true, + customCell :() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer'}}}, customRender: ({ record: { studentOrgName, studentDepartName } }) => - allDepartShow(studentOrgName), + {allDepartShow(studentOrgName)} }, { title: "所属小组", @@ -525,8 +525,9 @@ const tablecolumns = ref([ title: "加入方式", dataIndex: "source", key: "source", - width: "10%", + width: "120px", align: "center", + ellipsis: true, customRender: ({ record: { source } }) => // ({ 1: "快速添加", 2: "组织", 3: "受众", 4: "报名" }[source]), ({ @@ -544,7 +545,8 @@ const tablecolumns = ref([ title: "操作", dataIndex: "operation", key: "operation", - width: 260, + width: '260px', + fixed: "right", align: "center", slots: { customRender: "action" }, }, diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 1d878845..a56458f8 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -755,7 +755,7 @@ v-model:value="selectTime" type="date" style="width: 300px; margin-right: 14px" - :placeholder="[' 课程开始时间', ' 课程结束时间']" + :placeholder="[' 面授开始时间', ' 面授结束时间']" :show-time="{ defaultValue: [ moment('00:00', 'HH:mm'), @@ -819,7 +819,7 @@