diff --git a/src/i18n/langs/en/orderAuthor.js b/src/i18n/langs/en/orderAuthor.js index 3acd72024..d0967c8d9 100644 --- a/src/i18n/langs/en/orderAuthor.js +++ b/src/i18n/langs/en/orderAuthor.js @@ -100,11 +100,17 @@ export default { permission: 'Permission', orderSelectionItem: 'Order selection item', orderDetails: 'Order details', + universalPackage: '万能权限', + createPackage: '创建权限', + package: '权限包', + basePackage: '基础权限', statusType: 'Status type', private: 'Private', public: 'Public', pleaseEnterContent: 'Please enter content', selectGoods: 'Select Goods', month: ' month', - yuan: ' yuan' + yuan: ' yuan', + back: '返回', + next: '下一步' }; diff --git a/src/i18n/langs/en/planMonitor.js b/src/i18n/langs/en/planMonitor.js index 067b1c463..65b9abd8d 100644 --- a/src/i18n/langs/en/planMonitor.js +++ b/src/i18n/langs/en/planMonitor.js @@ -29,6 +29,86 @@ export default { deleteSuccess: 'Delete success!', pleaseSelectRunplan: 'please select run graph' }, + modifying: { + tripNumber: 'Trip number: ', + pleaseSelect: 'Please select', + manual: 'Manual', + defaultStopTime: 'Default stop time', + serviceNumber: 'Service number: ', + clearGuest: 'Clear guest', + continuationPlan: 'Continuation plan', + firstTrain: 'First train', + serialNumber: 'Serial number: ', + defaultRunLevel: 'Default run level: ', + startTime: 'Start Time:', + selectTime: 'Select Time', + inStock: 'In Stock', + outStock: 'Out Stock', + lastTrain: 'Last Train', + route: 'Route: ', + // 起始站 + // 起始区段 + // 终到站 + // 终到区段 + // 描述 + detail: 'Detail: ', + station: 'Station', + section: 'Section', + stopTime: 'Stop time', + runLevel: 'Run level', + arrivalTime: 'Arrival time', + departureTime: 'Departure time', + showDefaultTime: 'Show default stop time and run level', + automatic: 'Automatic', + default: 'Default', + modifyTask: 'Modify task', + setMessageTip1: 'Please set the start interval of the start section', + setMessageTip2: 'to the section', + setMessageTip3: '.', + modifyTaskSuccess: 'Modify task success!', + modifyTaskFailed: 'Modify task failed', + + startingStation: 'Start station', + startSection: 'Start section', + endStation: 'End station', + endSection: 'End section', + direction: 'Direction', + distance: 'Distance', + operation: 'Operation', + edit: 'Edit', + save: 'Save', + cancelAndQuit: 'Cancel and quit', + modifySuccess: 'Modify Success', + modifyFailed: 'Modify Failed', + modifyRunLevel: 'Modify run level', + + startStationTips: 'Start station departure time unchanged', + endStationTips: 'End station departure time unchanged', + startStationTitle: 'Start station', + startedStation: 'Start station', + endStationTitle: 'End station', + endedStation: 'End station', + description: 'Description', + modifyTaskRoute: 'Modify task route', + + modifyStartTime: 'Modify start time: ', + modifyStartTimeTitle: 'Modify start time', + search: 'Search', + modifyTwoStationTime: 'Modify the time between the two stations' + }, + editSmoothRun: { + trainProportion: 'Train proportion', + allTheLoopTrainProportion: 'Use the same size loop train proportion for all time periods', + sizeOfTheLoopTrainProportion: 'Large loop and small loop train proportion', + pleaseSelect: 'Please select', + startTime: 'Start time', + stopTime: 'Stop time', + runInterval: 'Run interval', + add: 'Add', + delete: 'Delete', + modify: 'Modify', + editSmoothRunTime: 'Edit smooth run time' + }, buy: 'Buy', offlineMappingSoftware: 'Offline mapping software', lianPlanSystem: 'Urban rail transit lian planning system', @@ -67,7 +147,7 @@ export default { runLevel: 'Run level', platform: 'Platform', modifyPlatformProperties: 'Modify platform properties', - file: 'file', + file: 'File', openRunningDiagram: 'Open run graph', createRunningDiagram: 'Create run graph', modifyRunningDiagramName: 'Modify run graph name', @@ -146,5 +226,6 @@ export default { task: 'Task', startTime: 'Start time', endTime: 'End time', - editPlanningTrain: 'Edit planning train' + editPlanningTrain: 'Edit planning train', + runGraphName: 'Run graph name' }; diff --git a/src/i18n/langs/en/rules.js b/src/i18n/langs/en/rules.js index 2e0588e95..83149866a 100644 --- a/src/i18n/langs/en/rules.js +++ b/src/i18n/langs/en/rules.js @@ -276,6 +276,7 @@ export default { accessNumber: 'Please input the number of permissions', courseNameEmpty: 'Course name cannot be empty', purchaseMonth: 'Please input the number of months to buy', + pleaseEnterGoodPrice: '请输入商品价格', enterTheNameOfTheRunGraph: 'Please enter the name of the run graph', chooseToPublishTheRunGraph: 'Please choose to publish the run chart', enterTheAlarmCode: 'Please enter the alarm code', diff --git a/src/i18n/langs/en/tip.js b/src/i18n/langs/en/tip.js index 06013133e..2be739c0c 100644 --- a/src/i18n/langs/en/tip.js +++ b/src/i18n/langs/en/tip.js @@ -171,6 +171,9 @@ export default { selectSpeedLimitValueTip: 'Please select the speed limit value, click the "release" button, and issue the command!', addTrainIdTip: 'Add train identification number: successful', editTrainIdTip: 'Modify train identification number: successful', + enterPrice: '请输入价格', + publishMap: '获取发布地图', + addPackage: '请添加权限', deletePlanSuccessfully: 'Delete plan successfully', deletePlanFailed: 'Delete plan failed', importRunGraphFailed: 'Import the run graph failed:', diff --git a/src/i18n/langs/zh/orderAuthor.js b/src/i18n/langs/zh/orderAuthor.js index d117c5175..937191068 100644 --- a/src/i18n/langs/zh/orderAuthor.js +++ b/src/i18n/langs/zh/orderAuthor.js @@ -105,8 +105,11 @@ export default { createPackage: '创建权限', package: '权限包', basePackage: '基础权限', + universalPackage: '万能权限', pleaseEnterContent: '请输入内容', selectGoods: '选择商品', month: '月', - yuan: '元' + yuan: '元', + back: '返回', + next: '下一步' }; diff --git a/src/i18n/langs/zh/planMonitor.js b/src/i18n/langs/zh/planMonitor.js index 9a8f2d81f..1231022a0 100644 --- a/src/i18n/langs/zh/planMonitor.js +++ b/src/i18n/langs/zh/planMonitor.js @@ -29,7 +29,87 @@ export default { deleteSuccess: '删除成功!', pleaseSelectRunplan: '请选择运行图' }, + modifying: { + tripNumber: '车次号:', + pleaseSelect: '请选择', + manual: '手工', + defaultStopTime: '缺省停站时间:', + serviceNumber: '表号:', + clearGuest: '清客', + continuationPlan: '延续计划', + firstTrain: '首班车', + serialNumber: '序列号:', + defaultRunLevel: '缺省运行等级:', + startTime: '开始时间', + selectTime: '选择时间', + inStock: '入库', + outStock: '出库', + lastTrain: '末班车', + route: '交路:', + // startingStation 起始站 + // startSection 起始区段 + // endStationTitle 终到站 + // endSection 终到区段 + // description 描述 + detail: '详情:', + station: '车站', + section: '区段', + stopTime: '停站时间', + runLevel: '运行等级', + arrivalTime: '到点', + departureTime: '发点', + showDefaultTime: '显示默认停站时间和运行等级', + automatic: '自动', + default: '默认', + modifyTask: '修改任务', + setMessageTip1: '请先设置开始区段', + setMessageTip2: '终到区段', + setMessageTip3: '的站间运行时间', + modifyTaskSuccess: '修改任务成功!', + modifyTaskFailed: '修改任务失败', + startingStation: '起始站', + startSection: '起始区段', + endStation: '终点站', + endSection: '终点区段', + direction: '方向', + distance: '距离', + operation: '操作', + edit: '编辑', + save: '保存', + cancelAndQuit: '取消&退出', + modifySuccess: '修改成功!', + modifyFailed: '修改失败', + modifyRunLevel: '修改运行等级', + + startStationTips: '起始站发车时间不变', + endStationTips: '终到站到达时间不变', + startStationTitle: '起始站', + startedStation: '起始站台', + endStationTitle: '终到站', + endedStation: '终到站台', + description: '描述', + modifyTaskRoute: '修改任务交路', + time: '时间', + + modifyStartTime: '修改开始时间:', + modifyStartTimeTitle: '修改起始时间', + search: '查找', + modifyTwoStationTime: '修改两站之间的时间' + }, + editSmoothRun: { + trainProportion: '分车比例', + allTheLoopTrainProportion: '所有时段使用相同大小环路分车比例', + sizeOfTheLoopTrainProportion: '大环路与小环路分车比例:', + pleaseSelect: '请选择', + startTime: '开始时间', + stopTime: '结束时间', + runInterval: '运行间隔', + add: '增加', + delete: '删除', + modify: '修改', + editSmoothRunTime: '编辑平稳运行时段' + }, buy: '购买', offlineMappingSoftware: '离线编图软件', lianPlanSystem: '城市轨道交通琏计划系统', diff --git a/src/i18n/langs/zh/rules.js b/src/i18n/langs/zh/rules.js index 53398d01b..29842be55 100644 --- a/src/i18n/langs/zh/rules.js +++ b/src/i18n/langs/zh/rules.js @@ -278,6 +278,7 @@ export default { enterTheTripNumber: '请输入车次号', enterTheTargetCode: '请输入目的地号', selectStation: '请选择车站', + pleaseEnterGoodPrice: '请输入商品价格', enterTheNameOfTheRunGraph: '请输入运行图名称', chooseToPublishTheRunGraph: '请选择发布运行图', enterTheAlarmCode: '请输入报警器编号', diff --git a/src/i18n/langs/zh/tip.js b/src/i18n/langs/zh/tip.js index 7d518c188..79890a85e 100644 --- a/src/i18n/langs/zh/tip.js +++ b/src/i18n/langs/zh/tip.js @@ -171,6 +171,9 @@ export default { selectSpeedLimitValueTip: '请选择限速值后,点击“下达”按钮,下达命令!', addTrainIdTip: '添加列车识别号:成功', editTrainIdTip: '修改列车识别号:成功', + enterPrice: '请输入价格', + publishMap: '获取发布地图', + addPackage: '请添加权限', deletePlanSuccessfully: '删除计划成功', deletePlanFailed: '删除计划失败', importRunGraphFailed: '导入运行图失败:', diff --git a/src/jmap/theme/chengdu_03/planConvert.js b/src/jmap/theme/chengdu_03/planConvert.js index 3f7684b29..30e023917 100644 --- a/src/jmap/theme/chengdu_03/planConvert.js +++ b/src/jmap/theme/chengdu_03/planConvert.js @@ -27,7 +27,7 @@ export default { importData(Sheet, JsonData) { var dataList = convertSheetToList(Sheet, false); var needList = Object.keys(this.ExcelConfig.columns); - + debugger; if (dataList && dataList.length) { for (var rowIndex = this.ExcelConfig.beginRow; rowIndex < dataList.length; rowIndex += 1) { for (var colIndex = this.ExcelConfig.beginCol; colIndex < dataList[this.ExcelConfig.beginCol].length; colIndex += this.ExcelConfig.fieldNum + 1) { diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 871e8ec9c..09e20008f 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -3,10 +3,10 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - BASE_API = 'https://test.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.41:9000'; // 王兴杰 + BASE_API = 'http://192.168.3.41:9000'; // 王兴杰 } else { BASE_API = process.env.VUE_APP_BASE_API; } diff --git a/src/views/orderauthor/permission/create/index.vue b/src/views/orderauthor/permission/create/index.vue index 9bd8a2c07..1273141b5 100644 --- a/src/views/orderauthor/permission/create/index.vue +++ b/src/views/orderauthor/permission/create/index.vue @@ -70,7 +70,8 @@ export default { permissionId: good.permissionId, name: good.name, remarks: good.remarks, - price: good.price + price: good.price, + list: good.list }]; this.$refs.orderForm.setOrderName(good, permission); this.display = 1; diff --git a/src/views/orderauthor/permission/create/list.vue b/src/views/orderauthor/permission/create/list.vue index 0cbb46879..7f03b3d15 100644 --- a/src/views/orderauthor/permission/create/list.vue +++ b/src/views/orderauthor/permission/create/list.vue @@ -1,7 +1,16 @@