shi'sen'yuan 3 tahun lalu
induk
melakukan
bdf593afbf

+ 4 - 0
master/src/main/java/com/ruoyi/project/ehs/domain/TEnvironapproval.java

@@ -36,6 +36,7 @@ public class TEnvironapproval extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     @Excel(name = "批准日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date effetivedate;
+    private String effetiveYear;
 
     /** 适用范围 */
     @Excel(name = "适用范围")
@@ -189,6 +190,9 @@ public class TEnvironapproval extends BaseEntity
     {
         return effetivedate;
     }
+    public String getEffetiveYear() { return effetiveYear; }
+
+    public void setEffetiveYear(String effetiveYear) { this.effetiveYear = effetiveYear; }
     public  void setIsPermanent(Long isPermanent) { this.isPermanent = isPermanent; }
 
     public Long getIsPermanent() { return isPermanent; }

+ 4 - 0
master/src/main/java/com/ruoyi/project/ehs/domain/TFireapproval.java

@@ -39,6 +39,7 @@ public class TFireapproval extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     @Excel(name = "批准日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date effetivedate;
+    private String effetiveYear;
 
     /** 适用范围 */
     @Excel(name = "适用范围")
@@ -191,6 +192,9 @@ public class TFireapproval extends BaseEntity
     {
         return effetivedate;
     }
+    public String getEffetiveYear() { return effetiveYear; }
+
+    public void setEffetiveYear(String effetiveYear) { this.effetiveYear = effetiveYear; }
     public void setValidityBefore(Date validityBefore)
     {
         this.validityBefore = validityBefore;

+ 4 - 0
master/src/main/java/com/ruoyi/project/ehs/domain/THealthapproval.java

@@ -32,6 +32,7 @@ public class THealthapproval extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     @Excel(name = "批准日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date effetivedate;
+    private String effetiveYear;
 
     /** 适用范围 */
     @Excel(name = "适用范围")
@@ -161,6 +162,9 @@ public class THealthapproval extends BaseEntity
     {
         return effetivedate;
     }
+    public String getEffetiveYear() { return effetiveYear; }
+
+    public void setEffetiveYear(String effetiveYear) { this.effetiveYear = effetiveYear; }
     public void setValidityBefore(Date validityBefore)
     {
         this.validityBefore = validityBefore;

+ 6 - 1
master/src/main/java/com/ruoyi/project/ehs/domain/TMsds.java

@@ -62,6 +62,7 @@ public class TMsds extends BaseEntity {
      */
     @Excel(name = "是否三致物", dictType = "CMR")
     private String cmr;
+    private String cmrs;
 
     /**
      * GHS符号
@@ -313,6 +314,10 @@ public class TMsds extends BaseEntity {
         return cmr;
     }
 
+    public String getCmrs() { return cmrs; }
+
+    public void setCmrs(String cmrs) { this.cmrs = cmrs; }
+
     public void setGhsPictogram(String ghsPictogram) {
         this.ghsPictogram = ghsPictogram;
     }
@@ -550,7 +555,7 @@ public class TMsds extends BaseEntity {
                 .append("delFlag", getDelFlag())
                 .append("hazardPhrases", getHazardPhrases())
                 .append("remarks", getRemarks())
-                .append("cmr", getCmr())
+                .append("cmrs", getCmrs())
                 .append("ghsPictogram", getGhsPictogram())
                 .append("createrCode", getCreaterCode())
                 .append("holdup", getHoldup())

+ 4 - 0
master/src/main/java/com/ruoyi/project/ehs/domain/TSafetyapproval.java

@@ -36,6 +36,7 @@ public class TSafetyapproval extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     @Excel(name = "批准日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date effetivedate;
+    private String effetiveYear;
 
     /** 适用范围 */
     @Excel(name = "适用范围")
@@ -183,6 +184,9 @@ public class TSafetyapproval extends BaseEntity
     {
         return effetivedate;
     }
+    public String getEffetiveYear() { return effetiveYear; }
+
+    public void setEffetiveYear(String effetiveYear) { this.effetiveYear = effetiveYear; }
     public void setValidityBefore(Date validityBefore)
     {
         this.validityBefore = validityBefore;

+ 1 - 0
master/src/main/java/com/ruoyi/project/plant/controller/TStaffmgrController.java

@@ -88,6 +88,7 @@ public class TStaffmgrController extends BaseController
     {
         ServletUtils.getParameter("sexs");
         startPage();
+        logger.info("staffmgr:" + tStaffmgr);
         List<TStaffmgr> list = tStaffmgrService.selectTStaffmgrList(tStaffmgr);
         return getDataTable(list);
     }

+ 1 - 8
master/src/main/resources/mybatis/ehs/TEnvironapprovalMapper.xml

@@ -55,14 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="approvalname != null  and approvalname != ''"> and approvalname like concat(concat('%', #{approvalname}), '%')</if>
             <if test="certno != null  and certno != ''"> and certno like concat(concat('%', #{certno}), '%')</if>
-            <if test="effetivedate != null "> and effetivedate = #{effetivedate}</if>
-            <if test="validity != null "> and validity = #{validity}</if>
-            <if test="relatedlaw != null  and relatedlaw != ''"> and relatedlaw like concat(concat('%', #{relatedlaw}), '%')</if>
-            <if test="responsauth != null  and responsauth != ''"> and responsauth like concat(concat('%', #{responsauth}), '%')</if>
-            <if test="owner != null  and owner != ''"> and owner like concat(concat('%', #{owner}), '%')</if>
-            <if test="reviewdate != null "> and reviewdate = #{reviewdate}</if>
-            <if test="nextreviewdate != null "> and nextreviewdate = #{nextreviewdate}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks like concat(concat('%', #{remarks}), '%')</if>
+            <if test="effetiveYear != null ">  and to_char(effetivedate,'yyyy') = #{effetiveYear}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 2 - 11
master/src/main/resources/mybatis/ehs/TFireapprovalMapper.xml

@@ -46,19 +46,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTFireapprovalList" parameterType="TFireapproval" resultMap="TFireapprovalResult">
         <include refid="selectTFireapprovalVo"/>
-        <where>  
-            <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
-            <if test="division != null  and division != ''"> and division like concat(concat('%', #{division}), '%')</if>
+        <where>
             <if test="approvalname != null  and approvalname != ''"> and approvalname like concat(concat('%', #{approvalname}), '%')</if>
             <if test="fileno != null  and fileno != ''"> and fileno like concat(concat('%', #{fileno}), '%')</if>
-            <if test="effetivedate != null "> and effetivedate = #{effetivedate}</if>
-            <if test="validity != null  and validity != ''"> and validity like concat(concat('%', #{validity}), '%')</if>
-            <if test="relatedlaw != null  and relatedlaw != ''"> and relatedlaw like concat(concat('%', #{relatedlaw}), '%')</if>
-            <if test="responsauth != null  and responsauth != ''"> and responsauth like concat(concat('%', #{responsauth}), '%')</if>
-            <if test="owner != null  and owner != ''"> and owner like concat(concat('%', #{owner}), '%')</if>
-            <if test="reviewdate != null "> and reviewdate = #{reviewdate}</if>
-            <if test="nextreviewdate != null "> and nextreviewdate = #{nextreviewdate}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks like concat(concat('%', #{remarks}), '%')</if>
+            <if test="effetiveYear != null ">  and to_char(effetivedate,'yyyy') = #{effetiveYear}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 2 - 2
master/src/main/resources/mybatis/ehs/THealthapprovalMapper.xml

@@ -46,8 +46,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTHealthapprovalVo"/>
         <where>  
             <if test="approvalname != null  and approvalname != ''"> and approvalname like concat(concat('%', #{approvalname}), '%')</if>
-            <if test="certno != null  and certno != ''"> and certno = #{certno}</if>
-            <if test="effetivedate != null "> and effetivedate = #{effetivedate}</if>
+            <if test="certno != null  and certno != ''"> and certno like concat(concat('%', #{certno}), '%')</if>
+            <if test="effetiveYear != null ">  and to_char(effetivedate,'yyyy') = #{effetiveYear}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 10 - 1
master/src/main/resources/mybatis/ehs/TMsdsMapper.xml

@@ -52,7 +52,16 @@
         <include refid="selectTMsdsVo"/>
         <where>
             <if test="cnName != null and cnName != ''"> and cn_name like concat(concat('%', #{cnName}), '%')</if>
-            <if test="cmr != null  and cmr != ''"> and cmr like concat(concat('%', #{cmr}), '%')</if>
+            <!--<if test="cmr != null  and cmr != ''"> and cmr like concat(concat('%', #{cmr}), '%')</if>-->
+            <if test="cmrs != null  and cmrs != ''">
+                and
+                cmr like concat(concat('%',
+                    <foreach collection="cmrs.split(',')" item="item" index="index"
+                             open="" close="" separator=",'%',">
+                        #{item}
+                    </foreach>
+                ), '%')
+            </if>
             <if test="issueTime != null "> and issue_time = #{issueTime}</if>
             <if test="productcategory != null and productcategory != ''"> and productcategory = #{productcategory}</if>
             <if test="issueTimeYear != null "> and to_char(d.issue_time,'yyyy') = #{issueTimeYear}</if>

+ 2 - 10
master/src/main/resources/mybatis/ehs/TSafetyapprovalMapper.xml

@@ -46,18 +46,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTSafetyapprovalList" parameterType="TSafetyapproval" resultMap="TSafetyapprovalResult">
         <include refid="selectTSafetyapprovalVo"/>
-        <where>  
-            <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
+        <where>
             <if test="approvalname != null  and approvalname != ''"> and approvalname like concat(concat('%', #{approvalname}), '%')</if>
             <if test="certno != null  and certno != ''"> and certno like concat(concat('%', #{certno}), '%')</if>
-            <if test="effetivedate != null "> and effetivedate = #{effetivedate}</if>
-            <if test="validity != null "> and validity = #{validity}</if>
-            <if test="relatedlaw != null  and relatedlaw != ''"> and relatedlaw like concat(concat('%', #{relatedlaw}), '%')</if>
-            <if test="responsauth != null  and responsauth != ''"> and responsauth like concat(concat('%', #{responsauth}), '%')</if>
-            <if test="owner != null  and owner != ''"> and owner like concat(concat('%', #{owner}), '%')</if>
-            <if test="reviewdate != null "> and reviewdate = #{reviewdate}</if>
-            <if test="nextreviewdate != null "> and nextreviewdate = #{nextreviewdate}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks like concat(concat('%', #{remarks}), '%')</if>
+            <if test="effetiveYear != null ">  and to_char(effetivedate,'yyyy') = #{effetiveYear}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 3 - 0
ui/src/lang/en.js

@@ -563,6 +563,8 @@ export default {
   取复证日期: 'Recertificate Date',
   培训课程: 'Course',
   是否完成: 'Is Finish',
+  每: 'Once every ',
+  年一次: ' years',
   未参培人员名单: 'Non-participants',
   新员工补培: 'New employee',
   参会人员名单: 'Participants',
@@ -1458,6 +1460,7 @@ export default {
   离职名单:'Resignation List',
   离职成功:'Successful Resignation',
   行动项:'Action Item',
+  偏差说明: 'Deviation Information',
   计划完成时间:'Estimate Endtime',
   生成经理目标协议:'Generate manager target agreement',
   判定标准:'Judgement Standard',

+ 3 - 0
ui/src/lang/zh.js

@@ -563,6 +563,8 @@ export default {
   取复证日期: '取复证日期',
   培训课程: '培训课程',
   是否完成: '是否完成',
+  每: '每',
+  年一次: '年一次',
   未参培人员名单: '未参培人员名单',
   新员工补培: '新员工补培',
   参会人员名单: '参培人员名单',
@@ -1458,6 +1460,7 @@ export default {
   离职名单:'离职名单',
   离职成功:'离职成功',
   行动项:'行动项',
+  偏差说明: '偏差说明',
   计划完成时间:'计划完成时间',
   生成经理目标协议:'生成经理目标协议',
   判定标准:'判定标准',

+ 18 - 8
ui/src/views/ehs/environapproval/index.vue

@@ -10,6 +10,23 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item :label="$t('证书编号')" prop="certno">
+        <el-input
+          v-model="queryParams.certno"
+          :placeholder="$t('请输入') + $t('证书编号')"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="$t('批准日期')" prop="effetiveYear">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.effetiveYear"
+                        type="year"
+                        value-format="yyyy"
+                        :placeholder="$t('请选择') + $t('批准日期') + $t('年份')">
+        </el-date-picker>
+      </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>
@@ -687,14 +704,7 @@ export default {
         pageSize: 20,
         approvalname: null,
         certno: null,
-        effetivedate: null,
-        validity: null,
-        relatedlaw: null,
-        responsauth: null,
-        owner: null,
-        reviewdate: null,
-        nextreviewdate: null,
-        remarks: null
+        effetiveYear: null
       },
       //人员表查询参数
       staffmgrQueryParams: {},

+ 18 - 9
ui/src/views/ehs/fireapproval/index.vue

@@ -10,6 +10,23 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item :label="$t('证书编号')" prop="fileno">
+        <el-input
+          v-model="queryParams.fileno"
+          :placeholder="$t('请输入') + $t('证书编号')"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="$t('批准日期')" prop="effetiveYear">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.effetiveYear"
+                        type="year"
+                        value-format="yyyy"
+                        :placeholder="$t('请选择') + $t('批准日期') + $t('年份')">
+        </el-date-picker>
+      </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>
@@ -560,17 +577,9 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 20,
-        plantCode: null,
         approvalname: null,
         fileno: null,
-        effetivedate: null,
-        validity: null,
-        relatedlaw: null,
-        responsauth: null,
-        owner: null,
-        reviewdate: null,
-        nextreviewdate: null,
-        remarks: null
+        effetiveYear: null
       },
       //人员表查询参数
       staffmgrQueryParams: {},

+ 6 - 6
ui/src/views/ehs/healthapproval/index.vue

@@ -19,12 +19,12 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('批准日期')" prop="effetivedate">
+      <el-form-item :label="$t('批准日期')" prop="effetiveYear">
         <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.effetivedate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          :placeholder="$t('请选择') + $t('批准日期')">
+          v-model="queryParams.effetiveYear"
+          type="year"
+          value-format="yyyy"
+          :placeholder="$t('请选择') + $t('批准日期') + $t('年份')">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -553,7 +553,7 @@ export default {
         pageSize: 20,
         approvalname: null,
         certno: null,
-        effetivedate: null,
+        effetiveYear: null,
       },
       // 表单参数
       form: {},

+ 2 - 12
ui/src/views/ehs/msds/index.vue

@@ -35,7 +35,7 @@
                         v-model="queryParams.issueTimeYear"
                         type="year"
                         value-format="yyyy"
-                        :placeholder="$t('请选择') + $t('年份')"
+                        :placeholder="$t('请选择') + $t('出版日期') + $t('年份')"
                         @keyup.enter.native="handleQuery">
         </el-date-picker>
       </el-form-item>
@@ -807,17 +807,7 @@
       getList() {
         let _this=this;
         this.loading = true;
-        var cmrId = null;
-        if (this.cmrs !== null) {
-          this.cmrs.forEach(function (value, key, arr) {
-            if (key != 0) {
-              cmrId = cmrId + "," + value;
-            }else if (key == 0) {
-              cmrId = value;
-            }
-          })
-          this.queryParams.cmr = cmrId;
-        }
+        this.queryParams.cmrs = this.cmrs.join()
         listMsds(this.queryParams).then(response => {
           this.msdsList = response.rows;
           this.msdsList.forEach(function (value,key,arr) {

+ 18 - 14
ui/src/views/ehs/safetyapproval/index.vue

@@ -10,6 +10,23 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item :label="$t('证书编号')" prop="certno">
+        <el-input
+          v-model="queryParams.certno"
+          :placeholder="$t('请输入') + $t('证书编号')"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="$t('批准日期')" prop="effetiveYear">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.effetiveYear"
+                        type="year"
+                        value-format="yyyy"
+                        :placeholder="$t('请选择') + $t('批准日期') + $t('年份')">
+        </el-date-picker>
+      </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>
@@ -562,22 +579,9 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 20,
-        plantCode: null,
         approvalname: null,
         certno: null,
-        effetivedate: null,
-        validity: null,
-        relatedlaw: null,
-        responsauth: null,
-        owner: null,
-        reviewdate: null,
-        nextreviewdate: null,
-        remarks: null,
-        scope: null,
-        follow: null,
-        allowance: null,
-        requirements: null,
-        reviewer: null
+        effetiveYear: null
       },
       //人员表查询参数
       staffmgrQueryParams: {},

+ 1 - 1
ui/src/views/plant/staffmgr/index.vue

@@ -11,7 +11,7 @@
         />
       </el-form-item>
       <el-form-item :label="$t('性别')" prop="sexs">
-        <el-select v-model="queryParams.sexs" :placeholder="$t('请选择') + $t('性别')" clearable size="small" multiple>
+        <el-select v-model="queryParams.sex" :placeholder="$t('请选择') + $t('性别')" size="small">
           <el-option
             v-for="dict in sexOptions"
             :key="dict.dictValue"

+ 8 - 8
ui/src/views/plant/targetreview/index.vue

@@ -132,15 +132,15 @@
           </el-dropdown>
         </template>
       </el-table-column>
-      <el-table-column label="偏差说明" align="center" prop="deviationInfo" :show-overflow-tooltip="true"/>
-      <el-table-column label="行动项" align="center" prop="actionItem" width="400" :show-overflow-tooltip="true"/>
-      <el-table-column label="负责人" align="center" prop="principalName" width="100" :show-overflow-tooltip="true"/>
-      <el-table-column label="计划完成时间" align="center" prop="expectedDate" width="100">
+      <el-table-column :label="$t('偏差说明')" align="center" prop="deviationInfo" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('行动项')" align="center" prop="actionItem" width="400" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('负责人')" align="center" prop="principalName" width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('计划完成时间')" align="center" prop="expectedDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.expectedDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="完成时间" align="center" prop="completionDate" width="100">
+      <el-table-column :label="$t('完成时间')" align="center" prop="completionDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.completionDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -208,8 +208,8 @@
         <el-form-item :label="$t('四季度')" prop="annual">
           <el-input v-model="form.annual" :placeholder="$t('请输入') + $t('四季度')" />
         </el-form-item>
-        <el-form-item label="偏差说明" prop="deviationInfo">
-          <el-input v-model="form.deviationInfo" placeholder="请输入偏差说明" />
+        <el-form-item :label="$t('偏差说明')" prop="deviationInfo">
+          <el-input v-model="form.deviationInfo" :placeholder="$t('请输入') + $t('偏差说明')" />
         </el-form-item>
         <el-form-item :label="$t('备注')" prop="remarks">
           <el-input v-model="form.remarks" :placeholder="$t('请输入') + $t('备注')" />
@@ -333,7 +333,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="cyan" icon="el-icon-download" size="mini" @click="downloadOperate">下载</el-button>
+          <el-button type="cyan" icon="el-icon-download" size="mini" @click="downloadOperate">{{ $t('下载') }}</el-button>
         </el-form-item>
       </el-form>
       <form ref="downloadForm" :action="downloadAction" target="FORMSUBMIT">

+ 2 - 2
ui/src/views/training/companylevel/index.vue

@@ -176,9 +176,9 @@
           </el-col>
           <el-col :span="16">
             <el-form-item :label="$t('频率')" prop="frequency" v-if="needFrequency === true">
-              每
+              {{ $t('') }}
               <el-input-number v-model="form.frequency" controls-position="right" :min="1" :max="10" size="mini"></el-input-number>
-              年一次
+              {{ $t('年一次') }}
             </el-form-item>
           </el-col>
         </el-row>

+ 1 - 1
ui/src/views/training/trainingrecords/index.vue

@@ -425,7 +425,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleDeviceQuery" style="margin-left: 20px;">搜索</el-button>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleDeviceQuery" style="margin-left: 20px;">{{ $t('搜索') }}</el-button>
         <el-row style="text-align: right">
           <svg-icon icon-class="rectangleGreen" class="rectangleGreen"></svg-icon>
           <span>{{ $t('需参加培训,已经完成培训人员') }}</span>

+ 2 - 2
ui/src/views/training/worklicense/index.vue

@@ -691,7 +691,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = this.$t('新增') + this.$t('空格') + this.$t('上岗证一览');
+      this.title = this.$t('新增') + this.$t('空格') + this.$t('上岗证一览');
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -708,7 +708,7 @@ export default {
         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('上岗证一览');
+        this.title = this.$t('修改')  + this.$t('上岗证一览');
       });
     },
     /** 提交按钮 */