Skip to content

D
dd_school
Commit f6433c06 by zhaopanyu
Options

zpy 1.19

parent 0ae2bb52
Showing with 216 additions and 4 deletions
ruoyi-ui/src/views/index.vue
...@@ -284,8 +284,6 @@ ...@@ -284,8 +284,6 @@
<h3>填报单位：东营市二中</h3> <h3>填报单位：东营市二中</h3>
</el-col> </el-col>
</el-row> </el-row>
<el-table key="a" v-if="dutyList.dutyType === '1'" border v-loading="loading2" :data="dutyList.list" <el-table key="a" v-if="dutyList.dutyType === '1'" border v-loading="loading2" :data="dutyList.list"
style="width: 100%" :span-method="objectSpanMethod2"> style="width: 100%" :span-method="objectSpanMethod2">
<el-table-column label="节日" align="center"> <el-table-column label="节日" align="center">
...@@ -941,6 +939,10 @@ export default { ...@@ -941,6 +939,10 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep th.el-table__cell>.cell {
font-size: 12px !important;
}
.card-box { .card-box {
padding-right: 5px; padding-right: 5px;
padding-left: 5px; padding-left: 5px;
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/schoolAwards/awardEntry/index.vue
...@@ -632,6 +632,26 @@ export default { ...@@ -632,6 +632,26 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.mask {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.5);
display: flex;
align-items: center;
justify-content: center;
}
.mask-content {
display: flex;
align-items: center;
justify-content: center;
color: #1a74be;
font-size: 16px;
}
.custom-blue-button { .custom-blue-button {
background: #409eff; background: #409eff;
/* 蓝色 */ /* 蓝色 */
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/schoolAwards/awardManagement/index.vue
...@@ -653,6 +653,25 @@ export default { ...@@ -653,6 +653,25 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.mask {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.5);
display: flex;
align-items: center;
justify-content: center;
}
.mask-content {
display: flex;
align-items: center;
justify-content: center;
color: #1a74be;
font-size: 16px;
}
.custom-blue-button { .custom-blue-button {
background: #409eff; background: #409eff;
/* 蓝色 */ /* 蓝色 */
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/schoolAwards/awardReview/index.vue
...@@ -408,6 +408,26 @@ export default { ...@@ -408,6 +408,26 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.mask {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.5);
display: flex;
align-items: center;
justify-content: center;
}
.mask-content {
display: flex;
align-items: center;
justify-content: center;
color: #1a74be;
font-size: 16px;
}
.custom-blue-button { .custom-blue-button {
background: #409eff; background: #409eff;
/* 蓝色 */ /* 蓝色 */
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentCommendation/awardEntry/index.vue
...@@ -631,6 +631,26 @@ export default { ...@@ -631,6 +631,26 @@ export default {
</script> </script>
<style scoped lang="scss" > <style scoped lang="scss" >
.mask {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.5);
display: flex;
align-items: center;
justify-content: center;
}
.mask-content {
display: flex;
align-items: center;
justify-content: center;
color: #1a74be;
font-size: 16px;
}
::v-deep .el-form-item { ::v-deep .el-form-item {
margin-bottom: 12px; margin-bottom: 12px;
} }
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentCommendation/commendationView/index.vue
...@@ -532,6 +532,25 @@ export default { ...@@ -532,6 +532,25 @@ export default {
</script> </script>
<style scoped lang="scss" > <style scoped lang="scss" >
.mask {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.5);
display: flex;
align-items: center;
justify-content: center;
}
.mask-content {
display: flex;
align-items: center;
justify-content: center;
color: #1a74be;
font-size: 16px;
}
::v-deep .el-form-item { ::v-deep .el-form-item {
margin-bottom: 12px; margin-bottom: 12px;
} }
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentCommendation/rewardManagement/index.vue
...@@ -781,6 +781,26 @@ export default { ...@@ -781,6 +781,26 @@ export default {
</script> </script>
<style scoped lang="scss" > <style scoped lang="scss" >
.mask {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.5);
display: flex;
align-items: center;
justify-content: center;
}
.mask-content {
display: flex;
align-items: center;
justify-content: center;
color: #1a74be;
font-size: 16px;
}
::v-deep .el-form-item { ::v-deep .el-form-item {
margin-bottom: 12px; margin-bottom: 12px;
} }
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/ViolationDiscipline/index.vue
...@@ -697,6 +697,26 @@ export default { ...@@ -697,6 +697,26 @@ export default {
</script> </script>
<style scoped lang="scss" > <style scoped lang="scss" >
.mask {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.5);
display: flex;
align-items: center;
justify-content: center;
}
.mask-content {
display: flex;
align-items: center;
justify-content: center;
color: #1a74be;
font-size: 16px;
}
::v-deep .el-form-item { ::v-deep .el-form-item {
margin-bottom: 12px; margin-bottom: 12px;
} }
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/disciplinaryManagemen/index.vue
...@@ -903,6 +903,7 @@ export default { ...@@ -903,6 +903,7 @@ export default {
this.reset(); this.reset();
this.title = "导入"; this.title = "导入";
this.uploadOpen = true; this.uploadOpen = true;
}, },
handleFileUploadProgress(event, file, fileList) { handleFileUploadProgress(event, file, fileList) {
this.upload.isUploading = true; this.upload.isUploading = true;
...@@ -1233,6 +1234,26 @@ export default { ...@@ -1233,6 +1234,26 @@ export default {
</script> </script>
<style scoped lang="scss" > <style scoped lang="scss" >
.mask {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.5);
display: flex;
align-items: center;
justify-content: center;
}
.mask-content {
display: flex;
align-items: center;
justify-content: center;
color: #1a74be;
font-size: 16px;
}
::v-deep .el-form-item { ::v-deep .el-form-item {
margin-bottom: 12px; margin-bottom: 12px;
} }
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/violationDisciplineentry/index.vue
...@@ -977,6 +977,26 @@ export default { ...@@ -977,6 +977,26 @@ export default {
</script> </script>
<style scoped lang="scss" > <style scoped lang="scss" >
.mask {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.5);
display: flex;
align-items: center;
justify-content: center;
}
.mask-content {
display: flex;
align-items: center;
justify-content: center;
color: #1a74be;
font-size: 16px;
}
::v-deep .el-form-item { ::v-deep .el-form-item {
margin-bottom: 12px; margin-bottom: 12px;
} }
......
ruoyi-ui/src/views/smartSchool/classAdviser/headmasterLesson/headmasterLesson.vue
<template> <template>
<div class="app-container " style="padding: 15px 20px 15px 15px;"> <div class="app-container " style="padding: 15px 20px 15px 15px;">
<el-row> <el-row>
<el-col :span="20"> <el-col :span="20">
<el-row> <el-row>
<el-col> <el-col>
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairStudentManage/index.vue
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column key="support" width="150" align="center" prop="support" label="接收资助情况"></el-table-column> <el-table-column key="support" width="150" align="center" prop="support" label="接收资助情况"></el-table-column>
<el-table-column label="操作" align="center" min-width="200px" fixed="right"> <el-table-column label="操作" align="center" min-width="280px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="parentsEdit(scope.row)">家长信息 <el-button size="mini" type="text" @click="parentsEdit(scope.row)">家长信息
</el-button> </el-button>
...@@ -196,6 +196,11 @@ ...@@ -196,6 +196,11 @@
</el-button> </el-button>
<el-button size="mini" type="text" @click="studentProve(scope.row)" v-hasPermi="['system:student:edit']">学籍证明 <el-button size="mini" type="text" @click="studentProve(scope.row)" v-hasPermi="['system:student:edit']">学籍证明
</el-button> </el-button>
<el-button size="mini" type="text" @click="award(scope.row)">嘉奖
</el-button>
<el-button size="mini" type="text" @click="discipline(scope.row)">违纪
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -921,6 +926,33 @@ export default { ...@@ -921,6 +926,33 @@ export default {
// } // }
// }) // })
// }, // },
// 学生嘉奖
award(row) {
this.$router.push({
path: '/classAdviser/studentManage/studentCommendation',
query: {
// id: row.id,
// name: row.studentName,
// idCard: row.idCard,
// schoolNo: row.schoolNo,
// schoolYear: this.queryParams.schoolYear
}
})
},
//违纪
discipline(row) {
this.$router.push({
path: '/classAdviser/studentManage/discipline',
query: {
// id: row.id,
// name: row.studentName,
// idCard: row.idCard,
// schoolNo: row.schoolNo,
// schoolYear: this.queryParams.schoolYear
}
})
},
studentTable(row) { studentTable(row) {
console.log('准备跳转'); console.log('准备跳转');
const baseUrl = window.location.origin; // 获取当前页面的协议、主机作为前缀URL const baseUrl = window.location.origin; // 获取当前页面的协议、主机作为前缀URL
......
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