Skip to content

D
dd_school
Commit c96972b3 by Cat
Options

zd 教师电子档案

parent 34770ed2
Showing with 66 additions and 56 deletions
ruoyi-ui/src/views/smartSchool/gradeWork/electronicRecord/index.vue
......@@ -44,11 +44,11 @@
</el-col>
<el-col :span="1.5">
<span>已填写：</span>
<span style="font-size: 14px">{{ completedCount }}</span>
<span style="font-size: 14px">{{ this.yfb }}</span>
</el-col>
<el-col :span="1.5">
<span>已确认：</span>
<span style="font-size: 14px">{{ confirmedCount }}</span>
<span style="font-size: 14px">{{ this.yqr }}</span>
</el-col>
</el-row>
</el-form>
......@@ -358,25 +358,17 @@
</el-table-column>
<el-table-column
align="center"
prop="thesisList.thesisName"
prop="thesisName"
label="论文名称"
>
</el-table-column>
<el-table-column
align="center"
prop="thesisList.level"
label="级别"
>
<el-table-column align="center" prop="level" label="级别">
</el-table-column>
<el-table-column
align="center"
prop="thesisList.grade"
label="等级"
>
<el-table-column align="center" prop="grade" label="等级">
</el-table-column>
<el-table-column
align="center"
prop="thesisList.publishTime"
prop="publishTime"
label="发表时间"
>
</el-table-column>
......@@ -397,15 +389,11 @@
<el-table :data="tableSecondData" border>
<el-table-column align="center" fixed type="index" label="序号">
</el-table-column>
<el-table-column
align="center"
prop="materialList.name"
label="名称"
>
<el-table-column align="center" prop="name" label="名称">
</el-table-column>
<el-table-column
align="center"
prop="materialList.publishTime"
prop="publishTime"
label="发表时间"
>
</el-table-column>
......@@ -426,19 +414,19 @@
</el-table-column>
<el-table-column
align="center"
prop="trainingList.trainingTime"
prop="trainingTime"
label="培训时间"
>
</el-table-column>
<el-table-column
align="center"
prop="trainingList.trainingName"
prop="trainingName"
label="培训名称"
>
</el-table-column>
<el-table-column
align="center"
prop="trainingList.isQualified"
prop="isQualified"
label="是否合格"
>
</el-table-column>
......@@ -459,25 +447,25 @@
</el-table-column>
<el-table-column
align="center"
prop="awardList.awardName"
prop="awardName"
label="获奖名称"
>
</el-table-column>
<el-table-column
align="center"
prop="awardList.awardTime"
prop="awardTime"
label="获奖时间"
>
</el-table-column>
<el-table-column
align="center"
prop="awardList.gradeOfAward"
prop="gradeOfAward"
label="获奖等级"
>
</el-table-column>
<el-table-column
align="center"
prop="awardList.licenseIssuingAuthority"
prop="licenseIssuingAuthority"
label="发证机关"
>
</el-table-column>
......@@ -528,6 +516,8 @@ export default {
loading: true,
// 总条数
total: 0,
yfb: 0,
yqr: 0,
queryForm: {
pageSize: 10,
pageNum: 1,
......@@ -593,6 +583,8 @@ export default {
getGradeTnfo(params).then((res) => {
this.tableData = res.rows;
this.total = res.total;
this.yfb = res.yfb;
this.yqr = res.yqr;
this.completedCount = res.rows.filter(
(item) => item.state === 3
).length;
......@@ -651,7 +643,25 @@ export default {
this.check = true;
this.title = "基本信息查看";
this.dialogVisible = true;
this.dialogForm = { ...row }; //Vue深拷贝
// this.dialogForm = { ...row }; //Vue深拷贝
this.dialogVisible = true;
const id = row.id;
getFileTnfo(id).then((res) => {
this.form = res.data;
console.log(this.form, "131231212");
this.title = "基本信息查看";
this.tableForthData = res.data.awardList;
// this.tableForth = res.data.awardList.forEach(function (item) {
// console.log(item);
// });
this.tableSecondData = res.data.materialList;
this.tableFirstData = res.data.thesisList;
this.tableThirdData = res.data.trainingList;
console.log(this.tableForth, " this.tableForth");
console.log(this.tableSecond, " this.tableSecond");
console.log(this.tableFirst, " this.tableFirst");
console.log(this.tableThird, " this.tableThird");
});
},
//修改按钮
......@@ -700,7 +710,6 @@ export default {
// 提取 `
handleExtract() {
const id = this.form.id;
console.log(id, "id");
syncNotice(id).then((res) => {
console.log(id, "id");
console.log("res提取", res);
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/dataMaintenance.vue
......@@ -347,25 +347,17 @@
</el-table-column>
<el-table-column
align="center"
prop="thesisList.thesisName"
prop="thesisName"
label="论文名称"
>
</el-table-column>
<el-table-column
align="center"
prop="thesisList.level"
label="级别"
>
<el-table-column align="center" prop="level" label="级别">
</el-table-column>
<el-table-column
align="center"
prop="thesisList.grade"
label="等级"
>
<el-table-column align="center" prop="grade" label="等级">
</el-table-column>
<el-table-column
align="center"
prop="thesisList.publishTime"
prop="publishTime"
label="发表时间"
>
</el-table-column>
......@@ -386,15 +378,11 @@
<el-table :data="tableSecondData" border>
<el-table-column align="center" fixed type="index" label="序号">
</el-table-column>
<el-table-column
align="center"
prop="materialList.name"
label="名称"
>
<el-table-column align="center" prop="name" label="名称">
</el-table-column>
<el-table-column
align="center"
prop="materialList.publishTime"
prop="publishTime"
label="发表时间"
>
</el-table-column>
......@@ -408,26 +396,26 @@
<div class="tableThird">
<div class="tableTitle">
<i class="el-icon-data-analysis"></i>
<span style="margin-left: 5px">发表成就奖论文情况</span>
<span style="margin-left: 5px">培训情况</span>
</div>
<el-table :data="tableThirdData" border>
<el-table-column align="center" fixed type="index" label="序号">
</el-table-column>
<el-table-column
align="center"
prop="trainingList.trainingTime"
prop="trainingTime"
label="培训时间"
>
</el-table-column>
<el-table-column
align="center"
prop="trainingList.trainingName"
prop="trainingName"
label="培训名称"
>
</el-table-column>
<el-table-column
align="center"
prop="trainingList.isQualified"
prop="isQualified"
label="是否合格"
>
</el-table-column>
......@@ -441,32 +429,32 @@
<div class="tableForth">
<div class="tableTitle">
<i class="el-icon-trophy"></i>
<span style="margin-left: 5px">发表成就奖论文情况</span>
<span style="margin-left: 5px">业务获奖情况</span>
</div>
<el-table :data="tableForthData" border>
<el-table-column align="center" fixed type="index" label="序号">
</el-table-column>
<el-table-column
align="center"
prop="awardList.awardName"
prop="awardName"
label="获奖名称"
>
</el-table-column>
<el-table-column
align="center"
prop="awardList.awardTime"
prop="awardTime"
label="获奖时间"
>
</el-table-column>
<el-table-column
align="center"
prop="awardList.gradeOfAward"
prop="gradeOfAward"
label="获奖等级"
>
</el-table-column>
<el-table-column
align="center"
prop="awardList.licenselssuingAuthority"
prop="licenselssuingAuthority"
label="发证机关"
>
</el-table-column>
......@@ -559,6 +547,7 @@ export default {
},
mounted() {
this.getList();
console.log(this.$route.query.status, "this.$route.query.status");
},
methods: {
......@@ -600,7 +589,19 @@ export default {
const id = row.id;
getFileTnfo(id).then((res) => {
this.form = res.data;
console.log(this.form, "131231212");
this.title = "基本信息查看";
this.tableForthData = res.data.awardList;
// this.tableForth = res.data.awardList.forEach(function (item) {
// console.log(item);
// });
this.tableSecondData = res.data.materialList;
this.tableFirstData = res.data.thesisList;
this.tableThirdData = res.data.trainingList;
console.log(this.tableForth, " this.tableForth");
console.log(this.tableSecond, " this.tableSecond");
console.log(this.tableFirst, " this.tableFirst");
console.log(this.tableThird, " this.tableThird");
});
},
......
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