Skip to content

D
dd_school
Commit c7972b4c by zhaopanyu
Options

zpy 12.20

parent b4c21519
Showing with 353 additions and 118 deletions
.DS_Store
No preview for this file type
ruoyi-ui/src/views/smartSchool/electronicArchives/examinationScore/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
<el-row>
<el-col :span="12">
<el-form-item label="届别" prop="year"> <el-form-item label="届别" prop="year">
<el-select v-model="queryParams.year" placeholder="请选择"> <el-select v-model="queryParams.year" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label" :value="dict.value"> <el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
...@@ -14,10 +20,16 @@ ...@@ -14,10 +20,16 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="教师姓名" prop="teacherName"> <el-form-item label="教师姓名" prop="teacherName">
<el-input v-model="queryParams.teacherName" placeholder="请输入教师姓名" clearable <el-input v-model="queryParams.teacherName" placeholder="请输入教师姓名" clearable
@keyup.enter.native="handleQuery" /> @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="授课班级" prop="teachingClassName"> <el-form-item label="授课班级" prop="teachingClassName">
<el-select v-model="queryParams.teachingClassName" placeholder="请选择" style="width: 100%"> <el-select v-model="queryParams.teachingClassName" placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.class_num" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.class_num" :key="dict.value" :label="dict.label"
...@@ -25,6 +37,10 @@ ...@@ -25,6 +37,10 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="班级类型" prop="classType"> <el-form-item label="班级类型" prop="classType">
<el-select v-model="queryParams.classType" placeholder="请选择" style="width: 100%"> <el-select v-model="queryParams.classType" placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label"
...@@ -32,6 +48,8 @@ ...@@ -32,6 +48,8 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="高考评优" prop="gkAppraising"> <el-form-item label="高考评优" prop="gkAppraising">
<el-select v-model="queryParams.gkAppraising" placeholder="请选择" style="width: 100%"> <el-select v-model="queryParams.gkAppraising" placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.gk_appraising" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.gk_appraising" :key="dict.value" :label="dict.label"
...@@ -39,15 +57,20 @@ ...@@ -39,15 +57,20 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-dialog>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:achievement:add']">新增</el-button> v-hasPermi="['system:achievement:add']">新增</el-button>
</el-col> </el-col>
...@@ -70,15 +93,15 @@ ...@@ -70,15 +93,15 @@
@selection-change="handleSelectionChange" :default-sort="{ prop: 'year', order: 'descending' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'year', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" sortable /> <el-table-column type="selection" width="55" align="center" sortable />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable />
<el-table-column label="届别" align="center" prop="year" sortable /> <el-table-column label="届别" align="center" prop="year" sortable width="80" />
<el-table-column label="学科" align="center" prop="sub" sortable> <el-table-column label="学科" align="center" prop="sub" sortable width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" /> <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="教师姓名" align="center" prop="teacherName" sortable /> <el-table-column label="教师姓名" align="center" prop="teacherName" sortable width="160" />
<el-table-column label="授课班级" align="center" prop="teachingClassName" sortable /> <el-table-column label="授课班级" align="center" prop="teachingClassName" sortable width="150" />
<el-table-column label="班级类型" align="center" prop="classType" sortable> <el-table-column label="班级类型" align="center" prop="classType" sortable show-overflow-tooltip width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="getSelectedTypes(scope.row.classType).length > 0"> <span v-if="getSelectedTypes(scope.row.classType).length > 0">
<span v-for="(option, index) in getSelectedTypes(scope.row.classType)" :key="index"> <span v-for="(option, index) in getSelectedTypes(scope.row.classType)" :key="index">
...@@ -88,15 +111,15 @@ ...@@ -88,15 +111,15 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="高考评优" align="center" prop="gkAppraising" sortable> <el-table-column label="高考评优" align="center" prop="gkAppraising" sortable width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.gk_appraising" :value="scope.row.gkAppraising" /> <dict-tag :options="dict.type.gk_appraising" :value="scope.row.gkAppraising" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="尖子生培养" align="center" prop="topStudentsCulture" sortable /> <el-table-column label="尖子生培养" align="center" prop="topStudentsCulture" sortable width="150" />
<el-table-column label="增量情况" align="center" prop="incrementSituation" sortable /> <el-table-column label="增量情况" align="center" prop="incrementSituation" sortable width="150" />
<el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable /> <el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable width="150" />
<el-table-column label="其他情况" align="center" prop="other" sortable /> <el-table-column label="其他情况" align="center" prop="other" sortable width="150" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']"
...@@ -323,6 +346,7 @@ export default { ...@@ -323,6 +346,7 @@ export default {
open: false, open: false,
isEdit: false, isEdit: false,
look: false, look: false,
query: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -374,6 +398,7 @@ export default { ...@@ -374,6 +398,7 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
/** 查询高考成绩列表 */ /** 查询高考成绩列表 */
getList() { getList() {
this.loading = true; this.loading = true;
...@@ -458,13 +483,19 @@ export default { ...@@ -458,13 +483,19 @@ export default {
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
},
/** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
this.getList(); this.getList();
this.query = false;
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
...@@ -546,16 +577,24 @@ export default { ...@@ -546,16 +577,24 @@ export default {
}; };
</script> </script>
<style scoped lang="scss" > <style scoped lang="scss" >
::v-deep .el-form-item {
margin-bottom: 0px;
}
::v-deep .el-input--medium .el-input__inner { ::v-deep .el-input--medium .el-input__inner {
height: 26px; height: 26px;
line-height: 26px; line-height: 26px;
} }
::v-deep .el-dialog__body { ::v-deep .el-dialog__body {
padding: 20px padding: 10px 20px
} }
::v-deep .el-dialog:not(.is-fullscreen) { ::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important; margin-top: 4vh !important;
} }
.search ::v-deep .el-form-item__content {
width: 200px
}
</style> </style>
ruoyi-ui/src/views/smartSchool/electronicArchives/personalInformation/index.vue
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
<div class="seach"> <div class="seach">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
<el-form-item label="教师信息" prop="name"> <el-form-item label="教师信息" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入教师姓名" clearable style="width: 600px;" /> <el-input v-model="queryParams.name" placeholder="请输入教师姓名" clearable style="width: 250px;" />
</el-form-item> </el-form-item>
<el-form-item label="身份证号" prop="idCard"> <el-form-item label="身份证号" prop="idCard">
<el-input v-model="queryParams.idCard" placeholder="请输入身份证号" clearable style="width: 600px;" /> <el-input v-model="queryParams.idCard" placeholder="请输入身份证号" clearable style="width: 250px;" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="getList">查询</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">查询</el-button>
...@@ -524,7 +524,7 @@ ...@@ -524,7 +524,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">工作量信息</div> <div class="card_title">工作量信息</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="schoolAworkload"> <el-table :data="schoolAworkload" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="学年" align="center" prop="schoolYear" width="90px" fixed="left" /> <el-table-column label="学年" align="center" prop="schoolYear" width="90px" fixed="left" />
<el-table-column label="学期" align="center" prop="semester" fixed="left"> <el-table-column label="学期" align="center" prop="semester" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -570,8 +570,8 @@ ...@@ -570,8 +570,8 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">班主任考核</div> <div class="card_title">班主任考核</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="schoolAclassTeacherAssessments"> <el-table :data="schoolAclassTeacherAssessments" :row-style="{ height: '0' }"
<el-table-column type="index" label="序号" width="55" align="center" /> :cell-style="{ padding: '3px' }">
<el-table-column label="学年" align="center" prop="schoolYear" /> <el-table-column label="学年" align="center" prop="schoolYear" />
<el-table-column label="学期" align="center" prop="semester"> <el-table-column label="学期" align="center" prop="semester">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -586,7 +586,6 @@ ...@@ -586,7 +586,6 @@
</el-table-column> </el-table-column>
<el-table-column label="班级" align="center" prop="className" /> <el-table-column label="班级" align="center" prop="className" />
<el-table-column label="班级类型" align="center" prop="classType" width="180px"> <el-table-column label="班级类型" align="center" prop="classType" width="180px">
</el-table-column> </el-table-column>
<el-table-column label="姓名" align="center" prop="teacherName" /> <el-table-column label="姓名" align="center" prop="teacherName" />
<el-table-column label="学科" align="center" prop="sub"> <el-table-column label="学科" align="center" prop="sub">
...@@ -604,7 +603,7 @@ ...@@ -604,7 +603,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">专业成长</div> <div class="card_title">专业成长</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="specialityVos"> <el-table :data="specialityVos" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="成长类型" align="center" prop="growthType"> <el-table-column label="成长类型" align="center" prop="growthType">
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub"> <el-table-column label="学科" align="center" prop="sub">
...@@ -640,7 +639,7 @@ ...@@ -640,7 +639,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">高考成绩 </div> <div class="card_title">高考成绩 </div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="schoolGkAchievement"> <el-table :data="schoolGkAchievement" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="届别" align="center" prop="year" /> <el-table-column label="届别" align="center" prop="year" />
<el-table-column label="学科" align="center" prop="sub"> <el-table-column label="学科" align="center" prop="sub">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -667,7 +666,7 @@ ...@@ -667,7 +666,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">教学成绩</div> <div class="card_title">教学成绩</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="schoolXteachingAchievements"> <el-table :data="schoolXteachingAchievements" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="学年" align="center" prop="schoolYear" /> <el-table-column label="学年" align="center" prop="schoolYear" />
<el-table-column label="学期" align="center" prop="semester"> <el-table-column label="学期" align="center" prop="semester">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -708,7 +707,7 @@ ...@@ -708,7 +707,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">辅导老师获奖</div> <div class="card_title">辅导老师获奖</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="fudaoTeacher"> <el-table :data="fudaoTeacher" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="成长类型" align="center"> <el-table-column label="成长类型" align="center">
<template> <template>
<span>辅导老师获奖</span> <span>辅导老师获奖</span>
...@@ -755,7 +754,7 @@ ...@@ -755,7 +754,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">辅导学生获奖</div> <div class="card_title">辅导学生获奖</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="fudaoStudent"> <el-table :data="fudaoStudent" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="成长类型" align="center"> <el-table-column label="成长类型" align="center">
<template> <template>
<span>辅导学生获奖</span> <span>辅导学生获奖</span>
...@@ -797,7 +796,7 @@ ...@@ -797,7 +796,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">年度考核</div> <div class="card_title">年度考核</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="schoolAnnualAssessment"> <el-table :data="schoolAnnualAssessment" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="姓名" align="center" prop="name" /> <el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="年度" align="center" prop="year" /> <el-table-column label="年度" align="center" prop="year" />
<el-table-column label="考核结果" align="center" prop="checkResult"> <el-table-column label="考核结果" align="center" prop="checkResult">
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teamAward/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
<el-row>
<el-col :span="12">
<el-form-item label="学年" prop="schoolYear"> <el-form-item label="学年" prop="schoolYear">
<el-select v-model="queryParams.schoolYear" placeholder="请选择" style="width: 190px;"> <el-select v-model="queryParams.schoolYear" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label" :value="dict.value"> <el-option v-for=" dict in dict.type.yearda" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="学期" prop="semester"> <el-form-item label="学期" prop="semester">
<el-select v-model="queryParams.semester" placeholder="请选择"> <el-select v-model="queryParams.semester" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="届别" prop="year"> <el-form-item label="届别" prop="year">
<el-select v-model="queryParams.year" placeholder="请选择"> <el-select v-model="queryParams.year" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label" :value="dict.value"> <el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="年级" prop="grade"> <el-form-item label="年级" prop="grade">
<el-select v-model="queryParams.grade" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.grade" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label" :value="dict.value"> <el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
...@@ -33,14 +51,19 @@ ...@@ -33,14 +51,19 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-dialog>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:award:add']">新增</el-button> v-hasPermi="['system:award:add']">新增</el-button>
</el-col> </el-col>
...@@ -59,12 +82,12 @@ ...@@ -59,12 +82,12 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="awardList" @selection-change="handleSelectionChange" <el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" v-loading="loading" :data="awardList"
:default-sort="{ prop: 'schoolYear', order: 'descending' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'schoolYear', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" />
<el-table-column label="学年" align="center" prop="schoolYear" sortable /> <el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="120px" />
<el-table-column label="学期" align="center" prop="semester" sortable> <el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" /> <dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" />
</template> </template>
...@@ -84,10 +107,12 @@ ...@@ -84,10 +107,12 @@
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" /> <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖情况" align="center" prop="awardSituation" sortable /> <el-table-column label="获奖情况" align="center" prop="awardSituation" sortable show-overflow-tooltip
<el-table-column label="团队成员贡献情况" align="center" prop="teamMembersContribution" sortable /> width="180px" />
<el-table-column label="团队成员贡献情况" align="center" prop="teamMembersContribution" sortable width="200"
show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" sortable /> <el-table-column label="备注" align="center" prop="remark" sortable />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']"
v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">修改</el-button> v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">修改</el-button>
...@@ -269,6 +294,7 @@ export default { ...@@ -269,6 +294,7 @@ export default {
return { return {
// 遮罩层 // 遮罩层
loading: true, loading: true,
query: false,
// 选中数组 // 选中数组
ids: [], ids: [],
// 非单个禁用 // 非单个禁用
...@@ -410,13 +436,18 @@ export default { ...@@ -410,13 +436,18 @@ export default {
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
this.resetcx();
},
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.query = true;
this.getList(); this.getList();
this.query = false;
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
...@@ -483,3 +514,25 @@ export default { ...@@ -483,3 +514,25 @@ export default {
} }
}; };
</script> </script>
<style lang="less" scoped>
::v-deep .el-form-item {
margin-bottom: 0px;
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body {
padding: 10px 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
.search ::v-deep .el-form-item__content {
width: 200px
}
</style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/personWork/examinationScore/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
<el-row>
<el-col :span="12">
<el-form-item label="届别" prop="year"> <el-form-item label="届别" prop="year">
<el-select v-model="queryParams.year" placeholder="请选择"> <el-select v-model="queryParams.year" placeholder="请选择">
<el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label" :value="dict.value"> <el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
...@@ -14,10 +20,16 @@ ...@@ -14,10 +20,16 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="教师姓名" prop="teacherName"> <el-form-item label="教师姓名" prop="teacherName">
<el-input v-model="queryParams.teacherName" placeholder="请输入教师姓名" clearable <el-input v-model="queryParams.teacherName" placeholder="请输入教师姓名" clearable
@keyup.enter.native="handleQuery" /> @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="授课班级" prop="teachingClassName"> <el-form-item label="授课班级" prop="teachingClassName">
<el-select v-model="queryParams.teachingClassName" placeholder="请选择" style="width: 100%"> <el-select v-model="queryParams.teachingClassName" placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.class_num" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.class_num" :key="dict.value" :label="dict.label"
...@@ -25,13 +37,19 @@ ...@@ -25,13 +37,19 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="班级类型" prop="classType"> <el-form-item label="班级类型" prop="classType">
<el-select v-model="queryParams.classType" multiple placeholder="请选择" style="width: 100%"> <el-select v-model="queryParams.classType" placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="高考评优" prop="gkAppraising"> <el-form-item label="高考评优" prop="gkAppraising">
<el-select v-model="queryParams.gkAppraising" placeholder="请选择" style="width: 100%"> <el-select v-model="queryParams.gkAppraising" placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.gk_appraising" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.gk_appraising" :key="dict.value" :label="dict.label"
...@@ -39,15 +57,21 @@ ...@@ -39,15 +57,21 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-dialog>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:achievement:add']">新增</el-button> v-hasPermi="['system:achievement:add']">新增</el-button>
</el-col> </el-col>
...@@ -66,19 +90,19 @@ ...@@ -66,19 +90,19 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :data="achievementList" @selection-change="handleSelectionChange" <el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="achievementList"
:default-sort="{ prop: 'year', order: 'descending' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'year', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" sortable />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable />
<el-table-column label="届别" align="center" prop="year" sortable /> <el-table-column label="届别" align="center" prop="year" sortable width="80" />
<el-table-column label="学科" align="center" prop="sub" sortable> <el-table-column label="学科" align="center" prop="sub" sortable width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" /> <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="教师姓名" align="center" prop="teacherName" sortable /> <el-table-column label="教师姓名" align="center" prop="teacherName" sortable width="150" />
<el-table-column label="授课班级" align="center" prop="teachingClassName" sortable /> <el-table-column label="授课班级" align="center" prop="teachingClassName" sortable width="130" />
<el-table-column label="班级类型" align="center" prop="classType" sortable> <el-table-column label="班级类型" align="center" prop="classType" sortable show-overflow-tooltip width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="getSelectedTypes(scope.row.classType).length > 0"> <span v-if="getSelectedTypes(scope.row.classType).length > 0">
<span v-for="(option, index) in getSelectedTypes(scope.row.classType)" :key="index"> <span v-for="(option, index) in getSelectedTypes(scope.row.classType)" :key="index">
...@@ -88,16 +112,16 @@ ...@@ -88,16 +112,16 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="高考评优" align="center" prop="gkAppraising" sortable> <el-table-column label="高考评优" align="center" prop="gkAppraising" sortable width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.gk_appraising" :value="scope.row.sub" /> <dict-tag :options="dict.type.gk_appraising" :value="scope.row.gkAppraising" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="尖子生培养" align="center" prop="topStudentsCulture" sortable /> <el-table-column label="尖子生培养" align="center" prop="topStudentsCulture" sortable width="150" />
<el-table-column label="增量情况" align="center" prop="incrementSituation" sortable /> <el-table-column label="增量情况" align="center" prop="incrementSituation" sortable width="150" />
<el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable /> <el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable width="180" />
<el-table-column label="其他" align="center" prop="other" sortable /> <el-table-column label="其他情况" align="center" prop="other" sortable width="150" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
<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)"
v-hasPermi="['system:achievement:edit']" v-hasPermi="['system:achievement:edit']"
...@@ -238,6 +262,7 @@ export default { ...@@ -238,6 +262,7 @@ export default {
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
isEdit: false, isEdit: false,
query: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -355,13 +380,19 @@ export default { ...@@ -355,13 +380,19 @@ export default {
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
},
/** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
this.getList(); this.getList();
this.query = false;
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
...@@ -447,3 +478,25 @@ export default { ...@@ -447,3 +478,25 @@ export default {
} }
}; };
</script> </script>
<style scoped lang="scss" >
::v-deep .el-form-item {
margin-bottom: 0px;
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body {
padding: 10px 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
.search ::v-deep .el-form-item__content {
width: 200px
}
</style>
ruoyi-ui/src/views/smartSchool/personWork/personalInformation/index.vue
...@@ -512,7 +512,7 @@ ...@@ -512,7 +512,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">工作量信息</div> <div class="card_title">工作量信息</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="schoolAworkload"> <el-table :data="schoolAworkload" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="学年" align="center" prop="schoolYear" width="90px" fixed="left" /> <el-table-column label="学年" align="center" prop="schoolYear" width="90px" fixed="left" />
<el-table-column label="学期" align="center" prop="semester" fixed="left"> <el-table-column label="学期" align="center" prop="semester" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -558,8 +558,8 @@ ...@@ -558,8 +558,8 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">班主任考核</div> <div class="card_title">班主任考核</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="schoolAclassTeacherAssessments"> <el-table :data="schoolAclassTeacherAssessments" :row-style="{ height: '0' }"
<el-table-column type="index" label="序号" width="55" align="center" /> :cell-style="{ padding: '3px' }">
<el-table-column label="学年" align="center" prop="schoolYear" /> <el-table-column label="学年" align="center" prop="schoolYear" />
<el-table-column label="学期" align="center" prop="semester"> <el-table-column label="学期" align="center" prop="semester">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -592,7 +592,7 @@ ...@@ -592,7 +592,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">专业成长</div> <div class="card_title">专业成长</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="specialityVos"> <el-table :data="specialityVos" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="成长类型" align="center" prop="growthType"> <el-table-column label="成长类型" align="center" prop="growthType">
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub"> <el-table-column label="学科" align="center" prop="sub">
...@@ -628,7 +628,7 @@ ...@@ -628,7 +628,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">高考成绩 </div> <div class="card_title">高考成绩 </div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="schoolGkAchievement"> <el-table :data="schoolGkAchievement" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="届别" align="center" prop="year" /> <el-table-column label="届别" align="center" prop="year" />
<el-table-column label="学科" align="center" prop="sub"> <el-table-column label="学科" align="center" prop="sub">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -655,7 +655,7 @@ ...@@ -655,7 +655,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">教学成绩</div> <div class="card_title">教学成绩</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="schoolXteachingAchievements"> <el-table :data="schoolXteachingAchievements" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="学年" align="center" prop="schoolYear" /> <el-table-column label="学年" align="center" prop="schoolYear" />
<el-table-column label="学期" align="center" prop="semester"> <el-table-column label="学期" align="center" prop="semester">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -696,7 +696,7 @@ ...@@ -696,7 +696,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">辅导老师获奖</div> <div class="card_title">辅导老师获奖</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="fudaoTeacher"> <el-table :data="fudaoTeacher" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="成长类型" align="center"> <el-table-column label="成长类型" align="center">
<template> <template>
<span>辅导老师获奖</span> <span>辅导老师获奖</span>
...@@ -743,7 +743,7 @@ ...@@ -743,7 +743,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">辅导学生获奖</div> <div class="card_title">辅导学生获奖</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="fudaoStudent"> <el-table :data="fudaoStudent" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="成长类型" align="center"> <el-table-column label="成长类型" align="center">
<template> <template>
<span>辅导学生获奖</span> <span>辅导学生获奖</span>
...@@ -785,7 +785,7 @@ ...@@ -785,7 +785,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">年度考核</div> <div class="card_title">年度考核</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="schoolAnnualAssessment"> <el-table :data="schoolAnnualAssessment" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="姓名" align="center" prop="name" /> <el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="年度" align="center" prop="year" /> <el-table-column label="年度" align="center" prop="year" />
<el-table-column label="考核结果" align="center" prop="checkResult"> <el-table-column label="考核结果" align="center" prop="checkResult">
......
ruoyi-ui/src/views/smartSchool/personWork/teamAward/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
<el-row>
<el-col :span="12">
<el-form-item label="学年" prop="schoolYear"> <el-form-item label="学年" prop="schoolYear">
<el-select v-model="queryParams.schoolYear" placeholder="请选择" style="width: 190px;"> <el-select v-model="queryParams.schoolYear" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label" :value="dict.value"> <el-option v-for=" dict in dict.type.yearda" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="学期" prop="semester"> <el-form-item label="学期" prop="semester">
<el-select v-model="queryParams.semester" placeholder="请选择"> <el-select v-model="queryParams.semester" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="届别" prop="year"> <el-form-item label="届别" prop="year">
<el-select v-model="queryParams.year" placeholder="请选择"> <el-select v-model="queryParams.year" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label" :value="dict.value"> <el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="年级" prop="grade"> <el-form-item label="年级" prop="grade">
<el-select v-model="queryParams.grade" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.grade" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label" :value="dict.value"> <el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
...@@ -33,14 +51,20 @@ ...@@ -33,14 +51,20 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-dialog>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:teamaward:add']">新增</el-button> v-hasPermi="['system:teamaward:add']">新增</el-button>
</el-col> </el-col>
...@@ -59,12 +83,12 @@ ...@@ -59,12 +83,12 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="awardList" @selection-change="handleSelectionChange" <el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" v-loading="loading" :data="awardList"
:default-sort="{ prop: 'schoolYear', order: 'descending' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'schoolYear', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" />
<el-table-column label="学年" align="center" prop="schoolYear" sortable /> <el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="120px" />
<el-table-column label="学期" align="center" prop="semester" sortable> <el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" /> <dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" />
</template> </template>
...@@ -84,16 +108,17 @@ ...@@ -84,16 +108,17 @@
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" /> <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖情况" align="center" prop="awardSituation" sortable /> <el-table-column label="获奖情况" align="center" prop="awardSituation" sortable show-overflow-tooltip
<el-table-column label="团队成员贡献情况" align="center" prop="teamMembersContribution" sortable /> width="180px" />
<el-table-column label="团队成员贡献情况" align="center" prop="teamMembersContribution" sortable width="200"
show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" sortable /> <el-table-column label="备注" align="center" prop="remark" sortable />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" 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)"
v-hasPermi="['system:teamaward:edit']" v-hasPermi="['system:teamaward:edit']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
<el-button size="mini" type="text" @click="handleLook(scope.row)" <el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:teamaward:look']"
v-hasPermi="['system:teamaward:look']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)" <el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:teamaward:remove']" v-hasPermi="['system:teamaward:remove']"
...@@ -214,6 +239,7 @@ export default { ...@@ -214,6 +239,7 @@ export default {
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
isEdit: false, isEdit: false,
query: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -346,13 +372,18 @@ export default { ...@@ -346,13 +372,18 @@ export default {
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
this.resetcx();
},
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.query = true;
this.getList(); this.getList();
this.query = false;
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
...@@ -422,3 +453,25 @@ export default { ...@@ -422,3 +453,25 @@ export default {
} }
}; };
</script> </script>
<style lang="less" scoped>
::v-deep .el-form-item {
margin-bottom: 0px;
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body {
padding: 10px 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
.search ::v-deep .el-form-item__content {
width: 200px
}
</style>
\ No newline at end of file
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