diff --git a/src/api/trainingPlatform.js b/src/api/trainingPlatform.js index d3cde2894..75f8c4705 100644 --- a/src/api/trainingPlatform.js +++ b/src/api/trainingPlatform.js @@ -57,3 +57,22 @@ export function getMapSystemPageList(params) { params }); } + +export function createMapSubSystem(data) { + /** 创建地图系统 */ + return request({ + url: `/api/mapSystem`, + method: 'post', + data: data + }); +} + +export function updateSubSystem(id, data) { + /** 查询子系统信息 */ + return request({ + url: `/api/mapSystem/${id}`, + method: 'put', + data: data + }); +} + diff --git a/src/i18n/langs/en/scriptRecord.js b/src/i18n/langs/en/scriptRecord.js index cb2897a0e..165e3dd22 100644 --- a/src/i18n/langs/en/scriptRecord.js +++ b/src/i18n/langs/en/scriptRecord.js @@ -4,7 +4,7 @@ export default { saveData: 'Save Data', mapList: 'Map List', createScript: 'Create Script', - modifyScript: 'Modify Script', + modifyScript: 'Modify Script', scriptName: 'Script Name', addScript: 'Add Script', map: 'Map', @@ -16,7 +16,7 @@ export default { createScriptFail: 'Create script failure', scriptDetail: 'Script Detail', scriptRecord: 'Edit', - scriptCreate: 'Create', + scriptCreate: 'Create', scriptModify: 'Modify', scriptDelete: 'Delete', getScriptFail: 'Get script information failure', @@ -83,14 +83,14 @@ export default { scriptBack: 'Back', speakTo: 'to', executeCommandTips: 'execute command: ', - operate: 'Operate', - scriptList: 'Script List', - applyPublish: 'Apply for release', - preview: 'Preview', - status: 'Status', - applyRevoke: 'Revoke', - publish: 'Publish', - revokeReason: 'Revoke explanation', + operate: 'Operate', + scriptList: 'Script List', + applyPublish: 'Apply for release', + preview: 'Preview', + status: 'Status', + applyRevoke: 'Revoke', + publish: 'Publish', + revokeReason: 'Revoke explanation', language: 'language', chinese: 'Chinese Simplified', english: 'English', @@ -100,5 +100,8 @@ export default { publishScriptSuccess: 'Publish Script Success', publishScriptFailed: 'Publish Script Failed', releaseScriptTip: 'This action will apply to release script, whether to continue?', - revokeScriptTip: 'This action will undo release script, whether to continue?' + revokeScriptTip: 'This action will undo release script, whether to continue?', + inputScriptName: 'Please input script name', + selectMap: 'Please select map', + inputScriptDescription: 'Please input script description' }; diff --git a/src/i18n/langs/en/systemGenerate.js b/src/i18n/langs/en/systemGenerate.js index cd34967aa..cf112ff3f 100644 --- a/src/i18n/langs/en/systemGenerate.js +++ b/src/i18n/langs/en/systemGenerate.js @@ -5,5 +5,22 @@ export default { name: 'Name', type: 'Type', updateData: 'Modify', - generate: 'Generate' + generate: 'Generate', + selectMap: 'Please select map', + generateSuccess: 'The subsystem under the map is generated successfully!', + generateFail: 'The subsystem under the map failed to generate!', + inputName: 'Please input subsystem name', + selectType: 'Please select type', + selectPrdName: 'Please select product name', + createSubSystem: 'Commission SubSystem', + modifySubSystem: 'Modify SubSystem', + commission: 'Commission', + customized: 'Project', + selectProject: 'Please select project', + createMapSystemSuccess: 'Create map system success', + createMapSystemFail: 'Create map system failed', + getSubSystemInfoFail: 'Get subsystem infomation failed', + updateMapSystemSuccess: 'Update map system success', + updateMapSystemFail: 'Update map system failed', + generation: 'One-click Generation' }; diff --git a/src/i18n/langs/zh/scriptRecord.js b/src/i18n/langs/zh/scriptRecord.js index e8a19d453..5f93c5a3e 100644 --- a/src/i18n/langs/zh/scriptRecord.js +++ b/src/i18n/langs/zh/scriptRecord.js @@ -84,14 +84,14 @@ export default { scriptBack: '返回', speakTo: '对', executeCommandTips: '执行指令: ', - operate: '操作', - scriptList: '剧本列表', - applyPublish: '申请发布', - preview: '预览', - status: '状态', - applyRevoke: '撤回', - publish: '发布', - revokeReason: '驳回原因', + operate: '操作', + scriptList: '剧本列表', + applyPublish: '申请发布', + preview: '预览', + status: '状态', + applyRevoke: '撤回', + publish: '发布', + revokeReason: '驳回原因', language: '语言', chinese: '中文', english: '英文', @@ -101,5 +101,8 @@ export default { publishScriptSuccess: '发布成功', publishScriptFailed: '发布失败', releaseScriptTip: '此操作将申请发布剧本, 是否继续?', - revokeScriptTip: '此操作将撤销发布剧本申请, 是否继续?' + revokeScriptTip: '此操作将撤销发布剧本申请, 是否继续?', + inputScriptName: '请输入剧本', + selectMap: '请选择地图', + inputScriptDescription: '请输入剧本描述' }; diff --git a/src/i18n/langs/zh/systemGenerate.js b/src/i18n/langs/zh/systemGenerate.js index 158981019..bf4a97b44 100644 --- a/src/i18n/langs/zh/systemGenerate.js +++ b/src/i18n/langs/zh/systemGenerate.js @@ -5,5 +5,23 @@ export default { name: '名称', type: '类型', updateData: '更新', - generate: '生成' + generate: '生成', + selectMap: '请选择地图', + generateSuccess: '生成该地图下子系统成功!', + generateFail: '生成该地图下子系统失败!', + inputName: '请输入子系统名称', + selectType: '请选择类型', + selectPrdName: '请选择产品名称', + createSubSystem: '定制子系统', + modifySubSystem: '修改子系统', + commission: '定制', + customized: '项目', + selectProject: '请选择项目', + createMapSystemSuccess: '创建地图系统成功', + createMapSystemFail: '创建地图系统失败', + getSubSystemInfoFail: '获取子系统信息失败', + updateMapSystemSuccess: '更新地图系统成功', + updateMapSystemFail: '更新地图系统失败', + generation: '一键生成' + }; diff --git a/src/router/index.js b/src/router/index.js index ca84942a3..0ff6e27a3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -311,7 +311,7 @@ export const constantRoutes = [ hidden: true }, { - path: '/jlmap3d/edit', + path: '/design/jlmap3d/edit', component: Jlmap3dedit, hidden: true }, diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js index 2987f9ec9..5f3523f75 100644 --- a/src/scripts/ConstConfig.js +++ b/src/scripts/ConstConfig.js @@ -107,7 +107,11 @@ export default { productType: [ { enlabel: 'Lesson System', label: '教学系统', value: 'Lesson'}, { enlabel: 'Exam System', label: '考试系统', value: 'Exam'}, - { enlabel: 'Simulation System', label: '仿真系统', value: 'Simulation'} + { enlabel: 'Simulation System', label: '仿真系统', value: 'Simulation'}, + { enlabel: 'Plan Draw', label: '运行图编制', value: 'Plan'} + ], + customeredProductType: [ + { enlabel: 'Plan Draw', label: '运行图编制', value: 'Plan'} ] } }; diff --git a/src/views/approval/script/operate.vue b/src/views/approval/script/operate.vue index 73e0b234f..2d777ef0e 100644 --- a/src/views/approval/script/operate.vue +++ b/src/views/approval/script/operate.vue @@ -18,8 +18,7 @@ formModel:{ id:'', explanation:'', - }, - isShow: false, + } } }, props: { @@ -60,7 +59,6 @@ }, doClose() { this.$refs.dataform.resetForm(); - this.isShow = false; this.dialogVisible = false } } diff --git a/src/views/designPlatform/userDemonList.vue b/src/views/designPlatform/userDemonList.vue index 48b343fb5..0a44a0655 100644 --- a/src/views/designPlatform/userDemonList.vue +++ b/src/views/designPlatform/userDemonList.vue @@ -187,7 +187,7 @@ export default { } }, jlmap3d() { - this.$router.push({ path: '/jlmap3d/edit', query: { mapid: this.editModel.id } }); + this.$router.push({ path: '/design/jlmap3d/edit', query: { mapid: this.editModel.id } }); }, importf() { const loading = this.$loading({ diff --git a/src/views/map/mapdraft/mapmanage/operateMenu.vue b/src/views/map/mapdraft/mapmanage/operateMenu.vue index 3d90068be..c0a03315e 100644 --- a/src/views/map/mapdraft/mapmanage/operateMenu.vue +++ b/src/views/map/mapdraft/mapmanage/operateMenu.vue @@ -63,10 +63,10 @@ export default { label: this.$t('map.deleteObj'), handler: this.deleteObj }, - // { - // label: this.$t('map.jlmap3d'), - // handler: this.jlmap3d - // } + { + label: this.$t('map.jlmap3d'), + handler: this.jlmap3d + } ], menuNormal: [], menu: [] diff --git a/src/views/scriptManage/create.vue b/src/views/scriptManage/create.vue index e3dd3c66b..24a9aa1d9 100644 --- a/src/views/scriptManage/create.vue +++ b/src/views/scriptManage/create.vue @@ -48,13 +48,13 @@ rules() { let crules = { name: [ - { required: true, message: '请输入剧本', trigger: 'blur' }, + { required: true, message: this.$t('scriptRecord.inputScriptName'), trigger: 'blur' }, ], mapId: [ - { required: true, message: '请选择地图', trigger: 'change' }, + { required: true, message: this.$t('scriptRecord.selectMap'), trigger: 'change' }, ], description:[ - { required: true, message: '请输入剧本描述', trigger: 'blur' }, + { required: true, message: this.$t('scriptRecord.inputScriptDescription'), trigger: 'blur' }, ] } return crules diff --git a/src/views/scriptManage/home.vue b/src/views/scriptManage/home.vue index e990827cb..ad5ae03fc 100644 --- a/src/views/scriptManage/home.vue +++ b/src/views/scriptManage/home.vue @@ -243,13 +243,22 @@ export default { }, covertData(row){ let releaseReview=ConstConfig.ConstSelect.releaseReview; - let lastData=Object.assign({}, row) ; - releaseReview.forEach(function(element){ - let rolename=element.value; - if(lastData.status==rolename){ - lastData.status=element.label; - } - }); + let lastData=Object.assign({}, row); + if(Cookies.get("user_lang")=="en"){ + releaseReview.forEach(function(element){ + let rolename=element.value; + if(lastData.status==rolename){ + lastData.status=element.enlabel; + } + }); + }else{ + releaseReview.forEach(function(element){ + let rolename=element.value; + if(lastData.status==rolename){ + lastData.status=element.label; + } + }); + } return lastData.status; // let explanation=lastData.explanation?'{ 说明:'+lastData.explanation+'}':''; // return lastData.status+explanation; diff --git a/src/views/systemGenerate/create.vue b/src/views/systemGenerate/create.vue new file mode 100644 index 000000000..06a773480 --- /dev/null +++ b/src/views/systemGenerate/create.vue @@ -0,0 +1,157 @@ + + + diff --git a/src/views/systemGenerate/generate.vue b/src/views/systemGenerate/generate.vue new file mode 100644 index 000000000..2483a2444 --- /dev/null +++ b/src/views/systemGenerate/generate.vue @@ -0,0 +1,75 @@ + + + \ No newline at end of file diff --git a/src/views/systemGenerate/index.vue b/src/views/systemGenerate/index.vue index f95a5c4c2..c55d83979 100644 --- a/src/views/systemGenerate/index.vue +++ b/src/views/systemGenerate/index.vue @@ -4,6 +4,9 @@ 地图子系统生成 --> + + + - @@ -23,8 +25,10 @@