Commit Graph

13410 Commits

Author SHA1 Message Date
fan
0297144b16 代码调整 2023-07-11 11:22:41 +08:00
fan
f17a54b860 代码调整 2023-07-10 13:19:51 +08:00
fan
78122f6e7a 代码调整 2023-07-10 10:48:00 +08:00
fan
7ff2271c38 代码调整 2023-07-10 10:22:27 +08:00
fan
502a994451 代码调整 2023-07-07 18:03:03 +08:00
fan
104496ac5a 代码调整 2023-07-07 17:07:51 +08:00
fan
977d8df4b6 代码调整 2023-07-07 16:33:22 +08:00
Yuan
f2cdfe5ee1 Merge branch 'thailand' of git.code.tencent.com:lian-cbtc/jl-client into thailand 2023-07-07 16:25:24 +08:00
Yuan
1580b0a509 泰国运行计划 2023-07-07 16:25:20 +08:00
fan
1555d9f401 Merge branch 'thailand' of https://git.code.tencent.com/lian-cbtc/jl-client into thailand 2023-07-07 11:22:58 +08:00
fan
731c716036 代码调整 2023-07-07 11:22:35 +08:00
Yuan
51e678011c Merge branch 'thailand' of git.code.tencent.com:lian-cbtc/jl-client into thailand 2023-07-06 15:21:50 +08:00
Yuan
7ce62aead4 泰国运行计划界面 2023-07-06 15:19:27 +08:00
fan
8795adbe72 车站调整 2023-07-06 10:24:40 +08:00
fan
d501fe2792 成员一键生成 2023-07-06 09:54:52 +08:00
fan
26d75c1bf3 转英文 2023-07-05 11:12:26 +08:00
fan
fc05f5ef13 设备登录退出路径丢失调整 2023-07-05 10:54:55 +08:00
fan
4d92751f7d 泰国项目调整 2023-07-05 10:42:33 +08:00
fan
c98746317c Merge branch 'thailand' of https://git.code.tencent.com/lian-cbtc/jl-client into thailand 2023-07-05 10:32:47 +08:00
fan
03be9f8f75 泰国项目调整 2023-07-05 10:32:21 +08:00
Yuan
d61deb1de4 Merge branch 'thailand' of git.code.tencent.com:lian-cbtc/jl-client into thailand 2023-07-05 09:51:28 +08:00
Yuan
bb8989ba1a 运行计划设置框 2023-07-05 09:51:25 +08:00
Yuan
4e0fa46cc2 设备类型增加沙盘 2023-07-05 09:50:49 +08:00
fan
b898aee79a 泰国项目调整 2023-07-04 18:05:58 +08:00
fan
b1345badec 泰国项目调整 2023-07-04 13:27:52 +08:00
fan
0cb84ab7aa 泰国路由调整 2023-06-09 10:52:05 +08:00
fan
a64b627982 泰国项目翻译调整 2023-06-05 11:08:35 +08:00
fan
78cbf08eda 泰国项目翻译调整 2023-06-05 11:04:24 +08:00
fan
8b2c00e7fa 列车操作调整 2023-06-05 09:37:31 +08:00
fan
8d2939197f 泰国翻译调整 2023-06-05 09:11:16 +08:00
fan
9648f95d4e Merge remote-tracking branch 'origin/test' into thailand 2023-06-02 17:33:18 +08:00
fan
228b4aadc3 列车操作调整 2023-06-02 17:32:58 +08:00
fan
04b49c870e Merge remote-tracking branch 'origin/test' into thailand 2023-06-02 16:54:47 +08:00
fan
0df4ffdcf6 登录调整 2023-06-02 16:54:05 +08:00
fan
fd5248bf3f 泰国翻译调整 2023-06-02 14:29:43 +08:00
fan
2a85d2e6cf Merge remote-tracking branch 'origin/test' into thailand 2023-06-02 14:27:34 +08:00
fan
b1c0ef11a8 设备登录配置调整&列车操作列车图标反转调整 2023-06-02 14:21:29 +08:00
fan
c84cc54639 泰国翻译 2023-06-01 16:17:14 +08:00
fan
795e8d8196 泰国翻译 2023-06-01 16:16:20 +08:00
fan
6a9aa02cc3 Merge remote-tracking branch 'origin/test' into thailand
# Conflicts:
#	src/jmapNew/theme/components/menus/dialog/setFault.vue
#	src/jmapNew/theme/datie_01/menus/menuDialog/helpAbout.vue
#	src/jmapNew/theme/datie_02/menus/menuSection.vue
#	src/jmapNew/theme/datie_jd1a/menus/menuDialog/helpAbout.vue
#	src/jmapNew/theme/datie_ksk/menus/menuDialog/helpAbout.vue
#	src/scripts/ConstConfig.js
#	src/views/newMap/display/chatBox.vue
#	src/views/newMap/display/memberManage/membersManage.vue
#	src/views/newMap/display/simulationMenu/simulationMenu.vue
#	src/views/newMap/display/terminals/equipmentConstructionTable.vue
#	src/views/newMap/display/terminals/registerBook.vue
#	src/views/newMap/display/terminals/terminalMenu.vue
#	src/views/newMap/display/trainingList/trainingMenu.vue
#	src/views/newMap/display/trainingList/trainingTip.vue
2023-06-01 16:15:38 +08:00
fan
928b380811 大铁线路二注释新建计划车&新增故障操作添加备用车 2023-06-01 15:43:46 +08:00
fan
06ec5fe8e1 项目登录客户端选择调整 2023-06-01 10:21:24 +08:00
fan
0f22d3c818 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-06-01 09:40:58 +08:00
fan
4471a3000c 设备登录query错误数据调整 2023-06-01 09:39:43 +08:00
dong
50cf3a826d 薄册输入时间日期实训调整 2023-05-31 17:39:02 +08:00
dong
61915cd583 实训编制时添加跳转到当前步骤功能 2023-05-31 14:22:05 +08:00
dong
252d3d69e4 会话群创建添加实训操作 2023-05-31 14:01:25 +08:00
fan
5ad0421991 增加错误日志 2023-05-31 10:24:16 +08:00
fan
228044b4c9 多人实训调整 2023-05-31 09:46:54 +08:00
fan
f13252ff27 34234124 2023-05-30 17:54:40 +08:00