Skip to content

D
dd_school
Commit fbd14fd2 by duxingshan
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/taskPublishing/index.vue
parents f61af9a3 95b9ce0f
Showing with 44 additions and 34 deletions
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/taskPublishing/index.vue
...@@ -22,36 +22,38 @@ ...@@ -22,36 +22,38 @@
</el-row> </el-row>
<!-- 列表 --> <!-- 列表 -->
<div class="listBlock"> <div class="listBlock">
<div class="itemBlock" v-for="(task, index) in tasks" :key="index"> <div class="itemBlock" v-for="(task, index) in tasks" :key="index">
<!-- 任务详细信息 --> <!-- 任务详细信息 -->
<div class="task-info"> <div class="task-info">
<div class="task-name">{{ task.taskName }}</div> <div class="task-name">{{ task.taskName }}</div>
<!-- 右上角显示已选人数/全部人数 --> <!-- 右上角显示已选人数/全部人数 -->
<div class="task-count"> <div class="task-count">
<div class="count"> <div class="count">
{{ task.yxrs }}/{{ task.zrs }} {{ task.yxrs }}/{{ task.zrs }}
</div>
<div class="sun">总人数/已选人数</div>
</div> </div>
<div class="sun">已选人数/总人数</div>
</div> </div>
</div> <div class="task-level">
<div class="task-level"> <span>级部：{{ task.grade }}</span>
<span>级部：{{ task.grade }}</span> <span>创建人：{{ task.createBy }}</span>
<span>创建人：{{ task.createBy }}</span> </div>
</div> <div class="task-time">
<div class="task-time"> <div>创建时间：{{ task.createTime }}</div>
<div>创建时间：{{ task.createTime }}</div> </div>
</div> <!-- 按钮 -->
<!-- 按钮 --> <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,task.yxrs,task.zrs)">选课情况</el-button> <el-button type="warning" size="small" round @click="springView(task.id, task.grade)">春季选课情况</el-button>
<el-button type="warning" size="small" round @click="springView(task.id,task.grade)">春季选课情况</el-button> <el-button type="danger" size="small" round
<el-button type="danger" size="small" round @click="artisticView()">艺体选课情况</el-button> @click="artisticView(task.id, task.grade)">艺体选课情况</el-button>
<el-button class="purpleBtn" size="small" round @click="summerViewing()">夏季选课情况</el-button> <el-button class="purpleBtn" size="small" round
<el-button class="rowBtn" size="small" round @click="secondaryDivision()">夏季二次选课</el-button> @click="summerViewing(task.id, task.grade)">夏季选课情况</el-button>
</div> <el-button class="rowBtn" size="small" round @click="secondaryDivision()">夏季二次选课</el-button>
</div> </div>
</div>
</div> </div>
<!-- 新增/修改弹窗 --> <!-- 新增/修改弹窗 -->
<el-dialog :title="title" :visible.sync="open" width="900px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
...@@ -77,7 +79,7 @@ ...@@ -77,7 +79,7 @@
<el-row> <el-row>
<el-col :span="16"> <el-col :span="16">
<el-form-item label="级部" prop="grade"> <el-form-item label="级部" prop="grade">
<el-input v-model="form.grade" placeholder="请输入"></el-input> <el-input v-model="form.grade" placeholder="请输入" disabled></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -101,7 +103,6 @@ export default { ...@@ -101,7 +103,6 @@ export default {
name: 'taskPublishing', name: 'taskPublishing',
data() { data() {
return { return {
row: null,
tasks: [], tasks: [],
queryForm: { queryForm: {
taskName: "", taskName: "",
...@@ -189,20 +190,23 @@ export default { ...@@ -189,20 +190,23 @@ export default {
}); });
}, },
//艺体选课按钮 //艺体选课按钮
artisticView() { artisticView(id, grade) {
this.$router.push({ this.$router.push({
path: "/gradeWork/courseSelection/artisticView", path: "/gradeWork/courseSelection/artisticView",
query: { query: {
// id: this.task.id id,
grade
} }
}); });
}, },
//夏季选课按钮 //夏季选课按钮
summerViewing() { summerViewing(id, grade) {
console.log("grade", grade)
this.$router.push({ this.$router.push({
path: "/gradeWork/courseSelection/summerViewing", path: "/gradeWork/courseSelection/summerViewing",
query: { query: {
// id: this.task.id id,
grade
} }
}); });
}, },
...@@ -329,26 +333,31 @@ export default { ...@@ -329,26 +333,31 @@ export default {
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;
...@@ -356,6 +365,7 @@ export default { ...@@ -356,6 +365,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