Skip to content

D
dd_school
Commit 76850e74 by duxingshan
Options

Merge remote-tracking branch 'origin/master'

parents 79700edb 0997a865
Showing with 106 additions and 75 deletions
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/taskPublishing/index.vue
...@@ -45,7 +45,8 @@ ...@@ -45,7 +45,8 @@
<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,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="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(task.id, task.grade)">艺体选课情况</el-button> @click="artisticView(task.id, task.grade)">艺体选课情况</el-button>
...@@ -111,9 +112,11 @@ export default { ...@@ -111,9 +112,11 @@ export default {
}, },
form: { form: {
id: "",
taskName: "", taskName: "",
grade: "", grade: "",
startTime: "",
endTime: "",
}, },
//新增弹窗 //新增弹窗
open: false, open: false,
...@@ -160,31 +163,31 @@ export default { ...@@ -160,31 +163,31 @@ export default {
this.title = "新增任务发布"; this.title = "新增任务发布";
}, },
// 成绩管理按钮 grade级部 ID任务ID // 成绩管理按钮 grade级部 ID任务ID
performance(id,grade) { performance(id, grade) {
this.$router.push({ this.$router.push({
path: "/gradeWork/courseSelection/performance", path: "/gradeWork/courseSelection/performance",
query: { query: {
id, id,
grade grade
} }
}); });
}, },
// 选课情况按钮 total总人数 choose已选人数 // 选课情况按钮 total总人数 choose已选人数
courseSelectionsituation(id,total,choose) { courseSelectionsituation(id, total, choose) {
this.$router.push({ this.$router.push({
path: "/gradeWork/courseSelection/courseSelectionsituation", path: "/gradeWork/courseSelection/courseSelectionsituation",
query: { query: {
id,total,choose id, total, choose
} }
}); });
}, },
// 春季选课按钮 grade级部 ID任务ID // 春季选课按钮 grade级部 ID任务ID
springView(id,grade) { springView(id, grade) {
this.$router.push({ this.$router.push({
path: "/gradeWork/courseSelection/springView", path: "/gradeWork/courseSelection/springView",
query: { query: {
id, id,
grade grade
} }
}); });
}, },
...@@ -240,12 +243,21 @@ export default { ...@@ -240,12 +243,21 @@ export default {
}, },
// 提交表单 // 提交表单
submitForm() { submitForm() {
// console.log('object', this.dateRange);
this.throttle(() => { this.throttle(() => {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (this.form.id != null) { 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"); console.log("res1111");
this.$message.success("修改成功"); this.$message.success("修改成功");
console.log("res", response); console.log("res", response);
...@@ -281,8 +293,6 @@ export default { ...@@ -281,8 +293,6 @@ export default {
getCurricula(task.id).then(response => { getCurricula(task.id).then(response => {
this.form = response.data; this.form = response.data;
this.dateRange = [response.data.startTime, response.data.endTime]; this.dateRange = [response.data.startTime, response.data.endTime];
console.log(response);
console.log('this.form', this.form);
this.$modal.closeLoading(); this.$modal.closeLoading();
}).catch(err => { }).catch(err => {
...@@ -306,11 +316,12 @@ export default { ...@@ -306,11 +316,12 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.listBlock { .listBlock {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
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;
...@@ -318,26 +329,28 @@ export default { ...@@ -318,26 +329,28 @@ export default {
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 {
...@@ -358,16 +371,16 @@ export default { ...@@ -358,16 +371,16 @@ export default {
} }
.task-info { .task-info {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
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;
} }
.task-count>.count { .task-count>.count {
...@@ -388,7 +401,7 @@ export default { ...@@ -388,7 +401,7 @@ export default {
} }
.task-buttons button { .task-buttons button {
margin-bottom: 10px; margin-bottom: 10px;
} }
.el-card { .el-card {
......
ruoyi-ui/src/views/smartSchool/personWork/lendingReceiving/index.vue → ruoyi-ui/src/views/smartSchool/personWork/acquisitionRecord/index.vue
<template> <template>
<div> <div>
<h2>教师借出领用报修记录</h2> <h2>教师领用记录</h2>
</div> </div>
</template> </template>
......
ruoyi-ui/src/views/smartSchool/personWork/lendingRecords/index.vue 0 → 100644
<template>
<div>
<h2>教师借出记录</h2>
</div>
</template>
<script>
export default {
}
</script>
<style lang="scss" scoped></style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/personWork/repairRecord/index.vue 0 → 100644
<template>
<div>
<h2>教师报修记录</h2>
</div>
</template>
<script>
export default {
}
</script>
<style lang="scss" scoped></style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/schoolProperty/classiFication/index.vue
...@@ -46,19 +46,19 @@ ...@@ -46,19 +46,19 @@
</el-table-column> </el-table-column>
</el-table> </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-form ref="postForm" :model="postForm" :rules="rules" label-width="110px">
<el-row> <el-row>
<el-col :span="10"> <el-col :span="12">
<el-form-item label="分类编码" prop="typeName"> <el-form-item label="分类编码" prop="typeName">
<el-input v-model="postForm.typeName"></el-input> <el-input v-model="postForm.typeName"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="10"> <el-col :span="12">
<el-form-item label="设备分类" prop="typeNum"> <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" <el-option v-for="item in sbflOptions" :key="item.value" :label="item.label"
:value="item.value" :style="{ width: '206.66px' }" /> :value="item.value" :style="{ width: '206.66px' }" />
</el-select> </el-select>
...@@ -66,9 +66,9 @@ ...@@ -66,9 +66,9 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="10"> <el-col :span="12">
<el-form-item label="型号" prop="typeOrder"> <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" <el-option v-for="item in xhOptions" :key="item.value" :label="item.label"
:value="item.value" :style="{ width: '100%' }" /> :value="item.value" :style="{ width: '100%' }" />
</el-select> </el-select>
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="10"> <el-col :span="12">
<el-form-item label="管理员" prop="licensePlate"> <el-form-item label="管理员" prop="licensePlate">
<el-input v-model="postForm.licensePlate" placeholder="请选择管理员" @focus="selectChange" <el-input v-model="postForm.licensePlate" placeholder="请选择管理员" @focus="selectChange"
style="width: 100%"></el-input> style="width: 100%"></el-input>
......
ruoyi-ui/src/views/smartSchool/schoolProperty/repairApplicant/index.vue
...@@ -110,9 +110,9 @@ ...@@ -110,9 +110,9 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="维修人" prop="repairsName"> <el-form-item label="维修人" prop="repairsName">
<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" <el-option v-for=" item in sbflOptions" :key="item.value" :label="item.label"
:value="item.value" :style="{ width: '100%' }" /> :value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -120,13 +120,13 @@ ...@@ -120,13 +120,13 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="投产日期:" prop="equipmentProductionDate"> <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> style="width: 100%;" value-format="yyyy-MM-dd" clearable></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="维修时间:" prop="equipmentProductionDate"> <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> style="width: 100%;" value-format="yyyy-MM-dd" clearable></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -134,13 +134,13 @@ ...@@ -134,13 +134,13 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="地点" prop="Address"> <el-form-item label="地点" prop="Address">
<el-input v-model="form.Address" placeholder="地点" /> <el-input v-model="postForm.Address" placeholder="地点" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="修理状态" prop="repairStatus"> <el-form-item label="修理状态" prop="repairStatus">
<el-select v-model="form.repairStatus" placeholder="请选择" clearable> <el-select v-model="postForm.repairStatus" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="item in repairStatusOptions" :key="item.value" :label="item.label" <el-option v-for=" item in repairStatusOptions" :key="item.value" :label="item.label"
:value="item.value" :style="{ width: '100%' }" /> :value="item.value" :style="{ width: '100%' }" />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -149,13 +149,13 @@ ...@@ -149,13 +149,13 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="报修时间:" prop="equipmentProductionDate"> <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> style="width: 100%;" value-format="yyyy-MM-dd" clearable></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="评价" prop="phevaluateone"> <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-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -175,40 +175,40 @@ ...@@ -175,40 +175,40 @@
</el-dialog> </el-dialog>
<!-- 查看对话框 --> <!-- 查看对话框 -->
<el-dialog :title="title" :visible.sync="openLook" width="1200px" append-to-body @close="cancel"> <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-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="自编码" prop="id"> <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-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="报修人" prop="repairsName"> <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-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="设备名称" prop="repairsName"> <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-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="问题" prop="repairsName"> <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-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="型号" prop="repairsName"> <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-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="维修人" prop="repairsName"> <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" <el-option v-for="item in sbflOptions" :key="item.value" :label="item.label"
:value="item.value" :style="{ width: '100%' }" /> :value="item.value" :style="{ width: '100%' }" />
</el-select> </el-select>
...@@ -237,7 +237,7 @@ ...@@ -237,7 +237,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="修理状态" prop="repairStatus"> <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" <el-option v-for="item in repairStatusOptions" :key="item.value" :label="item.label"
:value="item.value" :style="{ width: '100%' }" /> :value="item.value" :style="{ width: '100%' }" />
</el-select> </el-select>
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="评价" prop="phevaluateone"> <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-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -349,13 +349,6 @@ export default { ...@@ -349,13 +349,6 @@ export default {
}, },
// 反馈结果
formfk: {
id: "",
maintainResult: "",
maintainState: "3",
evaluate: "",
},
// 是否显示新增弹出层 // 是否显示新增弹出层
open: false, open: false,
// 查看对话框 // 查看对话框
...@@ -391,12 +384,9 @@ export default { ...@@ -391,12 +384,9 @@ export default {
} }
}, },
mounted() {
this.formfk.evaluate = 5;
},
created() { created() {
this.postForm.evaluate = 5;
this.getList(); 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