Commit Graph

3004 Commits

Author SHA1 Message Date
joylink_cuiweidong
6cb94046c8 代码调整 2022-08-03 15:40:51 +08:00
dong
ae5d53e9e0 代码调整 2022-08-03 15:33:03 +08:00
fan
d115c4975d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-03 14:38:12 +08:00
fan
5c63dafaa4 簿册显示调整 2022-08-03 14:37:59 +08:00
dong
5a072c7236 修改进路 2022-08-03 14:13:14 +08:00
dong
71480564f7 修改进路 2022-08-03 13:31:07 +08:00
fan
f3a1e22e65 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-03 11:22:04 +08:00
fan
024f1c8963 接受会话后同账户清除响铃 2022-08-03 11:21:52 +08:00
joylink_cuiweidong
ecb9287adf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-08-03 11:00:48 +08:00
joylink_cuiweidong
f1dc88be33 场景编辑代码调整 2022-08-03 11:00:31 +08:00
fan
6360e26c89 簿册车站传递调整 2022-08-03 10:04:31 +08:00
fan
c5d11595cf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-03 09:23:58 +08:00
Yuan
d1680c32e5 Merge branch 'yly' into test 2022-08-02 18:12:34 +08:00
Yuan
df174615ba jd1A调整,信号按钮调整 2022-08-02 18:12:03 +08:00
fan
3e105c3f8b 代码调整 2022-08-02 18:01:42 +08:00
dong
f81e76fa20 代码调整 2022-08-02 16:36:20 +08:00
dong
a65afc6cab 代码调整 2022-08-02 16:15:47 +08:00
dong
de71dc5c91 代码调整 2022-08-02 15:06:50 +08:00
dong
9d68eac471 进路修改 2022-08-02 14:38:39 +08:00
dong
0998fdffbe 进路修改 2022-08-02 14:10:18 +08:00
joylink_cuiweidong
7c0d160c68 大铁线路 剧本编制 添加 修改系统时间 2022-08-02 11:28:20 +08:00
joylink_cuiweidong
ba4f2efc6b 去除断点 2022-08-02 11:01:57 +08:00
joylink_cuiweidong
91e572ca1e 代码调整 2022-08-02 11:00:18 +08:00
joylink_cuiweidong
3131edd93b 代码调整 2022-08-02 10:33:35 +08:00
joylink_cuiweidong
9067b54e97 代码调整 2022-08-02 09:57:11 +08:00
joylink_cuiweidong
75f268cf21 添加 车务段段长 仿真角色 2022-08-01 17:48:03 +08:00
joylink_cuiweidong
553aa18f3d 代码调整 2022-08-01 17:26:16 +08:00
joylink_cuiweidong
b404adfbed 代码调整 2022-08-01 16:54:33 +08:00
joylink_cuiweidong
ec72904bef 剧本预览提示代码调整 2022-08-01 16:37:04 +08:00
fan
b9cd660a7e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-01 15:39:39 +08:00
fan
1bc2342172 哈尔滨盈达科技大铁项目 2022-08-01 15:39:12 +08:00
joylink_cuiweidong
67bedb3245 剧本预览添加 倍速功能 2022-08-01 15:27:51 +08:00
joylink_cuiweidong
80ef093b10 代码调整 2022-07-29 17:57:08 +08:00
joylink_cuiweidong
028ded01e3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-29 17:10:43 +08:00
joylink_cuiweidong
5132d43595 大铁线路 剧本 道岔钩锁和换端指令添加 2022-07-29 17:09:15 +08:00
dong
2bc1ae8cf3 代码调整 2022-07-29 14:41:36 +08:00
Yuan
838559280d merge 2022-07-29 13:56:02 +08:00
Yuan
10eba07da8 JD1A风格改造 2022-07-29 13:33:44 +08:00
dong
d099b7f577 修改剧本调度命令提示 2022-07-28 09:53:17 +08:00
joylink_cuiweidong
55bb88cb19 代码调整 2022-07-27 18:28:17 +08:00
joylink_cuiweidong
ccf640c492 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js
2022-07-27 18:21:37 +08:00
joylink_cuiweidong
6588b454a0 代码调整 2022-07-27 18:14:38 +08:00
dong
a7163cb437 剧本调度命令指令参数提示 2022-07-27 18:14:22 +08:00
joylink_cuiweidong
b40038910e 代码调整 2022-07-27 16:23:01 +08:00
joylink_cuiweidong
523d0a111e 代码调整 2022-07-27 13:43:13 +08:00
joylink_cuiweidong
d28803292e 添加 修改系统时间接口
剧本编制 添加角色 代码调整
2022-07-27 11:28:18 +08:00
dong
f8b83fc4e6 剧本行调命令指令 2022-07-26 18:10:14 +08:00
joylink_cuiweidong
2548337fc7 车务终端 订阅ctc 代码调整 2022-07-26 17:43:10 +08:00
joylink_cuiweidong
246f204eb7 代码调整 2022-07-26 16:30:48 +08:00
joylink_cuiweidong
c92d77fb69 给 信号员 添加 现地权限 2022-07-26 13:55:26 +08:00
joylink_cuiweidong
2e48ac5cc6 代码调整 2022-07-26 13:30:27 +08:00
joylink_cuiweidong
82f44d3499 剧本编制 放开会话和指令的删除
修改剧本 角色的名称
2022-07-26 11:21:58 +08:00
joylink_cuiweidong
7cd2ecc2dc 代码调整 2022-07-26 10:41:08 +08:00
joylink_cuiweidong
922d4641b7 剧本 添加设备管理员 2022-07-26 10:14:45 +08:00
joylink_cuiweidong
636819e9a5 代码调整 2022-07-25 18:06:04 +08:00
joylink_cuiweidong
5067f0132f 添加 剧本角色 站长、助理、信号员、客运员、扳道员 、引导员、工务工 2022-07-25 17:49:38 +08:00
joylink_cuiweidong
856a5b676a 剧本切换角色 ctc 对应车站未更改bug 调整 2022-07-25 16:33:04 +08:00
fan
e1031b47b1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-25 11:12:00 +08:00
fan
e9785184dd 画面切换 2022-07-25 11:01:01 +08:00
joylink_cuiweidong
808ce62c85 代码调整 2022-07-25 09:58:40 +08:00
fan
fdb071c9f6 取消鼠标悬浮消失 2022-07-22 18:04:12 +08:00
joylink_cuiweidong
7328ac596a 大铁线路 剧本调整 2022-07-22 16:56:59 +08:00
joylink_cuiweidong
4d8fbdf8c8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/newMap/displayNew/menuSchema.vue
2022-07-22 16:04:28 +08:00
joylink_cuiweidong
7abc3b37db 大铁线路 剧本编制 页面代码调整 2022-07-22 15:56:59 +08:00
fan
2c6807debf 现地工作站添加路票簿册 2022-07-22 14:27:03 +08:00
fan
15e8006f5a ctc=>车务终端 2022-07-21 10:14:29 +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
172415dccf 显示配置调整 2022-07-20 15:07:02 +08:00
fan
3d9419b809 指示灯关联必填调整 2022-07-19 13:41:55 +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
46ab43aef3 车务终端分散自律亮灯&占线板默认选中 2022-07-18 15:01:35 +08:00
fan
e176823ec6 占线板&进路序列调整 2022-07-18 13:07:45 +08:00
Yuan
e947e50a0d 增加几个按钮类型 2022-07-15 18:08:39 +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
636803400a 画面调整 2022-07-15 15:55:03 +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
1d6997db39 画面调整暂提 2022-07-15 09:57:03 +08:00
fan
b5a67f7fbe 车务终端非常站控模式下 不能操作 2022-07-14 18:13:46 +08:00
fan
dd935f0aec 添加地图功能配置项 2022-07-14 11:08:02 +08:00
fan
6d34c5fde6 站间透明问题修复2 2022-07-13 17:31:10 +08:00
fan
e1b7f84ea6 站间透明问题修复 2022-07-13 16:40:49 +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
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
b1e052efea 修改股道视图删除数据bug -- by fan 2022-07-08 17:26:38 +08:00
fan
1bdfe33623 进路序列、股道视图调整 2022-07-08 17:16:04 +08:00
fan
7be2c6b614 进路序列调整&站间透明暂提 2022-07-08 16:31:42 +08:00
fan
94f5c498c5 路票调整2 2022-07-07 16:08:04 +08:00
fan
a692ae3aa7 路票调整 2022-07-07 13:21:27 +08:00
fan
9ff73303c4 站间透明暂提 2022-07-06 15:47:23 +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
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
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
4779efbc23 代码调整&司机驾驶调整 2022-07-05 09:08:12 +08:00
fan
a30991a53f 占线板股道视图调整 2022-06-30 18:08:39 +08:00
fan
7cb0dc179a 问题调整:未获取到运行图信息 2022-06-30 15:32:58 +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
927687aa9b 大铁项目 代码调整 2022-06-30 13:52:27 +08:00
fan
8048cfd34c 大铁簿册调整&合众title调整 2022-06-30 09:04:44 +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
ec5c6f5ff4 大铁项目 调度台行车计划修改股道 删除计划 2022-06-29 13:53:35 +08:00
joylink_cuiweidong
933ecb9748 大铁 调度台 发布所有行车计划 车站签收行车计划 代码调整 2022-06-29 10:59:16 +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
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
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
fa1004067e 大铁项目 调度台 运行图 消息订阅 和返回的数据 代码调整 2022-06-27 14:45:31 +08:00
fan
83702c4c22 路票暂提 2022-06-27 13:09:22 +08:00
joylink_cuiweidong
73bf18ad86 大铁项目 调度台 代码调整 2022-06-27 11:05:12 +08:00
fan
3f40d29731 JD_1A线路建立 2022-06-24 16:23:21 +08:00
fan
8dd185cd9a 占线板闪烁调整 2022-06-24 14:57:20 +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
0a5ced4098 大铁ctc调整 增加端title 2022-06-17 14:16:54 +08:00
fan
ef22b07945 大铁ctc调整 2022-06-17 13:08:08 +08:00
fan
db9ca50400 大铁ctc调整 2022-06-17 11:26:03 +08:00
fan
4f177ad7a3 大铁ctc调整 2022-06-16 18:06:01 +08:00
fan
858f064a2e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-16 14:55:34 +08:00
fan
c0cf6e6077 大铁ctc调整 6/16 2022-06-16 14:55:17 +08:00
joylink_cuiweidong
41a22bae92 大铁项目 ctc 车务管理端 列车固定路径 增加指令代码调整 2022-06-16 14:18:04 +08:00
fan
6beeab667c 大铁ctc调整 占线板操作调整 2022-06-15 17:47:21 +08:00
fan
006f789032 大铁ctc调整6/15 2022-06-15 15:39:11 +08:00
fan
00fd8a168b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
 Conflicts:
	src/views/newMap/displayNew/menuSchema.vue
2022-06-15 09:20:26 +08:00
fan
e4fb05c1bf 打铁ctc调整 2022-06-15 09:18:36 +08:00
joylink_cuiweidong
949e3c3feb 大铁项目 车务管理端 代码调整 2022-06-14 14:39:07 +08:00
joylink_cuiweidong
dc7a117b0f 大铁项目 管理终端 页面 添加 2022-06-10 16:23:09 +08:00
joylink_cuiweidong
2a27cf6f46 大铁项目 地图绘制 指示灯关联 增加名称属性 2022-06-10 10:09:30 +08:00
fan
d36ee77d00 ctc显示调整 2022-06-09 18:06:47 +08:00
fan
d5e2e69965 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-06 16:30:38 +08:00
fan
19e70608a0 ctc显示调整 06/06 2022-06-06 16:29:42 +08:00
joylink_cuiweidong
942f728596 大铁项目 CTC 运行计划列表 代码调整 2022-06-02 15:13:59 +08:00
fan
270c32052c ctc显示调整 05/31 2022-05-31 18:09:34 +08:00
fan
81667572fc 实训仿真结束 退出实训界面 2022-05-30 17:34:44 +08:00
fan
85dac873de ctc界面调整2 2022-05-30 17:28:46 +08:00
fan
758b5b69e2 ctc界面调整1 2022-05-27 15:55:03 +08:00
fan
2d4a196dc8 区段增加方向运行端点 2022-05-27 15:54:14 +08:00
fan
5ebb0139ec Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-05-27 09:51:51 +08:00
fan
6149770821 指示灯关联调整 2022-05-27 09:51:29 +08:00
joylink_cuiweidong
8127b76cb6 大铁项目 仿真 不显示 时间 2022-05-25 14:18:55 +08:00
fan
7a7cbf9ae8 大铁调整 n5 2022-05-23 15:11:55 +08:00
fan
85fd48f700 大铁调整 n1 2022-05-11 14:56:08 +08:00
fan
88b21fc723 信号机增加类型 2022-05-09 09:12:48 +08:00
fan
826fbae799 大铁线路调整31 2022-05-06 14:22:26 +08:00
fan
aee6474645 大铁线路调整30 2022-05-05 17:08:17 +08:00
fan
7c8cbdf59c 大铁线路调整27 增加信号机类型 2022-04-29 16:32:23 +08:00
fan
7c2cddd441 大铁线路调整26 关联信号机调整 2022-04-28 13:34:17 +08:00
fan
7e8fdaf1a3 大铁线路调整25 2022-04-28 10:40:18 +08:00
fan
af2ffa23f3 大铁线路调整24 指示灯关联联锁数据调整 2022-04-28 10:35:41 +08:00
fan
1c04fd0bd6 大铁线路调整23 2022-04-27 17:35:36 +08:00
fan
0c57bdac50 大铁线路调整21 2022-04-24 17:06:21 +08:00
fan
9ed6c38a4e 大铁线路调整20 2022-04-24 15:20:12 +08:00
fan
b8a27f74aa 大铁线路调整19 2022-04-24 14:05:08 +08:00
fan
216166c572 大铁线路调整18 2022-04-24 14:03:48 +08:00
fan
279522f544 大铁线路调整17 precess调整 2022-04-24 13:17:57 +08:00
fan
e24b992ab9 大铁线路调整15 2022-04-24 11:14:44 +08:00
fan
a32a230ed8 大铁线路调整14 2022-04-24 11:04:04 +08:00
fan
3202fc1b40 大铁线路调整12 2022-04-22 19:13:44 +08:00
fan
93a3deb20c 大铁线路调整11 2022-04-22 17:55:42 +08:00
fan
3420059adf 大铁线路调整10 2022-04-22 16:34:34 +08:00
fan
daff80c19e 大铁线路调整9 2022-04-22 15:33:57 +08:00
fan
5e30c99d2c 大铁线路调整8 2022-04-22 14:40:31 +08:00
fan
140f6306ed 大铁线路调整7 2022-04-21 16:13:33 +08:00
fan
c5d60323e2 大铁线路调整6 联锁数据调整 2022-04-21 15:10:43 +08:00
fan
a045d2c776 大铁线路调整5 2022-04-21 10:02:13 +08:00
fan
c0bbf35455 大铁线路调整4 2022-04-19 17:55:27 +08:00
fan
0099c51a9d 大铁线路调整3 2022-04-19 16:14:17 +08:00
fan
1dcb5fe1dc 大铁线路调整2
(cherry picked from commit 6ed22109af)
2022-04-18 15:02:14 +08:00
fan
2f82b1729b 大铁线路调整
(cherry picked from commit 7fbe309f70)
2022-04-18 15:01:47 +08:00
fan
92d192cfe5 联系方式调整 2022-03-15 10:04:39 +08:00
joylink_fanyuhong
12c3572807 iscs调整 2022-01-19 17:23:25 +08:00
“sunzy”
f2f2878a99 修改配置地址 2021-12-30 19:36:26 +08:00
joylink_fanyuhong
a7c56b3592 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-12-30 09:35:11 +08:00
joylink_fanyuhong
c4e9ab2341 扬州工业展示修改 2021-12-29 14:01:28 +08:00
joylink_fanyuhong
3c2563e3d1 暂提 2021-12-29 13:44:05 +08:00
fan
4b4b98003c Merge remote-tracking branch 'origin/test' 2021-12-16 18:10:04 +08:00
fan
c98fd9e0e0 批量设置停车点偏移量增加停车轨设置 2021-12-13 18:06:29 +08:00
fan
afeec55025 延续保护 增加 保护区段ctc 2021-12-09 16:53:40 +08:00
fan
7b854e717e 显示配置车次窗设备修正=》判断调整 2021-12-09 14:57:55 +08:00
fan
17e7467edf 显示配置增加车次窗设备修正&加载备用车close时清除数据 2021-12-09 13:48:15 +08:00
fan
5a5dd046eb 仿真右侧列车显示过滤&加载备用车置灰已上线车辆 2021-12-07 14:10:07 +08:00
9631685998 Merge remote-tracking branch 'origin/test' 2021-12-06 21:19:18 +08:00
fan
830a630155 停车轨左右停车偏移放开 2021-12-03 17:50:37 +08:00
fan
84c4dd8ca1 批量翻转车头&车辆段仿真开放按计划行车和故障操作 2021-12-03 17:44:02 +08:00
fan
5ca3ca93ab 车辆段调整=》区段增加parkingTrack&列车增加stationCode&联锁配置项增加handleDepot 2021-12-03 13:25:20 +08:00
fan
690989cf75 南京二号线道岔问题调整 2021-11-29 14:41:03 +08:00