joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
11,774 Commits 20 Branches 0 Tags 448 MiB
3efdd6b316
Commit Graph

11402 Commits

Author SHA1 Message Date
fan
a2ccd82208 画面切换处理不同线路私有属性 2022-07-22 10:16:30 +08:00
fan
2c770a5bcc 暂提 2022-07-21 18:12:28 +08:00
joylink_cuiweidong
a9bd7ef945 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-21 17:25:59 +08:00
joylink_cuiweidong
8279ea9b39 大铁线路III型 信号机 添加 总人解指令 2022-07-21 17:25:40 +08:00
dong
13df1ba98d 信号加封解封 2022-07-21 17:17:31 +08:00
joylink_cuiweidong
5909f738f7 大铁项目 ctc 修改 改方、闭塞等操作 调整 2022-07-21 16:57:09 +08:00
joylink_cuiweidong
1deb1e017d 代码调整 2022-07-21 15:08:07 +08:00
joylink_cuiweidong
891cf8761c 代码调整 2022-07-21 11:25:21 +08:00
fan
6794e6370f 大铁二号线故障名称调整 2022-07-21 11:08:48 +08:00
fan
f6a5512cfc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-21 10:15:12 +08:00
fan
15e8006f5a ctc=>车务终端 2022-07-21 10:14:29 +08:00
joylink_cuiweidong
80408014fd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-20 18:20:37 +08:00
joylink_cuiweidong
a63827cd62 大铁线路III型 信号机 延时解锁 状态调整 2022-07-20 18:20:26 +08:00
fan
43ae2bd1fb 语音合成调整 2022-07-20 17:20:32 +08:00
Yuan
1c07eeef75 merge 2022-07-20 15:37:23 +08:00
Yuan
c4fc19c88e JD1A-信号按钮和表示状态修改 2022-07-20 15:35:55 +08:00
fan
0c34aa9163 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-20 15:07:13 +08:00
fan
172415dccf 显示配置调整 2022-07-20 15:07:02 +08:00
joylink_cuiweidong
4ab68d8731 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-20 14:40:16 +08:00
joylink_cuiweidong
20cf7de453 大铁线路III型 道岔 设置分路不良 取消分路不良 区段故障解锁 2022-07-20 14:39:57 +08:00
fan
e332f91eae ctc 非常站控下限制操作 2022-07-20 14:08:33 +08:00
fan
68bd166d27 车站发车预告语音播报 2022-07-20 13:14:08 +08:00
fan
3f07b9f554 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-20 10:05:52 +08:00
fan
b9ceb3a22a 长兴技术=》长兴技师 2022-07-20 10:05:22 +08:00
fan
ac6f16b360 语音播报暂提 2022-07-20 10:03:33 +08:00
joylink_cuiweidong
751733c450 大铁线路III型 道岔 道岔封锁 单锁 侧防 引导总锁 代码调整 2022-07-20 09:34:04 +08:00
joylink_cuiweidong
b6f4fc611f 大铁线路III型 道岔 挤岔状态代码调整 道岔名称代码调整 2022-07-19 17:14:52 +08:00
joylink_cuiweidong
45e6c90be9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-19 16:53:54 +08:00
joylink_cuiweidong
dd1b7b934e 大铁线路III型 定反位 实心小圆圈 失表状态调整 2022-07-19 16:53:37 +08:00
dong
e3c04e96a3 调度命令查询界面功能 2022-07-19 14:50:52 +08:00
joylink_cuiweidong
226f0fd71b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-19 14:04:08 +08:00
joylink_cuiweidong
a6bed94153 修改 特殊侵限分隔符 的绘制代码 2022-07-19 14:03:48 +08:00
fan
3d9419b809 指示灯关联必填调整 2022-07-19 13:41:55 +08:00
fan
93930bb8c3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-19 10:09:07 +08:00
fan
19ff4db593 信号按钮调整 2022-07-19 10:08:40 +08:00
joylink_cuiweidong
efab2fb9f2 大铁项目 ctc 行车日志 代码调整 2022-07-18 17:49:13 +08:00
joylink_cuiweidong
deece104b1 大铁项目 ctc 运行图初始化信息 改完通过接口拉取 2022-07-18 17:18:55 +08:00
joylink_cuiweidong
4b1c1aae49 TYJL-III型 区段 添加 分路不良标记 2022-07-18 16:37:08 +08:00
joylink_cuiweidong
d67b390b46 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-18 16:19:01 +08:00
joylink_cuiweidong
4583733127 大铁项目 切换角色 ctc 行车日志 数据切换 2022-07-18 16:17:53 +08:00
fan
fa3c110fbb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-18 15:05:49 +08:00
fan
46ab43aef3 车务终端分散自律亮灯&占线板默认选中 2022-07-18 15:01:35 +08:00
joylink_cuiweidong
953b63bd1a 代码调整 2022-07-18 13:49:24 +08:00
joylink_cuiweidong
b3e3dd7898 代码调整 2022-07-18 13:22:48 +08:00
fan
2011f1838c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-18 13:08:01 +08:00
fan
e176823ec6 占线板&进路序列调整 2022-07-18 13:07:45 +08:00
Yuan
3c82c261fa Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly 2022-07-15 18:27:10 +08:00
Yuan
fbf6e5fa2c resolve conflict 2022-07-15 18:10:37 +08:00
Yuan
e947e50a0d 增加几个按钮类型 2022-07-15 18:08:39 +08:00
Yuan
0943fc515d bugfix 2022-07-15 17:19:35 +08:00
fan
bfc336fb4c 长兴技校三方登录配置 2022-07-15 17:12:49 +08:00
fan
470c223a59 环境参数判断调整 2022-07-15 16:57:17 +08:00
fan
2125809e41 长兴技校不展示设计平台&环境参数判断调整 2022-07-15 16:47:45 +08:00
fan
65cb35036d local-test打包调整 2022-07-15 16:23:38 +08:00
fan
c188d28caf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-15 16:16:07 +08:00
fan
f43a29fd11 长兴技术学校登录页 2022-07-15 16:15:58 +08:00
fan
636803400a 画面调整 2022-07-15 15:55:03 +08:00
joylink_cuiweidong
bb193a7e5d 代码调整 2022-07-15 14:44:44 +08:00
joylink_cuiweidong
898cadb72d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-15 11:34:32 +08:00
joylink_cuiweidong
9fe5f79092 代码调整 2022-07-15 11:32:43 +08:00
Yuan
d8e3ad4fcb Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-07-15 10:41:16 +08:00
Yuan
e6730ec264 stage 2022-07-15 10:40:37 +08:00
fan
e2480e28dc 打包调整 2022-07-15 10:39:57 +08:00
Yuan
505c0ae95d resolve conflict 2022-07-15 10:21:21 +08:00
Yuan
acb63a1a8a stage 2022-07-15 10:19:15 +08:00
fan
744385424e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-15 09:57:14 +08:00
fan
1d6997db39 画面调整暂提 2022-07-15 09:57:03 +08:00
fan
39369648bb 站间透明问题调整 2022-07-15 09:56:11 +08:00
dong
07ce9db767 教学通用项目隐藏设计平台入口 2022-07-15 09:33:59 +08:00
fan
97535872da Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-15 09:17:12 +08:00
fan
b5a67f7fbe 车务终端非常站控模式下 不能操作 2022-07-14 18:13:46 +08:00
joylink_cuiweidong
b1a546828d 代码调整 2022-07-14 13:52:20 +08:00
joylink_cuiweidong
cf10f19b96 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-14 13:20:29 +08:00
joylink_cuiweidong
68110a77c1 代码调整 2022-07-14 13:20:05 +08:00
fan
dd935f0aec 添加地图功能配置项 2022-07-14 11:08:02 +08:00
fan
cc285801f6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-14 09:46:50 +08:00
fan
6dc29405da 仿真缩放比例 增加0.3、0.5、0.7 2022-07-14 09:46:26 +08:00
dong
e348123ecb 文件管理只有管理员能看见 2022-07-13 18:00:52 +08:00
fan
11d75a76a6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-13 17:31:23 +08:00
fan
6d34c5fde6 站间透明问题修复2 2022-07-13 17:31:10 +08:00
joylink_cuiweidong
e21ea808e1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-13 16:43:49 +08:00
joylink_cuiweidong
a049a67571 大铁项目 ctc 行车日志 代码调整 2022-07-13 16:43:15 +08:00
fan
a6ce3b106a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-13 16:41:06 +08:00
fan
e1b7f84ea6 站间透明问题修复 2022-07-13 16:40:49 +08:00
joylink_cuiweidong
f6bc53b0d9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-13 15:55:25 +08:00
joylink_cuiweidong
9a7fcd5697 大铁项目 行车日志 添加/修改 运行计划 2022-07-13 15:53:55 +08:00
fan
50921e2348 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-13 14:19:23 +08:00
fan
895b909e34 站间透明调整 2022-07-13 14:19:02 +08:00
dong
42cb9d6ee2 添加教学通用项目 2022-07-13 13:33:41 +08:00
joylink_cuiweidong
e9fc978c06 大铁项目 ctc 行车日志 设置超限 2022-07-12 15:49:02 +08:00
joylink_cuiweidong
ed4d2f9e73 大铁项目 ctc 行车日志 将原来的【删除】 -> 改成【设置删除标识】 2022-07-12 14:42:52 +08:00
Yuan
71ce383912 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-07-12 14:01:32 +08:00
Yuan
36c5e3c7db WIP: JD1A 底部操作栏左侧显隐控制部分 2022-07-12 14:01:08 +08:00
joylink_cuiweidong
aaa2cdb557 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-12 11:29:27 +08:00
joylink_cuiweidong
5aed3a7c06 大铁项目 ctc 行车日志 设置始发 设置终到 2022-07-12 11:29:15 +08:00
weizhihong
03e8b90893 【运行计划时间自动变化】 2022-07-11 15:02:31 +08:00
fan
e300d62896 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-08 17:45:21 +08:00
fan
e59e2ec8d4 股道视图调整 2022-07-08 17:45:07 +08:00
joylink_cuiweidong
548e737cfd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-08 17:39:06 +08:00
joylink_cuiweidong
553ac965ba 大铁项目 ctc 行车日志 设置/取消重点列车 设置允许股道与基本路径不一致 设置进出入口不一致 指令添加 2022-07-08 17:38:47 +08:00
joylink_zhangsai
b1e052efea 修改股道视图删除数据bug -- by fan 2022-07-08 17:26:38 +08:00
fan
0bf64a3bed Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-08 17:16:21 +08:00
fan
1bdfe33623 进路序列、股道视图调整 2022-07-08 17:16:04 +08:00
dong
9890752f84 修改拖拽窗口选中文本问题 2022-07-08 17:11:30 +08:00
joylink_cuiweidong
b437e9079a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-08 16:52:37 +08:00
joylink_cuiweidong
af992f8664 大铁项目 ctc 行车日志 取消到达 取消出发 取消闭塞 指令添加 2022-07-08 16:52:06 +08:00
Yuan
eb2447c69a Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-07-08 16:43:55 +08:00
Yuan
178d550db6 bugfix - 判断条件不完整 2022-07-08 16:43:52 +08:00
fan
19f2b8c290 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-08 16:34:27 +08:00
dong
04a22ee760 拖拽超出时限制位置 2022-07-08 16:34:02 +08:00
fan
d2f7edbda1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-08 16:32:01 +08:00
fan
7be2c6b614 进路序列调整&站间透明暂提 2022-07-08 16:31:42 +08:00
Yuan
d19e8eb3d9 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-07-08 15:30:58 +08:00
dong
c75d283389 调度命令添加校验功能 2022-07-08 14:56:33 +08:00
joylink_cuiweidong
d0f4c4b5cd 代码调整 2022-07-08 13:19:57 +08:00
dong
5b191b60b7 修改调度命令报错，添加中转识别号 2022-07-08 11:14:36 +08:00
Yuan
9d086724fe Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly 2022-07-07 18:14:11 +08:00
Yuan
8d38ee214e JD1A 皮肤修改 2022-07-07 18:14:03 +08:00
dong
998f5dbced 调度命令调整 2022-07-07 17:28:26 +08:00
joylink_cuiweidong
2bb6a88076 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-07 17:09:54 +08:00
joylink_cuiweidong
7f6a331002 大铁项目 ctc 行车日志 代码调整 2022-07-07 17:09:40 +08:00
dong
8cd5789bae 调度命令代码调整 2022-07-07 16:32:18 +08:00
joylink_cuiweidong
22e4935310 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-07 16:23:17 +08:00
joylink_cuiweidong
4f01e767d7 代码调整 2022-07-07 16:22:00 +08:00
fan
8c978c25a0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-07 16:08:30 +08:00
fan
94f5c498c5 路票调整2 2022-07-07 16:08:04 +08:00
强 董
dafe5f75d3 调度命令下达提示修改 2022-07-07 16:00:03 +08:00
joylink_cuiweidong
1b564f5e6c 大铁项目 ctc 行车日志 代码调整 2022-07-07 15:44:13 +08:00
joylink_cuiweidong
5b171c0d51 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-07 15:29:49 +08:00
joylink_cuiweidong
9c9697d706 代码调整 2022-07-07 15:29:37 +08:00
强 董
a22736f0f0 调度命令调整 2022-07-07 15:14:42 +08:00
强 董
9f425fad49 调度命令调整 2022-07-07 15:03:41 +08:00
joylink_cuiweidong
cf7915cef3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-07 13:59:47 +08:00
joylink_cuiweidong
651e7eceb5 大铁项目 调度台行车计划 列车类型 添加枚举 
大铁项目 衬托出 行车日志 实际时间添加颜色
 2022-07-07 13:58:57 +08:00
fan
607903c937 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-07 13:21:46 +08:00
fan
a692ae3aa7 路票调整 2022-07-07 13:21:27 +08:00
joylink_cuiweidong
cbe0203a66 大铁项目 调度台行车计划 修改到出入口 2022-07-06 18:00:48 +08:00
joylink_cuiweidong
1984dc807c 大铁项目 ctc 行车日志 清除闪烁 2022-07-06 17:26:59 +08:00
joylink_cuiweidong
5854fa5a60 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-06 17:16:16 +08:00
joylink_cuiweidong
58ba63a382 大铁项目 ctc 行车日志 初始化 清空数据 2022-07-06 17:15:54 +08:00
joylink_cuiweidong
1d2cf1c043 大铁项目 调度台行车计划 修改时间 2022-07-06 16:23:40 +08:00
fan
026395d982 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
 Conflicts:
	src/store/modules/socket.js
 2022-07-06 15:50:08 +08:00
fan
9ff73303c4 站间透明暂提 2022-07-06 15:47:23 +08:00
joylink_cuiweidong
00f1d98829 大铁项目 ctc 行车日志 增加 修改股道 发送计划 取消红闪 指令 
修改 发送计划按钮闪烁的标识
 2022-07-06 13:45:41 +08:00
fan
deda8eaf7f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-06 11:19:46 +08:00
fan
1093b8982b 路票流程调整 2022-07-06 11:19:22 +08:00
Yuan
0a4bfa82ae Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly 2022-07-06 11:18:58 +08:00
joylink_cuiweidong
78c3e41f9c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-06 10:42:14 +08:00
joylink_cuiweidong
84a4192183 代码调整 2022-07-06 10:41:40 +08:00
Yuan
e0e64340fc Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly 2022-07-06 09:30:27 +08:00
fan
2d4b0708bd 路票流程调整暂提 2022-07-05 18:03:14 +08:00
fan
012c8e7137 修复：因无法打开麦克风等错误导致的无法挂断电话BUG 2022-07-05 13:22:36 +08:00
fan
662b7a2332 增加仿真成员 车站助理 STATION_ASSISTANT 2022-07-05 10:59:58 +08:00
fan
a5b4b096f2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-05 09:08:35 +08:00
fan
4779efbc23 代码调整&司机驾驶调整 2022-07-05 09:08:12 +08:00
joylink_cuiweidong
2d89a10eae 铁科院 大铁线路 添加 区段故障解锁 指令 2022-07-04 16:09:08 +08:00
强 董
8555ae081a 调度命令调整 2022-07-04 14:46:00 +08:00
强 董
e2b2f80e4d 调度命令代码调整 2022-07-04 14:28:06 +08:00
强 董
eb0dc56616 调度命令代码调整 2022-07-04 11:17:35 +08:00
强 董
1ab714dab9 调度命令弹窗代码调整 2022-07-04 09:59:15 +08:00
强 董
4d5cf7b92c 添加调度命令直接签收界面 2022-07-04 09:57:24 +08:00
Yuan
ac9f9c7675 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly 2022-07-04 09:49:30 +08:00
强 董
5c078cdfbc 调度命令调整 2022-07-01 18:52:17 +08:00
强 董
f8c51df3c9 调度命令调整 2022-07-01 15:37:55 +08:00
强 董
95c739c342 行调命令调整 2022-07-01 13:58:44 +08:00
Yuan
b25c9bd9ad Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly 2022-07-01 09:34:48 +08:00
强 董
49593b2851 添加调度命令收令功能 2022-06-30 18:13:23 +08:00
fan
98916ac312 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-30 18:08:51 +08:00
fan
a30991a53f 占线板股道视图调整 2022-06-30 18:08:39 +08:00
walker_sheng
aa9e0fe265 修改local-test配置 2022-06-30 17:03:09 +08:00
fan
12d2f98e4a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-30 15:33:13 +08:00
fan
7cb0dc179a 问题调整：未获取到运行图信息 2022-06-30 15:32:58 +08:00
joylink_cuiweidong
599eaa5bd6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-30 15:21:45 +08:00
joylink_cuiweidong
057c39fb21 代码调整 2022-06-30 15:20:41 +08:00
fan
d1f0210b1b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-30 14:55:35 +08:00
fan
28a09e0f21 大铁簿册调整 2022-06-30 14:55:18 +08:00
joylink_cuiweidong
8311b453bf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-30 13:52:42 +08:00
joylink_cuiweidong
927687aa9b 大铁项目 代码调整 2022-06-30 13:52:27 +08:00
walker_sheng
f950bf8536 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-30 13:09:56 +08:00
walker_sheng
ed21d70bc4 local-test 打包配置 2022-06-30 13:09:40 +08:00
Yuan
f3e52724a3 大铁JD1A - 区段颜色修改 2022-06-30 10:55:51 +08:00
joylink_cuiweidong
f10a118132 大铁项目 代码调整 2022-06-30 10:40:36 +08:00
joylink_cuiweidong
64d98d84a4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-30 10:05:41 +08:00
joylink_cuiweidong
d4ad56e142 大铁项目 ctc 行车计划 签收 代码调整 2022-06-30 10:05:27 +08:00
fan
19b9803342 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-30 09:04:59 +08:00
fan
8048cfd34c 大铁簿册调整&合众title调整 2022-06-30 09:04:44 +08:00
joylink_cuiweidong
218cd5e2e5 代码调整 2022-06-29 17:55:40 +08:00
joylink_cuiweidong
889f3c60d0 代码调整 2022-06-29 17:41:36 +08:00
joylink_cuiweidong
1e2f294185 代码调整 2022-06-29 16:23:58 +08:00
joylink_cuiweidong
2ec521603c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-29 16:05:55 +08:00
joylink_cuiweidong
1f52b72eb5 代码调整 2022-06-29 16:05:29 +08:00
fan
6b117a66e0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
 Conflicts:
	src/jmapNew/theme/components/utils/menuOperate.js
	src/scripts/cmdPlugin/CommandEnum.js
	src/scripts/cmdPlugin/OperationHandler.js
 2022-06-29 15:59:56 +08:00
fan
21e8785ecb 大铁 路票调整 2022-06-29 15:57:24 +08:00
joylink_cuiweidong
6d6c7c3074 大铁项目 ctc 行车日志 签收计划 2022-06-29 15:53:51 +08:00
joylink_cuiweidong
ec5c6f5ff4 大铁项目 调度台行车计划修改股道 删除计划 2022-06-29 13:53:35 +08:00
joylink_cuiweidong
47da7cfc43 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-29 10:59:32 +08:00
joylink_cuiweidong
933ecb9748 大铁 调度台 发布所有行车计划 车站签收行车计划 代码调整 2022-06-29 10:59:16 +08:00
强 董
371e090195 修改调度命令界面 2022-06-29 10:36:57 +08:00
joylink_cuiweidong
a7db35f139 代码调整 2022-06-28 18:13:01 +08:00
joylink_cuiweidong
78d67ad0ec 大铁 调度台 添加运行计划 代码调整 2022-06-28 17:23:52 +08:00
joylink_cuiweidong
ff3ae565bc 代码调整 2022-06-28 16:50:48 +08:00
joylink_cuiweidong
4ef0db920d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-28 16:19:44 +08:00
joylink_cuiweidong
ab24f99392 大铁 调度台 添加运行计划 删除运行计划 指令添加 代码调整 2022-06-28 16:18:57 +08:00
强 董
0c49120dd9 修改路由里的调度台地址 2022-06-28 15:28:51 +08:00
fan
ebb204c475 大铁综合演练调整 2022-06-28 15:04:00 +08:00
fan
9248fd22ec Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
 Conflicts:
	src/views/newMap/displayNew/menuDemon.vue
 2022-06-28 13:07:51 +08:00
强 董
f934b70b3e 代码调整 2022-06-28 13:06:52 +08:00
fan
6724587aed 打铁综合演练 2022-06-28 13:06:21 +08:00
强 董
251c79a10a 添加调度台功能 2022-06-28 11:29:38 +08:00
fan
2fb45a7bfe 路票暂提1 2022-06-27 18:08:25 +08:00
joylink_cuiweidong
ffd1ab06b8 大铁项目 调度台 运行图 增加阶段计划 2022-06-27 16:19:52 +08:00
joylink_cuiweidong
fa1004067e 大铁项目 调度台 运行图 消息订阅 和返回的数据 代码调整 2022-06-27 14:45:31 +08:00
fan
8b8bdec3db 子系统栏显示调整 2022-06-27 13:22:25 +08:00
fan
83702c4c22 路票暂提 2022-06-27 13:09:22 +08:00
fan
717a629ea2 子系统栏显示调整 2022-06-27 13:08:46 +08:00
joylink_cuiweidong
73bf18ad86 大铁项目 调度台 代码调整 2022-06-27 11:05:12 +08:00
joylink_cuiweidong
6384208d93 代码调整 2022-06-24 16:51:17 +08:00
fan
8b3c7eadc5 JD_1A线路建立-调整 2022-06-24 16:37:42 +08:00
fan
3f40d29731 JD_1A线路建立 2022-06-24 16:23:21 +08:00
fan
afd3c54df2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-24 14:57:38 +08:00
fan
8dd185cd9a 占线板闪烁调整 2022-06-24 14:57:20 +08:00
joylink_cuiweidong
07e82fce24 铁科院 大铁线路 道岔 添加对应指令 2022-06-24 14:14:35 +08:00
joylink_cuiweidong
3e13058b3a 铁科院 大铁线路 道岔右键菜单添加 2022-06-24 13:59:23 +08:00
joylink_cuiweidong
985180eba7 代码调整 2022-06-23 16:52:51 +08:00
joylink_cuiweidong
caf5bca3c8 大铁项目 ctc 车务管理端 列车固定路径 删除路径 2022-06-23 16:48:16 +08:00
joylink_cuiweidong
ce67bb0a13 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-23 16:25:16 +08:00
joylink_cuiweidong
5cb096bfda 代码调整 2022-06-23 16:24:59 +08:00
fan
0931e54a40 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-23 15:52:09 +08:00
fan
a953bcff6c 注册增加来源 2022-06-23 15:51:49 +08:00
joylink_cuiweidong
4bbe980c21 大铁项目 ctc 车务管理端 样式调整 2022-06-23 14:22:42 +08:00
joylink_cuiweidong
0269ae8144 大铁项目 ctc 车务管理端 列车固定路径 代码调整 2022-06-23 14:00:47 +08:00
joylink_cuiweidong
c58262a066 铁科院 大铁线路 信号机右键菜单添加 2022-06-23 13:44:39 +08:00
joylink_cuiweidong
9b4e93ae7c 代码调整 2022-06-21 17:20:12 +08:00
joylink_cuiweidong
e7edd338fd 代码调整 2022-06-21 16:13:01 +08:00
joylink_cuiweidong
6e779510a2 车务管理端 车站股道 代码调整 2022-06-21 16:10:17 +08:00
fan
e699ed2e9b ibp设备调整 2022-06-21 15:05:58 +08:00
fan
9247ccedf5 设备管理 找不到链接设备name 显示设备code 2022-06-21 14:35:49 +08:00
fan
24cdeecb04 红河财经增加设备管理 2022-06-21 13:38:14 +08:00
fan
80361b40a5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-21 13:21:33 +08:00
fan
4d89aef6b8 红河财经登录页调整 2022-06-21 13:21:18 +08:00
joylink_cuiweidong
06d4e8005b 大铁项目 ctc 车务管理端 车站股道 代码调整 2022-06-21 11:33:11 +08:00
joylink_cuiweidong
cf3a0f80ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-20 17:57:47 +08:00
joylink_cuiweidong
15f70ee501 铁科院 大铁线路 代码调整 2022-06-20 17:57:12 +08:00
fan
58427fb837 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-20 17:45:13 +08:00
fan
de47b74def 添加合众登录页面 && 成都工职院虚拟仿真中心跳转调整 2022-06-20 17:44:33 +08:00
joylink_cuiweidong
5973a3c1ee 大铁项目 行车日志 修改车次号(大铁CTC) 代码调整 2022-06-20 11:24:22 +08:00
joylink_cuiweidong
4f855c3836 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-17 17:29:54 +08:00
joylink_cuiweidong
fa65f53643 大铁项目 ctc 代码调整 2022-06-17 17:29:34 +08:00
fan
5da99fcd14 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-17 14:17:07 +08:00
fan
0a5ced4098 大铁ctc调整 增加端title 2022-06-17 14:16:54 +08:00