Skip to content

D
dd_school
Commit b61b4650 by baochunxin
Options

Merge remote-tracking branch 'origin/master'

parents fc276b97 90848080
Showing with 2644 additions and 440 deletions
ruoyi-ui/src/api/smartSchool/electronicArchives/personalInformation.js
...@@ -8,3 +8,11 @@ export function listAward(query) { ...@@ -8,3 +8,11 @@ export function listAward(query) {
params: query, params: query,
}); });
} }
// 个人
export function listAwardgr(phoneNumber) {
return request({
url: `/teacher/basiclnformation/compre/${phoneNumber}`,
method: "get",
});
}
ruoyi-ui/src/assets/icons/svg/个人信息.svg 0 → 100644
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1702947865570" class="icon" viewBox="0 0 1102 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1709" xmlns:xlink="http://www.w3.org/1999/xlink" width="215.234375" height="200"><path d="M89.009231 219.411692V100.036923c0-45.764923 37.100308-82.825846 82.825846-82.825846h814.473846c45.686154 0 82.786462 37.060923 82.786462 82.825846v823.926154a82.825846 82.825846 0 0 1-82.825847 82.825846H171.835077A82.825846 82.825846 0 0 1 89.009231 923.963077V804.627692h75.303384v119.37477c0 4.174769 3.387077 7.522462 7.522462 7.522461h814.473846a7.522462 7.522462 0 0 0 7.483077-7.483077V100.036923a7.522462 7.522462 0 0 0-7.483077-7.522461H171.795692a7.522462 7.522462 0 0 0-7.483077 7.483076v119.414154H89.009231z" fill="#195c9f" p-id="1710"></path><path d="M586.279385 599.788308c107.953231 0 195.465846-88.418462 195.465846-197.513846 0-109.056-87.512615-197.474462-195.465846-197.474462-107.913846 0-195.426462 88.418462-195.426462 197.474462 0 109.095385 87.512615 197.513846 195.426462 197.513846z m0-60.258462c-74.515692 0-135.168-61.321846-135.168-137.255384s60.652308-137.255385 135.168-137.255385c74.555077 0 135.207385 61.321846 135.207384 137.255385S660.873846 539.569231 586.279385 539.569231z" fill="#195c9f" p-id="1711"></path><path d="M840.782769 819.2c0-154.545231-94.601846-271.478154-254.503384-271.478154-159.862154 0-254.503385 116.932923-254.503385 271.478154h60.258462c0-123.746462 70.813538-211.259077 194.244923-211.259077 123.470769 0 194.284308 87.512615 194.284307 211.259077h60.258462z" fill="#195c9f" p-id="1712"></path><path d="M18.077538 347.411692m37.651693 0l141.863384 0q37.651692 0 37.651693 37.651693l0 0q0 37.651692-37.651693 37.651692l-141.863384 0q-37.651692 0-37.651693-37.651692l0 0q0-37.651692 37.651693-37.651693Z" fill="#195c9f" p-id="1713"></path><path d="M18.077538 566.862769m37.651693 0l141.863384 0q37.651692 0 37.651693 37.651693l0 0q0 37.651692-37.651693 37.651692l-141.863384 0q-37.651692 0-37.651693-37.651692l0 0q0-37.651692 37.651693-37.651693Z" fill="#195c9f" p-id="1714"></path></svg>
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1702947865570" class="icon" viewBox="0 0 1102 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1709" xmlns:xlink="http://www.w3.org/1999/xlink" width="215.234375" height="200"><path d="M89.009231 219.411692V100.036923c0-45.764923 37.100308-82.825846 82.825846-82.825846h814.473846c45.686154 0 82.786462 37.060923 82.786462 82.825846v823.926154a82.825846 82.825846 0 0 1-82.825847 82.825846H171.835077A82.825846 82.825846 0 0 1 89.009231 923.963077V804.627692h75.303384v119.37477c0 4.174769 3.387077 7.522462 7.522462 7.522461h814.473846a7.522462 7.522462 0 0 0 7.483077-7.483077V100.036923a7.522462 7.522462 0 0 0-7.483077-7.522461H171.795692a7.522462 7.522462 0 0 0-7.483077 7.483076v119.414154H89.009231z" fill="#195c9f" p-id="1710"></path><path d="M586.279385 599.788308c107.953231 0 195.465846-88.418462 195.465846-197.513846 0-109.056-87.512615-197.474462-195.465846-197.474462-107.913846 0-195.426462 88.418462-195.426462 197.474462 0 109.095385 87.512615 197.513846 195.426462 197.513846z m0-60.258462c-74.515692 0-135.168-61.321846-135.168-137.255384s60.652308-137.255385 135.168-137.255385c74.555077 0 135.207385 61.321846 135.207384 137.255385S660.873846 539.569231 586.279385 539.569231z" fill="#195c9f" p-id="1711"></path><path d="M840.782769 819.2c0-154.545231-94.601846-271.478154-254.503384-271.478154-159.862154 0-254.503385 116.932923-254.503385 271.478154h60.258462c0-123.746462 70.813538-211.259077 194.244923-211.259077 123.470769 0 194.284308 87.512615 194.284307 211.259077h60.258462z" fill="#195c9f" p-id="1712"></path><path d="M18.077538 347.411692m37.651693 0l141.863384 0q37.651692 0 37.651693 37.651693l0 0q0 37.651692-37.651693 37.651692l-141.863384 0q-37.651692 0-37.651693-37.651692l0 0q0-37.651692 37.651693-37.651693Z" fill="#195c9f" p-id="1713"></path><path d="M18.077538 566.862769m37.651693 0l141.863384 0q37.651692 0 37.651693 37.651693l0 0q0 37.651692-37.651693 37.651692l-141.863384 0q-37.651692 0-37.651693-37.651692l0 0q0-37.651692 37.651693-37.651693Z" fill="#195c9f" p-id="1714"></path></svg>
\ No newline at end of file
ruoyi-ui/src/assets/icons/svg/班主任.svg 0 → 100644
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1702947904698" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3973" xmlns:xlink="http://www.w3.org/1999/xlink" width="212.5" height="200"><path d="M679.61065531 460.66664566c84.263383-55.849753 121.771133-159.81706 92.390977-255.997255S653.13007431 42.66666666 551.78776031 42.66666666s-190.767818 65.778598-220.213873 162.002724 8.083661 200.169468 92.347044 256.019221C266.57509931 502.66653766 155.21607431 641.51660166 149.34004331 803.03606366c0 101.441164 201.959735 152.161745 403.414241 152.161745s402.447717-50.742548 402.447717-152.183711c-5.271953-162.376154-117.300956-302.104877-275.591346-343.863139z m-77.212146 297.722566l-51.159911 50.720581-51.126962-50.720581 51.126962-165.846857z m-222.41052-487.908273c-0.087866-81.484625 57.716903-151.733399 138.300902-167.845806s161.310781 26.359765 193.019382 101.572962a170.174252 170.174252 0 0 1-62.604443 207.660035 173.35939 173.35939 0 0 1-217.55593-20.176204 170.240151 170.240151 0 0 1-51.126961-121.210987zM552.80920131 898.37054866c-210.658458 0-345.126211-56.805294-345.126211-93.357502 7.853013-167.01108 143.441056-300.182811 311.92389-306.344406l-76.728884 259.720571a28.259865 28.259865 0 0 0 7.688265 28.402647l82.31935 81.649373a28.798044 28.798044 0 0 0 40.90157 0l81.792155-84.186501a28.259865 28.259865 0 0 0 7.688265-28.402647l-77.739342-257.150494c167.900722 5.810132 303.499748 137.905506 312.407152 304.312508 0 36.519258-134.467753 93.357502-345.12621 93.357502z m0 0" p-id="3974" fill="#0096f9"></path></svg>
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1702947904698" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3973" xmlns:xlink="http://www.w3.org/1999/xlink" width="212.5" height="200"><path d="M679.61065531 460.66664566c84.263383-55.849753 121.771133-159.81706 92.390977-255.997255S653.13007431 42.66666666 551.78776031 42.66666666s-190.767818 65.778598-220.213873 162.002724 8.083661 200.169468 92.347044 256.019221C266.57509931 502.66653766 155.21607431 641.51660166 149.34004331 803.03606366c0 101.441164 201.959735 152.161745 403.414241 152.161745s402.447717-50.742548 402.447717-152.183711c-5.271953-162.376154-117.300956-302.104877-275.591346-343.863139z m-77.212146 297.722566l-51.159911 50.720581-51.126962-50.720581 51.126962-165.846857z m-222.41052-487.908273c-0.087866-81.484625 57.716903-151.733399 138.300902-167.845806s161.310781 26.359765 193.019382 101.572962a170.174252 170.174252 0 0 1-62.604443 207.660035 173.35939 173.35939 0 0 1-217.55593-20.176204 170.240151 170.240151 0 0 1-51.126961-121.210987zM552.80920131 898.37054866c-210.658458 0-345.126211-56.805294-345.126211-93.357502 7.853013-167.01108 143.441056-300.182811 311.92389-306.344406l-76.728884 259.720571a28.259865 28.259865 0 0 0 7.688265 28.402647l82.31935 81.649373a28.798044 28.798044 0 0 0 40.90157 0l81.792155-84.186501a28.259865 28.259865 0 0 0 7.688265-28.402647l-77.739342-257.150494c167.900722 5.810132 303.499748 137.905506 312.407152 304.312508 0 36.519258-134.467753 93.357502-345.12621 93.357502z m0 0" p-id="3974" fill="#0096f9"></path></svg>
\ No newline at end of file
ruoyi-ui/src/assets/icons/svg/科室工作量 (1).svg 0 → 100644
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1702947932221" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5959" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M772.2 956.6H251.9c-48.2 0-87.4-35.4-87.4-79v-655c0-43.6 39.2-79 87.4-79h109.8v49.7H251.9c-19.2 0-35.4 13.4-35.4 29.2v655c0 15.9 16.2 29.2 35.4 29.2h520.2c19.2 0 35.4-13.4 35.4-29.2v-655c0-15.9-16.2-29.2-35.4-29.2H660.3v-49.7h111.8c48.2 0 87.4 35.4 87.4 79v655c0.1 43.6-39.2 79-87.3 79z m0 0" p-id="5960" fill="#0096f9"></path><path d="M316.2 780.4H708v49.7H316.2v-49.7z m0-103.4H708v49.7H316.2V677z m0 3M599.7 143.5c0.6 4.1 0.9 8.3 0.9 12.4 0 48.8-39.7 88.5-88.5 88.5s-88.5-39.7-88.5-88.5c0-4.3 0.3-8.4 0.9-12.4H383v81.4c0 15.7 12.8 28.5 28.5 28.5h201.2c15.7 0 28.5-12.8 28.5-28.5v-81.4h-41.5z m0 0" p-id="5961" fill="#0096f9"></path><path d="M512.1 244.4c48.8 0 88.5-39.7 88.5-88.5 0-4.3-0.3-8.4-0.9-12.4-6.1-43-43.1-76.1-87.6-76.1-44.5 0-81.5 33.1-87.6 76.1-0.6 4.1-0.9 8.3-0.9 12.4-0.1 48.8 39.6 88.5 88.5 88.5z m-36.7-100.9c5.2-15.3 19.7-26.3 36.7-26.3 17 0 31.5 11 36.7 26.3 1.3 3.9 2.1 8.2 2.1 12.4 0 21.4-17.4 38.8-38.8 38.8s-38.8-17.4-38.8-38.8c0-4.4 0.7-8.5 2.1-12.4z m0 0M439.7 460.9h146.7v34.7H439.7z" p-id="5962" fill="#0096f9"></path><path d="M495.03 547.165v-140.4h35.7v140.4z" p-id="5963" fill="#0096f9"></path><path d="M624.5 621.1h-225c-17.2 0-31.1-14-31.1-31.3V398.5h39.2v182.6h208.8V398.5h39.2v191.4c0 17.2-14 31.2-31.1 31.2z" p-id="5964" fill="#0096f9"></path><path d="M337.5 436.8c-7.2-9.5-5.3-23 4.2-30.2l154-116.4c9.5-7.2 23-5.3 30.2 4.2 7.2 9.5 5.3 23-4.2 30.2L367.7 441c-9.5 7.2-23 5.3-30.2-4.2z" p-id="5965" fill="#0096f9"></path><path d="M684.4 434.9c-7 9.6-20.5 11.7-30.1 4.7L503.2 329.4c-9.6-7-11.7-20.5-4.7-30.1 7-9.6 20.5-11.7 30.1-4.7l151.2 110.2c9.5 7 11.6 20.5 4.6 30.1z" p-id="5966" fill="#0096f9"></path></svg>
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1702947932221" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5959" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M772.2 956.6H251.9c-48.2 0-87.4-35.4-87.4-79v-655c0-43.6 39.2-79 87.4-79h109.8v49.7H251.9c-19.2 0-35.4 13.4-35.4 29.2v655c0 15.9 16.2 29.2 35.4 29.2h520.2c19.2 0 35.4-13.4 35.4-29.2v-655c0-15.9-16.2-29.2-35.4-29.2H660.3v-49.7h111.8c48.2 0 87.4 35.4 87.4 79v655c0.1 43.6-39.2 79-87.3 79z m0 0" p-id="5960" fill="#0096f9"></path><path d="M316.2 780.4H708v49.7H316.2v-49.7z m0-103.4H708v49.7H316.2V677z m0 3M599.7 143.5c0.6 4.1 0.9 8.3 0.9 12.4 0 48.8-39.7 88.5-88.5 88.5s-88.5-39.7-88.5-88.5c0-4.3 0.3-8.4 0.9-12.4H383v81.4c0 15.7 12.8 28.5 28.5 28.5h201.2c15.7 0 28.5-12.8 28.5-28.5v-81.4h-41.5z m0 0" p-id="5961" fill="#0096f9"></path><path d="M512.1 244.4c48.8 0 88.5-39.7 88.5-88.5 0-4.3-0.3-8.4-0.9-12.4-6.1-43-43.1-76.1-87.6-76.1-44.5 0-81.5 33.1-87.6 76.1-0.6 4.1-0.9 8.3-0.9 12.4-0.1 48.8 39.6 88.5 88.5 88.5z m-36.7-100.9c5.2-15.3 19.7-26.3 36.7-26.3 17 0 31.5 11 36.7 26.3 1.3 3.9 2.1 8.2 2.1 12.4 0 21.4-17.4 38.8-38.8 38.8s-38.8-17.4-38.8-38.8c0-4.4 0.7-8.5 2.1-12.4z m0 0M439.7 460.9h146.7v34.7H439.7z" p-id="5962" fill="#0096f9"></path><path d="M495.03 547.165v-140.4h35.7v140.4z" p-id="5963" fill="#0096f9"></path><path d="M624.5 621.1h-225c-17.2 0-31.1-14-31.1-31.3V398.5h39.2v182.6h208.8V398.5h39.2v191.4c0 17.2-14 31.2-31.1 31.2z" p-id="5964" fill="#0096f9"></path><path d="M337.5 436.8c-7.2-9.5-5.3-23 4.2-30.2l154-116.4c9.5-7.2 23-5.3 30.2 4.2 7.2 9.5 5.3 23-4.2 30.2L367.7 441c-9.5 7.2-23 5.3-30.2-4.2z" p-id="5965" fill="#0096f9"></path><path d="M684.4 434.9c-7 9.6-20.5 11.7-30.1 4.7L503.2 329.4c-9.6-7-11.7-20.5-4.7-30.1 7-9.6 20.5-11.7 30.1-4.7l151.2 110.2c9.5 7 11.6 20.5 4.6 30.1z" p-id="5966" fill="#0096f9"></path></svg>
\ No newline at end of file
ruoyi-ui/src/components/DictTag/index.vue
...@@ -2,21 +2,10 @@ ...@@ -2,21 +2,10 @@
<div> <div>
<template v-for="(item, index) in options"> <template v-for="(item, index) in options">
<template v-if="values.includes(item.value)"> <template v-if="values.includes(item.value)">
<span <span v-if="item.raw.listClass == 'default' || item.raw.listClass == ''" :key="item.value" :index="index"
v-if="item.raw.listClass == 'default' || item.raw.listClass == ''" :class="item.raw.cssClass">{{ item.label }}</span>
:key="item.value" <el-tag v-else :disable-transitions="true" :key="item.value" :index="index"
:index="index" :type="item.raw.listClass == 'primary' ? '' : item.raw.listClass" :class="item.raw.cssClass">
:class="item.raw.cssClass"
>{{ item.label }}</span
>
<el-tag
v-else
:disable-transitions="true"
:key="item.value"
:index="index"
:type="item.raw.listClass == 'primary' ? '' : item.raw.listClass"
:class="item.raw.cssClass"
>
{{ item.label }} {{ item.label }}
</el-tag> </el-tag>
</template> </template>
...@@ -29,7 +18,7 @@ export default { ...@@ -29,7 +18,7 @@ export default {
name: "DictTag", name: "DictTag",
props: { props: {
options: { options: {
type: Array, type: [Number, Object, String, Array],
default: null, default: null,
}, },
value: [Number, String, Array], value: [Number, String, Array],
...@@ -46,7 +35,7 @@ export default { ...@@ -46,7 +35,7 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped>
.el-tag + .el-tag { .el-tag+.el-tag {
margin-left: 10px; margin-left: 10px;
} }
</style> </style>
ruoyi-ui/src/views/smartSchool/electronicArchives/basicInformation/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-dialog title="查询" :visible.sync="query" width="50%" append-to-body> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form ref="queryParams" :model="queryParams" label-width="96px"> <el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="任教学科" prop="teachingSubject"> <el-form-item label="任教学科" prop="teachingSubject">
...@@ -30,9 +30,8 @@ ...@@ -30,9 +30,8 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="出生年月" prop="birthDate"> <el-form-item label="出生年月" prop="birthDate">
<el-date-picker clearable v-model="queryParams.birthDate" type="date" value-format="yyyy-MM-dd" <el-input v-model="queryParams.birthDate" clearable placeholder="请输入"></el-input>
placeholder="请选择" :style="{ width: '100%' }">
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -111,7 +110,7 @@ ...@@ -111,7 +110,7 @@
</el-col> </el-col>
<el-col :offset="1" :span="1.5"> <el-col :offset="1" :span="1.5">
<el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport" <el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport"
v-hasPermi="['system:student:export']">导入 v-hasPermi="['system:student:import']">导入
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -127,7 +126,7 @@ ...@@ -127,7 +126,7 @@
</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' }"> :default-sort="{ prop: 'toSecondMiddleSchoolTime', order: 'descending' }" :row-style="{height: '0'}" :cell-style="{padding: '3px'}">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" fixed="left" /> <el-table-column type="index" label="序号" width="55" align="center" fixed="left" />
<el-table-column label="姓名" align="center" prop="name" sortable fixed="left" width="100" /> <el-table-column label="姓名" align="center" prop="name" sortable fixed="left" width="100" />
...@@ -148,8 +147,8 @@ ...@@ -148,8 +147,8 @@
<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="148px" /> <el-table-column label="到市二中工作时间" align="center" prop="toSecondMiddleSchoolTime" sortable width="155px" />
<el-table-column label="到市二中工作年限" align="center" prop="toSecondAge" sortable width="148px" /> <el-table-column label="到市二中工作年限" align="center" prop="toSecondAge" sortable width="155px" />
<el-table-column label="现职称" align="center" prop="currentProfessionalTitle" sortable width="100px"> <el-table-column label="现职称" align="center" prop="currentProfessionalTitle" sortable width="100px">
<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.currentProfessionalTitle" />
...@@ -162,11 +161,14 @@ ...@@ -162,11 +161,14 @@
<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 "> <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)">修改</el-button> <el-button v-hasPermi="['system:student:edit']" size="mini" type="text"
<el-button size="mini" type="text" @click="handleLook(scope.row)">详情</el-button> @click="handleUpdate(scope.row)">修改</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)">删除</el-button> <el-button v-hasPermi="['system:student:look']" size="mini" type="text"
@click="handleLook(scope.row)">详情</el-button>
<el-button v-hasPermi="['system:student:remove']" size="mini" type="text"
@click="handleDelete(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -199,7 +201,7 @@ ...@@ -199,7 +201,7 @@
</div> </div>
</el-dialog> </el-dialog>
<!-- 添加对话框 --> <!-- 添加对话框 -->
<el-dialog title="详细信息" :visible.sync="open" width="980px"> <el-dialog title="详细信息" :visible.sync="open" width="80%">
<el-form ref="form" :model="form" :rules="rules" label-width="138px"> <el-form ref="form" :model="form" :rules="rules" label-width="138px">
<el-row type="flex" justify="space-between"> <el-row type="flex" justify="space-between">
<el-col :span="16"> <el-col :span="16">
...@@ -257,8 +259,8 @@ ...@@ -257,8 +259,8 @@
</el-col> </el-col>
<el-col :span="12" class="custom-margin"> <el-col :span="12" class="custom-margin">
<el-form-item label="入党时间" prop="partyMembershipTime"> <el-form-item label="入党时间" prop="partyMembershipTime">
<el-date-picker clearable v-model="form.partyMembershipTime" type="date" <el-date-picker clearable v-model="form.partyMembershipTime" type="month"
value-format="yyyy-MM-dd" placeholder="请选择" :style="{ width: '100%' }"> value-format="yyyy-MM" placeholder="请选择" :style="{ width: '100%' }">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -274,11 +276,12 @@ ...@@ -274,11 +276,12 @@
</el-col> </el-col>
<el-col :span="6" class="custom-margin"> <el-col :span="6" class="custom-margin">
<el-card style=" <el-card style="
height: 200px; height: 180px;
width: 220px; width: 200px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin-bottom: 10px;
"> ">
<el-upload v-loading="uploadLoading" class="avatar-uploader" action="#" accept="image/*" <el-upload v-loading="uploadLoading" class="avatar-uploader" action="#" accept="image/*"
:show-file-list="false" :on-success="handleAvatarSuccess" :show-file-list="false" :on-success="handleAvatarSuccess"
...@@ -433,7 +436,9 @@ ...@@ -433,7 +436,9 @@
<el-row :gutter="2" type="flex" justify="space-between"> <el-row :gutter="2" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="毕业时间1" prop="graduationTime1"> <el-form-item label="毕业时间1" prop="graduationTime1">
<el-input v-model="form.graduationTime1" placeholder="请输入" /> <el-date-picker clearable v-model="form.graduationTime1" type="month" value-format="yyyy-MM"
placeholder="请选择" :style="{ width: '100%' }">
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
...@@ -450,7 +455,9 @@ ...@@ -450,7 +455,9 @@
<el-row :gutter="2" type="flex" justify="space-between"> <el-row :gutter="2" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="毕业时间2" prop="graduationTime2"> <el-form-item label="毕业时间2" prop="graduationTime2">
<el-input v-model="form.graduationTime2" placeholder="请输入" /> <el-date-picker clearable v-model="form.graduationTime2" type="month" value-format="yyyy-MM"
placeholder="请选择" :style="{ width: '100%' }">
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
...@@ -467,7 +474,9 @@ ...@@ -467,7 +474,9 @@
<el-row :gutter="2" type="flex" justify="space-between"> <el-row :gutter="2" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="毕业时间3" prop="graduationTime3"> <el-form-item label="毕业时间3" prop="graduationTime3">
<el-input v-model="form.graduationTime3" placeholder="请输入" /> <el-date-picker clearable v-model="form.graduationTime3" type="month" value-format="yyyy-MM"
placeholder="请选择" :style="{ width: '100%' }">
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
...@@ -512,7 +521,7 @@ ...@@ -512,7 +521,7 @@
</div> </div>
</el-dialog> </el-dialog>
<!-- 修改对话框 --> <!-- 修改对话框 -->
<el-dialog title="详细信息" :visible.sync="look" width="950px" append-to-body> <el-dialog title="详细信息" :visible.sync="look" width="80%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="138px"> <el-form ref="form" :model="form" :rules="rules" label-width="138px">
<el-row type="flex" justify="space-between"> <el-row type="flex" justify="space-between">
<el-col :span="16"> <el-col :span="16">
...@@ -949,20 +958,19 @@ export default { ...@@ -949,20 +958,19 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
name: [{ required: true, message: "请输入姓名", trigger: "blur" }], name: [{ required: true, trigger: "blur" }],
idCard: [{ required: true, validator: checkIdcard, trigger: "blur" }], idCard: [{ required: true, validator: checkIdcard, trigger: "blur" }],
teachingSubject: [ teachingSubject: [
{ required: true, message: "请输入任教学科", trigger: "change" }, { required: true, trigger: "change" },
], ],
toSecondMiddleSchoolTime: [ toSecondMiddleSchoolTime: [
{ {
required: true, required: true,
message: "请选择到二中工作时间",
trigger: "blur", trigger: "blur",
}, },
], ],
ddPhone: [ ddPhone: [
{ required: true, message: "请输入钉钉手机号", trigger: "blur" }, { required: true, trigger: "blur" },
], ],
}, },
}; };
...@@ -1263,7 +1271,6 @@ export default { ...@@ -1263,7 +1271,6 @@ export default {
this.ids = selection.map(item => item.id); this.ids = selection.map(item => item.id);
this.single = selection.length == 1; this.single = selection.length == 1;
this.multiple = selection.length > 1; this.multiple = selection.length > 1;
// 先定义 isMultiple 变量为 false // 先定义 isMultiple 变量为 false
let isMultiple = false; let isMultiple = false;
if (this.selection.length === 1) { if (this.selection.length === 1) {
...@@ -1382,7 +1389,7 @@ export default { ...@@ -1382,7 +1389,7 @@ export default {
}, },
}; };
</script> </script>
<style scoped> <style lang="scss" scoped>
.avatar-uploader .el-upload { .avatar-uploader .el-upload {
border: 1px dashed #d9d9d9; border: 1px dashed #d9d9d9;
border-radius: 6px; border-radius: 6px;
...@@ -1420,12 +1427,29 @@ export default { ...@@ -1420,12 +1427,29 @@ export default {
margin-top: -2px; margin-top: -2px;
margin-bottom: -5px; margin-bottom: -5px;
} */ } */
.custom-margin {
margin: -6px 0px;
}
.custom-evenly { //.custom-margin {
margin-top: -40px !important; // margin: -10px 0px;
text-align: right !important; //}
//.custom-evenly {
// margin-top: -40px !important;
// text-align: right !important;
//}
::v-deep .el-form-item{
margin-bottom: 0px;
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body{
padding: 10px 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
.search ::v-deep .el-form-item__content{
width: 200px
} }
</style> </style>
ruoyi-ui/src/views/smartSchool/electronicArchives/examinationScore/index.vue
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="班级类型" prop="classType"> <el-form-item label="班级类型" prop="classType">
<el-select v-model="queryParams.classType" multiple placeholder="请选择" style="width: 100%"> <el-select v-model="queryParams.classType" placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -66,8 +66,8 @@ ...@@ -66,8 +66,8 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :data="achievementList" @selection-change="handleSelectionChange" <el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="achievementList"
:default-sort="{ prop: 'year', order: 'descending' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'year', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" sortable /> <el-table-column type="selection" width="55" align="center" sortable />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable />
<el-table-column label="届别" align="center" prop="year" sortable /> <el-table-column label="届别" align="center" prop="year" sortable />
...@@ -90,22 +90,22 @@ ...@@ -90,22 +90,22 @@
</el-table-column> </el-table-column>
<el-table-column label="高考评优" align="center" prop="gkAppraising" sortable> <el-table-column label="高考评优" align="center" prop="gkAppraising" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.gk_appraising" :value="scope.row.sub" /> <dict-tag :options="dict.type.gk_appraising" :value="scope.row.gkAppraising" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="尖子生培养" align="center" prop="topStudentsCulture" sortable /> <el-table-column label="尖子生培养" align="center" prop="topStudentsCulture" sortable />
<el-table-column label="增量情况" align="center" prop="incrementSituation" sortable /> <el-table-column label="增量情况" align="center" prop="incrementSituation" sortable />
<el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable /> <el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable />
<el-table-column label="其他" align="center" prop="other" sortable /> <el-table-column label="其他情况" align="center" prop="other" sortable />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']"
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>
<el-button size="mini" type="text" @click="handleDelete(scope.row)" <el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:honors:remove']" v-hasPermi="['system:achievement:remove']"
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>
<el-button size="mini" type="text" @click="handleExamine(scope.row)" <el-button size="mini" type="text" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditState === '1'">审核</el-button> v-hasPermi="['system:achievement:aduit']" v-if="scope.row.auditState === '1'">审核</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -545,3 +545,17 @@ export default { ...@@ -545,3 +545,17 @@ export default {
} }
}; };
</script> </script>
<style scoped lang="scss" >
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body {
padding: 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
</style>
ruoyi-ui/src/views/smartSchool/electronicArchives/personalInformation/index copy.vue
...@@ -727,7 +727,7 @@ export default { ...@@ -727,7 +727,7 @@ export default {
} }
</script> </script>
<style> <style scoped>
.el-form-item { .el-form-item {
margin-bottom: 0; margin-bottom: 0;
} }
......
ruoyi-ui/src/views/smartSchool/electronicArchives/personalInformation/index.vue
...@@ -29,33 +29,34 @@ ...@@ -29,33 +29,34 @@
<!-- f1 --> <!-- f1 -->
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-col :span="4" class="border_right border-bottom table_cell"> <el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="name"> <el-form-item prop="name">
<span>姓名</span> <span>姓名</span>
</el-form-item></el-col> </el-form-item></el-col>
<el-col :span="4" class="border_right border-bottom table_cell"> <el-col :span="4" class="border_right border-bottom table_cell ">
<el-form-item prop="name"> <el-form-item prop="name">
<span>{{ form.name }}</span> <span>{{ form.name }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="border_right border-bottom table_cell"> <el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="sex"> <el-form-item prop="sex">
<span>性别</span> <span>性别</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="border_right border-bottom table_cell"> <el-col :span="4" class="border_right border-bottom table_cell ">
<el-form-item prop="sex"> <el-form-item prop="sex">
<span>{{ form.sex }}</span> <span>{{ form.sex == "0" ? '男' : form.sex == "1" ? '女' : '' }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="border_right border-bottom table_cell"> <el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="age"> <el-form-item prop="age">
<span>年龄</span> <span>年龄</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="border_right border-bottom table_cell"> <el-col :span="4" class="border_right border-bottom table_cell ">
<el-form-item prop="age"> <el-form-item prop="age">
<span>{{ form.age }}</span> <span>{{ form.age }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-col> </el-col>
...@@ -63,16 +64,16 @@ ...@@ -63,16 +64,16 @@
<!-- f2 --> <!-- f2 -->
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-col :span="4" class="border_right border-bottom table_cell"> <el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="birthDate"> <el-form-item prop="birthDate">
<span>出生年月</span> <span>出生年月</span>
</el-form-item></el-col> </el-form-item></el-col>
<el-col :span="4" class="border_right border-bottom table_cell"> <el-col :span="4" class="border_right border-bottom table_cell ">
<el-form-item prop="birthDate"> <el-form-item prop="birthDate">
<span>{{ form.birthDate }}</span> <span>{{ form.birthDate }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="border_right border-bottom table_cell"> <el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="hometown"> <el-form-item prop="hometown">
<span>籍贯</span> <span>籍贯</span>
</el-form-item> </el-form-item>
...@@ -82,7 +83,7 @@ ...@@ -82,7 +83,7 @@
<span>{{ form.hometown }}</span> <span>{{ form.hometown }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="border_right border-bottom table_cell"> <el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="nation"> <el-form-item prop="nation">
<span>民族</span> <span>民族</span>
</el-form-item> </el-form-item>
...@@ -97,7 +98,7 @@ ...@@ -97,7 +98,7 @@
<!-- f3 --> <!-- f3 -->
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-col :span="4" class="border_right border-bottom table_cell"> <el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="idCard"> <el-form-item prop="idCard">
<span>身份证号</span> <span>身份证号</span>
</el-form-item></el-col> </el-form-item></el-col>
...@@ -106,7 +107,7 @@ ...@@ -106,7 +107,7 @@
<span>{{ form.idCard }}</span> <span>{{ form.idCard }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="border_right border-bottom table_cell"> <el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="fileBirthDate"> <el-form-item prop="fileBirthDate">
<span>档案出生年月</span> <span>档案出生年月</span>
</el-form-item> </el-form-item>
...@@ -116,7 +117,7 @@ ...@@ -116,7 +117,7 @@
<span>{{ form.fileBirthDate }}</span> <span>{{ form.fileBirthDate }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="border_right border-bottom table_cell"> <el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="politicalLandscape"> <el-form-item prop="politicalLandscape">
<span>政治面貌</span> <span>政治面貌</span>
</el-form-item> </el-form-item>
...@@ -131,7 +132,7 @@ ...@@ -131,7 +132,7 @@
<!-- f4 --> <!-- f4 -->
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-col :span="4" class="border_right border-bottom table_cell"> <el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="partyMembershipTime"> <el-form-item prop="partyMembershipTime">
<span>入党时间</span> <span>入党时间</span>
</el-form-item></el-col> </el-form-item></el-col>
...@@ -140,7 +141,7 @@ ...@@ -140,7 +141,7 @@
<span>{{ form.partyMembershipTime }}</span> <span>{{ form.partyMembershipTime }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="border_right border-bottom table_cell"> <el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="teachingSubject"> <el-form-item prop="teachingSubject">
<span>任教学科</span> <span>任教学科</span>
</el-form-item> </el-form-item>
...@@ -150,7 +151,7 @@ ...@@ -150,7 +151,7 @@
<span>{{ form.teachingSubject }}</span> <span>{{ form.teachingSubject }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="border_right border-bottom table_cell"> <el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="currentProfessionalTitle"> <el-form-item prop="currentProfessionalTitle">
<span>现职称</span> <span>现职称</span>
</el-form-item> </el-form-item>
...@@ -165,7 +166,7 @@ ...@@ -165,7 +166,7 @@
<!-- f5 --> <!-- f5 -->
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-col :span="4" class="border_right border-bottom table_cell"> <el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="currentProfessionalTitleTime"> <el-form-item prop="currentProfessionalTitleTime">
<span>现职称取得资格时间</span> <span>现职称取得资格时间</span>
</el-form-item></el-col> </el-form-item></el-col>
...@@ -174,7 +175,7 @@ ...@@ -174,7 +175,7 @@
<span>{{ form.currentProfessionalTitleTime }}</span> <span>{{ form.currentProfessionalTitleTime }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="border_right border-bottom table_cell"> <el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="currentHiringProfessionalTitle"> <el-form-item prop="currentHiringProfessionalTitle">
<span>现聘职称</span> <span>现聘职称</span>
</el-form-item> </el-form-item>
...@@ -184,7 +185,7 @@ ...@@ -184,7 +185,7 @@
<span>{{ form.currentHiringProfessionalTitle }}</span> <span>{{ form.currentHiringProfessionalTitle }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="border_right border-bottom table_cell"> <el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="currentHiringProfessionalTitleTime"> <el-form-item prop="currentHiringProfessionalTitleTime">
<span>现聘任职时间</span> <span>现聘任职时间</span>
</el-form-item> </el-form-item>
...@@ -199,7 +200,7 @@ ...@@ -199,7 +200,7 @@
<!-- f6--> <!-- f6-->
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-col :span="4" class="border_right border-bottom table_cell"> <el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="currentPosition"> <el-form-item prop="currentPosition">
<span>现聘岗位</span> <span>现聘岗位</span>
</el-form-item></el-col> </el-form-item></el-col>
...@@ -208,7 +209,7 @@ ...@@ -208,7 +209,7 @@
<span>{{ form.currentPosition }}</span> <span>{{ form.currentPosition }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="border_right border-bottom table_cell"> <el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="currentJobLevel"> <el-form-item prop="currentJobLevel">
<span>现岗位等级</span> <span>现岗位等级</span>
</el-form-item> </el-form-item>
...@@ -218,7 +219,7 @@ ...@@ -218,7 +219,7 @@
<span>{{ form.currentJobLevel }}</span> <span>{{ form.currentJobLevel }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="border_right border-bottom table_cell"> <el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="currentJobLevelAppointmentTime"> <el-form-item prop="currentJobLevelAppointmentTime">
<span>现岗位等级聘任时间</span> <span>现岗位等级聘任时间</span>
</el-form-item> </el-form-item>
...@@ -233,12 +234,13 @@ ...@@ -233,12 +234,13 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-card <el-card
style="height: 180px;width: 415px; display: flex; align-items: center; justify-content: center; "> style=" height: 180px; width: 100%; display: flex; align-items: center; justify-content: center; ">
<el-upload v-loading="uploadLoading" class="avatar-uploader" action="#" accept="image/*" <el-upload v-loading="uploadLoading" class="avatar-uploader" action="#" accept="image/*"
:show-file-list="false" :on-success="handleAvatarSuccess" :show-file-list="false" :on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload" :http-request="uploadImage"> :before-upload="beforeAvatarUpload" :http-request="uploadImage">
<img v-if="form.photoUrl" :src="baseUrl + form.photoUrl" <img v-if="form.photoUrl" :src="baseUrl + form.photoUrl"
style="max-width: 100%; max-height: 100%" class="avatar" alt="" /> style="max-width: 100%; max-height: 180px; object-fit: contain;" class="avatar"
alt="" />
<i v-else class="el-icon-plus avatar-uploader-icon"></i> <i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload> </el-upload>
</el-card> </el-card>
...@@ -246,7 +248,7 @@ ...@@ -246,7 +248,7 @@
<!-- f1 --> <!-- f1 -->
<el-row> <el-row>
<el-col> <el-col>
<el-col :span="3" class="border_right border-bottom table_cell"> <el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="duties"> <el-form-item prop="duties">
<span>职务</span> <span>职务</span>
</el-form-item> </el-form-item>
...@@ -256,27 +258,27 @@ ...@@ -256,27 +258,27 @@
<span>{{ form.duties }}</span> <span>{{ form.duties }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="border_right border-bottom table_cell"> <el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="teacherQualificationType"> <el-form-item prop="teacherQualificationType">
<span>教师资格种类</span> <span>教师资格种类</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="border_right border-bottom table_cell"> <el-col :span="3" class="border_right border-bottom table_cell ">
<el-form-item prop="teacherQualificationType"> <el-form-item prop="teacherQualificationType">
<span>{{ form.teacherQualificationType }}</span> <span>{{ form.teacherQualificationType }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="border_right border-bottom table_cell"> <el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="teacherQualificationCertificateNum"> <el-form-item prop="teacherQualificationCertificateNum">
<span>教师资格号码</span> <span>教师资格号码</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="border_right border-bottom table_cell"> <el-col :span="3" class="border_right border-bottom table_cell ">
<el-form-item prop="teacherQualificationCertificateNum"> <el-form-item prop="teacherQualificationCertificateNum">
<span>{{ form.teacherQualificationCertificateNum }}</span> <span>{{ form.teacherQualificationCertificateNum }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="border_right border-bottom table_cell"> <el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="workingHours"> <el-form-item prop="workingHours">
<span>参加工作时间</span> <span>参加工作时间</span>
</el-form-item> </el-form-item>
...@@ -292,7 +294,7 @@ ...@@ -292,7 +294,7 @@
<!-- f2 --> <!-- f2 -->
<el-row> <el-row>
<el-col> <el-col>
<el-col :span="3" class="border_right border-bottom table_cell"> <el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="toSecondMiddleSchoolTime"> <el-form-item prop="toSecondMiddleSchoolTime">
<span>到二中工作时间</span> <span>到二中工作时间</span>
</el-form-item> </el-form-item>
...@@ -302,7 +304,7 @@ ...@@ -302,7 +304,7 @@
<span>{{ form.toSecondMiddleSchoolTime }}</span> <span>{{ form.toSecondMiddleSchoolTime }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="border_right border-bottom table_cell"> <el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="toSecondAge"> <el-form-item prop="toSecondAge">
<span>二中工作年龄</span> <span>二中工作年龄</span>
</el-form-item> </el-form-item>
...@@ -312,7 +314,7 @@ ...@@ -312,7 +314,7 @@
<span>{{ form.toSecondAge }}</span> <span>{{ form.toSecondAge }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="border_right border-bottom table_cell"> <el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="lengthOfTeacherTime"> <el-form-item prop="lengthOfTeacherTime">
<span>教龄起算时间</span> <span>教龄起算时间</span>
</el-form-item> </el-form-item>
...@@ -322,7 +324,7 @@ ...@@ -322,7 +324,7 @@
<span>{{ form.lengthOfTeacherTime }}</span> <span>{{ form.lengthOfTeacherTime }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="border_right border-bottom table_cell"> <el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="lengthOfServiceTime"> <el-form-item prop="lengthOfServiceTime">
<span>工龄起算时间</span> <span>工龄起算时间</span>
</el-form-item> </el-form-item>
...@@ -338,7 +340,7 @@ ...@@ -338,7 +340,7 @@
<!-- f3 --> <!-- f3 -->
<el-row> <el-row>
<el-col> <el-col>
<el-col :span="3" class="border_right border-bottom table_cell"> <el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="seniority"> <el-form-item prop="seniority">
<span>工龄年限</span> <span>工龄年限</span>
</el-form-item> </el-form-item>
...@@ -348,7 +350,7 @@ ...@@ -348,7 +350,7 @@
<span>{{ form.seniority }}</span> <span>{{ form.seniority }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="border_right border-bottom table_cell"> <el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="onDutySituation"> <el-form-item prop="onDutySituation">
<span>在岗情况</span> <span>在岗情况</span>
</el-form-item> </el-form-item>
...@@ -358,7 +360,7 @@ ...@@ -358,7 +360,7 @@
<span>{{ form.onDutySituation }}</span> <span>{{ form.onDutySituation }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="border_right border-bottom table_cell"> <el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="currentSituation"> <el-form-item prop="currentSituation">
<span>在编情况</span> <span>在编情况</span>
</el-form-item> </el-form-item>
...@@ -368,7 +370,7 @@ ...@@ -368,7 +370,7 @@
<span>{{ form.currentSituation }}</span> <span>{{ form.currentSituation }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="border_right border-bottom table_cell"> <el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="graduationInstitution1"> <el-form-item prop="graduationInstitution1">
<span>毕业院校1</span> <span>毕业院校1</span>
</el-form-item> </el-form-item>
...@@ -386,7 +388,7 @@ ...@@ -386,7 +388,7 @@
<!-- f4 --> <!-- f4 -->
<el-row> <el-row>
<el-col> <el-col>
<el-col :span="3" class="border_right border-bottom table_cell"> <el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="major1"> <el-form-item prop="major1">
<span>专业1</span> <span>专业1</span>
</el-form-item> </el-form-item>
...@@ -396,7 +398,7 @@ ...@@ -396,7 +398,7 @@
<span>{{ form.major1 }}</span> <span>{{ form.major1 }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="border_right border-bottom table_cell"> <el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="graduationTime1"> <el-form-item prop="graduationTime1">
<span>毕业时间1</span> <span>毕业时间1</span>
</el-form-item> </el-form-item>
...@@ -406,7 +408,7 @@ ...@@ -406,7 +408,7 @@
<span>{{ form.graduationTime1 }}</span> <span>{{ form.graduationTime1 }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="border_right border-bottom table_cell"> <el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="name"> <el-form-item prop="name">
<span>毕业院校2</span> <span>毕业院校2</span>
</el-form-item> </el-form-item>
...@@ -416,7 +418,7 @@ ...@@ -416,7 +418,7 @@
<span>{{ form.graduationInstitution2 }}</span> <span>{{ form.graduationInstitution2 }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="border_right border-bottom table_cell"> <el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="major2"> <el-form-item prop="major2">
<span>专业2</span> <span>专业2</span>
</el-form-item> </el-form-item>
...@@ -432,7 +434,7 @@ ...@@ -432,7 +434,7 @@
<!-- f5 --> <!-- f5 -->
<el-row> <el-row>
<el-col> <el-col>
<el-col :span="3" class="border_right border-bottom table_cell"> <el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="graduationTime2"> <el-form-item prop="graduationTime2">
<span>毕业时间2</span> <span>毕业时间2</span>
</el-form-item> </el-form-item>
...@@ -442,7 +444,7 @@ ...@@ -442,7 +444,7 @@
<span>{{ form.graduationTime2 }}</span> <span>{{ form.graduationTime2 }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="border_right border-bottom table_cell"> <el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="graduationInstitution3"> <el-form-item prop="graduationInstitution3">
<span>毕业学院3</span> <span>毕业学院3</span>
</el-form-item> </el-form-item>
...@@ -452,7 +454,7 @@ ...@@ -452,7 +454,7 @@
<span>{{ form.graduationInstitution3 }}</span> <span>{{ form.graduationInstitution3 }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="border_right border-bottom table_cell"> <el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="major3"> <el-form-item prop="major3">
<span>专业3</span> <span>专业3</span>
</el-form-item> </el-form-item>
...@@ -462,7 +464,7 @@ ...@@ -462,7 +464,7 @@
<span>{{ form.major3 }}</span> <span>{{ form.major3 }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="border_right border-bottom table_cell"> <el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="graduationTime3"> <el-form-item prop="graduationTime3">
<span>毕业时间3</span> <span>毕业时间3</span>
</el-form-item> </el-form-item>
...@@ -475,6 +477,43 @@ ...@@ -475,6 +477,43 @@
</el-col> </el-col>
</el-row> </el-row>
<!-- f6 -->
<el-row>
<el-col>
<el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="firstDegree">
<span>第一学历</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="firstDegree">
<span>{{ form.firstDegree }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="lastDegree">
<span>最后学历</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="lastDegree">
<span>{{ form.lastDegree }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="degree">
<span>学位</span>
</el-form-item>
</el-col>
<el-col :span="9" class="border_right border-bottom table_cell">
<el-form-item prop="degree">
<span>{{ form.degree }}</span>
</el-form-item>
</el-col>
</el-col>
</el-row>
</div> </div>
</el-form> </el-form>
</div> </div>
...@@ -510,7 +549,11 @@ ...@@ -510,7 +549,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="聘任职务" align="center" prop="appointmentPosition" width="120px" /> <el-table-column label="聘任职务" align="center" prop="appointmentPosition" width="120px" />
<el-table-column label="聘任情况" align="center" prop="appointmentSituation" width="120px" /> <el-table-column label="聘任情况" align="center" prop="appointmentSituation" width="120px">
<template slot-scope="scope">
<dict-tag :options="dict.type.appointment_situation" :value="scope.row.appointmentSituation" />
</template>
</el-table-column>
<el-table-column label="班级" align="center" prop="className" /> <el-table-column label="班级" align="center" prop="className" />
<el-table-column label="班级类型" align="center" prop="classType"> <el-table-column label="班级类型" align="center" prop="classType">
</el-table-column> </el-table-column>
...@@ -562,28 +605,30 @@ ...@@ -562,28 +605,30 @@
<div class="card_title">专业成长</div> <div class="card_title">专业成长</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="specialityVos"> <el-table :data="specialityVos">
<el-table-column label="成长类型" align="center" prop="type"> <el-table-column label="成长类型" align="center" prop="growthType">
<template>
<span>综合荣誉</span>
</template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub"> <el-table-column label="学科" align="center" prop="sub">
<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" /> <el-table-column label="获奖类别" align="center" prop="awardtype">
<el-table-column label="获奖等级" align="center" prop="awardLevel">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" /> <span v-if="scope.row.growthType == '综合荣誉'">{{ scope.row.awardtype }}</span>
<dict-tag v-else :options="getDictionaryByGrowthType(scope.row)" :value="scope.row.awardtype" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardType"> <el-table-column label="获奖等级" align="center" prop="awardlevel">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardType" /> <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="resultName" /> <el-table-column label="获奖级别" align="center" prop="awardrank">
<template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" />
</template>
</el-table-column>
<el-table-column label="成果名称" align="center" prop="resultName" />
<el-table-column label="获奖人" align="center" prop="userName" /> <el-table-column label="获奖人" align="center" prop="userName" />
<el-table-column label="主办单位" align="center" prop="org" /> <el-table-column label="主办单位" align="center" prop="org" />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180"> <el-table-column label="获奖时间" align="center" prop="awardTime" width="180">
...@@ -784,9 +829,10 @@ export default { ...@@ -784,9 +829,10 @@ export default {
"award_type_fdjs", "award_type_fdjs",
"award_type_fdxs", "award_type_fdxs",
"award_rank", "award_rank",
"awards_level", 'coachingr', 'check_result'], "awards_level", 'coachingr', 'check_result', 'appointment_situation', 'award_categoriesjs', 'award_categoriesjk', 'award_categories', 'project_research'],
data() { data() {
return { return {
sex: '',
classType: "", classType: "",
uploadForm: {}, uploadForm: {},
baseUrl: [process.env.VUE_APP_BASE_API], baseUrl: [process.env.VUE_APP_BASE_API],
...@@ -808,18 +854,35 @@ export default { ...@@ -808,18 +854,35 @@ export default {
fudaoStudent: [], fudaoStudent: [],
//专业成长 //专业成长
specialityVos: [], specialityVos: [],
form: {}, form: {
},
queryParams: {}, queryParams: {},
showSearch: true, showSearch: true,
} }
}, },
created() { created() {
this.getList();
}, },
methods: { methods: {
getSelectedTypes(classType) { getDictionaryByGrowthType(row) {
const selectedTypes = classType.split(','); // 将逗号分隔的字符串转换为数组 console.log(row, 'row');
return this.dict.type.class_type.filter(option => selectedTypes.includes(option.value.toString())); switch (row.growthType) {
// case '综合荣誉':
// console.log('awardtype', row.awardtype)
// return row.awardtype;
case '教学获奖':
return this.dict.type.award_categoriesjs;
case '讲课获奖':
return this.dict.type.award_categoriesjk;
case '论文论著':
return this.dict.type.award_categories;
case '课题研究':
return this.dict.type.project_research;
default:
return {};
}
}, },
//查询 //查询
getList() { getList() {
...@@ -827,6 +890,8 @@ export default { ...@@ -827,6 +890,8 @@ export default {
listAward(this.queryParams).then(response => { listAward(this.queryParams).then(response => {
console.log(response, response.data); console.log(response, response.data);
this.form = response.data.basicInformation; this.form = response.data.basicInformation;
this.form.idCard = response.data.basicInformation.idCard;
console.log(this.form.idCard, 'this.form.idCard');
this.form.photoUrl = response.data.basicInformation.photoUrl; this.form.photoUrl = response.data.basicInformation.photoUrl;
this.schoolAworkload = response.data.schoolAworkload; this.schoolAworkload = response.data.schoolAworkload;
this.schoolAclassTeacherAssessments = response.data.schoolAclassTeacherAssessments; this.schoolAclassTeacherAssessments = response.data.schoolAclassTeacherAssessments;
...@@ -841,15 +906,59 @@ export default { ...@@ -841,15 +906,59 @@ export default {
// console.log(this.specialityVos, 'this.specialityVos'); // console.log(this.specialityVos, 'this.specialityVos');
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
console.log('teaching_subjects', this.dict.type.teaching_subjects);
this.dict.type.teaching_subjects.find(item => {
if (item.value == response.data.basicInformation.teachingSubject) {
this.form.teachingSubject = item.label
}
})
this.dict.type.current_professional.find(item => {
if (item.value == response.data.basicInformation.currentHiringProfessionalTitle) {
this.form.currentHiringProfessionalTitle = item.label
}
})
this.dict.type.current_joblevel.find(item => {
if (item.value == response.data.basicInformation.currentJobLevel) {
this.form.currentJobLevel = item.label
}
})
this.dict.type.politics_tatusls.find(item => {
if (item.value == response.data.basicInformation.politicalLandscape) {
this.form.politicalLandscape = item.label
}
})
this.dict.type.current_professional.find(item => {
if (item.value == response.data.basicInformation.currentProfessionalTitle) {
this.form.currentProfessionalTitle = item.label
}
})
this.dict.type.duty_situation.find(item => {
if (item.value == response.data.basicInformation.onDutySituation) {
this.form.onDutySituation = item.label
}
})
}); });
}, },
resetQuery() { resetQuery() {
// 清空搜索出来的表格数据
this.form = {};
this.schoolAworkload = [];
this.schoolAclassTeacherAssessments = [];
this.schoolAnnualAssessment = [];
this.schoolXteachingAchievements = [];
this.schoolGkAchievement = [];
this.fudaoTeacher = [];
this.fudaoStudent = [];
this.specialityVos = [];
this.queryParams = { this.queryParams = {
name: '', name: '',
idCard: '', idCard: '',
}; };
this.getList(); this.getList();
}, },
// 上传成功回调 // 上传成功回调
handleAvatarSuccess(res, file) { handleAvatarSuccess(res, file) {
this.photoUrl = res.data.url; this.photoUrl = res.data.url;
...@@ -893,20 +1002,28 @@ export default { ...@@ -893,20 +1002,28 @@ export default {
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('/teacher/basiclnformation/exportPDF', { // 检查是否存在身份证号
...this.queryParams if (!this.form || !this.form.idCard) {
}, `教师个人信息汇总_${Date.now()}.pdf console.error('无法导出文件：身份证号未定义');
`) return;
}
}, // 构造请求参数，包括查询参数和身份证号
const queryParams = {
...this.queryParams,
idCard: this.form.idCard,
};
// 发送导出请求
this.download('/teacher/basiclnformation/exportPDF', queryParams, `教师个人信息汇总_${Date.now()}.pdf`);
},
}, },
} }
</script> </script>
<style> <style scoped>
.el-form-item { .el-form-item {
margin-bottom: 0; margin-bottom: 0;
} }
...@@ -976,4 +1093,8 @@ export default { ...@@ -976,4 +1093,8 @@ export default {
border-radius: 30px; border-radius: 30px;
} }
.background {
background-color: #eff8fc;
}
</style> </style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/annualAssessment/index.vue
...@@ -27,23 +27,23 @@ ...@@ -27,23 +27,23 @@
<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-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:assessment:add']">新增</el-button> v-hasPermi="['school:annualAssessment:add']">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['system:assessment:edit']">修改</el-button> v-hasPermi="['school: annualAssessment:edit']">修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:assessment:remove']">删除</el-button> v-hasPermi="['school:annualAssessment:remove']">删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:assessment:export']">导出</el-button> v-hasPermi="['school:annualAssessment:export ']">导出</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-upload" size="mini" @click="handleImport" <el-button type="warning" plain icon="el-icon-upload" size="mini" @click="handleImport"
v-hasPermi="['system:assessment:import']">导入</el-button> v-hasPermi="['school:annualAssessment:importData']">导入</el-button>
</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>
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/awardTutoringstu/index.vue
...@@ -53,19 +53,19 @@ ...@@ -53,19 +53,19 @@
<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-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:awards:add']">新增</el-button> v-hasPermi="['school:fudaos:addgl']">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['system:awards:edit']">修改</el-button> v-hasPermi="['school:fudaos:edit']">修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:awards:remove']">删除</el-button> v-hasPermi="['school:fudaos:delete']">删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:awards:export']">导出</el-button> v-hasPermi="['school:fudaos:export']">导出</el-button>
</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>
...@@ -111,13 +111,13 @@ ...@@ -111,13 +111,13 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
<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="['school:fudaos: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>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:honors:remove']" v-hasPermi="['school:fudaos:delete ']"
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>
<el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)" <el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditstate === '1'">审核</el-button> v-hasPermi="['school:fudaos:submit']" v-if="scope.row.auditstate === '1'">审核</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/comprehensiveHonors/index.vue
...@@ -85,9 +85,9 @@ ...@@ -85,9 +85,9 @@
<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="awardType" sortable> <el-table-column label="获奖级别" align="center" prop="awardRank" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardType" /> <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 /> <el-table-column label="综合荣誉-成果名称" align="center" prop="resultName" sortable />
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
v-hasPermi="['system:honors:remove']" v-hasPermi="['system:honors:remove']"
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>
<el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)" <el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditState === '1'">审核</el-button> v-hasPermi="['system:honors:audit']" v-if="scope.row.auditState === '1'">审核</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/essaysWritings/index.vue
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
v-hasPermi="['system:honors:remove']" v-hasPermi="['system:honors:remove']"
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>
<el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)" <el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditState === '1'">审核</el-button> v-hasPermi="['system:works:audit']" v-if="scope.row.auditState === '1'">审核</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -367,6 +367,7 @@ export default { ...@@ -367,6 +367,7 @@ export default {
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
look: false, look: false,
isEdit: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/lectureAwards/index.vue
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
v-hasPermi="['system:honors:remove']" v-hasPermi="['system:honors:remove']"
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>
<el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)" <el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditState === '1'">审核</el-button> v-hasPermi="['system:awards:audit']" v-if="scope.row.auditState === '1'">审核</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/projectResearch/index.vue
...@@ -53,19 +53,19 @@ ...@@ -53,19 +53,19 @@
<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-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:works:add']">新增</el-button> v-hasPermi="['system:research:add']">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['system:works:edit']">修改</el-button> v-hasPermi="['system:research:edit']">修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:works:remove']">删除</el-button> v-hasPermi="['system:research: remove']">删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:works:export']">导出</el-button> v-hasPermi="['system:research:export']">导出</el-button>
</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>
...@@ -108,13 +108,13 @@ ...@@ -108,13 +108,13 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<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:research: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>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:honors:remove']" v-hasPermi="['system:research:remove']"
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>
<el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)" <el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditState === '1'">审核</el-button> v-hasPermi="['system:research:audit']" v-if="scope.row.auditState === '1'">审核</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -369,6 +369,7 @@ export default { ...@@ -369,6 +369,7 @@ export default {
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
look: false, look: false,
isEdit: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teacherAwards/index.vue
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="获奖类别" prop="awardType"> <el-form-item label="获奖类别" prop="awardType">
<el-select v-model="form.awardType" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.awardType" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.award_categoriesjs" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.award_categoriesjs" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</el-form-item> </el-form-item>
<el-form-item label="获奖等级" prop="awardLevel"> <el-form-item label="获奖等级" prop="awardLevel">
<el-select v-model="form.awardLevel" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -53,19 +53,19 @@ ...@@ -53,19 +53,19 @@
<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-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:awards:add']">新增</el-button> v-hasPermi="['school:teacherAwards:add']">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['system:awards:edit']">修改</el-button> v-hasPermi="['school:teacherAwards:edit']">修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:awards:remove']">删除</el-button> v-hasPermi="['school:teacherAwards:remove']">删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:awards:export']">导出</el-button> v-hasPermi="['school:teacherAwards:export']">导出</el-button>
</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>
...@@ -110,13 +110,13 @@ ...@@ -110,13 +110,13 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<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="['school:teacherAwards: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>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:honors:remove']" v-hasPermi="['school:teacherAwards:remove']"
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>
<el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)" <el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditState === '1'">审核</el-button> v-hasPermi="['school:teacherAwards:audit']" v-if="scope.row.auditState === '1'">审核</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teachingAchievements/index.vue
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="学期" prop="semester"> <el-form-item label="学期" prop="semester">
<el-select v-model="queryParams.semster" placeholder="请选择"> <el-select v-model="queryParams.semester" placeholder="请选择">
<el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport" <el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport"
v-hasPermi="['system:student:export']">导入 v-hasPermi="['system:achievements:importData']">导入
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/tutorAward/index.vue
...@@ -60,19 +60,19 @@ ...@@ -60,19 +60,19 @@
<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-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:awards:add']">新增</el-button> v-hasPermi="['school:fudaot:addgl']">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['system:awards:edit']">修改</el-button> v-hasPermi="['school:fudaot:edit']">修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:awards:remove']">删除</el-button> v-hasPermi="['school:fudaot:delete']">删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:awards:export']">导出</el-button> v-hasPermi="['school:fudaot:export']">导出</el-button>
</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>
...@@ -123,13 +123,13 @@ ...@@ -123,13 +123,13 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<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="['school:fudaot: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>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:honors:remove']" v-hasPermi="['school:fudaot:delete']"
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>
<el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)" <el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditstate === '1'">审核</el-button> v-hasPermi="['school:fudaot:submit']" v-if="scope.row.auditstate === '1'">审核</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
ruoyi-ui/src/views/smartSchool/electronicArchives/teacherAssessment/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="98px"> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form ref="queryParams" :model="queryParams" label-width="96px">
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="teacherName"> <el-form-item label="姓名" prop="teacherName">
<el-input v-model="queryParams.teacherName" placeholder="请输入" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.teacherName" placeholder="请输入" clearable
@keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">>
<el-form-item label="学年" prop="schoolYear"> <el-form-item label="学年" prop="schoolYear">
<el-select v-model="queryParams.schoolYear" placeholder="请选择" style="width: 190px;"> <el-select v-model="queryParams.schoolYear" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label" :value="dict.value"> <el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="届别" prop="year"> <el-form-item label="届别" prop="year">
<el-select v-model="queryParams.year" placeholder="请选择"> <el-select v-model="queryParams.year" placeholder="请选择">
<el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label" :value="dict.value"> <el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item></el-col>
<el-col :span="12">
<el-form-item label="学期" prop="semester"> <el-form-item label="学期" prop="semester">
<el-select v-model="queryParams.semster" placeholder="请选择"> <el-select v-model="queryParams.semester" placeholder="请选择">
<el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="年级" prop="grade"> <el-form-item label="年级" prop="grade">
<el-select v-model="queryParams.grade" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.grade" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label" :value="dict.value"> <el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%"> <el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
...@@ -36,6 +56,10 @@ ...@@ -36,6 +56,10 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="班级类型" prop="classType"> <el-form-item label="班级类型" prop="classType">
<el-select v-model="queryParams.classType" placeholder="请选择" style="width: 100%"> <el-select v-model="queryParams.classType" placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label"
...@@ -43,24 +67,39 @@ ...@@ -43,24 +67,39 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="班级" prop="className"> <el-form-item label="班级" prop="className">
<el-input v-model="queryParams.className" placeholder="请输入" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.className" placeholder="请输入" clearable
@keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="德育考核成绩" prop="moralEduCheckAchievement"> <el-form-item label="德育考核成绩" prop="moralEduCheckAchievement">
<el-input v-model="queryParams.moralEduCheckAchievement" placeholder="请输入" clearable <el-input v-model="queryParams.moralEduCheckAchievement" placeholder="请输入" clearable
@keyup.enter.native="handleQuery" /> @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="智育考核成绩" prop="intellEduCheckAchievement"> <el-form-item label="智育考核成绩" prop="intellEduCheckAchievement">
<el-input v-model="queryParams.intellEduCheckAchievement" placeholder="请输入" clearable <el-input v-model="queryParams.intellEduCheckAchievement" placeholder="请输入" clearable
@keyup.enter.native="handleQuery" /> @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-dialog>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:assessment:add']">新增</el-button> v-hasPermi="['system:assessment:add']">新增</el-button>
</el-col> </el-col>
...@@ -74,7 +113,7 @@ ...@@ -74,7 +113,7 @@
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport" <el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport"
v-hasPermi="['system:student:export']">导入 v-hasPermi="['system:assessment:import']">导入
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -84,7 +123,8 @@ ...@@ -84,7 +123,8 @@
<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' }"> :default-sort="{ prop: 'schoolYear', order: 'descending' }" :row-style="{ height: '0' }"
:cell-style="{ padding: '3px' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" /> <el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" />
<el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" /> <el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" />
...@@ -99,8 +139,8 @@ ...@@ -99,8 +139,8 @@
<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 /> <el-table-column label="班级" align="center" prop="className" sortable show-overflow-tooltip />
<el-table-column label="班级类型" align="center" prop="classType" sortable width="180px"> <el-table-column label="班级类型" align="center" prop="classType" sortable width="180px" 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">
...@@ -180,7 +220,11 @@ ...@@ -180,7 +220,11 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="班级" prop="className"> <el-form-item label="班级" prop="className">
<el-input v-model="form.className" placeholder="请输入" /> <el-select v-model="form.className" multiple placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.class_num" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -198,7 +242,7 @@ ...@@ -198,7 +242,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="德育考核成绩" prop="moralEduCheckAchievement"> <el-form-item label="德育考核成绩" prop="moralEduCheckAchievement">
<el-input v-model="form.moralEduCheckAchievement" placeholder="请输入" /> <el-input v-model="form.moralEduCheckAchievement" type="number" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -206,7 +250,7 @@ ...@@ -206,7 +250,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="智育考核成绩" prop="intellEduCheckAchievement"> <el-form-item label="智育考核成绩" prop="intellEduCheckAchievement">
<el-input v-model="form.intellEduCheckAchievement" placeholder="请输入" /> <el-input v-model="form.intellEduCheckAchievement" type="number" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -278,7 +322,7 @@ import { listAssessment, getAssessment, delAssessment, addAssessment, updateAsse ...@@ -278,7 +322,7 @@ import { listAssessment, getAssessment, delAssessment, addAssessment, updateAsse
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
export default { export default {
name: "Assessment", name: "Assessment",
dicts: ["teaching_subjects", 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type', 'yearda', 'rankda', 'appointment_situation', 'appointment_positions'], dicts: ["teaching_subjects", 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type', 'yearda', 'rankda', 'appointment_situation', 'appointment_positions', 'class_num'],
data() { data() {
return { return {
uploadOpen: false, uploadOpen: false,
...@@ -316,6 +360,7 @@ export default { ...@@ -316,6 +360,7 @@ export default {
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
query: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -393,6 +438,11 @@ export default { ...@@ -393,6 +438,11 @@ export default {
getSelectedTypes(classType) { getSelectedTypes(classType) {
return this.dict.type.class_type.filter(option => classType.split(',').includes(option.value.toString())); return this.dict.type.class_type.filter(option => classType.split(',').includes(option.value.toString()));
}, },
/** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
this.resetcx();
},
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.open = false;
...@@ -492,6 +542,7 @@ export default { ...@@ -492,6 +542,7 @@ export default {
getAssessment(id).then(response => { getAssessment(id).then(response => {
this.form = response.data; this.form = response.data;
this.form.classType = this.form.classType.split(','); this.form.classType = this.form.classType.split(',');
this.form.className = this.form.className.split(',');
this.open = true; this.open = true;
this.title = "修改班主任考核"; this.title = "修改班主任考核";
}); });
...@@ -501,15 +552,17 @@ export default { ...@@ -501,15 +552,17 @@ export default {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
const classTypeStr = this.form.classType.join(','); const classTypeStr = this.form.classType.join(',');
console.log(classTypeStr); // 输出转换后的字符串 console.log(classTypeStr); // 输出转换后的字符串
const classNameStr = this.form.className.join(',');
console.log(classNameStr); // 输出转换后的字符串
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
updateAssessment({ ...this.form, classType: classTypeStr }).then(response => { updateAssessment({ ...this.form, classType: classTypeStr, className: classNameStr }).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addAssessment({ ...this.form, classType: classTypeStr }).then(response => { addAssessment({ ...this.form, classType: classTypeStr, className: classNameStr }).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
......
ruoyi-ui/src/views/smartSchool/electronicArchives/workloadInformation/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="89px"> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form ref="queryParams" :model="queryParams" label-width="96px">
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="name"> <el-form-item label="姓名" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.name" placeholder="请输入" clearable
@keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="学年" prop="schoolYear"> <el-form-item label="学年" prop="schoolYear">
<el-select v-model="queryParams.schoolYear" placeholder="请选择" style="width: 190px;"> <el-select v-model="queryParams.schoolYear" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label" :value="dict.value"> <el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="学期" prop="semester"> <el-form-item label="学期" prop="semester">
<el-select v-model="queryParams.semster" placeholder="请选择"> <el-select v-model="queryParams.semster" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="届别" prop="year"> <el-form-item label="届别" prop="year">
<el-select v-model="queryParams.year" placeholder="请选择"> <el-select v-model="queryParams.year" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label" :value="dict.value"> <el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="年级" prop="grade"> <el-form-item label="年级" prop="grade">
<el-select v-model="queryParams.grade" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.grade" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label" :value="dict.value"> <el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%"> <el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
...@@ -36,45 +57,70 @@ ...@@ -36,45 +57,70 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="聘任岗位" prop="appointmentPost"> <el-form-item label="聘任岗位" prop="appointmentPost">
<el-select v-model="queryParams.appointmentPost" placeholder="请选择" style="width: 100%"> <el-select v-model="queryParams.appointmentPost" placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.appointment_positions" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.appointment_positions" :key="dict.value"
:value="dict.value"> :label="dict.label" :value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="聘任职务" prop="appointmentPosition"> <el-form-item label="聘任职务" prop="appointmentPosition">
<el-input v-model="queryParams.appointmentPosition" placeholder="请输入" clearable <el-input v-model="queryParams.appointmentPosition" placeholder="请输入" clearable
@keyup.enter.native="handleQuery" /> @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="班级" prop="className"> <el-form-item label="班级" prop="className">
<el-input v-model="queryParams.className" placeholder="请输入" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.className" placeholder="请输入" clearable
@keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="班级类型" prop="classType"> <el-form-item label="班级类型" prop="classType">
<el-select v-model="queryParams.classType" multiple placeholder="请选择" style="width: 100%"> <el-select v-model="queryParams.classType" placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="证明人" prop="userName"> <el-form-item label="证明人" prop="userName">
<el-input v-model="queryParams.userName" placeholder="请输入" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.userName" placeholder="请输入" clearable
@keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="聘任情况" prop="appointmentSituation"> <el-form-item label="聘任情况" prop="appointmentSituation">
<el-select v-model="queryParams.appointmentSituation" placeholder="请选择" style="width: 100%"> <el-select v-model="queryParams.appointmentSituation" placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.appointment_situation" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.appointment_situation" :key="dict.value"
:value="dict.value"> :label="dict.label" :value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> </el-col>
</el-row>
<el-form-item class="dialog-footer" style="display: flex; justify-content: center; align-items: center">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-dialog>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:aworkload:add']">新增</el-button> v-hasPermi="['system:aworkload:add']">新增</el-button>
</el-col> </el-col>
...@@ -87,7 +133,7 @@ ...@@ -87,7 +133,7 @@
v-hasPermi="['system:aworkload:remove']">删除</el-button> v-hasPermi="['system:aworkload:remove']">删除</el-button>
</el-col> </el-col>
<el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport" <el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport"
v-hasPermi="['system:student:export']">导入 v-hasPermi="['system:student:import']">导入
</el-button> </el-button>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
...@@ -95,12 +141,14 @@ ...@@ -95,12 +141,14 @@
</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 :data="aworkloadList" @selection-change="handleSelectionChange" <el-table :data="aworkloadList" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'schoolYear', order: 'descending' }"> :default-sort="{ prop: 'schoolYear', order: 'descending' }" :row-style="{ height: '0' }"
:cell-style="{ padding: '3px' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" /> <el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" />
<el-table-column label="学年" align="center" prop="schoolYear" width="90px" fixed="left" sortable /> <el-table-column label="学年" align="center" prop="schoolYear" width="100px" fixed="left" sortable />
<el-table-column label="学期" align="center" prop="semester" fixed="left" sortable> <el-table-column label="学期" align="center" prop="semester" fixed="left" sortable width="100px">
<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>
...@@ -123,9 +171,13 @@ ...@@ -123,9 +171,13 @@
</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" />
<el-table-column label="聘任情况" align="center" prop="appointmentSituation" sortable width="120px" /> <el-table-column label="聘任情况" align="center" prop="appointmentSituation" sortable width="120px">
<el-table-column label="班级" align="center" prop="className" sortable /> <template slot-scope="scope">
<el-table-column label="班级类型" align="center"> <dict-tag :options="dict.type.appointment_situation" :value="scope.row.appointmentSituation" />
</template>
</el-table-column>
<el-table-column label="班级" align="center" prop="className" sortable width="150px" show-overflow-tooltip />
<el-table-column label=" 班级类型" align="center" width="180px" 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">
...@@ -135,18 +187,18 @@ ...@@ -135,18 +187,18 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="早读" align="center" prop="earlyReading" sortable /> <el-table-column label="早读" align="center" prop="earlyReading" sortable width="90px" />
<el-table-column label="正课" align="center" prop="requiredCourses" sortable /> <el-table-column label="正课" align="center" prop="requiredCourses" sortable width="90px" />
<el-table-column label="晚自习" align="center" prop="eveningSelfStudy" sortable width="120px" /> <el-table-column label="晚自习" align="center" prop="eveningSelfStudy" sortable width="90px" />
<el-table-column label="合计" align="center" prop="amountTo" sortable /> <el-table-column label="合计" align="center" prop="amountTo" sortable />
<el-table-column label="证明人" align="center" prop="userName" width="120px" fixed="right" sortable /> <el-table-column label="证明人" align="center" prop="userName" width="120px" fixed="right" sortable />
<el-table-column label="备注" align="center" prop="remark" fixed="right" sortable /> <el-table-column label="备注" align="center" prop="remark" fixed="right" sortable />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px" 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)"
v-hasPermi="['system:aworkload:edit']">修改</el-button> v-hasPermi="['system:aworkload:edit']">修改</el-button>
<el-button size="mini" type="text" @click="handleLook(scope.row)" <el-button size="mini" type="text" @click="handleLook(scope.row)"
v-hasPermi="['system:aworkload:edit']">详情</el-button> v-hasPermi="['system:aworkload:look']">详情</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)" <el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:aworkload:remove']">删除</el-button> v-hasPermi="['system:aworkload:remove']">删除</el-button>
</template> </template>
...@@ -264,19 +316,19 @@ ...@@ -264,19 +316,19 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="早读" prop="earlyReading"> <el-form-item label="早读" prop="earlyReading">
<el-input v-model="form.earlyReading" placeholder="请输入早读" /> <el-input v-model="form.earlyReading" type="number" placeholder="请输入早读" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="正课" prop="requiredCourses"> <el-form-item label="正课" prop="requiredCourses">
<el-input v-model="form.requiredCourses" placeholder="请输入正课" /> <el-input v-model="form.requiredCourses" type="number" placeholder="请输入正课" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="晚自习" prop="eveningSelfStudy"> <el-form-item label="晚自习" prop="eveningSelfStudy">
<el-input v-model="form.eveningSelfStudy" placeholder="请输入晚自习" /> <el-input v-model="form.eveningSelfStudy" type="number" placeholder="请输入晚自习" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -671,6 +723,7 @@ export default { ...@@ -671,6 +723,7 @@ export default {
look: false, look: false,
edit: false, edit: false,
isEdit: false, isEdit: false,
query: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -740,6 +793,10 @@ export default { ...@@ -740,6 +793,10 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
handleQuerycx() {
this.query = true;
this.resetcx();
},
/** 查询工作量信息列表 */ /** 查询工作量信息列表 */
getList() { getList() {
listAworkload(this.queryParams).then(response => { listAworkload(this.queryParams).then(response => {
...@@ -789,7 +846,7 @@ export default { ...@@ -789,7 +846,7 @@ export default {
this.download( this.download(
"/aworkload/download", "/aworkload/download",
{}, {},
`教师基础信息_${Date.now()}.xlsx` `工作量信息_${Date.now()}.xlsx`
); );
}, },
// 取消按钮 // 取消按钮
...@@ -836,7 +893,7 @@ export default { ...@@ -836,7 +893,7 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
...@@ -908,10 +965,24 @@ export default { ...@@ -908,10 +965,24 @@ export default {
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('/aworkload/download', { this.download('/aworkload/export', {
...this.queryParams ...this.queryParams
}, `工作量信息_${new Date().getTime()}.xlsx`) }, `工作量信息_${new Date().getTime()}.xlsx`)
} }
} }
}; };
</script> </script>
<style lang="less" scoped>
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body {
padding: 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
</style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/personWork/awardTutoringstu/index.vue
...@@ -53,19 +53,19 @@ ...@@ -53,19 +53,19 @@
<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-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:awards:add']">新增</el-button> v-hasPermi="['system:tutoringstu:add']">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['system:awards:edit']">修改</el-button> v-hasPermi="['system:tutoringstu:edit']">修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:awards:remove']">删除</el-button> v-hasPermi="['system:tutoringstu:remove']">删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:awards:export']">导出</el-button> v-hasPermi="['system:tutoringstu:export']">导出</el-button>
</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>
...@@ -110,15 +110,17 @@ ...@@ -110,15 +110,17 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<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:tutoringstu:edit']"
v-if="scope.row.auditstate === '0' || scope.row.auditstate === '3'">修改</el-button> v-if="scope.row.auditstate === '0' || scope.row.auditstate === '3'">修改</el-button>
<el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleLook(scope.row)"
v-hasPermi="['system:tutoringstu:look']"
v-if="scope.row.auditstate === '0' || scope.row.auditstate === '1' || scope.row.auditstate === '3' || scope.row.auditstate === '2'">查看</el-button> v-if="scope.row.auditstate === '0' || scope.row.auditstate === '1' || scope.row.auditstate === '3' || scope.row.auditstate === '2'">查看</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)" <el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:honors:remove']" v-hasPermi="['system:tutoringstu:remove']"
v-if="scope.row.auditstate === '0' || scope.row.auditstate === '3'">删除</el-button> v-if="scope.row.auditstate === '0' || scope.row.auditstate === '3'">删除</el-button>
<el-button size="mini" type="text" @click="handleExamine(scope.row)" <el-button size="mini" type="text" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditstate === '0'">提交</el-button> v-hasPermi="['system:tutoringstu:sub']" v-if="scope.row.auditstate === '0'">提交</el-button>
</template> </template>
</el-table-column> </el-table-column>
...@@ -228,9 +230,6 @@ ...@@ -228,9 +230,6 @@
</el-dialog> </el-dialog>
<!-- 选择对应处理人 -->
<SelectUser :id="selectHandles.id" :open.sync="selectHandles.open" :title="selectHandles.title"
:width="selectHandles.width" :execute="selectHandles.method" @select="selectUser"></SelectUser>
</div> </div>
</template> </template>
...@@ -238,24 +237,13 @@ ...@@ -238,24 +237,13 @@
<script> <script>
import { listAward, listAwardgr, getAward, addAward, addAwardgr, updateAward, delAward, audit } from "@/api/smartSchool/electronicArchives/professionalDevelopment/awardTutoringstu"; import { listAward, listAwardgr, getAward, addAward, addAwardgr, updateAward, delAward, audit } from "@/api/smartSchool/electronicArchives/professionalDevelopment/awardTutoringstu";
import { uploadImage as commonUpload } from "@/api/common"; import { uploadImage as commonUpload } from "@/api/common";
import SelectUser from "./components/SelectUser";
export default { export default {
name: "tutorAward", name: "tutorAward",
dicts: ["teaching_subjects", 'award_type_fdxs', 'awards_level', 'award_rank', 'coachingr'], dicts: ["teaching_subjects", 'award_type_fdxs', 'awards_level', 'award_rank', 'coachingr'],
components: {
SelectUser,
},
data() { data() {
return { return {
// 选择对应处理人
selectHandles: {
id: null,
open: false,
title: '',
width: '50%',
method: null,
type: null // 处理类型： 1 级部/处室； 2 分管； 3 主管
},
// 图片上传遮罩层 // 图片上传遮罩层
uploadLoading: false, uploadLoading: false,
baseUrl: [process.env.VUE_APP_BASE_API], baseUrl: [process.env.VUE_APP_BASE_API],
......
ruoyi-ui/src/views/smartSchool/personWork/comprehensiveHonors/index.vue
...@@ -80,9 +80,9 @@ ...@@ -80,9 +80,9 @@
<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="awardType" sortable> <el-table-column label="获奖级别" align="center" prop="awardRank" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardType" /> <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 /> <el-table-column label="综合荣誉-成果名称" align="center" prop="resultName" sortable />
...@@ -97,13 +97,13 @@ ...@@ -97,13 +97,13 @@
<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 === '0' || scope.row.auditState === '3'">修改</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
<el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:honors:look']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)" <el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:honors:remove']" v-hasPermi="['system:honors:remove']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button>
<el-button size="mini" type="text" @click="handleExamine(scope.row)" <el-button size="mini" type="text" @click="handleExamine(scope.row)" v-hasPermi="['system:honors:sub']"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditState === '0'">提交</el-button> v-if="scope.row.auditState === '0'">提交</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
ruoyi-ui/src/views/smartSchool/personWork/essaysWritings/index.vue
...@@ -109,15 +109,14 @@ ...@@ -109,15 +109,14 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<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: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>
<el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:works:look']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)" <el-button size="mini" type="text" @click="handleDelete(scope.row)" v-hasPermi="['system:works:remove']"
v-hasPermi="['system:honors:remove']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button>
<el-button size="mini" type="text" @click="handleExamine(scope.row)" <el-button size="mini" type="text" @click="handleExamine(scope.row)" v-hasPermi="['system:works:sub']"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditState === '0'">提交</el-button> v-if="scope.row.auditState === '0'">提交</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
ruoyi-ui/src/views/smartSchool/personWork/examinationScore/index.vue
...@@ -99,15 +99,17 @@ ...@@ -99,15 +99,17 @@
<el-table-column label="其他" align="center" prop="other" sortable /> <el-table-column label="其他" align="center" prop="other" sortable />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<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:achievement:edit']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
<el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleLook(scope.row)"
v-hasPermi="['system:achievement:look']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)" <el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:honors:remove']" v-hasPermi="['system:achievement:remove']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button>
<el-button size="mini" type="text" @click="handleExamine(scope.row)" <el-button size="mini" type="text" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditState === '0'">提交</el-button> v-hasPermi="['system:achievement:sub']" v-if="scope.row.auditState === '0'">提交</el-button>
</template> </template>
</el-table-column> </el-table-column>
...@@ -235,6 +237,7 @@ export default { ...@@ -235,6 +237,7 @@ export default {
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
isEdit: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
......
ruoyi-ui/src/views/smartSchool/personWork/lectureAwards/index.vue
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
</el-row> </el-row>
<el-table :data="awardsList" @selection-change="handleSelectionChange" <el-table :data="awardsList" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'awardTime', order: 'descending' }"> :default-sort="{ prop: 'awardTime', order: 'descending' }" >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable />
<el-table-column label="成长类型" align="center" sortable> <el-table-column label="成长类型" align="center" sortable>
...@@ -98,9 +98,9 @@ ...@@ -98,9 +98,9 @@
<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/> <el-table-column label="讲课获奖-成果名称" align="center" prop="resultName" sortable />
<el-table-column label="获奖人" align="center" prop="userName" sortable/> <el-table-column label="获奖人" align="center" prop="userName" sortable />
<el-table-column label="主办单位" align="center" prop="org" sortable/> <el-table-column label="主办单位" align="center" prop="org" sortable />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable> <el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable>
<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>
...@@ -108,15 +108,15 @@ ...@@ -108,15 +108,15 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<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: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>
<el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:awards:look']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)" <el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:honors:remove']" v-hasPermi="['system:awards:remove']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button>
<el-button size="mini" type="text" @click="handleExamine(scope.row)" <el-button size="mini" type="text" @click="handleExamine(scope.row)" v-hasPermi="['system:awards:sub']"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditState === '0'">提交</el-button> v-if="scope.row.auditState === '0'">提交</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
ruoyi-ui/src/views/smartSchool/personWork/personalInformation/index copy.vue 0 → 100644
<template>
<div class="app-container">
<div class="seach">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
<el-form-item label="教师信息" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入教师姓名" clearable @keyup.enter.native="handleQuery"
style="width: 600px;" />
</el-form-item>
<el-form-item label="身份证号" prop="idCard">
<el-input v-model="queryParams.idCard" placeholder="请输入身份证号" clearable @keyup.enter.native="handleQuery"
style="width: 600px;" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
<el-button type="warning" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="danger" icon="el-icon-refresh" size="mini" @click="resetQuery">导出</el-button>
</el-form-item>
</el-form>
</div>
<div class="title">
— 教师个人信息汇总 —
</div>
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">基本信息</div>
<div style="margin: 3px 10px 15px;">
<el-form :v-model="data" ref="data">
<!-- 距离 -->
<div style="height: 12px;"></div>
<div class="userinfo">
<el-col :span="20">
<!-- f1 -->
<el-row>
<el-col :span="24">
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>性别</span>
</el-form-item></el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>年龄</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>年龄</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
</el-col>
</el-row>
<!-- f2 -->
<el-row>
<el-col :span="24">
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>性别</span>
</el-form-item></el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>年龄</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>年龄</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
</el-col>
</el-row>
<!-- f3 -->
<el-row>
<el-col :span="24">
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>性别</span>
</el-form-item></el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>年龄</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>年龄</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
</el-col>
</el-row>
<!-- f4 -->
<el-row>
<el-col :span="24">
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>性别</span>
</el-form-item></el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>年龄</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>年龄</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
</el-col>
</el-row>
<!-- f5 -->
<el-row>
<el-col :span="24">
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>性别</span>
</el-form-item></el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>年龄</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>年龄</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
</el-col>
</el-row>
<!-- f6 -->
<el-row>
<el-col :span="24">
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>性别</span>
</el-form-item></el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>年龄</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>年龄</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-col>
<el-col :span="4">
<el-card>
<div style="height:143px">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Officia
esse,
odit modi nesciunt
quaerat necessitatibus eius nisi quis accusantium, quo obcaecati perferendis ab tempore
quos, perspiciatis repudiandae sed mollitia iure!
Lorem ipsum dolor sit amet consectetur, adipisicing elit. Beatae quod recusandae quaerat
veniam officia tenetur dicta laborum atque incidunt esse et quos sit, animi impedit
ipsum
error repellendus repellat magnam!</div>
</el-card>
</el-col>
<!-- f1 -->
<el-row>
<el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item>
</el-col>
<el-col :span="2" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item>
</el-col>
<el-col :span="2" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item>
</el-col>
<el-col :span="2" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-form-item>
</el-col>
<el-col :span="2" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item>
</el-col>
<el-col :span="2" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-form-item>
</el-col>
<el-col :span="2" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item>
</el-col>
<el-col :span="2" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
<!-- f2 -->
<el-row>
<el-col :span="24">
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item></el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
<!-- f3 -->
<el-row>
<el-col :span="24">
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item></el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
<!-- f4 -->
<el-row>
<el-col :span="24">
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item></el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
<!-- f5 -->
<el-row>
<el-col :span="24">
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item></el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="name">
<el-form-item prop="name">
<span>{{ data.name }}</span>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
</div>
</el-form>
</div>
</div>
<!--工作量信息 -->
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">工作量信息</div>
<div style="margin: 3px 10px 15px;">
<el-table :data="aworkloadList">
<el-table-column label="学年" align="center" prop="schoolYear" width="90px" fixed="left" />
<el-table-column label="学期" align="center" prop="semester" fixed="left">
<template slot-scope="scope">
<dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" />
</template>
</el-table-column>
<el-table-column label="届别" align="center" prop="year" fixed="left" />
<el-table-column label="年级" align="center" prop="grade" fixed="left">
<template slot-scope="scope">
<dict-tag :options="dict.type.grade_da" :value="scope.row.grade" />
</template>
</el-table-column>
<el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="学科" align="center" prop="sub">
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="聘任岗位" align="center" prop="appointmentPost" width="120px">
<template slot-scope="scope">
<dict-tag :options="dict.type.appointment_positions" :value="scope.row.appointmentPost" />
</template>
</el-table-column>
<el-table-column label="聘任职务" align="center" prop="appointmentPosition" width="120px" />
<el-table-column label="聘任情况" align="center" prop="appointmentSituation" width="120px" />
<el-table-column label="班级" align="center" prop="className" />
<el-table-column label="班级类型" align="center">
<template slot-scope="scope">
<span v-if="getSelectedTypes(scope.row.classType).length > 0">
<span v-for="(option, index) in getSelectedTypes(scope.row.classType)" :key="index">
{{ option.label }}
<span v-if="index !== getSelectedTypes(scope.row.classType).length - 1">, </span>
</span>
</span>
</template>
</el-table-column>
<el-table-column label="早读" align="center" prop="earlyReading" />
<el-table-column label="正课" align="center" prop="requiredCourses" />
<el-table-column label="晚自习" align="center" prop="eveningSelfStudy" width="120px" />
<el-table-column label="合计" align="center" prop="amountTo" />
<el-table-column label="证明人" align="center" prop="userName" width="120px" fixed="right" />
<el-table-column label="备注" align="center" prop="remark" fixed="right" />
</el-table>
</div>
</div>
<!--班主任考核信息 -->
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">班主任考核</div>
<div style="margin: 3px 10px 15px;">
<el-table :data="assessmentList">
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column label="学年" align="center" prop="schoolYear" />
<el-table-column label="学期" align="center" prop="semester">
<template slot-scope="scope">
<dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" />
</template>
</el-table-column>
<el-table-column label="届别" align="center" prop="year" />
<el-table-column label="年级" align="center" prop="grade">
<template slot-scope="scope">
<dict-tag :options="dict.type.grade_da" :value="scope.row.grade" />
</template>
</el-table-column>
<el-table-column label="班级" align="center" prop="className" />
<el-table-column label="班级类型" align="center" prop="classType" width="180px">
<template slot-scope="scope">
<span v-if="getSelectedTypes(scope.row.classType).length > 0">
<span v-for="(option, index) in getSelectedTypes(scope.row.classType)" :key="index">
{{ option.label }}
<span v-if="index !== getSelectedTypes(scope.row.classType).length - 1">, </span>
</span>
</span>
</template>
</el-table-column>
<el-table-column label="姓名" align="center" prop="teacherName" />
<el-table-column label="学科" align="center" prop="sub">
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="德育考核成绩" align="center" prop="moralEduCheckAchievement" width="130px" />
<el-table-column label="智育考核成绩" align="center" prop="intellEduCheckAchievement" width="130px" />
<el-table-column label="备注" align="center" prop="remark" />
</el-table>
</div>
</div>
<!--专业成长 -->
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">专业成长</div>
<div style="margin: 3px 10px 15px;">
<el-table :data="assessmentList">
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column label="学年" align="center" prop="schoolYear" />
<el-table-column label="学期" align="center" prop="semester">
<template slot-scope="scope">
<dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" />
</template>
</el-table-column>
<el-table-column label="届别" align="center" prop="year" />
<el-table-column label="年级" align="center" prop="grade">
<template slot-scope="scope">
<dict-tag :options="dict.type.grade_da" :value="scope.row.grade" />
</template>
</el-table-column>
<el-table-column label="班级" align="center" prop="className" />
<el-table-column label="班级类型" align="center" prop="classType" width="180px">
<template slot-scope="scope">
<span v-if="getSelectedTypes(scope.row.classType).length > 0">
<span v-for="(option, index) in getSelectedTypes(scope.row.classType)" :key="index">
{{ option.label }}
<span v-if="index !== getSelectedTypes(scope.row.classType).length - 1">, </span>
</span>
</span>
</template>
</el-table-column>
<el-table-column label="姓名" align="center" prop="teacherName" />
<el-table-column label="学科" align="center" prop="sub">
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="德育考核成绩" align="center" prop="moralEduCheckAchievement" width="130px" />
<el-table-column label="智育考核成绩" align="center" prop="intellEduCheckAchievement" width="130px" />
<el-table-column label="备注" align="center" prop="remark" />
</el-table>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
data: { name: 11, },
queryParams: { name: 11, idCard: 123456789012345678 },
showSearch: true,
}
},
methods: {
getSelectedTypes(classType) {
const selectedTypes = classType.split(','); // 将逗号分隔的字符串转换为数组
return this.dict.type.class_type.filter(option => selectedTypes.includes(option.value.toString()));
},
},
}
</script>
<style scoped>
.el-form-item {
margin-bottom: 0;
}
/* ::v-deep .el-form-item--medium .el-form-item__content {
line-height: 32px;
text-align: center;
color: pink;
} */
.userinfo {
border: 1px solid #e0dfdf;
}
.border_right {
border-right: 1px solid #e0dfdf;
}
.border_left {
border-left: 1px solid #e0dfdf;
}
.border_top {
border-top: 1px solid #e0dfdf;
}
.border_bottom {
border-bottom: 1px solid #e0dfdf;
}
.table_cell {
height: 30px;
line-height: 30px;
text-align: center;
border-top: 1px solid #e0dfdf;
border-bottom: 1px solid #e0dfdf;
}
.table_cell:last-child {
border-bottom: 1px solid #e0dfdf;
}
.el-input--medium .el-input__inner {
line-height: 20px;
}
.card_title {
background-color: #f3f3f3;
padding: 12px;
border-radius: 13px 13px 0 0;
}
.title {
border: 1px solid #e0dfdf;
text-align: center;
padding: 10px;
margin: 15px 0;
font-size: 30px;
}
.seach {
background-color: #f3f3f3;
padding: 10px;
border-radius: 30px;
}
</style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/personWork/personalInformation/index.vue 0 → 100644
<template>
<div class="app-container">
<div class="export-button-wrapper">
<el-button type="danger" icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
</div>
<div class="title">
— 教师个人信息汇总 —
</div>
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">基本信息</div>
<div style="margin: 3px 10px 15px;">
<el-form :v-model="form" ref="form">
<!-- 距离 -->
<div style="height: 12px;"></div>
<div class="userinfo">
<el-col :span="18">
<!-- f1 -->
<el-row>
<el-col :span="24">
<el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="name">
<span>姓名</span>
</el-form-item></el-col>
<el-col :span="4" class="border_right border-bottom table_cell ">
<el-form-item prop="name">
<span>{{ form.name }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="sex">
<span>性别</span>
</el-form-item>
</el-col>
<el-col :span="4" class="border_right border-bottom table_cell ">
<el-form-item prop="sex">
<span>{{ form.sex == "0" ? '男' : form.sex == "1" ? '女' : '' }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="age">
<span>年龄</span>
</el-form-item>
</el-col>
<el-col :span="4" class="border_right border-bottom table_cell ">
<el-form-item prop="age">
<span>{{ form.age }}</span>
</el-form-item>
</el-col>
</el-col>
</el-row>
<!-- f2 -->
<el-row>
<el-col :span="24">
<el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="birthDate">
<span>出生年月</span>
</el-form-item></el-col>
<el-col :span="4" class="border_right border-bottom table_cell ">
<el-form-item prop="birthDate">
<span>{{ form.birthDate }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="hometown">
<span>籍贯</span>
</el-form-item>
</el-col>
<el-col :span="4" class="border_right border-bottom table_cell">
<el-form-item prop="hometown">
<span>{{ form.hometown }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="nation">
<span>民族</span>
</el-form-item>
</el-col>
<el-col :span="4" class="border_right border-bottom table_cell">
<el-form-item prop="nation">
<span>{{ form.nation }}</span>
</el-form-item>
</el-col>
</el-col>
</el-row>
<!-- f3 -->
<el-row>
<el-col :span="24">
<el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="idCard">
<span>身份证号</span>
</el-form-item></el-col>
<el-col :span="4" class="border_right border-bottom table_cell">
<el-form-item prop="idCard">
<span>{{ form.idCard }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="fileBirthDate">
<span>档案出生年月</span>
</el-form-item>
</el-col>
<el-col :span="4" class="border_right border-bottom table_cell">
<el-form-item prop="fileBirthDate">
<span>{{ form.fileBirthDate }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="politicalLandscape">
<span>政治面貌</span>
</el-form-item>
</el-col>
<el-col :span="4" class="border_right border-bottom table_cell">
<el-form-item prop="politicalLandscape">
<span>{{ form.politicalLandscape }}</span>
</el-form-item>
</el-col>
</el-col>
</el-row>
<!-- f4 -->
<el-row>
<el-col :span="24">
<el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="partyMembershipTime">
<span>入党时间</span>
</el-form-item></el-col>
<el-col :span="4" class="border_right border-bottom table_cell">
<el-form-item prop="partyMembershipTime">
<span>{{ form.partyMembershipTime }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="teachingSubject">
<span>任教学科</span>
</el-form-item>
</el-col>
<el-col :span="4" class="border_right border-bottom table_cell">
<el-form-item prop="teachingSubject">
<span>{{ form.teachingSubject }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="currentProfessionalTitle">
<span>现职称</span>
</el-form-item>
</el-col>
<el-col :span="4" class="border_right border-bottom table_cell">
<el-form-item prop="currentProfessionalTitle">
<span>{{ form.currentProfessionalTitle }}</span>
</el-form-item>
</el-col>
</el-col>
</el-row>
<!-- f5 -->
<el-row>
<el-col :span="24">
<el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="currentProfessionalTitleTime">
<span>现职称取得资格时间</span>
</el-form-item></el-col>
<el-col :span="4" class="border_right border-bottom table_cell">
<el-form-item prop="currentProfessionalTitleTime">
<span>{{ form.currentProfessionalTitleTime }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="currentHiringProfessionalTitle">
<span>现聘职称</span>
</el-form-item>
</el-col>
<el-col :span="4" class="border_right border-bottom table_cell">
<el-form-item prop="currentHiringProfessionalTitle">
<span>{{ form.currentHiringProfessionalTitle }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="currentHiringProfessionalTitleTime">
<span>现聘任职时间</span>
</el-form-item>
</el-col>
<el-col :span="4" class="border_right border-bottom table_cell">
<el-form-item prop="currentHiringProfessionalTitleTime">
<span>{{ form.currentHiringProfessionalTitleTime }}</span>
</el-form-item>
</el-col>
</el-col>
</el-row>
<!-- f6-->
<el-row>
<el-col :span="24">
<el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="currentPosition">
<span>现聘岗位</span>
</el-form-item></el-col>
<el-col :span="4" class="border_right border-bottom table_cell">
<el-form-item prop="currentPosition">
<span>{{ form.currentPosition }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="currentJobLevel">
<span>现岗位等级</span>
</el-form-item>
</el-col>
<el-col :span="4" class="border_right border-bottom table_cell">
<el-form-item prop="currentJobLevel">
<span>{{ form.currentJobLevel }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="border_right border-bottom table_cell background">
<el-form-item prop="currentJobLevelAppointmentTime">
<span>现岗位等级聘任时间</span>
</el-form-item>
</el-col>
<el-col :span="4" class="border_right border-bottom table_cell">
<el-form-item prop="currentJobLevelAppointmentTime">
<span>{{ form.currentJobLevelAppointmentTime }}</span>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-col>
<el-col :span="6">
<el-card
style=" height: 180px; width: 100%; display: flex; align-items: center; justify-content: center; ">
<el-upload v-loading="uploadLoading" class="avatar-uploader" action="#" accept="image/*"
:show-file-list="false" :on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload" :http-request="uploadImage">
<img v-if="form.photoUrl" :src="baseUrl + form.photoUrl"
style="max-width: 100%; max-height: 180px; object-fit: contain;" class="avatar"
alt="" />
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-card>
</el-col>
<!-- f1 -->
<el-row>
<el-col>
<el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="duties">
<span>职务</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="duties">
<span>{{ form.duties }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="teacherQualificationType">
<span>教师资格种类</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell ">
<el-form-item prop="teacherQualificationType">
<span>{{ form.teacherQualificationType }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="teacherQualificationCertificateNum">
<span>教师资格号码</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell ">
<el-form-item prop="teacherQualificationCertificateNum">
<span>{{ form.teacherQualificationCertificateNum }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="workingHours">
<span>参加工作时间</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="workingHours">
<span>{{ form.workingHours }}</span>
</el-form-item>
</el-col>
</el-col>
</el-row>
<!-- f2 -->
<el-row>
<el-col>
<el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="toSecondMiddleSchoolTime">
<span>到二中工作时间</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="toSecondMiddleSchoolTime">
<span>{{ form.toSecondMiddleSchoolTime }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="toSecondAge">
<span>二中工作年龄</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="toSecondAge">
<span>{{ form.toSecondAge }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="lengthOfTeacherTime">
<span>教龄起算时间</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="lengthOfTeacherTime">
<span>{{ form.lengthOfTeacherTime }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="lengthOfServiceTime">
<span>工龄起算时间</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="lengthOfServiceTime">
<span>{{ form.lengthOfServiceTime }}</span>
</el-form-item>
</el-col>
</el-col>
</el-row>
<!-- f3 -->
<el-row>
<el-col>
<el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="seniority">
<span>工龄年限</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="seniority">
<span>{{ form.seniority }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="onDutySituation">
<span>在岗情况</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="onDutySituation">
<span>{{ form.onDutySituation }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="currentSituation">
<span>在编情况</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="currentSituation">
<span>{{ form.currentSituation }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="graduationInstitution1">
<span>毕业院校1</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="graduationInstitution1">
<el-form-item prop="graduationInstitution1">
<span>{{ form.graduationInstitution1 }}</span>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
<!-- f4 -->
<el-row>
<el-col>
<el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="major1">
<span>专业1</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="major1">
<span>{{ form.major1 }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="graduationTime1">
<span>毕业时间1</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="graduationTime1">
<span>{{ form.graduationTime1 }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="name">
<span>毕业院校2</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="graduationInstitution2">
<span>{{ form.graduationInstitution2 }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="major2">
<span>专业2</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="major2">
<span>{{ form.major2 }}</span>
</el-form-item>
</el-col>
</el-col>
</el-row>
<!-- f5 -->
<el-row>
<el-col>
<el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="graduationTime2">
<span>毕业时间2</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="graduationTime2">
<span>{{ form.graduationTime2 }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="graduationInstitution3">
<span>毕业学院3</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="graduationInstitution3">
<span>{{ form.graduationInstitution3 }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="major3">
<span>专业3</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="major3">
<span>{{ form.major3 }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="graduationTime3">
<span>毕业时间3</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="graduationTime3">
<span>{{ form.graduationTime3 }}</span>
</el-form-item>
</el-col>
</el-col>
</el-row>
<!-- f6 -->
<el-row>
<el-col>
<el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="firstDegree">
<span>第一学历</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="firstDegree">
<span>{{ form.firstDegree }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="lastDegree">
<span>最后学历</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<el-form-item prop="lastDegree">
<span>{{ form.lastDegree }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="border_right border-bottom table_cell background">
<el-form-item prop="degree">
<span>学位</span>
</el-form-item>
</el-col>
<el-col :span="9" class="border_right border-bottom table_cell">
<el-form-item prop="degree">
<span>{{ form.degree }}</span>
</el-form-item>
</el-col>
</el-col>
</el-row>
</div>
</el-form>
</div>
</div>
<!--工作量信息 -->
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">工作量信息</div>
<div style="margin: 3px 10px 15px;">
<el-table :data="schoolAworkload">
<el-table-column label="学年" align="center" prop="schoolYear" width="90px" fixed="left" />
<el-table-column label="学期" align="center" prop="semester" fixed="left">
<template slot-scope="scope">
<dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" />
</template>
</el-table-column>
<el-table-column label="届别" align="center" prop="year" fixed="left" />
<el-table-column label="年级" align="center" prop="grade" fixed="left">
<template slot-scope="scope">
<dict-tag :options="dict.type.grade_da" :value="scope.row.grade" />
</template>
</el-table-column>
<el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="学科" align="center" prop="sub">
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="聘任岗位" align="center" prop="appointmentPost" width="120px">
<template slot-scope="scope">
<dict-tag :options="dict.type.appointment_positions" :value="scope.row.appointmentPost" />
</template>
</el-table-column>
<el-table-column label="聘任职务" align="center" prop="appointmentPosition" width="120px" />
<el-table-column label="聘任情况" align="center" prop="appointmentSituation" width="120px">
<template slot-scope="scope">
<dict-tag :options="dict.type.appointment_situation" :value="scope.row.appointmentSituation" />
</template>
</el-table-column>
<el-table-column label="班级" align="center" prop="className" />
<el-table-column label="班级类型" align="center" prop="classType">
</el-table-column>
<el-table-column label="早读" align="center" prop="earlyReading" />
<el-table-column label="正课" align="center" prop="requiredCourses" />
<el-table-column label="晚自习" align="center" prop="eveningSelfStudy" width="120px" />
<el-table-column label="合计" align="center" prop="amountTo" />
<el-table-column label="证明人" align="center" prop="userName" width="120px" fixed="right" />
<el-table-column label="备注" align="center" prop="remark" fixed="right" />
</el-table>
</div>
</div>
<!--班主任考核信息 -->
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">班主任考核</div>
<div style="margin: 3px 10px 15px;">
<el-table :data="schoolAclassTeacherAssessments">
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column label="学年" align="center" prop="schoolYear" />
<el-table-column label="学期" align="center" prop="semester">
<template slot-scope="scope">
<dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" />
</template>
</el-table-column>
<el-table-column label="届别" align="center" prop="year" />
<el-table-column label="年级" align="center" prop="grade">
<template slot-scope="scope">
<dict-tag :options="dict.type.grade_da" :value="scope.row.grade" />
</template>
</el-table-column>
<el-table-column label="班级" align="center" prop="className" />
<el-table-column label="班级类型" align="center" prop="classType" width="180px">
</el-table-column>
<el-table-column label="姓名" align="center" prop="teacherName" />
<el-table-column label="学科" align="center" prop="sub">
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="德育考核成绩" align="center" prop="moralEduCheckAchievement" width="130px" />
<el-table-column label="智育考核成绩" align="center" prop="intellEduCheckAchievement" width="130px" />
<el-table-column label="备注" align="center" prop="remark" />
</el-table>
</div>
</div>
<!--专业成长 -->
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">专业成长</div>
<div style="margin: 3px 10px 15px;">
<el-table :data="specialityVos">
<el-table-column label="成长类型" align="center" prop="growthType">
</el-table-column>
<el-table-column label="学科" align="center" prop="sub">
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="获奖类别" align="center" prop="awardtype">
<template slot-scope="scope">
<span v-if="scope.row.growthType == '综合荣誉'">{{ scope.row.awardtype }}</span>
<dict-tag v-else :options="getDictionaryByGrowthType(scope.row)" :value="scope.row.awardtype" />
</template>
</el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardlevel">
<template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" />
</template>
</el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardrank">
<template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" />
</template>
</el-table-column>
<el-table-column label="成果名称" align="center" prop="resultName" />
<el-table-column label="获奖人" align="center" prop="userName" />
<el-table-column label="主办单位" align="center" prop="org" />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180">
</el-table-column>
</el-table>
</div>
</div>
<!--高考成绩 -->
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">高考成绩 </div>
<div style="margin: 3px 10px 15px;">
<el-table :data="schoolGkAchievement">
<el-table-column label="届别" align="center" prop="year" />
<el-table-column label="学科" align="center" prop="sub">
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="教师姓名" align="center" prop="teacherName" />
<el-table-column label="授课班级" align="center" prop="teachingClassName" />
<el-table-column label="班级类型" align="center" prop="classType">
</el-table-column>
<el-table-column label="高考评优" align="center" prop="gkAppraising">
<template slot-scope="scope">
<dict-tag :options="dict.type.gk_appraising" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="尖子生培养" align="center" prop="topStudentsCulture" />
<el-table-column label="增量情况" align="center" prop="incrementSituation" />
<el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" />
<el-table-column label="其他" align="center" prop="other" />
</el-table>
</div>
</div>
<!--教学成绩 -->
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">教学成绩</div>
<div style="margin: 3px 10px 15px;">
<el-table :data="schoolXteachingAchievements">
<el-table-column label="学年" align="center" prop="schoolYear" />
<el-table-column label="学期" align="center" prop="semester">
<template slot-scope="scope">
<dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" />
</template>
</el-table-column>
<el-table-column label="考试时间" align="center" prop="examTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.examTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="考试类型" align="center" prop="examType">
<template slot-scope="scope">
<dict-tag :options="dict.type.exam_typeda" :value="scope.row.examType" />
</template>
</el-table-column>
<el-table-column label="届别" align="center" prop="year" />
<el-table-column label="年级" align="center" prop="grade">
<template slot-scope="scope">
<dict-tag :options="dict.type.grade_da" :value="scope.row.grade" />
</template>
</el-table-column>
<el-table-column label="姓名" align="center" prop="userName" />
<el-table-column label="学科" align="center" prop="sub">
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="班级" align="center" prop="className">
</el-table-column>
<el-table-column label="班级类型" align="center" prop="classType">
</el-table-column>
<el-table-column label="考核分" align="center" prop="assessmentScore" />
</el-table>
</div>
</div>
<!--辅导教师获奖 -->
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">辅导老师获奖</div>
<div style="margin: 3px 10px 15px;">
<el-table :data="fudaoTeacher">
<el-table-column label="成长类型" align="center">
<template>
<span>辅导老师获奖</span>
</template>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub">
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="获奖类别" align="center" prop="awardtype">
<template slot-scope="scope">
<dict-tag :options="dict.type.award_type_fdjs" :value="scope.row.awardtype" />
</template>
</el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardlevel">
<template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" />
</template>
</el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardrank">
<template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" />
</template>
</el-table-column>
<el-table-column label="比赛名称" align="center" prop="competitionname" />
<el-table-column label="获奖人" align="center" prop="username" />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" />
<el-table-column label="辅导职责" align="center" prop="coachingr">
<template slot-scope="scope">
<dict-tag :options="dict.type.coachingr" :value="scope.row.coachingr" />
</template>
</el-table-column>
<el-table-column label="主办单位" align="center" prop="org" />
<el-table-column label="获奖时间" align="center" prop="awardtime" width="180">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
</el-table>
</div>
</div>
<!--辅导学生获奖 -->
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">辅导学生获奖</div>
<div style="margin: 3px 10px 15px;">
<el-table :data="fudaoStudent">
<el-table-column label="成长类型" align="center">
<template>
<span>辅导学生获奖</span>
</template>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub">
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="获奖类别" align="center" prop="awardtype">
<template slot-scope="scope">
<dict-tag :options="dict.type.award_type_fdxs" :value="scope.row.awardtype" />
</template>
</el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardlevel">
<template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" />
</template>
</el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardrank">
<template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" />
</template>
</el-table-column>
<el-table-column label="比赛名称" align="center" prop="resultname" />
<el-table-column label="获奖人" align="center" prop="username" />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" />
<el-table-column label="主办单位" align="center" prop="org" />
<el-table-column label="获奖时间" align="center" prop="awardtime" width="180">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
</el-table>
</div>
</div>
<!--年度考核 -->
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">年度考核</div>
<div style="margin: 3px 10px 15px;">
<el-table :data="schoolAnnualAssessment">
<el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="年度" align="center" prop="year" />
<el-table-column label="考核结果" align="center" prop="checkResult">
<template slot-scope="scope">
<dict-tag :options="dict.type.check_result" :value="scope.row.checkResult" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
</el-table>
</div>
</div>
</div>
</template>
<script>
import { listAward, listAwardgr } from "@/api/smartSchool/electronicArchives/personalInformation";
import { getToken } from "@/utils/auth";
import { uploadImage as commonUpload } from "@/api/common";
export default {
dicts: ["teaching_subjects", 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type', 'yearda', 'rankda', "sys_user_sex",
"politics_tatusls",
"current_professional",
"current_position",
"current_joblevel",
"duty_situation",
"current_situation",
"appointment_positions",
"gk_appraising",
"award_type_fdjs",
"award_type_fdxs",
"award_rank",
"awards_level", 'coachingr', 'check_result', 'appointment_situation', 'award_categoriesjs', 'award_categoriesjk', 'award_categories', 'project_research'],
data() {
return {
sex: '',
phoneNumber: '', // 在这里定义并初始化 phoneNumber 变量
classType: "",
uploadForm: {},
baseUrl: [process.env.VUE_APP_BASE_API],
uploadLoading: false,
uploadFileLoading: false,
//工作量信息
schoolAworkload: [],
//班主任考核
schoolAclassTeacherAssessments: [],
//年度考核
schoolAnnualAssessment: [],
//教学成绩
schoolXteachingAchievements: [],
// 高考成绩
schoolGkAchievement: [],
//辅导老师获奖
fudaoTeacher: [],
//辅导学生获奖
fudaoStudent: [],
//专业成长
specialityVos: [],
form: {
},
queryParams: {},
showSearch: true,
}
},
created() {
this.getList();
},
methods: {
getDictionaryByGrowthType(row) {
console.log(row, 'row');
switch (row.growthType) {
// case '综合荣誉':
// console.log('awardtype', row.awardtype)
// return row.awardtype;
case '教学获奖':
return this.dict.type.award_categoriesjs;
case '讲课获奖':
return this.dict.type.award_categoriesjk;
case '论文论著':
return this.dict.type.award_categories;
case '课题研究':
return this.dict.type.project_research;
default:
return {};
}
},
//查询
getList() {
this.loading = true;
const phoneNumber = this.$store.state.user.teacher.teacherTel;
listAwardgr(phoneNumber).then(response => {
console.log(response, response.data);
this.form = response.data.basicInformation;
this.form.idCard = response.data.basicInformation.idCard;
this.form.photoUrl = response.data.basicInformation.photoUrl;
console.log(this.form.photoUrl, ' this.form.photoUrl');
this.schoolAworkload = response.data.schoolAworkload;
this.schoolAclassTeacherAssessments = response.data.schoolAclassTeacherAssessments;
this.schoolXteachingAchievements = response.data.schoolXteachingAchievements;
this.schoolAnnualAssessment = response.data.schoolAnnualAssessment;
this.schoolXteachingAchievements = response.data.schoolXteachingAchievements;
this.schoolGkAchievement = response.data.schoolGkAchievement;
this.fudaoTeacher = response.data.fudaoTeacher
this.fudaoStudent = response.data.fudaoStudent
// console.log(this.fudaoStudent, 'this.fudaoStudent');
this.specialityVos = response.data.specialityVos
// console.log(this.specialityVos, 'this.specialityVos');
this.total = response.total;
this.loading = false;
console.log('teaching_subjects', this.dict.type.teaching_subjects);
this.dict.type.teaching_subjects.find(item => {
if (item.value == response.data.basicInformation.teachingSubject) {
this.form.teachingSubject = item.label
}
})
this.dict.type.current_professional.find(item => {
if (item.value == response.data.basicInformation.currentHiringProfessionalTitle) {
this.form.currentHiringProfessionalTitle = item.label
}
})
this.dict.type.current_joblevel.find(item => {
if (item.value == response.data.basicInformation.currentJobLevel) {
this.form.currentJobLevel = item.label
}
})
this.dict.type.politics_tatusls.find(item => {
if (item.value == response.data.basicInformation.politicalLandscape) {
this.form.politicalLandscape = item.label
}
})
this.dict.type.current_professional.find(item => {
if (item.value == response.data.basicInformation.currentProfessionalTitle) {
this.form.currentProfessionalTitle = item.label
}
})
this.dict.type.duty_situation.find(item => {
if (item.value == response.data.basicInformation.onDutySituation) {
this.form.onDutySituation = item.label
}
})
});
},
resetQuery() {
// 清空搜索出来的表格数据
this.form = {};
this.schoolAworkload = [];
this.schoolAclassTeacherAssessments = [];
this.schoolAnnualAssessment = [];
this.schoolXteachingAchievements = [];
this.schoolGkAchievement = [];
this.fudaoTeacher = [];
this.fudaoStudent = [];
this.specialityVos = [];
this.queryParams = {
name: '',
idCard: '',
};
this.getList();
},
// 上传成功回调
handleAvatarSuccess(res, file) {
this.photoUrl = res.data.url;
this.commonUpload(file);
},
// 上传前格式和图片大小限制
beforeAvatarUpload(file) {
const type =
file.type === "image/jpeg" ||
"image/jpg" ||
"image/webp" ||
"image/png";
const isLt2M = file.size / 1024 / 1024 < 2;
if (!type) {
this.$message.error("图片格式不正确!(只能包含jpg，png，webp，JPEG)");
}
if (!isLt2M) {
this.$message.error("上传图片大小不能超过 2MB!");
}
return type && isLt2M;
},
// 上传图片
uploadImage(file) {
const fileData = file.file;
const formData = new FormData();
formData.append("file", fileData);
this.uploadLoading = true;
commonUpload(formData)
.then((response) => {
this.uploadLoading = false;
this.$modal.msgSuccess("上传成功");
this.photoUrl = this.pev + response.url;
this.form.photoUrl = response.url;
console.log(this.form.photoUr, 'this.form.photoUr');
console.log(response.url, 'response.url');
})
.catch((error) => {
this.uploadLoading = false;
});
},
/** 导出按钮操作 */
handleExport() {
const phoneNumber = this.$store.state.user.teacher.teacherTel;
const queryParams = {
phoneNumber
};
this.download('/teacher/basiclnformation/exportPDF', queryParams, `教师个人信息汇总.pdf`);
}
},
}
</script>
<style scoped>
.el-form-item {
margin-bottom: 0;
}
/* ::v-deep .el-form-item--medium .el-form-item__content {
line-height: 32px;
text-align: center;
color: pink;
} */
.userinfo {
border: 1px solid #e0dfdf;
}
.border_right {
border-right: 1px solid #e0dfdf;
}
.border_left {
border-left: 1px solid #e0dfdf;
}
.border_top {
border-top: 1px solid #e0dfdf;
}
.border_bottom {
border-bottom: 1px solid #e0dfdf;
}
.table_cell {
height: 30px;
line-height: 30px;
text-align: center;
border-top: 1px solid #e0dfdf;
border-bottom: 1px solid #e0dfdf;
}
.table_cell:last-child {
border-bottom: 1px solid #e0dfdf;
}
.el-input--medium .el-input__inner {
line-height: 20px;
}
.card_title {
background-color: #f3f3f3;
padding: 12px;
border-radius: 13px 13px 0 0;
}
.title {
border: 1px solid #e0dfdf;
text-align: center;
padding: 10px;
margin: 15px 0;
font-size: 30px;
}
.seach {
background-color: #f3f3f3;
padding: 10px;
border-radius: 30px;
}
.background {
background-color: #eff8fc;
}
.export-button-wrapper {
display: flex;
justify-content: flex-end;
margin-top: 10px;
}
</style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/personWork/projectResearch/index.vue
...@@ -53,19 +53,19 @@ ...@@ -53,19 +53,19 @@
<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-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:works:add']">新增</el-button> v-hasPermi="['system:research:add']">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['system:works:edit']">修改</el-button> v-hasPermi="['system:research:edit']">修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:works:remove']">删除</el-button> v-hasPermi="['system:research:remove']">删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:works:export']">导出</el-button> v-hasPermi="['system:research:export']">导出</el-button>
</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>
...@@ -107,15 +107,16 @@ ...@@ -107,15 +107,16 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<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:research:edit']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
<el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:research:look']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)" <el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:honors:remove']" v-hasPermi="['system:research:remove']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button>
<el-button size="mini" type="text" @click="handleExamine(scope.row)" <el-button size="mini" type="text" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditState === '0'">提交</el-button> v-hasPermi="['system:research:sub']" v-if="scope.row.auditState === '0'">提交</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
ruoyi-ui/src/views/smartSchool/personWork/teacherAwards/index.vue
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="获奖类别" prop="awardType"> <el-form-item label="获奖类别" prop="awardType">
<el-select v-model="form.awardType" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.awardType" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.award_categoriesjs" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.award_categoriesjs" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</el-form-item> </el-form-item>
<el-form-item label="获奖等级" prop="awardLevel"> <el-form-item label="获奖等级" prop="awardLevel">
<el-select v-model="form.awardLevel" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -109,15 +109,15 @@ ...@@ -109,15 +109,15 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<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: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>
<el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:awards:look']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)" <el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:honors:remove']" v-hasPermi="['system:awards:remove']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button>
<el-button size="mini" type="text" @click="handleExamine(scope.row)" <el-button size="mini" type="text" @click="handleExamine(scope.row)" v-hasPermi="['system:awards:sub']"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditState === '0'">提交</el-button> v-if="scope.row.auditState === '0'">提交</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
ruoyi-ui/src/views/smartSchool/personWork/teamAward/index.vue
...@@ -42,19 +42,19 @@ ...@@ -42,19 +42,19 @@
<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-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:award:add']">新增</el-button> v-hasPermi="['system:teamaward:add']">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['system:award:edit']">修改</el-button> v-hasPermi="['system:teamaward:edit']">修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:award:remove']">删除</el-button> v-hasPermi="['system:teamaward:remove']">删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:award:export']">导出</el-button> v-hasPermi="['system:teamaward:export']">导出</el-button>
</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>
...@@ -89,15 +89,17 @@ ...@@ -89,15 +89,17 @@
<el-table-column label="备注" align="center" prop="remark" sortable /> <el-table-column label="备注" align="center" prop="remark" sortable />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<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:teamaward:edit']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
<el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleLook(scope.row)"
v-hasPermi="['system:teamaward:look']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)" <el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:honors:remove']" v-hasPermi="['system:teamaward:remove']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button>
<el-button size="mini" type="text" @click="handleExamine(scope.row)" <el-button size="mini" type="text" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditState === '0'">提交</el-button> v-hasPermi="['system:teamaward:sub']" v-if="scope.row.auditState === '0'">提交</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
ruoyi-ui/src/views/smartSchool/personWork/tutorAward/index.vue
...@@ -60,19 +60,19 @@ ...@@ -60,19 +60,19 @@
<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-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:awards:add']">新增</el-button> v-hasPermi="['system:tutoraward:add']">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['system:awards:edit']">修改</el-button> v-hasPermi="['system:tutoraward:edit']">修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:awards:remove']">删除</el-button> v-hasPermi="['system:tutoraward:remove']">删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:awards:export']">导出</el-button> v-hasPermi="['system:tutoraward:export']">导出</el-button>
</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>
...@@ -122,15 +122,15 @@ ...@@ -122,15 +122,15 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<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:tutoraward:edit']"
v-if="scope.row.auditstate === '0' || scope.row.auditstate === '3'">修改</el-button> v-if="scope.row.auditstate === '0' || scope.row.auditstate === '3'">修改</el-button>
<el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:tutoraward:look']"
v-if="scope.row.auditstate === '0' || scope.row.auditstate === '1' || scope.row.auditstate === '3' || scope.row.auditstate === '2'">查看</el-button> v-if="scope.row.auditstate === '0' || scope.row.auditstate === '1' || scope.row.auditstate === '3' || scope.row.auditstate === '2'">查看</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)" <el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:honors:remove']" v-hasPermi="['system:tutoraward:remove']"
v-if="scope.row.auditstate === '0' || scope.row.auditstate === '3'">删除</el-button> v-if="scope.row.auditstate === '0' || scope.row.auditstate === '3'">删除</el-button>
<el-button size="mini" type="text" @click="handleExamine(scope.row)" <el-button size="mini" type="text" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditstate === '0'">提交</el-button> v-hasPermi="['system:tutoraward:sub']" v-if="scope.row.auditstate === '0'">提交</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
ruoyi-ui/src/views/tool/build/index.vue
...@@ -11,19 +11,11 @@ ...@@ -11,19 +11,11 @@
<div class="components-title"> <div class="components-title">
<svg-icon icon-class="component" />输入型组件 <svg-icon icon-class="component" />输入型组件
</div> </div>
<draggable <draggable class="components-draggable" :list="inputComponents"
class="components-draggable" :group="{ name: 'componentsGroup', pull: 'clone', put: false }" :clone="cloneComponent"
:list="inputComponents" draggable=".components-item" :sort="false" @end="onEnd">
:group="{ name: 'componentsGroup', pull: 'clone', put: false }" <div v-for="(element, index) in inputComponents" :key="index" class="components-item"
:clone="cloneComponent" @click="addComponent(element)">
draggable=".components-item"
:sort="false"
@end="onEnd"
>
<div
v-for="(element, index) in inputComponents" :key="index" class="components-item"
@click="addComponent(element)"
>
<div class="components-body"> <div class="components-body">
<svg-icon :icon-class="element.tagIcon" /> <svg-icon :icon-class="element.tagIcon" />
{{ element.label }} {{ element.label }}
...@@ -33,21 +25,11 @@ ...@@ -33,21 +25,11 @@
<div class="components-title"> <div class="components-title">
<svg-icon icon-class="component" />选择型组件 <svg-icon icon-class="component" />选择型组件
</div> </div>
<draggable <draggable class="components-draggable" :list="selectComponents"
class="components-draggable" :group="{ name: 'componentsGroup', pull: 'clone', put: false }" :clone="cloneComponent"
:list="selectComponents" draggable=".components-item" :sort="false" @end="onEnd">
:group="{ name: 'componentsGroup', pull: 'clone', put: false }" <div v-for="(element, index) in selectComponents" :key="index" class="components-item"
:clone="cloneComponent" @click="addComponent(element)">
draggable=".components-item"
:sort="false"
@end="onEnd"
>
<div
v-for="(element, index) in selectComponents"
:key="index"
class="components-item"
@click="addComponent(element)"
>
<div class="components-body"> <div class="components-body">
<svg-icon :icon-class="element.tagIcon" /> <svg-icon :icon-class="element.tagIcon" />
{{ element.label }} {{ element.label }}
...@@ -57,15 +39,11 @@ ...@@ -57,15 +39,11 @@
<div class="components-title"> <div class="components-title">
<svg-icon icon-class="component" /> 布局型组件 <svg-icon icon-class="component" /> 布局型组件
</div> </div>
<draggable <draggable class="components-draggable" :list="layoutComponents"
class="components-draggable" :list="layoutComponents"
:group="{ name: 'componentsGroup', pull: 'clone', put: false }" :clone="cloneComponent" :group="{ name: 'componentsGroup', pull: 'clone', put: false }" :clone="cloneComponent"
draggable=".components-item" :sort="false" @end="onEnd" draggable=".components-item" :sort="false" @end="onEnd">
> <div v-for="(element, index) in layoutComponents" :key="index" class="components-item"
<div @click="addComponent(element)">
v-for="(element, index) in layoutComponents" :key="index" class="components-item"
@click="addComponent(element)"
>
<div class="components-body"> <div class="components-body">
<svg-icon :icon-class="element.tagIcon" /> <svg-icon :icon-class="element.tagIcon" />
{{ element.label }} {{ element.label }}
...@@ -90,25 +68,12 @@ ...@@ -90,25 +68,12 @@
</div> </div>
<el-scrollbar class="center-scrollbar"> <el-scrollbar class="center-scrollbar">
<el-row class="center-board-row" :gutter="formConf.gutter"> <el-row class="center-board-row" :gutter="formConf.gutter">
<el-form <el-form :size="formConf.size" :label-position="formConf.labelPosition" :disabled="formConf.disabled"
:size="formConf.size" :label-width="formConf.labelWidth + 'px'">
:label-position="formConf.labelPosition"
:disabled="formConf.disabled"
:label-width="formConf.labelWidth + 'px'"
>
<draggable class="drawing-board" :list="drawingList" :animation="340" group="componentsGroup"> <draggable class="drawing-board" :list="drawingList" :animation="340" group="componentsGroup">
<draggable-item <draggable-item v-for="(element, index) in drawingList" :key="element.renderKey" :drawing-list="drawingList"
v-for="(element, index) in drawingList" :element="element" :index="index" :active-id="activeId" :form-conf="formConf" @activeItem="activeFormItem"
:key="element.renderKey" @copyItem="drawingItemCopy" @deleteItem="drawingItemDelete" />
:drawing-list="drawingList"
:element="element"
:index="index"
:active-id="activeId"
:form-conf="formConf"
@activeItem="activeFormItem"
@copyItem="drawingItemCopy"
@deleteItem="drawingItemDelete"
/>
</draggable> </draggable>
<div v-show="!drawingList.length" class="empty-info"> <div v-show="!drawingList.length" class="empty-info">
从左侧拖入或点选组件进行表单设计 从左侧拖入或点选组件进行表单设计
...@@ -118,19 +83,10 @@ ...@@ -118,19 +83,10 @@
</el-scrollbar> </el-scrollbar>
</div> </div>
<right-panel <right-panel :active-data="activeData" :form-conf="formConf" :show-field="!!drawingList.length"
:active-data="activeData" @tag-change="tagChange" />
:form-conf="formConf"
:show-field="!!drawingList.length" <code-type-dialog :visible.sync="dialogVisible" title="选择生成类型" :show-file-name="showFileName" @confirm="generate" />
@tag-change="tagChange"
/>
<code-type-dialog
:visible.sync="dialogVisible"
title="选择生成类型"
:show-file-name="showFileName"
@confirm="generate"
/>
<input id="copyNode" type="hidden"> <input id="copyNode" type="hidden">
</div> </div>
</template> </template>
...@@ -370,31 +326,36 @@ export default { ...@@ -370,31 +326,36 @@ export default {
} }
</script> </script>
<style lang='scss'> <style lang='scss' scoped>
body, html{ body,
html {
margin: 0; margin: 0;
padding: 0; padding: 0;
background: #fff; background: #fff;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
text-rendering: optimizeLegibility; text-rendering: optimizeLegibility;
font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji; font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji;
} }
input, textarea{ input,
font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji; textarea {
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji;
} }
.editor-tabs{ .editor-tabs {
background: #121315; background: #121315;
.el-tabs__header{
.el-tabs__header {
margin: 0; margin: 0;
border-bottom-color: #121315; border-bottom-color: #121315;
.el-tabs__nav{
.el-tabs__nav {
border-color: #121315; border-color: #121315;
} }
} }
.el-tabs__item{
.el-tabs__item {
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
color: #888a8e; color: #888a8e;
...@@ -403,15 +364,18 @@ input, textarea{ ...@@ -403,15 +364,18 @@ input, textarea{
margin-right: 5px; margin-right: 5px;
user-select: none; user-select: none;
} }
.el-tabs__item.is-active{
.el-tabs__item.is-active {
background: #1e1e1e; background: #1e1e1e;
border-bottom-color: #1e1e1e!important; border-bottom-color: #1e1e1e !important;
color: #fff; color: #fff;
} }
.el-icon-edit{
.el-icon-edit {
color: #f1fa8c; color: #f1fa8c;
} }
.el-icon-document{
.el-icon-document {
color: #a95812; color: #a95812;
} }
} }
...@@ -422,29 +386,35 @@ input, textarea{ ...@@ -422,29 +386,35 @@ input, textarea{
padding: 12px 18px 15px 15px; padding: 12px 18px 15px 15px;
} }
} }
.left-scrollbar .el-scrollbar__wrap { .left-scrollbar .el-scrollbar__wrap {
box-sizing: border-box; box-sizing: border-box;
overflow-x: hidden !important; overflow-x: hidden !important;
margin-bottom: 0 !important; margin-bottom: 0 !important;
} }
.center-tabs{
.el-tabs__header{ .center-tabs {
margin-bottom: 0!important; .el-tabs__header {
margin-bottom: 0 !important;
} }
.el-tabs__item{
.el-tabs__item {
width: 50%; width: 50%;
text-align: center; text-align: center;
} }
.el-tabs__nav{
.el-tabs__nav {
width: 100%; width: 100%;
} }
} }
.reg-item{
.reg-item {
padding: 12px 6px; padding: 12px 6px;
background: #f8f8f8; background: #f8f8f8;
position: relative; position: relative;
border-radius: 4px; border-radius: 4px;
.close-btn{
.close-btn {
position: absolute; position: absolute;
right: -6px; right: -6px;
top: -6px; top: -6px;
...@@ -459,18 +429,22 @@ input, textarea{ ...@@ -459,18 +429,22 @@ input, textarea{
z-index: 1; z-index: 1;
cursor: pointer; cursor: pointer;
font-size: 12px; font-size: 12px;
&:hover{
&:hover {
background: rgba(210, 23, 23, 0.5) background: rgba(210, 23, 23, 0.5)
} }
} }
& + .reg-item{
&+.reg-item {
margin-top: 18px; margin-top: 18px;
} }
} }
.action-bar{
.action-bar {
& .el-button+.el-button { & .el-button+.el-button {
margin-left: 15px; margin-left: 15px;
} }
& i { & i {
font-size: 20px; font-size: 20px;
vertical-align: middle; vertical-align: middle;
...@@ -479,32 +453,37 @@ input, textarea{ ...@@ -479,32 +453,37 @@ input, textarea{
} }
} }
.custom-tree-node{ .custom-tree-node {
width: 100%; width: 100%;
font-size: 14px; font-size: 14px;
.node-operation{
.node-operation {
float: right; float: right;
} }
i[class*="el-icon"] + i[class*="el-icon"]{
i[class*="el-icon"]+i[class*="el-icon"] {
margin-left: 6px; margin-left: 6px;
} }
.el-icon-plus{
.el-icon-plus {
color: #409EFF; color: #409EFF;
} }
.el-icon-delete{
.el-icon-delete {
color: #157a0c; color: #157a0c;
} }
} }
.left-scrollbar .el-scrollbar__view{ .left-scrollbar .el-scrollbar__view {
overflow-x: hidden; overflow-x: hidden;
} }
.el-rate{ .el-rate {
display: inline-block; display: inline-block;
vertical-align: text-top; vertical-align: text-top;
} }
.el-upload__tip{
.el-upload__tip {
line-height: 1.2; line-height: 1.2;
} }
...@@ -521,6 +500,7 @@ $lighterBlue: #409EFF; ...@@ -521,6 +500,7 @@ $lighterBlue: #409EFF;
padding: 8px; padding: 8px;
box-sizing: border-box; box-sizing: border-box;
height: 100%; height: 100%;
.components-item { .components-item {
display: inline-block; display: inline-block;
width: 48%; width: 48%;
...@@ -528,14 +508,17 @@ $lighterBlue: #409EFF; ...@@ -528,14 +508,17 @@ $lighterBlue: #409EFF;
transition: transform 0ms !important; transition: transform 0ms !important;
} }
} }
.components-draggable{
.components-draggable {
padding-bottom: 20px; padding-bottom: 20px;
} }
.components-title{
.components-title {
font-size: 14px; font-size: 14px;
color: #222; color: #222;
margin: 6px 2px; margin: 6px 2px;
.svg-icon{
.svg-icon {
color: #666; color: #666;
font-size: 18px; font-size: 18px;
} }
...@@ -548,13 +531,16 @@ $lighterBlue: #409EFF; ...@@ -548,13 +531,16 @@ $lighterBlue: #409EFF;
cursor: move; cursor: move;
border: 1px dashed $selectedColor; border: 1px dashed $selectedColor;
border-radius: 3px; border-radius: 3px;
.svg-icon{
.svg-icon {
color: #777; color: #777;
font-size: 15px; font-size: 15px;
} }
&:hover { &:hover {
border: 1px dashed #787be8; border: 1px dashed #787be8;
color: #787be8; color: #787be8;
.svg-icon { .svg-icon {
color: #787be8; color: #787be8;
} }
...@@ -568,10 +554,12 @@ $lighterBlue: #409EFF; ...@@ -568,10 +554,12 @@ $lighterBlue: #409EFF;
top: 0; top: 0;
height: 100vh; height: 100vh;
} }
.left-scrollbar{
.left-scrollbar {
height: calc(100vh - 42px); height: calc(100vh - 42px);
overflow: hidden; overflow: hidden;
} }
.center-scrollbar { .center-scrollbar {
height: calc(100vh - 42px); height: calc(100vh - 42px);
overflow: hidden; overflow: hidden;
...@@ -579,13 +567,15 @@ $lighterBlue: #409EFF; ...@@ -579,13 +567,15 @@ $lighterBlue: #409EFF;
border-right: 1px solid #f1e8e8; border-right: 1px solid #f1e8e8;
box-sizing: border-box; box-sizing: border-box;
} }
.center-board { .center-board {
height: 100vh; height: 100vh;
width: auto; width: auto;
margin: 0 350px 0 260px; margin: 0 350px 0 260px;
box-sizing: border-box; box-sizing: border-box;
} }
.empty-info{
.empty-info {
position: absolute; position: absolute;
top: 46%; top: 46%;
left: 0; left: 0;
...@@ -595,27 +585,32 @@ $lighterBlue: #409EFF; ...@@ -595,27 +585,32 @@ $lighterBlue: #409EFF;
color: #ccb1ea; color: #ccb1ea;
letter-spacing: 4px; letter-spacing: 4px;
} }
.action-bar{
.action-bar {
position: relative; position: relative;
height: 42px; height: 42px;
text-align: right; text-align: right;
padding: 0 15px; padding: 0 15px;
box-sizing: border-box;; box-sizing: border-box;
;
border: 1px solid #f1e8e8; border: 1px solid #f1e8e8;
border-top: none; border-top: none;
border-left: none; border-left: none;
.delete-btn{
.delete-btn {
color: #F56C6C; color: #F56C6C;
} }
} }
.logo-wrapper{
.logo-wrapper {
position: relative; position: relative;
height: 42px; height: 42px;
background: #fff; background: #fff;
border-bottom: 1px solid #f1e8e8; border-bottom: 1px solid #f1e8e8;
box-sizing: border-box; box-sizing: border-box;
} }
.logo{
.logo {
position: absolute; position: absolute;
left: 12px; left: 12px;
top: 6px; top: 6px;
...@@ -624,16 +619,19 @@ $lighterBlue: #409EFF; ...@@ -624,16 +619,19 @@ $lighterBlue: #409EFF;
font-weight: 600; font-weight: 600;
font-size: 17px; font-size: 17px;
white-space: nowrap; white-space: nowrap;
> img{
>img {
width: 30px; width: 30px;
height: 30px; height: 30px;
vertical-align: top; vertical-align: top;
} }
.github{
.github {
display: inline-block; display: inline-block;
vertical-align: sub; vertical-align: sub;
margin-left: 15px; margin-left: 15px;
> img{
>img {
height: 22px; height: 22px;
} }
} }
...@@ -642,23 +640,28 @@ $lighterBlue: #409EFF; ...@@ -642,23 +640,28 @@ $lighterBlue: #409EFF;
.center-board-row { .center-board-row {
padding: 12px 12px 15px 12px; padding: 12px 12px 15px 12px;
box-sizing: border-box; box-sizing: border-box;
& > .el-form {
&>.el-form {
// 69 = 12+15+42 // 69 = 12+15+42
height: calc(100vh - 69px); height: calc(100vh - 69px);
} }
} }
.drawing-board { .drawing-board {
height: 100%; height: 100%;
position: relative; position: relative;
.components-body { .components-body {
padding: 0; padding: 0;
margin: 0; margin: 0;
font-size: 0; font-size: 0;
} }
.sortable-ghost { .sortable-ghost {
position: relative; position: relative;
display: block; display: block;
overflow: hidden; overflow: hidden;
&::before { &::before {
content: " "; content: " ";
position: absolute; position: absolute;
...@@ -670,38 +673,48 @@ $lighterBlue: #409EFF; ...@@ -670,38 +673,48 @@ $lighterBlue: #409EFF;
z-index: 2; z-index: 2;
} }
} }
.components-item.sortable-ghost { .components-item.sortable-ghost {
width: 100%; width: 100%;
height: 60px; height: 60px;
background-color: $selectedColor; background-color: $selectedColor;
} }
.active-from-item { .active-from-item {
& > .el-form-item{ &>.el-form-item {
background: $selectedColor; background: $selectedColor;
border-radius: 6px; border-radius: 6px;
} }
& > .drawing-item-copy, & > .drawing-item-delete{
&>.drawing-item-copy,
&>.drawing-item-delete {
display: initial; display: initial;
} }
& > .component-name{
&>.component-name {
color: $lighterBlue; color: $lighterBlue;
} }
} }
.el-form-item{
.el-form-item {
margin-bottom: 15px; margin-bottom: 15px;
} }
} }
.drawing-item{
.drawing-item {
position: relative; position: relative;
cursor: move; cursor: move;
&.unfocus-bordered:not(.activeFromItem) > div:first-child {
&.unfocus-bordered:not(.activeFromItem)>div:first-child {
border: 1px dashed #ccc; border: 1px dashed #ccc;
} }
.el-form-item{
.el-form-item {
padding: 12px 10px; padding: 12px 10px;
} }
} }
.drawing-row-item{
.drawing-row-item {
position: relative; position: relative;
cursor: move; cursor: move;
box-sizing: border-box; box-sizing: border-box;
...@@ -709,22 +722,28 @@ $lighterBlue: #409EFF; ...@@ -709,22 +722,28 @@ $lighterBlue: #409EFF;
border-radius: 3px; border-radius: 3px;
padding: 0 2px; padding: 0 2px;
margin-bottom: 15px; margin-bottom: 15px;
.drawing-row-item { .drawing-row-item {
margin-bottom: 2px; margin-bottom: 2px;
} }
.el-col{
.el-col {
margin-top: 22px; margin-top: 22px;
} }
.el-form-item{
.el-form-item {
margin-bottom: 0; margin-bottom: 0;
} }
.drag-wrapper{
.drag-wrapper {
min-height: 80px; min-height: 80px;
} }
&.active-from-item{
&.active-from-item {
border: 1px dashed $lighterBlue; border: 1px dashed $lighterBlue;
} }
.component-name{
.component-name {
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
...@@ -734,17 +753,23 @@ $lighterBlue: #409EFF; ...@@ -734,17 +753,23 @@ $lighterBlue: #409EFF;
padding: 0 6px; padding: 0 6px;
} }
} }
.drawing-item, .drawing-row-item{
.drawing-item,
.drawing-row-item {
&:hover { &:hover {
& > .el-form-item{ &>.el-form-item {
background: $selectedColor; background: $selectedColor;
border-radius: 6px; border-radius: 6px;
} }
& > .drawing-item-copy, & > .drawing-item-delete{
&>.drawing-item-copy,
&>.drawing-item-delete {
display: initial; display: initial;
} }
} }
& > .drawing-item-copy, & > .drawing-item-delete{
&>.drawing-item-copy,
&>.drawing-item-delete {
display: none; display: none;
position: absolute; position: absolute;
top: -10px; top: -10px;
...@@ -758,26 +783,29 @@ $lighterBlue: #409EFF; ...@@ -758,26 +783,29 @@ $lighterBlue: #409EFF;
cursor: pointer; cursor: pointer;
z-index: 1; z-index: 1;
} }
& > .drawing-item-copy{
&>.drawing-item-copy {
right: 56px; right: 56px;
border-color: $lighterBlue; border-color: $lighterBlue;
color: $lighterBlue; color: $lighterBlue;
background: #fff; background: #fff;
&:hover{
&:hover {
background: $lighterBlue; background: $lighterBlue;
color: #fff; color: #fff;
} }
} }
& > .drawing-item-delete{
&>.drawing-item-delete {
right: 24px; right: 24px;
border-color: #F56C6C; border-color: #F56C6C;
color: #F56C6C; color: #F56C6C;
background: #fff; background: #fff;
&:hover{
&:hover {
background: #F56C6C; background: #F56C6C;
color: #fff; color: #fff;
} }
} }
} }
</style> </style>
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