-修改苯乙烯上岗证一览表数据

-修改预约票申请流程

master/src/main/java/com/ruoyi/project/invoice/controller/TApproveReserveInvoiceController.java

@@ -239,6 +239,13 @@ public class TApproveReserveInvoiceController extends BaseController {
             invoice.setStatus(2L);
             invoice.setEnddate(new Date());
         }
+        if (devTask.getCondition().equals("2")) {
+            devTask.setCondition("0");
+            devTask.setComment("作废并修改流程" + symbol + devTask.getComment());
+            invoice.setStatus(-1L);
+            invoice.setContent("作废并修改流程");
+            invoice.setEnddate(new Date());
+        }
         Map<String, Object> param = new HashMap<>();
         List<TInvoiceWorkcontent> workcontents = invoiceWorkcontentMapper.selectTInvoiceWorkcontentBybookingticketId(Long.valueOf(invoice.getInvoiceId()));
         if (task.getName().equals("装置主管签字确认")) {

master/src/main/java/com/ruoyi/project/invoice/controller/TInvoiceBookingworkticketController.java

@@ -457,6 +457,15 @@ public class TInvoiceBookingworkticketController extends BaseController
         return AjaxResult.success(t);
     }
 
+    @GetMapping(value = "/infoById/{id}")
+    public AjaxResult getInfoById(@PathVariable("id") Long id)
+    {
+        TInvoiceBookingworkticket t=  tInvoiceBookingworkticketService.selectBookingworkticketById(id);
+        List<TInvoiceWorkcontent>  list= tInvoiceBookingworkticketService.selectTInvoiceWorkcontentBybookingticketId(t.getId());
+        t.settInvoiceWorkcontentList(list);
+        return AjaxResult.success(t);
+    }
+
     /**
      * 票号生成文件
      */

master/src/main/java/com/ruoyi/project/invoice/mapper/TInvoiceBookingworkticketMapper.java

@@ -23,6 +23,7 @@ public interface TInvoiceBookingworkticketMapper  extends BaseMapper<TInvoiceBoo
      * @return 预约作业票台账
      */
     public TInvoiceBookingworkticket selectTInvoiceBookingworkticketById(Long id);
+    public TInvoiceBookingworkticket selectBookingworkticketById(Long id);
     public List<TInvoiceBookingworkticketVo> selectDetailById(Long id);
 
     /**

master/src/main/java/com/ruoyi/project/invoice/service/ITInvoiceBookingworkticketService.java

@@ -23,6 +23,7 @@ public interface ITInvoiceBookingworkticketService extends IService<TInvoiceBook
      * @return 预约作业票台账
      */
     public TInvoiceBookingworkticket selectTInvoiceBookingworkticketById(Long id);
+    public TInvoiceBookingworkticket selectBookingworkticketById(Long id);
     public List<TInvoiceBookingworkticketVo> selectDetailById(Long id);
 
     /**

master/src/main/java/com/ruoyi/project/invoice/service/impl/TInvoiceBookingworkticketServiceImpl.java

@@ -10,7 +10,6 @@ import com.ruoyi.project.invoice.mapper.TInvoiceBookingworkticketMapper;
 import com.ruoyi.project.invoice.mapper.TInvoiceContractorMapper;
 import com.ruoyi.project.invoice.mapper.TInvoiceWorkcontentMapper;
 import com.ruoyi.project.invoice.service.ITInvoiceBookingworkticketService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -45,6 +44,11 @@ public class TInvoiceBookingworkticketServiceImpl extends ServiceImpl<TInvoiceBo
     {
         return tInvoiceBookingworkticketMapper.selectTInvoiceBookingworkticketById(id);
     }
+    @Override
+    public TInvoiceBookingworkticket selectBookingworkticketById(Long id)
+    {
+        return tInvoiceBookingworkticketMapper.selectBookingworkticketById(id);
+    }
 
     @Override
     public List<TInvoiceBookingworkticketVo> selectDetailById(Long id)

master/src/main/java/com/ruoyi/project/listener/invoiceApprove/InvoiceEndFailListener.java

@@ -35,9 +35,12 @@ public class InvoiceEndFailListener implements Serializable, ExecutionListener {
         ISysUserService sysUserService = (ISysUserService) SpringContextUtils.getBean("sysUserService");
         IMailService mailService = (IMailService) SpringContextUtils.getBean("mailService");
         TApproveReserveInvoice approveEntity = tApproveReserveInvoiceService.selectTApproveReserveInvoiceById(Long.parseLong(id)) ;
-
+        if(approveEntity.getStatus()==-1){
+            logger.info("===================作废流程结束！===================");
+            return;
+        }
         // 修改申请状态
-        TInvoiceBookingworkticket invoiceBook = tInvoiceBookingworkticketService.selectTInvoiceBookingworkticketById(Long.valueOf(approveEntity.getInvoiceId()));
+        TInvoiceBookingworkticket invoiceBook = tInvoiceBookingworkticketService.selectBookingworkticketById(Long.valueOf(approveEntity.getInvoiceId()));
         approveEntity.setStatus(3L);
         approveEntity.setEnddate(new Date());
         invoiceBook.setStatus(7L);

master/src/main/java/com/ruoyi/project/listener/invoiceApprove/InvoiceEndSuccessListener.java

@@ -57,7 +57,7 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
         approveEntity.setStatus(1L);
         approveEntity.setEnddate(new Date());
         // 修改申请状态
-        TInvoiceBookingworkticket invoiceBook = tInvoiceBookingworkticketService.selectTInvoiceBookingworkticketById(Long.valueOf(approveEntity.getInvoiceId()));
+        TInvoiceBookingworkticket invoiceBook = tInvoiceBookingworkticketService.selectBookingworkticketById(Long.valueOf(approveEntity.getInvoiceId()));
         invoiceBook.setStatus(3L);
         tInvoiceBookingworkticketService.updateById(invoiceBook);
         //发送邮件
@@ -120,7 +120,7 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
             e.printStackTrace();
         }
         //找到主记录
-        TInvoiceBookingworkticket tInvoiceBookingworkticket=tInvoiceBookingworkticketService.selectTInvoiceBookingworkticketById(Long.parseLong(approveEntity.getInvoiceId()));
+        TInvoiceBookingworkticket tInvoiceBookingworkticket=tInvoiceBookingworkticketService.selectBookingworkticketById(Long.parseLong(approveEntity.getInvoiceId()));
         tInvoiceBookingworkticket.setFilename(url);
         tInvoiceBookingworkticketService.updateTInvoiceBookingworkticket(tInvoiceBookingworkticket);
         tApproveReserveInvoiceService.updateTApproveReserveInvoice(approveEntity);
@@ -135,7 +135,7 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
     public String PreView(Long id) throws IOException {
         ITInvoiceBookingworkticketService tInvoiceBookingworkticketService = (ITInvoiceBookingworkticketService) SpringContextUtils.getBean("tInvoiceBookingworkticketService");
         //根据ID查询并生成
-        TInvoiceBookingworkticket tInvoiceBookingworkticket= tInvoiceBookingworkticketService.selectTInvoiceBookingworkticketById(id);
+        TInvoiceBookingworkticket tInvoiceBookingworkticket= tInvoiceBookingworkticketService.selectBookingworkticketById(id);
         String url = this.createBookingworkticketWord(tInvoiceBookingworkticket);
         return url;
     }

master/src/main/java/com/ruoyi/project/training/controller/TWorklicenseController.java

@@ -1,35 +1,36 @@
 package com.ruoyi.project.training.controller;
 
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.common.domain.DataEntity;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysDictData;
 import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysDictTypeService;
 import com.ruoyi.project.training.domain.TTrainingWorklicense;
-import com.ruoyi.project.training.domain.TTrainingrecords;
+import com.ruoyi.project.training.domain.TWorklicense;
 import com.ruoyi.project.training.mapper.TWorklicenseMapper;
-import org.apache.poi.ss.usermodel.*;
-import org.springframework.security.access.prepost.PreAuthorize;
+import com.ruoyi.project.training.service.ITWorklicenseService;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.training.domain.TWorklicense;
-import com.ruoyi.project.training.service.ITWorklicenseService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * 上岗证一览Controller
@@ -140,6 +141,29 @@ public class TWorklicenseController extends BaseController
         list.add(data5);
         return list;
     }
+    @GetMapping("/licensebyxData")
+    public List<DataEntity> licensebyxData(Map param)
+    {
+        param.put("params" , new HashMap<>());
+        param.put("type", 1);
+        DataEntity data1 = tWorklicenseMapper.selectLicenseData(param);
+        data1.setDataName("裂解（裂化）");
+        param.put("type", 2);
+        DataEntity data2 = tWorklicenseMapper.selectLicenseData(param);
+        data2.setDataName("压力容器");
+        param.put("type", 3);
+        DataEntity data3 = tWorklicenseMapper.selectLicenseData(param);
+        data3.setDataName("压力管道");
+        param.put("type", 4);
+        DataEntity data4 = tWorklicenseMapper.selectLicenseData(param);
+        data4.setDataName("烷基化");
+        List<DataEntity> list = new ArrayList<>();
+        list.add(data1);
+        list.add(data2);
+        list.add(data3);
+        list.add(data4);
+        return list;
+    }
 
     /**
      * 导出上岗证一览列表

master/src/main/resources/mybatis/invoice/TInvoiceBookingworkticketMapper.xml

@@ -158,6 +158,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.id=b.bookingticket_id and  a.id=#{id} and a.del_flag = 0 and b.del_flag = 0
     </select>
 
+    <select id="selectBookingworkticketById" parameterType="Long" resultMap="TInvoiceBookingworkticketResult">
+        <include refid="selectTInvoiceBookingworkticketVo"/>
+        where d.id = #{id}
+    </select>
+
     <select id="selectTInvoiceBookingworkticketById" parameterType="Long" resultMap="TInvoiceBookingworkticketResult">
         select d.id, d.work_unit, d.work_area, d.unit_number, d.floor_location, d.work_start_time, d.work_end_time, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.contact, d.phonenumber, d.status, d.dept_id, d.user_mg ,d.user_unit,s.dept_name,d.filename,d.reservation_number
         ,su.nick_name as userSupName,su.PHONENUMBER as userSupPhone ,su2.nick_name as userMgName,su2.PHONENUMBER as userMgPhone

ui/src/api/invoice/bookingworkticket.js

@@ -15,6 +15,11 @@ export function getBookingworkticket(id) {
     url: '/invoice/bookingworkticket/' + id,
     method: 'get'
   })
+}export function getInfoById(id) {
+  return request({
+    url: '/invoice/bookingworkticket/infoById/' + id,
+    method: 'get'
+  })
 }
 
 // 新增预约作业票台账

ui/src/api/training/worklicense.js

@@ -25,6 +25,13 @@ export function licenseData(query) {
     params: query
   })
 }
+export function licensebyxData(query) {
+  return request({
+    url: '/training/worklicense/licensebyxData',
+    method: 'get',
+    params: query
+  })
+}
 // 查询上岗证一览详细
 export function getWorklicense(id) {
   return request({

ui/src/views/approve/approveDetail/invoice-detail.vue

@@ -241,7 +241,10 @@ import Bookingworkticket from "@/views/invoice/bookingworkticket/index"
 import log from "@/views/monitor/job/log";
 import {getAllUserUnit, getUserByUnit} from "@/api/invoice/unit";
 import {treeselect} from "@/api/system/dept";
-import {addBookingworkticket, getBookingworkticket, updateBookingworkticket} from "@/api/invoice/bookingworkticket";
+import {
+  getInfoById,
+  updateBookingworkticket
+} from "@/api/invoice/bookingworkticket";
 import Treeselect from "@riophae/vue-treeselect";
 import {selectDevice} from "@/api/invoice/device";
 
@@ -780,7 +783,7 @@ export default {
       this.save=false
       this.detailReset();
       const id = this.devList[0].bookingticketId
-      getBookingworkticket(id).then(response => {
+      getInfoById(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改预约作业票台账";
@@ -840,7 +843,7 @@ export default {
         arr.push(genForm4)
       }
 
-      this.taskForm.condition = 0
+      this.taskForm.condition = 2
       this.taskForm.govFiles = this.dataForm.files
 
       //多重校验

ui/src/views/training/byxWorklicense/index.vue

@@ -0,0 +1,959 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item :label="$t('姓名')" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          :placeholder="$t('请输入') + $t('姓名')"
+          clearable
+          size="small"
+          @input="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="$t('班组')" prop="classes">
+        <el-select v-model="queryParams.classes" @change="handleQuery"    :placeholder="$t('请选择') + $t('班组')" clearable size="small">
+          <el-option
+            v-for="dict in classesOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('裂解(裂化)')" prop="boiler" label-width="50">
+        <el-checkbox v-model="queryParams.boiler" @change="handleQuery"   ></el-checkbox>
+      </el-form-item>
+      <el-form-item :label="$t('压力容器')" prop="cracking" label-width="50">
+        <el-checkbox v-model="queryParams.cracking" @change="handleQuery"   ></el-checkbox>
+      </el-form-item>
+      <el-form-item :label="$t('压力管道')" prop="hotarea" label-width="50">
+        <el-checkbox v-model="queryParams.hotarea" @change="handleQuery"   ></el-checkbox>
+      </el-form-item>
+      <el-form-item label="烷基化" prop="coldarea" label-width="50">
+        <el-checkbox v-model="queryParams.coldarea" @change="handleQuery"   ></el-checkbox>
+      </el-form-item>
+      <el-form-item :label="$t('无')+$t('空格')+$t('上岗证')" prop="notHave" label-width="50">
+        <el-checkbox v-model="queryParams.notHave" @change="handleQuery"   ></el-checkbox>
+      </el-form-item>
+      <el-form-item :label="$t('证书有效期即将到期')" prop="expiring" label-width="50">
+        <el-checkbox v-model="queryParams.expiring" @change="handleQuery"   ></el-checkbox>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('搜索') }}</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('重置') }}</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['training:worklicense:add']"
+        >{{ $t('新增') }}</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['training:worklicense:edit']"
+        >{{ $t('修改') }}</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['training:worklicense:remove']"
+        >{{ $t('删除') }}</el-button>
+      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--          <el-button-->
+<!--                  type="info"-->
+<!--                  icon="el-icon-upload2"-->
+<!--                  size="mini"-->
+<!--                  @click="handleImport"-->
+<!--                  v-hasPermi="['training:worklicense:edit']"-->
+<!--          >{{ $t('导入') }}</el-button>-->
+<!--      </el-col>-->
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['training:worklicense:export']"
+        >{{ $t('导出') }}</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-s-data"
+          size="mini"
+          @click="handleData"
+        >{{ $t('数据分析') }}</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="worklicenseList" @selection-change="handleSelectionChange" :cell-class-name="tableCellClassName" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column :label="$t('姓名')" align="center" prop="name" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('员工号')" align="center" prop="employeeid" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('班组')" align="center" prop="classes" :formatter="classesFormat" />
+      <el-table-column :label="$t('职务')" align="center" prop="post" width="150" :formatter="actualpostFormat"/>
+      <el-table-column :label="$t('证件类型')" align="center" prop="idtype" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('证件号')" align="center" prop="crackingIdnum" width="150" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('裂解（裂化）')" align="center" prop="boiler" :formatter="boilerFormat">
+        <template slot-scope="scope">
+          <span> {{boilerFormat(scope.row)}}</span>
+          <el-button v-if="boilerFormat(scope.row) == 'YES'" icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'worklicense-boiler')"  circle></el-button>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('压力容器')" align="center" prop="cracking" :formatter="crackingFormat">
+        <template slot-scope="scope">
+          <span> {{crackingFormat(scope.row)}}</span>
+          <el-button v-if="crackingFormat(scope.row) == 'YES'" icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'worklicense-compression')"  circle></el-button>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('压力管道')" align="center" prop="hotarea" :formatter="hotareaFormat">
+        <template slot-scope="scope">
+          <span> {{hotareaFormat(scope.row)}}</span>
+          <el-button v-if="hotareaFormat(scope.row) == 'YES'" icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'worklicense-separation')" circle></el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="烷基化" align="center" prop="coldarea" width="100" :formatter="coldareaFormat">
+        <template slot-scope="scope">
+          <span> {{coldareaFormat(scope.row)}}</span>
+          <el-button v-if="coldareaFormat(scope.row) == 'YES'" icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'worklicense-pguaeu')"  circle></el-button>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('取复证日期')" align="center" prop="recertificatedate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.recertificatedate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('证书有效期')" align="center" prop="validity" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.validity, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('操作')" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['training:worklicense:edit']"
+          >{{ $t('修改') }}</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['training:worklicense:remove']"
+          >{{ $t('删除') }}</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改上岗证一览对话框 -->
+    <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item :label="$t('装置名称')" prop="plantCode">
+          <el-select v-model="form.plantCode" :placeholder="$t('请选择') + $t('装置名称')">
+            <el-option
+              v-for="dict in plantCodeOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('姓名')" prop="name">
+          <el-input v-model="form.name" :placeholder="$t('请输入') + $t('姓名')" />
+        </el-form-item>
+        <el-form-item :label="$t('员工号')" prop="employeeid">
+          <el-input v-model="form.employeeid" :placeholder="$t('请输入') + $t('员工号')" />
+        </el-form-item>
+        <el-form-item :label="$t('班组')" prop="classes">
+          <el-select v-model="form.classes" :placeholder="$t('请选择') + $t('班组')">
+            <el-option
+              v-for="dict in classesOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('职务')" prop="post">
+          <el-select v-model="form.post" :placeholder="$t('请选择') + $t('职务')">
+            <el-option
+              v-for="dict in actualpostOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('证件类型')" prop="idtype">
+          <el-input v-model="form.idtype" :placeholder="$t('请输入') + $t('证件类型')" />
+        </el-form-item>
+        <el-form-item :label="$t('证件号')" prop="crackingIdnum">
+          <el-input v-model="form.crackingIdnum" :placeholder="$t('请输入') +$t('证件号') " />
+        </el-form-item>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item :label="$t('裂解（裂化）')" prop="boiler">
+              <el-checkbox v-model="form.boiler" @change="changeBoiler()"></el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="$t('压力容器')" prop="cracking">
+              <el-checkbox v-model="form.cracking" @change="changeCracking()"></el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="$t('压力管道')" prop="hotarea">
+              <el-checkbox v-model="form.hotarea" @change="changeHotarea()"></el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="烷基化" prop="coldarea">
+              <el-checkbox v-model="form.coldarea" @change="changeColdarea()"></el-checkbox>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item :label="$t('取复证日期')" prop="recertificatedate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.recertificatedate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            :placeholder="$t('请选择') + $t('取复证日期')">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item :label="$t('证书有效期')" prop="validity">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.validity"
+            type="date"
+            value-format="yyyy-MM-dd"
+            :placeholder="$t('请选择') + $t('证书有效期')">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item :label="$t('备注')" prop="remarks">
+          <el-input v-model="form.remarks" :placeholder="$t('请输入') + $t('备注')" />
+        </el-form-item>
+          <el-form-item :label="$t('归属部门')" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :placeholder="$t('请选择') + $t('归属部门')" />
+          </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">{{ $t('确 定') }}</el-button>
+        <el-button @click="cancel">{{ $t('取 消') }}</el-button>
+      </div>
+    </el-dialog>
+    <!-- 用户导入对话框 -->
+    <el-dialog v-dialogDrag :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+        <el-upload
+                ref="upload"
+                :limit="1"
+                accept=".xlsx, .xls"
+                :headers="upload.headers"
+                :action="upload.url"
+                :disabled="upload.isUploading"
+                :on-progress="handleFileUploadProgress"
+                :on-success="handleFileSuccess"
+                :auto-upload="false"
+                drag
+        >
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text">
+                {{ $t('将文件拖到此处，或') }}
+                <em>{{ $t('点击上传') }}</em>
+            </div>
+            <div class="el-upload__tip" slot="tip">
+                <!--<el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据-->
+                <el-link type="info" style="font-size:12px" @click="importTemplate">{{ $t('下载模板') }}</el-link>
+            </div>
+            <form ref="downloadFileForm" :action="upload.downloadAction" target="FORMSUBMIT">
+              <input name="type" :value="upload.type" hidden />
+            </form>
+            <div class="el-upload__tip" style="color:red" slot="tip">{{ $t('提示：仅允许导入“xls”或“xlsx”格式文件！') }}</div>
+        </el-upload>
+        <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="submitFileForm">{{ $t('确 定') }}</el-button>
+            <el-button @click="upload.open = false">{{ $t('取 消') }}</el-button>
+        </div>
+    </el-dialog>
+    <!-- 报告附件对话框 -->
+    <el-dialog v-dialogDrag :title="doc.title" :visible.sync="doc.open" width="1000px" append-to-body >
+      <el-upload v-hasPermi="['training:trainingrecords:file']"
+                 ref="doc"
+                 :limit="50"
+                 :headers="doc.headers"
+                 :action="doc.url + '?pType=' + doc.pType + '&pId=' + doc.pId"
+                 :disabled="doc.isUploading"
+                 :on-progress="handleFileDocProgress"
+                 :on-success="handleFileDocSuccess"
+                 :auto-upload="true"
+                 drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">
+          {{ $t('将文件拖到此处，或') }}
+          <em>{{ $t('点击上传') }}</em>
+        </div>
+      </el-upload>
+      <el-table :data="doc.commonfileList" border>
+        <el-table-column :label="$t('文件名')" align="center" prop="fileName" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <a  class="link-type"  @click="handleDownload(scope.row)">
+              <span>{{ scope.row.fileName }}</span>
+            </a>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('大小(Kb)')" align="center" prop="fileSize" :show-overflow-tooltip="true" width="80" />
+        <el-table-column :label="$t('上传人')" align="center" prop="creator" :show-overflow-tooltip="true" width="120"/>
+<!--        <el-table-column :label="$t('培训日期')" align="center" prop="pDate"  width="150">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-date-picker-->
+<!--              v-if="scope.row.isEdit"-->
+<!--              v-model="scope.row.pDate"-->
+<!--              type="date"-->
+<!--              value-format="yyyy-MM-dd"-->
+<!--              placeholder="日期">-->
+<!--            </el-date-picker>-->
+<!--            <span v-else>{{ parseTime(scope.row.pDate, '{y}-{m}-{d}') }}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+        <el-table-column :label="$t('操作')" align="center" width="220" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              v-if="scope.row.fileName.endsWith('pdf')"
+              size="mini"
+              type="text"
+              icon="el-icon-view"
+              @click="handleSee(scope.row)"
+            >{{ $t('预览') }}</el-button>
+            <el-button v-hasPermi="['training:trainingrecords:file']"  type="text" size="small" v-if="scope.row.isEdit" @click="save(scope.row)">保存</el-button>
+            <el-button type="text" size="small" v-if="scope.row.isEdit" @click="cancelFile(scope.row, scope.$index)">取消</el-button>
+<!--            <el-button v-hasPermi="['training:trainingrecords:file']" v-if="!scope.row.isEdit" @click="edit(scope.row)" icon="el-icon-edit" type="text" size="mini">编辑</el-button>-->
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-download"
+              @click="handleDownload(scope.row)"
+            >{{ $t('下载') }}</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDeleteDoc(scope.row)"
+              v-hasPermi="['training:trainingrecords:file']"
+            >{{ $t('删除') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-dialog v-dialogDrag :title="pdf.title" :visible.sync="pdf.open" width="1300px" append-to-body>
+        <div style="margin-top: -60px;float: right;margin-right: 40px;">
+          <el-button size="mini" type="text" @click="openPdf">{{$t('新页面打开PDF')}}</el-button></div>
+        <div style="margin-top: -30px">
+          <iframe :src="pdf.pdfUrl" frameborder="0" width="100%" height="700px"></iframe>
+        </div>
+      </el-dialog>
+
+      <div slot="footer" class="dialog-footer">
+        <!--        <el-button type="primary" @click="submitFileForm">{{ $t('确 定') }}</el-button>-->
+        <el-button @click="doc.open = false">{{ $t('返 回') }}</el-button>
+      </div>
+    </el-dialog>
+    <el-drawer
+      :title="$t('数据分析')"
+      size="600px"
+      :visible.sync="drawer"
+      :direction="direction">
+      <el-row>
+        <el-col>
+          <el-card class="box-card" shadow="hover">
+            <div slot="header" class="clearfix">
+              <span>{{$t('上岗证')+$t('空格')+ $t('统计') }}</span>
+            </div>
+            <div class="text item">
+              <license-data></license-data>
+            </div>
+          </el-card>
+        </el-col>
+      </el-row>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import { listWorklicense, getWorklicense, delWorklicense, addWorklicense, updateWorklicense, exportWorklicense } from "@/api/training/worklicense";
+import { treeselect } from "@/api/system/dept";
+import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import LicenseData from "./licenseData";
+import {addCommonfile, allFileList, delCommonfile, updateCommonfile} from "@/api/common/commonfile";
+
+export default {
+  name: "Worklicense",
+  components: {LicenseData, Treeselect},
+  data() {
+    return {
+      drawer: false,
+      direction: 'rtl',
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 上岗证一览表格数据
+      worklicenseList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight:300,
+      // 是否显示弹出层
+      open: false,
+      // 装置名称字典
+      plantCodeOptions: [],
+      // 班组字典
+      classesOptions: [],
+      // 职务字典
+      actualpostOptions: [],
+      // 裂解字典
+      boilerOptions: [],
+      // 压缩字典
+      crackingOptions: [],
+      // 分离字典
+      hotareaOptions: [],
+      // PGU/AEU字典
+      coldareaOptions: [],
+      // 用户导入参数
+      upload: {
+        downloadAction: process.env.VUE_APP_BASE_API + '/common/template',
+        //下载模板类型
+        type: "worklicense",
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/training/worklicense/importData"
+      },
+      // 报告附件参数
+      doc: {
+        file: "",
+        // 是否显示弹出层（报告附件）
+        open: false,
+        // 弹出层标题（报告附件）
+        title: "附件",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 报告附件上传位置编号
+        ids: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/common/commonfile/uploadFile",
+        commonfileList: null,
+        queryParams: {
+          pId: null,
+          pType: 'traning'
+        },
+        pType: 'traning',
+        pId: null,
+        form: {}
+      },
+      pdf : {
+        title: '',
+        pdfUrl: '',
+        numPages: null,
+        open: false,
+        pageNum: 1,
+        pageTotalNum: 1,
+        loadedRatio: 0,
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        name: null,
+        classes: null,
+        boiler: null,
+        cracking: null,
+        hotarea: null,
+        coldarea: null,
+        notHave: null,
+        expiring: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        plantCode: [
+          { required: true, message: this.$t('装置名称')+this.$t('不能为空'), trigger: "change" }
+        ],
+        deptId: [
+          { required: true, message: this.$t('部门编号')+this.$t('不能为空'), trigger: "blur" }
+        ]
+      },
+      //是否填写证件号
+      boilerDisplay: false,
+      compressionDisplay: false,
+      separationDisplay: false,
+      pguaeuDisplay: false,
+    };
+  },
+  watch: {
+        // 根据名称筛选部门树
+        deptName(val) {
+            this.$refs.tree.filter(val);
+        }
+   },
+  created() {
+      //设置表格高度对应屏幕高度
+      this.$nextTick(() => {
+          this.clientHeight = (document.body.clientHeight - 80) * 0.8
+      })
+    this.getList();
+    this.getTreeselect();
+    this.getDicts("PLANT_DIVIDE").then(response => {
+      this.plantCodeOptions = response.data;
+    });
+    this.getDicts("TEAM_DIVIDE").then(response => {
+      this.classesOptions = response.data;
+    });
+    this.getDicts("ACTUALPOST").then(response => {
+      this.actualpostOptions = response.data;
+    });
+    this.getDicts("YES_NO_EN").then(response => {
+      this.boilerOptions = response.data;
+    });
+    this.getDicts("YES_NO_EN").then(response => {
+      this.crackingOptions = response.data;
+    });
+    this.getDicts("YES_NO_EN").then(response => {
+      this.hotareaOptions = response.data;
+    });
+    this.getDicts("YES_NO_EN").then(response => {
+      this.coldareaOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询上岗证一览列表 */
+    getList() {
+      this.loading = true;
+      listWorklicense(this.queryParams).then(response => {
+        this.worklicenseList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    //根据分数显示颜色提示
+    tableCellClassName({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex == 12) {
+        return this.changeColor(row.validity)
+      }
+    },
+    changeColor (value) {
+      var timeInterval = Date.parse(value) - Date.parse(new Date());
+      if (timeInterval <= 182 * 24 * 3600 * 1000) {
+        return 'cellCare'
+      }
+    },
+     /** 查询部门下拉树结构 */
+     getTreeselect() {
+          treeselect().then(response => {
+              this.deptOptions = response.data;
+          });
+     },
+    // 装置名称字典翻译
+    plantCodeFormat(row, column) {
+      return this.selectDictLabel(this.plantCodeOptions, row.plantCode);
+    },
+    // 班组字典翻译
+    classesFormat(row, column) {
+      return this.selectDictLabel(this.classesOptions, row.classes);
+    },
+    // 职务字典翻译
+    actualpostFormat(row, column) {
+      return this.selectDictLabel(this.actualpostOptions, row.post);
+    },
+    // 裂解字典翻译
+    boilerFormat(row, column) {
+      return this.selectDictLabel(this.boilerOptions, row.boiler);
+    },
+    // 压缩字典翻译
+    crackingFormat(row, column) {
+      return this.selectDictLabel(this.crackingOptions, row.cracking);
+    },
+    // 分离字典翻译
+    hotareaFormat(row, column) {
+      return this.selectDictLabel(this.hotareaOptions, row.hotarea);
+    },
+    // PGU/AEU字典翻译
+    coldareaFormat(row, column) {
+      return this.selectDictLabel(this.coldareaOptions, row.coldarea);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        plantCode: null,
+        name: null,
+        employeeid: null,
+        classes: null,
+        post: null,
+        idtype: null,
+        crackingIdnum: null,
+        boiler: null,
+        cracking: null,
+        hotarea: null,
+        coldarea: null,
+        aromatic: null,
+        recertificatedate: null,
+        validity: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        remarks: null,
+        deptId: null,
+        separationIdnum: null,
+        compressionIdnum: null,
+        pguaeuIdnum: null,
+        separationDate: null,
+        compressionDate: null,
+        pguaeuDate: null,
+        crackingDate: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = this.$t('新增') + this.$t('空格') + this.$t('上岗证一览表');
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getWorklicense(id).then(response => {
+        this.form = response.data;
+        if (response.data.boiler == 1) { this.form.boiler = true; this.boilerDisplay = true }
+        if (response.data.boiler == 0) { this.form.boiler = false; this.boilerDisplay = false }
+        if (response.data.cracking == 1) { this.form.cracking = true; this.compressionDisplay = true }
+        if (response.data.cracking == 0) { this.form.cracking = false; this.compressionDisplay = false }
+        if (response.data.hotarea == 1) { this.form.hotarea = true; this.separationDisplay = true }
+        if (response.data.hotarea == 0) { this.form.hotarea = false; this.separationDisplay = false }
+        if (response.data.coldarea == 1) { this.form.coldarea = true; this.pguaeuDisplay = true }
+        if (response.data.coldarea == 0) { this.form.coldarea = false; this.pguaeuDisplay = false }
+        this.open = true;
+        this.title = this.$t('修改')  + this.$t('上岗证一览表');
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateWorklicense(this.form).then(response => {
+              this.msgSuccess(this.$t('修改成功'));
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addWorklicense(this.form).then(response => {
+              this.msgSuccess(this.$t('新增成功'));
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm(this.$t('是否确认删除?'), this.$t('警告'), {
+          confirmButtonText: this.$t('确定'),
+          cancelButtonText: this.$t('取消'),
+          type: "warning"
+        }).then(function() {
+          return delWorklicense(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess(this.$t('删除成功'));
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm(this.$t('是否确认导出所有上岗证一览数据项?'), this.$t('警告'), {
+          confirmButtonText: this.$t('确定'),
+          cancelButtonText: this.$t('取消'),
+          type: "warning"
+        }).then(function() {
+          return exportWorklicense(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+        this.upload.title = this.$t('用户导入');
+        this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      this.$refs['downloadFileForm'].submit()
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+        this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      if (response.data[0] != null) {
+        this.$alert(this.$t('成功导入') + response.msg + this.$t('条数据') + "，" + this.$t('第') + response.data + this.$t('行数据出现错误导入失败')+"。", this.$t('导入结果'), { dangerouslyUseHTMLString: true });
+      }else {
+        this.$alert(this.$t('成功导入') + response.msg + this.$t('条数据'), this.$t('导入结果'), { dangerouslyUseHTMLString: true });
+      }
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+        this.$refs.upload.submit();
+    },
+    //数据分析
+    handleData(){
+      this.drawer = true
+    },
+    //裂解修改
+    changeBoiler() {
+      if (this.form.boiler === true) {
+        this.boilerDisplay = true
+      }else {
+        this.boilerDisplay = false
+      }
+    },
+    //压缩修改
+    changeCracking() {
+      if (this.form.cracking === true) {
+        this.compressionDisplay = true
+      }else {
+        this.compressionDisplay = false
+      }
+    },
+    //分离修改
+    changeHotarea() {
+      if (this.form.hotarea === true) {
+        this.separationDisplay = true
+      }else {
+        this.separationDisplay = false
+      }
+    },
+    //PGU/AEU修改
+    changeColdarea() {
+      if (this.form.coldarea === true) {
+        this.pguaeuDisplay = true
+      }else {
+        this.pguaeuDisplay = false
+      }
+    },
+    /** 报告附件按钮操作 */
+    handleDoc(row , fileType) {
+      var workType = "";
+      if (fileType === "worklicense-boiler"){
+        workType = this.$t('裂解');
+      }else if (fileType === "worklicense-compression"){
+        workType = this.$t('压缩');
+      }else if (fileType === "worklicense-separation"){
+        workType = this.$t('分离');
+      }else if (fileType === "worklicense-pguaeu"){
+        workType = "PGU/AEU";
+      }
+      this.doc.pType = fileType
+      this.doc.queryParams.pType = fileType
+      this.doc.id = row.id;
+      this.doc.title = row.name + this.$t('的')+ this.$t('空格') + workType+ this.$t('空格') +  this.$t('上岗证')+ this.$t('空格')+ this.$t('附件') ;
+      this.doc.open = true;
+      this.doc.queryParams.pId = row.id
+      this.doc.pId = row.id
+      this.getFileList()
+      /*this.$nextTick(() => {
+        this.$refs.doc.clearFiles()
+      })*/
+    },
+    getFileList (){
+      allFileList(this.doc.queryParams).then(response => {
+        response.forEach(element => {
+          element["isEdit"] = false
+        });
+        response.forEach(element => {
+          element["isAdd"] = false
+        });
+        this.doc.commonfileList = response;
+      });
+    },
+    //附件上传中处理
+    handleFileDocProgress(event, file, fileList) {
+      this.doc.file = file;
+      this.doc.isUploading = true;
+    },
+    //附件上传成功处理
+    handleFileDocSuccess(response, file, fileList) {
+      this.doc.isUploading = false;
+      this.$alert(response.msg, this.$t('导入结果'), { dangerouslyUseHTMLString: true });
+      this.getFileList()
+    },
+    // 文件下载处理
+    handleDownload(row) {
+      var name = row.fileName;
+      var url = row.fileUrl;
+      var suffix = url.substring(url.lastIndexOf("."), url.length);
+      const a = document.createElement('a')
+      a.setAttribute('download', name)
+      a.setAttribute('target', '_blank')
+      a.setAttribute('href', process.env.VUE_APP_BASE_API + url)
+      a.click()
+    },
+    openPdf(){
+        window.open(this.pdf.pdfUrl);//path是文件的全路径地址
+      },
+      handleSee (row){
+      // window.open(process.env.VUE_APP_BASE_API +'/pdf/web/viewer.html?file=' + process.env.VUE_APP_BASE_API + row.fileUrl);//path是文件的全路径地址
+      this.pdf.open =true
+      this.pdf.title = row.fileName
+      this.pdf.pdfUrl = process.env.VUE_APP_BASE_API +'/pdf/web/viewer.html?file=' + process.env.VUE_APP_BASE_API + row.fileUrl
+    },
+    // 上一页
+    prePage() {
+      let page = this.pdf.pageNum
+      page = page > 1 ? page - 1 : this.pdf.pageTotalNum
+      this.pdf.pageNum = page
+    },
+    // 下一页
+    nextPage() {
+      let page = this.pdf.pageNum
+      page = page < this.pdf.pageTotalNum ? page + 1 : 1
+      this.pdf.pageNum = page
+    },
+    // 取消
+    cancelFile(row, index) {
+      // 如果是新增的数据
+      if (row.isAdd) {
+        this.doc.commonfileList.splice(index, 1)
+      } else {
+        // 不是新增的数据  还原数据
+        for (const i in row.oldRow) {
+          row[i] = row.oldRow[i]
+        }
+        row.isEdit = false
+      }
+    },
+    edit(row) {
+      // 备份原始数据
+      row['oldRow'] = JSON.parse(JSON.stringify(row));
+      this.$nextTick(() => {
+        row.isEdit = true;
+      })
+    },
+    save(row) {
+      row.isEdit = false;
+      var that = this;
+      that.loading = true;
+      this.form = row;
+      if (row.isAdd == true) {
+        addCommonfile(this.form).then(response => {
+          this.msgSuccess(this.$t('新增成功'));
+          this.open = false;
+          this.getList();
+        });
+      }else {
+        updateCommonfile(this.form).then(response => {
+          this.msgSuccess(this.$t('修改成功'));
+          this.open = false;
+          this.getList();
+        });
+      }
+    },
+    /** 删除按钮操作 */
+    handleDeleteDoc(row) {
+      const ids = row.id || this.ids;
+      this.$confirm(this.$t('是否确认删除?'), this.$t('警告'), {
+        confirmButtonText: this.$t('确定'),
+        cancelButtonText: this.$t('取消'),
+        type: "warning"
+      }).then(function() {
+        return delCommonfile(ids);
+      }).then(() => {
+        this.getFileList()
+        this.msgSuccess(this.$t('删除成功'));
+      })
+    },
+  }
+};
+</script>

ui/src/views/training/byxWorklicense/licenseData.vue

@@ -0,0 +1,108 @@
+<template>
+  <div>
+    <div id="licenseData" :style="{width:width,height:height}"></div>
+  </div>
+</template>
+
+<script>
+import {licensebyxData, licenseData} from "@/api/training/worklicense";
+
+  export default {
+    props: {
+      width: {
+        type: String,
+        default: '100%'
+      },
+      height: {
+        type: String,
+        default: '200px'
+      },
+    },
+    data() {
+      return {
+        option: {
+          color: ['#3398DB'],
+          /* 周围边距 */
+          grid: {
+            left: '3%',
+            right: '3%',
+            bottom: '1%',
+            top: '15%',
+            containLabel: true
+          },
+          /* 标识 */
+          legend: {
+            data: [this.$t('证书')],
+          },
+          toolbox: {
+            show: true,
+            feature: {
+              mark: {show: true},
+              magicType: {
+                show: true,
+                type: ['pie', 'funnel']
+              },
+              restore: {show: true},
+              saveAsImage: {show: true}
+            }
+          },
+          /* 坐标轴显示 */
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {            // 坐标轴指示器，坐标轴触发有效
+              /*type: 'shadow'        // 默认为直线，可选为：'line' | 'shadow'*/
+              type: 'cross',
+              label: {
+                backgroundColor: '#a0a0a0'
+              }
+            }
+          },
+          xAxis: {
+            data: []
+          },
+          yAxis: {
+            name: this.$t('人数'),
+          },
+          series: [{
+            name: this.$t('证书'),
+            type: 'bar',
+            barWidth: '40%',
+            data: []
+          }]
+        },
+
+        // 查询参数
+        queryParams: {
+          item: 1,
+        },
+        chart: null,
+        chartData : []
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        licensebyxData(this.queryParams).then(response => {
+          this.chartData = response
+          for(let i = 0 ; i <this.chartData.length ; i++){
+            if(this.chartData[i].dataName!= null && this.chartData[i].dataName!= ''){
+              this.option.xAxis.data.push(this.chartData[i].dataName)
+              this.option.series[0].data.push(this.chartData[i].dataNum)
+            }
+          }
+          this.initChart()
+        });
+      })
+    },
+    methods: {
+      /** 获取当前年份 */
+      getNowTime() {
+        var now = new Date();
+      },
+      initChart() {
+        // 基于准备好的dom，初始化echarts实例
+        this.chart = this.echarts.init(document.getElementById('licenseData'))
+        this.chart.setOption(this.option)
+      }
+    }
+  }
+</script>