-
+
@@ -61,7 +61,7 @@
getLessonTree({ mapId: '' }).then(response => {
this.treeData = this.convertTreeData(response.data, node);
}).catch(error => {
- this.$messageBox('刷新失败')
+ this.$messageBox(this.$t('error.refreshFailed'))
});
},
allowDrop(draggingNode, dropNode, type) {
@@ -135,4 +135,4 @@
margin: 0 auto;
margin-top: 10px;
}
-
\ No newline at end of file
+
diff --git a/src/views/lesson/taskmanage/createTask.vue b/src/views/lesson/taskmanage/createTask.vue
index 801ae28a5..7b8ea98a2 100644
--- a/src/views/lesson/taskmanage/createTask.vue
+++ b/src/views/lesson/taskmanage/createTask.vue
@@ -2,8 +2,8 @@
@@ -35,7 +35,7 @@
let form = {
labelWidth: '120px',
items: [
- { prop: 'parameter', label: '皮肤类型', type: 'select', required: true, options: this.skinCodeList },
+ { prop: 'parameter', label: this.$t('lesson.skinType'), type: 'select', required: true, options: this.skinCodeList },
]
}
return form
@@ -43,13 +43,13 @@
rules() {
let crules = {
parameter: [
- { required: true, message: '请选择地图', trigger: 'change' },
+ { required: true, message: this.$t('rules.mapInput'), trigger: 'change' },
]
}
return crules
},
title() {
- return '自动生成操作'
+ return this.$t('lesson.generationOperation')
}
},
mounted() {
@@ -92,9 +92,9 @@
self.doClose()
self.$emit('reloadTable'); // 刷新列表
} catch (error) {
- this.$messageBox('创建失败');
+ this.$messageBox(this.$t('tip.creatingFailed'));
}
}
}
}
-
\ No newline at end of file
+
diff --git a/src/views/lesson/taskmanage/list.vue b/src/views/lesson/taskmanage/list.vue
index 2c362fb9f..296f05a49 100644
--- a/src/views/lesson/taskmanage/list.vue
+++ b/src/views/lesson/taskmanage/list.vue
@@ -54,7 +54,7 @@
tagType: (row) => { return '' }
},
{
- title: '创建时间',
+ title: this.$t('lesson.creationTime'),
prop: 'createTime'
},
{
@@ -65,15 +65,15 @@
tagType: (row) => { if (row.status != '03') { return 'warning' } else { return 'success' } }
},
{
- title: '开始时间',
+ title: this.$t('global.startTime'),
prop: 'startTime'
},
{
- title: '完成时间',
+ title: this.$t('lesson.finishTime'),
prop: 'finishTime'
},
{
- title: '创建结果',
+ title: this.$t('lesson.createResults'),
prop: 'result',
width: '400px'
},
@@ -83,19 +83,19 @@
width: '250',
buttons: [
{
- name: '开始',
+ name: this.$t('lesson.start'),
handleClick: this.taskStart,
type: '',
showControl: (row) => { return row.status == '01' }
},
{
- name: '取消',
+ name: this.$t('global.cancel'),
handleClick: this.taskCancel,
type: '',
showControl: (row) => { return row.status == '04' }
},
{
- name: '重新执行',
+ name: this.$t('lesson.toPerform'),
handleClick: this.taskStart,
type: '',
showControl: (row) => { return row.status == '03' || row.status == '05' }
@@ -104,7 +104,7 @@
}
],
actions: [
- { text: '创建', btnCode: 'employee_insert', handler: this.createTask }
+ { text: this.$t('global.create'), btnCode: 'employee_insert', handler: this.createTask }
]
},
@@ -130,7 +130,7 @@
})
},
taskStart(index, node) {
- this.$confirm('此操作将开始任务, 是否继续?', this.$t('global.tips'), {
+ this.$confirm( this.$t('tip.startOperationHint'), this.$t('global.tips'), {
confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('global.cancel'),
type: 'warning'
@@ -145,7 +145,7 @@
})
},
taskCancel(index, node) {
- this.$confirm('此操作将取消任务, 是否继续?', this.$t('global.tips'), {
+ this.$confirm( this.$t('tip.startOperationHint'), this.$t('global.tips'), {
confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('global.cancel'),
type: 'warning'
@@ -167,4 +167,4 @@
},
}
}
-
\ No newline at end of file
+
diff --git a/src/views/lesson/trainingmanage/draft.vue b/src/views/lesson/trainingmanage/draft.vue
index e1a30b618..467d96ab4 100644
--- a/src/views/lesson/trainingmanage/draft.vue
+++ b/src/views/lesson/trainingmanage/draft.vue
@@ -1,7 +1,7 @@
-
-
+
+
-
+
-
+
-
+
-
+
s
-
+
s
-
+
@@ -82,11 +82,11 @@ export default {
data() {
var minDurations = (rule, value, callback) => {
if (!value) {
- return callback(new Error('请输入标准用时'));
+ return callback(new Error(this.$t('rules.enterStandardTime')));
}
setTimeout(() => {
if (!Number.isInteger(value)) {
- callback(new Error('请输入数字值'));
+ callback(new Error(this.$t('rules.enterNumericValue')));
} else {
callback();
}
@@ -94,14 +94,14 @@ export default {
};
var maxDurations = (rule, value, callback) => {
if (!value) {
- return callback(new Error('请输入标准用时'));
+ return callback(new Error(this.$t('rules.enterStandardTime')));
}
setTimeout(() => {
if (!Number.isInteger(value)) {
- callback(new Error('请输入数字值'));
+ callback(new Error(this.$t('rules.enterNumericValue')));
} else {
if (value < this.operateModel.minDuration) {
- callback(new Error('必须大于最小时间'));
+ callback(new Error(this.$t('rules.greaterThanMinTime')));
} else {
callback();
}
@@ -111,9 +111,9 @@ export default {
var checkOperateType = (rule, value, callback) => {
if (value.length <= 0) {
- return callback(new Error('请选择实训类型'));
+ return callback(new Error(this.$t('rules.selectTrainingType')));
} else if (this.operation.event == '02' && value.length !== 1) {
- return callback(new Error('只能选择一个实训类型'));
+ return callback(new Error(this.$t('rules.selectOneTrainingType')));
} else {
callback();
}
@@ -151,13 +151,13 @@ export default {
},
rules: {
skinCode: [
- { required: true, message: '请输入地图名称', trigger: 'change' }
+ { required: true, message: this.$t('rules.pleaseEnterMapName'), trigger: 'change' }
],
prdCode: [
- { required: true, message: '请输入产品类型', trigger: 'change' }
+ { required: true, message: this.$t('rules.enterProductType'), trigger: 'change' }
],
type: [
- { required: true, message: '请输入实训类型', trigger: 'change' }
+ { required: true, message: this.$t('rules.inputTrainingType'), trigger: 'change' }
],
operateType: [
{ required: true, validator: checkOperateType, trigger: 'change' }
@@ -266,11 +266,11 @@ export default {
};
addAutoTraining(data).then(response => {
- this.$message.success('自动生成实训成功！');
+ this.$message.success(this.$t('tip.automaticGenerationTrainingSuccess'));
this.$emit('refresh');
this.close();
}).catch(() => {
- this.$messageBox('生成实训失败');
+ this.$messageBox(this.$t('tip.automaticGenerationTrainingFailure'));
this.loading = false;
});
} else if (this.operation.event == '02') { // edit
@@ -287,11 +287,11 @@ export default {
};
updateAutoTraining(data).then(response => {
- this.$message.success('更新自动生成实训成功！');
+ this.$message.success(this.$t('tip.updateAutomaticGenerationTrainingSuccess'));
this.$emit('refresh');
this.close();
}).catch(() => {
- this.$messageBox('更新自动生成实训失败');
+ this.$messageBox(this.$t('tip.updateAutomaticGenerationTrainingFailure'));
this.loading = false;
});
} else if (this.operation.event == '03') { // delete
@@ -305,11 +305,11 @@ export default {
};
deleteAutoTraining(data).then(response => {
- this.$message.success('删除自动生成实训成功！');
+ this.$message.success(this.$t('tip.deleteAutomaticGenerationTrainingSuccess'));
this.$emit('refresh');
this.close();
}).catch(() => {
- this.$messageBox('删除自动生成实训失败');
+ this.$messageBox(this.$t('tip.deleteAutomaticGenerationTrainingFailure'));
this.loading = false;
});
}
@@ -324,4 +324,8 @@ export default {
.el-checkbox {
margin-left: 20px;
}
+ .dialog-form {
+ position: relative;
+ left: 15px;
+ }
diff --git a/src/views/lesson/trainingmanage/index.vue b/src/views/lesson/trainingmanage/index.vue
index 736022b3d..8af900867 100644
--- a/src/views/lesson/trainingmanage/index.vue
+++ b/src/views/lesson/trainingmanage/index.vue
@@ -37,7 +37,7 @@ export default {
pageIndex: 'pageNum'
},
queryForm: {
- labelWidth: '80px',
+ labelWidth: '120px',
initLoadCallback: this.loadInitQueryList,
queryObject: {
skinCode: {
@@ -50,7 +50,7 @@ export default {
},
prdCode: {
type: 'select',
- label: '产品',
+ label: this.$t('lesson.product'),
change: this.prdChoose,
config: {
data: []
@@ -73,9 +73,9 @@ export default {
},
generateType: {
type: 'select',
- label: '自动/人工',
+ label: this.$t('lesson.automaticOrManual'),
config: {
- data: [{ value: '02', label: '人工' }, { value: '01', label: '自动' }]
+ data: [{ value: '02', label: this.$t('lesson.manual') }, { value: '01', label: this.$t('lesson.automatic') }]
}
},
name: {
@@ -147,9 +147,9 @@ export default {
}
],
actions: [
- { text: '生成实训', btnCode: 'employee_insert', handler: this.autoMaticTrainging },
- { text: '修改实训', btnCode: 'employee_insert', handler: this.editTrainingByType, type: 'warning' },
- { text: '删除实训', btnCode: 'employee_insert', handler: this.delAutoMaticTrainging, type: 'danger' }
+ { text: this.$t('lesson.generateTraining'), btnCode: 'employee_insert', handler: this.autoMaticTrainging },
+ { text: this.$t('lesson.updateTraining'), btnCode: 'employee_insert', handler: this.editTrainingByType, type: 'warning'},
+ { text: this.$t('lesson.deleteTraining'), btnCode: 'employee_insert', handler: this.delAutoMaticTrainging, type: 'danger'}
]
},
@@ -249,13 +249,13 @@ export default {
}
},
autoMaticTrainging() {
- this.$refs.draftTrain.show({ event: '01', title: '自动生成实训' });
+ this.$refs.draftTrain.show({ event: '01', title: this.$t('lesson.automaticGenerationOfTraining') });
},
editTrainingByType() {
- this.$refs.draftTrain.show({ event: '02', title: '按类别修改实训' });
+ this.$refs.draftTrain.show({ event: '02', title: this.$t('lesson.modifyTrainingByCategory') });
},
delAutoMaticTrainging() {
- this.$refs.draftTrain.show({ event: '03', title: '删除自动生成实训' });
+ this.$refs.draftTrain.show({ event: '03', title: this.$t('lesson.deleteAutoGeneratedTraining') });
},
demoDisplay(index, node) {
trainingNotify({ trainingId: node.id }).then(resp => {
@@ -264,7 +264,7 @@ export default {
this.$router.push({ path: `${UrlConfig.display}/manage`, query: query });
launchFullscreen();
}).catch(error => {
- this.$messageBox(`创建仿真失败: ${error.message}`);
+ this.$messageBox(this.$t('error.createSimulationFailed') +error.message);
});
},
diff --git a/src/views/lesson/trainingrecord/category/draft.vue b/src/views/lesson/trainingrecord/category/draft.vue
index 65bad1203..a5fb84a5e 100644
--- a/src/views/lesson/trainingrecord/category/draft.vue
+++ b/src/views/lesson/trainingrecord/category/draft.vue
@@ -1,10 +1,10 @@
-
+
-
+
-
+
-
+
-
+
s
-
+
s
-
+
@@ -71,11 +71,11 @@ export default {
data() {
var minDurations = (rule, value, callback) => {
if (!value) {
- return callback(new Error('请输入标准用时'));
+ return callback(new Error(this.$t('rules.enterStandardTime')));
}
setTimeout(() => {
if (!Number.isInteger(value)) {
- callback(new Error('请输入数字值'));
+ callback(new Error(this.$t('rules.enterNumericValue')));
} else {
callback();
}
@@ -83,14 +83,14 @@ export default {
};
var maxDurations = (rule, value, callback) => {
if (!value) {
- return callback(new Error('请输入标准用时'));
+ return callback(new Error(this.$t('rules.enterStandardTime')));
}
setTimeout(() => {
if (!Number.isInteger(value)) {
- callback(new Error('请输入数字值'));
+ callback(new Error(this.$t('rules.enterNumericValue')));
} else {
if (value < this.operateModel.minDuration) {
- callback(new Error('必须大于最小时间'));
+ callback(new Error(this.$t('rules.greaterThanMinTime')));
} else {
callback();
}
@@ -120,7 +120,7 @@ export default {
},
rules: {
name: [
- { required: true, message: '请输入实训名称', trigger: 'change' }
+ { required: true, message: this.$t('rules.inputTrainingName'), trigger: 'change' }
],
minDuration: [
{ required: true, validator: minDurations, trigger: 'blur' }
@@ -129,7 +129,7 @@ export default {
{ required: true, validator: maxDurations, trigger: 'blur' }
],
remarks: [
- { required: true, message: '请输入实训说明', trigger: 'change' }
+ { required: true, message: this.$t('rules.inputTrainingRemark'), trigger: 'change' }
]
}
};
@@ -216,7 +216,7 @@ export default {
this.operateModel.operateType = response.data.operateType;
this.operateModel.remarks = response.data.remarks;
}).catch(() => {
- this.$messageBox('获取骤数据失败');
+ this.$messageBox(this.$t('error.obtainStepDataFailed'));
});
break;
}
@@ -271,9 +271,9 @@ export default {
addTraining(data).then(response => {
this.$emit('refresh', [localStore.get('cityCode') || '', localStore.get('skinCode') || '']);
this.close();
- this.$message.success('添加实训成功!');
+ this.$message.success(this.$t('tip.addTrainingSuccessfully'));
}).catch(() => {
- this.$messageBox('新增实训失败');
+ this.$messageBox(this.$t('tip.addTrainingFailed'));
});
}
});
@@ -295,9 +295,9 @@ export default {
updateTraining(data).then(response => {
this.$emit('refresh', [localStore.get('cityCode') || '', localStore.get('skinCode') || '']);
this.close();
- this.$message.success('更新实训成功!');
+ this.$message.success(this.$t('tip.updateTrainingSuccessfully'));
}).catch(() => {
- this.$messageBox('更新实训失败');
+ this.$messageBox(this.$t('tip.updateTrainingFailed'));
});
}
});
diff --git a/src/views/lesson/trainingrecord/manage/stepmanage/stepinfo/step.vue b/src/views/lesson/trainingrecord/manage/stepmanage/stepinfo/step.vue
index 1266028fe..2100330b7 100644
--- a/src/views/lesson/trainingrecord/manage/stepmanage/stepinfo/step.vue
+++ b/src/views/lesson/trainingrecord/manage/stepmanage/stepinfo/step.vue
@@ -217,14 +217,14 @@ export default {
saveTrainingStepsData(model).then(response => {
this.$refs.form.resetFields();
this.$store.dispatch('training/emitTipFresh');
- this.$message.success('保存步骤数据成功');
+ this.$message.success(this.$t('tip.savedStepDataSuccessfully'));
this.saveDisabled = false;
}).catch(() => {
this.saveDisabled = false;
- this.$messageBox('保存步骤数据失败');
+ this.$messageBox(this.$t('tip.savedStepDataFailed'));
});
} else {
- this.$messageBox('请选择关联的车站');
+ this.$messageBox(this.$t('rules.selectAssociatedStation'));
}
});
}
diff --git a/src/views/map/mapdraft/mapedit/configMap.vue b/src/views/map/mapdraft/mapedit/configMap.vue
index 0f377d721..572aa1034 100644
--- a/src/views/map/mapdraft/mapedit/configMap.vue
+++ b/src/views/map/mapdraft/mapedit/configMap.vue
@@ -148,9 +148,13 @@ export default {
/deep/{
.el-form-item__label{
text-align: left;
+ height: 30px;
+ line-height: 30px;
}
.el-checkbox-group{
width: 100%;
+ display: flex;
+ flex-wrap: wrap;
}
}
}
@@ -167,7 +171,7 @@ export default {
.title{
overflow: hidden;
border-bottom: 1px solid #ccc;
- padding: 9px;
+ padding: 8px 15px;
.fl-title{
float: left;
}
@@ -190,10 +194,24 @@ export default {
.el-checkbox{
margin-right: 10px;
width: 75px;
+ height: 30px;
+ display: flex;
+ align-items: center;
}
.el-form-item{
- margin-bottom: -4px;
+ margin-bottom: 6px;
+ }
+
+ // ckect框选中颜色
+ .content_box .el-checkbox__input.is-checked .el-checkbox__inner,
+ .content_box .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+ background-color: #85bef9;
+ border-color: #85bef9;
+ }
+ // 文字选中颜色
+ .content_box .el-checkbox__input.is-checked+.el-checkbox__label {
+ color: #3c93ec;
}
}
}
diff --git a/src/views/map/mapdraft/mapedit/index.vue b/src/views/map/mapdraft/mapedit/index.vue
index f3a595d89..e75a85f9b 100644
--- a/src/views/map/mapdraft/mapedit/index.vue
+++ b/src/views/map/mapdraft/mapedit/index.vue
@@ -315,9 +315,10 @@ export default {
float: right;
width: 520px;
- /deep/ .el-scrollbar__view {
- width: 510px !important;
- }
+ // /deep/ .el-scrollbar__view {
+ // width: 510px !important;
+ // height: calc(100% - 40px);
+ // }
}
.physical-view {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue
index 048fad5f9..ee3607179 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue
@@ -12,7 +12,7 @@
-
+
@@ -120,7 +120,7 @@ export default {
draw: {
name: this.$t('map.drawData'),
item: [
- { prop: 'code', label: this.$t('map.code'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.resourceList, change: true, deviceChange: this.deviceChange },
+ { prop: 'code', label: `${this.$t('map.image')}${this.$t('map.code')}`, type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.resourceList, change: true, deviceChange: this.deviceChange },
{ prop: 'name', label: this.$t('map.imageName'), type: 'input' },
{ prop: 'width', label: this.$t('map.imageWidth'), type: 'number', min: 0 },
{ prop: 'height', label: this.$t('map.imageHeight'), type: 'number', min: 0 },
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/config/data.vue b/src/views/map/mapdraft/mapedit/mapoperate/config/data.vue
index 08ee6149c..8db820036 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/config/data.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/config/data.vue
@@ -59,7 +59,7 @@