Merge remote-tracking branch 'origin/master'

ui/src/lang/en.js

@@ -1642,7 +1642,7 @@ export default {
   提交成功:'Submitted successfully',
   '导入成功条数:':'Number of successfully imported items:',
   '失败行数:':'Number of failed rows:',
-  '正在导入…':'Importing... ',
+  '正在导入...':'Importing... ',
   删除标识:'Delete logo',
   维修经理:'Maintenance Manager',
   机械维修:'Mechanical maintenance',

ui/src/lang/zh.js

@@ -1642,7 +1642,7 @@ export default {
   提交成功:'提交成功',
   '导入成功条数:':'导入成功条数:',
   '失败行数:':'失败行数:',
-  '正在导入…':'正在导入…',
+  '正在导入...':'正在导入...',
   删除标识:'删除标识',
   维修经理:'维修经理',
   机械维修:'机械维修',

ui/src/views/sems/specCc/bf.vue

@@ -195,7 +195,7 @@
         <el-row>
           <el-col :span="12">
         <el-form-item :label="$t('工作能力')+'(Ton)'" prop="capacity">
-          <el-input v-model="form.capacity" :placeholder="$t('请输入')+ $t('工作能力')+'(t)'" />
+          <el-input v-model="form.capacity" :placeholder="$t('请输入')+ $t('工作能力')+'(Ton)'" />
         </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -508,7 +508,7 @@ export default {
       // 表单校验
       rules: {
         plantCode: [
-          { required: true, message: this.$t('装置名称不能为空'), trigger: "blur" }
+          { required: true, message: this.$t('装置名称')+this.$t('不能为空'), trigger: "blur" }
         ],
       }
     };

ui/src/views/sems/specCc/index.vue

@@ -567,7 +567,7 @@
       // 表单校验
       rules: {
         plantCode: [
-          { required: true, message: this.$t('装置名称不能为空'), trigger: "blur" }
+          { required: true, message: this.$t('装置名称')+this.$t('不能为空'), trigger: "blur" }
         ],
       }
     };

ui/src/views/sems/specCc/ty.vue

@@ -560,7 +560,7 @@ export default {
       // 表单校验
       rules: {
         plantCode: [
-          { required: true, message: this.$t('装置名称不能为空'), trigger: "blur" }
+          { required: true, message: this.$t('装置名称')+this.$t('不能为空'), trigger: "blur" }
         ],
       }
     };

ui/src/views/sems/specCc/zx.vue

@@ -509,7 +509,7 @@ export default {
       // 表单校验
       rules: {
         plantCode: [
-          { required: true, message: this.$t('装置名称不能为空'), trigger: "blur" }
+          { required: true, message: this.$t('装置名称')+this.$t('不能为空'), trigger: "blur" }
         ],
       }
     };

ui/src/views/sems/specanalysis/YlgdChart.vue

@@ -33,7 +33,7 @@ export default {
         },
         series: [
           {
-            name: '安全等级',
+            name: this.$t('安全等级'),
             type: 'pie',
             radius: '50%',
             data: [

ui/src/views/sems/specanalysis/YlrqChart.vue

@@ -34,7 +34,7 @@ export default {
         },
         series: [
           {
-            name: '安全等级',
+            name: this.$t('安全等级'),
             type: 'pie',
             radius: '50%',
             data: [