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

3134 Commits

Author SHA1 Message Date
lVAL
d7d3fee044 线路：成都3，佛山1，西安2 
问题：
a.成都3实训描述问题
b.佛山引导实训不提示的问题
c.西安2引导实训不生成的问题
 2021-02-23 16:32:42 +08:00
lVAL
cb8d4f9f03 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 14:54:24 +08:00
lVAL
a8a3a8a5cc 线路：南京2，宁波1，宁波3 
问题：增加引导的实训
 2021-02-23 14:54:14 +08:00
fan
1eb5dd05c3 问题调整 2021-02-23 14:20:05 +08:00
fan
195de40008 车站计轴复位状态调整 2021-02-23 13:34:42 +08:00
lVAL
420f67693d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 12:17:04 +08:00
lVAL
cf912b7834 线路：宁波3 
问题：增加设置跳停的操作
 2021-02-23 12:16:54 +08:00
joylink_cuiweidong
f0a3e0005d 删除 宁波三号线 暂时不用的文件 2021-02-23 09:27:50 +08:00
joylink_cuiweidong
914b710e43 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 09:18:03 +08:00
joylink_cuiweidong
b1353c6d69 宁波三号线 控制权转移 下放控制 收回控制 代码调整 2021-02-23 09:17:44 +08:00
lVAL
0f492cfbe2 修改配置描述 2021-02-23 08:59:39 +08:00
lVAL
e52242773c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 18:56:49 +08:00
lVAL
dafe484a0a 修改为人解列车进路 2021-02-22 18:56:39 +08:00
fan
a432cfc632 实训调整 2021-02-22 18:51:24 +08:00
fan
33c76f6098 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 18:48:31 +08:00
fan
8adadc5858 区域控制权在实训中不生效 2021-02-22 18:48:24 +08:00
lVAL
867d09cd4a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 18:47:00 +08:00
lVAL
7110d2f06f 修改菜单列表 2021-02-22 18:46:52 +08:00
joylink_cuiweidong
dbf1006f8a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 18:38:55 +08:00
joylink_cuiweidong
1a0e2a1c84 宁波三号线 控制权转移 下放站控 请求区域控制 代码调整 2021-02-22 18:38:38 +08:00
lVAL
23385f1718 修改实训名称 2021-02-22 18:38:24 +08:00
lVAL
20ba9fbc15 优化代码 没有参数e 报错的问题 2021-02-22 18:13:55 +08:00
lVAL
e5cba385b1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 17:50:54 +08:00
lVAL
08de82a230 线路：宁波1 
问题：站台部分操作完成后，深蓝色高亮未清除干净
 2021-02-22 17:49:55 +08:00
fan
6f91ee4b28 区域控制权在实训中不生效 2021-02-22 17:17:54 +08:00
fan
6501a68a1c merge 2021-02-22 16:43:01 +08:00
fan
04efafeb5c 宁波一 根据区域选择控制权 限制菜单 2021-02-22 16:41:30 +08:00
lVAL
07b38833fd 线路：宁波1 
问题：mouseEvent.mouseout 报错问题
 2021-02-22 16:34:56 +08:00
lVAL
609d34b8fb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 16:29:55 +08:00
lVAL
f016e0f6bf 线路：宁波1 
问题：设置道岔操作时，岔芯蓝色高亮设置
 2021-02-22 16:29:45 +08:00
fan
33dc1ea677 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 16:17:04 +08:00
fan
63a37caed3 宁波一 区域选择 2021-02-22 16:16:54 +08:00
lVAL
b804f78dae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 10:56:57 +08:00
lVAL
9b42af2dd6 优化提示问题 2021-02-22 10:56:50 +08:00
fan
e6814f4def merge 2021-02-22 10:31:30 +08:00
fan
dc3e3d7b7e 宁波一 计轴复位按钮操作 2021-02-22 10:27:32 +08:00
joylink_cuiweidong
61be91ed77 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 10:15:11 +08:00
joylink_cuiweidong
4b8782cf05 代码调整 2021-02-22 10:15:01 +08:00
joylink_cuiweidong
1d41095b46 运行图 转换函数代码调整 
宁波三号线 控制权转移 请求区域控制代码调整
 2021-02-22 10:13:14 +08:00
lVAL
48b1bc9ae4 线路：宁波1 
问题：
1.优化区域选择，点击应用后关闭弹窗；
2.修改控制模式的文字状态不发生变化。
 2021-02-22 09:19:20 +08:00
lVAL
6d7abac8d8 线路： 北京1 宁波1 
问题： 关于选择设备后，两次操作第二次操作中有时候无故高亮消失的问题
 2021-02-20 18:23:26 +08:00
lVAL
faf2bc09a1 线路：宁波1 
问题：修改代码中组件名称重复导致的错误
 2021-02-20 17:24:49 +08:00
lVAL
a4b55d303b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-20 17:14:59 +08:00
lVAL
36364f9f26 线路：宁波1 
问题：道岔和区段 选择设备后高亮在菜单出来后消失的问题
 2021-02-20 17:14:52 +08:00
fan
efcb9ff262 冲掉代码回补 2021-02-20 17:13:27 +08:00
fan
2e385e7fe2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-20 17:11:02 +08:00
fan
fdf63db248 车站计轴复位（未完） 2021-02-20 17:10:10 +08:00
lVAL
17057cc014 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/config/skinCode/ningbo_01.js
 2021-02-20 17:03:45 +08:00
lVAL
69f5379356 调整福州1号线实训 2021-02-20 17:02:40 +08:00
fan
871b9beb5d merge 2021-02-20 15:57:34 +08:00
fan
7413d131c3 区域选择 2021-02-20 15:55:53 +08:00
joylink_cuiweidong
466d57b4be Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-20 15:05:36 +08:00
joylink_cuiweidong
86ac34e899 泰雷兹 宁波三号线 控制权转移代码调整 2021-02-20 15:05:25 +08:00
joylink_cuiweidong
858c7dd7a7 宁波三号线（泰雷兹线路） 系统扣车设置/取消 操作添加 2021-02-20 15:03:44 +08:00
fan
7483b1be46 调整综合演练现地设备显示 2021-02-20 13:28:11 +08:00
fan
8a2f3b02ac Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-20 09:28:34 +08:00
fan
7e80d34e50 宁波一 信号机封锁调整 2021-02-20 09:27:21 +08:00
lVAL
c6ecccc788 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-19 18:30:34 +08:00
lVAL
7583442a2f 优化，排列进路加载速度 2021-02-19 18:30:26 +08:00
fan
14f8b05538 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-19 18:26:02 +08:00
fan
77af4b9288 宁波一： 操作流程调整 2021-02-19 18:25:51 +08:00
lVAL
1f438bb2ee 修改 宁波车次窗显示状态 2021-02-19 17:39:38 +08:00
lVAL
4a64a59ce4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-19 17:27:20 +08:00
lVAL
3b53548ba1 宁波1号线 鼠标选择高亮状态 2021-02-19 17:27:10 +08:00
fan
d083f56a7e 宁波一： 操作流程调整 2021-02-19 14:47:23 +08:00
fan
159cd4cdf0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-19 11:06:20 +08:00
fan
2f8c2a3d42 宁波一： 设置扣车流程调整&区故解二次确认调整提示 2021-02-19 11:06:03 +08:00
lVAL
86a420d8ec Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-19 10:43:06 +08:00
lVAL
b7ea10b459 修改宁波3号线 操作中的部分bug 2021-02-19 10:42:58 +08:00
fan
b44011057c 宁波一： 取消进路流程调整 2021-02-19 10:10:53 +08:00
fan
10bef80096 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-19 09:32:01 +08:00
fan
b43537cf94 宁波一： 排列进路流程微调 2021-02-19 09:31:35 +08:00
lVAL
2aff2be8b4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-19 09:26:36 +08:00
lVAL
1030f13d37 修改宁波3号线，二次确认 锁闭标题问题； 
修改西安2号线，定操、反操实训第一步描述错误。
 2021-02-19 09:26:26 +08:00
fan
baa0ba70a3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-19 09:12:39 +08:00
fan
827e52e0f4 宁波一： 全站进路交自动控 2021-02-19 09:12:09 +08:00
joylink_cuiweidong
1aa597fa39 宁波一号线 区故解指令代码调整 计轴预复位报错调整 2021-02-18 18:23:33 +08:00
joylink_cuiweidong
8bd93ba1d7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-18 17:03:25 +08:00
joylink_cuiweidong
0e9454f890 宁波一号线 现地 设置进路报错提示调整 2021-02-18 17:03:08 +08:00
fan
b30ffd5635 宁波一 设置/取消全站自动通过进路 2021-02-18 16:58:35 +08:00
fan
c7e63a3d22 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-18 16:22:23 +08:00
fan
e2a36fdf92 宁波一 设置/取消全站自动通过进路 2021-02-18 16:22:15 +08:00
joylink_cuiweidong
c0c5356f8a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-18 15:50:32 +08:00
joylink_cuiweidong
5762399c6b 宁波一号线 菜单样式调整 2021-02-18 15:50:14 +08:00
fan
3e5f101a3a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-18 15:38:35 +08:00
fan
731c8e7fc3 宁波一 设置/取消强制点灯 2021-02-18 15:38:20 +08:00
lVAL
88e0c99135 线路：宁波 
问题：修改排列进路预览，选择性进路后，以左侧信号机左对齐设置显示偏移
 2021-02-18 10:18:51 +08:00
lVAL
b0fe7b7755 线路：宁波1 
问题：排列进路展开预览多次后，图不显示的问题
 2021-02-18 09:57:31 +08:00
lVAL
c6fc85397a 修改排列进路的操作的问题 2021-02-18 09:55:15 +08:00
lVAL
f05a3d496e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/map.js
#	src/jmapNew/shape/Cross/index.js
#	src/jmapNew/shape/Section/index.js
 2021-02-18 09:23:17 +08:00
fan
510b26c86c 宁波一新指令 2021-02-05 18:10:55 +08:00
lVAL
3475d573a6 修改代码 2021-02-05 18:07:35 +08:00
lVAL
a038ca7040 增加 宁波线处理 2021-02-05 18:01:16 +08:00
lVAL
d7c17d0935 修改道岔太短的问题 2021-02-05 18:00:06 +08:00
fan
b6550e6500 国赛取消注释 取消临时限速函数 2021-02-05 16:30:11 +08:00
fan
1cea217aa9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-05 15:17:41 +08:00
fan
f3ec3a1476 南京二号线折行显示调整 2021-02-05 15:12:57 +08:00
joylink_cuiweidong
62bf080515 成都三号线 引导总锁 实训代码调整 2021-02-05 14:55:55 +08:00
joylink_cuiweidong
871a04e441 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-05 11:01:41 +08:00
joylink_cuiweidong
9cdecca6bd 成都三号线 添加设置联锁控操作 
成都三号线 添加设置 联锁控实训，引导总锁，取消引导总锁实训
 2021-02-05 11:01:21 +08:00
fan
88683b3763 代码调整 2021-02-05 09:19:18 +08:00
fan
766059611c 国赛=》取消临时限速 取消注释 
(cherry picked from commit 18b5688cdf)
 2021-02-05 09:18:15 +08:00
lVAL
d0ce0a9132 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-04 13:30:03 +08:00
lVAL
c70a383e91 线路：宁波3 
问题：增加宁波3 用户权限/转移控制/请求区域控制权|授权转移|下放站控|回收站控 菜单和实训配置。
 2021-02-04 13:29:47 +08:00
fan
3bfa419bbe 宁波一 上电解锁调整 2021-02-04 13:23:42 +08:00
fan
3b87f7ef14 注释：执行关键操作测试 2021-02-04 13:10:24 +08:00
fan
e8de151360 宁波一操作实训策略调整&线路配置参数 2021-02-04 13:08:59 +08:00
lVAL
ff7e32ec0d 线路：宁波1，成都3 
问题：补充缺失部分实训，成都的全线取消扣车，宁波的设置折返
 2021-02-03 17:07:05 +08:00
joylink_cuiweidong
dd6f3cf7d3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-03 13:40:40 +08:00
joylink_cuiweidong
2968b1ddfb 北交大客流策略 添加 2021-02-03 13:40:11 +08:00
lVAL
7a10d0497a 线路：佛山，宁波3 
问题：控制模式实训配置
 2021-02-03 13:27:11 +08:00
lVAL
579858d02a 线路：南京2 
问题：配置插芯的实训区段限制
 2021-02-03 09:46:17 +08:00
lVAL
b7b90fe707 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-02 19:00:15 +08:00
fan
3e50519732 宁波一实训折返策略调整 2021-02-02 19:00:48 +08:00
lVAL
6dd4e305b3 修改实训配置 2021-02-02 19:00:03 +08:00
fan
f5e0539e6d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-02 18:55:42 +08:00
fan
83a1eecb40 宁波一实训折返策略调整 2021-02-02 18:55:33 +08:00
joylink_cuiweidong
eeb7e3afad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/initializeSignalCanBlock.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/signalBlock.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/stationControl.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/switchActive.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/switchBlock.vue
 2021-02-02 18:16:51 +08:00
joylink_cuiweidong
c149f33a99 删除无用的代码 2021-02-02 18:06:02 +08:00
fan
18dcc3b089 BUG 160: 宁波一：控制模式（按钮）处缺少紧急站控 2021-02-02 17:54:40 +08:00
fan
1729082bac 折返策略 宁波一实训 2021-02-02 17:28:56 +08:00
fan
ec32fb62ff 折返策略 宁波一实训 2021-02-02 17:13:05 +08:00
lVAL
a6070c49f2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/allocateTime.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/signalModel.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue
 2021-02-02 16:45:24 +08:00
lVAL
7d9803165c 修改，宁波线路，道岔状态更改，操作界面检测，不刷新页面的问题 2021-02-02 16:40:58 +08:00
joylink_cuiweidong
efd8c86762 宁波一号线，南京二号线，哈尔滨一号线 删除不需要的代码 2021-02-02 16:28:03 +08:00
joylink_cuiweidong
e73d5d33d8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-02 15:22:28 +08:00
joylink_cuiweidong
14cd1948b3 福州一号线 佛山一号线 删除不需要的代码 2021-02-02 15:22:13 +08:00
fan
e4881b4efc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-02 14:53:46 +08:00
fan
a431f17246 实训调整 2021-02-02 14:53:33 +08:00
joylink_cuiweidong
1abd14d7e9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-02 14:10:06 +08:00
joylink_cuiweidong
2ddd9a0dc8 北京一号线/成都1，3号线 删除不需要的代码 2021-02-02 14:09:46 +08:00
fan
d594af49e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-02 11:03:24 +08:00
fan
f66e3e3cc0 实训代码调整 2021-02-02 11:03:11 +08:00
joylink_cuiweidong
2ca7c33966 宁波三号线 操作调整 2021-02-02 10:57:41 +08:00
lVAL
dbdfe26e86 修改宁波3 检测selected的方式 2021-02-02 10:49:25 +08:00
lVAL
7c80fc77c6 修改代码 2021-02-02 10:25:21 +08:00
lVAL
7b11378443 修改 宁波 selected报错问题 2021-02-02 09:41:35 +08:00
lVAL
cb7ae5fe6b 线路：宁波3 
问题：实训提示描述
 2021-02-02 09:09:11 +08:00
lVAL
6be29c157b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 18:36:20 +08:00
lVAL
0a2f2b08b3 增加信号机和站台 显示 2021-02-01 18:36:07 +08:00
fan
07efc9ae51 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 18:31:23 +08:00
fan
fa384b79ee 代码调整 2021-02-01 18:31:09 +08:00
joylink_cuiweidong
077457a4ac 西安二号线 添加帮助 操作定义 2021-02-01 18:11:58 +08:00
lVAL
26a82237b1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 17:56:15 +08:00
lVAL
7095f145c9 增加 西安02 的信号机帮助和站台帮助实训 2021-02-01 17:56:03 +08:00
joylink_cuiweidong
def8b44d97 佛山 宁波 竞赛 车站操作 调整 2021-02-01 15:23:45 +08:00
joylink_cuiweidong
2ad9f691bf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 14:38:09 +08:00
joylink_cuiweidong
2aadda7606 福州一号线 实训 操作定义 代码调整 2021-02-01 14:37:52 +08:00
fan
900a858010 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 14:31:28 +08:00
fan
8982177e99 代码调整 2021-02-01 14:31:16 +08:00
lVAL
9071ce93e9 线路：南京2 
问题：行调 交出控制、接受控制实训流程问题
 2021-02-01 13:46:59 +08:00
lVAL
2e890a378c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 13:44:14 +08:00
lVAL
f0e3ee1f49 线路：南京2 
问题：修改现地 强制站控，交出控制权，接受控制的实训流程。
 2021-02-01 13:43:48 +08:00
joylink_cuiweidong
c4619c0784 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 11:24:14 +08:00
joylink_cuiweidong
7818a149c4 福州一号线 道岔计轴预复位 操作定义调整 2021-02-01 11:23:37 +08:00
fan
e0245e4cbd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 10:19:07 +08:00
fan
143f517097 卡斯柯 紧急站控实训调整 2021-02-01 10:18:54 +08:00
lVAL
ad385fbe97 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 18:37:37 +08:00
lVAL
0598e48b42 修改宁波线状态刷新 2021-01-29 18:37:10 +08:00
joylink_cuiweidong
7e173b4c4c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 17:32:09 +08:00
joylink_cuiweidong
8c4f24f9e2 bug101 交控仿真路线:控制模式转换的操作与手册不一致 实训 调整 2021-01-29 17:31:48 +08:00
fan
96256020c5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 17:17:50 +08:00
fan
39e7cb83b9 南京二选中区段调整 2021-01-29 17:17:41 +08:00
lVAL
8c25f274f5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 16:21:35 +08:00
lVAL
fa5b6027d3 删除无用打印 2021-01-29 16:21:19 +08:00
fan
84a438a74d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 15:01:50 +08:00
fan
318d120db6 BUG 107: 浙大网新仿真线路：对立的功能应设置有误 2021-01-29 15:01:38 +08:00
joylink_cuiweidong
fcf3ec5b8e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 14:40:27 +08:00
joylink_cuiweidong
f1106b7dc0 运行图编制 菜单顺序 调整 2021-01-29 14:40:09 +08:00
fan
f1822495d2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 13:23:41 +08:00
fan
12e16f9a99 BUG 152: 教学系统：在课程中点击实训进入实训后点击返回应退出到课程详情页面，目前退出到教学系统界面了，建议修改 2021-01-29 13:23:29 +08:00
lVAL
f91f045a1e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 11:08:19 +08:00
lVAL
20a71051c7 线路：佛州 
问题：设置限速和取消限速，配置逻辑区段生成实训
 2021-01-29 11:08:03 +08:00
joylink_cuiweidong
67d7008ec0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 09:57:39 +08:00
joylink_cuiweidong
45572a9f2a 删除不需要的文件 2021-01-29 09:57:22 +08:00
lVAL
4d3d92e18b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 09:46:05 +08:00
lVAL
e28047773d 线路：福州1 
问题：设置运行等级实训提示运行时间未提示的问题
 2021-01-29 09:45:43 +08:00
fan
80cb675d9d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 18:54:57 +08:00
fan
f4e3deaabc 仿真异常不清除订阅 2021-01-28 18:54:48 +08:00
joylink_cuiweidong
a9f47fdeb2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 18:49:59 +08:00
joylink_cuiweidong
381f26b661 成都三号线 设置/取消 自动进路/自动折返 实训 操作定义代码调整 2021-01-28 18:49:36 +08:00
lVAL
d4014b53c4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 18:44:21 +08:00
lVAL
31f9e2a4d3 修改生成实训配置 佛山1 2021-01-28 18:44:03 +08:00
fan
3f70632b84 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 17:47:56 +08:00
fan
b1d944c52f 国赛购买成功调整 2021-01-28 17:47:43 +08:00
lVAL
6a033b2a9d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 16:28:14 +08:00
lVAL
590fb34edf 修改 宁波线操作 2021-01-28 16:27:44 +08:00
joylink_cuiweidong
694fe461a6 成都1和3，北京1，佛山有轨电车，哈尔滨1，南京2 运行图 折返点计算 代码调整 2021-01-28 16:12:10 +08:00
joylink_cuiweidong
909a5cb7f9 宁波一、三号线，西安二号线 运行图 转换函数 调整 2021-01-28 14:45:33 +08:00
joylink_cuiweidong
f6d3a6f030 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 13:38:29 +08:00
joylink_cuiweidong
c9a8d09e67 福州一号线 运行图绘图 折返点计算调整 2021-01-28 13:38:10 +08:00
lVAL
035ae9d367 修改 南京2 实训配置 2021-01-28 09:27:32 +08:00
lVAL
369c5446cc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/nanjing_02/menus/menuButton.vue
 2021-01-27 18:39:11 +08:00
lVAL
ba5de90773 配置 南京2实训 2021-01-27 18:32:16 +08:00
fan
3c499369a6 meger 2021-01-27 15:53:09 +08:00
fan
cb894aec34 南京二号线操作调整显示 2021-01-27 15:37:01 +08:00
lVAL
fbcfca4f9b 优化 南京2 提示信息的代码 2021-01-27 13:42:33 +08:00
lVAL
89c0b4f693 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-27 13:31:31 +08:00
lVAL
d5dd86be69 删除南京2 无用代码 2021-01-27 13:31:18 +08:00
joylink_cuiweidong
ccaceffeca 删除暂不需要文件 2021-01-27 13:13:44 +08:00
joylink_cuiweidong
b2adbb8eda 删除不需要的文件 2021-01-27 13:06:24 +08:00
lVAL
14e7acd715 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/nanjing_02/menus/menuBar.vue
 2021-01-27 11:25:23 +08:00
lVAL
62d52fd27f 修改南京2错误提示功能 2021-01-27 11:24:14 +08:00
joylink_cuiweidong
030a603da4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-27 10:40:50 +08:00
joylink_cuiweidong
c52474b771 宁波三号线（泰雷兹） 
扣车后没有显示扣车标识修改
 2021-01-27 10:38:34 +08:00
fan
d562037967 调整报警闪烁 2021-01-27 10:18:47 +08:00
fan
c0d1ffffd6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-27 09:47:38 +08:00
fan
ca1b5892af 剧本编辑框和请求栈堆微调 2021-01-27 09:47:26 +08:00
lVAL
b237d09402 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-27 09:27:59 +08:00
lVAL
ad0590dfe4 修改南京2 登录密码为1 以及限制普通站不能登录 2021-01-27 09:27:44 +08:00
fan
86dfe7a5f5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 18:19:14 +08:00
fan
f92e017f1b 调整南京二号线岔区设限显示 2021-01-26 18:19:04 +08:00
lVAL
be6610a850 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 17:45:39 +08:00
lVAL
4efca07ac8 配置 宁波3 设置跳停和取消跳停配置 2021-01-26 17:45:24 +08:00
fan
aa74b86dbd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 16:19:39 +08:00
fan
abed3ef7c1 BUG108: 浙大网新仿真：道岔单解时出现字母“E”后，右键点击出现“使能”，此时不点击使能，而点击空白处，再点击字母E，没有反应，并且初始化后E还在闪烁 && 南京二排列进路后封锁区段显示调整 2021-01-26 16:19:29 +08:00
lVAL
0c527d8b63 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 15:03:00 +08:00
lVAL
5858bb1eb3 优化代码 2021-01-26 15:02:39 +08:00
fan
324f662c8f BUG109: 浙大网新：站台设置停站时间时有误，详细请看图 2021-01-26 14:54:37 +08:00
joylink_cuiweidong
519916458f 成都三号线 实训操作定义代码调整 2021-01-26 14:40:17 +08:00
joylink_cuiweidong
2525d57f8f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 14:04:36 +08:00
joylink_cuiweidong
bd9917c0ca 道岔区段 切除闪烁绘图代码调整 2021-01-26 14:04:17 +08:00
fan
4f911227fe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 13:07:11 +08:00
fan
c32009a9d2 南京二号线折行显示列车调整 2021-01-26 13:07:02 +08:00
joylink_cuiweidong
ebcd6b9bd9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 11:10:38 +08:00
joylink_cuiweidong
7d0a4269e6 运行图绘制代码调整 
南京二号线 运行图转换函数代码调整
 2021-01-26 11:10:18 +08:00
lVAL
9602cfc27a 修改实训查询 表单联动查询的问题 2021-01-26 11:05:18 +08:00
lVAL
c2ecb60cd7 修改 南京2 刚登陆进去执行操作异常的问题 2021-01-26 10:42:39 +08:00
lVAL
8d9114cfa7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 09:36:04 +08:00
lVAL
c3553c87f1 修改 南京2现地登录操作问题 2021-01-26 09:35:54 +08:00
joylink_cuiweidong
212b286408 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 18:36:38 +08:00
joylink_cuiweidong
da2caf0396 运行图 代码调整 2021-01-25 18:36:22 +08:00
lVAL
8ecbee01b2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 18:23:32 +08:00
lVAL
d325a10c40 配置宁波3 线路 实训 2021-01-25 18:23:23 +08:00
joylink_cuiweidong
194b31094d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 17:48:00 +08:00
joylink_cuiweidong
6b0d8cf772 代码调整 2021-01-25 17:47:49 +08:00
lVAL
388bd1e328 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 17:43:46 +08:00
lVAL
1f9ade8ec8 修改宁波一 实训代码格式 2021-01-25 17:43:38 +08:00
fan
b427f8a8e6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 17:42:11 +08:00
fan
f4db53df3f 调整南京二号线显示问题 2021-01-25 17:42:01 +08:00
lVAL
78863b868c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 17:30:27 +08:00
lVAL
76a7d1fe83 修改西安二号线实训折返不发指令的问题 2021-01-25 17:30:16 +08:00
fan
76f0fa96ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 17:21:40 +08:00
fan
4fb1cd1bed 南京二号线行值折行显示 2021-01-25 17:21:24 +08:00
lVAL
32304d294e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 15:46:29 +08:00
lVAL
b5788f01d4 增加 现地车站登录功能 2021-01-25 15:46:18 +08:00
joylink_cuiweidong
6d70fd3fb2 成都三号线（交控）现地 人工控/自动控 操作定义代码调整 2021-01-25 14:05:51 +08:00
joylink_cuiweidong
e49cce6b8a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 13:51:23 +08:00
joylink_cuiweidong
41447e97dc 代码调整 2021-01-25 13:51:13 +08:00
joylink_cuiweidong
d3546c5de2 岔心鼠标事件 绘图代码调整 2021-01-25 13:48:37 +08:00
fan
98342c2423 南京二号线遮盖信号机的颜色调整 2021-01-25 10:23:13 +08:00
fan
7e026191c9 报警和记录框无法拖动，是固定的。 2021-01-25 09:57:20 +08:00
fan
a55f69a3cb 南京二号线 延时解锁 2021-01-22 21:28:30 +08:00
fan
e574bcf2eb 南二 挤岔恢复 2021-01-22 21:14:20 +08:00
fan
cf871345e3 注释南京二列车操作 2021-01-22 19:52:08 +08:00
fan
67a061d9da Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-22 19:35:23 +08:00
fan
32f68ed895 道岔状态调整 2021-01-22 19:35:14 +08:00
joylink_cuiweidong
8373a96229 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-22 19:18:37 +08:00
joylink_cuiweidong
8eee00f454 代码调整 2021-01-22 19:18:16 +08:00
lVAL
d9de6c2548 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-22 18:58:33 +08:00
lVAL
b5d69120ff 增加 宁波三 实训部分配置，以及修改西安控制模式操作提示未知错误的问题 2021-01-22 18:58:01 +08:00
fan
0d8a6df9de 预复位调整 2021-01-22 18:33:21 +08:00
fan
3407d4d13b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-22 17:47:05 +08:00
fan
d2d854b0c0 预复位调整 2021-01-22 17:46:51 +08:00
lVAL
4211651bcf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-22 17:39:26 +08:00
lVAL
584a30a634 增加 区段的新建列车操作，以及菜单实训operate配置 2021-01-22 17:39:12 +08:00
fan
97d8a66ccb 道岔的故障和预复位的显示 2021-01-22 16:55:00 +08:00
lVAL
527f59cc58 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-22 15:00:50 +08:00
lVAL
2ec8d1686a 福州线排查操作和实训情况 2021-01-22 15:00:36 +08:00
fan
e0fe554699 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-22 13:59:42 +08:00
fan
4a0c7e1e95 逻辑区段实际长度设置调整 2021-01-22 13:59:32 +08:00
lVAL
277252916c 修改成都3操作优化，以及实训配置修正 2021-01-22 10:57:27 +08:00
joylink_cuiweidong
5d7810b6f9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 19:19:41 +08:00
joylink_cuiweidong
3e6da71787 代码调整 2021-01-21 19:19:20 +08:00
fan
2cdbc1ee78 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 19:12:17 +08:00
fan
258796555e 车队进路调整 2021-01-21 19:11:50 +08:00
joylink_cuiweidong
2b6e1ca117 岔心 代码调整 2021-01-21 19:02:28 +08:00
joylink_cuiweidong
a9ea00c0c8 南京十一站 代码调整 2021-01-21 18:39:00 +08:00
fan
60e82ec34e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 17:45:09 +08:00
fan
ff6dac7c60 南二强解道岔&强解区段 2021-01-21 17:44:57 +08:00
lVAL
49b7de7cae 调整西安 开放自动进路和关闭自动进路 实训 2021-01-21 17:08:17 +08:00
lVAL
84306b2507 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 17:00:22 +08:00
lVAL
1e488cdec6 西安2号线，修改开放自动进路和取消自动进路 实训配置 2021-01-21 17:00:12 +08:00
lVAL
0b9aeacda3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 16:38:52 +08:00
joylink_cuiweidong
5fec6faef3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 16:38:49 +08:00
lVAL
2f2316e353 增加西安2区故解流程 2021-01-21 16:38:44 +08:00
joylink_cuiweidong
21f4b004c9 西安二号线 开放自动进路/关闭自动进路 操作添加 2021-01-21 16:38:29 +08:00
fan
45fd2d348b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 16:32:22 +08:00
fan
5b69262124 南京二好像长闪短闪调整 2021-01-21 16:32:11 +08:00
joylink_cuiweidong
8e958875f4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 15:54:13 +08:00
joylink_cuiweidong
e5069bbe92 西安二号线 部分操作 暂时隐藏 2021-01-21 15:53:51 +08:00
lVAL
56df3cd81c 添加 南京2 道岔 强解道岔配置 2021-01-21 15:53:37 +08:00
lVAL
bdbd5b9cc0 删除 福州2现地定位反位右键操作 2021-01-21 15:49:52 +08:00
lVAL
5bf71f2d7a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 15:28:32 +08:00
lVAL
c3c3548574 修改，西安2 删除现地 信号机封锁解封配置 2021-01-21 15:28:21 +08:00
joylink_cuiweidong
5b1e331d26 岔心区段 批量设置集中站 调整 2021-01-21 14:49:02 +08:00
joylink_cuiweidong
be9e15567e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 14:15:18 +08:00
joylink_cuiweidong
16f255fcae bug136 南铁院11站：现地仿真里岔心设置限速后不显示数字 调整 2021-01-21 14:15:00 +08:00
fan
e71fe4cea8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 13:45:32 +08:00
fan
6df9350155 卡斯柯实训调整&南京二号线封锁调整 2021-01-21 13:45:20 +08:00
lVAL
eac5a23ddf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/foshan_01/operationConfig.js
 2021-01-21 11:10:52 +08:00
lVAL
b8a36028fd 增加 佛山线全线限速配置注释 2021-01-21 11:09:51 +08:00
joylink_cuiweidong
1d32bd66b4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/foshan_01/operationConfig.js
 2021-01-21 11:04:25 +08:00
joylink_cuiweidong
cd9aa64552 佛山线路 实训代码调整 2021-01-21 11:02:04 +08:00
lVAL
322f0724c1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 10:42:27 +08:00
lVAL
f0829b768b 增加佛州线实训配置 2021-01-21 10:42:17 +08:00
fan
356ec2db79 南京二号线调整 2021-01-21 10:13:30 +08:00
fan
ac4580f1b3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 10:06:13 +08:00
fan
89700f2245 卡斯柯调整 2021-01-21 10:05:59 +08:00
lVAL
8e634b78e9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 18:45:24 +08:00
lVAL
9ed523fb86 增加佛州控制模式 2021-01-20 18:45:05 +08:00
fan
50321992c0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 18:29:24 +08:00
fan
75e48959ba 调整生成课程和试卷问题&设置运行等级报错调整 2021-01-20 18:29:12 +08:00
joylink_cuiweidong
ea99e7a9e4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 18:13:58 +08:00
lVAL
2dc837020c 增加控制模式实训 2021-01-20 18:14:03 +08:00
joylink_cuiweidong
7171601b06 佛山线路 实训 代码调整 2021-01-20 18:13:42 +08:00
lVAL
2408e28509 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/foshan_01/operationConfig.js
 2021-01-20 17:53:00 +08:00
lVAL
87f2d274d1 修改指令 2021-01-20 17:52:34 +08:00
joylink_cuiweidong
913a9229d9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 17:47:22 +08:00
joylink_cuiweidong
cc462621f5 佛山线 实训 代码调整 2021-01-20 17:47:05 +08:00
lVAL
338a7c9cbe 增加信号机封锁解封 实训 2021-01-20 17:42:42 +08:00
lVAL
8d25d8c1d8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 16:33:31 +08:00
lVAL
711f0bc70a 修改 成都3 实训配置情况 2021-01-20 16:33:19 +08:00
fan
287e6251b7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 16:26:42 +08:00
fan
5a36ce69fe 添加线路配置项 signalHumanControlBeforeSetAtsControlOrCIAutoTrigger、cancelAtsControlOfAllRoutesWhenCancelRoute 2021-01-20 16:26:32 +08:00
lVAL
a4a7494975 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 16:10:25 +08:00
lVAL
78822e9c30 成都3 实训引导总锁配置，先注释掉 2021-01-20 16:10:14 +08:00
fan
2e4cdc698e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 16:07:37 +08:00
fan
70045c8f87 现地行调条件显示调整 2021-01-20 16:07:10 +08:00
lVAL
5764a103c8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 15:53:51 +08:00
lVAL
c8e2b30271 增加 成都3 中控、站控、紧急站控、扣车、设置跳停、取消跳停实训 2021-01-20 15:53:36 +08:00
fan
25b6ad4ca8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 15:53:23 +08:00
fan
34aca8de12 现地行调条件显示调整 2021-01-20 15:53:13 +08:00
joylink_cuiweidong
c8c4264be9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 15:32:08 +08:00
fan
a7d4e0c195 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 13:50:57 +08:00
fan
330f58eba4 右键选择 进路快捷操作盘 2021-01-20 13:50:37 +08:00
joylink_cuiweidong
79f0de576c 代码调整 2021-01-20 11:16:09 +08:00
joylink_cuiweidong
5cbfa16d6c bug104 交控线行调仿真：站台信息显示的默认停站时间不正确 修改 2021-01-20 10:16:15 +08:00
joylink_cuiweidong
3c76a3139c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 09:54:26 +08:00
joylink_cuiweidong
5b5d635f07 bug103 设置停站时间范围改为15-300S 修改 2021-01-20 09:54:01 +08:00
fan
92929a02fc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-19 19:03:53 +08:00
fan
0126066322 调整传输信号机选择 2021-01-19 19:03:42 +08:00
lVAL
332aa9b61a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-19 18:22:14 +08:00
lVAL
35a98a6e00 修改 nameAlone 报错的优化 2021-01-19 18:22:04 +08:00
joylink_cuiweidong
10ed69f5ec 代码调整 2021-01-19 17:44:18 +08:00
joylink_cuiweidong
745dbd6859 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-19 17:15:07 +08:00
joylink_cuiweidong
df6ede1e4b 南京二号线 站台操作调整 2021-01-19 17:14:47 +08:00
fan
b4059db243 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-19 16:08:04 +08:00
fan
c6e9e1fe38 列车状态调整 2021-01-19 16:07:32 +08:00
joylink_cuiweidong
9828c65b26 代码调整 2021-01-19 14:07:57 +08:00
joylink_cuiweidong
be344cf815 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/nanjing_02/menus/menuButton.vue
 2021-01-19 14:00:32 +08:00
joylink_cuiweidong
d404ed01dc 代码调整 2021-01-19 13:57:35 +08:00
fan
606c4ae301 menuButton调整 2021-01-19 13:56:45 +08:00
fan
12be0c61cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-19 13:26:05 +08:00
fan
daea6e1760 传输信号机选中状态 2021-01-19 13:25:53 +08:00
lVAL
5f80334433 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-19 13:04:06 +08:00
lVAL
696af622b7 调整南京2岔芯设置限速和设置封锁 2021-01-19 13:03:43 +08:00
fan
732c44fea0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-19 11:10:04 +08:00
fan
145259d3b5 传输信号机 && 佛山进路预览调整 2021-01-19 11:09:53 +08:00
lVAL
396d7ec14e 修改南京2号线菜单配置方式 2021-01-19 10:31:31 +08:00
lVAL
267a815956 修改南京2按钮配置 2021-01-19 09:54:45 +08:00
joylink_cuiweidong
05a8c85d6b 代码调整 2021-01-19 09:20:37 +08:00
joylink_cuiweidong
4cbc3de4ea Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-18 18:06:23 +08:00
joylink_cuiweidong
ba80512efa 南京二号线 站台添加 月台 按钮 2021-01-18 18:06:08 +08:00
fan
07ad4c85dd 被覆盖代码重新提交 2021-01-18 17:41:46 +08:00
lVAL
b156097cba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/nanjing_02/menus/menuButton.vue
 2021-01-18 17:35:19 +08:00
lVAL
aed7f034b1 南京2车站操作设备并且状态刷新后，页面操作菜单disabled刷新问题 2021-01-18 17:32:20 +08:00
fan
f18c48ffa8 南京二号线初始获取车站调整&计轴占用状态调整 2021-01-18 17:24:00 +08:00
fan
057687a678 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-18 16:57:03 +08:00
lVAL
9617c36d01 修改控制模式 disabled 控制 2021-01-18 16:53:54 +08:00
fan
1ba5d404b5 南京二号线进路锁闭封锁状态调整 2021-01-18 16:51:45 +08:00
fan
58f1bc5950 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-18 16:22:38 +08:00
fan
cff6a78d3a 南京二号线行调点击空白关闭 2021-01-18 16:22:26 +08:00
lVAL
198602923c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-18 15:49:00 +08:00
lVAL
7d61451fa9 修改 应答器 创建的几个优化问题，以及南京线路中心左键弹窗，右键不弹 2021-01-18 15:48:05 +08:00
fan
14091957d7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-18 15:41:43 +08:00
joylink_cuiweidong
d322aad5d4 南京二号线 站台安全门 通信正常开启状态 调整 2021-01-18 15:16:00 +08:00
fan
6aea2334e6 南京二号线 控制模式none 车站字体闪烁 2021-01-18 14:10:55 +08:00
joylink_cuiweidong
74b9c8cc7e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-18 13:40:29 +08:00
joylink_cuiweidong
5687ffc5a8 南京二号线 区段 轨区设限 代码调整 2021-01-18 13:37:45 +08:00
fan
fa412d1079 南京二号线 状态调整 2021-01-18 10:52:06 +08:00
fan
e7f2d73857 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 18:42:43 +08:00
fan
649691b1c3 操作表盘调整 2021-01-15 18:42:17 +08:00
joylink_cuiweidong
3e1696d081 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 18:36:52 +08:00
joylink_cuiweidong
69737a06f0 区段 颜色配置文件调整 2021-01-15 18:36:13 +08:00
lVAL
a70de561ba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 18:10:23 +08:00
lVAL
fd5d8245c7 修改代码 2021-01-15 18:10:14 +08:00
fan
1c9c8aab8a 南京二号线 道岔 侧防 和进路锁闭 优先级调整 2021-01-15 18:00:32 +08:00
fan
bacdca5e19 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 17:53:05 +08:00
fan
844b2ee382 南京二号线引导进路 2021-01-15 17:52:54 +08:00
joylink_cuiweidong
0eb7ca8a06 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 17:17:33 +08:00
joylink_cuiweidong
f61df9b1e8 岔心状态 绘图代码调整 2021-01-15 17:17:17 +08:00
fan
087f1123b8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 17:00:10 +08:00
fan
45869c5362 信号机状态调整 2021-01-15 16:59:58 +08:00
lVAL
89dacd7deb 增加南京2号线 信号机配置 2021-01-15 16:40:23 +08:00
lVAL
5b4e15a979 修改操作提示 2021-01-15 16:12:49 +08:00
lVAL
c06bad3005 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 16:09:35 +08:00
lVAL
cc5ee4661f 修改 发送命令后 提示的信息 2021-01-15 16:09:26 +08:00
fan
a60209a10f 信号机状态调整 2021-01-15 16:01:15 +08:00
lVAL
bc8f65c149 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 15:25:49 +08:00
lVAL
57acd71924 修改南京2蓝色颜色 2021-01-15 15:25:41 +08:00
fan
cd5bcfe888 信号机&道岔状态调整 2021-01-15 15:24:19 +08:00
fan
93eaaacd96 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 13:34:35 +08:00
fan
0caf3d233a 排列进路 2021-01-15 13:34:25 +08:00
lVAL
25e89c9b1c 配置强解 道岔和区段，（道岔等待后端确定指令） 2021-01-15 12:25:25 +08:00
lVAL
2024cef7c9 修改南京仿真bar遮挡运行图的问题 2021-01-15 12:18:27 +08:00
fan
12925e92bb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 11:21:22 +08:00
fan
29c8e5b4b9 暂提 2021-01-15 11:21:11 +08:00
lVAL
80f8ecf19f 修改南京2号线 tempData 报错问题 2021-01-15 11:16:17 +08:00
lVAL
356042f673 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 11:00:05 +08:00
lVAL
ec30635c02 修改应答器图层以及回车修改属性的问题 2021-01-15 10:59:58 +08:00
joylink_cuiweidong
04e4df6225 代码调整 2021-01-15 10:38:35 +08:00
joylink_cuiweidong
4e28468ad9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 10:33:15 +08:00
joylink_cuiweidong
a86c76422f 岔心绘图代码调整 
区段绘图（左右关联区段 关系）调整
 2021-01-15 10:32:57 +08:00
lVAL
4c89a777ba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 09:53:46 +08:00
lVAL
c6c59f48b7 修改代码 2021-01-15 09:53:37 +08:00
fan
0671c6e733 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 09:42:36 +08:00
fan
15928a6248 道岔封锁状态调整 2021-01-15 09:42:19 +08:00
lVAL
cb364658fc 修改替换错误 2021-01-15 09:39:27 +08:00
lVAL
41f1253746 修改 南京2号线 中心操作弹窗为非模式对话框 2021-01-15 09:34:16 +08:00
lVAL
284899599c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/nanjing_02/menus/menuButton.vue
 2021-01-14 18:38:29 +08:00
lVAL
b5c2202114 增加 南京线增加参数选择的步骤功能 2021-01-14 18:37:31 +08:00
joylink_cuiweidong
c8d0bf50f5 代码调整 2021-01-14 17:11:10 +08:00
joylink_cuiweidong
06edd5f531 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-14 17:00:04 +08:00
joylink_cuiweidong
3dd6696140 代码调整 2021-01-14 16:59:41 +08:00
fan
359e24dfbd merge 2021-01-14 16:35:45 +08:00
fan
ab804e3b95 南京二号线状态调整 道岔长闪 2021-01-14 16:26:04 +08:00
joylink_cuiweidong
c4f6cde2c4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-14 16:04:03 +08:00
joylink_cuiweidong
28babc78f9 岔心 绘图调整 2021-01-14 16:03:48 +08:00
lVAL
2fc70489eb 修改南京2号线菜单皮肤 2021-01-14 15:44:56 +08:00
lVAL
51096d5ea1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-14 15:32:33 +08:00
lVAL
eb7fa1f5cb 修改实现南京2行调和现地界面操作 2021-01-14 15:32:17 +08:00
fan
ec87dc8eaf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-14 14:43:03 +08:00
fan
9c7c0f674e 南京二号线状态调整 2021-01-14 14:42:53 +08:00
lVAL
44adeaf24a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-14 14:15:18 +08:00
lVAL
22403b198d 修改南京2号线菜单，以及样式 2021-01-14 14:15:02 +08:00
joylink_cuiweidong
845f10caf6 岔心绘图代码调整 
bug调整：新建完一个信号机 三个状态不发生改变
 2021-01-14 13:04:04 +08:00
joylink_cuiweidong
3be5df98e8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-13 18:33:21 +08:00
joylink_cuiweidong
becb6a03df 岔心代码调整 2021-01-13 18:33:07 +08:00
lVAL
1dfa8f5b19 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-13 18:08:02 +08:00
lVAL
37bc98d706 修改应答器 计算方式 2021-01-13 18:07:49 +08:00
joylink_cuiweidong
c42a184b7b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-13 17:54:11 +08:00
joylink_cuiweidong
7ac59f6006 岔心 绘图代码调整 2021-01-13 17:53:51 +08:00
lVAL
9f4155b70d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-13 17:45:49 +08:00
lVAL
15f94a7d1d 优化 应答器创建 选择关联区段类型 以及优化绘制显示位置 2021-01-13 17:45:38 +08:00
joylink_cuiweidong
752b4e9a26 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/config/skinCode/nanjing_02.js
#	src/jmapNew/utils/parser.js
 2021-01-13 17:43:15 +08:00
joylink_cuiweidong
99644039d3 新建车站以后 无法点击其他的东西 bug 调整 2021-01-13 17:34:57 +08:00
joylink_cuiweidong
7599458c8f 岔心 元素绘图代码调整 2021-01-13 17:01:53 +08:00
lVAL
fd3f82e7ba 修改炼精二号线 逻辑区段名称大小 2021-01-13 14:18:48 +08:00
lVAL
006d784178 修改应答器bug 2021-01-13 10:26:52 +08:00
joylink_cuiweidong
fbb8157ff1 代码调整 2021-01-12 20:20:56 +08:00
joylink_cuiweidong
12acee5bc7 代码调整 2021-01-12 18:06:52 +08:00
joylink_cuiweidong
b33e4b92ed 暂时 注释 西安二号线 未实现的 功能 2021-01-12 17:57:44 +08:00
joylink_cuiweidong
1e2e8c2609 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/config/skinCode/nanjing_02.js
#	src/jmapNew/shape/Responder/index.js
 2021-01-12 17:27:25 +08:00
joylink_cuiweidong
85a88a9431 岔心 绘图代码调整 2021-01-12 17:25:32 +08:00
lVAL
64df012fc3 设置应答器 绘图显示 仿真不显示 2021-01-12 11:32:39 +08:00
lVAL
8c261bb3a6 优化应答器 状态处理功能 2021-01-12 11:00:16 +08:00
lVAL
7bacd3c49f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-12 10:07:50 +08:00
lVAL
9bd12bb82e 增加应答器配置 2021-01-12 10:07:31 +08:00
fan
9a74d3ee39 成绩导出调整 2021-01-11 17:51:54 +08:00
fan
84354dde17 课程迁移问题调整&区段限速取消限速仅逻辑区段显示 2021-01-11 15:23:56 +08:00
fan
ec5b0e0a1e 西门子列车未实现操作注释 2021-01-11 11:04:14 +08:00
fan
682a47f730 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-08 17:27:36 +08:00
fan
0051560fff 课程迁移调整 2021-01-08 17:27:25 +08:00
zyy
bb22ed66ed 调整大屏预览显示流程 2021-01-08 16:50:50 +08:00
joylink_cuiweidong
18ff2dcd22 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-08 09:54:21 +08:00
joylink_cuiweidong
8145673f5d 成都三号线 代码调整 2021-01-08 09:54:04 +08:00
lVAL
d5f94f8539 修改 变量名称 2021-01-07 15:18:48 +08:00
lVAL
f5cfb5f787 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/config/skinCode/xian_01.js
 2021-01-07 15:16:34 +08:00
lVAL
1a0612020e 增加，信号机灯丝故障处理 2021-01-07 15:15:54 +08:00
joylink_cuiweidong
c266442842 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-06 18:15:34 +08:00
fan
e94ffd235a 故障模式快捷键&ISCS返回（退出）调整 2021-01-06 18:17:40 +08:00
joylink_cuiweidong
558ea5cc95 代码调整 2021-01-06 18:15:14 +08:00
joylink_cuiweidong
728ba4b47b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-06 11:28:11 +08:00
joylink_cuiweidong
6e3cdc6bd1 bug56 设置运行等级后，查询站台状态显示自动 代码调整 2021-01-06 11:27:55 +08:00
lVAL
0ad6925791 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-06 10:21:20 +08:00
lVAL
0e37349fcd 修改，站台设置跳停和取消跳停现地没有生成实训的配置问题 2021-01-06 10:21:11 +08:00
joylink_cuiweidong
923e3ba05c bug57 苏电院西门子仿真线路：进路控制模式显示有误，自动显示人工 修改 2021-01-06 09:32:27 +08:00
joylink_cuiweidong
411bde3aee bug 64 苏电院交控仿真线路：信号解封无效 调整 2021-01-05 18:19:02 +08:00
joylink_cuiweidong
dd0a0b2fdf bug70（在课程树创建课程章节时，创建二级章节后无法继续创建一级章节）修改 2021-01-05 17:31:03 +08:00
lVAL
42dd23b716 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/xian_02/menus/menuSignal.vue
 2021-01-05 16:05:52 +08:00
lVAL
cc2814f722 增加西安2号线实训配置 2021-01-05 16:05:13 +08:00
joylink_cuiweidong
c0a949eafa 更改 西安二号线 信号机解封 实训提示 2021-01-05 15:32:12 +08:00
lVAL
e8d1777703 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-05 15:08:08 +08:00
lVAL
ea7d29f520 增加 信号机解封实训配置 2021-01-05 15:07:54 +08:00
joylink_cuiweidong
9684fd6937 信号机 取消封锁 使能 操作代码调整 2021-01-05 14:45:10 +08:00
fan
0a9ca02ae9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-05 13:57:05 +08:00
fan
175d5b1810 代码调整 2021-01-05 13:56:51 +08:00
joylink_cuiweidong
dcfd22463b 西安二号线 指令操作调整 2021-01-05 13:45:29 +08:00
joylink_cuiweidong
40a367a005 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-05 13:00:25 +08:00
joylink_cuiweidong
50a2085052 西安二号线 绘图代码 调整 2021-01-05 11:33:18 +08:00
lVAL
f11ded27f7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-05 11:30:34 +08:00
lVAL
f35628f130 修改道岔单锁实训流程问题 2021-01-05 11:30:25 +08:00
joylink_cuiweidong
bc791715f4 西安二号线 操作代码调整 2021-01-05 09:43:09 +08:00
lVAL
1c04595c38 补充 西安二号线 实训配置 2021-01-05 09:13:09 +08:00
lVAL
0d183d53ce Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-04 18:25:42 +08:00
lVAL
e9c3a49612 添加缺失的实训配置（未调整，未验证） 2021-01-04 18:25:33 +08:00
fan
d31c9c1da3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-04 17:52:52 +08:00
fan
43f039e5c6 浙大网新 发送请求提示调整 2021-01-04 17:52:38 +08:00
lVAL
7468e2edcb 注释掉，宁波三仿真操作功能无关的操作 2021-01-04 17:37:56 +08:00
joylink_cuiweidong
e3584dc2ea 西安二号线 紧急本地控制（紧急站控） 操作代码调整 2021-01-04 15:39:54 +08:00
fan
b71962d77c 浙大网新 扣车和取消扣车实训调整 2021-01-04 14:50:13 +08:00
joylink_cuiweidong
1a65264d64 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-04 14:48:28 +08:00
joylink_cuiweidong
4151680a6a 西安二号线 现地 控制权转移 代码调整 2021-01-04 14:48:09 +08:00
fan
3c7f96614d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-04 14:03:40 +08:00
fan
f73fcff33e 浙大网新 跳停和取消跳停 2021-01-04 14:03:26 +08:00
joylink_cuiweidong
ad2e6ed0f6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-31 18:03:17 +08:00
joylink_cuiweidong
a024699e8f 西安二号线 控制模式 绘图调整 2020-12-31 18:02:55 +08:00
fan
c5fd6a97a8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-31 16:40:29 +08:00
fan
386cda6dba Bug54：苏电院交控仿真线路切换到车站一显示调整成员角色失败& 浙大网新部分实训调整 2020-12-31 16:40:13 +08:00
joylink_cuiweidong
5ec5d451d0 西安二号线 右键操作 代码调整 2020-12-31 14:57:53 +08:00
joylink_cuiweidong
2d831ca398 bug12（哈尔滨仿真线路里的交出控制功能逻辑问题）修改 2020-12-31 14:13:51 +08:00
fan
730b673da2 泰雷兹屏蔽门 2020-12-30 11:15:05 +08:00
fan
9a55afa779 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-29 11:04:17 +08:00
fan
72db8b3e94 紧急停车状态调整 2020-12-29 11:04:01 +08:00
joylink_cuiweidong
0bcdae70db 紧急停车代码调整 2020-12-29 10:59:55 +08:00
lVAL
da1fa87021 修改代码 2020-12-28 17:39:47 +08:00
lVAL
f97a98da21 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-28 16:59:57 +08:00
lVAL
44e42bf5e5 调整宁波3号线操作 2020-12-28 16:59:29 +08:00
fan
1d775c4529 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-28 16:41:56 +08:00
fan
b24e59bc9a 代码调整 2020-12-28 16:41:37 +08:00
joylink_cuiweidong
0b606fbc56 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-28 16:25:49 +08:00
joylink_cuiweidong
dbbd817aad 哈尔滨仿真线路里的交出控制功能逻辑问题 （bug12）代码调整 2020-12-28 16:25:29 +08:00
fan
908aa12c21 bug: 11 设置运行等级显示问题 2020-12-28 16:00:55 +08:00
fan
e9a0359b1f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-28 15:01:35 +08:00
fan
16206cd003 bug: 1 & 紧急停车调整 & bug: 10 2020-12-28 15:01:25 +08:00
joylink_cuiweidong
906e12d508 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-28 13:03:18 +08:00
joylink_cuiweidong
fc4d130675 宁波三号线 站台操作调整 2020-12-28 13:02:33 +08:00
fan
614f835701 成都一号线两个确认运行至前方站 2020-12-28 11:24:25 +08:00
joylink_cuiweidong
940f01a89e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-25 18:07:15 +08:00
joylink_cuiweidong
418e8b86a4 宁波三号线 行调操作代码调整 2020-12-25 18:06:08 +08:00
lVAL
d229e5ca59 调试 宁波3号线 指令 2020-12-25 18:05:49 +08:00
lVAL
ac3ee7cf7e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-25 14:24:59 +08:00
lVAL
d5315ef81b 增阿基指令分页的功能 2020-12-25 14:24:47 +08:00
joylink_cuiweidong
18a8b75a98 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-25 14:02:33 +08:00
joylink_cuiweidong
9dfc64ea0a 宁波三号线 真实运行图 导入代码调整 2020-12-25 14:02:03 +08:00
fan
ada7d199c8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-25 11:18:09 +08:00
fan
2aa6cb1f8f 哈尔滨操作调整&ibp调整 2020-12-25 11:17:56 +08:00
joylink_cuiweidong
1a7b0b0301 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-25 09:08:47 +08:00
joylink_cuiweidong
d74564f9b1 宁波三号线运行图导入代码调整 2020-12-25 09:08:31 +08:00
lVAL
c4aba14e1f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-24 18:35:45 +08:00
lVAL
0d8ff932a0 修改组件操作报错的问题 2020-12-24 18:35:26 +08:00
fan
4611c4b74b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-24 15:33:17 +08:00
fan
48e37e44f8 indexedDb调整 2020-12-24 15:33:06 +08:00
joylink_cuiweidong
31605db52e 成都三号线 实训定义调整 2020-12-23 16:39:53 +08:00
joylink_cuiweidong
8b04f92d7a 成都的三号线 信号封锁状态 绘图代码调整 2020-12-23 10:23:29 +08:00
joylink_cuiweidong
623cbd2143 北交大 客流 代码调整 2020-12-22 18:42:27 +08:00
joylink_cuiweidong
d5fcc4bd36 北交大 客流数据 代码调整 2020-12-22 18:26:31 +08:00
joylink_cuiweidong
7f23431ebd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 18:16:22 +08:00
joylink_cuiweidong
b5ebe1599d 成都三号线 现地工作站 指令操作代码调整 2020-12-22 18:16:06 +08:00