Skip to content

D
dd_school
Commit b3efedb8 by zhaopanyu
Options

zpy 8.7

parent 6ffb6f99
Showing with 103 additions and 294 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/equipmenTledger/index.vue
......@@ -35,11 +35,11 @@
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport">导入
<el-button type="success" icon="el-icon-download" size="mini" @click="handleImport">导入
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExportClass">导出
<el-button type="warning" icon="el-icon-upload2" size="mini" @click="handleExportClass">导出
</el-button>
</el-col>
<el-col :span="1.5">
......@@ -117,7 +117,7 @@
@pagination="getList" />
<!-- 添加或修改学校班级对话框 -->
<el-dialog :title="title" :visible.sync="dialogVisibleforClass" width="800px" append-to-body>
<el-dialog :title="title" :visible.sync="dialogVisibleforClass" width="50%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" :disabled="!isEdit" label-width="140px">
<el-row :gutter="20">
<el-col :span="12">
......@@ -167,7 +167,7 @@
<el-col :span="12">
<el-form-item label="设备状态:">
<el-select v-model="queryParams.equipmentStatus" @keyup.enter.native="handleQuery" clearable
placeholder="请选择设备状态">
placeholder="请选择设备状态" style="width: 100%;">
<el-option v-for="dict in dict.type.EquipmentStatus" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
......@@ -180,7 +180,7 @@
<el-col :span="12">
<el-form-item label="是否允许借出:" prop="equipmentIsBorrow">
<el-select v-model="queryParams.equipmentIsBorrow" @keyup.enter.native="handleQuery" clearable
placeholder="请选择是否允许借出">
placeholder="请选择是否允许借出" style="width: 100%;">
<el-option v-for="dict in dict.type.EquipmentIsBorrow" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
......@@ -189,7 +189,7 @@
<el-col :span="12">
<el-form-item label="是否借出:" prop="equipmentIsBorrow">
<el-select v-model="queryParams.equipmentIsBorrow" @keyup.enter.native="handleQuery" clearable
placeholder="请选择是否借出">
placeholder="请选择是否借出" style="width: 100%;">
<el-option v-for="dict in dict.type.EquipmentIsBorrow" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
......@@ -260,8 +260,8 @@
<el-button @click="upload.open = false">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
......@@ -276,12 +276,9 @@ import {
allBY, editBatch,
} from "@/api/smartSchool/teachAffairAdministration/affairClassManage/index";
import TeacherSelect from '@/views/components/moduleComponets/TeacherSelect/index.vue'
import { teacherListInform } from "@/api/smartSchool/teacherManage/teacherInformation";
import PicAvatar from "@/views/smartSchool/schoolManage/introduce/schoolInfo/profile/picAvatar";
import { commonUpload } from "@/api/common";
import { getYearList } from "@/utils/utilLibrary/getYearList";
import { getToken } from "@/utils/auth";
import { TempGrades, TEXT_SIZE_ONE_HU, TEXT_SIZE_ONE_TH, TEXT_SIZE_TEL } from "@/enums/common";
export default {
name: "index",
......@@ -289,11 +286,7 @@ export default {
components: { TeacherSelect, PicAvatar },
data() {
return {
baseUrl: process.env.VUE_APP_BASE_API,
// 文本域
TEXT_SIZE_ONE_HU,
TEXT_SIZE_ONE_TH,
TEXT_SIZE_TEL,
//获取子组件传来的信息
pic: [],
// 遮罩层
......@@ -316,12 +309,9 @@ export default {
dialogVisibleforClass: false,
// 批量操作对话框
dialogVisibleforBatch: false,
// 任课教师列表对话框
dialogVisibleForTeachers: false,
// 教师对话框标题
titleInform: '',
// 老师信息选择对话框
openTeacherInform: false,
// 班级导入参数
upload: {
// 是否显示弹出层（班级导入）
......@@ -339,110 +329,32 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
classValue: undefined,
gradeAlias: undefined,
houseName: undefined,
teacherName: undefined,
teacherTel: undefined,
isUsed: undefined,
schoolYear: new Date().getFullYear()
},
// 表单参数
form: {},
batchForm: {},
// 表单校验
rules: {
schoolYear: [{ required: true, message: '学年不能为空', trigger: 'change' }],
gradeValue: [{ required: true, message: '年级不能为空', trigger: 'change' }],
classValue: [{ required: true, message: '班级不能为空', trigger: 'change' }],
teacherName: [{ required: true, message: '班主任姓名不能为空', trigger: 'change' }],
teacherTel: [{ required: true, message: '班主任手机号不能为空', trigger: 'change' }],
houseName: [{ required: true, message: '所在教学楼不能为空', trigger: 'change' }],
classNum1: [{ required: true, message: '高一班级数量不能为空', trigger: 'blur' }],
classNum2: [{ required: true, message: '高二班级数量不能为空', trigger: 'blur' }],
classNum3: [{ required: true, message: '高三班级数量不能为空', trigger: 'blur' }],
// teacherWord: [{required: true, message: '寄语不能为空', trigger: 'blur'}],
},
// 任课教师列表表单
teachersListForm: {},
// 教师列表
teachersList: [],
// 新增或修改老师对话框
teacherPerForm: {},
// 控制表格属性的显示与隐藏
columns: [
{ key: 0, label: `班徽`, visible: true },
{ key: 1, label: `当前学年`, visible: true },
{ key: 2, label: `类型`, visible: false },
{ key: 3, label: `年级`, visible: true },
{ key: 4, label: `班级`, visible: true },
{ key: 5, label: `班级别名`, visible: true },
{ key: 6, label: `所在教学楼`, visible: true },
{ key: 7, label: `班主任姓名`, visible: true },
{ key: 8, label: `班主任手机号`, visible: true },
{ key: 9, label: `班级口号`, visible: true },
{ key: 10, label: `班主任寄语`, visible: false },
{ key: 11, label: `是否毕业`, visible: true },
{ key: 12, label: `备注`, visible: false },
],
// 选择老师对话框
teacherOptions: {
open: false,
title: '选择老师'
},
// 上传图片的加载效果
uploadLoading: false,
// imageUrl: '',
// 年份列表数据
yearList: [],
// 表单是否可以修改、
isEdit: true,
};
},
created() {
this.yearList = getYearList();
//获取最新年份
this.newYear()
this.getList()
},
computed: {
resolveClassName() {
return form => {
// const result = ['*', '*', '*'];
const result = [];
const { classValue, gradeValue, schoolYear } = form;
classValue && (result[1] = this.dict.type.Class.find(item => item.value == classValue).label);
gradeValue && (result[0] = TempGrades.find(item => item.value == gradeValue).label);
// schoolYear && (result[0] = schoolYear);
form.gradeName = result[0];
form.className = result[1];
form.classAlias = result.join('');
return form.classAlias;
}
}
},
watch: {
'form.schoolYear'(val) {
this.form.schoolYear = '' + val;
},
pic: {
handler(newValue, oldValue) {
this.isUploadPic = newValue[3]
}
}
},
methods: {
schoolYearChange() {
console.log("日期改变", this.form.schoolYear)
},
newYear() {
getNewYear().then((res) => {
this.queryParams.schoolYear = res.schoolYear
this.handleQuery();
})
},
/** 查询学校班级列表 */
getList() {
this.loading = true;
......@@ -460,20 +372,7 @@ export default {
// 表单重置
reset() {
this.form = {
picUrl: '',
schoolYear: '',
classNum1: 0,
classNum2: 0,
classNum3: 0,
gradeValue: '',
classValue: '',
classAlias: '',
teacherName: '',
houseName: '',
remark: '',
teacherTel: '',
classSlogan: '',
teacherWord: ''
};
// this.imageUrl = '';
......@@ -491,12 +390,7 @@ export default {
this.queryParams = {
pageNum: 1,
pageSize: 10,
classValue: undefined,
classAlias: undefined,
houseName: undefined,
teacherName: undefined,
teacherTel: undefined,
isUsed: undefined,
};
this.newYear();
//
......@@ -507,10 +401,7 @@ export default {
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
//获取图片信息
getClassInfoPic(val) {
this.pic = val
},
/** 新增班级按钮操作 */
handleAdd() {
this.reset();
......@@ -600,13 +491,7 @@ export default {
})
},
// // 批量毕业
// handleGraduation() {
// allBY(this.ids).then((reponse) => {
// this.$modal.msgSuccess("操作成功");
// this.getList();
// });
// },
// 批量打印
printBarcodes() {
// this.$modal.confirm('是否确认打印所选班级条码？').then(() => {
......@@ -681,88 +566,9 @@ export default {
);
}
},
// 获取教师信息
teacherInfoList() {
this.teacherOptions.open = true;
},
/** 选择老师(打开对话框) */
selectTeacher() {
this.teacherOptions.open = true;
},
/** 获取老师信息列表 */
getTeacherList(queryForm, callback) {
teacherListInform({ ...queryForm, employeeType: 0 }).then(response => {
callback(response.rows, response.total);
}).catch(error => {
callback([], 0);
})
},
/** 设置老师信息 */
setTeacherInfo(item) {
// this.form.teacherName = item.teacherName;
this.$set(this.form, 'teacherName', item.teacherName);
this.$set(this.form, 'teacherTel', item.teacherTel);
this.$set(this.form, 'teacherId', item.id);
},
// 任课教师列表
teachersListEdit(row) {
this.$router.push({
path: "/jwClassManage/teacherlists",
query: {
gradeId: row.id,
routeBack: 0
},
});
},
// 是否毕业按钮切换
changeSwitch(row) {
// const ids=this.ids||row.id
let text = row.isGraduated === "1" ? "毕业" : "取消毕业";
this.$modal.confirm('确认要' + text + '"' + row.classAlias + '"班级吗？').then(function () {
return allBY(row.id, row.isGraduated);
}).then(() => {
this.$modal.msgSuccess(text + "成功");
}).catch(function () {
row.isGraduated = row.isGraduated === "0" ? "1" : "0";
});
},
// 图片上传功能
uploadImage(file) {
const fileData = file.file;
const formData = new FormData();
formData.append('file', fileData);
this.uploadLoading = true;
commonUpload(formData).then(response => {
this.uploadLoading = false;
this.$modal.msgSuccess('上传成功');
// this.imageUrl = this.baseUrl + response.fileName;
this.form.picUrl = response.fileName;
}).catch(error => {
this.uploadLoading = false;
})
},
// 上传图片之前的钩子函数
beforeAvatarUpload() {
},
// 上传成功
handleAvatarSuccess() {
},
/** 上传过程 */
handleFileUploadProgress() {
this.upload.isUploading = true;
},
/** 上传成功 */
handleFileSuccess(response) {
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
this.getList();
},
/** 提交 */
submitFileForm() {
this.$refs.upload.submit();
......
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