Skip to content

D
dd_school
Commit 56b18d1f by wangjian
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolTeacherBasicInformationVo.java
#	smart-campus/src/main/resources/file/教师基础信息导入模板.xlsx
parents 1752b83f 87ef4264
Showing with 664 additions and 344 deletions
ruoyi-admin/src/main/resources/application-druid.yml
......@@ -9,10 +9,14 @@ spring:
# url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
# username: root
# password: password
# master:
# url: jdbc:mysql://1.116.38.25:3986/dd_smart_school?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
# username: henneg
# password: heneng2024
master:
url: jdbc:mysql://1.116.38.25:3986/dd_smart_school?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
username: henneg
password: heneng2024
url: jdbc:mysql://192.168.31.167:3306/dd_smart_school?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
username: root
password: qianhe2024
# #二中
# master:
# url: jdbc:mysql://10.20.100.201:3306/dd_smart_school?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
......
ruoyi-ui/src/router/index.js
......@@ -89,6 +89,8 @@ export const constantRoutes = [
),
hidden: true,
},
//教师电子档案
//课程表
{
path: "/printLesson",
......@@ -211,6 +213,27 @@ export const dynamicRoutes = [
},
],
},
// {
// path: "/electronicArchives/personalInformation",
// component: () =>
// import("@/views/smartSchool/electronicArchives/personalInformation"),
// hidden: true,
// },
{
path: "/",
component: Layout,
hidden: true,
redirect: "noredirect",
children: [
{
path: "electronicArchives/personalInformation",
component: () =>
import("@/views/smartSchool/electronicArchives/personalInformation"),
name: "personalInformation",
meta: { title: "教师个人信息汇总", icon: "" },
},
],
},
//科目数据
// {
// path: "/subjectManagement/data",
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/schoolAwards/awardEntry/index.vue
......@@ -20,8 +20,8 @@
</el-date-picker>
</el-form-item>
<el-form-item label="主导部门">
<Treeselect v-model="queryForm.competentDeptId" :options="deptOptions" :show-count="true" placeholder="请选择"
:defaultExpandLevel=1 style="width: 208px" filterable />
<Treeselect v-model="queryForm.competentDeptId" :options="deptOptions" :show-count="true"
placeholder="请选择" :defaultExpandLevel=1 style="width: 208px" filterable />
</el-form-item>
<el-form-item>
......@@ -122,8 +122,8 @@
<el-col :span="12">
<el-form-item label="主管部门" prop="competentDeptId">
<Treeselect v-model="form.competentDeptId" :options="deptOptions" :show-count="true"
placeholder="请选择" :default-expand-level=1 :style="{ width: '100%' }" @select="deptIdAndName"
filterable />
placeholder="请选择" :default-expand-level=1 :style="{ width: '100%' }"
@select="deptIdAndName" filterable />
</el-form-item>
</el-col>
</el-row>
......@@ -139,8 +139,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖时间" prop="awardsTime">
<el-date-picker v-model="form.awardsTime" type="date" placeholder="选择" value-format="yyyy-MM-dd"
:style="{ width: '100%' }">
<el-date-picker v-model="form.awardsTime" type="date" placeholder="选择"
value-format="yyyy-MM-dd" :style="{ width: '100%' }">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -244,8 +244,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖时间" prop="awardsTime">
<el-date-picker v-model="form.awardsTime" type="date" placeholder="选择" value-format="yyyy-MM-dd"
:style="{ width: '100%' }">
<el-date-picker v-model="form.awardsTime" type="date" placeholder="选择"
value-format="yyyy-MM-dd" :style="{ width: '100%' }">
</el-date-picker>
</el-form-item>
</el-col>
......
ruoyi-ui/src/views/smartSchool/electronicArchives/electronicRecords/index.vue
......@@ -32,7 +32,8 @@
</el-select>
</el-form-item>
<el-form-item label="姓名" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
<el-input v-model="queryParams.name" placeholder="请输入姓名" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
......@@ -67,8 +68,8 @@
v-hasPermi="['school:youthTeacher:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['school:youthTeacher:remove']">删除</el-button>
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
@click="handleDelete" v-hasPermi="['school:youthTeacher:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
......@@ -81,7 +82,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="youthTeacherList" @selection-change="handleSelectionChange"
<el-table border v-loading="loading" :data="youthTeacherList" @selection-change="handleSelectionChange"
:row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
:header-cell-style="{ height: '0px', fontSize: '12px', padding: '0 0' }">
<el-table-column type="selection" width="55" align="center" />
......@@ -108,8 +109,8 @@
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
<!-- 添加或修改青年教师成长档案对话框 -->
<el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
......@@ -127,8 +128,8 @@
<el-col :span="12">
<el-form-item label="学期" prop="semester">
<el-select v-model="form.semester" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -158,8 +159,8 @@
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -198,7 +199,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="研做高考题情况" prop="situation">
<el-input v-model="form.situation" placeholder="请输入研做高考题情况" />
<el-input v-model="form.situation" placeholder="请输入研做高考题情况" />
</el-form-item>
</el-col>
......@@ -233,8 +234,8 @@
<el-col :span="12">
<el-form-item label="学期" prop="semester">
<el-select v-model="form.semester" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -264,8 +265,8 @@
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -304,7 +305,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="研做高考题情况" prop="situation">
<el-input v-model="form.situation" placeholder="请输入研做高考题情况" />
<el-input v-model="form.situation" placeholder="请输入研做高考题情况" />
</el-form-item>
</el-col>
......@@ -313,7 +314,8 @@
<el-col :span="24">
<el-form-item label="优质课比赛:">
<li class="el-upload-list__item ele-upload-list__item-content">
<el-link :href="`${baseUrl}${form.classCompetitionUrl}`" :underline="false" target="_blank">
<el-link :href="`${baseUrl}${form.classCompetitionUrl}`" :underline="false"
target="_blank">
<span class="el-icon-document"> {{ form.classCompetitionName }} </span>
</el-link>
</li>
......@@ -332,7 +334,8 @@
<el-form-item prop="dataUrl">
<el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
:on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
:on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false"
drag>
<i class="el-icon-upload"></i>
<div class="el-upload__text">
将文件拖到此处，或<em>点击上传</em>
......@@ -722,4 +725,14 @@ export default {
.search ::v-deep .el-form-item__content {
width: 200px
}
::v-deep.el-table--border .el-table__cell .cell {
padding-left: 0px !important;
}
::v-deep .el-table-column--selection .cell {
padding-left: 0px !important;
/* padding-right: 14px; */
}
</style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/electronicArchives/examinationScore/index.vue
......@@ -96,13 +96,13 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
<el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }" @sort-change="sortChange"
:header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="achievementList"
@selection-change="handleSelectionChange" :default-sort="{ prop: 'year', order: 'descending' }">
<el-table-column type="selection" width="30" align="center" sortable />
<el-table-column type="index" label="序号" width="30" align="center" sortable />
<el-table-column label="届别" align="center" prop="year" sortable width="60" show-overflow-tooltip />
<el-table-column label="学科" align="center" prop="sub" sortable width="60" show-overflow-tooltip>
<el-table-column label="届别" align="center" prop="year" sortable width="55" show-overflow-tooltip />
<el-table-column label="学科" align="center" prop="sub" sortable width="55" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
......@@ -120,24 +120,24 @@
</span>
</template> -->
</el-table-column>
<el-table-column label="高考评优" align="center" prop="gkAppraising" sortable width="110" show-overflow-tooltip>
<el-table-column label="高考评优" align="center" prop="gkAppraising" sortable width="90" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.gk_appraising" :value="scope.row.gkAppraising" />
</template>
</el-table-column>
<el-table-column label="尖子生培养" align="center" prop="topStudentsCulture" sortable width="120"
show-overflow-tooltip />
<el-table-column label="增量情况" align="center" prop="incrementSituation" sortable width="120"
<el-table-column label="增量情况" align="center" prop="incrementSituation" sortable width="75"
show-overflow-tooltip />
<el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable width="120"
<el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable width="100"
show-overflow-tooltip />
<el-table-column label="其他情况" align="center" prop="other" sortable show-overflow-tooltip />
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="90" fixed="right">
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="75" fixed="right">
<template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)"
v-hasPermi="['system:honors:edit']"
......@@ -435,6 +435,8 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
orderByColumn: "",
isAsc: "asc",
sub: null,
teacherName: null,
year: null,
......@@ -482,6 +484,23 @@ export default {
this.getList();
},
methods: {
//排序列
sortChange(data) {
console.log(data, 'data');
const { prop, order } = data
//排序列
this.queryParams.orderByColumn = prop;
//排序顺序ascending或descending
// this.queryParams.isAsc = order;
if (order == "ascending") {
this.queryParams.isAsc = 'asc';
} else {
this.queryParams.isAsc = 'desc';
}
//返回第一页
this.queryParams.pageNum = 1;
this.getList();
},
//下载模版
importTemplate() {
this.download(
......@@ -784,4 +803,9 @@ export default {
padding: 0;
}
::v-deep.el-table--border .el-table__cell .cell {
padding-left: 0px !important;
}
</style>
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/annualAssessment/index.vue
......@@ -4,7 +4,8 @@
class="search">
<el-form-item label="年度" prop="year">
<el-select v-model="queryParams.year" clearable 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-select>
</el-form-item>
......@@ -35,8 +36,8 @@
v-hasPermi="['school: annualAssessment:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['school:annualAssessment:remove']">删除</el-button>
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
@click="handleDelete" v-hasPermi="['school:annualAssessment:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
......@@ -49,7 +50,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table :data="assessmentList" @selection-change="handleSelectionChange" :row-style="{ height: '0' }"
<el-table border :data="assessmentList" @selection-change="handleSelectionChange" :row-style="{ height: '0' }"
:cell-style="{ padding: '3px' }">
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" width="55" label="序号" align="center" />
......@@ -71,14 +72,15 @@
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
<el-dialog :title="title" :visible.sync="uploadOpen" width="520px" append-to-body inline @close="cancel">
<el-form ref="uploadForm" :model="uploadForm" :rules="rules" label-width="70px">
<el-form-item prop="dataUrl">
<el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
:on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
:on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false"
drag>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
......@@ -397,4 +399,9 @@ export default {
.search ::v-deep .el-form-item__content {
width: 200px
}
::v-deep.el-table--border .el-table__cell .cell {
padding-left: 0px !important;
}
</style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/essaysWritings/index.vue
<template>
<div class="app-container">
<el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
......@@ -7,8 +6,8 @@
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -35,7 +34,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardLevel">
<el-select v-model="queryParams.awardLevel" clearable placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardLevel" clearable placeholder="请选择"
style="width: 100%;">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -52,15 +52,15 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖开始时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
<el-date-picker clearable v-model="queryParams.startTime" type="date"
value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖结束时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
<el-date-picker clearable v-model="queryParams.endTime" type="date"
value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -84,8 +84,8 @@
v-hasPermi="['system:works:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:works:remove']">删除</el-button>
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
@click="handleDelete" v-hasPermi="['system:works:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
......@@ -93,7 +93,7 @@
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
<el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
:header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="worksList"
@selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<el-table-column type="selection" width="30" align="center" />
......@@ -103,7 +103,8 @@
<span>论文论著</span>
</template>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="60px" show-overflow-tooltip>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="60px"
show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
......@@ -123,11 +124,10 @@
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
</template>
</el-table-column>
<el-table-column label="论文论著-成果名称" align="center" prop="resultName" sortable width="130px"
show-overflow-tooltip />
<el-table-column label="论文论著-成果名称" align="center" prop="resultName" sortable show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="80px" show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" sortable width="100px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardTime" sortable show-overflow-tooltip>
<el-table-column label="主办单位" align="center" prop="org" sortable width="110px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="100px" sortable show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template>
......@@ -137,7 +137,8 @@
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right"
width="150px">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:honors:edit']"
......@@ -151,8 +152,8 @@
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
<!-- 添加或修改论文著作对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
......@@ -161,8 +162,8 @@
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -170,8 +171,8 @@
<el-col :span="12">
<el-form-item label="获奖类别" prop="awardType">
<el-select v-model="form.awardType" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.award_categories" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.award_categories" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -260,8 +261,8 @@
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -694,7 +695,7 @@ export default {
}
};
</script>
<style scoped lang="scss" >
<style scoped lang="scss">
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
......@@ -755,4 +756,9 @@ export default {
padding: 0;
}
::v-deep.el-table--border .el-table__cell .cell {
padding-left: 0px !important;
}
</style>
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/lectureAwards/index.vue
......@@ -6,8 +6,8 @@
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -34,7 +34,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardLevel">
<el-select v-model="queryParams.awardLevel" clearable placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardLevel" clearable placeholder="请选择"
style="width: 100%;">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -51,15 +52,15 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖开始时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
<el-date-picker clearable v-model="queryParams.startTime" type="date"
value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖结束时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
<el-date-picker clearable v-model="queryParams.endTime" type="date"
value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -83,8 +84,8 @@
v-hasPermi="['system:awards:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:awards:remove']">删除</el-button>
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
@click="handleDelete" v-hasPermi="['system:awards:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
......@@ -92,7 +93,7 @@
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
<el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
:header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="awardsList"
@selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<el-table-column type="selection" width="30" align="center" />
......@@ -102,7 +103,8 @@
<span>讲课获奖</span>
</template>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" show-overflow-tooltip width="65px">
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" show-overflow-tooltip
width="65px">
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
......@@ -122,11 +124,10 @@
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
</template>
</el-table-column>
<el-table-column label="讲课获奖-成果名称" align="center" prop="resultName" sortable width="140px"
show-overflow-tooltip />
<el-table-column label="讲课获奖-成果名称" align="center" prop="resultName" sortable show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="80px" show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" sortable width="100px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardTime" sortable show-overflow-tooltip>
<el-table-column label="主办单位" align="center" prop="org" sortable width="110px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="100px" sortable show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template>
......@@ -136,7 +137,8 @@
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="160px">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right"
width="160px">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:honors:edit']"
......@@ -150,8 +152,8 @@
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
<!-- 添加或修改讲课获奖对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
......@@ -160,8 +162,8 @@
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -260,8 +262,8 @@
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -692,7 +694,7 @@ export default {
}
};
</script>
<style scoped lang="scss" >
<style scoped lang="scss">
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
......@@ -753,4 +755,9 @@ export default {
padding: 0;
}
::v-deep.el-table--border .el-table__cell .cell {
padding-left: 0px !important;
}
</style>
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teacherAwards/index.vue
......@@ -6,8 +6,8 @@
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -34,7 +34,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardLevel">
<el-select v-model="queryParams.awardLevel" clearable placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardLevel" clearable placeholder="请选择"
style="width: 100%;">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -51,8 +52,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖开始时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
<el-date-picker clearable v-model="queryParams.startTime" type="date"
value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -60,8 +61,8 @@
<el-row>
<el-col :span="12">
<el-form-item label="获奖结束时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
<el-date-picker clearable v-model="queryParams.endTime" type="date"
value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -85,8 +86,8 @@
v-hasPermi="['school:teacherAwards:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['school:teacherAwards:remove']">删除</el-button>
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
@click="handleDelete" v-hasPermi="['school:teacherAwards:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
......@@ -95,7 +96,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
<el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
:header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="awardsList"
@selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<el-table-column type="selection" width="30" align="center" />
......@@ -105,7 +106,8 @@
<span>教学获奖</span>
</template>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" show-overflow-tooltip width="60px">
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" show-overflow-tooltip
width="60px">
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
......@@ -125,11 +127,10 @@
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
</template>
</el-table-column>
<el-table-column label="教学获奖-成果名称" align="center" prop="resultName" sortable width="140px"
show-overflow-tooltip />
<el-table-column label="教学获奖-成果名称" align="center" prop="resultName" sortable show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="80px" show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" sortable width="100px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardTime" sortable show-overflow-tooltip>
<el-table-column label="获奖时间" align="center" prop="awardTime" sortable width="100px" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template>
......@@ -139,7 +140,8 @@
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="160px">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right"
width="160px">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['school:teacherAwards:edit']"
......@@ -153,8 +155,8 @@
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
<!-- 添加或修改教师获奖对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
......@@ -163,8 +165,8 @@
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -261,8 +263,8 @@
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -690,7 +692,7 @@ export default {
}
};
</script>
<style scoped lang="scss" >
<style scoped lang="scss">
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
......@@ -751,4 +753,9 @@ export default {
padding: 0;
}
::v-deep.el-table--border .el-table__cell .cell {
padding-left: 0px !important;
}
</style>
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teachingAchievements/index.vue
......@@ -144,11 +144,11 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table :data="achievementsList" @selection-change="handleSelectionChange"
<el-table border :data="achievementsList" @selection-change="handleSelectionChange" @sort-change="sortChange"
:default-sort="{ prop: 'examTime', order: 'descending' }" :row-style="{ height: '1px' }"
: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="index" label="序号" width="30" align="center" sortable />
<el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" />
<el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="80px"
show-overflow-tooltip />
<el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="80px"
......@@ -157,7 +157,7 @@
<dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" />
</template>
</el-table-column>
<el-table-column label="考试时间" align="center" prop="examTime" width="120" sortable show-overflow-tooltip>
<el-table-column label="考试时间" align="center" prop="examTime" width="85" sortable show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.examTime, '{y}-{m}-{d}') }}</span>
</template>
......@@ -179,9 +179,9 @@
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="班级" align="center" width="100px" prop="className" sortable show-overflow-tooltip>
<el-table-column label="班级" align="center" width="60px" prop="className" sortable show-overflow-tooltip>
</el-table-column>
<el-table-column label="班级类型" align="center" sortable show-overflow-tooltip width="120px">
<el-table-column label="班级类型" align="center" sortable show-overflow-tooltip width="80px">
<template slot-scope="scope">
<span v-if="getSelectedTypes(scope.row.classType).length > 0">
<span v-for="(option, index) in getSelectedTypes(scope.row.classType)" :key="index">
......@@ -192,10 +192,12 @@
</template>
</el-table-column>
<!-- 新加 优生增量和常规增量-->
<el-table-column label="优生增量" align="center" prop="yszl" sortable show-overflow-tooltip />
<el-table-column label="常规增量" align="center" prop="cgzl" 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"
<el-table-column label="常规增量" align="center" prop="cgzl" sortable show-overflow-tooltip width="80px" />
<el-table-column label="优生增量" align="center" prop="yszl" sortable show-overflow-tooltip width="80px" />
<el-table-column label="增量分" align="center" prop="assessmentScore" sortable show-overflow-tooltip
width="70px" />
<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="100px"
fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
......@@ -344,13 +346,13 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="优生增量" prop="yszl">
<el-input v-model="form.yszl" placeholder="请输入优生增量" clearable />
<el-form-item label="常规增量" prop="cgzl">
<el-input v-model="form.cgzl" placeholder="请输入常规增量" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="常规增量" prop="cgzl">
<el-input v-model="form.cgzl" placeholder="请输入常规增量" clearable />
<el-form-item label="优生增量" prop="yszl">
<el-input v-model="form.yszl" placeholder="请输入优生增量" clearable />
</el-form-item>
</el-col>
</el-row>
......@@ -421,6 +423,8 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
orderByColumn: "",
isAsc: "asc",
userName: "",
schoolYear: "",
semester: "",
......@@ -483,6 +487,23 @@ export default {
this.getList();
},
methods: {
//排序列
sortChange(data) {
console.log(data, 'data');
const { prop, order } = data
//排序列
this.queryParams.orderByColumn = prop;
//排序顺序ascending或descending
// this.queryParams.isAsc = order;
if (order == "ascending") {
this.queryParams.isAsc = 'asc';
} else {
this.queryParams.isAsc = 'desc';
}
//返回第一页
this.queryParams.pageNum = 1;
this.getList();
},
/** 查询教学成绩列表 */
getList() {
this.loading = true;
......@@ -709,4 +730,14 @@ export default {
padding: 0;
}
::v-deep.el-table--border .el-table__cell .cell {
padding-left: 0px !important;
}
::v-deep.el-table--border .el-table__cell .cell {
padding-left: 0px !important;
}
</style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/officialWork/budgetFilling/index.vue
......@@ -65,7 +65,6 @@
</div>
</div>
<!-- 表格数据 -->
<el-button class="el-icon-plus" size="mini" @click="addLine()">增加</el-button>
<el-table border :data="postForm.xzTable" ref="xzTable" class="xzTable" :header-cell-style="{
......
ruoyi-ui/src/views/smartSchool/personWork/awardTutoringstu/index.vue
......@@ -6,8 +6,8 @@
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -15,8 +15,8 @@
<el-col :span="12">
<el-form-item label="获奖类别" prop="awardtype">
<el-select v-model="queryParams.awardtype" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.award_type_fdxs" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.award_type_fdxs" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -34,7 +34,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardlevel">
<el-select v-model="queryParams.awardlevel" clearable placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardlevel" clearable placeholder="请选择"
style="width: 100%;">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -58,15 +59,15 @@
<el-row>
<el-col :span="12">
<el-form-item label="获奖开始时间" prop="startTime">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
<el-date-picker clearable v-model="queryParams.startTime" type="date"
value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖结束时间" prop="endTime">
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
<el-date-picker clearable v-model="queryParams.endTime" type="date"
value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -90,8 +91,8 @@
v-hasPermi="['system:tutoringstu:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:tutoringstu:remove']">删除</el-button>
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
@click="handleDelete" v-hasPermi="['system:tutoringstu:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
......@@ -100,7 +101,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
<el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
:header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="awardsList"
@selection-change="handleSelectionChange" :default-sort="{ prop: 'awardtime', order: 'descending' }">
<el-table-column type="selection" width="30" align="center" />
......@@ -110,7 +111,8 @@
<span>辅导学生获奖</span>
</template>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="60px" show-overflow-tooltip>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="60px"
show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
......@@ -130,7 +132,8 @@
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" />
</template>
</el-table-column>
<el-table-column label="比赛名称" align="center" prop="resultname" sortable width="120px" show-overflow-tooltip />
<el-table-column label="比赛名称" align="center" prop="resultname" sortable width="120px"
show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="username" sortable width="80px" show-overflow-tooltip />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable width="80px"
show-overflow-tooltip />
......@@ -162,8 +165,8 @@
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
<!-- 添加或修改教师获奖对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
......@@ -172,8 +175,8 @@
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -181,8 +184,8 @@
<el-col :span="12">
<el-form-item label="获奖类别" prop="awardtype">
<el-select v-model="form.awardtype" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.award_type_fdxs" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.award_type_fdxs" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -576,7 +579,7 @@ export default {
}
};
</script>
<style scoped lang="scss" >
<style scoped lang="scss">
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
......@@ -637,4 +640,9 @@ export default {
padding: 0;
}
::v-deep.el-table--border .el-table__cell .cell {
padding-left: 0px !important;
}
</style>
ruoyi-ui/src/views/smartSchool/personWork/comprehensiveHonors/index.vue
......@@ -6,8 +6,8 @@
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -31,7 +31,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardLevel">
<el-select v-model="queryParams.awardLevel" clearable placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardLevel" clearable placeholder="请选择"
style="width: 100%;">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -48,8 +49,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖开始时间" prop="startTime">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
<el-date-picker clearable v-model="queryParams.startTime" type="date"
value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -57,8 +58,8 @@
<el-row>
<el-col :span="12">
<el-form-item label="获奖结束时间" prop="endTime">
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
<el-date-picker clearable v-model="queryParams.endTime" type="date"
value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -78,8 +79,8 @@
v-hasPermi="['system:honors:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:honors:remove']">删除</el-button>
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
@click="handleDelete" v-hasPermi="['system:honors:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
......@@ -88,7 +89,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
<el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
:header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="honorsList"
@selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<el-table-column type="selection" width="30" align="center" />
......@@ -99,7 +100,8 @@
<span>综合荣誉</span>
</template>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="65px" show-overflow-tooltip>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="65px"
show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
......@@ -129,24 +131,27 @@
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right"
width="150px">
<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 === '0' || scope.row.auditState === '3'">修改</el-button>
<el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:honors:look']"
<el-button size="mini" type="text" @click="handleLook(scope.row)"
v-hasPermi="['system:honors:look']"
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)"
v-hasPermi="['system:honors:remove']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button>
<el-button size="mini" type="text" @click="handleExamine(scope.row)" v-hasPermi="['system:honors:sub']"
v-if="scope.row.auditState === '0'">提交</el-button>
<el-button size="mini" type="text" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:sub']" v-if="scope.row.auditState === '0'">提交</el-button>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
<!-- 添加或修改综合荣誉对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
......@@ -155,8 +160,8 @@
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -593,7 +598,7 @@ export default {
}
};
</script>
<style scoped lang="scss" >
<style scoped lang="scss">
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
......@@ -655,4 +660,9 @@ export default {
padding: 0;
}
::v-deep.el-table--border .el-table__cell .cell {
padding-left: 0px !important;
}
</style>
ruoyi-ui/src/views/smartSchool/personWork/examinationScore/index.vue
......@@ -15,8 +15,8 @@
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -52,7 +52,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="高考评优" prop="gkAppraising">
<el-select v-model="queryParams.gkAppraising" clearable placeholder="请选择" style="width: 100%">
<el-select v-model="queryParams.gkAppraising" clearable placeholder="请选择"
style="width: 100%">
<el-option v-for="dict in dict.type.gk_appraising" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -67,7 +68,6 @@
</el-form-item>
</el-form>
</el-dialog>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
......@@ -81,8 +81,8 @@
v-hasPermi="['system:achievement:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:achievement:remove']">删除</el-button>
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
@click="handleDelete" v-hasPermi="['system:achievement:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
......@@ -90,8 +90,7 @@
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
<el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
:header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="achievementList"
@selection-change="handleSelectionChange" :default-sort="{ prop: 'year', order: 'descending' }">
<el-table-column type="selection" width="30" align="center" sortable />
......@@ -150,8 +149,8 @@
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
<!-- 添加或修改高考成绩对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
......@@ -160,8 +159,8 @@
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -491,7 +490,7 @@ export default {
}
};
</script>
<style scoped lang="scss" >
<style scoped lang="scss">
::v-deep .el-form-item {
margin-bottom: 0px;
}
......@@ -529,4 +528,14 @@ export default {
padding: 0;
}
::v-deep.el-table--border .el-table__cell .cell {
padding-left: 0px !important;
}
::v-deep.el-table--border .el-table__cell .cell {
padding-left: 0px !important;
}
</style>
ruoyi-ui/src/views/smartSchool/personWork/lectureAwards/index.vue
......@@ -6,8 +6,8 @@
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -34,7 +34,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardLevel">
<el-select v-model="queryParams.awardLevel" clearable placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardLevel" clearable placeholder="请选择"
style="width: 100%;">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -51,15 +52,15 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖开始时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
<el-date-picker clearable v-model="queryParams.startTime" type="date"
value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖结束时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
<el-date-picker clearable v-model="queryParams.endTime" type="date"
value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -84,8 +85,8 @@
v-hasPermi="['system:awards:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:awards:remove']">删除</el-button>
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
@click="handleDelete" v-hasPermi="['system:awards:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
......@@ -94,9 +95,9 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
<el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }" @sort-change="sortChange"
:header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="awardsList"
@selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
@selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'desc' }">
<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 label="成长类型" align="center" fixed="left" width="80px" show-overflow-tooltip>
......@@ -104,7 +105,8 @@
<span>讲课获奖</span>
</template>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" show-overflow-tooltip width="65px">
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" show-overflow-tooltip
width="65px">
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
......@@ -139,24 +141,27 @@
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180px">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right"
width="180px">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:awards:edit']"
<el-button size="mini" type="text" @click="handleUpdate(scope.row)"
v-hasPermi="['system:awards:edit']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
<el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:awards:look']"
<el-button size="mini" type="text" @click="handleLook(scope.row)"
v-hasPermi="['system:awards:look']"
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)"
v-hasPermi="['system:awards:remove']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button>
<el-button size="mini" type="text" @click="handleExamine(scope.row)" v-hasPermi="['system:awards:sub']"
v-if="scope.row.auditState === '0'">提交</el-button>
<el-button size="mini" type="text" @click="handleExamine(scope.row)"
v-hasPermi="['system:awards:sub']" v-if="scope.row.auditState === '0'">提交</el-button>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
<!-- 添加或修改讲课获奖对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
......@@ -165,8 +170,8 @@
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -311,6 +316,8 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
orderByColumn: "",
isAsc: "asc",
sub: null,
awardType: null,
awardRank: null,
......@@ -371,6 +378,23 @@ export default {
this.getList();
},
methods: {
//排序列
sortChange(data) {
console.log(data, 'data');
const { prop, order } = data
//排序列
this.queryParams.orderByColumn = prop;
//排序顺序ascending或descending
// this.queryParams.isAsc = order;
if (order == "ascending") {
this.queryParams.isAsc = 'asc';
} else {
this.queryParams.isAsc = 'desc';
}
//返回第一页
this.queryParams.pageNum = 1;
this.getList();
},
/** 查询讲课获奖列表 */
getList() {
......@@ -595,7 +619,7 @@ export default {
}
};
</script>
<style scoped lang="scss" >
<style scoped lang="scss">
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
......@@ -656,4 +680,9 @@ export default {
padding: 0;
}
::v-deep.el-table--border .el-table__cell .cell {
padding-left: 0px !important;
}
</style>
ruoyi-ui/src/views/smartSchool/personWork/teacherAwards/index.vue
......@@ -6,8 +6,8 @@
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -34,7 +34,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardLevel">
<el-select v-model="queryParams.awardLevel" clearable placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardLevel" clearable placeholder="请选择"
style="width: 100%;">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -51,8 +52,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖开始时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
<el-date-picker clearable v-model="queryParams.startTime" type="date"
value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -60,8 +61,8 @@
<el-row>
<el-col :span="12">
<el-form-item label="获奖结束时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
<el-date-picker clearable v-model="queryParams.endTime" type="date"
value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -85,8 +86,8 @@
v-hasPermi="['system:awards:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:awards:remove']">删除</el-button>
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
@click="handleDelete" v-hasPermi="['system:awards:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
......@@ -95,7 +96,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
<el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }" @sort-change="sortChange"
:header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="awardsList"
@selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<el-table-column type="selection" width="30" align="center" />
......@@ -105,7 +106,8 @@
<span>教学获奖</span>
</template>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" show-overflow-tooltip width="60px">
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" show-overflow-tooltip
width="60px">
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
......@@ -142,22 +144,24 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="160px
">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:awards:edit']"
<el-button size="mini" type="text" @click="handleUpdate(scope.row)"
v-hasPermi="['system:awards:edit']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
<el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:awards:look']"
<el-button size="mini" type="text" @click="handleLook(scope.row)"
v-hasPermi="['system:awards:look']"
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)"
v-hasPermi="['system:awards:remove']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button>
<el-button size="mini" type="text" @click="handleExamine(scope.row)" v-hasPermi="['system:awards:sub']"
v-if="scope.row.auditState === '0'">提交</el-button>
<el-button size="mini" type="text" @click="handleExamine(scope.row)"
v-hasPermi="['system:awards:sub']" v-if="scope.row.auditState === '0'">提交</el-button>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
<!-- 添加或修改教师获奖对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
......@@ -166,8 +170,8 @@
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -312,6 +316,8 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
orderByColumn: "",
isAsc: "asc",
sub: null,
awardType: null,
awardRank: null,
......@@ -371,6 +377,23 @@ export default {
this.getList();
},
methods: {
//排序列
sortChange(data) {
console.log(data, 'data');
const { prop, order } = data
//排序列
this.queryParams.orderByColumn = prop;
//排序顺序ascending或descending
// this.queryParams.isAsc = order;
if (order == "ascending") {
this.queryParams.isAsc = 'asc';
} else {
this.queryParams.isAsc = 'desc';
}
//返回第一页
this.queryParams.pageNum = 1;
this.getList();
},
/** 查询教师获奖列表 */
getList() {
this.loading = true;
......@@ -594,7 +617,7 @@ export default {
}
};
</script>
<style scoped lang="scss" >
<style scoped lang="scss">
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
......@@ -655,4 +678,9 @@ export default {
padding: 0;
}
::v-deep.el-table--border .el-table__cell .cell {
padding-left: 0px !important;
}
</style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/personWork/teamAward/index.vue
......@@ -5,7 +5,8 @@
<el-row>
<el-col :span="12">
<el-form-item label="学年" prop="schoolYear">
<el-select v-model="queryParams.schoolYear" clearable placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.schoolYear" clearable placeholder="请选择"
style="width: 100%;">
<el-option v-for=" dict in dict.type.yearda" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -15,8 +16,8 @@
<el-col :span="12">
<el-form-item label="学期" prop="semester">
<el-select v-model="queryParams.semester" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -46,8 +47,8 @@
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -73,8 +74,8 @@
v-hasPermi="['system:teamaward:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:teamaward:remove']">删除</el-button>
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
@click="handleDelete" v-hasPermi="['system:teamaward:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
......@@ -83,9 +84,10 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
:header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" v-loading="loading" :data="awardList"
@selection-change="handleSelectionChange" :default-sort="{ prop: 'schoolYear', order: 'descending' }">
<el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
:header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" v-loading="loading"
:data="awardList" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'schoolYear', order: 'descending' }">
<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 label="学年" align="center" prop="schoolYear" sortable fixed="left" width="80px"
......@@ -126,7 +128,8 @@
<el-button size="mini" type="text" @click="handleUpdate(scope.row)"
v-hasPermi="['system:teamaward:edit']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
<el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:teamaward:look']"
<el-button size="mini" type="text" @click="handleLook(scope.row)"
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>
<el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:teamaward:remove']"
......@@ -138,8 +141,8 @@
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
<!-- 添加或修改团队获奖对话框 -->
<el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
......@@ -157,8 +160,8 @@
<el-col :span="12">
<el-form-item label="学期" prop="semester">
<el-select v-model="form.semester" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -188,8 +191,8 @@
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -495,4 +498,9 @@ export default {
padding: 0;
}
::v-deep.el-table--border .el-table__cell .cell {
padding-left: 0px !important;
}
</style>
\ No newline at end of file
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolTeacherBasicInformation.java
......@@ -97,26 +97,26 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
/**
* 现职称(1无、2初级、3中级、4副高、5正高)
*/
@Excel(name = "现职称")
@Excel(name = "现具备专技资格")
private String currentProfessionalTitle;
/**
* 现职称取得资格时间
*/
@Excel(name = "现职称取得资格时间")
@Excel(name = "现具备专技资格时间")
// @JsonFormat(pattern = "yyyy-MM-dd")
private Date currentProfessionalTitleTime;
/**
* 现聘职称(1无、2初级、3中级、4副高、5正高)
*/
@Excel(name = "现聘职称")
@Excel(name = "现聘专技资格")
private String currentHiringProfessionalTitle;
/**
* 现职称聘任时间
*/
@Excel(name = "现职称聘任时间")
@Excel(name = "现聘专技资格时间")
// @JsonFormat(pattern = "yyyy-MM-dd")
private Date currentHiringProfessionalTitleTime;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolTeacherBasiclnExport.java
......@@ -97,25 +97,25 @@ public class SchoolTeacherBasiclnExport {
/**
* 现职称(1无、2初级、3中级、4副高、5正高)
*/
@Excel(name = "现职称" ,dictType= "current_professional")
@Excel(name = "现具备专技资格")
private String currentProfessionalTitle;
/**
* 现职称取得资格时间
*/
@Excel(name = "现职称取得时间" ,dateFormat="yyyy-MM-dd")
@Excel(name = "现具备专技资格时间" ,dateFormat="yyyy-MM-dd")
private Date currentProfessionalTitleTime;
/**
* 现聘职称(1无、2初级、3中级、4副高、5正高)
*/
@Excel(name = "现聘职称",dictType= "current_professional")
@Excel(name = "现聘专技资格")
private String currentHiringProfessionalTitle;
/**
* 现职称聘任时间
*/
@Excel(name = "现聘职称取得时间" ,dateFormat="yyyy-MM-dd")
@Excel(name = "现聘专技资格时间" ,dateFormat="yyyy-MM-dd")
private Date currentHiringProfessionalTitleTime;
/**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationServicelmpl.java
......@@ -244,27 +244,38 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
}
}
//5现职称
schoolCheckVo = checkeDicet("current_professional", date.getCurrentProfessionalTitle());
/* schoolCheckVo = checkeDicet("current_professional", date.getCurrentProfessionalTitle());
if (schoolCheckVo !=null) {
if (schoolCheckVo.getFlag()) {
date.setCurrentProfessionalTitle(schoolCheckVo.getVal());
} else {
sb.append(date.getName() + "用户现职称录入不符合选择项:" + schoolCheckVo.getVal());
sb.append(date.getName() + "用户现具备专技资格录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>");
}
}
}*/
//6 先职称取得时间
if (null != date.getCurrentProfessionalTitleTime()){
schoolCheckVo = this.checkeDateTime(date.getCurrentProfessionalTitleTime());
if (schoolCheckVo.getFlag()){
date.setCurrentProfessionalTitleTime(schoolCheckVo.getDate());
}else {
sb.append(date.getName()+"用户现职称取得资格时间格式错误");
sb.append(date.getName()+"用户现具备专技资格时间格式错误");
sb.append("<br/>");
}
}
//6 现职称聘任时间
if (null != date.getCurrentHiringProfessionalTitleTime()){
schoolCheckVo = this.checkeDateTime(date.getCurrentHiringProfessionalTitleTime());
if (schoolCheckVo.getFlag()){
date.setCurrentProfessionalTitleTime(schoolCheckVo.getDate());
}else {
sb.append(date.getName()+"用户现聘专技资格时间格式错误");
sb.append("<br/>");
}
}
//7 先聘岗位
schoolCheckVo = checkeDicet("current_position", date.getCurrentPosition());
if (schoolCheckVo !=null) {
......@@ -298,15 +309,15 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
}
}
//现聘职称
schoolCheckVo = checkeDicet("current_professional", date.getCurrentHiringProfessionalTitle());
/* schoolCheckVo = checkeDicet("current_professional", date.getCurrentHiringProfessionalTitle());
if (schoolCheckVo !=null) {
if (schoolCheckVo.getFlag()) {
date.setCurrentHiringProfessionalTitle(schoolCheckVo.getVal());
} else {
sb.append(date.getName() + "用户现聘职称录入不符合选择项:" + schoolCheckVo.getVal());
sb.append(date.getName() + "用户现聘专技资格录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>");
}
}
}*/
//8 现岗位等级
schoolCheckVo = checkeDicet("current_joblevel", date.getCurrentJobLevel());
......
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