Skip to content

D
dd_school
Commit f40d5173 by zhaopanyu
Options

zpy 8.2

parent 0f81bcc4
Showing with 135 additions and 83 deletions
ruoyi-ui/src/api/smartSchool/gradeWork/courseSelection/taskPublishing.js 0 → 100644
import request from "@/utils/request";
// 查看选课任务发布列表
export function dataCurricula(query) {
return request({
url: "/curricula/variable/list",
method: "get",
params: query,
});
}
// 新增选课任务
export function addCurricula(data) {
return request({
url: "/curricula/variable/add",
method: "post",
data: data,
});
}
// 修改选课任务
export function updateCurricula(data) {
return request({
url: "/curricula/variable/edit",
method: "post",
data: data,
});
}
// 查询选课任务详细信息
export function getCurricula(id) {
return request({
url: "/curricula/variable/" + id,
method: "get",
});
}
//获取当前最新级部
export function getDept(data) {
return request({
url: "/curricula/variable/getNewGrade",
method: "get",
data: data,
});
}
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/taskPublishing/index.vue
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="80px"> <el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="80px">
<el-form-item prop="rwmc" label="任务名称"> <el-form-item prop="taskName" label="任务名称">
<el-input v-model="queryForm.activityName" placeholder="任务名称"></el-input> <el-input v-model="queryForm.taskName" placeholder="任务名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="jb" label="级部"> <el-form-item prop="grade" label="级部">
<el-input v-model="queryForm.activityName" placeholder="级部"></el-input> <el-input v-model="queryForm.grade" placeholder="级部"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button> <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd()">新增</el-button>
</el-col> </el-col>
</el-row> </el-row>
...@@ -29,11 +29,11 @@ ...@@ -29,11 +29,11 @@
<div class="task-info"> <div class="task-info">
<div class="left"> <div class="left">
<div class="task-name"> <div class="task-name">
<div>{{ task.name }}</div> <div>{{ task.taskName }}</div>
</div> </div>
<div class="task-level"> <div class="task-level">
<span>级部：{{ task.level }}</span> <span>级部：{{ task.grade }}</span>
<span>创建人：{{ task.creator }}</span> <span>创建人：{{ task.createBy }}</span>
</div> </div>
<div class="task-time"> <div class="task-time">
<div>创建时间：{{ task.createTime }}</div> <div>创建时间：{{ task.createTime }}</div>
...@@ -44,13 +44,13 @@ ...@@ -44,13 +44,13 @@
<!-- 右上角显示已选人数/全部人数 --> <!-- 右上角显示已选人数/全部人数 -->
<div class="task-count"> <div class="task-count">
<div class="count"> <div class="count">
{{ task.selectedCount }}/{{ task.totalCount }} {{ task.yxrs }}/{{ task.zrs }}
</div> </div>
<div class="sun">已选人数/总人数</div> <div class="sun">已选人数/总人数</div>
</div> </div>
<!-- 右下角按钮 --> <!-- 右下角按钮 -->
<div class="task-buttons"> <div class="task-buttons">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate()">修改 <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(task)">修改
</el-button> </el-button>
<el-button type="text" size="small" icon="el-icon-edit" @click="performance()"> 成绩管理 <el-button type="text" size="small" icon="el-icon-edit" @click="performance()"> 成绩管理
</el-button> </el-button>
...@@ -71,25 +71,26 @@ ...@@ -71,25 +71,26 @@
<el-form ref="form" :model="form" :rules="rules" label-width="110px"> <el-form ref="form" :model="form" :rules="rules" label-width="110px">
<div> <div>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="16">
<el-form-item label="任务发布" prop="rwfb"> <el-form-item label="任务名称" prop="taskName">
<el-input v-model="form.rwfb" placeholder="请输入"></el-input> <el-input v-model="form.taskName" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="16">
<el-form-item label="发布时间" prop="rwfb"> <el-form-item label="发布时间">
<el-date-picker v-model="form.sj" type="daterange" range-separator="至" <el-date-picker v-model="dateRange" type="daterange" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" :style="{ width: '100%' }"> start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss" :style="{ width: '100%' }">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="16">
<el-form-item label="级部" prop="jb"> <el-form-item label="级部" prop="grade">
<el-input v-model="form.jb" placeholder="请输入"></el-input> <el-input v-model="form.grade" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -107,38 +108,25 @@ ...@@ -107,38 +108,25 @@
</template> </template>
<script> <script>
import { dataCurricula, addCurricula, updateCurricula, getCurricula, getDept }
from "@/api/smartSchool/gradeWork/courseSelection/taskPublishing.js";
export default { export default {
name: 'courseSelection', name: 'taskPublishing',
data() { data() {
return { return {
tasks: [{ row: null,
name: '高一选课', tasks: [],
level: '高一',
creator: '张三',
createTime: '2020-09-01',
selectedCount: 100,
totalCount: 200,
},
{
name: '高一选课',
level: '高一',
creator: '张三',
createTime: '2021-09-01',
selectedCount: 100,
totalCount: 200,
},
],
queryForm: { queryForm: {
startTime: "", taskName: "",
endTime: "", grade: "",
pageNum: 1,
pageSize: 10,
}, },
form: { form: {
taskName: "",
grade: "",
}, },
//新增弹窗 //新增弹窗
...@@ -153,15 +141,23 @@ export default { ...@@ -153,15 +141,23 @@ export default {
AppointmentList: [], AppointmentList: [],
// 详情 // 详情
look: false, look: false,
// 日期范围
dateRange: [],
}; };
}, },
created() {
this.getList();
},
methods: { methods: {
/** 获取列表数据 */ /** 获取列表数据 */
getList() { getList() {
listAuditor(params).then(response => { const params = {
this.loading = false; taskName: this.queryForm.taskName,
this.infoList = response.rows; grade: this.queryForm.grade,
};
dataCurricula(params).then(response => {
console.log(111, response.rows); console.log(111, response.rows);
this.tasks = response.rows;
this.total = response.total; this.total = response.total;
}).catch(err => { }).catch(err => {
this.loading = false; this.loading = false;
...@@ -171,12 +167,22 @@ export default { ...@@ -171,12 +167,22 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
getDept().then(response => {
this.form.grade = response.data.grade;
console.log(this.form.grade);
})
.catch(err => {
this.loading = false;
});
this.title = "新增任务发布"; this.title = "新增任务发布";
}, },
// 成绩管理按钮 // 成绩管理按钮
performance() { performance() {
this.$router.push({ this.$router.push({
path: "/performance", path: "/gradeWork/courseSelection/performance",
query: { query: {
// id: this.task.id // id: this.task.id
} }
...@@ -185,7 +191,7 @@ export default { ...@@ -185,7 +191,7 @@ export default {
// 选课情况按钮 // 选课情况按钮
courseSelectionsituation() { courseSelectionsituation() {
this.$router.push({ this.$router.push({
path: "/courseSelectionsituation", path: "/gradeWork/courseSelection/courseSelectionsituation",
query: { query: {
// id: this.task.id // id: this.task.id
} }
...@@ -194,7 +200,7 @@ export default { ...@@ -194,7 +200,7 @@ export default {
// 春季选课按钮 // 春季选课按钮
springView() { springView() {
this.$router.push({ this.$router.push({
path: "/springView", path: "/gradeWork/courseSelection/springView",
query: { query: {
// id: this.task.id // id: this.task.id
} }
...@@ -203,7 +209,7 @@ export default { ...@@ -203,7 +209,7 @@ export default {
//艺体选课按钮 //艺体选课按钮
artisticView() { artisticView() {
this.$router.push({ this.$router.push({
path: "/artisticView", path: "/gradeWork/courseSelection/artisticView",
query: { query: {
// id: this.task.id // id: this.task.id
} }
...@@ -212,7 +218,7 @@ export default { ...@@ -212,7 +218,7 @@ export default {
//夏季选课按钮 //夏季选课按钮
summerViewing() { summerViewing() {
this.$router.push({ this.$router.push({
path: "/summerViewing", path: "/gradeWork/courseSelection/summerViewing",
query: { query: {
// id: this.task.id // id: this.task.id
} }
...@@ -221,7 +227,7 @@ export default { ...@@ -221,7 +227,7 @@ export default {
//夏季二次选课按钮 //夏季二次选课按钮
secondaryDivision() { secondaryDivision() {
this.$router.push({ this.$router.push({
path: "/secondaryDivision", path: "/gradeWork/courseSelection/secondaryDivision",
query: { query: {
// id: this.task.id // id: this.task.id
} }
...@@ -250,33 +256,33 @@ export default { ...@@ -250,33 +256,33 @@ export default {
// 提交表单 // 提交表单
submitForm() { submitForm() {
this.throttle(() => { this.throttle(() => {
this.$refs["postForm"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
this.$modal.loading('正在上传数据，请稍等...'); if (this.form.id != null) {
if (this.postForm.id != null) {
// 编辑 // 编辑
this.postForm.isGov = this.postForm.isGov; // 设置 isGov 字段的值 updateCurricula(this.form).then(response => {
editBudget(this.postForm).then(response => { console.log("res1111");
this.$modal.closeLoading(); this.$message.success("修改成功");
this.$modal.msgSuccess("修改成功"); console.log("res", response);
this.open = false; this.open = false;
this.getList(); this.getList();
}).catch(err => { }).catch(err => {
this.$modal.closeLoading();
}); });
} else { } else {
// 新增 // 新增
const params = {
this.postForm.isGov = this.postForm.isGov; // 设置 isGov 字段的值 taskName: this.form.taskName,
addBudget(this.postForm).then(response => { grade: this.form.grade,
console.log('this.postForm', this.postForm); startTime: this.dateRange[0],
this.$modal.closeLoading(); endTime: this.dateRange[1]
console.log(this); };
this.$modal.msgSuccess("新增成功"); addCurricula(params).then(response => {
this.$message.success("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}).catch(err => { }).catch(err => {
this.$modal.closeLoading(); // Handle error if necessary
}); });
} }
} }
...@@ -284,24 +290,28 @@ export default { ...@@ -284,24 +290,28 @@ export default {
}) })
}, },
// 编辑按钮 // 编辑按钮
handleUpdate() { handleUpdate(task) {
this.title = '修改'; this.title = '修改';
this.open = true; this.open = true;
// queryBudget(row.id).then(response => { getCurricula(task.id).then(response => {
// this.postForm = response.data; this.form = response.data;
// console.log('this.postForm', this.postForm); this.dateRange = [response.data.startTime, response.data.endTime];
// this.$modal.closeLoading(); console.log(response);
// }).catch(err => { console.log('this.form', this.form);
// this.$modal.closeLoading(); this.$modal.closeLoading();
// }) }).catch(err => {
})
}, },
// 重置表单 // 重置表单
reset() { reset() {
// 这里需要重置对话框表单 // 重置对话框表单
this.postForm = { this.form = {
taskName: "",
grade: "",
}; };
this.resetForm('postForm'); this.dateRange = [];
this.resetForm('form');
}, },
...@@ -361,7 +371,7 @@ export default { ...@@ -361,7 +371,7 @@ export default {
font-size: 38px; font-size: 38px;
font-weight: bold; font-weight: bold;
// text-align: center; // text-align: center;
margin-left: -8%; margin-right: 2%;
font-family: PMZDBiaoTi-regular; font-family: PMZDBiaoTi-regular;
} }
......
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