Skip to content

D
dd_school
Commit a99331fe by zhaopanyu
Options

zpy 2.1

parent 0f88a905
Showing with 531 additions and 201 deletions
ruoyi-ui/src/api/smartSchool/electronicArchives/electronicRecords.js 0 → 100644
import request from "@/utils/request";
// 查询青年教师成长档案列表
export function listYouthTeacher(query) {
return request({
url: "/school/youthTeacher/list",
method: "get",
params: query,
});
}
// 查询青年教师成长档案详细
export function getYouthTeacher(id) {
return request({
url: "/school/youthTeacher/" + id,
method: "get",
});
}
// 新增青年教师成长档案
export function addYouthTeacher(data) {
return request({
url: "/school/youthTeacher",
method: "post",
data: data,
});
}
// 修改青年教师成长档案
export function updateYouthTeacher(data) {
return request({
url: "/school/youthTeacher",
method: "put",
data: data,
});
}
// 删除青年教师成长档案
export function delYouthTeacher(id) {
return request({
url: "/school/youthTeacher/" + id,
method: "delete",
});
}
ruoyi-ui/src/assets/icons/svg/重点青少年.svg 0 → 100644
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1706602940595" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5249" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M371.147454 531.610275A284.3219 284.3219 0 0 1 227.564326 284.435674C227.564326 127.341851 354.906177 0 512 0s284.435674 127.341851 284.435674 284.435674-127.341851 284.435674-284.435674 284.435675C270.229677 568.871349 72.461552 757.452201 57.756228 995.52486h-0.085331a28.443567 28.443567 0 1 1-56.68803-3.327897c13.453807-219.868776 165.68378-402.192044 370.164587-460.586688zM512 511.984214a227.548539 227.548539 0 1 0 0-455.097079 227.548539 227.548539 0 0 0 0 455.097079z" fill="#0a78c8" p-id="5250"></path><path d="M678.08199 641.203341a28.443567 28.443567 0 0 0-50.857098 25.51388l171.372493 341.550357a28.443567 28.443567 0 0 0 50.857099 0l171.372494-341.550357a28.443567 28.443567 0 0 0-50.857099-25.51388L824.025935 932.095705l-145.943945-290.892364z" fill="#0a78c8" p-id="5251"></path></svg>
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1706602940595" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5249" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M371.147454 531.610275A284.3219 284.3219 0 0 1 227.564326 284.435674C227.564326 127.341851 354.906177 0 512 0s284.435674 127.341851 284.435674 284.435674-127.341851 284.435674-284.435674 284.435675C270.229677 568.871349 72.461552 757.452201 57.756228 995.52486h-0.085331a28.443567 28.443567 0 1 1-56.68803-3.327897c13.453807-219.868776 165.68378-402.192044 370.164587-460.586688zM512 511.984214a227.548539 227.548539 0 1 0 0-455.097079 227.548539 227.548539 0 0 0 0 455.097079z" fill="#0a78c8" p-id="5250"></path><path d="M678.08199 641.203341a28.443567 28.443567 0 0 0-50.857098 25.51388l171.372493 341.550357a28.443567 28.443567 0 0 0 50.857099 0l171.372494-341.550357a28.443567 28.443567 0 0 0-50.857099-25.51388L824.025935 932.095705l-145.943945-290.892364z" fill="#0a78c8" p-id="5251"></path></svg>
\ No newline at end of file
ruoyi-ui/src/components/FileUploadNewstu/index.vue 0 → 100644
<template>
<div class="upload-file">
<el-upload multiple :action="uploadFileUrl" :before-upload="handleBeforeUpload" :file-list="fileList" :limit="limit"
:on-error="handleUploadError" :on-exceed="handleExceed" :on-success="handleUploadSuccess"
:show-file-list="false" :headers="headers" class="upload-file-uploader" ref="fileUpload">
<!-- 上传按钮 -->
<el-button size="mini" type="primary">上传附件</el-button>
<!-- 上传提示 -->
<!-- <div class="el-upload__tip" slot="tip" v-if="showTip">-->
<!-- 请上传-->
<!-- <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>-->
<!-- <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>-->
<!-- 的文件-->
<!-- </div>-->
</el-upload>
<!-- 文件列表 -->
<transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
<li :key="file.url" class="el-upload-list__item ele-upload-list__item-content"
v-for="(file, index) in fileList">
<el-link :href="`${baseUrl}${file.url}`" :underline="false" target="_blank">
<span class="el-icon-document">{{ file.name }}</span>
</el-link>
<div class="ele-upload-list__item-content-action" style="float: right">
<el-link style="margin-left: 10px; color: #1890ff" :href="`${baseUrl}${file.url}`" :underline="false"
target="_blank">下载</el-link>
<el-link style="margin-left: 15px" :underline="false" @click="handleDelete(index)"
type="danger">删除</el-link>
</div>
</li>
</transition-group>
</div>
</template>
<script>
import { getToken } from "@/utils/auth";
export default {
name: "UploadFileNew",
props: {
// 值
value: [String, Object, Array],
// 数量限制
limit: {
type: Number,
default: 1,
},
// 大小限制(MB)
fileSize: {
type: Number,
default: 5,
},
// 文件类型, 例如['png', 'jpg', 'jpeg']
fileType: {
type: Array,
default: () => ["doc", "xls", "ppt", "txt", "pdf"],
},
// 是否显示提示
isShowTip: {
type: Boolean,
default: true
}
},
data() {
return {
number: 0,
uploadList: [],
baseUrl: process.env.VUE_APP_BASE_API,
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址
headers: {
Authorization: "Bearer " + getToken(),
},
fileList: [],
};
},
watch: {
value: {
handler(val) {
if (val) {
let temp = 1;
// 首先将值转为数组
const list = Array.isArray(val) ? val : this.value.split(',');
// 然后将数组转为对象数组
this.fileList = list.map(item => {
if (typeof item === "string") {
item = { name: item, url: item };
}
item.uid = item.uid || new Date().getTime() + temp++;
return item;
});
} else {
this.fileList = [];
return [];
}
},
deep: true,
immediate: true
}
},
computed: {
// 是否显示提示
showTip() {
return this.isShowTip && (this.fileType || this.fileSize);
},
},
methods: {
// 上传前校检格式和大小
handleBeforeUpload(file) {
// 校检文件类型
// if (this.fileType) {
// const fileName = file.name.split('.');
// const fileExt = fileName[fileName.length - 1];
// const isTypeOk = this.fileType.indexOf(fileExt) >= 0;
// if (!isTypeOk) {
// this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`);
// return false;
// }
// }
// 校检文件大小
// if (this.fileSize) {
// const isLt = file.size / 1024 / 1024 < this.fileSize;
// if (!isLt) {
// this.$modal.msgError(`上传文件大小不能超过 ${this.fileSize} MB!`);
// return false;
// }
// }
this.$modal.loading("正在上传文件，请稍候...");
this.number++;
return true;
},
// 文件个数超出
handleExceed() {
this.$modal.msgError(`上传文件数量不能超过 ${this.limit} 个!`);
},
// 上传失败
handleUploadError(err) {
this.$modal.msgError("上传文件失败，请重试");
this.$modal.closeLoading()
},
// 上传成功回调
handleUploadSuccess(res, file) {
console.log('handleUploadSuccess', res)
console.log('file', file)
if (res.code === 200) {
this.uploadList.push({ name: res.newFileName, url: res.fileName });
this.uploadedSuccessfully();
} else {
this.number--;
this.$modal.closeLoading();
this.$modal.msgError(res.msg);
this.$refs.fileUpload.handleRemove(file);
this.uploadedSuccessfully();
}
},
// 删除文件
handleDelete(index) {
this.fileList.splice(index, 1);
// this.$emit("input", this.listToString(this.fileList));
this.$emit("input", this.fileList);
},
// 上传结束处理
uploadedSuccessfully() {
if (this.number > 0 && this.uploadList.length === this.number) {
this.fileList = this.fileList.concat(this.uploadList);
this.uploadList = [];
this.number = 0;
// this.$emit("input", this.listToString(this.fileList));
this.$emit("input", this.fileList);
this.$modal.closeLoading();
}
},
// 获取文件名称
getFileName(name) {
if (name.lastIndexOf("/") > -1) {
return name.slice(name.lastIndexOf("/") + 1);
} else {
return "";
}
},
// 对象转成指定字符串分隔
// listToString(list, separator) {
// let strs = "";
// separator = separator || ",";
// for (let i in list) {
// strs += list[i].url + separator;
// }
// return strs != '' ? strs.substr(0, strs.length - 1) : '';
// }
}
};
</script>
<style scoped lang="scss">
.upload-file {
vertical-align: center;
width: 100%;
text-align: right;
position: relative;
}
::v-deep .el-upload {
position: absolute;
right: 0px;
top: 0px;
}
.upload-file-uploader {
margin-bottom: 5px;
}
.upload-file-list {
width: 85%;
position: relative !important;
top: 0px !important;
}
.upload-file-list .el-upload-list__item {
// border: 1px solid #e4e7ed;
line-height: 2;
margin-bottom: 10px;
position: relative;
}
.upload-file-list .ele-upload-list__item-content {
display: flex;
justify-content: flex-start;
;
align-items: center;
color: inherit;
}
.ele-upload-list__item-content-action .el-link {
margin-right: 10px;
}
</style>
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/schoolAwards/awardManagement/index.vue
...@@ -69,7 +69,11 @@ ...@@ -69,7 +69,11 @@
<div>{{ selectDictLabel(dict.type.audit_state, row.auditState) }}</div> <div>{{ selectDictLabel(dict.type.audit_state, row.auditState) }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="remark" label="备注" width="150" show-overflow-tooltip /> <el-table-column align="center" prop="remark" label="公布形式" width="120" show-overflow-tooltip>
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.announcement, row.remark) }}</div>
</template>
</el-table-column>
<el-table-column align="center" fixed="right" label="操作" width="150"> <el-table-column align="center" fixed="right" label="操作" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
...@@ -166,17 +170,19 @@ ...@@ -166,17 +170,19 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="12">
<el-form-item label="备注" prop="remark"> <el-form-item label="公布形式" prop="remark">
<el-input v-model="form.remark" placeholder="请输入" clearable type="textarea" :rows="2" <el-select v-model="form.remark" placeholder="请选择" clearable style="width: 100%;">
:style="{ width: '100%' }"></el-input> <el-option v-for="dict in dict.type.announcement" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</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="schoolAccessoryList"> <el-form-item label="证书图片" prop="schoolAccessoryList">
<el-upload v-loading="uploadLoading" class="avatar-uploader" :action="uploadFileUrl" <el-upload v-loading="uploadLoading" class="avatar-uploader" multiple :action="uploadFileUrl"
accept="image/*" :show-file-list="false" :on-success="handleAvatarSuccess" accept="image/*" :show-file-list="false" :on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload" :on-remove="handleRemove"> :before-upload="beforeAvatarUpload" :on-remove="handleRemove">
<div v-if="form.schoolAccessoryList.length === 0"> <div v-if="form.schoolAccessoryList.length === 0">
...@@ -268,17 +274,19 @@ ...@@ -268,17 +274,19 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="12">
<el-form-item label="备注" prop="remark"> <el-form-item label="公布形式" prop="remark">
<el-input v-model="form.remark" placeholder="请输入" clearable type="textarea" :rows="2" <el-select v-model="form.remark" placeholder="请选择" clearable style="width: 100%;">
:style="{ width: '100%' }"></el-input> <el-option v-for="dict in dict.type.announcement" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</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="schoolAccessoryList"> <el-form-item label="证书图片" prop="schoolAccessoryList">
<el-upload v-loading="uploadLoading" class="avatar-uploader" :action="uploadFileUrl" <el-upload v-loading="uploadLoading" class="avatar-uploader" multiple :action="uploadFileUrl"
accept="image/*" :show-file-list="false" :on-success="handleAvatarSuccess" accept="image/*" :show-file-list="false" :on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload" :on-remove="handleRemove"> :before-upload="beforeAvatarUpload" :on-remove="handleRemove">
<div v-if="form.schoolAccessoryList.length === 0"> <div v-if="form.schoolAccessoryList.length === 0">
...@@ -326,7 +334,7 @@ import picAvatar from '@/views/smartSchool/schoolManage/introduce/schoolInfo/pro ...@@ -326,7 +334,7 @@ import picAvatar from '@/views/smartSchool/schoolManage/introduce/schoolInfo/pro
export default { export default {
name: 'index', name: 'index',
components: { Treeselect, picAvatar }, components: { Treeselect, picAvatar },
dicts: ['awards_type', 'awards_level', 'audit_state'], dicts: ['awards_type', 'awards_level', 'audit_state', 'announcement'],
data() { data() {
return { return {
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址 uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
...@@ -672,6 +680,7 @@ export default { ...@@ -672,6 +680,7 @@ export default {
color: #1a74be; color: #1a74be;
font-size: 16px; font-size: 16px;
} }
.custom-blue-button { .custom-blue-button {
background: #409eff; background: #409eff;
/* 蓝色 */ /* 蓝色 */
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/ViolationDiscipline/index.vue
...@@ -58,12 +58,9 @@ ...@@ -58,12 +58,9 @@
:value="item.userId"></el-option> :value="item.userId"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="违纪类别"> <el-form-item label="违纪行为">
<el-select v-model="queryForm.violateType" placeholder="请选择" clearable style="width: 100%;"> <el-input v-model="queryForm.violateType" placeholder="输入"></el-input>
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value" />
</el-select>
</el-form-item> -->
<el-form-item label="违纪次数"> <el-form-item label="违纪次数">
<el-select v-model="queryForm.violateNum" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="queryForm.violateNum" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.violate_num" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.violate_num" :key="dict.value" :label="dict.label"
...@@ -126,11 +123,11 @@ ...@@ -126,11 +123,11 @@
<el-table-column align="center" prop="idCard" sortable label="身份证号" width="180" show-overflow-tooltip /> <el-table-column align="center" prop="idCard" sortable label="身份证号" width="180" show-overflow-tooltip />
<el-table-column align="center" prop="classTeacher" sortable label="班主任" width="100" show-overflow-tooltip /> <el-table-column align="center" prop="classTeacher" sortable label="班主任" width="100" show-overflow-tooltip />
<el-table-column align="center" prop="gradeDirector" sortable label="级部主任" width="100" show-overflow-tooltip /> <el-table-column align="center" prop="gradeDirector" sortable label="级部主任" width="100" show-overflow-tooltip />
<!-- <el-table-column align="center" prop="violateType" sortable label="违纪类别" width="120" show-overflow-tooltip> <el-table-column align="center" prop="violateType" sortable label="违纪行为" width="120" show-overflow-tooltip>
<template slot-scope="{ row }"> <!-- <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.violate_type, row.violateType) }}</div> <div>{{ selectDictLabel(dict.type.violate_type, row.violateType) }}</div>
</template> </template> -->
</el-table-column> --> </el-table-column>
<el-table-column align="center" prop="violateNum" sortable label="违纪次数" width="100" show-overflow-tooltip> <el-table-column align="center" prop="violateNum" sortable label="违纪次数" width="100" show-overflow-tooltip>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.violate_num, row.violateNum) }}</div> <div>{{ selectDictLabel(dict.type.violate_num, row.violateNum) }}</div>
...@@ -261,21 +258,22 @@ ...@@ -261,21 +258,22 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<!-- <el-form-item label="违纪类别" prop="violateType"> <el-form-item label="违纪行为">
<el-select v-model="form.violateType" placeholder="请选择" clearable style="width: 100%;"> <el-input v-model="form.violateType" placeholder="输入"></el-input>
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value" />
</el-select> </el-col>
</el-form-item> --> </el-row>
<el-row>
<el-col :span="8">
<el-form-item label="违纪次数" prop="violateNum"> <el-form-item label="违纪次数" prop="violateNum">
<el-select v-model="form.violateNum" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="form.violateNum" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.violate_num" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.violate_num" :key="dict.value" :label="dict.label"
:value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="处分结果" prop="punishResult"> <el-form-item label="处分结果" prop="punishResult">
<el-select v-model="form.punishResult" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="form.punishResult" placeholder="请选择" clearable style="width: 100%;">
...@@ -283,7 +281,10 @@ ...@@ -283,7 +281,10 @@
:value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="处分时间" prop="punishTime"> <el-form-item label="处分时间" prop="punishTime">
<el-date-picker v-model="form.punishTime" type="date" value-format="yyyy-MM-dd" <el-date-picker v-model="form.punishTime" type="date" value-format="yyyy-MM-dd"
...@@ -430,9 +431,9 @@ export default { ...@@ -430,9 +431,9 @@ export default {
violateNum: [ violateNum: [
{ required: true, message: "违纪次数不能为空", trigger: "change" } { required: true, message: "违纪次数不能为空", trigger: "change" }
], ],
// violateType: [ violateType: [
// { required: true, message: "违纪类别不能为空", trigger: "change" } { required: true, message: "违纪行为不能为空", trigger: "change" }
// ], ],
punishResult: [ punishResult: [
{ required: true, message: "处分结果不能为空", trigger: "change" } { required: true, message: "处分结果不能为空", trigger: "change" }
], ],
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/disciplinaryManagemen/index.vue
...@@ -58,12 +58,9 @@ ...@@ -58,12 +58,9 @@
:value="item.userId"></el-option> :value="item.userId"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="违纪类别"> <el-form-item label="违纪行为">
<el-select v-model="queryForm.violateType" placeholder="请选择" clearable style="width: 100%;"> <el-input v-model="queryForm.violateType" placeholder="输入"></el-input>
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value" />
</el-select> -->
<!-- </el-form-item> -->
<el-form-item label="违纪次数"> <el-form-item label="违纪次数">
<el-select v-model="queryForm.violateNum" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="queryForm.violateNum" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.violate_num" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.violate_num" :key="dict.value" :label="dict.label"
...@@ -135,11 +132,11 @@ ...@@ -135,11 +132,11 @@
<el-table-column align="center" prop="idCard" sortable label="身份证号" width="180" show-overflow-tooltip /> <el-table-column align="center" prop="idCard" sortable label="身份证号" width="180" show-overflow-tooltip />
<el-table-column align="center" prop="classTeacher" sortable label="班主任" width="100" show-overflow-tooltip /> <el-table-column align="center" prop="classTeacher" sortable label="班主任" width="100" show-overflow-tooltip />
<el-table-column align="center" prop="gradeDirector" sortable label="级部主任" width="100" show-overflow-tooltip /> <el-table-column align="center" prop="gradeDirector" sortable label="级部主任" width="100" show-overflow-tooltip />
<!-- <el-table-column align="center" prop="violateType" sortable label="违纪类别" width="120"> <el-table-column align="center" prop="violateType" sortable label="违纪行为" width="120">
<template slot-scope="{ row }"> <!-- <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.violate_type, row.violateType) }}</div> <div>{{ selectDictLabel(dict.type.violate_type, row.violateType) }}</div>
</template> </template> -->
</el-table-column> --> </el-table-column>
<el-table-column align="center" prop="violateNum" sortable label="违纪次数" width="100"> <el-table-column align="center" prop="violateNum" sortable label="违纪次数" width="100">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.violate_num, row.violateNum) }}</div> <div>{{ selectDictLabel(dict.type.violate_num, row.violateNum) }}</div>
...@@ -318,21 +315,28 @@ ...@@ -318,21 +315,28 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<!-- <el-form-item label="违纪类别" prop="violateType"> <!-- <el-form-item label="违纪行为" prop="violateType">
<el-select v-model="form.violateType" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="form.violateType" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label"
:value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<el-form-item label="违纪行为" prop="violateType">
<el-input v-model="form.violateType" placeholder="输入"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="违纪次数" prop="violateNum"> <el-form-item label="违纪次数" prop="violateNum">
<el-select v-model="form.violateNum" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="form.violateNum" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.violate_num" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.violate_num" :key="dict.value" :label="dict.label"
:value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="处分结果" prop="punishResult"> <el-form-item label="处分结果" prop="punishResult">
<el-select v-model="form.punishResult" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="form.punishResult" placeholder="请选择" clearable style="width: 100%;">
...@@ -340,7 +344,10 @@ ...@@ -340,7 +344,10 @@
:value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="处分时间" prop="punishTime"> <el-form-item label="处分时间" prop="punishTime">
<el-date-picker v-model="form.punishTime" type="date" value-format="yyyy-MM-dd" <el-date-picker v-model="form.punishTime" type="date" value-format="yyyy-MM-dd"
...@@ -475,21 +482,22 @@ ...@@ -475,21 +482,22 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<!-- <el-form-item label="违纪类别" prop="violateType"> <el-form-item label="违纪行为" prop="violateType">
<el-select v-model="form.violateType" placeholder="请选择" clearable style="width: 100%;"> <el-input v-model="form.violateType" placeholder="输入"></el-input>
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value" />
</el-select> </el-col>
</el-form-item> --> </el-row>
<el-row>
<el-col :span="8">
<el-form-item label="违纪次数" prop="violateNum"> <el-form-item label="违纪次数" prop="violateNum">
<el-select v-model="form.violateNum" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="form.violateNum" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.violate_num" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.violate_num" :key="dict.value" :label="dict.label"
:value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="处分结果" prop="punishResult"> <el-form-item label="处分结果" prop="punishResult">
<el-select v-model="form.punishResult" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="form.punishResult" placeholder="请选择" clearable style="width: 100%;">
...@@ -497,8 +505,11 @@ ...@@ -497,8 +505,11 @@
:value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> </el-row>
<el-row>
<el-col :span="24">
<el-form-item label="处分时间" prop="punishTime"> <el-form-item label="处分时间" prop="punishTime">
<el-date-picker v-model="form.punishTime" type="date" value-format="yyyy-MM-dd" <el-date-picker v-model="form.punishTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" clearable :style="{ width: '100%' }"> placeholder="请选择" clearable :style="{ width: '100%' }">
...@@ -633,21 +644,22 @@ ...@@ -633,21 +644,22 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<!-- <el-form-item label="违纪类别" prop="violateType"> <el-form-item label="违纪行为" prop="violateType">
<el-select v-model="form.violateType" placeholder="请选择" clearable style="width: 100%;"> <el-input v-model="form.violateType" placeholder="输入"></el-input>
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value" />
</el-select> </el-col>
</el-form-item> --> </el-row>
<el-row>
<el-col :span="8">
<el-form-item label="违纪次数" prop="violateNum"> <el-form-item label="违纪次数" prop="violateNum">
<el-select v-model="form.violateNum" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="form.violateNum" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.violate_num" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.violate_num" :key="dict.value" :label="dict.label"
:value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="处分结果" prop="punishResult"> <el-form-item label="处分结果" prop="punishResult">
<el-select v-model="form.punishResult" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="form.punishResult" placeholder="请选择" clearable style="width: 100%;">
...@@ -655,8 +667,11 @@ ...@@ -655,8 +667,11 @@
:value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> </el-row>
<el-row>
<el-col :span="24">
<el-form-item label="处分时间" prop="punishTime"> <el-form-item label="处分时间" prop="punishTime">
<el-date-picker v-model="form.punishTime" type="date" value-format="yyyy-MM-dd" <el-date-picker v-model="form.punishTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" clearable :style="{ width: '100%' }"> placeholder="请选择" clearable :style="{ width: '100%' }">
...@@ -824,9 +839,9 @@ export default { ...@@ -824,9 +839,9 @@ export default {
violateNum: [ violateNum: [
{ required: true, message: "违纪次数不能为空", trigger: "change" } { required: true, message: "违纪次数不能为空", trigger: "change" }
], ],
// violateType: [ violateType: [
// { required: true, message: "违纪类别不能为空", trigger: "change" } { required: true, message: "违纪行为不能为空", trigger: "change" }
// ], ],
punishResult: [ punishResult: [
{ required: true, message: "处分结果不能为空", trigger: "change" } { required: true, message: "处分结果不能为空", trigger: "change" }
], ],
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/violationDisciplineentry/index.vue
...@@ -58,12 +58,9 @@ ...@@ -58,12 +58,9 @@
:value="item.userId"></el-option> :value="item.userId"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="违纪类别"> <el-form-item label="违纪行为">
<el-select v-model="queryForm.violateType" placeholder="请选择" clearable style="width: 100%;"> <el-input v-model="queryForm.violateType" placeholder="输入"></el-input>
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value" />
</el-select>
</el-form-item> -->
<el-form-item label="违纪次数"> <el-form-item label="违纪次数">
<el-select v-model="queryForm.violateNum" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="queryForm.violateNum" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.violate_num" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.violate_num" :key="dict.value" :label="dict.label"
...@@ -136,11 +133,11 @@ ...@@ -136,11 +133,11 @@
<el-table-column align="center" prop="idCard" sortable label="身份证号" width="180" show-overflow-tooltip /> <el-table-column align="center" prop="idCard" sortable label="身份证号" width="180" show-overflow-tooltip />
<el-table-column align="center" prop="classTeacher" sortable label="班主任" width="100" show-overflow-tooltip /> <el-table-column align="center" prop="classTeacher" sortable label="班主任" width="100" show-overflow-tooltip />
<el-table-column align="center" prop="gradeDirector" sortable label="级部主任" width="100" show-overflow-tooltip /> <el-table-column align="center" prop="gradeDirector" sortable label="级部主任" width="100" show-overflow-tooltip />
<!-- <el-table-column align="center" prop="violateType" sortable label="违纪类别" width="120" show-overflow-tooltip> <el-table-column align="center" prop="violateType" sortable label="违纪行为" width="120" show-overflow-tooltip>
<template slot-scope="{ row }"> <!-- <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.violate_type, row.violateType) }}</div> <div>{{ selectDictLabel(dict.type.violate_type, row.violateType) }}</div>
</template> </template> -->
</el-table-column> --> </el-table-column>
<el-table-column align="center" prop="violateNum" sortable label="违纪次数" width="100" show-overflow-tooltip> <el-table-column align="center" prop="violateNum" sortable label="违纪次数" width="100" show-overflow-tooltip>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.violate_num, row.violateNum) }}</div> <div>{{ selectDictLabel(dict.type.violate_num, row.violateNum) }}</div>
...@@ -280,21 +277,21 @@ ...@@ -280,21 +277,21 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<!-- <el-form-item label="违纪类别" prop="violateType"> <el-form-item label="违纪行为">
<el-select v-model="form.violateType" placeholder="请选择" clearable style="width: 100%;"> <el-input v-model="queryForm.violateType" placeholder="输入"></el-input>
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value" /> </el-col>
</el-select> </el-row>
</el-form-item> --> <el-row>
<el-col :span="8">
<el-form-item label="违纪次数" prop="violateNum"> <el-form-item label="违纪次数" prop="violateNum">
<el-select v-model="form.violateNum" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="form.violateNum" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.violate_num" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.violate_num" :key="dict.value" :label="dict.label"
:value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="处分结果" prop="punishResult"> <el-form-item label="处分结果" prop="punishResult">
<el-select v-model="form.punishResult" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="form.punishResult" placeholder="请选择" clearable style="width: 100%;">
...@@ -302,6 +299,7 @@ ...@@ -302,6 +299,7 @@
:value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="处分时间" prop="punishTime"> <el-form-item label="处分时间" prop="punishTime">
...@@ -436,12 +434,14 @@ ...@@ -436,12 +434,14 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<!-- <el-form-item label="违纪类别" prop="violateType"> <el-form-item label="违纪行为">
<el-select v-model="form.violateType" placeholder="请选择" clearable style="width: 100%;"> <el-input v-model="form.violateType" placeholder="输入"></el-input>
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value" />
</el-select> </el-col>
</el-form-item> --> </el-row>
<el-row>
<el-col :span="8">
<el-form-item label="违纪次数" prop="violateNum"> <el-form-item label="违纪次数" prop="violateNum">
<el-select v-model="form.violateNum" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="form.violateNum" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.violate_num" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.violate_num" :key="dict.value" :label="dict.label"
...@@ -449,8 +449,6 @@ ...@@ -449,8 +449,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="处分结果" prop="punishResult"> <el-form-item label="处分结果" prop="punishResult">
<el-select v-model="form.punishResult" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="form.punishResult" placeholder="请选择" clearable style="width: 100%;">
...@@ -664,9 +662,9 @@ export default { ...@@ -664,9 +662,9 @@ export default {
violateNum: [ violateNum: [
{ required: true, message: "违纪次数不能为空", trigger: "change" } { required: true, message: "违纪次数不能为空", trigger: "change" }
], ],
// violateType: [ violateType: [
// { required: true, message: "违纪类别不能为空", trigger: "change" } { required: true, message: "违纪行为不能为空", trigger: "change" }
// ], ],
punishResult: [ punishResult: [
{ required: true, message: "处分结果不能为空", trigger: "change" } { required: true, message: "处分结果不能为空", trigger: "change" }
], ],
......
ruoyi-ui/src/views/smartSchool/classAdviser/studentManage/discipline/index.vue
...@@ -58,12 +58,9 @@ ...@@ -58,12 +58,9 @@
:value="item.userId"></el-option> :value="item.userId"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="违纪类别"> <el-form-item label="违纪行为">
<el-select v-model="queryForm.violateType" placeholder="请选择" clearable style="width: 100%;"> <el-input v-model="queryForm.violateType" placeholder="输入"></el-input>
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value" />
</el-select>
</el-form-item> -->
<el-form-item label="违纪次数"> <el-form-item label="违纪次数">
<el-select v-model="queryForm.violateNum" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="queryForm.violateNum" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.violate_num" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.violate_num" :key="dict.value" :label="dict.label"
...@@ -126,11 +123,11 @@ ...@@ -126,11 +123,11 @@
<el-table-column align="center" prop="idCard" sortable label="身份证号" width="180" show-overflow-tooltip /> <el-table-column align="center" prop="idCard" sortable label="身份证号" width="180" show-overflow-tooltip />
<el-table-column align="center" prop="classTeacher" sortable label="班主任" width="100" show-overflow-tooltip /> <el-table-column align="center" prop="classTeacher" sortable label="班主任" width="100" show-overflow-tooltip />
<el-table-column align="center" prop="gradeDirector" sortable label="级部主任" width="100" show-overflow-tooltip /> <el-table-column align="center" prop="gradeDirector" sortable label="级部主任" width="100" show-overflow-tooltip />
<!-- <el-table-column align="center" prop="violateType" sortable label="违纪类别" width="120" show-overflow-tooltip> <el-table-column align="center" prop="violateType" sortable label="违纪行为" width="120" show-overflow-tooltip>
<template slot-scope="{ row }"> <!-- <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.violate_type, row.violateType) }}</div> <div>{{ selectDictLabel(dict.type.violate_type, row.violateType) }}</div>
</template> </template> -->
</el-table-column> --> </el-table-column>
<el-table-column align="center" prop="violateNum" sortable label="违纪次数" width="100" show-overflow-tooltip> <el-table-column align="center" prop="violateNum" sortable label="违纪次数" width="100" show-overflow-tooltip>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.violate_num, row.violateNum) }}</div> <div>{{ selectDictLabel(dict.type.violate_num, row.violateNum) }}</div>
...@@ -261,21 +258,21 @@ ...@@ -261,21 +258,21 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<!-- <el-form-item label="违纪类别" prop="violateType"> <el-form-item label="违纪行为">
<el-select v-model="form.violateType" placeholder="请选择" clearable style="width: 100%;"> <el-input v-model="form.violateType" placeholder="输入"></el-input>
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value" /> </el-col>
</el-select> </el-row>
</el-form-item> --> <el-row>
<el-col :span="8">
<el-form-item label="违纪次数" prop="violateNum"> <el-form-item label="违纪次数" prop="violateNum">
<el-select v-model="form.violateNum" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="form.violateNum" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for=" dict in dict.type.violate_num " <el-option v-for=" dict in dict.type.violate_num "
:key="dict.value" :label="dict.label" :value="dict.value" /> :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="处分结果" prop="punishResult"> <el-form-item label="处分结果" prop="punishResult">
<el-select v-model="form.punishResult" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="form.punishResult" placeholder="请选择" clearable style="width: 100%;">
...@@ -283,7 +280,10 @@ ...@@ -283,7 +280,10 @@
:key="dict.value" :label="dict.label" :value="dict.value" /> :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="处分时间" prop="punishTime"> <el-form-item label="处分时间" prop="punishTime">
<el-date-picker v-model="form.punishTime" type="date" value-format="yyyy-MM-dd" <el-date-picker v-model="form.punishTime" type="date" value-format="yyyy-MM-dd"
...@@ -432,7 +432,7 @@ export default { ...@@ -432,7 +432,7 @@ export default {
{ required: true, message: "违纪次数不能为空", trigger: "change" } { required: true, message: "违纪次数不能为空", trigger: "change" }
], ],
violateType: [ violateType: [
{ required: true, message: "违纪类别不能为空", trigger: "change" } { required: true, message: "违纪行为不能为空", trigger: "change" }
], ],
punishResult: [ punishResult: [
{ required: true, message: "处分结果不能为空", trigger: "change" } { required: true, message: "处分结果不能为空", trigger: "change" }
......
ruoyi-ui/src/views/smartSchool/electronicArchives/personalInformation/index.vue
...@@ -816,6 +816,25 @@ ...@@ -816,6 +816,25 @@
</el-table> </el-table>
</div> </div>
</div> </div>
<!--青年教成长档案 -->
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">青年教成长档案</div>
<div style="margin: 3px 10px 15px;">
<el-table :data="youthTeacherList">
<el-table-column label="学年" align="center" prop="schoolYear" />
<el-table-column label="学期" align="center" prop="semester">
<template slot-scope="scope">
<dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" />
</template>
</el-table-column>
<el-table-column label="年级" align="center" prop="grade" />
<el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="青年教师培养期" align="center" prop="incubationPeriod" />
<el-table-column label="师生同考成绩" align="center" prop="sameExamResults" />
<el-table-column label="研做高考题情况" align="center" prop="situation" />
</el-table>
</div>
</div>
</div> </div>
</template> </template>
...@@ -861,6 +880,7 @@ export default { ...@@ -861,6 +880,7 @@ export default {
fudaoStudent: [], fudaoStudent: [],
//专业成长 //专业成长
specialityVos: [], specialityVos: [],
youthTeacherList: [],
form: { form: {
}, },
...@@ -910,6 +930,8 @@ export default { ...@@ -910,6 +930,8 @@ export default {
this.fudaoStudent = response.data.fudaoStudent this.fudaoStudent = response.data.fudaoStudent
// console.log(this.fudaoStudent, 'this.fudaoStudent'); // console.log(this.fudaoStudent, 'this.fudaoStudent');
this.specialityVos = response.data.specialityVos this.specialityVos = response.data.specialityVos
this.youthTeacherList = response.data.schoolXsyouthTeachers
console.log(this.youthTeacherList, 'this.youthTeacherList');
// console.log(this.specialityVos, 'this.specialityVos'); // console.log(this.specialityVos, 'this.specialityVos');
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teachingAchievements/index.vue
...@@ -103,8 +103,8 @@ ...@@ -103,8 +103,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="考核分" prop="assessmentScore"> <el-form-item label="增量分" prop="assessmentScore">
<el-input v-model="queryParams.assessmentScore" placeholder="请输入考核分" clearable <el-input v-model="queryParams.assessmentScore" placeholder="请输入增量分" clearable
@keyup.enter.native="handleQuery" /> @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
:default-sort="{ prop: 'examTime', order: 'descending' }" :row-style="{ height: '1px' }" :default-sort="{ prop: 'examTime', order: 'descending' }" :row-style="{ height: '1px' }"
:cell-style="{ padding: '0px' }" :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }"> :cell-style="{ padding: '0px' }" :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }">
<el-table-column type="selection" width="30" align="center" /> <el-table-column type="selection" width="30" align="center" />
<el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" /> <el-table-column type="index" label="序号" width="30" align="center" sortable />
<el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="80px" <el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="80px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="80px" <el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="80px"
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="考核分" align="center" prop="assessmentScore" sortable show-overflow-tooltip /> <el-table-column label="增量分" align="center" prop="assessmentScore" sortable show-overflow-tooltip />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180px" fixed="right"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
...@@ -330,8 +330,8 @@ ...@@ -330,8 +330,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="考核分" prop="assessmentScore"> <el-form-item label="增量分" prop="assessmentScore">
<el-input v-model="form.assessmentScore" placeholder="请输入考核分" type="number" clearable /> <el-input v-model="form.assessmentScore" placeholder="请输入增量分" type="number" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -454,7 +454,7 @@ export default { ...@@ -454,7 +454,7 @@ export default {
{ required: true, message: "班级类型不能为空", trigger: "change" } { required: true, message: "班级类型不能为空", trigger: "change" }
], ],
assessmentScore: [ assessmentScore: [
{ required: true, message: "考核分不能为空", trigger: "blur" } { required: true, message: "增量分不能为空", trigger: "blur" }
], ],
} }
......
ruoyi-ui/src/views/smartSchool/electronicArchives/workloadInformation/index.vue
...@@ -195,13 +195,15 @@ ...@@ -195,13 +195,15 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="早读" align="center" prop="earlyReading" sortable width="60px" show-overflow-tooltip /> <!-- <el-table-column label="早读" align="center" prop="earlyReading" sortable width="60px" show-overflow-tooltip />
<el-table-column label="正课" align="center" prop="requiredCourses" sortable width="60px" show-overflow-tooltip /> <el-table-column label="正课" align="center" prop="requiredCourses" sortable width="60px" show-overflow-tooltip />
<el-table-column label="晚自习" align="center" prop="eveningSelfStudy" sortable width="70px" <el-table-column label="晚自习" align="center" prop="eveningSelfStudy" sortable width="70px"
show-overflow-tooltip /> -->
<el-table-column label="周课时量" align="center" prop="weeklyClassHours" sortable width="80px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="合计" align="center" prop="amountTo" sortable show-overflow-tooltip /> <!-- <el-table-column label="合计" align="center" prop="amountTo" sortable show-overflow-tooltip /> -->
<el-table-column label="证明人" align="center" prop="userName" width="80px" sortable show-overflow-tooltip /> <el-table-column label="证明人" align="center" prop="userName" width="80px" sortable show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" sortable show-overflow-tooltip /> <el-table-column label="备注" align="center" prop="remark" sortable show-overflow-tooltip />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px" fixed="right"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
...@@ -322,7 +324,7 @@ ...@@ -322,7 +324,7 @@
</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="earlyReading"> <el-form-item label="早读" prop="earlyReading">
<el-input v-model="form.earlyReading" type="number" clearable placeholder="请输入" /> <el-input v-model="form.earlyReading" type="number" clearable placeholder="请输入" />
...@@ -333,11 +335,15 @@ ...@@ -333,11 +335,15 @@
<el-input v-model="form.requiredCourses" type="number" clearable placeholder="请输入" /> <el-input v-model="form.requiredCourses" type="number" clearable placeholder="请输入" />
</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="eveningSelfStudy"> <!-- <el-form-item label="晚自习" prop="eveningSelfStudy">
<el-input v-model="form.eveningSelfStudy" type="number" clearable placeholder="请输入" /> <el-input v-model="form.eveningSelfStudy" type="number" clearable placeholder="请输入" />
</el-form-item> -->
<!-- weeklyClassHours -->
<el-form-item label="周课时量" prop="weeklyClassHours">
<el-input v-model="form.weeklyClassHours" type="number" placeholder="请输入" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -466,8 +472,8 @@ ...@@ -466,8 +472,8 @@
</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="earlyReading"> <el-form-item label="早读" prop="earlyReading">
<el-input v-model="form.earlyReading" placeholder="请输入" clearable /> <el-input v-model="form.earlyReading" placeholder="请输入" clearable />
</el-form-item> </el-form-item>
...@@ -476,26 +482,27 @@ ...@@ -476,26 +482,27 @@
<el-form-item label="正课" prop="requiredCourses"> <el-form-item label="正课" prop="requiredCourses">
<el-input v-model="form.requiredCourses" placeholder="请输入" clearable /> <el-input v-model="form.requiredCourses" placeholder="请输入" clearable />
</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="eveningSelfStudy"> <el-form-item label="周课时量" prop="weeklyClassHours">
<el-input v-model="form.eveningSelfStudy" placeholder="请输入" clearable /> <el-input v-model="form.weeklyClassHours" type="number" placeholder="请输入" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="证明人" prop="userName">
<el-input v-model="form.userName" placeholder="请输入证明人" clearable />
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="合计" prop="amountTo"> <el-form-item label="合计" prop="amountTo">
<el-input v-model="form.amountTo" placeholder="请输入合计" clearable /> <el-input v-model="form.amountTo" placeholder="请输入合计" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col> -->
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12">
<el-form-item label="证明人" prop="userName">
<el-input v-model="form.userName" placeholder="请输入证明人" clearable />
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" clearable /> <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" clearable />
...@@ -615,7 +622,7 @@ ...@@ -615,7 +622,7 @@
</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="earlyReading"> <el-form-item label="早读" prop="earlyReading">
<el-input v-model="form.earlyReading" placeholder="请输入早读" /> <el-input v-model="form.earlyReading" placeholder="请输入早读" />
...@@ -626,25 +633,29 @@ ...@@ -626,25 +633,29 @@
<el-input v-model="form.requiredCourses" placeholder="请输入正课" /> <el-input v-model="form.requiredCourses" placeholder="请输入正课" />
</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="eveningSelfStudy"> <!-- <el-form-item label="晚自习" prop="eveningSelfStudy">
<el-input v-model="form.eveningSelfStudy" placeholder="请输入晚自习" /> <el-input v-model="form.eveningSelfStudy" placeholder="请输入晚自习" />
</el-form-item> -->
<el-form-item label="周课时量" prop="weeklyClassHours">
<el-input v-model="form.weeklyClassHours" type="number" placeholder="请输入" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="证明人" prop="userName">
<el-input v-model="form.userName" placeholder="请输入证明人" />
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="合计" prop="amountTo"> <el-form-item label="合计" prop="amountTo">
<el-input v-model="form.amountTo" placeholder="请输入合计" /> <el-input v-model="form.amountTo" placeholder="请输入合计" />
</el-form-item> </el-form-item>
</el-col> </el-col> -->
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12">
<el-form-item label="证明人" prop="userName">
<el-input v-model="form.userName" placeholder="请输入证明人" />
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
...@@ -790,15 +801,15 @@ export default { ...@@ -790,15 +801,15 @@ export default {
appointmentPost: [ appointmentPost: [
{ required: true, message: "聘任岗位不能为空", trigger: "blur" } { required: true, message: "聘任岗位不能为空", trigger: "blur" }
], ],
earlyReading: [ weeklyClassHours: [
{ required: true, message: "早读不能为空", trigger: "blur" } { required: true, message: "周课时量不能为空", trigger: "blur" }
],
requiredCourses: [
{ required: true, message: "正读不能为空", trigger: "blur" }
],
eveningSelfStudy: [
{ required: true, message: "晚自习不能为空", trigger: "blur" }
], ],
// requiredCourses: [
// { required: true, message: "正读不能为空", trigger: "blur" }
// ],
// eveningSelfStudy: [
// { required: true, message: "晚自习不能为空", trigger: "blur" }
// ],
userName: [ userName: [
{ required: true, message: "证明人不能为空", trigger: "blur" } { required: true, message: "证明人不能为空", trigger: "blur" }
] ]
......
ruoyi-ui/src/views/smartSchool/gradeWork/studentManage/discipline/index.vue
...@@ -58,12 +58,9 @@ ...@@ -58,12 +58,9 @@
:value="item.userId"></el-option> :value="item.userId"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="违纪类别"> <el-form-item label="违纪行为">
<el-select v-model="queryForm.violateType" placeholder="请选择" clearable style="width: 100%;"> <el-input v-model="queryForm.violateType" placeholder="输入"></el-input>
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value" />
</el-select>
</el-form-item> -->
<el-form-item label="违纪次数"> <el-form-item label="违纪次数">
<el-select v-model="queryForm.violateNum" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="queryForm.violateNum" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.violate_num" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.violate_num" :key="dict.value" :label="dict.label"
...@@ -126,11 +123,11 @@ ...@@ -126,11 +123,11 @@
<el-table-column align="center" prop="idCard" sortable label="身份证号" width="180" show-overflow-tooltip /> <el-table-column align="center" prop="idCard" sortable label="身份证号" width="180" show-overflow-tooltip />
<el-table-column align="center" prop="classTeacher" sortable label="班主任" width="100" show-overflow-tooltip /> <el-table-column align="center" prop="classTeacher" sortable label="班主任" width="100" show-overflow-tooltip />
<el-table-column align="center" prop="gradeDirector" sortable label="级部主任" width="100" show-overflow-tooltip /> <el-table-column align="center" prop="gradeDirector" sortable label="级部主任" width="100" show-overflow-tooltip />
<!-- <el-table-column align="center" prop="violateType" sortable label="违纪类别" width="120" show-overflow-tooltip> <el-table-column align="center" prop="violateType" sortable label="违纪行为" width="120" show-overflow-tooltip>
<template slot-scope="{ row }"> <!-- <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.violate_type, row.violateType) }}</div> <div>{{ selectDictLabel(dict.type.violate_type, row.violateType) }}</div>
</template> </template> -->
</el-table-column> --> </el-table-column>
<el-table-column align="center" prop="violateNum" sortable label="违纪次数" width="100" show-overflow-tooltip> <el-table-column align="center" prop="violateNum" sortable label="违纪次数" width="100" show-overflow-tooltip>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.violate_num, row.violateNum) }}</div> <div>{{ selectDictLabel(dict.type.violate_num, row.violateNum) }}</div>
...@@ -261,12 +258,9 @@ ...@@ -261,12 +258,9 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<!-- <el-form-item label="违纪类别" prop="violateType"> <el-form-item label="违纪行为">
<el-select v-model="form.violateType" placeholder="请选择" clearable style="width: 100%;"> <el-input v-model="form.violateType" placeholder="输入"></el-input>
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value" />
</el-select>
</el-form-item> -->
<el-form-item label="违纪次数" prop="violateNum"> <el-form-item label="违纪次数" prop="violateNum">
<el-select v-model="form.violateNum" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="form.violateNum" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for=" dict in dict.type.violate_num " <el-option v-for=" dict in dict.type.violate_num "
...@@ -432,7 +426,7 @@ export default { ...@@ -432,7 +426,7 @@ export default {
{ required: true, message: "违纪次数不能为空", trigger: "change" } { required: true, message: "违纪次数不能为空", trigger: "change" }
], ],
violateType: [ violateType: [
{ required: true, message: "违纪类别不能为空", trigger: "change" } { required: true, message: "违纪行为不能为空", trigger: "change" }
], ],
punishResult: [ punishResult: [
{ required: true, message: "处分结果不能为空", trigger: "change" } { required: true, message: "处分结果不能为空", trigger: "change" }
......
ruoyi-ui/src/views/smartSchool/personWork/auditoriumReservation/index.vue
...@@ -841,8 +841,6 @@ export default { ...@@ -841,8 +841,6 @@ export default {
fjmc: this.postForm.fjmc, fjmc: this.postForm.fjmc,
}] }]
} }
console.log('postForm', this.postForm); console.log('postForm', this.postForm);
this.postForm.leadershipName = response.data.leadershipName this.postForm.leadershipName = response.data.leadershipName
console.log(1111, response.data); console.log(1111, response.data);
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairStudentManage/discipline/index.vue
...@@ -58,12 +58,9 @@ ...@@ -58,12 +58,9 @@
:value="item.userId"></el-option> :value="item.userId"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="违纪类别"> <el-form-item label="违纪行为">
<el-select v-model="queryForm.violateType" placeholder="请选择" clearable style="width: 100%;"> <el-input v-model="queryForm.violateType" placeholder="输入"></el-input>
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value" />
</el-select>
</el-form-item> -->
<el-form-item label="违纪次数"> <el-form-item label="违纪次数">
<el-select v-model="queryForm.violateNum" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="queryForm.violateNum" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.violate_num" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.violate_num" :key="dict.value" :label="dict.label"
...@@ -126,11 +123,11 @@ ...@@ -126,11 +123,11 @@
<el-table-column align="center" prop="idCard" sortable label="身份证号" width="180" show-overflow-tooltip /> <el-table-column align="center" prop="idCard" sortable label="身份证号" width="180" show-overflow-tooltip />
<el-table-column align="center" prop="classTeacher" sortable label="班主任" width="100" show-overflow-tooltip /> <el-table-column align="center" prop="classTeacher" sortable label="班主任" width="100" show-overflow-tooltip />
<el-table-column align="center" prop="gradeDirector" sortable label="级部主任" width="100" show-overflow-tooltip /> <el-table-column align="center" prop="gradeDirector" sortable label="级部主任" width="100" show-overflow-tooltip />
<!-- <el-table-column align="center" prop="violateType" sortable label="违纪类别" width="120" show-overflow-tooltip> <el-table-column align="center" prop="violateType" sortable label="违纪行为" width="120" show-overflow-tooltip>
<template slot-scope="{ row }"> <!-- <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.violate_type, row.violateType) }}</div> <div>{{ selectDictLabel(dict.type.violate_type, row.violateType) }}</div>
</template> </template> -->
</el-table-column> --> </el-table-column>
<el-table-column align="center" prop="violateNum" sortable label="违纪次数" width="100" show-overflow-tooltip> <el-table-column align="center" prop="violateNum" sortable label="违纪次数" width="100" show-overflow-tooltip>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.violate_num, row.violateNum) }}</div> <div>{{ selectDictLabel(dict.type.violate_num, row.violateNum) }}</div>
...@@ -261,29 +258,32 @@ ...@@ -261,29 +258,32 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<!-- <el-form-item label="违纪类别" prop="violateType"> <el-form-item label="违纪行为">
<el-select v-model="form.violateType" placeholder="请选择" clearable style="width: 100%;"> <el-input v-model="form.violateType" placeholder="输入"></el-input>
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value" />
</el-select> </el-col>
</el-form-item> --> </el-row>
<el-row>
<el-col :span="8">
<el-form-item label="违纪次数" prop="violateNum"> <el-form-item label="违纪次数" prop="violateNum">
<el-select v-model="form.violateNum" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="form.violateNum" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for=" dict in dict.type.violate_num " <el-option v-for=" dict in dict.type.violate_num "
:key="dict.value" :label="dict.label" :value="dict.value" /> :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="处分结果" prop="punishResult"> <el-form-item label="处分结果" prop="punishResult">
<el-select v-model="form.punishResult" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="form.punishResult" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for=" dict in dict.type.punish_result " <el-option v-for=" dict in dict.type.punish_result" :key="dict.value" :label="dict.label"
:key="dict.value" :label="dict.label" :value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="处分时间" prop="punishTime"> <el-form-item label="处分时间" prop="punishTime">
<el-date-picker v-model="form.punishTime" type="date" value-format="yyyy-MM-dd" <el-date-picker v-model="form.punishTime" type="date" value-format="yyyy-MM-dd"
...@@ -432,7 +432,7 @@ export default { ...@@ -432,7 +432,7 @@ export default {
{ required: true, message: "违纪次数不能为空", trigger: "change" } { required: true, message: "违纪次数不能为空", trigger: "change" }
], ],
violateType: [ violateType: [
{ required: true, message: "违纪类别不能为空", trigger: "change" } { required: true, message: "违纪行为不能为空", trigger: "change" }
], ],
punishResult: [ punishResult: [
{ required: true, message: "处分结果不能为空", trigger: "change" } { required: true, message: "处分结果不能为空", trigger: "change" }
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/stuEssentialInfAlert/index.vue
...@@ -413,7 +413,6 @@ export default { ...@@ -413,7 +413,6 @@ export default {
handleSubmit(row) { handleSubmit(row) {
const id = row.id const id = row.id
this.$modal.confirm('确认提交学生关键信息变更？').then(function () { this.$modal.confirm('确认提交学生关键信息变更？').then(function () {
// return submit(id); // return submit(id);
}).then(() => { }).then(() => {
this.$modal.confirm('再次确认提交学生关键信息变更？').then(function () { this.$modal.confirm('再次确认提交学生关键信息变更？').then(function () {
......
ruoyi-ui/src/views/whitePage.vue
...@@ -21,9 +21,9 @@ export default { ...@@ -21,9 +21,9 @@ export default {
}, },
created() { created() {
// 钉钉code码，正式时打开 // 钉钉code码，正式时打开
this.getCode() // this.getCode()
// token,测试用 // token,测试用
// this.csToken() this.csToken()
}, },
methods: { methods: {
// 获取code // 获取code
...@@ -63,11 +63,13 @@ export default { ...@@ -63,11 +63,13 @@ export default {
// 根据roles权限生成可访问的路由表 // 根据roles权限生成可访问的路由表
router.addRoutes(accessRoutes) // 动态添加可访问路由表 router.addRoutes(accessRoutes) // 动态添加可访问路由表
// this.init() // this.init()
}) })
}) })
} else { } else {
this.$message.error(res.message) this.$message.error(res.message)
this.$router.push({
path: '/dd'
})
} }
}) })
......
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