Skip to content

D
dd_school
Commit da2e6b73 by zhaopanyu
Options

zpy 12.18

parent b1203c9f
Showing with 442 additions and 131 deletions
ruoyi-ui/src/views/smartSchool/electronicArchives/personalInformation/index.vue
...@@ -3,17 +3,15 @@ ...@@ -3,17 +3,15 @@
<div class="seach"> <div class="seach">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
<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 style="width: 600px;" />
style="width: 600px;" />
</el-form-item> </el-form-item>
<el-form-item label="身份证号" prop="idCard"> <el-form-item label="身份证号" prop="idCard">
<el-input v-model="queryParams.idCard" placeholder="请输入身份证号" clearable @keyup.enter.native="handleQuery" <el-input v-model="queryParams.idCard" placeholder="请输入身份证号" clearable style="width: 600px;" />
style="width: 600px;" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="getList">查询</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">查询</el-button>
<el-button type="warning" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</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-button type="danger" icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -41,7 +39,7 @@ ...@@ -41,7 +39,7 @@
</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="name"> <el-form-item prop="sex">
<span>性别</span> <span>性别</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -130,74 +128,353 @@ ...@@ -130,74 +128,353 @@
</el-col> </el-col>
</el-col> </el-col>
</el-row> </el-row>
<!-- f4 -->
<el-row>
<el-col :span="24">
<el-col :span="4" class="border_right border-bottom table_cell">
<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">
<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">
<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">
<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">
<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">
<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">
<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">
<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">
<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>
<el-col :span="6"> <el-col :span="6">
<el-card> <el-card
<div style="height:143px">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Officia style="height: 180px;width: 415px; display: flex; align-items: center; justify-content: center; ">
esse, <el-upload v-loading="uploadLoading" class="avatar-uploader" action="#" accept="image/*"
odit modi nesciunt :show-file-list="false" :on-success="handleAvatarSuccess"
quaerat necessitatibus eius nisi quis accusantium, quo obcaecati perferendis ab tempore :before-upload="beforeAvatarUpload" :http-request="uploadImage">
quos, perspiciatis repudiandae sed mollitia iure! <img v-if="form.photoUrl" :src="baseUrl + form.photoUrl"
Lorem ipsum dolor sit amet consectetur, adipisicing elit. Beatae quod recusandae quaerat style="max-width: 100%; max-height: 100%" class="avatar" alt="" />
veniam officia tenetur dicta laborum atque incidunt esse et quos sit, animi impedit <i v-else class="el-icon-plus avatar-uploader-icon"></i>
ipsum </el-upload>
error repellendus repellat magnam!</div>
</el-card> </el-card>
</el-col> </el-col>
<!-- 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">
<el-form-item prop="name"> <el-form-item prop="duties">
<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="name"> <el-form-item prop="duties">
<span>{{ form.name }}</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">
<el-form-item prop="name"> <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="name"> <el-form-item prop="teacherQualificationType">
<el-form-item prop="name"> <span>{{ form.teacherQualificationType }}</span>
<span>{{ form.name }}</span>
</el-form-item>
</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="name"> <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="name"> <el-form-item prop="teacherQualificationCertificateNum">
<el-form-item prop="name"> <span>{{ form.teacherQualificationCertificateNum }}</span>
<span>{{ form.name }}</span>
</el-form-item>
</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="name"> <el-form-item prop="workingHours">
<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="name"> <el-form-item prop="workingHours">
<el-form-item prop="name"> <span>{{ form.workingHours }}</span>
<span>{{ form.name }}</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">
<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">
<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">
<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">
<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">
<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">
<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">
<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">
<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-form-item> </el-form-item>
</el-col> </el-col>
</el-col> </el-col>
</el-row> </el-row>
<!-- f4 -->
<el-row>
<el-col>
<el-col :span="3" class="border_right border-bottom table_cell">
<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">
<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">
<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">
<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">
<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">
<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">
<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">
<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>
</div> </div>
</el-form> </el-form>
</div> </div>
...@@ -235,15 +512,7 @@ ...@@ -235,15 +512,7 @@
<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" />
<el-table-column label="班级" align="center" prop="className" /> <el-table-column label="班级" align="center" prop="className" />
<el-table-column label="班级类型" align="center"> <el-table-column label="班级类型" align="center" prop="classType">
<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>
<el-table-column label="早读" align="center" prop="earlyReading" /> <el-table-column label="早读" align="center" prop="earlyReading" />
<el-table-column label="正课" align="center" prop="requiredCourses" /> <el-table-column label="正课" align="center" prop="requiredCourses" />
...@@ -274,14 +543,7 @@ ...@@ -274,14 +543,7 @@
</el-table-column> </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" width="180px"> <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>
<el-table-column label="姓名" align="center" prop="teacherName" /> <el-table-column label="姓名" align="center" prop="teacherName" />
<el-table-column label="学科" align="center" prop="sub"> <el-table-column label="学科" align="center" prop="sub">
...@@ -300,38 +562,32 @@ ...@@ -300,38 +562,32 @@
<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="schoolYear" /> <el-table-column label="成长类型" align="center" prop="type">
<el-table-column label="学期" align="center" prop="semester"> <template>
<template slot-scope="scope"> <span>综合荣誉</span>
<dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="届别" align="center" prop="year" /> <el-table-column label="学科" align="center" prop="sub">
<el-table-column label="年级" align="center" prop="grade">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.grade_da" :value="scope.row.grade" /> <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="班级" align="center" prop="className" /> <el-table-column label="获奖类别" align="center" prop="awardType" />
<el-table-column label="班级类型" align="center" prop="classType" width="180px"> <el-table-column label="获奖等级" align="center" prop="awardLevel">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="getSelectedTypes(scope.row.classType).length > 0"> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" />
<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> </template>
</el-table-column> </el-table-column>
<el-table-column label="姓名" align="center" prop="teacherName" /> <el-table-column label="获奖级别" align="center" prop="awardType">
<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.awards_level" :value="scope.row.awardType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="德育考核成绩" align="center" prop="moralEduCheckAchievement" width="130px" /> <el-table-column label="综合荣誉-成果名称" align="center" prop="resultName" />
<el-table-column label="智育考核成绩" align="center" prop="intellEduCheckAchievement" width="130px" /> <el-table-column label="获奖人" align="center" prop="userName" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="主办单位" align="center" prop="org" />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180">
</el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -340,33 +596,25 @@ ...@@ -340,33 +596,25 @@
<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="schoolGkAchievement"> <el-table :data="schoolGkAchievement">
<el-table-column label="届别" align="center" prop="year" sortable /> <el-table-column label="届别" align="center" prop="year" />
<el-table-column label="学科" align="center" prop="sub" sortable> <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="teacherName" sortable /> <el-table-column label="教师姓名" align="center" prop="teacherName" />
<el-table-column label="授课班级" align="center" prop="teachingClassName" sortable /> <el-table-column label="授课班级" align="center" prop="teachingClassName" />
<el-table-column label="班级类型" align="center" prop="classType" sortable> <el-table-column label="班级类型" align="center" prop="classType">
<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>
<el-table-column label="高考评优" align="center" prop="gkAppraising" sortable> <el-table-column label="高考评优" align="center" prop="gkAppraising">
<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.sub" />
</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" />
<el-table-column label="增量情况" align="center" prop="incrementSituation" sortable /> <el-table-column label="增量情况" align="center" prop="incrementSituation" />
<el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable /> <el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" />
<el-table-column label="其他" align="center" prop="other" sortable /> <el-table-column label="其他" align="center" prop="other" />
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -375,47 +623,39 @@ ...@@ -375,47 +623,39 @@
<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="schoolXteachingAchievements"> <el-table :data="schoolXteachingAchievements">
<el-table-column label="学年" align="center" prop="schoolYear" sortable /> <el-table-column label="学年" align="center" prop="schoolYear" />
<el-table-column label="学期" align="center" prop="semester" sortable> <el-table-column label="学期" align="center" prop="semester">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" /> <dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="考试时间" align="center" prop="examTime" width="180" sortable> <el-table-column label="考试时间" align="center" prop="examTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.examTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.examTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="考试类型" align="center" prop="examType" sortable> <el-table-column label="考试类型" align="center" prop="examType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.exam_typeda" :value="scope.row.examType" /> <dict-tag :options="dict.type.exam_typeda" :value="scope.row.examType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="届别" align="center" prop="year" sortable /> <el-table-column label="届别" align="center" prop="year" />
<el-table-column label="年级" align="center" prop="grade" sortable> <el-table-column label="年级" align="center" prop="grade">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.grade_da" :value="scope.row.grade" /> <dict-tag :options="dict.type.grade_da" :value="scope.row.grade" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="姓名" align="center" prop="userName" sortable /> <el-table-column label="姓名" align="center" prop="userName" />
<el-table-column label="学科" align="center" prop="sub" sortable> <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="className" sortable> <el-table-column label="班级" align="center" prop="className">
</el-table-column> </el-table-column>
<el-table-column label="班级类型" align="center" sortable> <el-table-column label="班级类型" align="center" prop="classType">
<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>
<el-table-column label="考核分" align="center" prop="assessmentScore" sortable /> <el-table-column label="考核分" align="center" prop="assessmentScore" />
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -429,36 +669,36 @@ ...@@ -429,36 +669,36 @@
<span>辅导老师获奖</span> <span>辅导老师获奖</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable> <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" sortable> <el-table-column label="获奖类别" align="center" prop="awardtype">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_type_fdjs" :value="scope.row.awardtype" /> <dict-tag :options="dict.type.award_type_fdjs" :value="scope.row.awardtype" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardlevel" sortable> <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" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardrank" sortable> <el-table-column label="获奖级别" align="center" prop="awardrank">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比赛名称" align="center" prop="competitionname" sortable /> <el-table-column label="比赛名称" align="center" prop="competitionname" />
<el-table-column label="获奖人" align="center" prop="username" sortable /> <el-table-column label="获奖人" align="center" prop="username" />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable /> <el-table-column label="指导教师" align="center" prop="guidanceteacher" />
<el-table-column label="辅导职责" align="center" prop="coachingr" sortable> <el-table-column label="辅导职责" align="center" prop="coachingr">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.coachingr" :value="scope.row.coachingr" /> <dict-tag :options="dict.type.coachingr" :value="scope.row.coachingr" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="主办单位" align="center" prop="org" sortable /> <el-table-column label="主办单位" align="center" prop="org" />
<el-table-column label="获奖时间" align="center" prop="awardtime" width="180" sortable> <el-table-column label="获奖时间" align="center" prop="awardtime" width="180">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> --> </template> -->
...@@ -476,31 +716,31 @@ ...@@ -476,31 +716,31 @@
<span>辅导学生获奖</span> <span>辅导学生获奖</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable> <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" sortable> <el-table-column label="获奖类别" align="center" prop="awardtype">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_type_fdxs" :value="scope.row.awardtype" /> <dict-tag :options="dict.type.award_type_fdxs" :value="scope.row.awardtype" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardlevel" sortable> <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" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardrank" sortable> <el-table-column label="获奖级别" align="center" prop="awardrank">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比赛名称" align="center" prop="resultname" sortable /> <el-table-column label="比赛名称" align="center" prop="resultname" />
<el-table-column label="获奖人" align="center" prop="username" sortable /> <el-table-column label="获奖人" align="center" prop="username" />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable /> <el-table-column label="指导教师" align="center" prop="guidanceteacher" />
<el-table-column label="主办单位" align="center" prop="org" sortable /> <el-table-column label="主办单位" align="center" prop="org" />
<el-table-column label="获奖时间" align="center" prop="awardtime" width="180" sortable> <el-table-column label="获奖时间" align="center" prop="awardtime" width="180">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> --> </template> -->
...@@ -529,10 +769,29 @@ ...@@ -529,10 +769,29 @@
<script> <script>
import { listAward } from "@/api/smartSchool/electronicArchives/personalInformation"; import { listAward } from "@/api/smartSchool/electronicArchives/personalInformation";
import { getToken } from "@/utils/auth";
import { uploadImage as commonUpload } from "@/api/common";
export default { export default {
dicts: ["teaching_subjects", 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type', 'yearda', 'rankda'], 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'],
data() { data() {
return { return {
classType: "",
uploadForm: {},
baseUrl: [process.env.VUE_APP_BASE_API],
uploadLoading: false,
uploadFileLoading: false,
//工作量信息 //工作量信息
schoolAworkload: [], schoolAworkload: [],
//班主任考核 //班主任考核
...@@ -568,6 +827,7 @@ export default { ...@@ -568,6 +827,7 @@ 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.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;
this.schoolXteachingAchievements = response.data.schoolXteachingAchievements; this.schoolXteachingAchievements = response.data.schoolXteachingAchievements;
...@@ -576,7 +836,9 @@ export default { ...@@ -576,7 +836,9 @@ export default {
this.schoolGkAchievement = response.data.schoolGkAchievement; this.schoolGkAchievement = response.data.schoolGkAchievement;
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');
this.specialityVos = response.data.specialityVos this.specialityVos = response.data.specialityVos
// console.log(this.specialityVos, 'this.specialityVos');
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
}); });
...@@ -588,6 +850,55 @@ export default { ...@@ -588,6 +850,55 @@ export default {
}; };
this.getList(); 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() {
this.download('/teacher/basiclnformation/exportPDF', {
...this.queryParams
}, `教师个人信息汇总_${Date.now()}.pdf
`)
},
}, },
} }
......
ruoyi-ui/src/views/whitePage.vue
...@@ -30,9 +30,9 @@ export default { ...@@ -30,9 +30,9 @@ export default {
getCode() { getCode() {
dd.getAuthCode({ dd.getAuthCode({
//测试 //测试
// corpId: 'dingaa3937ff8b7dd267f2c783f7214b6d69', corpId: 'dingaa3937ff8b7dd267f2c783f7214b6d69',
//正式 //正式
corpId: 'dingccea40788226c988f2c783f7214b6d69', // corpId: 'dingccea40788226c988f2c783f7214b6d69',
success: (res) => { success: (res) => {
console.log('获取新的免登码成功', res); console.log('获取新的免登码成功', res);
const code = res.code const code = res.code
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment