diff --git a/src/i18n/langs/en/index.js b/src/i18n/langs/en/index.js index 453afee9a..5c2a70ad4 100644 --- a/src/i18n/langs/en/index.js +++ b/src/i18n/langs/en/index.js @@ -9,6 +9,7 @@ import scriptRecord from './scriptRecord'; import tip from './tip'; import system from './system'; import orderAuthor from './orderAuthor'; +import teach from './teach'; import publish from './publish'; import permission from './permission'; import replay from './replay'; @@ -20,6 +21,7 @@ export default { global, router, lesson, + teach, error, rules, scriptRecord, diff --git a/src/i18n/langs/en/map.js b/src/i18n/langs/en/map.js index bdc7ba4fb..76461e4c9 100644 --- a/src/i18n/langs/en/map.js +++ b/src/i18n/langs/en/map.js @@ -23,6 +23,7 @@ export default { layerDisplay: 'The layer display', viewShows: 'View shows', contentShows: 'content show', + createBatch: 'Create a batch', save: 'save', updata: 'update', @@ -299,6 +300,7 @@ export default { zzkContent: 'Station control content:', stationControlZok: 'central', + skinStyleColon: 'Skin type:', skinDesignation: 'SkinName', skinCoding: 'SkinCoding', coordinatesOrigin: 'CoordinatesOrigin', @@ -341,9 +343,13 @@ export default { productType: 'ProductType', productCode: 'ProductCode', productName: 'ProductName', + createProductCategories: 'Create product categories', productDescription: 'ProductDescription', associateTrainingTypes: 'AssociateTrainingTypes', createTrainingCategories: 'CreateTrainingCategories', + editTraining: 'Edit product categories', + productCategories: 'The product category', + selectOperation: 'Please select operation', editTrainingCategories: 'EditTrainingCategories', linkWidth: 'LinkWidth', maxLinkWidth: '(Link width is at most 20)', @@ -380,6 +386,7 @@ export default { trainCode: 'Train number:', groupNumber: 'The number of:', + groupNumberInterval: 'Group number interval:', modelCode: 'Car type:', trainmodelCreate: 'New car type', diff --git a/src/i18n/langs/en/teach.js b/src/i18n/langs/en/teach.js new file mode 100644 index 000000000..79e55c94a --- /dev/null +++ b/src/i18n/langs/en/teach.js @@ -0,0 +1,19 @@ +export default { + title: 'Urban rail transit teaching system', + describe: 'This system is equipped with real business logic and software architecture based on the business and process-driven mode of metro employees and training sites. From the perspective of business process, standard operation, training mode and open principle, it strives to build a practical training and teaching system that best meets user needs and responds to changes quickly.', + trainingName: 'Training name:', + trainingTime: 'Best time to complete the training:', + trainingMaximum: 'Maximum time to complete the training:', + trainingInstructions: 'Training instructions:', + startTraining: 'Began to practice', + + courseName: 'Course name', + courseDescription: 'Course description', + courseDetails: 'Course details', + free: 'free', + permissionsDetails: 'Permissions for details', + buy: 'buy', + permissionDistribute: 'Permission distribution (class)', + authorityTransferred: 'Authority transferred', + courseList: 'Course list' +}; diff --git a/src/i18n/langs/en/tip.js b/src/i18n/langs/en/tip.js index 0261b8ee6..fe597eeb0 100644 --- a/src/i18n/langs/en/tip.js +++ b/src/i18n/langs/en/tip.js @@ -25,6 +25,8 @@ export default { selectedSectionEmpty: 'The selected section is empty', selectedStationEmpty: 'The selected station is empty', + enterKeywordsFiltering: 'Enter keywords for filtering', + selectMap: 'Please select the map first', selectTrainType: 'Please select the train model to view', @@ -63,6 +65,8 @@ export default { createRoutingFailed: 'Failed to create junction', pathUpdataSuccessful: 'Road update successful!', pathUpdataFailed: 'Update traffic failed', + productCodeExists: 'The product Code already exists', + narrowScope: 'You cannot narrow down the training list you created last time', failedLoadMap: 'Failed to load map data', sectionPointsDeficiency: 'Segment coordinates missing', @@ -89,5 +93,11 @@ export default { skinDeleteConfirmation: 'This will permanently remove the skin. Do you want to continue?', skinCodingExist: 'Map skin codes already exist', underImport: 'UnderImport...', - deleteTypeHint: 'This action deletes the type. Do you want to continue?' + deleteTypeHint: 'This action deletes the type. Do you want to continue?', + selectValidInterval: 'Please select a valid interval', + + failedCourse: 'Failed to obtain course information', + createSimulationFaild: 'Failed to create simulation', + accessCourseNo: 'No access to this course, please go and buy it!' + }; diff --git a/src/i18n/langs/zh/global.js b/src/i18n/langs/zh/global.js index 45c9f0812..7504b6566 100644 --- a/src/i18n/langs/zh/global.js +++ b/src/i18n/langs/zh/global.js @@ -85,6 +85,30 @@ export default { inputRoomNumber: '请输入房间号', chooseRoom: '选择房间', month: '月', + + permissions: '权限', + yuanMonth: '元/月', + permissionType: '权限类型:', + purchaseDuration: '购买时长:', + custom: '自定义', + permissionNum: '权限数量:', + indexA: '个', + purchasePrice: '购买总价:', + submitOrders: '提交订单', + + january: '一月', + march: '三月', + year: '一年', + twoYears: '两年', + fiveYears: '五年', + tenYears: '十年', + courseName: '课程名称', + screenName: '大屏名称', + productName: '产品名称', + coursePrice: '课程单价', + testPrice: '考试单价', + simulationPrice: '仿真单价', + timeUnitPrice: '大屏单价', putaway: '上 架', soldOut: '下 架', exportMap: '导出地图', diff --git a/src/i18n/langs/zh/index.js b/src/i18n/langs/zh/index.js index a991332d7..d9b3304bb 100644 --- a/src/i18n/langs/zh/index.js +++ b/src/i18n/langs/zh/index.js @@ -9,6 +9,7 @@ import scriptRecord from './scriptRecord'; import tip from './tip'; import system from './system'; import orderAuthor from './orderAuthor'; +import teach from './teach'; import publish from './publish'; import permission from './permission'; import replay from './replay'; @@ -21,6 +22,7 @@ export default { router, lesson, error, + teach, rules, scriptRecord, tip, diff --git a/src/i18n/langs/zh/map.js b/src/i18n/langs/zh/map.js index de8a3581d..3d2b0164a 100644 --- a/src/i18n/langs/zh/map.js +++ b/src/i18n/langs/zh/map.js @@ -23,6 +23,7 @@ export default { layerDisplay: '图层显示', viewShows: '视图显示', contentShows: '内容显示', + createBatch: '批量创建', save: '保存', updata: '更新', @@ -330,6 +331,7 @@ export default { trainCode: '列车编号:', groupNumber: '车组号:', + groupNumberInterval: '车组号区间:', trainNumber: '车组号', modelCode: '车类型:', @@ -414,6 +416,7 @@ export default { startStation: '起始站', endStation: '终到站', + skinStyleColon: '皮肤类型:', skinDesignation: '皮肤名称', skinCoding: '皮肤编码', coordinatesOrigin: '坐标原点', @@ -456,9 +459,13 @@ export default { productType: '产品类型', productCode: '产品编码', productName: '产品名称', + createProductCategories: '创建产品类目', productDescription: '产品说明', associateTrainingTypes: '关联实训类型', createTrainingCategories: '创建实训类目', + editTraining: '编辑产品类目', + productCategories: '产品类目', + selectOperation: '请选择操作', editTrainingCategories: '编辑实训类目', linkWidth: 'link宽度', maxLinkWidth: '(Link宽度最大为20)', diff --git a/src/i18n/langs/zh/rules.js b/src/i18n/langs/zh/rules.js index 7cec90d9e..b979fef56 100644 --- a/src/i18n/langs/zh/rules.js +++ b/src/i18n/langs/zh/rules.js @@ -212,6 +212,9 @@ export default { sectionWidthInputPrompt: '请输入有效区段宽度', selectShowWatermark: '请选择是否水印', + courseNameEmpty: '课程名称不能为空', + purchaseMonth: '请输入购买月数', + accessNumber: '请输入权限数量', pleaseInputMapName: '请输入地图新名称', inputTemplateRunPlan: '请选择模板运行图', inputSkinType: '请选择皮肤类型', diff --git a/src/i18n/langs/zh/teach.js b/src/i18n/langs/zh/teach.js new file mode 100644 index 000000000..4a148e78d --- /dev/null +++ b/src/i18n/langs/zh/teach.js @@ -0,0 +1,19 @@ +export default { + title: '城市轨道交通教学系统', + describe: '该系统具备真实的业务逻辑，以地铁员工和培训点为要素的业务和流程驱动方式进行软件架构，从业务流程、标准作业、培训方式及开放原则等角度出发，力求打造最符合用户需求及快速响应变化的实训教学系统。', + trainingName: '实训名称：', + trainingTime: '完成实训最佳用时：', + trainingMaximum: '完成实训最大用时：', + trainingInstructions: '实训说明：', + startTraining: '开始实训', + + courseName: '课程名称', + courseDescription: '课程说明', + courseDetails: '课程详情', + free: '免费', + permissionsDetails: '权限详情', + buy: '购买', + permissionDistribute: '权限分发(上课)', + authorityTransferred: '权限转赠', + courseList: '课程列表' +}; diff --git a/src/i18n/langs/zh/tip.js b/src/i18n/langs/zh/tip.js index 2a1aec950..2da8511cb 100644 --- a/src/i18n/langs/zh/tip.js +++ b/src/i18n/langs/zh/tip.js @@ -8,6 +8,7 @@ export default { hint: '提示', cancelledDelete: '已取消删除', cancelGeneration: '已取消批量生成', + refreshFailure: '刷新失败', updateSuccessfully: '更新成功', saveSuccessfully: '保存成功', @@ -25,6 +26,8 @@ export default { selectedSectionEmpty: '选择的区段为空', selectedStationEmpty: '选择的车站为空', + enterKeywordsFiltering: '输入关键字进行过滤', + selectMap: '请先选择地图', selectTrainType: '请选择查看的列车模型', @@ -59,6 +62,9 @@ export default { deleteProductSuccessfully: '删除产品成功', deleteProductFailed: '删除产品失败', cannotDeleteProduct: '产品已被使用无法删除', + productCodeExists: '产品Code已存在', + narrowScope: '不能缩小上次创建的实训列表的范围', + pathCreationSuccessful: '创建交路成功！', createRoutingFailed: '创建交路失败', pathUpdataSuccessful: '更新交路成功！', @@ -89,6 +95,15 @@ export default { skinDeleteConfirmation: '此操作将永久删除该皮肤, 是否继续?', skinCodingExist: '地图皮肤编码已存在', underImport: '正在导入中...', - deleteTypeHint: '此操作将删除该类型, 是否继续？' + deleteTypeHint: '此操作将删除该类型, 是否继续？', + selectValidInterval: '请选择有效的区间', + + failedCourse: '获取课程信息失败', + createSimulationFaild: '创建仿真失败', + accessCourseNo: '无此课程权限, 请前往购买！', + + failedSubmitOrder: '提交订单失败', + permissionsNumber: '请输入有效的权限个数', + purchaseMonth: '请输入有效的购买月数' }; diff --git a/src/router/index.js b/src/router/index.js index b2058ee8a..4dca952fb 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -27,8 +27,8 @@ import SkinCodeDraft from '@/views/map/skinCode/draft'; import Mapdraft from '@/views/map/mapdraft/index'; import Mapedit from '@/views/map/mapdraft/mapedit/index'; import Runplan from '@/views/map/runplan/index'; +import MapProduct from '@/views/map/product/index'; import RunplanView from '@/views/map/runplan/chart'; -import Trainingcategory from '@/views/lesson/trainingcategory/index'; import Trainingrecord from '@/views/lesson/trainingrecord/index'; import TrainingrecordManage from '@/views/lesson/trainingrecord/manage/index'; import Taskmanage from '@/views/lesson/taskmanage/list'; @@ -389,7 +389,7 @@ export const asyncRouter = [ }, { path: 'product', - component: Trainingcategory, + component: MapProduct, meta: { i18n: 'router.productEdit' } diff --git a/src/views/components/pay/commit.vue b/src/views/components/pay/commit.vue index 73faf0c9e..5ecb4e1b6 100644 --- a/src/views/components/pay/commit.vue +++ b/src/views/components/pay/commit.vue @@ -12,30 +12,30 @@ {{ saleModel.name }} - - {{ systemName }}权限 + + {{ systemName }}{{ $t('global.permissions') }} {{ saleModel.price.toFixed(2) }} - 元/月 + {{ $t('global.yuanMonth') }} - + - + - 月 + {{ $t('global.month') }} - + - 个 + {{ $t('global.indexA') }} - + {{ parseInt(sumPrice) }} . {{ (sumPrice - parseInt(sumPrice)).toFixed(2).toString().replace('.0', '').replace(' ', '') }} @@ -44,9 +44,9 @@ - 提交订单 + {{ $t('global.submitOrders') }} - 返回 + {{ $t('global.back') }} @@ -69,14 +69,14 @@ export default { data() { return { disabled: true, - choose: '一月', + choose: this.$t('global.january'), chooseList: [ - { label: '一月', value: 1 }, - { label: '三月', value: 3 }, - { label: '一年', value: 12 }, - { label: '两年', value: 24 }, - { label: '五年', value: 60 }, - { label: '十年', value: 120 } + { label: this.$t('global.january'), value: 1 }, + { label: this.$t('global.march'), value: 3 }, + { label: this.$t('global.year'), value: 12 }, + { label: this.$t('global.twoYears'), value: 24 }, + { label: this.$t('global.fiveYears'), value: 60 }, + { label: this.$t('global.tenYears'), value: 120 } ], saleModel: { goodsId: '', @@ -94,48 +94,48 @@ export default { nameTitle() { if (this.$route.query.permissionType == PermissionType.EXAM || this.$route.query.permissionType == PermissionType.LESSON) { - return '课程名称'; + return this.$t('global.courseName'); } else if (this.$route.query.permissionType == PermissionType.SCREEN) { - return '大屏名称'; + return this.$t('global.screenName'); } else { - return '产品名称'; + return this.$t('global.productName'); } }, priceTitle() { switch (this.$route.query.permissionType) { - case PermissionType.LESSON: return '课程单价'; - case PermissionType.EXAM: return '考试单价'; - case PermissionType.SIMULATION: return '仿真单价'; - case PermissionType.SCREEN: return '大屏单价'; + case PermissionType.LESSON: return this.$t('global.coursePrice'); + case PermissionType.EXAM: return this.$t('global.testPrice'); + case PermissionType.SIMULATION: return this.$t('global.simulationPrice'); + case PermissionType.SCREEN: return this.$t('global.timeUnitPrice'); } return ''; }, rules() { return { 'name': [ - { required: true, message: '课程名称不能为空', trigger: 'blur' } + { required: true, message: this.$t('rules.courseNameEmpty'), trigger: 'blur' } ], 'months': [ - { required: true, message: '请输入购买月数', trigger: 'blur' }, + { required: true, message: this.$t('rules.purchaseMonth'), trigger: 'blur' }, { validator(rule, value, callback) { if (Number.isInteger(Number(value)) && Number(value) >= 0) { callback(); } else { - callback(new Error('请输入有效的购买月数')); + callback(new Error(this.$t('tip.purchaseMonth'))); } }, trigger: 'blur' } ], 'total': [ - { required: true, message: '请输入权限数量', trigger: 'blur' }, + { required: true, message: this.$t('rules.accessNumber'), trigger: 'blur' }, { validator(rule, value, callback) { if (Number.isInteger(Number(value)) && Number(value) >= 0) { callback(); } else { - callback(new Error('请输入有效的权限个数')); + callback(new Error(this.$t('tip.permissionsNumber'))); } }, trigger: 'blur' @@ -163,7 +163,7 @@ export default { methods: { // 选择自定义时长，修改页面控件状态 chooseEvent(label) { - this.disabled = label !== '自定义'; + this.disabled = label !== this.$t('global.custom'); this.chooseList.forEach(elem => { if (label === elem.label) { this.saleModel.months = elem.value; @@ -184,7 +184,7 @@ export default { commitOrder(model).then(response => { this.$emit('commit', response.data); }).catch(() => { - this.$messageBox('提交订单失败'); + this.$messageBox(this.$t('tip.failedSubmitOrder')); }); } }); diff --git a/src/views/map/mapdraft/mapedit/mapoperate/train/create.vue b/src/views/map/mapdraft/mapedit/mapoperate/train/create.vue index 7df1e22fb..8ce94cb62 100644 --- a/src/views/map/mapdraft/mapedit/mapoperate/train/create.vue +++ b/src/views/map/mapdraft/mapedit/mapoperate/train/create.vue @@ -1,23 +1,23 @@ @@ -79,14 +79,14 @@ export default { range.end >= range.beg) { callback(); } else { - callback(new Error('请选择有效的区间')); + callback(new Error(this.$t('tip.selectValidInterval'))); } }, trigger: 'blur' } ], modelCode: [ - { required: true, message: '请选择车类型', trigger: 'change' } + { required: true, message: this.$t('rules.selectTrainType'), trigger: 'change' } ] }; } diff --git a/src/views/map/mapdraft/mapedit/mapoperate/train/index.vue b/src/views/map/mapdraft/mapedit/mapoperate/train/index.vue index 6ea475221..08870ffc6 100644 --- a/src/views/map/mapdraft/mapedit/mapoperate/train/index.vue +++ b/src/views/map/mapdraft/mapedit/mapoperate/train/index.vue @@ -62,13 +62,13 @@ export default { }, rules: { code: [ - { required: true, message: '请重新选择设备', trigger: 'change' } + { required: true, message: this.$t('rules.pleaseReSelectDevice'), trigger: 'change' } ], groupNumber: [ - { required: true, message: '请输入车组号', trigger: 'blur' } + { required: true, message: this.$t('rules.pleaseEnterGroupNumber'), trigger: 'blur' } ], modelCode: [ - { required: true, message: '请选择车类型', trigger: 'change' } + { required: true, message: this.$t('rules.selectTrainType'), trigger: 'change' } ] }, search: '' @@ -130,7 +130,7 @@ export default { if (Object.keys(this.$store.state.map.map || {}).length) { this.$refs.trainMode.doShow({}, 'ADD'); } else { - this.$messageBox('请先选择地图'); + this.$messageBox(this.$t('tip.selectMap')); } }, uptTrainMode(code) { @@ -138,7 +138,7 @@ export default { if (index >= 0) { this.$refs.trainMode.doShow(this.trainModelList[index], 'UPT'); } else { - this.$messageBox('请选择查看的列车模型'); + this.$messageBox(this.$t('tip.selectTrainType')); } }, delTrainMode(code) { @@ -154,15 +154,15 @@ export default { const train = this.$store.getters['map/getDeviceByCode'](row.code); if (train) { const _that = this; - this.$confirm('是否确认删除？', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', + this.$confirm(this.$t('tip.confirmDeletion'), this.$t('tip.hint'), { + confirmButtonText: this.$t('tip.confirm'), + cancelButtonText: this.$t('tip.cancel'), type: 'warning' }).then(() => { _that.$emit('delMapModel', train); _that.deviceSelect(); }).catch(() => { - _that.$message.info('已取消删除'); + _that.$message.info(this.$t('tip.cancelledDelete')); }); } }, diff --git a/src/views/map/product/draft.vue b/src/views/map/product/draft.vue deleted file mode 100644 index c1947c450..000000000 --- a/src/views/map/product/draft.vue +++ /dev/null @@ -1,318 +0,0 @@ - - - - diff --git a/src/views/lesson/trainingcategory/edit.vue b/src/views/map/product/edit.vue similarity index 79% rename from src/views/lesson/trainingcategory/edit.vue rename to src/views/map/product/edit.vue index ce5c9e5ae..8fb1913de 100644 --- a/src/views/lesson/trainingcategory/edit.vue +++ b/src/views/map/product/edit.vue @@ -7,10 +7,10 @@ - + - + diff --git a/src/views/lesson/trainingcategory/tree.vue b/src/views/map/product/tree.vue similarity index 93% rename from src/views/lesson/trainingcategory/tree.vue rename to src/views/map/product/tree.vue index c75099a02..17eca4c9b 100644 --- a/src/views/lesson/trainingcategory/tree.vue +++ b/src/views/map/product/tree.vue @@ -1,9 +1,9 @@ diff --git a/src/views/map/runplan/manage/create.vue b/src/views/map/runplan/manage/create.vue index 4028ce95e..c9b4a15d9 100644 --- a/src/views/map/runplan/manage/create.vue +++ b/src/views/map/runplan/manage/create.vue @@ -98,11 +98,11 @@ - {{$t('global.lastStep')}} + {{ $t('global.previousStep') }} - {{$t('global.skip')}} - {{$t('global.create')}} - {{$t('global.confirm')}} + {{ $t('global.skip') }} + {{ $t('global.create') }} + {{ $t('global.confirm') }} @@ -118,7 +118,9 @@ export default { props: { selected: { type: Object, - requited: true + default: function () { + return null; + } } }, data() { diff --git a/src/views/map/runplan/manage/import.vue b/src/views/map/runplan/manage/import.vue index c06ff5e44..644d254c4 100644 --- a/src/views/map/runplan/manage/import.vue +++ b/src/views/map/runplan/manage/import.vue @@ -6,8 +6,8 @@ - {{$t('map.import')}} - {{$t('global.cancel')}} + {{ $t('map.import') }} + {{ $t('global.cancel') }} @@ -21,7 +21,9 @@ export default { props: { selected: { type: Object, - requited: true + default: function () { + return null; + } } }, data() { diff --git a/src/views/map/runplan/manage/list.vue b/src/views/map/runplan/manage/list.vue index 2b8e7b9c5..4fcc7e31c 100644 --- a/src/views/map/runplan/manage/list.vue +++ b/src/views/map/runplan/manage/list.vue @@ -1,7 +1,7 @@ @@ -22,7 +22,9 @@ export default { props: { selected: { type: Object, - requited: true + default: function () { + return null; + } } }, data() { diff --git a/src/views/map/skinCode/draft.vue b/src/views/map/skinCode/draft.vue index 036f11c2b..ace0c8a78 100644 --- a/src/views/map/skinCode/draft.vue +++ b/src/views/map/skinCode/draft.vue @@ -12,9 +12,9 @@
- {{$t('global.create')}} - {{$t('global.update')}} - {{$t('global.return')}} + {{ $t('global.create') }} + {{ $t('global.update') }} + {{ $t('global.return') }}
@@ -48,10 +48,10 @@ export default { computed: { title() { if (this.isAdd) { - return this.$t('map.addMapSkin'); + return this.$t('map.addMapSkin'); } if (this.isEdit) { - return this.$t('map.updateMapSkin'); + return this.$t('map.updateMapSkin'); } return ''; }, diff --git a/src/views/map/skinStyle/draft.vue b/src/views/map/skinStyle/draft.vue index 8726d1bc2..1922c77a4 100644 --- a/src/views/map/skinStyle/draft.vue +++ b/src/views/map/skinStyle/draft.vue @@ -12,8 +12,8 @@
- {{$t('global.create')}} - {{$t('global.update')}} + {{ $t('global.create') }} + {{ $t('global.update') }}
@@ -47,10 +47,10 @@ export default { computed: { title() { if (this.isAdd) { - return this.$t('map.addMapSkin'); + return this.$t('map.addMapSkin'); } if (this.isEdit) { - return this.$t('map.updateMapSkin'); + return this.$t('map.updateMapSkin'); } return ''; }, diff --git a/src/views/map/skinStyle/index.vue b/src/views/map/skinStyle/index.vue index 0c82090ae..cfdb2c82a 100644 --- a/src/views/map/skinStyle/index.vue +++ b/src/views/map/skinStyle/index.vue @@ -25,11 +25,11 @@ export default { queryObject: { name: { type: 'text', - label: this.$t('map.skinDesignation'), + label: this.$t('map.skinDesignation') }, code: { type: 'text', - label: this.$t('map.skinCoding'), + label: this.$t('map.skinCoding') } } }, diff --git a/src/views/scriptManage/display/tipScriptRecord.vue b/src/views/scriptManage/display/tipScriptRecord.vue index 68e98ff9f..cd151c8e7 100644 --- a/src/views/scriptManage/display/tipScriptRecord.vue +++ b/src/views/scriptManage/display/tipScriptRecord.vue @@ -162,10 +162,6 @@ import {saveScriptScenes, saveScriptData, dumpScriptData, updateMapLocation, scr this.initAutoSaveScript(); }) }, - saveMaplocation() - { - - } } } diff --git a/src/views/scriptManage/scriptRecord/addAction.vue b/src/views/scriptManage/scriptRecord/addAction.vue index f89f477ce..b78b1e19a 100644 --- a/src/views/scriptManage/scriptRecord/addAction.vue +++ b/src/views/scriptManage/scriptRecord/addAction.vue @@ -98,6 +98,11 @@ this.$parent.$parent.$parent.setIsParse(this.isPause); this.$refs['modalData'].clearValidate(); this.$refs['commandData'].clearValidate(); + if(!val) + { + this.initActionData(); + this.initCommandActionData(); + } }, }, data() { @@ -219,7 +224,7 @@ this.adding=false; this.$message.success('添加指令成功'); this.$emit('create',true); - this.initCommandActionData(); + // this.initCommandActionData(); }).catch(error => { this.adding=false; this.$messageBox(`添加指令失败: ${error.message}`); @@ -245,7 +250,7 @@ this.modifying=false; this.$message.success('添加对话成功'); this.$emit('create',true); - this.initActionData(); + // this.initActionData(); }).catch(error => { this.modifying=false; this.$messageBox(`添加对话失败: ${error.message}`); @@ -261,7 +266,7 @@ this.$emit('modifyButtonName'); this.$message.success('修改对话成功'); this.$emit('create',false); - this.initActionData(); + // this.initActionData(); }).catch(error => { this.modifying=false; this.$messageBox(`修改对话失败: ${error.message}`); diff --git a/src/views/scriptManage/scriptRecord/getAction.vue b/src/views/scriptManage/scriptRecord/getAction.vue index 6723be95e..f8fab3f14 100644 --- a/src/views/scriptManage/scriptRecord/getAction.vue +++ b/src/views/scriptManage/scriptRecord/getAction.vue @@ -14,12 +14,25 @@
+ - {{actionInfo.otherInfo}} + + + {{actionInfo.memberName}} + 对 + {{actionInfo.targetName}} + : + {{actionInfo.reply}} + + + {{actionInfo.memberName}} + 执行指令: + {{actionInfo.command}} +
- 修改 + 修改
@@ -100,7 +113,7 @@ { let target=memberVOList.find(elem=>{return elem.id==element.targetId}); let targetName=target.name==undefined?"":" - "+target.name; - this.actionInfoList.push({id:element.id,detail:""+member.role+memberName+""+" 对 "+""+target.role+targetName+"：",otherInfo:element.reply,row:element,disabled:false}); + this.actionInfoList.push({id:element.id,isCoversition:true,memberName:member.role+memberName,targetName:target.role+targetName,reply:element.reply,row:element,visible:true}); break; } case "Command": @@ -110,12 +123,12 @@ { case 'Train_Manual_Route_Blocking_Drive': { - this.actionInfoList.push({id:element.id,detail:""+member.role+memberName+"执行指令 ：",otherInfo:deviceCommand.label,row:element,disabled:true}); + this.actionInfoList.push({id:element.id,isCoversition:false,memberName:member.role+memberName,command:deviceCommand.label,row:element,visible:false}); break; } case 'Train_Manual_Limit_Drive': { - this.actionInfoList.push({id:element.id,detail:""+member.role+memberName+"执行指令 : ",otherInfo:deviceCommand.label,row:element,disabled:true}); + this.actionInfoList.push({id:element.id,isCoversition:false,memberName:member.role+memberName,command:deviceCommand.label,row:element,visible:false}); break; } default: @@ -226,4 +239,10 @@ width: 380px; position: absolute; } + .roleClass{ + color:#409EFF + } + .commandStyle{ + color:#f00; + } diff --git a/src/views/teach/category/tree.vue b/src/views/teach/category/tree.vue index 208f82070..ce3e8379e 100644 --- a/src/views/teach/category/tree.vue +++ b/src/views/teach/category/tree.vue @@ -1,8 +1,7 @@