LY 合成器修改

master/src/main/java/com/ruoyi/project/common/controller/ByxHomeDataController.java

@@ -60,6 +60,7 @@ public class ByxHomeDataController extends BaseController {
     @GetMapping("/procedureCount")
     public AjaxResult procedureCount() {
         TPlantproglist tPlantproglist = new TPlantproglist();
+        tPlantproglist.setDeptId(10010l);
         HashMap<String, Object> result = new HashMap<>();
         tPlantproglist.setItem(2L);
         List<TPlantproglist> list = tPlantproglistService.selectTPlantproglistList(tPlantproglist);
@@ -96,6 +97,7 @@ public class ByxHomeDataController extends BaseController {
     @GetMapping("/trainCount")
     public AjaxResult getTrainCount() {
         TTraining tTraining = new TTraining();
+        tTraining.setDeptId(10010l);
         Calendar cal = Calendar.getInstance();
         tTraining.setYear(String.valueOf(cal.get(Calendar.YEAR)));
         return AjaxResult.success(tTrainingService.countTTraining(tTraining));
@@ -105,6 +107,7 @@ public class ByxHomeDataController extends BaseController {
     public AjaxResult getLine() {
 
         TPlantproglist tPlantproglist = new TPlantproglist();
+        tPlantproglist.setDeptId(10010l);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM");
         Calendar cal = Calendar.getInstance();
         Map<String, List<TPlantproglist>> result = new HashMap<>();

master/src/main/java/com/ruoyi/project/common/controller/CBPSHomeDataController.java

@@ -14,6 +14,7 @@ import com.ruoyi.project.ehs.service.ITHealthapprovalService;
 import com.ruoyi.project.ehs.service.ITSafetyapprovalService;
 import com.ruoyi.project.training.domain.TTraining;
 import com.ruoyi.project.training.mapper.TWorkcertificateCbpsMapper;
+import com.ruoyi.project.training.newstaff.domain.TTnNew;
 import com.ruoyi.project.training.service.ITTrainingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -159,18 +160,36 @@ public class CBPSHomeDataController extends BaseController {
         return AjaxResult.success(result);
     }
 
+//    @GetMapping("/trainCount")
+//    public AjaxResult getTrainCount() {
+//        TTraining tTraining = new TTraining();
+//        tTraining.setDeptId(10012l);
+//        Calendar cal = Calendar.getInstance();
+//        tTraining.setYear(String.valueOf(cal.get(Calendar.YEAR)));
+//        return AjaxResult.success(tTrainingService.countTTraining(tTraining));
+//    }
+
     @GetMapping("/trainCount")
     public AjaxResult getTrainCount() {
         TTraining tTraining = new TTraining();
-        Calendar cal = Calendar.getInstance();
-        tTraining.setYear(String.valueOf(cal.get(Calendar.YEAR)));
-        return AjaxResult.success(tTrainingService.countTTraining(tTraining));
+        tTraining.setDeptId(10012l);
+        tTraining.setIsfinish(1l);
+        List<TTraining> list1 = tTrainingService.selectTTrainingList(tTraining);
+        tTraining.setIsfinish(0l);
+        List<TTraining> list0 = tTrainingService.selectTTrainingList(tTraining);
+        HashMap<String, Object> result = new HashMap<>();
+        result.put("count1", list1.size());
+        result.put("count1Name", "已完成");
+        result.put("count0", list0.size());
+        result.put("count0Name", "未完成");
+        return AjaxResult.success(result);
     }
 
     @GetMapping("/getLine")
     public AjaxResult getLine() {
 
         TPlantproglist tPlantproglist = new TPlantproglist();
+        tPlantproglist.setDeptId(10012l);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM");
         Calendar cal = Calendar.getInstance();
         Map<String, List<TPlantproglist>> result = new HashMap<>();

master/src/main/java/com/ruoyi/project/plant/controller/TStaffmgrController.java

@@ -11,6 +11,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.config.RuoYiConfig;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.BaseEntity;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.common.domain.DataEntity;
 import com.ruoyi.project.plant.domain.TStaffmgr;
@@ -360,10 +361,8 @@ public class TStaffmgrController extends BaseController
 
     //学历统计
     @GetMapping("/eduData")
-    public List<DataEntity> eduData(Map param)
+    public List<DataEntity> eduData(BaseEntity param)
     {
-        param.put("params" , new HashMap<>());
-        Map<String,Object> data = new HashMap();
         List<DataEntity> list = tStaffmgrMapper.selectEduData(param);
         List<SysDictData> education = iSysDictTypeService.selectDictDataByType("EDUCATION");
         for (DataEntity d: list
@@ -385,9 +384,8 @@ public class TStaffmgrController extends BaseController
 
     //英语统计
     @GetMapping("/engData")
-    public List<DataEntity> engData(Map param)
+    public List<DataEntity> engData(BaseEntity param)
     {
-        param.put("params" , new HashMap<>());
         List<DataEntity> list = tStaffmgrMapper.selectEngData(param);
         List<SysDictData> englishability = iSysDictTypeService.selectDictDataByType("ENGLISHABILITY");
         for (DataEntity d: list
@@ -409,9 +407,8 @@ public class TStaffmgrController extends BaseController
 
     //班值统计
     @GetMapping("/teamData")
-    public List<DataEntity> teamData(Map param)
+    public List<DataEntity> teamData(BaseEntity param)
     {
-        param.put("params" , new HashMap<>());
         List<DataEntity> list = tStaffmgrMapper.selectTeamData(param);
         List<SysDictData> englishability = iSysDictTypeService.selectDictDataByType("TEAM_DIVIDE");
         for (DataEntity d: list
@@ -555,7 +552,7 @@ public class TStaffmgrController extends BaseController
         //判断是否重复员工
         TStaffmgr tStaffmgr1 = tStaffmgrMapper.selectTStaffmgrByStaffId(tStaffmgr.getStaffid());
         if (tStaffmgr1 != null) {
-            if (tStaffmgr1.getId()!= tStaffmgr.getId()) {
+            if (!tStaffmgr1.getId().equals(tStaffmgr.getId())) {
                 return AjaxResult.error("员工号已存在");
             }
         }

master/src/main/java/com/ruoyi/project/plant/mapper/TStaffmgrMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.project.plant.mapper;
 
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.framework.web.domain.BaseEntity;
 import com.ruoyi.project.common.domain.DataEntity;
 import com.ruoyi.project.plant.domain.TStaffmgr;
 import com.ruoyi.project.system.domain.SysUser;
@@ -124,11 +125,13 @@ public interface TStaffmgrMapper
     public int deleteTStaffmgrByIds(Long[] ids);
 
     @DataScope(deptAlias = "d")
-    List<DataEntity> selectEduData(Map param);
+    List<DataEntity> selectEduData(BaseEntity param);
 
-    List<DataEntity> selectEngData(Map param);
+    @DataScope(deptAlias = "d")
+    List<DataEntity> selectEngData(BaseEntity param);
 
-    List<DataEntity> selectTeamData(Map param);
+    @DataScope(deptAlias = "d")
+    List<DataEntity> selectTeamData(BaseEntity param);
 
     @DataScope(deptAlias = "d")
     List<TStaffmgr> selectLeftTStaffmgrList(TStaffmgr tStaffmgr);

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevDtController.java

@@ -232,7 +232,7 @@ public class TSpecdevDtController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getLastCellNum();
+                int cellNum = row.getPhysicalNumberOfCells();
                 TSpecdevDt entity = new TSpecdevDt();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

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

@@ -476,7 +476,10 @@ public class TTrainingController extends BaseController {
         TTraining tTraining = tTrainingMapper.selectTTrainingById(trainingId);
         String tempUrl = "";
         if (tTraining.getDeptId() == 103 || tTraining.getDeptId() == 10012) {
-            if (tTraining.getTrainingType().equals("12")) {
+            if (tTraining.getDeptId() == 10012) {
+                tempUrl = "static/word/training/signCBPS.docx"; // 模板文件
+            }
+            else if (tTraining.getTrainingType().equals("12")) {
                 tempUrl = "static/word/training/signMOC.docx"; // 模板文件
             } else {
                 tempUrl = "static/word/training/sign.docx"; // 模板文件

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

@@ -148,7 +148,8 @@ public class TTrainingHisparticipantsController extends BaseController {
                 try {
                     logger.info("读取行数：" + finalI);
                     Row row = sheet.getRow(finalI);
-                    int cellNum = row.getPhysicalNumberOfCells();
+                    int cellNum = row.getLastCellNum();
+                    logger.info("总列数：" + cellNum);
                     TTrainingHisparticipants entity = new TTrainingHisparticipants();
                     for (int j = 0; j < cellNum; j++) {
                         Cell cell = row.getCell(j);
@@ -165,7 +166,7 @@ public class TTrainingHisparticipantsController extends BaseController {
                             if (cellValue.length() > 3) {
                                 entity.setEndDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                             }
-                        } else if (j == 7) {
+                        } else if (j == 7) { //课程编号
                             entity.setCourseCode(cellValue.trim());
                             for (TTrainingCompanylevel t : levelList
                             ) {
@@ -222,7 +223,7 @@ public class TTrainingHisparticipantsController extends BaseController {
         ) {
             failNum.getAndIncrement();
                 executorService.execute(() -> {
-                //续票列表 -- 业务模块
+                // -- 业务模块
                 try {
                     tTrainingHisparticipantsMapper.insertTTrainingHisparticipants(t);
                     successNumber.getAndIncrement();

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

@@ -392,7 +392,10 @@ public class TTrainingRegularController extends BaseController
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         for (Long id : ids) {
-            TTraining training = tTrainingService.selectTTrainingByRegularId(id);
+            TTraining training = tTrainingService.selectTTrainingByRegularId(id); //查询培训跟踪计划
+            if (training == null) {
+                continue;
+            }
             tTrainingService.deleteTTrainingById(training.getId());
             TTrainingRegular regular = tTrainingRegularService.selectTTrainingRegularById(id);
             if (regular.getActualpostId() != null || regular.getDesignatedStaff() != null || regular.getInvolvedMoc().equals("true")) {

master/src/main/resources/application.yml

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /u03/cpmsfile/uploadPath）
-  profile: /u03/cpmsfile/uploadPath
+  profile: D:/ruoyi/uploadPath
   # 邮件中链接跳转路径 示例（本地：http://localhost/#，服务器：http://47.114.101.16:8080/cpms/index.html#）
   requestJumpPath: https://cpms.basf-ypc.net.cn/cpms/index.html#
   # 获取ip地址开关
@@ -182,7 +182,7 @@ jodconverter:
     enabled: true
     # 设置LibreOffice主目录
     #    office-home: /opt/libreoffice7.2  C:/Program Files/LibreOffice
-    office-home: /opt/libreoffice7.2
+    office-home: C:/Program Files/LibreOffice
     max-tasks-per-process: 100
     port-numbers: 8100
     # 开启多个LibreOffice进程，每个端口对应一个进程

master/src/main/resources/mybatis/document/TPlantproglistMapper.xml

@@ -100,7 +100,7 @@
         WHERE
             to_char(NEXTEDITDATE, 'YYYY/MM' ) =  #{startDate}
                 AND DEL_FLAG=0
-                AND DEPT_ID=10010
+                AND DEPT_ID= #{deptId}
         ORDER BY
             data_month
     </select>
@@ -114,7 +114,7 @@
         WHERE
             to_char(NEXTREVIEWDATE, 'YYYY/MM' ) =  #{startDate}
                 AND DEL_FLAG=0
-                AND DEPT_ID=10010
+                AND DEPT_ID= #{deptId}
         ORDER BY
             data_month
     </select>

master/src/main/resources/mybatis/plant/TStaffmgrMapper.xml

@@ -445,13 +445,13 @@
     <select id="selectEduData" resultType="com.ruoyi.project.common.domain.DataEntity">
             SELECT count(1) as dataNum,d.EDUCATION as dataName FROM "T_STAFFMGR" d
         <where>
-            <if test="name != null  and name != ''"> and name like concat(concat('%', #{name}), '%')</if>
-            <if test="sex != null  and sex != ''"> and sex = #{sex}</if>
-            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
-            <if test="team != null  and team != ''"> and team = #{team}</if>
-            <if test="actualpost != null  and actualpost != ''"> and actualpost = #{actualpost}</if>
-            <if test="education != null  and education != ''"> and education = #{education}</if>
-            <if test="enAbility != null  and enAbility != ''"> and en_ability = #{enAbility}</if>
+<!--            <if test="name != null  and name != ''"> and name like concat(concat('%', #{name}), '%')</if>-->
+<!--            <if test="sex != null  and sex != ''"> and sex = #{sex}</if>-->
+<!--            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>-->
+<!--            <if test="team != null  and team != ''"> and team = #{team}</if>-->
+<!--            <if test="actualpost != null  and actualpost != ''"> and actualpost = #{actualpost}</if>-->
+<!--            <if test="education != null  and education != ''"> and education = #{education}</if>-->
+<!--            <if test="enAbility != null  and enAbility != ''"> and en_ability = #{enAbility}</if>-->
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -463,13 +463,13 @@
     <select id="selectEngData" resultType="com.ruoyi.project.common.domain.DataEntity">
         SELECT count(1) as dataNum,d.en_ability as dataName FROM "T_STAFFMGR" d
         <where>
-            <if test="name != null  and name != ''"> and name like concat(concat('%', #{name}), '%')</if>
-            <if test="sex != null  and sex != ''"> and sex = #{sex}</if>
-            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
-            <if test="team != null  and team != ''"> and team = #{team}</if>
-            <if test="actualpost != null  and actualpost != ''"> and actualpost = #{actualpost}</if>
-            <if test="education != null  and education != ''"> and education = #{education}</if>
-            <if test="enAbility != null  and enAbility != ''"> and en_ability = #{enAbility}</if>
+<!--            <if test="name != null  and name != ''"> and name like concat(concat('%', #{name}), '%')</if>-->
+<!--            <if test="sex != null  and sex != ''"> and sex = #{sex}</if>-->
+<!--            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>-->
+<!--            <if test="team != null  and team != ''"> and team = #{team}</if>-->
+<!--            <if test="actualpost != null  and actualpost != ''"> and actualpost = #{actualpost}</if>-->
+<!--            <if test="education != null  and education != ''"> and education = #{education}</if>-->
+<!--            <if test="enAbility != null  and enAbility != ''"> and en_ability = #{enAbility}</if>-->
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -481,13 +481,13 @@
     <select id="selectTeamData" resultType="com.ruoyi.project.common.domain.DataEntity">
         SELECT count(1) as dataNum,d.team as dataName FROM "T_STAFFMGR" d
         <where>
-            <if test="name != null  and name != ''"> and name like concat(concat('%', #{name}), '%')</if>
-            <if test="sex != null  and sex != ''"> and sex = #{sex}</if>
-            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
-            <if test="team != null  and team != ''"> and team = #{team}</if>
-            <if test="actualpost != null  and actualpost != ''"> and actualpost = #{actualpost}</if>
-            <if test="education != null  and education != ''"> and education = #{education}</if>
-            <if test="enAbility != null  and enAbility != ''"> and en_ability = #{enAbility}</if>
+<!--            <if test="name != null  and name != ''"> and name like concat(concat('%', #{name}), '%')</if>-->
+<!--            <if test="sex != null  and sex != ''"> and sex = #{sex}</if>-->
+<!--            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>-->
+<!--            <if test="team != null  and team != ''"> and team = #{team}</if>-->
+<!--            <if test="actualpost != null  and actualpost != ''"> and actualpost = #{actualpost}</if>-->
+<!--            <if test="education != null  and education != ''"> and education = #{education}</if>-->
+<!--            <if test="enAbility != null  and enAbility != ''"> and en_ability = #{enAbility}</if>-->
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

master/src/main/resources/mybatis/training/TTrainingMapper.xml

@@ -114,7 +114,7 @@
                 LEFT JOIN SYS_DICT_DATA b ON a.TRAINING_TYPE = b.DICT_VALUE
         WHERE
             b.DICT_TYPE = 'TRAINING_TYPE'
-          AND a.dept_id = 10010
+          AND a.dept_id = #{deptId}
           AND a.DEL_FLAG = 0
           AND years = #{year}
         GROUP BY

master/src/main/resources/mybatis/training/TWorkcertificateCbpsMapper.xml

@@ -47,10 +47,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectTWorkcertificateCbpsVo">
         select d.id, d.plant_code, d.name, d.employeeid, d.classes, d.container, d.container_date, d.container_lifespan, d.pipe, d.pipe_date, d.pipe_lifespan, d.worker, d.worker_date, d.worker_lifespan, d.foreman, d.foreman_date, d.foreman_lifespan, d.ac, d.ac_date, d.ac_lifespan, d.firefighter, d.firefighter_date, d.firefighter_lifespan, d.safety, d.safety_date, d.safety_lifespan, d.tds, d.tds_date, d.tds_lifespan, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.remarks, d.dept_id ,s.dept_name from t_workcertificate_cbps d
       left join sys_dept s on s.dept_id = d.dept_id
+
     </sql>
 
     <select id="selectTWorkcertificateCbpsList" parameterType="TWorkcertificateCbps" resultMap="TWorkcertificateCbpsResult">
         <include refid="selectTWorkcertificateCbpsVo"/>
+        LEFT JOIN t_staffmgr t on d.employeeid = t.staffid and t.del_flag = 0
+        LEFT JOIN SYS_DICT_DATA sdd on t.ACTUALPOST = sdd.DICT_VALUE and sdd.DICT_TYPE = 'ACTUALPOST'
+        LEFT JOIN SYS_DICT_DATA sdd2 on d.classes = sdd2.DICT_VALUE and sdd2.DICT_TYPE = 'TEAM_DIVIDE'
         <where>
             <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
             <if test="employeeid != null  and employeeid != ''"> and employeeid = #{employeeid}</if>
@@ -88,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by sdd2.DICT_SORT ,sdd.DICT_SORT
     </select>
 
     <select id="selectTWorkcertificateCbpsById" parameterType="Long" resultMap="TWorkcertificateCbpsResult">
@@ -341,14 +346,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectDateWarn" resultType="map">
         SELECT
-        COUNT(CASE WHEN container_date IS NOT NULL AND container_date <![CDATA[ <= ]]> sysdate + 30 THEN 1 END) AS container,
-        COUNT(CASE WHEN pipe_date IS NOT NULL AND pipe_date <![CDATA[ <= ]]> sysdate + 30 THEN 1 END) AS pipe,
-        COUNT(CASE WHEN worker_date IS NOT NULL AND worker_date <![CDATA[ <= ]]> sysdate + 30 THEN 1 END) AS worker,
-        COUNT(CASE WHEN foreman_date IS NOT NULL AND foreman_date <![CDATA[ <= ]]> sysdate + 30 THEN 1 END) AS foreman,
-        COUNT(CASE WHEN ac_date IS NOT NULL AND ac_date <![CDATA[ <= ]]> sysdate + 30 THEN 1 END) AS ac,
-        COUNT(CASE WHEN firefighter_date IS NOT NULL AND firefighter_date <![CDATA[ <= ]]> sysdate + 30 THEN 1 END) AS firefighter,
-        COUNT(CASE WHEN safety_date IS NOT NULL AND safety_date <![CDATA[ <= ]]> sysdate + 30 THEN 1 END) AS safety,
-        COUNT(CASE WHEN tds_date IS NOT NULL AND tds_date <![CDATA[ <= ]]> sysdate + 30 THEN 1 END) AS tds
+        COUNT(CASE WHEN container_LIFESPAN IS NOT NULL AND container_LIFESPAN <![CDATA[ <= ]]> sysdate + 30 THEN 1 END) AS container,
+        COUNT(CASE WHEN pipe_LIFESPAN IS NOT NULL AND pipe_LIFESPAN <![CDATA[ <= ]]> sysdate + 30 THEN 1 END) AS pipe,
+        COUNT(CASE WHEN worker_LIFESPAN IS NOT NULL AND worker_LIFESPAN <![CDATA[ <= ]]> sysdate + 30 THEN 1 END) AS worker,
+        COUNT(CASE WHEN foreman_LIFESPAN IS NOT NULL AND foreman_LIFESPAN <![CDATA[ <= ]]> sysdate + 30 THEN 1 END) AS foreman,
+        COUNT(CASE WHEN ac_LIFESPAN IS NOT NULL AND ac_LIFESPAN <![CDATA[ <= ]]> sysdate + 30 THEN 1 END) AS ac,
+        COUNT(CASE WHEN firefighter_LIFESPAN IS NOT NULL AND firefighter_LIFESPAN <![CDATA[ <= ]]> sysdate + 30 THEN 1 END) AS firefighter,
+        COUNT(CASE WHEN safety_LIFESPAN IS NOT NULL AND safety_LIFESPAN <![CDATA[ <= ]]> sysdate + 30 THEN 1 END) AS safety,
+        COUNT(CASE WHEN tds_LIFESPAN IS NOT NULL AND tds_LIFESPAN <![CDATA[ <= ]]> sysdate + 30 THEN 1 END) AS tds
         FROM
         t_workcertificate_cbps
     </select>

ui/src/views/dashboard/hcq/PieChart.vue

@@ -28,16 +28,17 @@ export default {
     return {
       chart: null,
       trainData:[],
+      dataOut: [],
       trainingType:[]
     }
   },
   mounted() {
     this.$nextTick(() => {
       trainCount().then(res=>{
-        for (const item of res.data) {
-          this.trainData.push({value:item.trainingTypeCount,name:item.trainingType});
-          this.trainingType.push(item.trainingType)
-        }
+        this.dataOut = [
+          {value: res.data.count1, name: res.data.count1Name},
+          {value: res.data.count0, name: res.data.count0Name},
+        ]
         this.initChart()
       })
     })
@@ -88,7 +89,7 @@ export default {
             labelLine: {
               show: true
             },
-            data: [{name: '已完成',value: 1} , {name: '未完成',value: 6}],
+            data: this.dataOut,
           }
         ],
 

ui/src/views/dashboard/hcq/workcertificateChart.vue

@@ -96,7 +96,6 @@ export default {
             axisTick: {
               show: false
             },
-            interval: 1 // 设置纵轴的单位间隔为1
           },
           legend: {
             data: ['总数', '预警数']

ui/src/views/plant/staffmgr/engChart.vue

@@ -49,7 +49,7 @@
               label: {
                 formatter: '{b}: ({d}%)'
               },
-              name: this.$t('学历'),
+              name: this.$t('英语'),
               type: 'pie',
               radius: ['50%', '70%'],
               selectedMode: 'single',

ui/src/views/plant/staffmgr/index.vue

@@ -148,7 +148,7 @@
           icon="el-icon-s-release"
           size="mini"
           @click="handleLeft(0)"
-        >{{ $t('离职名单') }}</el-button>
+        >{{ $t('离岗名单') }}</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -806,7 +806,7 @@
           isRetire: null
         },
         querypIdParams: {
-          units: '10,18,20',
+          units: '10,18,20,30',
         },
         educations: [],
         units: [],

ui/src/views/plant/staffmgr/teamChart.vue

@@ -49,7 +49,7 @@
               label: {
                 formatter: '{b}: ({d}%)'
               },
-              name: this.$t('学历'),
+              name: this.$t('班值'),
               type: 'pie',
               radius: ['50%', '70%'],
               selectedMode: 'single',

ui/src/views/sems/safecheck/dailycheck/index.vue

@@ -129,32 +129,36 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="dailycheckList" @selection-change="handleSelectionChange"
+    <u-table v-loading="loading" :data="dailycheckList"
+              use-virtual
+              showBodyOverflow="title"
+              :row-height="60"
+              @selection-change="handleSelectionChange"
               :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="装置名称" align="center" prop="plantCode" :show-overflow-tooltip="true"/>
-      <el-table-column label="检查日期" align="center" prop="checkDate" width="100">
+      <u-table-column type="selection" width="55" align="center"/>
+      <u-table-column label="装置名称" align="center" prop="plantCode" :show-overflow-tooltip="true"/>
+      <u-table-column label="检查日期" align="center" prop="checkDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.checkDate, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="isConfirm" :show-overflow-tooltip="true" :formatter="isConfirmFormat"/>
+      </u-table-column>
+      <u-table-column label="状态" align="center" prop="isConfirm" :show-overflow-tooltip="true" :formatter="isConfirmFormat"/>
 
-      <el-table-column label="安全员" align="center" prop="checkerName" width="120">
+      <u-table-column label="安全员" align="center" prop="checkerName" width="120">
         <template slot-scope="scope">
           <span v-if="scope.row.agentId">{{ scope.row.checkerName}} 代 {{ scope.row.agentName}}</span>
           <span v-else>{{ scope.row.checkerName}}</span>
         </template>
-      </el-table-column>
-      <el-table-column label="人员" align="center" prop="cPerson" :show-overflow-tooltip="true" :formatter="itemFormat"/>
-      <el-table-column label="设备本体" align="center" prop="cDevice" :show-overflow-tooltip="true" :formatter="itemFormat"/>
-      <el-table-column label="安全附件或安全保护装置" align="center" prop="cSafety" :show-overflow-tooltip="true" :formatter="itemFormat"/>
-      <el-table-column label="政府监督、通报、预警" align="center" prop="cGov" :show-overflow-tooltip="true" :formatter="itemFormat"/>
-      <el-table-column label="投诉举报" align="center" prop="cComplaint" :show-overflow-tooltip="true" :formatter="itemFormat"/>
-      <el-table-column label="舆情信息" align="center" prop="cOpinion" :show-overflow-tooltip="true" :formatter="itemFormat"/>
-      <el-table-column label="其他" align="center" prop="cOther" :show-overflow-tooltip="true" :formatter="itemFormat"/>
-      <el-table-column label="说明" align="center" prop="explain" :show-overflow-tooltip="true" />
-      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+      </u-table-column>
+      <u-table-column label="人员" align="center" prop="cPerson" :show-overflow-tooltip="true" :formatter="itemFormat"/>
+      <u-table-column label="设备本体" align="center" prop="cDevice" :show-overflow-tooltip="true" :formatter="itemFormat"/>
+      <u-table-column label="安全附件或安全保护装置" align="center" prop="cSafety" :show-overflow-tooltip="true" :formatter="itemFormat"/>
+      <u-table-column label="政府监督、通报、预警" align="center" prop="cGov" :show-overflow-tooltip="true" :formatter="itemFormat"/>
+      <u-table-column label="投诉举报" align="center" prop="cComplaint" :show-overflow-tooltip="true" :formatter="itemFormat"/>
+      <u-table-column label="舆情信息" align="center" prop="cOpinion" :show-overflow-tooltip="true" :formatter="itemFormat"/>
+      <u-table-column label="其他" align="center" prop="cOther" :show-overflow-tooltip="true" :formatter="itemFormat"/>
+      <u-table-column label="说明" align="center" prop="explain" :show-overflow-tooltip="true" />
+      <u-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             v-if="scope.row.isConfirm == 0"
@@ -189,8 +193,8 @@
           >附件
           </el-button>
         </template>
-      </el-table-column>
-    </el-table>
+      </u-table-column>
+    </u-table>
 
     <pagination
       v-show="total>0"
@@ -467,7 +471,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 20,
+        pageSize: 500,
         plantCode: null,
         checkDate: null,
         cPerson: null,

ui/src/views/sems/safecheck/personweekcheck/index.vue

@@ -105,26 +105,30 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="personweekcheckList" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="装置名称" align="center" prop="plantCode" :show-overflow-tooltip="true"/>
-      <el-table-column label="周排查日期" align="center" prop="checkDate" width="100">
+    <u-table v-loading="loading" :data="personweekcheckList" @selection-change="handleSelectionChange"
+             use-virtual
+             showBodyOverflow="title"
+             :row-height="60"
+             :height="clientHeight" border>
+      <u-table-column type="selection" width="55" align="center" />
+      <u-table-column label="装置名称" align="center" prop="plantCode" :show-overflow-tooltip="true"/>
+      <u-table-column label="周排查日期" align="center" prop="checkDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.checkDate, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
-      <el-table-column label="安全员" align="center" prop="checkerName" width="120">
+      </u-table-column>
+      <u-table-column label="安全员" align="center" prop="checkerName" width="120">
         <template slot-scope="scope">
           <span v-if="scope.row.agentId">{{ scope.row.checkerName}} 代 {{ scope.row.agentName}}</span>
           <span v-else>{{ scope.row.checkerName}}</span>
         </template>
-      </el-table-column>      <el-table-column label="周" align="center" prop="weekNo" :show-overflow-tooltip="true"/>
-      <el-table-column label="状态" align="center" prop="isConfirm" :show-overflow-tooltip="true" :formatter="isConfirmFormat"/>
-      <el-table-column label="上周安全风险隐患问题整改核实情况" align="center" prop="lastWeekRisk" :show-overflow-tooltip="true"/>
-      <el-table-column label="本周主要安全风险隐患和整改情况" align="center" prop="thisWeekRisk" :show-overflow-tooltip="true"/>
-      <el-table-column label="本周安全管理情况评价" align="center" prop="safeCondition" :show-overflow-tooltip="true"/>
-      <el-table-column label="下周工作重点" align="center" prop="nextWeekWork" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+      </u-table-column>      <u-table-column label="周" align="center" prop="weekNo" :show-overflow-tooltip="true"/>
+      <u-table-column label="状态" align="center" prop="isConfirm" :show-overflow-tooltip="true" :formatter="isConfirmFormat"/>
+      <u-table-column label="上周安全风险隐患问题整改核实情况" align="center" prop="lastWeekRisk" :show-overflow-tooltip="true"/>
+      <u-table-column label="本周主要安全风险隐患和整改情况" align="center" prop="thisWeekRisk" :show-overflow-tooltip="true"/>
+      <u-table-column label="本周安全管理情况评价" align="center" prop="safeCondition" :show-overflow-tooltip="true"/>
+      <u-table-column label="下周工作重点" align="center" prop="nextWeekWork" :show-overflow-tooltip="true"/>
+      <u-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             v-if="scope.row.isConfirm == 0"
@@ -150,9 +154,9 @@
           >附件
           </el-button>
         </template>
-      </el-table-column>
+      </u-table-column>
 
-    </el-table>
+    </u-table>
 
     <pagination
       v-show="total>0"
@@ -306,7 +310,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 20,
+        pageSize: 500,
         plantCode: null,
         checkDate: null,
         weekNo: null,

ui/src/views/sems/safecheck/weekcheck/index.vue

@@ -84,27 +84,31 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="weekcheckList" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="周排查日期" align="center" prop="checkDate" width="100">
+    <u-table v-loading="loading"
+              use-virtual
+              showBodyOverflow="title"
+              :row-height="60"
+              :data="weekcheckList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <u-table-column type="selection" width="55" align="center" />
+      <u-table-column label="周排查日期" align="center" prop="checkDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.checkDate, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
-      <el-table-column label="周" align="center" prop="weekNo" :show-overflow-tooltip="true"/>
-      <el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true"  :formatter="statusFormat"/>
-      <el-table-column label="上周安全风险隐患问题整改核实情况" align="center" prop="lastWeekRisk" :show-overflow-tooltip="true"/>
-      <el-table-column label="本周主要安全风险隐患和整改情况" align="center" prop="thisWeekRisk" :show-overflow-tooltip="true"/>
-      <el-table-column label="本周安全管理情况评价" align="center" prop="safeCondition" :show-overflow-tooltip="true"/>
-      <el-table-column label="下周工作重点" align="center" prop="nextWeekWork" :show-overflow-tooltip="true"/>
-      <el-table-column label="安全管理员姓名" align="center" prop="safeAdminName" :show-overflow-tooltip="true"/>
-      <el-table-column label="安全管理员意见" align="center" prop="safeAdminSug" :show-overflow-tooltip="true"/>
-      <el-table-column label="安全管理员日期" align="center" prop="safeAdminDate" :show-overflow-tooltip="true"/>
-      <el-table-column label="安全总监姓名" align="center" prop="safeDirName" :show-overflow-tooltip="true"/>
-      <el-table-column label="安全总监意见" align="center" prop="safeDirSug" :show-overflow-tooltip="true"/>
-      <el-table-column label="安全总监日期" align="center" prop="safeDirDate" :show-overflow-tooltip="true"/>
+      </u-table-column>
+      <u-table-column label="周" align="center" prop="weekNo" :show-overflow-tooltip="true"/>
+      <u-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true"  :formatter="statusFormat"/>
+      <u-table-column label="上周安全风险隐患问题整改核实情况" align="center" prop="lastWeekRisk" :show-overflow-tooltip="true"/>
+      <u-table-column label="本周主要安全风险隐患和整改情况" align="center" prop="thisWeekRisk" :show-overflow-tooltip="true"/>
+      <u-table-column label="本周安全管理情况评价" align="center" prop="safeCondition" :show-overflow-tooltip="true"/>
+      <u-table-column label="下周工作重点" align="center" prop="nextWeekWork" :show-overflow-tooltip="true"/>
+      <u-table-column label="安全管理员姓名" align="center" prop="safeAdminName" :show-overflow-tooltip="true"/>
+      <u-table-column label="安全管理员意见" align="center" prop="safeAdminSug" :show-overflow-tooltip="true"/>
+      <u-table-column label="安全管理员日期" align="center" prop="safeAdminDate" :show-overflow-tooltip="true"/>
+      <u-table-column label="安全总监姓名" align="center" prop="safeDirName" :show-overflow-tooltip="true"/>
+      <u-table-column label="安全总监意见" align="center" prop="safeDirSug" :show-overflow-tooltip="true"/>
+      <u-table-column label="安全总监日期" align="center" prop="safeDirDate" :show-overflow-tooltip="true"/>
 
-      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+      <u-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             v-if="scope.row.status == 0"
@@ -139,8 +143,8 @@
           >预览
           </el-button>
         </template>
-      </el-table-column>
-    </el-table>
+      </u-table-column>
+    </u-table>
 
     <pagination
       v-show="total>0"
@@ -343,7 +347,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 20,
+        pageSize: 100,
         plantCode: null,
         checkDate: null,
         checkerId: null,

ui/src/views/training/newstaff/tnNew/index.vue

@@ -679,7 +679,7 @@ export default {
       this.doc.id = row.id;
       this.doc.title = this.$t('附件') ;
       this.doc.open = true;
-      this.doc.queryParams.pId = row.id
+      this.doc.queryParams.pId = row.newId
       this.doc.pId = row.newId
       this.getFileList()
       this.$nextTick(() => {