Skip to content

D
dd_school
Commit c23c00b3 by Cat
Options

zd 教师电子档案

parent 485ed745
Showing with 19 additions and 31 deletions
ruoyi-ui/src/views/smartSchool/gradeWork/electronicRecord/index.vue
...@@ -648,12 +648,8 @@ export default { ...@@ -648,12 +648,8 @@ export default {
const id = row.id; const id = row.id;
getFileTnfo(id).then((res) => { getFileTnfo(id).then((res) => {
this.form = res.data; this.form = res.data;
console.log(this.form, "131231212");
this.title = "基本信息查看"; this.title = "基本信息查看";
this.tableForthData = res.data.awardList; this.tableForthData = res.data.awardList;
// this.tableForth = res.data.awardList.forEach(function (item) {
// console.log(item);
// });
this.tableSecondData = res.data.materialList; this.tableSecondData = res.data.materialList;
this.tableFirstData = res.data.thesisList; this.tableFirstData = res.data.thesisList;
this.tableThirdData = res.data.trainingList; this.tableThirdData = res.data.trainingList;
......
ruoyi-ui/src/views/smartSchool/personWork/electronicRecord/index.vue
...@@ -360,25 +360,17 @@ ...@@ -360,25 +360,17 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="thesisList.thesisName" prop="thesisName"
label="论文名称" label="论文名称"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column align="center" prop="level" label="级别">
align="center"
prop="thesisList.level"
label="级别"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column align="center" prop="grade" label="等级">
align="center"
prop="thesisList.grade"
label="等级"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="thesisList.publishTime" prop="publishTime"
label="发表时间" label="发表时间"
> >
</el-table-column> </el-table-column>
...@@ -399,15 +391,11 @@ ...@@ -399,15 +391,11 @@
<el-table :data="tableSecondData" border> <el-table :data="tableSecondData" border>
<el-table-column align="center" fixed type="index" label="序号"> <el-table-column align="center" fixed type="index" label="序号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column align="center" prop="name" label="名称">
align="center"
prop="materialList.name"
label="名称"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="materialList.publishTime" prop="publishTime"
label="发表时间" label="发表时间"
> >
</el-table-column> </el-table-column>
...@@ -417,26 +405,26 @@ ...@@ -417,26 +405,26 @@
<div class="tableThird"> <div class="tableThird">
<div class="tableTitle"> <div class="tableTitle">
<i class="el-icon-data-analysis"></i> <i class="el-icon-data-analysis"></i>
<span style="margin-left: 5px">发表成就奖论文情况</span> <span style="margin-left: 5px">培训情况</span>
</div> </div>
<el-table :data="tableThirdData" border> <el-table :data="tableThirdData" border>
<el-table-column align="center" fixed type="index" label="序号"> <el-table-column align="center" fixed type="index" label="序号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="trainingList.trainingTime" prop="trainingTime"
label="培训时间" label="培训时间"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="trainingList.trainingName" prop="trainingName"
label="培训名称" label="培训名称"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="trainingList.isQualified" prop="isQualified"
label="是否合格" label="是否合格"
> >
</el-table-column> </el-table-column>
...@@ -446,32 +434,32 @@ ...@@ -446,32 +434,32 @@
<div class="tableForth"> <div class="tableForth">
<div class="tableTitle"> <div class="tableTitle">
<i class="el-icon-trophy"></i> <i class="el-icon-trophy"></i>
<span style="margin-left: 5px">发表成就奖论文情况</span> <span style="margin-left: 5px">业务获奖情况</span>
</div> </div>
<el-table :data="tableForthData" border> <el-table :data="tableForthData" border>
<el-table-column align="center" fixed type="index" label="序号"> <el-table-column align="center" fixed type="index" label="序号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="awardList.awardName" prop="awardName"
label="获奖名称" label="获奖名称"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="awardList.awardTime" prop="awardTime"
label="获奖时间" label="获奖时间"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="awardList.gradeOfAward" prop="gradeOfAward"
label="获奖等级" label="获奖等级"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="awardList.licenselssuingAuthority" prop="licenselssuingAuthority"
label="发证机关" label="发证机关"
> >
</el-table-column> </el-table-column>
...@@ -617,6 +605,10 @@ export default { ...@@ -617,6 +605,10 @@ export default {
getFileTnfo(id).then((res) => { getFileTnfo(id).then((res) => {
this.form = res.data; this.form = res.data;
this.title = "基本信息查看"; this.title = "基本信息查看";
this.tableForthData = res.data.awardList;
this.tableSecondData = res.data.materialList;
this.tableFirstData = res.data.thesisList;
this.tableThirdData = res.data.trainingList;
}); });
}, },
//填写按钮 //填写按钮
......
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