Commit 07188d01 by zhaopanyu

zpy 8.4

parent 47f8e8f8
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<!-- 按钮 --> <!-- 按钮 -->
<div class="task-buttons"> <div class="task-buttons">
<el-button size="mini" icon="el-icon-edit" round @click="handleUpdate(task)">修改</el-button> <el-button size="mini" icon="el-icon-edit" round @click="handleUpdate(task)">修改</el-button>
<el-button type="primary" size="small" round @click="performance(task.id,task.grade)">成绩管理</el-button> <el-button type="primary" size="small" round @click="performance(task.id, task.grade)">成绩管理</el-button>
<el-button type="success" size="small" round @click="courseSelectionsituation(task.id)">选课情况</el-button> <el-button type="success" size="small" round @click="courseSelectionsituation(task.id)">选课情况</el-button>
<el-button type="warning" size="small" round @click="springView(task.id)">春季选课情况</el-button> <el-button type="warning" size="small" round @click="springView(task.id)">春季选课情况</el-button>
<el-button type="danger" size="small" round @click="artisticView()">艺体选课情况</el-button> <el-button type="danger" size="small" round @click="artisticView()">艺体选课情况</el-button>
...@@ -101,7 +101,6 @@ export default { ...@@ -101,7 +101,6 @@ export default {
name: 'taskPublishing', name: 'taskPublishing',
data() { data() {
return { return {
row: null,
tasks: [], tasks: [],
queryForm: { queryForm: {
taskName: "", taskName: "",
...@@ -122,8 +121,6 @@ export default { ...@@ -122,8 +121,6 @@ export default {
// 记录条数 // 记录条数
total: 0, total: 0,
title: "", title: "",
// 记录列表
AppointmentList: [],
// 详情 // 详情
look: false, look: false,
// 日期范围 // 日期范围
...@@ -159,14 +156,11 @@ export default { ...@@ -159,14 +156,11 @@ export default {
.catch(err => { .catch(err => {
this.loading = false; this.loading = false;
}); });
this.title = "新增任务发布"; this.title = "新增任务发布";
}, },
// 成绩管理按钮 grade级部 ID任务ID // 成绩管理按钮 grade级部 ID任务ID
performance(id,grade) { performance(id, grade) {
console.log("grade",grade) console.log("grade", grade)
this.$router.push({ this.$router.push({
path: "/gradeWork/courseSelection/performance", path: "/gradeWork/courseSelection/performance",
query: { query: {
...@@ -313,46 +307,55 @@ export default { ...@@ -313,46 +307,55 @@ export default {
align-items: flex-start; align-items: flex-start;
flex-wrap: wrap; flex-wrap: wrap;
} }
.itemBlock { .itemBlock {
width: 49%; width: 49%;
padding: 15px 20px 5px 20px; padding: 15px 20px 5px 20px;
margin:0 1.5% 1.5% 0; margin: 0 1.5% 1.5% 0;
border-radius: 20px; border-radius: 20px;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
} }
.listBlock .itemBlock:nth-child(2n){
margin-right: 0px!important; .listBlock .itemBlock:nth-child(2n) {
margin-right: 0px !important;
} }
.purpleBtn { .purpleBtn {
color: #FFFFFF; color: #FFFFFF;
background-color: #B66D93; background-color: #B66D93;
border: 1px solid #B66D93; border: 1px solid #B66D93;
} }
.rowBtn { .rowBtn {
color: #FFFFFF; color: #FFFFFF;
background-color: #D3C1B1; background-color: #D3C1B1;
border: 1px solid #D3C1B1; border: 1px solid #D3C1B1;
} }
.task-name { .task-name {
color: #777; color: #777;
font-size: 38px; font-size: 38px;
font-weight: 500; font-weight: 500;
text-align: left; text-align: left;
} }
.task-level { .task-level {
margin-bottom: 6px; margin-bottom: 6px;
color: rgba(108, 108, 108, 1); color: rgba(108, 108, 108, 1);
font-size: 13px; font-size: 13px;
text-align: left; text-align: left;
} }
.task-level>span { .task-level>span {
margin-right: 25px; margin-right: 25px;
} }
.task-time { .task-time {
color: rgba(108, 108, 108, 1); color: rgba(108, 108, 108, 1);
font-size: 13px; font-size: 13px;
text-align: left; text-align: left;
} }
.task-info { .task-info {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
...@@ -360,6 +363,7 @@ export default { ...@@ -360,6 +363,7 @@ export default {
justify-content: space-between; justify-content: space-between;
padding-bottom: 15px; padding-bottom: 15px;
} }
.task-count { .task-count {
text-align: center; text-align: center;
padding-right: 10px; padding-right: 10px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment