|
|
@@ -23,7 +23,7 @@
|
|
|
</div>
|
|
|
<el-row :gutter="15">
|
|
|
<el-card style="width: 100%">
|
|
|
- <div style="font-size:20px">
|
|
|
+ <div style="font-size:25px">
|
|
|
公告
|
|
|
</div>
|
|
|
<el-table ref="multipleTable"
|
|
|
@@ -66,7 +66,7 @@
|
|
|
<el-row :gutter="15"
|
|
|
style="margin-top: 10px;">
|
|
|
<el-card>
|
|
|
- <div style="font-size:20px">
|
|
|
+ <div style="font-size:25px">
|
|
|
课程表
|
|
|
</div>
|
|
|
<template style="padding: 15px;">
|
|
|
@@ -142,12 +142,6 @@
|
|
|
min-width="160px"
|
|
|
show-overflow-tooltip
|
|
|
:formatter="formatClass"></el-table-column>
|
|
|
- <el-table-column prop="Status"
|
|
|
- align="center"
|
|
|
- min-width="40px"
|
|
|
- label="状态"
|
|
|
- show-overflow-tooltip
|
|
|
- :formatter="formatStatus"></el-table-column>
|
|
|
<el-table-column prop="CreatedTime"
|
|
|
align="center"
|
|
|
min-width="120px"
|
|
|
@@ -169,7 +163,7 @@
|
|
|
<el-row :gutter="15"
|
|
|
style="margin-top: 10px;">
|
|
|
<el-card>
|
|
|
- <div style="font-size:20px">
|
|
|
+ <div style="font-size:25px">
|
|
|
值班表
|
|
|
</div>
|
|
|
<template style="padding: 15px;">
|
|
|
@@ -178,37 +172,37 @@
|
|
|
:inline="true"
|
|
|
class="sbutton_padding"
|
|
|
style="margin-top: 7px;text-align:right;">
|
|
|
- <el-form-item label="学期">
|
|
|
- <el-select v-model="search.terms"
|
|
|
+ <el-form-item label="学年">
|
|
|
+ <el-select v-model="searchduty.Year"
|
|
|
style="width: 140px;">
|
|
|
- <el-option v-for="item in term"
|
|
|
- :key="item.ItemName"
|
|
|
- :label="item.ItemName"
|
|
|
- :value="item.ItemValue">
|
|
|
+ <el-option v-for="item in years"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="班级"
|
|
|
class="sbutton_margin">
|
|
|
<el-select ref="reftube"
|
|
|
- v-model="search.class"
|
|
|
+ v-model="searchduty.ClassId"
|
|
|
placeholder="请选择年级学年"
|
|
|
style="width:100%">
|
|
|
- <el-option v-for="item in activitiesclass"
|
|
|
- :key="item.value"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value">
|
|
|
+ <el-option v-for="item in classList"
|
|
|
+ :key="item.Id"
|
|
|
+ :label="item.Name"
|
|
|
+ :value="parseInt(item.Id)">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-button size="mini"
|
|
|
type="primary"
|
|
|
- @click="initDatasCourse()"
|
|
|
+ @click="initDatas_duty()"
|
|
|
style="margin-left:10px"
|
|
|
class="sbutton_margin">查 询</el-button>
|
|
|
<el-button size="mini"
|
|
|
type="primary"
|
|
|
- @click="clearSearch"
|
|
|
+ @click="clearSearchduty"
|
|
|
class="sbutton_margin">重 置</el-button>
|
|
|
</el-form>
|
|
|
</template>
|
|
|
@@ -228,18 +222,14 @@
|
|
|
<el-table-column prop="Term"
|
|
|
label="学期"
|
|
|
align="center"
|
|
|
- min-width="120px"
|
|
|
- show-overflow-tooltip></el-table-column>
|
|
|
+ min-width="160px"
|
|
|
+ show-overflow-tooltip
|
|
|
+ :formatter="formatTerm"></el-table-column>
|
|
|
<el-table-column prop="Title"
|
|
|
label="标题"
|
|
|
align="center"
|
|
|
min-width="120px"
|
|
|
show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column prop="Name"
|
|
|
- label="状态"
|
|
|
- align="center"
|
|
|
- min-width="120px"
|
|
|
- show-overflow-tooltip></el-table-column>
|
|
|
<el-table-column prop="CreatedTime"
|
|
|
label="创建日期"
|
|
|
align="center"
|
|
|
@@ -247,13 +237,13 @@
|
|
|
show-overflow-tooltip></el-table-column>
|
|
|
</el-table>
|
|
|
<el-pagination style="margin: 10px;"
|
|
|
- @size-change="handleSizeChange"
|
|
|
- @current-change="handleCurrentChange"
|
|
|
- :current-page="searchcourse.page.current"
|
|
|
+ @size-change="handleSizeChangeduty"
|
|
|
+ @current-change="handleCurrentChangeduty"
|
|
|
+ :current-page="searchduty.page.current"
|
|
|
:page-sizes="[10, 15, 20]"
|
|
|
- :page-size="searchcourse.page.size"
|
|
|
+ :page-size="searchduty.page.size"
|
|
|
layout="total, sizes, prev, pager, next, jumper"
|
|
|
- :total="searchcourse.page.total">
|
|
|
+ :total="searchduty.page.total">
|
|
|
</el-pagination>
|
|
|
</el-card>
|
|
|
</el-row>
|
|
|
@@ -321,6 +311,7 @@ export default {
|
|
|
searchduty: {
|
|
|
Term: '',
|
|
|
Year: '',
|
|
|
+ Title: '',
|
|
|
page: {
|
|
|
total: 0,
|
|
|
current: 1,
|
|
|
@@ -490,7 +481,7 @@ export default {
|
|
|
DutyApi.getPageList(this.searchduty)
|
|
|
.then(res => {
|
|
|
_this.activitiesduty = res.records
|
|
|
- // _this.search.page.total = res.total
|
|
|
+ _this.searchduty.page.total = res.total
|
|
|
})
|
|
|
},
|
|
|
// 初始化列表数据课程
|
|
|
@@ -572,14 +563,30 @@ export default {
|
|
|
this.searchcourse.page.current = val
|
|
|
this.initDatasCourse()
|
|
|
},
|
|
|
+ // 值班表
|
|
|
+ handleSizeChangeduty (val) {
|
|
|
+ this.searchduty.page.size = val
|
|
|
+ this.searchduty.page.current = 1
|
|
|
+ this.initDatas_duty()
|
|
|
+ },
|
|
|
+ handleCurrentChangeduty (val) {
|
|
|
+ this.searchduty.page.current = val
|
|
|
+ this.initDatas_duty()
|
|
|
+ },
|
|
|
searchCommand () {
|
|
|
// this.initDatasCourse()
|
|
|
},
|
|
|
clearSearch () {
|
|
|
this.searchcourse.Year = ''
|
|
|
this.searchcourse.ClassId = ''
|
|
|
- // this.initDatasCourse()
|
|
|
- }
|
|
|
+ this.initDatasCourse()
|
|
|
+ },
|
|
|
+ clearSearchduty () {
|
|
|
+ this.searchduty.Year = ''
|
|
|
+ this.searchduty.ClassId = ''
|
|
|
+ this.initDatas_duty()
|
|
|
+ },
|
|
|
+
|
|
|
|
|
|
}
|
|
|
}
|
zangkai