Skip to content

D
dd_school
Commit b3efedb8 by zhaopanyu
Options

zpy 8.7

parent 6ffb6f99
Showing with 77 additions and 74 deletions
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/taskPublishing/index.vue
......@@ -45,7 +45,8 @@
<div class="task-buttons">
<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="success" size="small" round @click="courseSelectionsituation(task.id,task.yxrs,task.zrs)">选课情况</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="danger" size="small" round
@click="artisticView(task.id, task.grade)">艺体选课情况</el-button>
......@@ -111,9 +112,11 @@ export default {
},
form: {
id: "",
taskName: "",
grade: "",
startTime: "",
endTime: "",
},
//新增弹窗
open: false,
......@@ -160,31 +163,31 @@ export default {
this.title = "新增任务发布";
},
// 成绩管理按钮 grade级部 ID任务ID
performance(id,grade) {
performance(id, grade) {
this.$router.push({
path: "/gradeWork/courseSelection/performance",
query: {
id,
grade
id,
grade
}
});
},
// 选课情况按钮 total总人数 choose已选人数
courseSelectionsituation(id,total,choose) {
courseSelectionsituation(id, total, choose) {
this.$router.push({
path: "/gradeWork/courseSelection/courseSelectionsituation",
query: {
id,total,choose
id, total, choose
}
});
},
// 春季选课按钮 grade级部 ID任务ID
springView(id,grade) {
springView(id, grade) {
this.$router.push({
path: "/gradeWork/courseSelection/springView",
query: {
id,
grade
id,
grade
}
});
},
......@@ -240,12 +243,21 @@ export default {
},
// 提交表单
submitForm() {
// console.log('object', this.dateRange);
this.throttle(() => {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
// 编辑
updateCurricula(this.form).then(response => {
const params = {
id: this.form.id,
taskName: this.form.taskName,
startTime: this.dateRange[0],
endTime: this.dateRange[1]
};
updateCurricula(params).then(response => {
console.log(params, 'params');
console.log("res1111");
this.$message.success("修改成功");
console.log("res", response);
......@@ -281,8 +293,6 @@ export default {
getCurricula(task.id).then(response => {
this.form = response.data;
this.dateRange = [response.data.startTime, response.data.endTime];
console.log(response);
console.log('this.form', this.form);
this.$modal.closeLoading();
}).catch(err => {
......@@ -306,11 +316,12 @@ export default {
<style lang="scss" scoped>
.listBlock {
display: flex;
flex-direction: row;
align-items: flex-start;
flex-wrap: wrap;
display: flex;
flex-direction: row;
align-items: flex-start;
flex-wrap: wrap;
}
.itemBlock {
width: 49%;
padding: 15px 20px 5px 20px;
......@@ -318,26 +329,28 @@ export default {
border-radius: 20px;
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 {
color: #FFFFFF;
background-color: #B66D93;
border: 1px solid #B66D93;
color: #FFFFFF;
background-color: #B66D93;
border: 1px solid #B66D93;
}
.rowBtn {
color: #FFFFFF;
background-color: #D3C1B1;
border: 1px solid #D3C1B1;
color: #FFFFFF;
background-color: #D3C1B1;
border: 1px solid #D3C1B1;
}
.task-name {
color: #777;
font-size: 38px;
font-weight: 500;
text-align: left;
color: #777;
font-size: 38px;
font-weight: 500;
text-align: left;
}
.task-level {
......@@ -358,16 +371,16 @@ export default {
}
.task-info {
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
padding-bottom: 15px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
padding-bottom: 15px;
}
.task-count {
text-align: center;
padding-right: 10px;
text-align: center;
padding-right: 10px;
}
.task-count>.count {
......@@ -388,7 +401,7 @@ export default {
}
.task-buttons button {
margin-bottom: 10px;
margin-bottom: 10px;
}
.el-card {
......
ruoyi-ui/src/views/smartSchool/schoolProperty/classiFication/index.vue
......@@ -46,19 +46,19 @@
</el-table-column>
</el-table>
<!-- 新增/修改弹出框 -->
<el-dialog width="800px" :visible.sync="open" :title="title" append-to-body @close="cancel">
<el-dialog width="40%" :visible.sync="open" :title="title" append-to-body @close="cancel">
<el-form ref="postForm" :model="postForm" :rules="rules" label-width="110px">
<el-row>
<el-col :span="10">
<el-col :span="12">
<el-form-item label="分类编码" prop="typeName">
<el-input v-model="postForm.typeName"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-col :span="12">
<el-form-item label="设备分类" prop="typeNum">
<el-select v-model="postForm.typeNum" placeholder="请选择设备分类" clearable>
<el-select v-model="postForm.typeNum" placeholder="请选择设备分类" clearable style="width: 100%;">
<el-option v-for="item in sbflOptions" :key="item.value" :label="item.label"
:value="item.value" :style="{ width: '206.66px' }" />
</el-select>
......@@ -66,9 +66,9 @@
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-col :span="12">
<el-form-item label="型号" prop="typeOrder">
<el-select v-model="postForm.typeOrder" placeholder="请选择型号" clearable>
<el-select v-model="postForm.typeOrder" placeholder="请选择型号" clearable style="width: 100%;">
<el-option v-for="item in xhOptions" :key="item.value" :label="item.label"
:value="item.value" :style="{ width: '100%' }" />
</el-select>
......@@ -76,7 +76,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-col :span="12">
<el-form-item label="管理员" prop="licensePlate">
<el-input v-model="postForm.licensePlate" placeholder="请选择管理员" @focus="selectChange"
style="width: 100%"></el-input>
......
ruoyi-ui/src/views/smartSchool/schoolProperty/repairApplicant/index.vue
......@@ -110,9 +110,9 @@
</el-col>
<el-col :span="12">
<el-form-item label="维修人" prop="repairsName">
<el-select v-model="postForm.typeNum" placeholder="请选择维修人" clearable>
<el-option v-for="item in sbflOptions" :key="item.value" :label="item.label"
:value="item.value" :style="{ width: '100%' }" />
<el-select v-model="postForm.typeNum" placeholder="请选择维修人" clearable style="width: 100%;">
<el-option v-for=" item in sbflOptions" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
</el-form-item>
</el-col>
......@@ -120,13 +120,13 @@
<el-row>
<el-col :span="12">
<el-form-item label="投产日期:" prop="equipmentProductionDate">
<el-date-picker v-model="form.equipmentProductionDate" type="date" placeholder="选择日期"
<el-date-picker v-model="postForm.equipmentProductionDate" type="date" placeholder="选择日期"
style="width: 100%;" value-format="yyyy-MM-dd" clearable></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="维修时间:" prop="equipmentProductionDate">
<el-date-picker v-model="form.equipmentProductionDate" type="date" placeholder="选择日期"
<el-date-picker v-model="postForm.equipmentProductionDate" type="date" placeholder="选择日期"
style="width: 100%;" value-format="yyyy-MM-dd" clearable></el-date-picker>
</el-form-item>
</el-col>
......@@ -134,13 +134,13 @@
<el-row>
<el-col :span="12">
<el-form-item label="地点" prop="Address">
<el-input v-model="form.Address" placeholder="地点" />
<el-input v-model="postForm.Address" placeholder="地点" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="修理状态" prop="repairStatus">
<el-select v-model="form.repairStatus" placeholder="请选择" clearable>
<el-option v-for="item in repairStatusOptions" :key="item.value" :label="item.label"
<el-select v-model="postForm.repairStatus" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for=" item in repairStatusOptions" :key="item.value" :label="item.label"
:value="item.value" :style="{ width: '100%' }" />
</el-select>
</el-form-item>
......@@ -149,13 +149,13 @@
<el-row>
<el-col :span="12">
<el-form-item label="报修时间:" prop="equipmentProductionDate">
<el-date-picker v-model="form.equipmentProductionDate" type="date" placeholder="选择日期"
<el-date-picker v-model="postForm.equipmentProductionDate" type="date" placeholder="选择日期"
style="width: 100%;" value-format="yyyy-MM-dd" clearable></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="评价" prop="phevaluateone">
<el-rate v-model="formfk.evaluate" :max="5"></el-rate>
<el-rate v-model="postForm.evaluate" :max="5"></el-rate>
</el-form-item>
</el-col>
</el-row>
......@@ -175,40 +175,40 @@
</el-dialog>
<!-- 查看对话框 -->
<el-dialog :title="title" :visible.sync="openLook" width="1200px" append-to-body @close="cancel">
<el-form ref="postForm" :model="postForm" :rules="rules" label-width="110px">
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-row>
<el-col :span="12">
<el-form-item label="自编码" prop="id">
<el-input v-model="postForm.id" placeholder="报修单号"></el-input>
<el-input v-model="form.id" placeholder="报修单号"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="报修人" prop="repairsName">
<el-input v-model="postForm.repairsName" placeholder="报修人"></el-input>
<el-input v-model="form.repairsName" placeholder="报修人"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="设备名称" prop="repairsName">
<el-input v-model="postForm.repairsName" placeholder="设备名称"></el-input>
<el-input v-model="form.repairsName" placeholder="设备名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="问题" prop="repairsName">
<el-input v-model="postForm.repairsName" placeholder="问题"></el-input>
<el-input v-model="form.repairsName" placeholder="问题"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="型号" prop="repairsName">
<el-input v-model="postForm.repairsName" placeholder="型号"></el-input>
<el-input v-model="form.repairsName" placeholder="型号"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="维修人" prop="repairsName">
<el-select v-model="postForm.repairsName" placeholder="请选择维修人" clearable>
<el-select v-model="form.repairsName" placeholder="请选择维修人" clearable style="width: 100%;">
<el-option v-for="item in sbflOptions" :key="item.value" :label="item.label"
:value="item.value" :style="{ width: '100%' }" />
</el-select>
......@@ -237,7 +237,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="修理状态" prop="repairStatus">
<el-select v-model="form.repairStatus" placeholder="请选择" clearable>
<el-select v-model="form.repairStatus" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="item in repairStatusOptions" :key="item.value" :label="item.label"
:value="item.value" :style="{ width: '100%' }" />
</el-select>
......@@ -253,7 +253,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="评价" prop="phevaluateone">
<el-rate v-model="formfk.evaluate" :max="5"></el-rate>
<el-rate v-model="form.evaluate" :max="5" style="width: 100%;"></el-rate>
</el-form-item>
</el-col>
</el-row>
......@@ -349,13 +349,6 @@ export default {
},
// 反馈结果
formfk: {
id: "",
maintainResult: "",
maintainState: "3",
evaluate: "",
},
// 是否显示新增弹出层
open: false,
// 查看对话框
......@@ -391,12 +384,9 @@ export default {
}
},
mounted() {
this.formfk.evaluate = 5;
},
created() {
this.postForm.evaluate = 5;
this.getList();
},
......
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