Skip to content

D
dd_school
Commit 6ea477f4 by zhaopanyu
Options

zpy 1.5

parent a9b5f17e
Showing with 1026 additions and 348 deletions
ruoyi-ui/src/components/fileUploadn/index.vue 0 → 100644
<template>
<div class="upload-file">
<el-upload multiple :action="uploadFileUrl" :before-upload="handleBeforeUpload" :file-list="fileList" :limit="limit"
:on-error="handleUploadError" :on-exceed="handleExceed" :on-success="handleUploadSuccess"
:show-file-list="false" :headers="headers" class="upload-file-uploader" ref="fileUpload">
<!-- 上传按钮 -->
<el-button size="mini" type="primary">上传附件</el-button>
<!-- 上传提示 -->
<!-- <div class="el-upload__tip" slot="tip" v-if="showTip">-->
<!-- 请上传-->
<!-- <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>-->
<!-- <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>-->
<!-- 的文件-->
<!-- </div>-->
</el-upload>
<!-- 文件列表 -->
<transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
<li :key="file.url" class="el-upload-list__item ele-upload-list__item-content"
v-for="(file, index) in fileList">
{{ file.url }}{{ file.name }}
<el-link :href="`${baseUrl}${file.url}`" :underline="false" target="_blank">
<span class="el-icon-document">{{ file.name }}</span>
</el-link>
<div class="ele-upload-list__item-content-action" style="float: right">
<el-link style="margin-left: 10px; color: #1890ff" :href="`${baseUrl}${file.url}`" :underline="false"
target="_blank">下载</el-link>
<el-link style="margin-left: 15px" :underline="false" @click="handleDelete(index)"
type="danger">删除</el-link>
</div>
</li>
</transition-group>
</div>
</template>
<script>
import { getToken } from "@/utils/auth";
export default {
name: "UploadFileNew",
props: {
// 值
value: [String, Object, Array],
// 数量限制
limit: {
type: Number,
default: 5,
},
// 大小限制(MB)
fileSize: {
type: Number,
default: 5,
},
// 文件类型, 例如['png', 'jpg', 'jpeg']
fileType: {
type: Array,
default: () => ["doc", "xls", "ppt", "txt", "pdf"],
},
// 是否显示提示
isShowTip: {
type: Boolean,
default: true
}
},
data() {
return {
number: 0,
uploadList: [],
baseUrl: process.env.VUE_APP_BASE_API,
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址
headers: {
Authorization: "Bearer " + getToken(),
},
fileList: [],
};
},
watch: {
value: {
handler(val) {
if (val) {
let temp = 1;
// 首先将值转为数组
const list = Array.isArray(val) ? val : this.value.split(',');
// 然后将数组转为对象数组
this.fileList = list.map(item => {
if (typeof item === "string") {
item = { name: item, url: item };
}
item.uid = item.uid || new Date().getTime() + temp++;
return item;
});
} else {
this.fileList = [];
return [];
}
},
deep: true,
immediate: true
}
},
computed: {
// 是否显示提示
showTip() {
return this.isShowTip && (this.fileType || this.fileSize);
},
},
methods: {
// 上传前校检格式和大小
handleBeforeUpload(file) {
// 校检文件类型
// if (this.fileType) {
// const fileName = file.name.split('.');
// const fileExt = fileName[fileName.length - 1];
// const isTypeOk = this.fileType.indexOf(fileExt) >= 0;
// if (!isTypeOk) {
// this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`);
// return false;
// }
// }
// 校检文件大小
// if (this.fileSize) {
// const isLt = file.size / 1024 / 1024 < this.fileSize;
// if (!isLt) {
// this.$modal.msgError(`上传文件大小不能超过 ${this.fileSize} MB!`);
// return false;
// }
// }
this.$modal.loading("正在上传文件，请稍候...");
this.number++;
return true;
},
// 文件个数超出
handleExceed() {
this.$modal.msgError(`上传文件数量不能超过 ${this.limit} 个!`);
},
// 上传失败
handleUploadError(err) {
this.$modal.msgError("上传文件失败，请重试");
this.$modal.closeLoading()
},
// 上传成功回调
handleUploadSuccess(res, file) {
console.log('handleUploadSuccess', res)
console.log('file', file)
if (res.code === 200) {
this.uploadList.push({ name: res.newFileName, url: res.fileName });
console.log(this.uploadList, 'this.uploadList');
this.uploadedSuccessfully();
} else {
this.number--;
this.$modal.closeLoading();
this.$modal.msgError(res.msg);
this.$refs.fileUpload.handleRemove(file);
this.uploadedSuccessfully();
}
},
// 删除文件
handleDelete(index) {
this.fileList.splice(index, 1);
// this.$emit("input", this.listToString(this.fileList));
this.$emit("input", this.fileList);
},
// 上传结束处理
uploadedSuccessfully() {
if (this.number > 0 && this.uploadList.length === this.number) {
this.fileList = this.fileList.concat(this.uploadList);
console.log(this.fileList, '111');
this.uploadList = [];
this.number = 0;
// this.$emit("input", this.listToString(this.fileList));
this.$emit("input", this.fileList);
this.$modal.closeLoading();
}
},
// 获取文件名称
getFileName(name) {
if (name.lastIndexOf("/") > -1) {
return name.slice(name.lastIndexOf("/") + 1);
} else {
return "";
}
},
// 对象转成指定字符串分隔
// listToString(list, separator) {
// let strs = "";
// separator = separator || ",";
// for (let i in list) {
// strs += list[i].url + separator;
// }
// return strs != '' ? strs.substr(0, strs.length - 1) : '';
// }
}
};
</script>
<style scoped lang="scss">
.upload-file {
vertical-align: center;
width: 100%;
text-align: right;
position: relative;
}
::v-deep .el-upload {
position: absolute;
right: 0px;
top: 0px;
}
.upload-file-uploader {
margin-bottom: 5px;
}
.upload-file-list {
width: 85%;
position: relative !important;
top: 0px !important;
}
.upload-file-list .el-upload-list__item {
// border: 1px solid #e4e7ed;
line-height: 2;
margin-bottom: 10px;
position: relative;
}
.upload-file-list .ele-upload-list__item-content {
display: flex;
justify-content: flex-start;
;
align-items: center;
color: inherit;
}
.ele-upload-list__item-content-action .el-link {
margin-right: 10px;
}
</style>
ruoyi-ui/src/enums/home/index.js
...@@ -56,4 +56,5 @@ export const approves = [ ...@@ -56,4 +56,5 @@ export const approves = [
icon: "teacher", icon: "teacher",
path: "/indexMould/myTask/depBudgetapproval", path: "/indexMould/myTask/depBudgetapproval",
}, },
]; ];
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/schoolAwards/awardEntry/index.vue
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
</el-form-item> </el-form-item>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button> <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
</el-row> </el-row>
</el-form> </el-form>
<el-table :data="tableData" border style="width: 100%"> <el-table :data="tableData" border style="width: 100%">
...@@ -575,7 +576,13 @@ export default { ...@@ -575,7 +576,13 @@ export default {
console.error('Error while fetching department leaders: ' + error); console.error('Error while fetching department leaders: ' + error);
}); });
}, },
/** 导出按钮操作 */
handleExport() {
this.download('/school/awards/exportGr', {
...this.queryForm
}, `获奖录入_${Date.now()}.xlsx`)
},
resetQuery() { resetQuery() {
this.queryForm = { this.queryForm = {
pageNum: 1, pageNum: 1,
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/schoolAwards/awardManagement/index.vue
...@@ -27,9 +27,13 @@ ...@@ -27,9 +27,13 @@
<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>
<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-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:student:export']">导出
</el-button>
</el-form-item> </el-form-item>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button> <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
</el-row> </el-row>
</el-form> </el-form>
<el-table :data="tableData" border style="width: 100%"> <el-table :data="tableData" border style="width: 100%">
...@@ -606,6 +610,13 @@ export default { ...@@ -606,6 +610,13 @@ export default {
this.schoolAccessoryList = [], this.schoolAccessoryList = [],
this.getList(); this.getList();
}, },
/** 导出按钮操作 */
handleExport() {
this.download('/school/awards/exportYtg', {
...this.queryForm
}, `获奖管理_${Date.now()}.xlsx`)
},
//确定按钮 //确定按钮
submitForm: function () { submitForm: function () {
this.$refs['form'].validate(valid => { this.$refs['form'].validate(valid => {
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/ViolationDiscipline/index.vue
...@@ -277,7 +277,16 @@ ...@@ -277,7 +277,16 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-col :span="10">
<el-form-item label="附件 :">
<li class="el-upload-list__item ele-upload-list__item-content" v-for="file in fileList"
:key="file.id">
<el-link :href="`${baseUrl}${file.accessoryUrl}`" :underline="false" target="_blank">
<span class="el-icon-document"> {{ file.accessoryName }} </span>
</el-link>
</li>
</el-form-item>
</el-col>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="text-align: center;"> <div slot="footer" class="dialog-footer" style="text-align: center;">
<el-button @click="cancelDialog">取 消</el-button> <el-button @click="cancelDialog">取 消</el-button>
...@@ -451,6 +460,8 @@ export default { ...@@ -451,6 +460,8 @@ export default {
const id = row.id || this.ids; const id = row.id || this.ids;
getDiscipline(id).then((response) => { getDiscipline(id).then((response) => {
this.form = response.data; this.form = response.data;
this.fileList = response.data.schoolAccessoryList;
console.log(this.fileList, 'this.fileList');
this.isEdit = true; this.isEdit = true;
this.dialogTableVisible = true; this.dialogTableVisible = true;
this.form.gradeId = response.data.gradeId; this.form.gradeId = response.data.gradeId;
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/violationDisciplineentry/index.vue
...@@ -87,6 +87,16 @@ ...@@ -87,6 +87,16 @@
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button> <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
</el-col> </el-col>
<!-- <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport"
v-hasPermi="['system:student:import']">导入
</el-button>
</el-col> -->
<!-- <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:student:export']">导出
</el-button>
</el-col> -->
</el-row> </el-row>
<el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="tableData" <el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="tableData"
...@@ -289,7 +299,13 @@ ...@@ -289,7 +299,13 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="16">
<el-form-item label="附件" :rules="[{ required: true, message: '请上传附件' }]">
<FilepersonUploadNew @input="getFileList" :value="fileList"></FilepersonUploadNew>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="text-align: center;"> <div slot="footer" class="dialog-footer" style="text-align: center;">
<el-button type="primary" @click="submitForm"> 确 定</el-button> <el-button type="primary" @click="submitForm"> 确 定</el-button>
...@@ -430,7 +446,16 @@ ...@@ -430,7 +446,16 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-col :span="10">
<el-form-item label="附件 :">
<li class="el-upload-list__item ele-upload-list__item-content" v-for="file in fileList"
:key="file.id">
<el-link :href="`${baseUrl}${file.accessoryUrl}`" :underline="false" target="_blank">
<span class="el-icon-document"> {{ file.accessoryName }} </span>
</el-link>
</li>
</el-form-item>
</el-col>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="text-align: center;"> <div slot="footer" class="dialog-footer" style="text-align: center;">
<el-button @click="cancelDialog">取 消</el-button> <el-button @click="cancelDialog">取 消</el-button>
...@@ -457,11 +482,39 @@ import { ...@@ -457,11 +482,39 @@ import {
getTeacher,//获取教师 getTeacher,//获取教师
} from '@/api/smartSchool/awardsDisciplinary/studentViolation/disciplinaryManagemen' } from '@/api/smartSchool/awardsDisciplinary/studentViolation/disciplinaryManagemen'
import { checkIdcard } from '@/utils/utilLibrary/validate' import { checkIdcard } from '@/utils/utilLibrary/validate'
import FilepersonUploadNew from "@/components/FilepersonUploadNew";
import { getToken } from "@/utils/auth";
export default { export default {
name: 'index', name: 'index',
components: {
FilepersonUploadNew,
},
dicts: ['violate_type', 'violate_num', 'punish_result', 'sys_user_sex', 'grade_type', 'semester', 'audit_state1'], dicts: ['violate_type', 'violate_num', 'punish_result', 'sys_user_sex', 'grade_type', 'semester', 'audit_state1'],
data() { data() {
return { return {
title: "",
importing: false,
uploadOpen: false,
upload: {
// 是否显示弹出层（用户导入）
open: false,
// 弹出层标题（用户导入）
title: "",
// 是否禁用上传
isUploading: false,
// 是否更新已经存在的用户数据
updateSupport: 0,
// 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
url:
process.env.VUE_APP_BASE_API + "/school/discipline/importData",
},
fileList: [],
uploadForm: {},
baseUrl: [process.env.VUE_APP_BASE_API],
uploadLoading: false,
uploadFileLoading: false,
queryForm: { queryForm: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
...@@ -593,6 +646,8 @@ export default { ...@@ -593,6 +646,8 @@ export default {
this.form = response.data; this.form = response.data;
this.isEdit = true; this.isEdit = true;
this.look = true; this.look = true;
this.fileList = response.data.schoolAccessoryList;
console.log(this.fileList, 'this.fileList');
this.form.gradeId = response.data.gradeId; this.form.gradeId = response.data.gradeId;
const params = { gradeId: this.form.gradeId }; const params = { gradeId: this.form.gradeId };
getClassList(params).then(response => { getClassList(params).then(response => {
...@@ -605,6 +660,53 @@ export default { ...@@ -605,6 +660,53 @@ export default {
}) })
}, },
// 附件上传回调函数
getFileList(data) {
console.log('getFileList', data)
// this.form.files = data
this.schoolAccessoryList = data.map(item => {
return {
"accessoryUrl": item.url,
"accessoryName": item.name
}
})
console.log('schoolAccessoryList', this.schoolAccessoryList)
},
handleImport() {
this.reset();
this.title = "导入";
this.uploadOpen = true;
},
handleFileUploadProgress(event, file, fileList) {
this.upload.isUploading = true;
this.importing = true;
},
// 提交上传文件
submitFileForm() {
this.$refs.upload.submit();
},
cancelFile() {
this.uploadOpen = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
},
// 文件上传成功处理
handleFileSuccess(response, file, fileList) {
this.uploadOpen = false;
this.upload.isUploading = false;
this.importing = false;
this.$refs.upload.clearFiles();
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
response.msg +
"</div>",
"导入结果",
{ dangerouslyUseHTMLString: true }
);
this.getList();
},
//修改 //修改
handleEdit(row) { handleEdit(row) {
......
ruoyi-ui/src/views/smartSchool/classAdviser/studentManage/index.vue
...@@ -159,8 +159,8 @@ ...@@ -159,8 +159,8 @@
</el-button> </el-button>
<el-button size="mini" type="text" @click="parentsEdit(scope.row)">家长信息 <el-button size="mini" type="text" @click="parentsEdit(scope.row)">家长信息
</el-button> </el-button>
<el-button size="mini" type="text" @click="moralScore(scope.row)">学生积分 <!-- <el-button size="mini" type="text" @click="moralScore(scope.row)">学生积分
</el-button> </el-button> -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -927,18 +927,18 @@ export default { ...@@ -927,18 +927,18 @@ export default {
}) })
}, },
// 学生积分 // 学生积分
moralScore(row) { // moralScore(row) {
this.$router.push({ // this.$router.push({
path: '/classAdviser/studentmanage/score', // path: '/classAdviser/studentmanage/score',
query: { // query: {
id: row.id, // id: row.id,
name: row.studentName, // name: row.studentName,
idCard: row.idCard, // idCard: row.idCard,
schoolNo: row.schoolNo, // schoolNo: row.schoolNo,
schoolYear: this.queryParams.schoolYear // schoolYear: this.queryParams.schoolYear
} // }
}) // })
}, // },
// /** 更多下拉菜单 */ // /** 更多下拉菜单 */
// handleCommand(command, row) { // handleCommand(command, row) {
......
ruoyi-ui/src/views/smartSchool/electronicArchives/basicInformation/index.vue
...@@ -130,50 +130,46 @@ ...@@ -130,50 +130,46 @@
</el-col> </el-col>
</el-row> </el-row>
<el-table :data="informationList" @selection-change="handleSelectionChange" <el-table :data="informationList" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'toSecondMiddleSchoolTime', order: 'descending' }" :row-style="{ height: '0' }" :default-sort="{ prop: 'toSecondMiddleSchoolTime', order: 'descending' }" :row-style="{ height: '1px' }"
:cell-style="{ padding: '3px' }"> :cell-style="{ padding: '0px' }" :header-cell-style="{ height: '0px', fontSize: '12px', padding: '0 0' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="30" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" fixed="left" /> <el-table-column type="index" label="序号" width="30" align="center" fixed="left" />
<el-table-column label="姓名" align="center" prop="name" sortable fixed="left" width="150" <el-table-column label="姓名" align="center" prop="name" sortable fixed="left" show-overflow-tooltip />
show-overflow-tooltip /> <el-table-column label="性别" width="55" align="center" prop="sex" sortable fixed="left" show-overflow-tooltip>
<el-table-column label="性别" align="center" prop="sex" sortable fixed="left" width="80" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" /> <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="年龄" align="center" prop="age" sortable fixed="left" width="80" show-overflow-tooltip /> <el-table-column label="年龄" width="55" align="center" prop="age" sortable fixed="left" show-overflow-tooltip />
<el-table-column label="档案年龄" align="center" prop="fileAge" sortable width="120px" show-overflow-tooltip /> <el-table-column label="档案年龄" align="center" prop="fileAge" sortable show-overflow-tooltip />
<el-table-column label="政治面貌" align="center" prop="politicalLandscape" sortable width="100px" <el-table-column label="政治面貌" align="center" prop="politicalLandscape" sortable show-overflow-tooltip>
show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.politics_tatusls" :value="scope.row.politicalLandscape" /> <dict-tag :options="dict.type.politics_tatusls" :value="scope.row.politicalLandscape" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="档案生日" align="center" prop="fileBirthDate" sortable width="100px" show-overflow-tooltip> <el-table-column label="档案生日" align="center" prop="fileBirthDate" sortable show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.fileBirthDate, "{y}-{m}-{d}") }}</span> <span>{{ parseTime(scope.row.fileBirthDate, "{y}-{m}-{d}") }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="到市二中工作时间" align="center" prop="toSecondMiddleSchoolTime" sortable width="155px" <el-table-column label="到市二中工作时间" width="70" align="center" prop="toSecondMiddleSchoolTime" sortable
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="到市二中工作年限" align="center" prop="toSecondAge" sortable width="155px" <el-table-column label="到市二中工作年限" width="70" align="center" prop="toSecondAge" sortable show-overflow-tooltip />
show-overflow-tooltip /> <el-table-column label="现职称" align="center" prop="currentHiringProfessionalTitle" sortable
<el-table-column label="现职称" align="center" prop="currentProfessionalTitle" sortable width="100px"
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.current_professional" :value="scope.row.currentProfessionalTitle" /> <dict-tag :options="dict.type.current_professional" :value="scope.row.currentHiringProfessionalTitle" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="毕业院校" align="center" prop="graduationInstitution1" sortable width="160px" <el-table-column label="毕业院校" align="center" prop="graduationInstitution3" sortable show-overflow-tooltip />
show-overflow-tooltip /> <el-table-column label="学历" width="75px" align="center" prop="lastDegree" sortable show-overflow-tooltip />
<el-table-column label="学历" align="center" prop="lastDegree" sortable show-overflow-tooltip /> <el-table-column label="在岗情况" align="center" prop="onDutySituation" sortable show-overflow-tooltip
<el-table-column label="在岗情况" align="center" prop="onDutySituation" sortable width="100px" width="100px">
show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.duty_situation" :value="scope.row.onDutySituation" /> <dict-tag :options="dict.type.duty_situation" :value="scope.row.onDutySituation" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="150px"> <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-hasPermi="['system:student:edit']" size="mini" type="text" <el-button v-hasPermi="['system:student:edit']" size="mini" type="text"
@click="handleUpdate(scope.row)">修改</el-button> @click="handleUpdate(scope.row)">修改</el-button>
...@@ -1508,4 +1504,21 @@ export default { ...@@ -1508,4 +1504,21 @@ export default {
color: #1a74be; color: #1a74be;
font-size: 15px; font-size: 15px;
} }
::v-deep .el-table .el-table__cell {
padding: 0;
}
::v-deep .el-table .cell {
padding: 0;
}
::v-deep .el-table th.el-table__cell>.cell {
padding: 0;
}
// ::v-deep.el-table .caret-wrapper {
// height: 20px !important;
// }
</style> </style>
ruoyi-ui/src/views/smartSchool/electronicArchives/examinationScore/index.vue
...@@ -90,20 +90,21 @@ ...@@ -90,20 +90,21 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="achievementList" <el-table :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' }"> @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="30" align="center" sortable />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="30" align="center" sortable />
<el-table-column label="届别" align="center" prop="year" sortable width="80" show-overflow-tooltip /> <el-table-column label="届别" align="center" prop="year" sortable width="60" show-overflow-tooltip />
<el-table-column label="学科" align="center" prop="sub" sortable width="80" show-overflow-tooltip> <el-table-column label="学科" align="center" prop="sub" sortable width="60" show-overflow-tooltip>
<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 width="150" show-overflow-tooltip /> <el-table-column label="教师姓名" align="center" prop="teacherName" sortable width="80" show-overflow-tooltip />
<el-table-column label="授课班级" align="center" prop="teachingClassName" sortable width="120" <el-table-column label="授课班级" align="center" prop="teachingClassName" sortable width="80"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="班级类型" align="center" prop="classType" sortable show-overflow-tooltip width="200"> <el-table-column label="班级类型" align="center" prop="classType" sortable show-overflow-tooltip width="90">
<!-- <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">
...@@ -113,19 +114,19 @@ ...@@ -113,19 +114,19 @@
</span> </span>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="高考评优" align="center" prop="gkAppraising" sortable width="150" show-overflow-tooltip> <el-table-column label="高考评优" align="center" prop="gkAppraising" sortable width="110" show-overflow-tooltip>
<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 width="150" <el-table-column label="尖子生培养" align="center" prop="topStudentsCulture" sortable width="120"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="增量情况" align="center" prop="incrementSituation" sortable width="150" <el-table-column label="增量情况" align="center" prop="incrementSituation" sortable width="120"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable width="150" <el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable width="120"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="其他情况" align="center" prop="other" sortable width="150" 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="120" fixed="right"> <el-table-column label="审核状态" align="center" prop="auditState" sortable width="90" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template> </template>
...@@ -657,4 +658,17 @@ export default { ...@@ -657,4 +658,17 @@ export default {
.search ::v-deep .el-form-item__content { .search ::v-deep .el-form-item__content {
width: 200px; width: 200px;
} }
::v-deep .el-table .el-table__cell {
padding: 0;
}
::v-deep .el-table .cell {
padding: 0;
}
::v-deep .el-table th.el-table__cell>.cell {
padding: 0;
}
</style> </style>
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/annualAssessment/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-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="78px"
class="search"> class="search">
<el-form-item label="年度" prop="year"> <el-form-item label="年度" prop="year">
<el-select v-model="queryParams.year" clearable placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.year" clearable placeholder="请选择" style="width: 100%;">
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/awardTutoringstu/index.vue
...@@ -100,51 +100,52 @@ ...@@ -100,51 +100,52 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="awardsList" <el-table :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' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardtime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="30" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" /> <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center" fixed="left" width="120px" show-overflow-tooltip> <el-table-column label="成长类型" align="center" fixed="left" width="90px" show-overflow-tooltip>
<template> <template>
<span>辅导学生获奖</span> <span>辅导学生获奖</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="120px" show-overflow-tooltip> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="60px" show-overflow-tooltip>
<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="awardtype" sortable width="120px" show-overflow-tooltip> <el-table-column label="获奖类别" align="center" prop="awardtype" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_type_fdxs" :value="scope.row.awardtype" /> <dict-tag :options="dict.type.award_type_fdxs" :value="scope.row.awardtype" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardlevel" sortable width="120px" show-overflow-tooltip> <el-table-column label="获奖等级" align="center" prop="awardlevel" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardrank" sortable width="120px" show-overflow-tooltip> <el-table-column label="获奖级别" align="center" prop="awardrank" sortable width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比赛名称" align="center" prop="resultname" sortable width="180px" 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="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="120px" <el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable width="80px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" sortable width="180px" 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" width="180" sortable show-overflow-tooltip> <el-table-column label="获奖时间" align="center" prop="awardtime" sortable show-overflow-tooltip>
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="审核状态" align="center" prop="auditstate" sortable width="120" fixed="right"> <el-table-column label="审核状态" align="center" prop="auditstate" sortable width="80" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditstate" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditstate" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['school:fudaos:edit']" v-hasPermi="['school:fudaos:edit']"
...@@ -775,4 +776,17 @@ export default { ...@@ -775,4 +776,17 @@ export default {
.search ::v-deep .el-form-item__content { .search ::v-deep .el-form-item__content {
width: 200px width: 200px
} }
::v-deep .el-table .el-table__cell {
padding: 0;
}
::v-deep .el-table .cell {
padding: 0;
}
::v-deep .el-table th.el-table__cell>.cell {
padding: 0;
}
</style> </style>
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/comprehensiveHonors/index.vue
...@@ -92,47 +92,48 @@ ...@@ -92,47 +92,48 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="honorsList" <el-table :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' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="30" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" /> <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center" prop="type" sortable width="130px" fixed="left" <el-table-column label="成长类型" align="center" prop="type" sortable width="80px" fixed="left"
show-overflow-tooltip> show-overflow-tooltip>
<template> <template>
<span>综合荣誉</span> <span>综合荣誉</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="130px" show-overflow-tooltip> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="65px" show-overflow-tooltip>
<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="awardType" sortable width="130px" show-overflow-tooltip /> <el-table-column label="获奖类别" align="center" prop="awardType" sortable width="80px" show-overflow-tooltip />
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px" show-overflow-tooltip> <el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="120px" show-overflow-tooltip> <el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="综合荣誉-成果名称" align="center" prop="resultName" sortable width="220px" <el-table-column label="综合荣誉-成果名称" align="center" prop="resultName" sortable width="140px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="150px" 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="180px" 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" width="180" sortable show-overflow-tooltip> <el-table-column label="获奖时间" align="center" prop="awardTime" sortable show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120" fixed="right"> <el-table-column label="审核状态" align="center" prop="auditState" sortable width="80" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template> </template>
</el-table-column> </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="160px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:honors:edit']" v-hasPermi="['system:honors:edit']"
...@@ -743,4 +744,18 @@ export default { ...@@ -743,4 +744,18 @@ export default {
.search ::v-deep .el-form-item__content { .search ::v-deep .el-form-item__content {
width: 200px width: 200px
} }
::v-deep .el-table .el-table__cell {
padding: 0;
}
::v-deep .el-table .cell {
padding: 0;
}
::v-deep .el-table th.el-table__cell>.cell {
padding: 0;
}
</style> </style>
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/essaysWritings/index.vue
...@@ -71,7 +71,6 @@ ...@@ -71,7 +71,6 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-dialog> </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-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
...@@ -94,51 +93,51 @@ ...@@ -94,51 +93,51 @@
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
<el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="worksList" :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="worksList"
@selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="30" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" /> <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center" fixed="left" width="120px" show-overflow-tooltip> <el-table-column label="成长类型" align="center" fixed="left" width="80px" show-overflow-tooltip>
<template> <template>
<span>论文论著</span> <span>论文论著</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="120px" show-overflow-tooltip> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="60px" show-overflow-tooltip>
<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="awardType" sortable width="180px" show-overflow-tooltip> <el-table-column label="获奖类别" align="center" prop="awardType" sortable width="120px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_categories" :value="scope.row.awardType" /> <dict-tag :options="dict.type.award_categories" :value="scope.row.awardType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px" show-overflow-tooltip> <el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="130px" show-overflow-tooltip> <el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="论文论著-成果名称" align="center" prop="resultName" sortable width="180px" <el-table-column label="论文论著-成果名称" align="center" prop="resultName" sortable width="130px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="130px" 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="180px" 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" width="180" sortable show-overflow-tooltip> <el-table-column label="获奖时间" align="center" prop="awardTime" sortable show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120" fixed="right"> <el-table-column label="审核状态" align="center" prop="auditState" sortable width="80" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template> </template>
</el-table-column> </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="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:honors:edit']" v-hasPermi="['system:honors:edit']"
...@@ -743,4 +742,17 @@ export default { ...@@ -743,4 +742,17 @@ export default {
.search ::v-deep .el-form-item__content { .search ::v-deep .el-form-item__content {
width: 200px width: 200px
} }
::v-deep .el-table .el-table__cell {
padding: 0;
}
::v-deep .el-table .cell {
padding: 0;
}
::v-deep .el-table th.el-table__cell>.cell {
padding: 0;
}
</style> </style>
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/lectureAwards/index.vue
...@@ -92,51 +92,51 @@ ...@@ -92,51 +92,51 @@
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
<el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="awardsList" :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: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="30" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" /> <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center" fixed="left" width="130px" show-overflow-tooltip> <el-table-column label="成长类型" align="center" fixed="left" width="80px" show-overflow-tooltip>
<template> <template>
<span>讲课获奖</span> <span>讲课获奖</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" show-overflow-tooltip> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" show-overflow-tooltip width="65px">
<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="awardType" sortable width="130px" show-overflow-tooltip> <el-table-column label="获奖类别" align="center" prop="awardType" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_categoriesjk" :value="scope.row.awardType" /> <dict-tag :options="dict.type.award_categoriesjk" :value="scope.row.awardType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px" show-overflow-tooltip> <el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="130px" show-overflow-tooltip> <el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="讲课获奖-成果名称" align="center" prop="resultName" sortable width="180px" <el-table-column label="讲课获奖-成果名称" align="center" prop="resultName" sortable width="140px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="130px" 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="150px" 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" width="180" sortable show-overflow-tooltip> <el-table-column label="获奖时间" align="center" prop="awardTime" sortable show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120" fixed="right"> <el-table-column label="审核状态" align="center" prop="auditState" sortable width="80" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template> </template>
</el-table-column> </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="160px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:honors:edit']" v-hasPermi="['system:honors:edit']"
...@@ -740,4 +740,17 @@ export default { ...@@ -740,4 +740,17 @@ export default {
.search ::v-deep .el-form-item__content { .search ::v-deep .el-form-item__content {
width: 200px width: 200px
} }
::v-deep .el-table .el-table__cell {
padding: 0;
}
::v-deep .el-table .cell {
padding: 0;
}
::v-deep .el-table th.el-table__cell>.cell {
padding: 0;
}
</style> </style>
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/projectResearch/index.vue
...@@ -95,43 +95,44 @@ ...@@ -95,43 +95,44 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="worksList" <el-table :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' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="30" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" /> <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center" sortable fixed="left" width="130px" show-overflow-tooltip> <el-table-column label="成长类型" align="center" sortable fixed="left" width="80px" show-overflow-tooltip>
<span>课题研究</span> <span>课题研究</span>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="130px" show-overflow-tooltip> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="60px" show-overflow-tooltip>
<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="awardType" sortable width="130px" show-overflow-tooltip> <el-table-column label="获奖类别" align="center" prop="awardType" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.project_research" :value="scope.row.awardType" /> <dict-tag :options="dict.type.project_research" :value="scope.row.awardType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="120px" show-overflow-tooltip> <el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="120px" show-overflow-tooltip> <el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="课题研究-成果名称" align="center" prop="resultName" sortable width="180px" <el-table-column label="课题研究-成果名称" align="center" prop="resultName" sortable width="140px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="userName" 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="org" sortable width="180px" 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" width="180" sortable show-overflow-tooltip> <el-table-column label="获奖时间" align="center" prop="awardTime" sortable show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120" fixed="right"> <el-table-column label="审核状态" align="center" prop="auditState" sortable width="80" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template> </template>
...@@ -746,4 +747,17 @@ export default { ...@@ -746,4 +747,17 @@ export default {
.search ::v-deep .el-form-item__content { .search ::v-deep .el-form-item__content {
width: 200px width: 200px
} }
::v-deep .el-table .el-table__cell {
padding: 0;
}
::v-deep .el-table .cell {
padding: 0;
}
::v-deep .el-table th.el-table__cell>.cell {
padding: 0;
}
</style> </style>
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teacherAwards/index.vue
...@@ -95,50 +95,51 @@ ...@@ -95,50 +95,51 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="awardsList" <el-table :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' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="30" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" /> <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center" fixed="left" width="130px" show-overflow-tooltip> <el-table-column label="成长类型" align="center" fixed="left" width="80px" show-overflow-tooltip>
<template> <template>
<span>教学获奖</span> <span>教学获奖</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" show-overflow-tooltip> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" show-overflow-tooltip width="60px">
<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="awardType" sortable width="130px" show-overflow-tooltip> <el-table-column label="获奖类别" align="center" prop="awardType" sortable width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_categoriesjs" :value="scope.row.awardType" /> <dict-tag :options="dict.type.award_categoriesjs" :value="scope.row.awardType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px" show-overflow-tooltip> <el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="130px" show-overflow-tooltip> <el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="教学获奖-成果名称" align="center" prop="resultName" sortable width="190px" <el-table-column label="教学获奖-成果名称" align="center" prop="resultName" sortable width="140px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="130px" 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="130px" 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" width="180" sortable show-overflow-tooltip> <el-table-column label="获奖时间" align="center" prop="awardTime" sortable show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120" fixed="right"> <el-table-column label="审核状态" align="center" prop="auditState" sortable width="80" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template> </template>
</el-table-column> </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="160px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['school:teacherAwards:edit']" v-hasPermi="['school:teacherAwards:edit']"
...@@ -737,4 +738,17 @@ export default { ...@@ -737,4 +738,17 @@ export default {
.search ::v-deep .el-form-item__content { .search ::v-deep .el-form-item__content {
width: 200px width: 200px
} }
::v-deep .el-table .el-table__cell {
padding: 0;
}
::v-deep .el-table .cell {
padding: 0;
}
::v-deep .el-table th.el-table__cell>.cell {
padding: 0;
}
</style> </style>
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teachingAchievements/index.vue
...@@ -144,43 +144,43 @@ ...@@ -144,43 +144,43 @@
</el-row> </el-row>
<el-table :data="achievementsList" @selection-change="handleSelectionChange" <el-table :data="achievementsList" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'examTime', order: 'descending' }" :row-style="{ height: '0' }" :default-sort="{ prop: 'examTime', order: 'descending' }" :row-style="{ height: '1px' }"
:cell-style="{ padding: '3px' }"> :cell-style="{ padding: '0px' }" :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="30" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" /> <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="120px" <el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="80px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="120px" <el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="80px"
show-overflow-tooltip> show-overflow-tooltip>
<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>
</el-table-column> </el-table-column>
<el-table-column label="考试时间" align="center" prop="examTime" width="180" sortable show-overflow-tooltip> <el-table-column label="考试时间" align="center" prop="examTime" width="120" sortable show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.examTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.examTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="考试类型" align="center" prop="examType" sortable width="120px" show-overflow-tooltip> <el-table-column label="考试类型" align="center" prop="examType" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.exam_typeda" :value="scope.row.examType" /> <dict-tag :options="dict.type.exam_typeda" :value="scope.row.examType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="届别" align="center" prop="year" sortable show-overflow-tooltip /> <el-table-column label="届别" align="center" prop="year" sortable show-overflow-tooltip width="50px" />
<el-table-column label="年级" align="center" prop="grade" sortable show-overflow-tooltip> <el-table-column label="年级" align="center" prop="grade" sortable show-overflow-tooltip width="50px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.grade_da" :value="scope.row.grade" /> <dict-tag :options="dict.type.grade_da" :value="scope.row.grade" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="姓名" align="center" prop="userName" sortable show-overflow-tooltip /> <el-table-column label="姓名" align="center" prop="userName" width="70px" sortable show-overflow-tooltip />
<el-table-column label="学科" align="center" prop="sub" sortable show-overflow-tooltip> <el-table-column label="学科" align="center" prop="sub" width="50px" sortable show-overflow-tooltip>
<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="className" sortable show-overflow-tooltip> <el-table-column label="班级" align="center" width="100px" prop="className" sortable show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column label="班级类型" align="center" sortable show-overflow-tooltip width="180px"> <el-table-column label="班级类型" align="center" sortable show-overflow-tooltip width="120px">
<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">
...@@ -190,8 +190,7 @@ ...@@ -190,8 +190,7 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="考核分" align="center" prop="assessmentScore" sortable width="100px" <el-table-column label="考核分" align="center" prop="assessmentScore" sortable show-overflow-tooltip />
show-overflow-tooltip />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180px" fixed="right"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
...@@ -678,4 +677,17 @@ export default { ...@@ -678,4 +677,17 @@ export default {
color: #1a74be; color: #1a74be;
font-size: 15px; font-size: 15px;
} }
::v-deep .el-table .el-table__cell {
padding: 0;
}
::v-deep .el-table .cell {
padding: 0;
}
::v-deep .el-table th.el-table__cell>.cell {
padding: 0;
}
</style> </style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teamAward/index.vue
...@@ -82,44 +82,45 @@ ...@@ -82,44 +82,45 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" v-loading="loading" :data="awardList" <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' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'schoolYear', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="30" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" /> <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="120px" <el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="80px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="120px" <el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="80px"
show-overflow-tooltip> show-overflow-tooltip>
<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>
</el-table-column> </el-table-column>
<el-table-column label="届别" align="center" prop="year" sortable show-overflow-tooltip> <el-table-column label="届别" align="center" prop="year" sortable show-overflow-tooltip width="60px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.rankda" :value="scope.row.year" /> <dict-tag :options="dict.type.rankda" :value="scope.row.year" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="年级" align="center" prop="grade" sortable show-overflow-tooltip> <el-table-column label="年级" align="center" prop="grade" sortable show-overflow-tooltip width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.grade_da" :value="scope.row.grade" /> <dict-tag :options="dict.type.grade_da" :value="scope.row.grade" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable show-overflow-tooltip> <el-table-column label="学科" align="center" prop="sub" sortable show-overflow-tooltip width="70px">
<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="awardSituation" sortable show-overflow-tooltip <el-table-column label="获奖情况" align="center" prop="awardSituation" sortable show-overflow-tooltip
width="180px" /> width="160px" />
<el-table-column label="团队成员贡献情况" align="center" prop="teamMembersContribution" sortable width="200" <el-table-column label="团队成员贡献情况" align="center" prop="teamMembersContribution" sortable width="160px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" sortable show-overflow-tooltip /> <el-table-column label="备注" align="center" prop="remark" sortable show-overflow-tooltip />
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120" fixed="right"> <el-table-column label="审核状态" align="center" prop="auditState" sortable width="80" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right"> <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)" 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>
...@@ -543,4 +544,17 @@ export default { ...@@ -543,4 +544,17 @@ export default {
.search ::v-deep .el-form-item__content { .search ::v-deep .el-form-item__content {
width: 200px width: 200px
} }
::v-deep .el-table .el-table__cell {
padding: 0;
}
::v-deep .el-table .cell {
padding: 0;
}
::v-deep .el-table th.el-table__cell>.cell {
padding: 0;
}
</style> </style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/tutorAward/index.vue
...@@ -111,57 +111,58 @@ ...@@ -111,57 +111,58 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="awardsList" <el-table :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' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardtime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="30" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" /> <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center" fixed="left" width="120px" show-overflow-tooltip> <el-table-column label="成长类型" align="center" fixed="left" width="90px" show-overflow-tooltip>
<template> <template>
<span>辅导老师获奖</span> <span>辅导老师获奖</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="100px" show-overflow-tooltip> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="50px" show-overflow-tooltip>
<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="awardtype" sortable width="130px" show-overflow-tooltip> <el-table-column label="获奖类别" align="center" prop="awardtype" sortable width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_type_fdjs" :value="scope.row.awardtype" /> <dict-tag :options="dict.type.award_type_fdjs" :value="scope.row.awardtype" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardlevel" sortable width="130px" show-overflow-tooltip> <el-table-column label="获奖等级" align="center" prop="awardlevel" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardrank" sortable width="130px" show-overflow-tooltip> <el-table-column label="获奖级别" align="center" prop="awardrank" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比赛名称" align="center" prop="competitionname" sortable width="130px" <el-table-column label="比赛名称" align="center" prop="competitionname" sortable width="130px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="username" sortable width="130px" show-overflow-tooltip /> <el-table-column label="获奖人" align="center" prop="username" sortable width="70px" show-overflow-tooltip />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable width="130px" <el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable width="80px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="辅导职责" align="center" prop="coachingr" sortable width="130px" show-overflow-tooltip> <el-table-column label="辅导职责" align="center" prop="coachingr" sortable width="90px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.coachingr" :value="scope.row.coachingr" /> <dict-tag :options="dict.type.coachingr" :value="scope.row.coachingr" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="主办单位" align="center" prop="org" sortable width="180px" 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" width="180" sortable show-overflow-tooltip> <el-table-column label="获奖时间" align="center" prop="awardtime" sortable show-overflow-tooltip>
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="审核状态" align="center" prop="auditstate" sortable width="120" fixed="right"> <el-table-column label="审核状态" align="center" prop="auditstate" sortable width="80" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditstate" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditstate" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180px" fixed="right"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['school:fudaot:edit']" v-hasPermi="['school:fudaot:edit']"
...@@ -812,4 +813,17 @@ export default { ...@@ -812,4 +813,17 @@ export default {
.search ::v-deep .el-form-item__content { .search ::v-deep .el-form-item__content {
width: 200px width: 200px
} }
::v-deep .el-table .el-table__cell {
padding: 0;
}
::v-deep .el-table .cell {
padding: 0;
}
::v-deep .el-table th.el-table__cell>.cell {
padding: 0;
}
</style> </style>
ruoyi-ui/src/views/smartSchool/electronicArchives/teacherAssessment/index.vue
...@@ -123,27 +123,27 @@ ...@@ -123,27 +123,27 @@
<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="assessmentList" @selection-change="handleSelectionChange" <el-table :data="assessmentList" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'schoolYear', order: 'descending' }" :row-style="{ height: '0' }" :default-sort="{ prop: 'schoolYear', order: 'descending' }" :row-style="{ height: '1px' }"
:cell-style="{ padding: '3px' }"> :cell-style="{ padding: '0px' }" :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="30" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="130px <el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="80px
" show-overflow-tooltip /> " show-overflow-tooltip />
<el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="130px" <el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="80px"
show-overflow-tooltip> show-overflow-tooltip>
<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>
</el-table-column> </el-table-column>
<el-table-column label="届别" align="center" prop="year" sortable fixed="left" show-overflow-tooltip /> <el-table-column label="届别" align="center" prop="year" sortable show-overflow-tooltip width="70px" />
<el-table-column label="年级" align="center" prop="grade" sortable show-overflow-tooltip> <el-table-column label="年级" align="center" prop="grade" sortable show-overflow-tooltip width="60px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.grade_da" :value="scope.row.grade" /> <dict-tag :options="dict.type.grade_da" :value="scope.row.grade" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="班级" align="center" prop="className" sortable show-overflow-tooltip /> <el-table-column label="班级" align="center" prop="className" sortable show-overflow-tooltip width="70px" />
<el-table-column label="班级类型" align="center" prop="classType" sortable width="180px" show-overflow-tooltip> <el-table-column label="班级类型" align="center" prop="classType" sortable width="90px" show-overflow-tooltip>
<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">
...@@ -153,20 +153,20 @@ ...@@ -153,20 +153,20 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="姓名" align="center" prop="teacherName" sortable show-overflow-tooltip /> <el-table-column label="姓名" align="center" prop="teacherName" sortable show-overflow-tooltip width="90px" />
<el-table-column label="学科" align="center" prop="sub" sortable show-overflow-tooltip> <el-table-column label="学科" align="center" prop="sub" sortable show-overflow-tooltip width="80px">
<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="moralEduCheckAchievement" sortable width="130px" <el-table-column label="德育考核成绩" align="center" prop="moralEduCheckAchievement" sortable width="110px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="智育考核成绩" align="center" prop="intellEduCheckAchievement" sortable width="130px" <el-table-column label="智育考核成绩" align="center" prop="intellEduCheckAchievement" sortable width="110px"
show-overflow-tooltip /> show-overflow-tooltip />
<!-- <el-table-column label="总考核成绩" align="center" prop="totalCheckAchievement" sortable fixed="right" <!-- <el-table-column label="总考核成绩" align="center" prop="totalCheckAchievement" sortable fixed="right"
width="130px" /> --> width="130px" /> -->
<el-table-column label="备注" align="center" prop="remark" sortable show-overflow-tooltip /> <el-table-column label="备注" align="center" prop="remark" sortable show-overflow-tooltip />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
...@@ -644,4 +644,17 @@ export default { ...@@ -644,4 +644,17 @@ export default {
color: #1a74be; color: #1a74be;
font-size: 15px; font-size: 15px;
} }
::v-deep .el-table .el-table__cell {
padding: 0;
}
::v-deep .el-table .cell {
padding: 0;
}
::v-deep .el-table th.el-table__cell>.cell {
padding: 0;
}
</style> </style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/electronicArchives/workloadInformation/index.vue
...@@ -145,46 +145,47 @@ ...@@ -145,46 +145,47 @@
</el-row> </el-row>
<el-table :data="aworkloadList" @selection-change="handleSelectionChange" <el-table :data="aworkloadList" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'schoolYear', order: 'descending' }" :row-style="{ height: '0' }" :default-sort="{ prop: 'schoolYear', order: 'descending' }" :row-style="{ height: '1px' }"
:cell-style="{ padding: '3px' }"> :cell-style="{ padding: '0px' }" :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="30" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" /> <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" />
<el-table-column label="学年" align="center" prop="schoolYear" width="100px" fixed="left" sortable <el-table-column label="学年" align="center" prop="schoolYear" width="80px" fixed="left" sortable
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="学期" align="center" prop="semester" fixed="left" sortable width="100px" <el-table-column label="学期" align="center" prop="semester" fixed="left" sortable width="80px"
show-overflow-tooltip> show-overflow-tooltip>
<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>
</el-table-column> </el-table-column>
<el-table-column label="届别" align="center" prop="year" fixed="left" sortable show-overflow-tooltip /> <el-table-column label="届别" align="center" prop="year" fixed="left" width="70px" sortable
<el-table-column label="年级" align="center" prop="grade" fixed="left" sortable show-overflow-tooltip> show-overflow-tooltip />
<el-table-column label="年级" align="center" prop="grade" fixed="left" width="50px" sortable
show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.grade_da" :value="scope.row.grade" /> <dict-tag :options="dict.type.grade_da" :value="scope.row.grade" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="姓名" align="center" prop="name" sortable width="130px" show-overflow-tooltip /> <el-table-column label="姓名" align="center" prop="name" sortable width="80px" show-overflow-tooltip />
<el-table-column label="学科" align="center" prop="sub" sortable show-overflow-tooltip> <el-table-column label="学科" align="center" prop="sub" sortable show-overflow-tooltip width="50px">
<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="appointmentPost" sortable width="120px" <el-table-column label="聘任岗位" align="center" prop="appointmentPost" sortable width="80px" show-overflow-tooltip>
show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.appointment_positions" :value="scope.row.appointmentPost" /> <dict-tag :options="dict.type.appointment_positions" :value="scope.row.appointmentPost" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="聘任职务" align="center" prop="appointmentPosition" sortable width="120px" <el-table-column label="聘任职务" align="center" prop="appointmentPosition" sortable width="120px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="聘任情况" align="center" prop="appointmentSituation" sortable width="120px" <el-table-column label="聘任情况" align="center" prop="appointmentSituation" sortable width="80px"
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.appointment_situation" :value="scope.row.appointmentSituation" /> <dict-tag :options="dict.type.appointment_situation" :value="scope.row.appointmentSituation" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="班级" align="center" prop="className" sortable width="150px" show-overflow-tooltip /> <el-table-column label="班级" align="center" prop="className" sortable width="80px" show-overflow-tooltip />
<el-table-column label=" 班级类型" align="center" width="180px" show-overflow-tooltip> <el-table-column label=" 班级类型" align="center" width="140px" show-overflow-tooltip>
<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">
...@@ -194,13 +195,13 @@ ...@@ -194,13 +195,13 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="早读" align="center" prop="earlyReading" sortable width="90px" show-overflow-tooltip /> <el-table-column label="早读" align="center" prop="earlyReading" sortable width="60px" show-overflow-tooltip />
<el-table-column label="正课" align="center" prop="requiredCourses" sortable width="90px" show-overflow-tooltip /> <el-table-column label="正课" align="center" prop="requiredCourses" sortable width="60px" show-overflow-tooltip />
<el-table-column label="晚自习" align="center" prop="eveningSelfStudy" sortable width="90px" <el-table-column label="晚自习" align="center" prop="eveningSelfStudy" sortable width="70px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="合计" align="center" prop="amountTo" sortable show-overflow-tooltip /> <el-table-column label="合计" align="center" prop="amountTo" sortable show-overflow-tooltip />
<el-table-column label="证明人" align="center" prop="userName" width="120px" sortable show-overflow-tooltip /> <el-table-column label="证明人" align="center" prop="userName" width="80px" sortable show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" sortable width="150px" show-overflow-tooltip /> <el-table-column label="备注" align="center" prop="remark" sortable show-overflow-tooltip />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px" fixed="right"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
...@@ -1049,4 +1050,17 @@ export default { ...@@ -1049,4 +1050,17 @@ export default {
color: #1a74be; color: #1a74be;
font-size: 15px; font-size: 15px;
} }
::v-deep .el-table .el-table__cell {
padding: 0;
}
::v-deep .el-table .cell {
padding: 0;
}
::v-deep .el-table th.el-table__cell>.cell {
padding: 0;
}
</style> </style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/personWork/awardTutoringstu/index.vue
...@@ -100,51 +100,52 @@ ...@@ -100,51 +100,52 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="awardsList" <el-table :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' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardtime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="30" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" /> <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center" fixed="left" width="120px" show-overflow-tooltip> <el-table-column label="成长类型" align="center" fixed="left" width="90px" show-overflow-tooltip>
<template> <template>
<span>辅导学生获奖</span> <span>辅导学生获奖</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="120px" show-overflow-tooltip> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="60px" show-overflow-tooltip>
<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="awardtype" sortable width="120px" show-overflow-tooltip> <el-table-column label="获奖类别" align="center" prop="awardtype" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_type_fdxs" :value="scope.row.awardtype" /> <dict-tag :options="dict.type.award_type_fdxs" :value="scope.row.awardtype" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardlevel" sortable width="120px" show-overflow-tooltip> <el-table-column label="获奖等级" align="center" prop="awardlevel" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardrank" sortable width="120px" show-overflow-tooltip> <el-table-column label="获奖级别" align="center" prop="awardrank" sortable width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比赛名称" align="center" prop="resultname" sortable width="180px" 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="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="120px" <el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable width="80px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" sortable width="180px" 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" width="180" sortable show-overflow-tooltip> <el-table-column label="获奖时间" align="center" prop="awardtime" sortable show-overflow-tooltip>
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="审核状态" align="center" prop="auditstate" sortable width="120" fixed="right"> <el-table-column label="审核状态" align="center" prop="auditstate" sortable width="80" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditstate" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditstate" />
</template> </template>
</el-table-column> </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="160" 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:tutoringstu:edit']" v-hasPermi="['system:tutoringstu:edit']"
...@@ -623,4 +624,17 @@ export default { ...@@ -623,4 +624,17 @@ export default {
.search ::v-deep .el-form-item__content { .search ::v-deep .el-form-item__content {
width: 200px width: 200px
} }
::v-deep .el-table .el-table__cell {
padding: 0;
}
::v-deep .el-table .cell {
padding: 0;
}
::v-deep .el-table th.el-table__cell>.cell {
padding: 0;
}
</style> </style>
ruoyi-ui/src/views/smartSchool/personWork/comprehensiveHonors/index.vue
...@@ -88,42 +88,43 @@ ...@@ -88,42 +88,43 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="honorsList" <el-table :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' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="30" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" /> <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center" prop="type" sortable width="120px" fixed="left" <el-table-column label="成长类型" align="center" prop="type" sortable width="80px" fixed="left"
show-overflow-tooltip> show-overflow-tooltip>
<template> <template>
<span>综合荣誉</span> <span>综合荣誉</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" show-overflow-tooltip> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="65px" show-overflow-tooltip>
<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="awardType" sortable width="120px" show-overflow-tooltip /> <el-table-column label="获奖类别" align="center" prop="awardType" sortable width="80px" show-overflow-tooltip />
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="120px" show-overflow-tooltip> <el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="120px" show-overflow-tooltip> <el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="综合荣誉-成果名称" align="center" prop="resultName" sortable width="180px" <el-table-column label="综合荣誉-成果名称" align="center" prop="resultName" sortable width="140px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="userName" 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="org" sortable width="150px" 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" width="180" sortable show-overflow-tooltips> <el-table-column label="获奖时间" align="center" prop="awardTime" sortable show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120" fixed="right"> <el-table-column label="审核状态" align="center" prop="auditState" sortable width="80" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template> </template>
...@@ -640,4 +641,18 @@ export default { ...@@ -640,4 +641,18 @@ export default {
.search ::v-deep .el-form-item__content { .search ::v-deep .el-form-item__content {
width: 200px width: 200px
} }
::v-deep .el-table .el-table__cell {
padding: 0;
}
::v-deep .el-table .cell {
padding: 0;
}
::v-deep .el-table th.el-table__cell>.cell {
padding: 0;
}
</style> </style>
ruoyi-ui/src/views/smartSchool/personWork/essaysWritings/index.vue
...@@ -94,51 +94,52 @@ ...@@ -94,51 +94,52 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="worksList" <el-table :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' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="30" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" /> <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center" fixed="left" width="120px" show-overflow-tooltip> <el-table-column label="成长类型" align="center" fixed="left" width="80px" show-overflow-tooltip>
<template> <template>
<span>论文论著</span> <span>论文论著</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="120px" show-overflow-tooltip> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="60px" show-overflow-tooltip>
<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="awardType" sortable width="180px" show-overflow-tooltip> <el-table-column label="获奖类别" align="center" prop="awardType" sortable width="120px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_categories" :value="scope.row.awardType" /> <dict-tag :options="dict.type.award_categories" :value="scope.row.awardType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px" show-overflow-tooltip> <el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="130px" show-overflow-tooltip> <el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="论文论著-成果名称" align="center" prop="resultName" sortable width="180px" <el-table-column label="论文论著-成果名称" align="center" prop="resultName" sortable width="130px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="130px" 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="180px" 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" width="180" sortable show-overflow-tooltip> <el-table-column label="获奖时间" align="center" prop="awardTime" sortable show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120" fixed="right"> <el-table-column label="审核状态" align="center" prop="auditState" sortable width="80" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template> </template>
</el-table-column> </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="160px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:works:edit']" <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:works: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>
...@@ -641,4 +642,17 @@ export default { ...@@ -641,4 +642,17 @@ export default {
.search ::v-deep .el-form-item__content { .search ::v-deep .el-form-item__content {
width: 200px width: 200px
} }
::v-deep .el-table .el-table__cell {
padding: 0;
}
::v-deep .el-table .cell {
padding: 0;
}
::v-deep .el-table th.el-table__cell>.cell {
padding: 0;
}
</style> </style>
ruoyi-ui/src/views/smartSchool/personWork/examinationScore/index.vue
...@@ -91,20 +91,21 @@ ...@@ -91,20 +91,21 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="achievementList" <el-table :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' }"> @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="30" align="center" sortable />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="30" align="center" sortable />
<el-table-column label="届别" align="center" prop="year" sortable width="80" show-overflow-tooltip /> <el-table-column label="届别" align="center" prop="year" sortable width="60" show-overflow-tooltip />
<el-table-column label="学科" align="center" prop="sub" sortable width="80" show-overflow-tooltip> <el-table-column label="学科" align="center" prop="sub" sortable width="60" show-overflow-tooltip>
<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 width="120" show-overflow-tooltip /> <el-table-column label="教师姓名" align="center" prop="teacherName" sortable width="80" show-overflow-tooltip />
<el-table-column label="授课班级" align="center" prop="teachingClassName" sortable width="120" <el-table-column label="授课班级" align="center" prop="teachingClassName" sortable width="80"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="班级类型" align="center" prop="classType" sortable show-overflow-tooltip width="150"> <el-table-column label="班级类型" align="center" prop="classType" sortable show-overflow-tooltip width="90">
<!-- <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">
...@@ -114,24 +115,24 @@ ...@@ -114,24 +115,24 @@
</span> </span>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="高考评优" align="center" prop="gkAppraising" sortable width="180" show-overflow-tooltip> <el-table-column label="高考评优" align="center" prop="gkAppraising" sortable width="110" show-overflow-tooltip>
<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 width="180" <el-table-column label="尖子生培养" align="center" prop="topStudentsCulture" sortable width="120"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="增量情况" align="center" prop="incrementSituation" sortable width="180" <el-table-column label="增量情况" align="center" prop="incrementSituation" sortable width="120"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable width="180" <el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable width="120"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="其他情况" align="center" prop="other" sortable width="150" 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="120" fixed="right"> <el-table-column label="审核状态" align="center" prop="auditState" sortable width="90" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right"> <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:achievement:edit']" v-hasPermi="['system:achievement:edit']"
...@@ -515,4 +516,17 @@ export default { ...@@ -515,4 +516,17 @@ export default {
.search ::v-deep .el-form-item__content { .search ::v-deep .el-form-item__content {
width: 200px width: 200px
} }
::v-deep .el-table .el-table__cell {
padding: 0;
}
::v-deep .el-table .cell {
padding: 0;
}
::v-deep .el-table th.el-table__cell>.cell {
padding: 0;
}
</style> </style>
ruoyi-ui/src/views/smartSchool/personWork/lectureAwards/index.vue
...@@ -94,51 +94,52 @@ ...@@ -94,51 +94,52 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="awardsList" <el-table :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' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="30" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" /> <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center" fixed="left" width="130px" show-overflow-tooltip> <el-table-column label="成长类型" align="center" fixed="left" width="80px" show-overflow-tooltip>
<template> <template>
<span>讲课获奖</span> <span>讲课获奖</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" show-overflow-tooltip> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" show-overflow-tooltip width="65px">
<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="awardType" sortable width="130px" show-overflow-tooltip> <el-table-column label="获奖类别" align="center" prop="awardType" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_categoriesjk" :value="scope.row.awardType" /> <dict-tag :options="dict.type.award_categoriesjk" :value="scope.row.awardType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px" show-overflow-tooltip> <el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="130px" show-overflow-tooltip> <el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="讲课获奖-成果名称" align="center" prop="resultName" sortable width="180px" <el-table-column label="讲课获奖-成果名称" align="center" prop="resultName" sortable width="140px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="130px" 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="150px" 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" width="180" sortable show-overflow-tooltip> <el-table-column label="获奖时间" align="center" prop="awardTime" sortable show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120" fixed="right"> <el-table-column label="审核状态" align="center" prop="auditState" sortable width="80" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template> </template>
</el-table-column> </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="180px">
<template slot-scope="scope"> <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> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
...@@ -642,4 +643,17 @@ export default { ...@@ -642,4 +643,17 @@ export default {
.search ::v-deep .el-form-item__content { .search ::v-deep .el-form-item__content {
width: 200px width: 200px
} }
::v-deep .el-table .el-table__cell {
padding: 0;
}
::v-deep .el-table .cell {
padding: 0;
}
::v-deep .el-table th.el-table__cell>.cell {
padding: 0;
}
</style> </style>
ruoyi-ui/src/views/smartSchool/personWork/projectResearch/index.vue
...@@ -95,49 +95,49 @@ ...@@ -95,49 +95,49 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
<el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="worksList" :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="worksList"
@selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="30" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" /> <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center" sortable fixed="left" width="130px" show-overflow-tooltip> <el-table-column label="成长类型" align="center" sortable fixed="left" width="80px" show-overflow-tooltip>
<span>课题研究</span> <span>课题研究</span>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="130px" show-overflow-tooltip> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="60px" show-overflow-tooltip>
<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="awardType" sortable width="130px" show-overflow-tooltip> <el-table-column label="获奖类别" align="center" prop="awardType" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.project_research" :value="scope.row.awardType" /> <dict-tag :options="dict.type.project_research" :value="scope.row.awardType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="120px" show-overflow-tooltip> <el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="120px" show-overflow-tooltip> <el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="课题研究-成果名称" align="center" prop="resultName" sortable width="180px" <el-table-column label="课题研究-成果名称" align="center" prop="resultName" sortable width="140px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="userName" 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="org" sortable width="180px" 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" width="180" sortable show-overflow-tooltip> <el-table-column label="获奖时间" align="center" prop="awardTime" sortable show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120" fixed="right"> <el-table-column label="审核状态" align="center" prop="auditState" sortable width="80" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px" fixed="right"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160px" 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:research:edit']" v-hasPermi="['system:research:edit']"
...@@ -648,4 +648,17 @@ export default { ...@@ -648,4 +648,17 @@ export default {
.search ::v-deep .el-form-item__content { .search ::v-deep .el-form-item__content {
width: 200px width: 200px
} }
::v-deep .el-table .el-table__cell {
padding: 0;
}
::v-deep .el-table .cell {
padding: 0;
}
::v-deep .el-table th.el-table__cell>.cell {
padding: 0;
}
</style> </style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/personWork/teacherAwards/index.vue
...@@ -95,50 +95,51 @@ ...@@ -95,50 +95,51 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="awardsList" <el-table :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' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="30" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" /> <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center" fixed="left" width="130px" show-overflow-tooltip> <el-table-column label="成长类型" align="center" fixed="left" width="80px" show-overflow-tooltip>
<template> <template>
<span>教学获奖</span> <span>教学获奖</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" show-overflow-tooltip> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" show-overflow-tooltip width="60px">
<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="awardType" sortable width="130px" show-overflow-tooltip> <el-table-column label="获奖类别" align="center" prop="awardType" sortable width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_categoriesjs" :value="scope.row.awardType" /> <dict-tag :options="dict.type.award_categoriesjs" :value="scope.row.awardType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px" show-overflow-tooltip> <el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="130px" show-overflow-tooltip> <el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="教学获奖-成果名称" align="center" prop="resultName" sortable width="190px" <el-table-column label="教学获奖-成果名称" align="center" prop="resultName" sortable width="140px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="130px" 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="130px" 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" width="180" sortable show-overflow-tooltip> <el-table-column label="获奖时间" align="center" prop="awardTime" sortable show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120" fixed="right"> <el-table-column label="审核状态" align="center" prop="auditState" sortable width="80" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template> </template>
</el-table-column> </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="160px
"> ">
<template slot-scope="scope"> <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']"
...@@ -641,4 +642,17 @@ export default { ...@@ -641,4 +642,17 @@ export default {
.search ::v-deep .el-form-item__content { .search ::v-deep .el-form-item__content {
width: 200px width: 200px
} }
::v-deep .el-table .el-table__cell {
padding: 0;
}
::v-deep .el-table .cell {
padding: 0;
}
::v-deep .el-table th.el-table__cell>.cell {
padding: 0;
}
</style> </style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/personWork/teamAward/index.vue
...@@ -83,44 +83,45 @@ ...@@ -83,44 +83,45 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" v-loading="loading" :data="awardList" <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' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'schoolYear', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="30" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" /> <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="120px" <el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="80px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="120px" <el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="80px"
show-overflow-tooltip> show-overflow-tooltip>
<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>
</el-table-column> </el-table-column>
<el-table-column label="届别" align="center" prop="year" sortable show-overflow-tooltip> <el-table-column label="届别" align="center" prop="year" sortable show-overflow-tooltip width="60px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.rankda" :value="scope.row.year" /> <dict-tag :options="dict.type.rankda" :value="scope.row.year" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="年级" align="center" prop="grade" sortable show-overflow-tooltip> <el-table-column label="年级" align="center" prop="grade" sortable show-overflow-tooltip width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.grade_da" :value="scope.row.grade" /> <dict-tag :options="dict.type.grade_da" :value="scope.row.grade" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable show-overflow-tooltip> <el-table-column label="学科" align="center" prop="sub" sortable show-overflow-tooltip width="70px">
<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="awardSituation" sortable show-overflow-tooltip <el-table-column label="获奖情况" align="center" prop="awardSituation" sortable show-overflow-tooltip
width="180px" /> width="160px" />
<el-table-column label="团队成员贡献情况" align="center" prop="teamMembersContribution" sortable width="200" <el-table-column label="团队成员贡献情况" align="center" prop="teamMembersContribution" sortable width="160px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" sortable show-overflow-tooltip /> <el-table-column label="备注" align="center" prop="remark" sortable show-overflow-tooltip />
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120" fixed="right"> <el-table-column label="审核状态" align="center" prop="auditState" sortable width="80" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template> </template>
</el-table-column> </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="160" 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']"
...@@ -481,4 +482,17 @@ export default { ...@@ -481,4 +482,17 @@ export default {
.search ::v-deep .el-form-item__content { .search ::v-deep .el-form-item__content {
width: 200px width: 200px
} }
::v-deep .el-table .el-table__cell {
padding: 0;
}
::v-deep .el-table .cell {
padding: 0;
}
::v-deep .el-table th.el-table__cell>.cell {
padding: 0;
}
</style> </style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/personWork/tutorAward/index.vue
...@@ -111,57 +111,58 @@ ...@@ -111,57 +111,58 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="awardsList" <el-table :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' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardtime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="30" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" /> <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center" fixed="left" width="120px" show-overflow-tooltip> <el-table-column label="成长类型" align="center" fixed="left" width="90px" show-overflow-tooltip>
<template> <template>
<span>辅导老师获奖</span> <span>辅导老师获奖</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="100px" show-overflow-tooltip> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="50px" show-overflow-tooltip>
<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="awardtype" sortable width="130px" show-overflow-tooltip> <el-table-column label="获奖类别" align="center" prop="awardtype" sortable width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_type_fdjs" :value="scope.row.awardtype" /> <dict-tag :options="dict.type.award_type_fdjs" :value="scope.row.awardtype" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardlevel" sortable width="130px" show-overflow-tooltip> <el-table-column label="获奖等级" align="center" prop="awardlevel" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardrank" sortable width="130px" show-overflow-tooltip> <el-table-column label="获奖级别" align="center" prop="awardrank" sortable width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比赛名称" align="center" prop="competitionname" sortable width="130px" <el-table-column label="比赛名称" align="center" prop="competitionname" sortable width="130px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="username" sortable width="130px" show-overflow-tooltip /> <el-table-column label="获奖人" align="center" prop="username" sortable width="70px" show-overflow-tooltip />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable width="130px" <el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable width="80px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="辅导职责" align="center" prop="coachingr" sortable width="130px" show-overflow-tooltip> <el-table-column label="辅导职责" align="center" prop="coachingr" sortable width="90px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.coachingr" :value="scope.row.coachingr" /> <dict-tag :options="dict.type.coachingr" :value="scope.row.coachingr" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="主办单位" align="center" prop="org" sortable width="180px" 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" width="180" sortable show-overflow-tooltip> <el-table-column label="获奖时间" align="center" prop="awardtime" sortable show-overflow-tooltip>
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="审核状态" align="center" prop="auditstate" sortable width="120" fixed="right"> <el-table-column label="审核状态" align="center" prop="auditstate" sortable width="80" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditstate" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditstate" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180px" fixed="right"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160px" 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:tutoraward:edit']" v-hasPermi="['system:tutoraward:edit']"
...@@ -696,4 +697,17 @@ export default { ...@@ -696,4 +697,17 @@ export default {
.search ::v-deep .el-form-item__content { .search ::v-deep .el-form-item__content {
width: 200px width: 200px
} }
::v-deep .el-table .el-table__cell {
padding: 0;
}
::v-deep .el-table .cell {
padding: 0;
}
::v-deep .el-table th.el-table__cell>.cell {
padding: 0;
}
</style> </style>
ruoyi-ui/src/views/whitePage.vue
...@@ -32,7 +32,7 @@ export default { ...@@ -32,7 +32,7 @@ export default {
//测试 //测试
corpId: 'dingaa3937ff8b7dd267f2c783f7214b6d69', corpId: 'dingaa3937ff8b7dd267f2c783f7214b6d69',
//正式 //正式
// corpId: 'dingccea40788226c988f2c783f7214b6d69', // corpId: 'dingccea40788226c988f2c783f7214b6d69',
success: (res) => { success: (res) => {
console.log('获取新的免登码成功', res); console.log('获取新的免登码成功', res);
const code = res.code const code = res.code
......
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