cq před 3 roky
rodič
revize
933913da93

+ 3 - 3
ui/src/views/training/training/index.vue

@@ -978,7 +978,7 @@ export default {
         this.designatedPositionOptions = response.data;
       });
       this.form.trainingType = this.queryParams.trainingType
-      this.title = this.$t('新增') + " " + this.$t('培训计划');
+      this.title = this.$t('新增') + this.$t('空格') + this.$t('培训计划');
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -1068,7 +1068,7 @@ export default {
           this.form.trainer = [];
         }
         this.open = true;
-        this.title = this.$t('修改') + " " + this.$t('培训计划');
+        this.title = this.$t('修改')  + this.$t('培训计划');
       });
     },
     /** 提交按钮 */
@@ -1330,7 +1330,7 @@ export default {
       })
     },
     handleExceed(files, fileList) {
-      this.$message.warning(this.$t(`当前限制选择 5 个文件`));
+      this.$message.warning(this.$t('当前限制选择 5 个文件'));
     },
     handleRemove(file, fileList) {
       this.form.picUrl = fileList.map((obj)=>{return obj.response.msg}).join(",");

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

@@ -326,7 +326,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('空格') + this.$t('未参加人员');
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -335,7 +335,7 @@ export default {
       getTrainingNon(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = this.$t('修改') + this.$t('培训计划') + this.$t('未参加人员');
+        this.title = this.$t('修改') + this.$t('培训计划')+this.$t('空格') + this.$t('未参加人员');
       });
     },
     /** 提交按钮 */

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

@@ -385,7 +385,7 @@
             {{scope.row[0]}}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('公司级') + $t('培训课程') + $t('名称')" align="center" width="350" fixed>
+        <el-table-column :label="$t('公司级') + $t('空格') +$t('培训课程') + $t('空格') + $t('名称')" align="center" width="350" fixed>
           <template slot-scope="scope">
             {{scope.row[1]}}
           </template>
@@ -407,7 +407,7 @@
                           v-model="deviceParams.year"
                           type="year"
                           value-format="yyyy"
-                          :placeholder="$t('请选择年份')">
+                          :placeholder="$t('请选择')+$t('年份')">
           </el-date-picker>
         </el-form-item>
         <el-form-item :label="$t('培训类型')" prop="trainingType">
@@ -441,7 +441,7 @@
             {{scope.row[0]}}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('装置级') + $t('培训课程') + $t('名称')" align="center" width="350" fixed>
+        <el-table-column :label="$t('装置级') +$t('空格') + $t('培训课程')+$t('空格') + $t('名称')" align="center" width="350" fixed>
           <template slot-scope="scope">
             {{scope.row[1]}}
           </template>
@@ -467,7 +467,7 @@
     <el-dialog v-dialogDrag :title="worklicenseTitle" :visible.sync="worklicenseOpen" width="800px" append-to-body>
       <el-table v-loading="loading" :data="worklicenseList" border>
         <el-table-column :label="$t('上岗证类型')" align="center" prop="worklicenseType" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('上岗证证件号')" align="center" prop="worklicenseIdnum" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('上岗证')+$t('空格')+$t('证件号')" align="center" prop="worklicenseIdnum" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('操作')" align="center" width="120" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
@@ -484,7 +484,7 @@
     <el-dialog v-dialogDrag :title="companyTitle" :visible.sync="companyOpen" width="1500px" append-to-body>
       <el-table v-loading="loading" :data="participantsList" border>
         <el-table-column :label="$t('课程代码')" align="center" prop="courseCode" width="150" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('公司级') + $t('培训课程') + $t('名称')" align="center" prop="companyItem" width="400" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('公司级') + $t('空格') + $t('培训课程') + $t('空格') + $t('名称')" align="center" prop="companyItem" width="400" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('开始日期')" align="center" prop="startDate" width="250">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
@@ -1189,7 +1189,7 @@ export default {
     /** 公司级培训矩阵按钮操作 */
     handleCompany() {
       this.companyTrainingLoad =true
-      this.companyTrainingTitle = this.$t('参加')+this.$t('公司级')+this.$t('培训人员') +this.$t('名单')
+      this.companyTrainingTitle = this.$t('参加')+this.$t('空格')+this.$t('公司级')+this.$t('空格')+this.$t('培训人员')+this.$t('空格') +this.$t('名单')
       this.companyTrainingOpen = true
       // loading.close();
       this.tableShow = true
@@ -1201,7 +1201,7 @@ export default {
     handleDevice() {
       this.deviceTrainingLoad =true
       this.resetForm("queryRegularForm");
-      this.deviceTrainingTitle =this.$t('参加') + this.$t('装置级') + this.$t('培训人员') + this.$t('名单')
+      this.deviceTrainingTitle =this.$t('参加') +this.$t('空格') + this.$t('装置级') +this.$t('空格') + this.$t('培训人员') +this.$t('空格') + this.$t('名单')
       this.deviceTrainingOpen = true
       this.tableShow = true
       this.deviceParams.year = this.getNowTime();
@@ -1218,7 +1218,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = this.$t('新增') + " " + this.$t('培训成绩');
+      this.title = this.$t('新增') + this.$t('空格') + this.$t('培训成绩');
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -1232,7 +1232,7 @@ export default {
         if (response.data.coldarea == 10) { this.form.coldarea = true }
         if (response.data.aeupgu == 10) { this.form.aeupgu = true }
         this.open = true;
-        this.title = this.$t('修改') + " " + this.$t('培训成绩');
+        this.title = this.$t('修改')  + this.$t('培训成绩');
       });
     },
     /** 提交按钮 */
@@ -1345,13 +1345,13 @@ export default {
       this.doc.id = row.id;
       var titleType = '';
       if (fileType === 'trainingrecords-onbord') {
-        titleType = row.name + this.$t('的')+this.$t('入职')+this.$t('培训')
+        titleType = row.name + this.$t('空格') + this.$t('的')+this.$t('入职')+ this.$t('空格') + this.$t('培训')
       }else if (fileType === 'trainingrecords-tds') {
-        titleType = row.name + this.$t('的')+this.$t('TDS培训')
+        titleType = row.name + this.$t('空格') + this.$t('的')+this.$t('TDS培训')
       }else if (fileType === 'trainingrecords-craft') {
-        titleType = row.name + this.$t('的')+this.$t('工艺培训')
+        titleType = row.name + this.$t('空格') + this.$t('的')+this.$t('工艺培训')
       }else {
-        titleType =this.$t('上岗证')+this.$t('培训')
+        titleType =this.$t('上岗证') + this.$t('空格') + this.$t('培训')
       }
       this.doc.title = titleType;
       this.doc.open = true;
@@ -1437,7 +1437,7 @@ export default {
     /** 打开公司级培训列表 */
     openCompany(row) {
       this.companyOpen = true;
-      this.companyTitle = row.name + this.$t('的')+this.$t('公司级')+this.$t('培训信息');
+      this.companyTitle = row.name+ this.$t('空格') + this.$t('的')+this.$t('公司级') + this.$t('空格') +this.$t('培训信息');
       this.$nextTick(() => {
         this.getParticipants(row.employeeid)
       })
@@ -1446,7 +1446,7 @@ export default {
     openDevice(row) {
       this.deviceOpen = true;
       this.resetForm("queryRegularForm");
-      this.deviceTitle = row.name + this.$t('的')+this.$t('装置级')+this.$t('培训信息');
+      this.deviceTitle = row.name + this.$t('空格') + this.$t('的')+this.$t('装置级') + this.$t('空格') +this.$t('培训信息');
       this.employeeid = row.employeeid;
       this.queryDeviceParams.year = this.getNowTime();
       this.$nextTick(() => {