Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dd_school
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangqi
dd_school
Commits
423a161a
Commit
423a161a
authored
Aug 01, 2023
by
zhaopanyu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of 49.232.152.146:xhxy/smart_school
parents
6297f277
cd318144
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
487 additions
and
13 deletions
+487
-13
ruoyi-ui/src/assets/styles/index.scss
+10
-0
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/artisticView/index.vue
+66
-5
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/courseSelectionsituation/index.vue
+80
-4
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/performance/index.vue
+331
-4
No files found.
ruoyi-ui/src/assets/styles/index.scss
View file @
423a161a
...
@@ -195,3 +195,13 @@ aside {
...
@@ -195,3 +195,13 @@ aside {
.multiselect--active
{
.multiselect--active
{
z-index
:
1000
!
important
;
z-index
:
1000
!
important
;
}
}
//新增样式
.flexBlock
{
display
:
flex
;
flex-direction
:
row
;
align-items
:
center
;
}
.selectWidth
{
width
:
100%
;
}
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/artisticView/index.vue
View file @
423a161a
<
template
>
<
template
>
<div>
<div
class=
"app-container"
>
<h2>
艺体选课情况
</h2>
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
label-width=
"80px"
>
</div>
<el-form-item
label=
"学生姓名"
prop=
"userName"
>
<el-input
v-model=
"queryParams.student"
placeholder=
"请输入学生姓名"
clearable
/>
</el-form-item>
<el-form-item
label=
"班级"
prop=
"userName"
>
<el-select
v-model=
"queryParams.class"
placeholder=
"请选择班级"
>
<el-option
v-for=
"(item,index) in classList"
:key=
"index"
:label=
"item"
:value=
"item"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"已选课目"
prop=
"userName"
>
<el-select
v-model=
"queryParams.selectedSubjects"
placeholder=
"请选择已选课目"
>
<el-option
v-for=
"(item,index) in selectedSubjectsList"
:key=
"index"
:label=
"item"
:value=
"item"
></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button
type=
"primary"
icon=
"el-icon-search"
size=
"mini"
@
click=
"getList"
>
搜索
</el-button>
<el-button
icon=
"el-icon-refresh"
size=
"mini"
@
click=
"resetQuery"
>
重置
</el-button>
<el-button
type=
"warning"
icon=
"el-icon-upload2"
size=
"mini"
@
click=
"exportRecord"
>
导出
</el-button>
</el-form-item>
</el-form>
<el-table
v-loading=
"loading"
:data=
"courseSelectionData"
stripe
>
<el-table-column
label=
"序号"
type=
"index"
width=
"55"
align=
"center"
/>
<el-table-column
label=
"班级"
align=
"center"
prop=
"orgname"
/>
<el-table-column
label=
"学生姓名"
align=
"center"
prop=
"deviceNum"
/>
<el-table-column
label=
"学号"
align=
"center"
prop=
"userName"
/>
<el-table-column
label=
"身份证号"
align=
"center"
prop=
"teacherCode"
/>
<el-table-column
label=
"课程类型"
align=
"center"
prop=
"orgname"
/>
<el-table-column
label=
"选课时间"
align=
"center"
prop=
"orgname"
/>
<el-table-column
label=
"选课状态"
align=
"center"
prop=
"orgname"
/>
<el-table-column
label=
"已选科目(排序)"
align=
"center"
prop=
"orgname"
/>
<el-table-column
label=
"已选课程"
align=
"center"
prop=
"orgname"
/>
</el-table>
<pagination
ref=
"pageBlock"
v-show=
"total > 0"
:total=
"total"
:page
.
sync=
"queryParams.pageNum"
:limit
.
sync=
"queryParams.pageSize"
@
pagination=
"getList"
/>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
export
default
{
export
default
{
data
(){
return
{
queryParams
:{
student
:
''
,
class
:
''
,
selectedSubjects
:
''
,
pageNum
:
1
,
pageSize
:
10
,
},
selectedSubjectsList
:[
1
,
2
,
3
],
// 已选课目
classList
:[
1
,
2
,
3
],
// 班级
courseSelectionData
:[],
loading
:
false
,
total
:
0
,
}
},
methods
:{
//获取数据信息
getList
(){
},
//重置
resetQuery
(){},
//导出
exportRecord
(){}
}
}
}
</
script
>
</
script
>
<
style
lang=
"scss"
scoped
></
style
>
<
style
lang=
"scss"
scoped
>
\ No newline at end of file
</
style
>
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/courseSelectionsituation/index.vue
View file @
423a161a
<
template
>
<
template
>
<div>
<div
class=
"app-container"
>
<h2>
选课情况
</h2>
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
label-width=
"80px"
>
<el-form-item
label=
"学生姓名"
prop=
"userName"
>
<el-input
v-model=
"queryParams.student"
placeholder=
"请输入学生姓名"
clearable
/>
</el-form-item>
<el-form-item
label=
"课程类型"
prop=
"userName"
>
<el-select
v-model=
"queryParams.courseType"
placeholder=
"请选择课程类型"
>
<el-option
v-for=
"(item,index) in courseTypeList"
:key=
"index"
:label=
"item"
:value=
"item"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"选课状态"
prop=
"userName"
>
<el-select
v-model=
"queryParams.selectionStatus"
placeholder=
"请选择选课状态"
>
<el-option
v-for=
"(item,index) in selectionStatusList"
:key=
"index"
:label=
"item"
:value=
"item"
></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button
type=
"primary"
icon=
"el-icon-search"
size=
"mini"
@
click=
"getList"
>
搜索
</el-button>
<el-button
icon=
"el-icon-refresh"
size=
"mini"
@
click=
"resetQuery"
>
重置
</el-button>
<el-button
type=
"warning"
icon=
"el-icon-upload2"
size=
"mini"
@
click=
"exportRecord"
>
导出
</el-button>
</el-form-item>
</el-form>
<div
class=
"flexBlock person"
>
<div>
总人数:45 人
</div>
<div>
已选课:
<span>
40
</span>
人
</div>
</div>
<el-table
v-loading=
"loading"
:data=
"courseSelectionData"
stripe
>
<el-table-column
label=
"序号"
type=
"index"
width=
"55"
align=
"center"
/>
<el-table-column
label=
"学生姓名"
align=
"center"
prop=
"deviceNum"
/>
<el-table-column
label=
"身份证号"
align=
"center"
prop=
"teacherCode"
/>
<el-table-column
label=
"学号"
align=
"center"
prop=
"userName"
/>
<el-table-column
label=
"课程类型"
align=
"center"
prop=
"orgname"
/>
<el-table-column
label=
"选课时间"
align=
"center"
prop=
"orgname"
/>
<el-table-column
label=
"选课状态"
align=
"center"
prop=
"orgname"
/>
<el-table-column
label=
"已选专业/课程"
align=
"center"
prop=
"orgname"
/>
</el-table>
<pagination
ref=
"pageBlock"
v-show=
"total > 0"
:total=
"total"
:page
.
sync=
"queryParams.pageNum"
:limit
.
sync=
"queryParams.pageSize"
@
pagination=
"getList"
/>
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
export
default
{
export
default
{
data
(){
return
{
queryParams
:{
student
:
''
,
courseType
:
''
,
selectionStatus
:
''
,
pageNum
:
1
,
pageSize
:
10
,
},
courseTypeList
:[
1
,
2
,
3
],
//课程类型
selectionStatusList
:[
1
,
2
,
3
],
//选课状态
courseSelectionData
:[],
loading
:
false
,
total
:
0
,
}
},
methods
:{
//获取数据信息
getList
(){
},
//重置
resetQuery
(){},
//导出
exportRecord
(){}
}
}
}
</
script
>
</
script
>
<
style
lang=
"scss"
scoped
></
style
>
<
style
lang=
"scss"
scoped
>
\ No newline at end of file
.person
{
line-height
:
35px
;
color
:
#333333
;
font-size
:
14px
;
padding-bottom
:
10px
;
}
.person
div
:last-child
{
padding-left
:
20px
;
}
.person
div
:last-child
span
{
color
:
#1890ff
;
font-weight
:
500
;
}
</
style
>
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/performance/index.vue
View file @
423a161a
<
template
>
<
template
>
<div>
<div
class=
"app-container"
>
<h2>
成绩管理
</h2>
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
label-width=
"80px"
>
<el-form-item
label=
"学生姓名"
prop=
"userName"
>
<el-input
v-model=
"queryParams.student"
placeholder=
"请输入学生姓名"
clearable
/>
</el-form-item>
<el-form-item
label=
"考试类型"
prop=
"userName"
>
<el-select
v-model=
"queryParams.examType"
placeholder=
"请选择考试类型"
>
<el-option
v-for=
"(item,index) in examTypeList"
:key=
"index"
:label=
"item"
:value=
"item"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"班级"
prop=
"userName"
>
<el-select
v-model=
"queryParams.class"
placeholder=
"请选择班级"
>
<el-option
v-for=
"(item,index) in classList"
:key=
"index"
:label=
"item"
:value=
"item"
></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button
type=
"primary"
icon=
"el-icon-search"
size=
"mini"
@
click=
"getList"
>
搜索
</el-button>
<el-button
icon=
"el-icon-refresh"
size=
"mini"
@
click=
"resetQuery"
>
重置
</el-button>
<el-button
type=
"success"
icon=
"el-icon-download"
size=
"mini"
@
click=
"upload.open = true"
>
导入
</el-button>
</el-form-item>
</el-form>
<el-row
:gutter=
"10"
class=
"mb8"
>
<el-col
:span=
"1.5"
>
<el-button
type=
"primary"
plain
icon=
"el-icon-plus"
size=
"mini"
@
click=
"handleOption(0)"
>
新增
</el-button>
</el-col>
<el-col
:span=
"1.5"
>
<el-button
type=
"danger"
plain
icon=
"el-icon-delete"
size=
"mini"
:disabled=
"!isMultiple"
@
click=
"handleDelete"
>
批量删除
</el-button>
</el-col>
</el-row>
<el-table
v-loading=
"loading"
:data=
"achievementData"
stripe
>
<el-table-column
fixed=
"left"
label=
"序号"
type=
"index"
width=
"55"
align=
"center"
/>
<el-table-column
fixed=
"left"
label=
"学生姓名"
align=
"center"
prop=
"deviceNum"
/>
<el-table-column
fixed=
"left"
label=
"学号"
align=
"center"
prop=
"userName"
/>
<el-table-column
fixed=
"left"
label=
"身份证号"
align=
"center"
prop=
"teacherCode"
/>
<el-table-column
fixed=
"left"
label=
"班级"
align=
"center"
prop=
"orgname"
/>
<el-table-column
fixed=
"left"
label=
"考试类型"
align=
"center"
prop=
"orgname"
/>
<el-table-column
label=
"总成绩"
align=
"center"
prop=
"orgname"
/>
<el-table-column
label=
"学校排名"
align=
"center"
prop=
"orgname"
/>
<el-table-column
label=
"语文"
align=
"center"
prop=
"orgname"
/>
<el-table-column
label=
"学校排名"
align=
"center"
prop=
"orgname"
/>
<el-table-column
fixed=
"right"
label=
"操作"
align=
"center"
prop=
"orgname"
width=
"150"
>
<template
slot-scope=
"
{ row }">
<el-button
type=
"text"
size=
"small"
>
删除
</el-button>
<el-button
type=
"text"
size=
"small"
@
click=
"handleOption(1,row)"
>
编辑
</el-button>
</
template
>
</el-table-column>
</el-table>
<pagination
ref=
"pageBlock"
v-show=
"total > 0"
:total=
"total"
:page
.
sync=
"queryParams.pageNum"
:limit
.
sync=
"queryParams.pageSize"
@
pagination=
"getList"
/>
<!-- 导入弹出框 -->
<el-dialog
:title=
"upload.title"
:visible
.
sync=
"upload.open"
width=
"400px"
append-to-body
>
<el-upload
ref=
"upload"
:limit=
"1"
accept=
".xlsx, .xls"
:headers=
"upload.headers"
:action=
"upload.url + '?updateSupport=' + upload.updateSupport"
:disabled=
"upload.isUploading"
:on-progress=
"handleFileUploadProgress"
:on-success=
"handleFileSuccess"
:auto-upload=
"false"
drag
>
<i
class=
"el-icon-upload"
></i>
<div
class=
"el-upload__text"
>
将文件拖到此处,或
<em>
点击上传
</em></div>
<div
class=
"el-upload__tip text-center"
slot=
"tip"
>
<el-link
type=
"primary"
:underline=
"false"
style=
"font-size: 12px; vertical-align: baseline"
@
click=
"downloadTemplate"
>
下载模板
</el-link>
</div>
</el-upload>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
type=
"primary"
@
click=
"submitFileForm"
>
确 定
</el-button>
<el-button
@
click=
"upload.open = false"
>
取 消
</el-button>
</div>
</el-dialog>
<!-- 导入弹出框 -->
<!-- 新增编辑弹出框 -->
<el-dialog
title=
"详细信息"
:visible
.
sync=
"dialogVisible"
width=
"40%"
>
<el-form
:model=
"achievementForm"
label-width=
"70px"
label-position=
"left"
>
<el-row
:gutter=
"30"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"学号"
>
<el-select
v-model=
"achievementForm.id"
filterable
placeholder=
"请选择学号"
class=
"selectWidth"
>
<el-option
v-for=
"(item,index) in studentID"
:key=
"index"
:label=
"item"
:value=
"item"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"学生姓名"
>
<el-input
v-model=
"achievementForm.id"
placeholder=
"请输入学生姓名"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row
:gutter=
"30"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"班级"
>
<el-input
v-model=
"achievementForm.id"
placeholder=
"请输入班级"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"身份证号"
>
<el-input
v-model=
"achievementForm.id"
placeholder=
"请输入身份证号"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row
:gutter=
"30"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"考试类型"
>
<el-select
v-model=
"achievementForm.id"
filterable
placeholder=
"请选择考试类型"
class=
"selectWidth"
>
<el-option
v-for=
"(item,index) in examTypeList"
:key=
"index"
:label=
"item"
:value=
"item"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row
:gutter=
"30"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"总成绩"
>
<el-input
v-model=
"achievementForm.id"
placeholder=
"请输入总成绩"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"学校排名"
>
<el-input
v-model=
"achievementForm.id"
placeholder=
"请输入学校排名"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row
:gutter=
"30"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"语文"
>
<el-input
v-model=
"achievementForm.id"
placeholder=
"请输入语文"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"学校排名"
>
<el-input
v-model=
"achievementForm.id"
placeholder=
"请输入学校排名"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row
:gutter=
"30"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"数学"
>
<el-input
v-model=
"achievementForm.id"
placeholder=
"请输入数学"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"学校排名"
>
<el-input
v-model=
"achievementForm.id"
placeholder=
"请输入学校排名"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row
:gutter=
"30"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"英语"
>
<el-input
v-model=
"achievementForm.id"
placeholder=
"请输入英语"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"学校排名"
>
<el-input
v-model=
"achievementForm.id"
placeholder=
"请输入学校排名"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row
:gutter=
"30"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"历史"
>
<el-input
v-model=
"achievementForm.id"
placeholder=
"请输入历史"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"学校排名"
>
<el-input
v-model=
"achievementForm.id"
placeholder=
"请输入学校排名"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row
:gutter=
"30"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"地理"
>
<el-input
v-model=
"achievementForm.id"
placeholder=
"请输入地理"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"学校排名"
>
<el-input
v-model=
"achievementForm.id"
placeholder=
"请输入学校排名"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row
:gutter=
"30"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"政治"
>
<el-input
v-model=
"achievementForm.id"
placeholder=
"请输入政治"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"学校排名"
>
<el-input
v-model=
"achievementForm.id"
placeholder=
"请输入学校排名"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row
:gutter=
"30"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"生物"
>
<el-input
v-model=
"achievementForm.id"
placeholder=
"请输入生物"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"学校排名"
>
<el-input
v-model=
"achievementForm.id"
placeholder=
"请输入学校排名"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row
:gutter=
"30"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"物理"
>
<el-input
v-model=
"achievementForm.id"
placeholder=
"请输入物理"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"学校排名"
>
<el-input
v-model=
"achievementForm.id"
placeholder=
"请输入学校排名"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row
:gutter=
"30"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"化学"
>
<el-input
v-model=
"achievementForm.id"
placeholder=
"请输入化学"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"学校排名"
>
<el-input
v-model=
"achievementForm.id"
placeholder=
"请输入学校排名"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<span
slot=
"footer"
class=
"dialog-footer"
>
<el-button
@
click=
"dialogVisible = false"
>
取 消
</el-button>
<el-button
type=
"primary"
@
click=
"dialogVisible = false"
>
确 定
</el-button>
</span>
</el-dialog>
<!-- 新增编辑弹出框 -->
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
{
getToken
}
from
"@/utils/auth"
;
export
default
{
export
default
{
data
(){
return
{
queryParams
:{
student
:
''
,
examType
:
''
,
class
:
''
,
pageNum
:
1
,
pageSize
:
10
,
},
examTypeList
:[
1
,
2
,
3
,
4
],
// 考试类型
classList
:[
1
,
2
,
3
,
4
],
// 班级
loading
:
false
,
total
:
0
,
isMultiple
:
false
,
// table是否有选择
achievementData
:[],
// table数据
dialogVisible
:
false
,
// 新增编辑弹出框
upload
:
{
// 是否显示弹出层(用户导入)
open
:
false
,
// 弹出层标题(用户导入)
title
:
""
,
// 是否禁用上传
isUploading
:
false
,
// 是否更新已经存在的用户数据
updateSupport
:
0
,
// 设置上传的请求头部
headers
:
{
Authorization
:
"Bearer "
+
getToken
()
},
// 上传的地址
url
:
process
.
env
.
VUE_APP_BASE_API
+
"/"
,
},
achievementForm
:{
// 新增、编辑成绩数据
id
:
''
,
},
studentID
:[
1
,
2
,
3
,
4
,
5
],
// 学号list
}
},
methods
:{
//获取数据信息
getList
(){
},
//重置
resetQuery
(){},
//新增成绩
handleOption
(
type
,
item
){
if
(
type
==
0
){
//新增
}
else
{
//编辑
}
this
.
dialogVisible
=
true
},
//批量删除
handleDelete
(){},
//下载模板
downloadTemplate
()
{
this
.
download
(
""
,
{},
`成绩管理数据导入_template_
${
new
Date
().
getTime
()}
.xlsx`
);
},
// 文件上传中处理
handleFileUploadProgress
(
event
,
file
,
fileList
)
{
this
.
upload
.
isUploading
=
true
;
},
// 文件上传成功处理
handleFileSuccess
(
response
,
file
,
fileList
)
{
this
.
upload
.
open
=
false
;
this
.
upload
.
isUploading
=
false
;
this
.
$refs
.
upload
.
clearFiles
();
this
.
$alert
(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>"
+
response
.
msg
+
"</div>"
,
"导入结果"
,
{
dangerouslyUseHTMLString
:
true
}
);
this
.
getList
();
},
// 提交上传文件
submitFileForm
()
{
this
.
$refs
.
upload
.
submit
();
},
}
}
}
</
script
>
</
script
>
<
style
lang=
"scss"
scoped
></
style
>
<
style
lang=
"scss"
scoped
></
style
>
\ No newline at end of file
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