Skip to content

D
dd_school
Commit 1a62debd by zhaopanyu
Options

zpy 2.2

parent a99331fe
Showing with 41 additions and 12 deletions
ruoyi-ui/src/views/smartSchool/electronicArchives/personalInformation/index copy.vue
...@@ -614,10 +614,12 @@ ...@@ -614,10 +614,12 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="早读" align="center" prop="earlyReading" /> <el-table-column label="周课时量" align="center" prop="weeklyClassHours" sortable width="80px"
show-overflow-tooltip />
<!-- <el-table-column label="早读" align="center" prop="earlyReading" />
<el-table-column label="正课" align="center" prop="requiredCourses" /> <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="eveningSelfStudy" width="120px" />
<el-table-column label="合计" align="center" prop="amountTo" /> <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="userName" width="120px" fixed="right" />
<el-table-column label="备注" align="center" prop="remark" fixed="right" /> <el-table-column label="备注" align="center" prop="remark" fixed="right" />
</el-table> </el-table>
......
ruoyi-ui/src/views/smartSchool/electronicArchives/personalInformation/index.vue
...@@ -560,11 +560,13 @@ ...@@ -560,11 +560,13 @@
<el-table-column label="班级" align="center" prop="className" show-overflow-tooltip /> <el-table-column label="班级" align="center" prop="className" show-overflow-tooltip />
<el-table-column label="班级类型" align="center" prop="classType" show-overflow-tooltip> <el-table-column label="班级类型" align="center" prop="classType" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column label="早读" align="center" prop="earlyReading" show-overflow-tooltip /> <el-table-column label="周课时量" align="center" prop="weeklyClassHours" width="100px"
show-overflow-tooltip />
<!-- <el-table-column label="早读" align="center" prop="earlyReading" show-overflow-tooltip />
<el-table-column label="正课" align="center" prop="requiredCourses" show-overflow-tooltip /> <el-table-column label="正课" align="center" prop="requiredCourses" show-overflow-tooltip />
<el-table-column label="晚自习" align="center" prop="eveningSelfStudy" width="120px" <el-table-column label="晚自习" align="center" prop="eveningSelfStudy" width="120px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="合计" align="center" prop="amountTo" show-overflow-tooltip /> <el-table-column label="合计" align="center" prop="amountTo" show-overflow-tooltip /> -->
<el-table-column label="证明人" align="center" prop="userName" width="120px" fixed="right" <el-table-column label="证明人" align="center" prop="userName" width="120px" fixed="right"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" fixed="right" show-overflow-tooltip /> <el-table-column label="备注" align="center" prop="remark" fixed="right" show-overflow-tooltip />
...@@ -706,7 +708,7 @@ ...@@ -706,7 +708,7 @@
</el-table-column> </el-table-column>
<el-table-column label="班级类型" align="center" prop="classType" show-overflow-tooltip> <el-table-column label="班级类型" align="center" prop="classType" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column label="考核分" align="center" prop="assessmentScore" show-overflow-tooltip /> <el-table-column label="增量分" align="center" prop="assessmentScore" show-overflow-tooltip />
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -816,9 +818,9 @@ ...@@ -816,9 +818,9 @@
</el-table> </el-table>
</div> </div>
</div> </div>
<!--青年教成长档案 --> <!--青年教师成长档案 -->
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<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="youthTeacherList"> <el-table :data="youthTeacherList">
<el-table-column label="学年" align="center" prop="schoolYear" /> <el-table-column label="学年" align="center" prop="schoolYear" />
......
ruoyi-ui/src/views/smartSchool/personWork/personalInformation/index copy.vue
...@@ -614,10 +614,12 @@ ...@@ -614,10 +614,12 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="早读" align="center" prop="earlyReading" /> <el-table-column label="周课时量" align="center" prop="weeklyClassHours" sortable width="80px"
show-overflow-tooltip />
<!-- <el-table-column label="早读" align="center" prop="earlyReading" />
<el-table-column label="正课" align="center" prop="requiredCourses" /> <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="eveningSelfStudy" width="120px" />
<el-table-column label="合计" align="center" prop="amountTo" /> <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="userName" width="120px" fixed="right" />
<el-table-column label="备注" align="center" prop="remark" fixed="right" /> <el-table-column label="备注" align="center" prop="remark" fixed="right" />
</el-table> </el-table>
......
ruoyi-ui/src/views/smartSchool/personWork/personalInformation/index.vue
...@@ -548,11 +548,13 @@ ...@@ -548,11 +548,13 @@
<el-table-column label="班级" align="center" prop="className" show-overflow-tooltip /> <el-table-column label="班级" align="center" prop="className" show-overflow-tooltip />
<el-table-column label="班级类型" align="center" prop="classType" show-overflow-tooltip> <el-table-column label="班级类型" align="center" prop="classType" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column label="早读" align="center" prop="earlyReading" show-overflow-tooltip /> <el-table-column label="周课时量" align="center" prop="weeklyClassHours" width="80px"
show-overflow-tooltip />
<!-- <el-table-column label="早读" align="center" prop="earlyReading" show-overflow-tooltip />
<el-table-column label="正课" align="center" prop="requiredCourses" show-overflow-tooltip /> <el-table-column label="正课" align="center" prop="requiredCourses" show-overflow-tooltip />
<el-table-column label="晚自习" align="center" prop="eveningSelfStudy" width="100px" <el-table-column label="晚自习" align="center" prop="eveningSelfStudy" width="100px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="合计" align="center" prop="amountTo" show-overflow-tooltip /> <el-table-column label="合计" align="center" prop="amountTo" show-overflow-tooltip /> -->
<el-table-column label="证明人" align="center" prop="userName" width="120px" fixed="right" <el-table-column label="证明人" align="center" prop="userName" width="120px" fixed="right"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" fixed="right" show-overflow-tooltip /> <el-table-column label="备注" align="center" prop="remark" fixed="right" show-overflow-tooltip />
...@@ -694,7 +696,7 @@ ...@@ -694,7 +696,7 @@
</el-table-column> </el-table-column>
<el-table-column label="班级类型" align="center" prop="classType" show-overflow-tooltip> <el-table-column label="班级类型" align="center" prop="classType" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column label="考核分" align="center" prop="assessmentScore" show-overflow-tooltip /> <el-table-column label="增量分" align="center" prop="assessmentScore" show-overflow-tooltip />
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -803,6 +805,25 @@ ...@@ -803,6 +805,25 @@
</el-table> </el-table>
</div> </div>
</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="youthTeacherList">
<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="grade" />
<el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="青年教师培养期" align="center" prop="incubationPeriod" />
<el-table-column label="师生同考成绩" align="center" prop="sameExamResults" />
<el-table-column label="研做高考题情况" align="center" prop="situation" />
</el-table>
</div>
</div>
</div> </div>
</template> </template>
...@@ -833,6 +854,7 @@ export default { ...@@ -833,6 +854,7 @@ export default {
baseUrl: [process.env.VUE_APP_BASE_API], baseUrl: [process.env.VUE_APP_BASE_API],
uploadLoading: false, uploadLoading: false,
uploadFileLoading: false, uploadFileLoading: false,
youthTeacherList: [],
//工作量信息 //工作量信息
schoolAworkload: [], schoolAworkload: [],
//班主任考核 //班主任考核
...@@ -896,6 +918,7 @@ export default { ...@@ -896,6 +918,7 @@ export default {
this.schoolAnnualAssessment = response.data.schoolAnnualAssessment; this.schoolAnnualAssessment = response.data.schoolAnnualAssessment;
this.schoolXteachingAchievements = response.data.schoolXteachingAchievements; this.schoolXteachingAchievements = response.data.schoolXteachingAchievements;
this.schoolGkAchievement = response.data.schoolGkAchievement; this.schoolGkAchievement = response.data.schoolGkAchievement;
this.youthTeacherList = response.data.schoolXsyouthTeachers
this.fudaoTeacher = response.data.fudaoTeacher this.fudaoTeacher = response.data.fudaoTeacher
this.fudaoStudent = response.data.fudaoStudent this.fudaoStudent = response.data.fudaoStudent
// console.log(this.fudaoStudent, 'this.fudaoStudent'); // console.log(this.fudaoStudent, 'this.fudaoStudent');
......
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