diff --git a/src/api/trainingPlatform.js b/src/api/trainingPlatform.js index 75f8c4705..1dd8282b3 100644 --- a/src/api/trainingPlatform.js +++ b/src/api/trainingPlatform.js @@ -1,10 +1,11 @@ import request from '@/utils/request'; -export function getTrainingSystemList(cityCode) { +export function getTrainingSystemList(cityCode, params) { /** 根据cityCode后去对应地图及其子系统 */ return request({ url: `/api/mapSystem/city/${cityCode}`, - method: 'get' + method: 'get', + params }); } @@ -76,3 +77,11 @@ export function updateSubSystem(id, data) { }); } +export function deleteSubSystem(id) { + /** 删除地图系统 */ + return request({ + url: `/api/mapSystem/${id}`, + method: 'delete' + }); +} + diff --git a/src/i18n/langs/en/menu.js b/src/i18n/langs/en/menu.js index 8026f15ff..fab47a954 100644 --- a/src/i18n/langs/en/menu.js +++ b/src/i18n/langs/en/menu.js @@ -491,5 +491,6 @@ export default { settingTrain: 'Setting train', sourceTrainWindow: 'Source train window', trainWindow: 'Train window', - targetTrainWindow: 'Target train window' + targetTrainWindow: 'Target train window', + category: 'category' }; diff --git a/src/i18n/langs/en/systemGenerate.js b/src/i18n/langs/en/systemGenerate.js index cf112ff3f..c47b10e42 100644 --- a/src/i18n/langs/en/systemGenerate.js +++ b/src/i18n/langs/en/systemGenerate.js @@ -22,5 +22,9 @@ export default { getSubSystemInfoFail: 'Get subsystem infomation failed', updateMapSystemSuccess: 'Update map system success', updateMapSystemFail: 'Update map system failed', - generation: 'One-click Generation' + generation: 'One-click Generation', + deleteData: 'Delete', + deleteMapSystemSuccess: 'Delete map system success', + deleteMapSystemFail: 'Delete map system fail', + deleteMapSystemTip: 'This action will apply to delete map system, whether to continue?' }; diff --git a/src/i18n/langs/zh/menu.js b/src/i18n/langs/zh/menu.js index 21ca42c26..c4cd66d80 100644 --- a/src/i18n/langs/zh/menu.js +++ b/src/i18n/langs/zh/menu.js @@ -487,6 +487,7 @@ export default { settingTrain: '设置列车', sourceTrainWindow: '源车次窗', trainWindow: '车次窗', - targetTrainWindow: '目的车次窗' + targetTrainWindow: '目的车次窗', + category: '类别' }; diff --git a/src/i18n/langs/zh/systemGenerate.js b/src/i18n/langs/zh/systemGenerate.js index bf4a97b44..059145485 100644 --- a/src/i18n/langs/zh/systemGenerate.js +++ b/src/i18n/langs/zh/systemGenerate.js @@ -22,6 +22,10 @@ export default { getSubSystemInfoFail: '获取子系统信息失败', updateMapSystemSuccess: '更新地图系统成功', updateMapSystemFail: '更新地图系统失败', - generation: '一键生成' + generation: '一键生成', + deleteData: '删除', + deleteMapSystemSuccess: '删除地图系统成功', + deleteMapSystemFail: '删除地图系统失败', + deleteMapSystemTip: '此操作将删除地图系统, 是否继续?' }; diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/trainControl.vue b/src/jmap/theme/fuzhou_01/menus/dialog/trainControl.vue index f82e528a6..0bc7e8b4b 100644 --- a/src/jmap/theme/fuzhou_01/menus/dialog/trainControl.vue +++ b/src/jmap/theme/fuzhou_01/menus/dialog/trainControl.vue @@ -52,19 +52,17 @@ :disabled="targetCodeIsDisabled" /> - + @@ -99,12 +97,18 @@ export default { data() { return { trainList: [], + categoryList: [ + { name: 'MM', value: '01' }, + { name: 'BB', value: '02' }, + { name: 'AA', value: '03' } + ], formModel: { tripNumber: '', groupNumber: '', trainType: '01', serviceNumber: '', - targetCode: '' + targetCode: '', + category: 'MM' }, rules: { @@ -252,6 +256,14 @@ export default { 'formModel.tripNumber': function(val) { if (val.length == 4) { this.trainNoChange(val); + } else { + this.formModel = { + groupNumber: this.formModel.groupNumber, + tripNumber: val, + trainType: this.formModel.trainType, + serviceNumber: '', + targetCode: '' + }; } } }, @@ -278,12 +290,11 @@ export default { const model = this.$store.getters['map/getDeviceByCode'](selected.code); this.formModel = { groupNumber: model.groupNumber, - tripNumber: model.tripNumber, + tripNumber: `${model.directionCode}${model.tripNumber}`, trainType: model.type, - serviceNumber: '', - targetCode: '' + serviceNumber: model.serviceNumber, + targetCode: model.targetCode }; - debugger; /** 加载列车数据*/ this.loadInitData(this.map); @@ -340,7 +351,7 @@ export default { const operate = { send: true, type: MapDeviceType.Train.type, - val: `${tripNumber}`, + val: tripNumber, operation: '' }; @@ -351,16 +362,25 @@ export default { } OperateHandler.backStep(1); this.$store.dispatch('training/next', operate).then(({ valid, response }) => { - console.log(valid, response, 111); - if (valid && response.data) { - this.formModel = { - groupNumber: this.formModel.groupNumber, - tripNumber: tripNumber, - trainType: '01', - serviceNumber: response.data.serviceNumber, - targetCode: response.data.tripNumber - }; - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + if (valid) { + if (response.data) { + this.formModel = { + groupNumber: this.formModel.groupNumber, + tripNumber: tripNumber, + trainType: this.formModel.trainType, + serviceNumber: response.data.serviceNumber, + targetCode: response.data.targetCode + }; + this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + } else { + this.formModel = { + groupNumber: this.formModel.groupNumber, + tripNumber: tripNumber, + trainType: this.formModel.trainType, + serviceNumber: '', + targetCode: '' + }; + } } }); }, @@ -413,7 +433,7 @@ export default { type: MapDeviceType.Train.type, operation: OperationEvent.Train.editTrainId.menu.operation, messages: [this.$t('tip.editTrainIdTip')], - val: `01::${this.formModel.tripNumber}` + val: `${this.formModel.trainType}::${this.formModel.tripNumber}` }; this.loading = true; diff --git a/src/router/index.js b/src/router/index.js index 0c38f881b..bdbd75af7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -22,6 +22,7 @@ import JointTraining from '@/views/jointTraining/index'; import Error401 from '@/views/error-page/401'; import Errpr404 from '@/views/error-page/404'; + import SkinCode from '@/views/map/skinCode/index'; import SkinCodeDraft from '@/views/map/skinCode/draft'; import Mapdraft from '@/views/map/mapdraft/index'; @@ -29,6 +30,7 @@ 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 Trainingrecord from '@/views/lesson/trainingrecord/index'; import TrainingrecordManage from '@/views/lesson/trainingrecord/manage/index'; import Taskmanage from '@/views/lesson/taskmanage/list'; @@ -61,7 +63,6 @@ import ScreenMonitorDetail from '@/views/screenMonitor/detail/index'; import PlanMonitorEditTool from '@/views/planMonitor/editTool/index'; import PlanMonitorEditUserTool from '@/views/planMonitor/editTool/userindex'; - import PlanMonitor from '@/views/planMonitor/index'; import PlanMonitorHome from '@/views/planMonitor/home'; import PlanMonitorDetail from '@/views/planMonitor/detail'; @@ -95,12 +96,10 @@ import OrderList from '@/views/orderauthor/order/list'; import OrderDraft from '@/views/orderauthor/order/draft'; import Author from '@/views/orderauthor/author/index'; import AuthorDraft from '@/views/orderauthor/author/draft/ruleForm'; - import Permission from '@/views/orderauthor/permission/index'; import PermissionDetail from '@/views/orderauthor/permission/detail'; import PermissionDraft from '@/views/orderauthor/permission/draft/ruleForm'; import PermissionCreate from '@/views/orderauthor/permission/create/index'; - import UserRules from '@/views/orderauthor/rules/index'; import UserRulesDetail from '@/views/orderauthor/rules/detail'; diff --git a/src/scripts/DeviceTypeDic.js b/src/scripts/DeviceTypeDic.js deleted file mode 100644 index 68be8bc23..000000000 --- a/src/scripts/DeviceTypeDic.js +++ /dev/null @@ -1,26 +0,0 @@ -export default { - ConstSelect: { - // 剧本录制模块枚举 - deviceType: [ - {label: '进路', value: 'Route'}, - {label: '区段', value: 'Section'}, - {label: '信号机', value: 'Signal'}, - {label: '站台', value: 'StationStand'}, - {label: '集中站', value: 'Station'}, - {label: '控制模式', value: 'StationControl'}, - {label: '道岔', value: 'Switch'}, - {label: '列车', value: 'Train'} - ], - // 行为触发条件类型 - triggerType: [ - {label: '对话', value: 'Conversation'}, - {label: '设备', value: 'DeviceCondition'}, - {label: '无', value: 'None'} - ], - // 动作类型 - actionType: [ - {label: '对话', value: 'Conversation'}, - {label: '指令', value: 'Command'} - ] - } -}; diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 4a9d2ec3e..dddc1bdf3 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -4,6 +4,7 @@ import { getToken, setToken, removeToken, removeScreenToken, setScreenToken, get import { getUserConfigInfo } from '@/api/management/user'; import { LoginParams } from '@/utils/login'; import { creatSubscribe, perpetualTopic } from '@/utils/stomp'; +import Cookies from 'js-cookie'; const user = { state: { @@ -174,10 +175,10 @@ const user = { FedLogOut({ commit }, clientId) { return new Promise(resolve => { if (clientId == LoginParams.DaPing.clientId) { - commit('SET_TOKENDESIGN', ''); + commit('SET_TOKENSCREEN', ''); removeScreenToken(); } else if (clientId == LoginParams.Design.clientId) { - commit('SET_TOKENSCREEN', ''); + commit('SET_TOKENDESIGN', ''); removeDesignToken(); } // else if (clientId == LoginParams.LianJiHua.clientId) { @@ -201,6 +202,10 @@ const user = { commit('SET_ROLES', []); commit('SET_ID', ''); removeSessionStorage('design'); + Cookies.remove('UserDesignName'); + Cookies.remove('UserDesignToken'); + Cookies.remove('UserName'); + Cookies.remove('UserToken'); handleRemoveToken(); resolve(); }).catch(error => { diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index f997f31f4..5935e41a6 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -4,8 +4,8 @@ export function getBaseUrl() { if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; // BASE_API = 'https://test.joylink.club/jlcloud'; - BASE_API = 'http://192.168.3.5:9000'; // 袁琪 - // BASE_API = 'http://192.168.3.6:9000'; // 旭强 + // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 + BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.41:9000'; // 王兴杰 } else { BASE_API = process.env.VUE_APP_BASE_API; diff --git a/src/views/designPlatform/home.vue b/src/views/designPlatform/home.vue index b73cbfa7e..76c1054a8 100644 --- a/src/views/designPlatform/home.vue +++ b/src/views/designPlatform/home.vue @@ -4,7 +4,7 @@

城市轨道交通设计平台 - +

diff --git a/src/views/scriptManage/category/tree.vue b/src/views/scriptManage/category/tree.vue deleted file mode 100644 index a31f89370..000000000 --- a/src/views/scriptManage/category/tree.vue +++ /dev/null @@ -1,147 +0,0 @@ - - - diff --git a/src/views/scriptManage/create.vue b/src/views/scriptManage/create.vue index 24a9aa1d9..759fdb286 100644 --- a/src/views/scriptManage/create.vue +++ b/src/views/scriptManage/create.vue @@ -25,8 +25,7 @@ name: '', mapId: '', description:'' - }, - isShow: false, + } } }, props: { @@ -59,9 +58,6 @@ } return crules }, - // title() { - // return '创建剧本' - // } }, mounted() { this.loadInitData(); @@ -101,7 +97,6 @@ }, doClose() { this.$refs.dataform.resetForm(); - this.isShow = false; this.dialogVisible = false } } diff --git a/src/views/scriptManage/home.vue b/src/views/scriptManage/home.vue index ad5ae03fc..661db766e 100644 --- a/src/views/scriptManage/home.vue +++ b/src/views/scriptManage/home.vue @@ -1,56 +1,10 @@