Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
confucius
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
罗超
confucius
Commits
942387a6
Commit
942387a6
authored
Jul 29, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
4d8b4c86
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
7 deletions
+23
-7
classConflict.vue
src/pages/course/classConflict.vue
+23
-7
No files found.
src/pages/course/classConflict.vue
View file @
942387a6
...
@@ -6,23 +6,25 @@
...
@@ -6,23 +6,25 @@
.OCourseTable
tr
td
{
.OCourseTable
tr
td
{
height
:
40px
;
height
:
40px
;
color
:
#000
;
color
:
#000
;
}
}
.OCourseTable
tr
th
{
.OCourseTable
tr
th
{
height
:
40px
;
height
:
40px
;
background-color
:
rgb
(
238
,
238
,
239
);
background-color
:
rgb
(
238
,
238
,
239
);
}
}
.resStyle
{
color
:
red
;
.resStyle
{
color
:
red
;
}
}
</
style
>
</
style
>
<
template
>
<
template
>
<div
class=
"page-body"
>
<div
class=
"page-body"
>
<div
class=
"page-content"
>
<div
class=
"page-content"
>
<q-table
:pagination=
"pMsg"
:loading=
"loading"
no-data-label=
"暂无相关数据"
selection=
"multiple"
flat
<q-table
:pagination=
"pMsg"
:loading=
"loading"
no-data-label=
"暂无相关数据"
selection=
"multiple"
flat
:selected
.
sync=
"selected"
class=
"sticky-column-table"
separator=
"none"
:selected
.
sync=
"selected"
class=
"sticky-column-table"
separator=
"none"
:data=
"dataList"
:columns=
"columns"
:data=
"dataList"
:columns=
"columns"
row-key=
"ClassPlanId"
hide-bottom
>
row-key=
"ClassPlanId"
hide-bottom
>
<template
v-slot:top=
"props"
>
<template
v-slot:top=
"props"
>
<div
class=
"col-2 q-table__title"
>
上课计划冲突调整
</div>
<div
class=
"col-2 q-table__title"
>
上课计划冲突调整
</div>
<q-space
/>
<q-space
/>
...
@@ -59,7 +61,8 @@
...
@@ -59,7 +61,8 @@
<td>
{{
subItem
.
ClassDate
}}
</td>
<td>
{{
subItem
.
ClassDate
}}
</td>
<td
:class=
"
{'resStyle':props.row.TeacherId==subItem.TeacherId}">
{{
subItem
.
TeacherName
}}
</td>
<td
:class=
"
{'resStyle':props.row.TeacherId==subItem.TeacherId}">
{{
subItem
.
TeacherName
}}
</td>
<td>
<td>
<span
:class=
"
{'resStyle':props.row.ClassRoomId==subItem.ClassRoomId}">
{{
subItem
.
RoomName
}}
</span>
<span
:class=
"
{'resStyle':props.row.ClassRoomId==subItem.ClassRoomId}">
{{
subItem
.
RoomName
}}
</span>
</td>
</td>
<td>
<td>
<template
v-if=
"subItem.PlanTimeList&&subItem.PlanTimeList.length>0"
>
<template
v-if=
"subItem.PlanTimeList&&subItem.PlanTimeList.length>0"
>
...
@@ -97,7 +100,6 @@
...
@@ -97,7 +100,6 @@
field
:
"ClassDate"
,
field
:
"ClassDate"
,
align
:
"left"
align
:
"left"
},
},
{
{
name
:
"TeacherName"
,
name
:
"TeacherName"
,
label
:
"老师"
,
label
:
"老师"
,
...
@@ -130,6 +132,20 @@
...
@@ -130,6 +132,20 @@
},
},
msg
:
{
msg
:
{
ClassId
:
53
ClassId
:
53
},
//提交参数
postMsg
:
{
ClassId
:
0
,
//班级编号
MoveType
:
1
,
//调动选项(1-固定日期,2-全局调整)
ChangeType
:
2
,
//调动类型(1-老师,2-教室,3-时段)
PlanList
:
[],
//固定日期调整
ClassRoomId
:
0
,
//全局调整--教室编号
TeacherId
:
0
,
//全局调整--教师编号
TimeList
:
[{
StartTime
:
""
,
//开始时间
EndTime
:
""
,
//结束时间
TimeHour
:
0
,
//消耗课时
}],
//全局调整--上课时段
}
}
};
};
},
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment