LY 培训

ui/src/layout/components/Navbar.vue

@@ -137,7 +137,7 @@ export default {
     const timer = setInterval(() => {
       this.getNotice()
       this.getMessage()
-    }, 10000)
+    }, 100000)
   },
   methods: {
     getNotice(){

ui/src/views/training/spec/successor/staffResume.vue

@@ -48,11 +48,38 @@
       <div slot="header" class="clearfix">
         <span>公司级培养</span>
       </div>
+      <el-table v-loading="loading" :data="participantsList" border>
+        <el-table-column :label="$t('课程代码')" align="center" prop="courseCode" width="120" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('公司级') + $t('空格') + $t('培训课程') + $t('空格') + $t('名称')" align="center" prop="companyItem" width="400" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('开始日期')" align="center" prop="startDate" width="200">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('结束日期')" align="center" prop="endDate" width="200">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('培训时长')" align="center" prop="trainingDuration" :show-overflow-tooltip="true"/>
+      </el-table>
     </el-card>
     <el-card>
       <div slot="header" class="clearfix">
         <span>装置级培养</span>
       </div>
+      <el-table v-loading="loading" :data="devicceList" border>
+        <el-table-column :label="$t('课程代码')" align="center" prop="courseCode" width="200" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('课程名称')" align="center" prop="item" width="350" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('授课人')" align="center" prop="lecturerName" width="150" :show-overflow-tooltip="true" />
+        <el-table-column :label="$t('课时')" align="center" prop="hour" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('开始日期')" align="center" prop="startDate" width="100">
+          <template slot-scope="scope">
+            <span v-if="scope.row.supplementary === '0' && scope.row.trainingType === '10'">{{ parseTime(scope.row.startDate, '{y}-{m}') }}</span>
+            <span v-else>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
     </el-card>
     <el-card>
       <div slot="header" class="clearfix">
@@ -82,6 +109,8 @@
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listPlan} from "@/api/training/spec/plan";
+import {listParticipants} from "@/api/training/participants";
+import {listDevice} from "@/api/training/device";
 
 export default {
   name: "Resume",
@@ -121,6 +150,10 @@ export default {
       total: 0,
       // 培养计划表格数据
       planList: [],
+      // 人员-公司级培训关系表格数据
+      participantsList: [],
+      // 人员-装置级培训关系表格数据
+      devicceList: [],
       // 弹出层标题
       title: "",
       // 操作
@@ -145,6 +178,16 @@ export default {
         classHour: null,
         studyState: null
       },
+      queryCompanyParams: {
+        staffId: null,
+        companyId: null,
+      },
+      queryDeviceParams: {
+        staffId: null,
+        regularId: null,
+        year: this.getNowTime(),
+        trainingType: null
+      },
       // 表单参数
       form: {},
       // 表单校验
@@ -184,6 +227,16 @@ export default {
       this.staff = row.staff
       this.queryParams.staffId = row.staff.staffid
       this.getPlanList()
+      this.getParticipants()
+      this.getDevice()
+    },
+    /** 获取当前年份 */
+    getNowTime() {
+      var now = new Date();
+      var year = now.getFullYear(); //得到年份
+      var defaultDate = `${year}`;
+      defaultDate = `${year}`
+      return defaultDate;
     },
     /** 查询培养计划列表 */
     getPlanList() {
@@ -194,6 +247,18 @@ export default {
         this.loading = false;
       });
     },
+    getParticipants() {
+      this.queryCompanyParams.staffId = this.staff.staffid
+      listParticipants(this.queryCompanyParams).then(response => {
+        this.participantsList = response.rows;
+      });
+    },
+    getDevice() {
+      this.queryDeviceParams.staffId = this.staff.staffid
+      listDevice(this.queryDeviceParams).then(response => {
+        this.devicceList = response.rows;
+      });
+    },
     // 装置名称字典翻译
     plantCodeFormat(row, column) {
       return this.selectDictLabel(this.plantCodeOptions, row.plantCode);