zyy
|
bae0a26c64
|
调整层级
|
2020-09-27 14:45:15 +08:00 |
|
zyy
|
e4d673cdb0
|
调整层级
|
2020-09-27 14:44:59 +08:00 |
|
lVAL
|
e6074f491b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-27 14:29:45 +08:00 |
|
lVAL
|
7375020995
|
修改鼠标事件处理
|
2020-09-27 14:29:32 +08:00 |
|
zyy
|
18f370f36f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-27 13:41:41 +08:00 |
|
zyy
|
118f95efc4
|
调整ibp 触摸板
|
2020-09-27 13:41:25 +08:00 |
|
joylink_cuiweidong
|
c5fbc578db
|
竞赛 场景管理 创建的创建和查询接口代码调整
|
2020-09-27 11:22:48 +08:00 |
|
zyy
|
9c3158c080
|
Merge branch 'test'
# Conflicts:
# src/views/newMap/chatView/chatBox.vue
|
2020-09-25 18:47:03 +08:00 |
|
zyy
|
13f4cccaae
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-25 18:42:26 +08:00 |
|
zyy
|
f8d3b70021
|
调整会话流程
|
2020-09-25 18:41:59 +08:00 |
|
fan
|
7a37e5cf5e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-25 18:20:07 +08:00 |
|
fan
|
a5c36b4fca
|
成员管理问题调整
|
2020-09-25 18:19:49 +08:00 |
|
sunzhenyu
|
99f7521952
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-25 18:11:38 +08:00 |
|
sunzhenyu
|
160d4f9d59
|
增加三维列车救援vr下操纵杆控制触发动画,增加三维编辑器区段平整功能
|
2020-09-25 18:09:13 +08:00 |
|
joylink_cuiweidong
|
2c27c5a62c
|
会话代码调整
|
2020-09-25 17:33:18 +08:00 |
|
joylink_cuiweidong
|
bc10b0cbb2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-25 17:15:40 +08:00 |
|
joylink_cuiweidong
|
7460428838
|
会话代码调整
|
2020-09-25 17:15:25 +08:00 |
|
zyy
|
fa6f9d00f9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-25 16:08:07 +08:00 |
|
zyy
|
4362038f13
|
调整综合监控元素绘制
|
2020-09-25 16:07:53 +08:00 |
|
joylink_cuiweidong
|
c1e1409119
|
宁波一号线 实训操作定义调整
|
2020-09-25 16:03:43 +08:00 |
|
joylink_cuiweidong
|
0f188a6dab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-25 15:23:39 +08:00 |
|
joylink_cuiweidong
|
69e935f559
|
宁波线进路 实训定义代码调整
|
2020-09-25 15:23:23 +08:00 |
|
zyy
|
bcdf1524cd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-25 15:23:06 +08:00 |
|
zyy
|
55910a826b
|
调整会话
|
2020-09-25 15:22:54 +08:00 |
|
joylink_cuiweidong
|
dd9ffdeb52
|
删除不必要的文件
|
2020-09-25 14:48:09 +08:00 |
|
joylink_cuiweidong
|
4dfb904133
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-25 14:47:13 +08:00 |
|
joylink_cuiweidong
|
2386f424d4
|
竞赛 理论考试 代码调整
|
2020-09-25 14:46:57 +08:00 |
|
zyy
|
a0adc641b2
|
增加iconfont图标导入，调整逻辑
|
2020-09-25 13:58:41 +08:00 |
|
zyy
|
7fb7c0a819
|
调整代码
|
2020-09-24 19:04:33 +08:00 |
|
zyy
|
88ec572564
|
调整车站值班员按钮
|
2020-09-24 18:34:25 +08:00 |
|
zyy
|
8a28526fe1
|
调整样式
|
2020-09-24 17:55:06 +08:00 |
|
zyy
|
a5b954c017
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-24 17:26:12 +08:00 |
|
zyy
|
aa34210cae
|
调整会话框流程
|
2020-09-24 17:25:52 +08:00 |
|
joylink_cuiweidong
|
83793d75ca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-24 13:42:16 +08:00 |
|
joylink_cuiweidong
|
fcf01baa53
|
竞赛 理论考试 练习模式代码调整
|
2020-09-24 13:42:01 +08:00 |
|
zyy
|
c71d4beb39
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-24 13:40:24 +08:00 |
|
zyy
|
be565e3711
|
调整道岔逻辑
|
2020-09-24 13:40:09 +08:00 |
|
joylink_cuiweidong
|
7753f831f1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-23 18:44:24 +08:00 |
|
joylink_cuiweidong
|
d67aa6804f
|
竞赛 理论考试 代码调整
|
2020-09-23 18:44:00 +08:00 |
|
sunzhenyu
|
0202d20591
|
修改三维cctv速度
|
2020-09-23 16:39:16 +08:00 |
|
sunzhenyu
|
a3342d93ed
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-23 16:21:07 +08:00 |
|
sunzhenyu
|
5215064faa
|
增加三维vr列车抢修测试界面，修改三维哈尔滨本地文件列车
|
2020-09-23 16:20:50 +08:00 |
|
zyy
|
5109f7b558
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-23 10:38:35 +08:00 |
|
zyy
|
21f5208c21
|
调整综合监控
|
2020-09-23 10:38:22 +08:00 |
|
joylink_cuiweidong
|
dc8ae0bbfe
|
iscs 绘图调整
|
2020-09-23 10:22:52 +08:00 |
|
joylink_cuiweidong
|
1faf2cbf91
|
代码调整
|
2020-09-22 18:47:34 +08:00 |
|
joylink_cuiweidong
|
465391b20e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 18:46:12 +08:00 |
|
zyy
|
0ed3d83273
|
调整表格配置
|
2020-09-22 18:45:20 +08:00 |
|
joylink_cuiweidong
|
d56e713232
|
iscs 系统代码调整
|
2020-09-22 18:45:00 +08:00 |
|
zyy
|
d93cbc4beb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 18:03:58 +08:00 |
|
zyy
|
2ef9409527
|
增加图片
|
2020-09-22 18:03:46 +08:00 |
|
joylink_cuiweidong
|
5d0f5ad4fd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 17:51:32 +08:00 |
|
joylink_cuiweidong
|
f26726055c
|
iscs 绘图代码调整
|
2020-09-22 17:51:15 +08:00 |
|
zyy
|
0a01ea04c6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 17:12:39 +08:00 |
|
zyy
|
57de1331e2
|
调整福州一号线综合监控配置
|
2020-09-22 17:12:28 +08:00 |
|
fan
|
7b766e2a47
|
理论题库导入
|
2020-09-22 16:56:32 +08:00 |
|
fan
|
4a0509546f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 16:45:31 +08:00 |
|
fan
|
21d2a9953f
|
理论题库导入
|
2020-09-22 16:45:19 +08:00 |
|
fan
|
53d7586313
|
理论题库导入
|
2020-09-22 16:45:03 +08:00 |
|
joylink_cuiweidong
|
0c81fb8208
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 15:26:00 +08:00 |
|
joylink_cuiweidong
|
f2bbefc27e
|
iscs 三角形绘图元素添加
|
2020-09-22 15:25:33 +08:00 |
|
sunzhenyu
|
7d31d198f0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 15:17:06 +08:00 |
|
sunzhenyu
|
89fd0ec052
|
修改三维cctv移动鼠标卡顿，改用主线程渲染人物动画
|
2020-09-22 15:16:53 +08:00 |
|
joylink_cuiweidong
|
1e8577cefd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 11:31:35 +08:00 |
|
joylink_cuiweidong
|
d346ec8f2e
|
iscs 系统代码调整
|
2020-09-22 11:31:18 +08:00 |
|
fan
|
8f3f722d4a
|
sics文字矩形组合元素添加
|
2020-09-22 11:28:28 +08:00 |
|
fan
|
6a68147700
|
去除创建会话提示
|
2020-09-22 09:52:48 +08:00 |
|
fan
|
e4be43ad37
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 09:51:22 +08:00 |
|
fan
|
87bee8bcb5
|
iscs调整&去除创建会话提示
|
2020-09-22 09:51:01 +08:00 |
|
joylink_cuiweidong
|
e56731421f
|
Merge remote-tracking branch 'remotes/origin/test'
|
2020-09-21 18:55:51 +08:00 |
|
joylink_cuiweidong
|
af7b9c5545
|
iscs系统页面代码调整
|
2020-09-21 18:55:23 +08:00 |
|
zyy
|
a620e029e0
|
调整绘图配置
|
2020-09-21 18:14:17 +08:00 |
|
zyy
|
212138f370
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 18:05:36 +08:00 |
|
zyy
|
dd99815868
|
福州一号线绘图配置
|
2020-09-21 18:05:25 +08:00 |
|
fan
|
893ecd7ff4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 17:39:18 +08:00 |
|
fan
|
8199d383fb
|
iscs调整
|
2020-09-21 17:39:06 +08:00 |
|
joylink_cuiweidong
|
3bc037678d
|
Merge remote-tracking branch 'remotes/origin/test'
|
2020-09-21 16:28:17 +08:00 |
|
joylink_cuiweidong
|
e094134960
|
剧本代码调整
|
2020-09-21 16:24:17 +08:00 |
|
joylink_cuiweidong
|
9e46bcdf37
|
Merge branch 'master' of https://git.code.tencent.com/lian-cbtc/jl-client
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/switch/create.vue
|
2020-09-21 16:20:34 +08:00 |
|
joylink_cuiweidong
|
0945448549
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 16:00:41 +08:00 |
|
joylink_cuiweidong
|
0b380b3b0f
|
福州线路iscs系统 样式调整
|
2020-09-21 16:00:24 +08:00 |
|
fan
|
99894a1443
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 14:29:23 +08:00 |
|
fan
|
bf4ce9d247
|
iscs调整
|
2020-09-21 14:29:02 +08:00 |
|
zyy
|
179ea283b7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 14:24:04 +08:00 |
|
zyy
|
165cef3f69
|
调整文件路径
|
2020-09-21 14:23:51 +08:00 |
|
joylink_cuiweidong
|
a93adc7094
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 14:20:46 +08:00 |
|
joylink_cuiweidong
|
047c9aa127
|
剧本 代码调整
|
2020-09-21 14:20:33 +08:00 |
|
zyy
|
1636659889
|
增加综合监控配置文件
|
2020-09-21 14:11:02 +08:00 |
|
joylink_cuiweidong
|
2a4d7d750a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 13:38:53 +08:00 |
|
joylink_cuiweidong
|
91e34add37
|
剧本代码调整
|
2020-09-21 13:38:37 +08:00 |
|
fan
|
0a33127068
|
iscs调整
|
2020-09-21 13:20:30 +08:00 |
|
joylink_cuiweidong
|
aaead41423
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 10:54:02 +08:00 |
|
joylink_cuiweidong
|
a22715ab23
|
剧本会话代码调整
|
2020-09-21 10:53:45 +08:00 |
|
fan
|
1c5f972e74
|
调整iscs
|
2020-09-21 10:26:34 +08:00 |
|
fan
|
39a1acd081
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 10:17:47 +08:00 |
|
fan
|
05b879f63d
|
综合演练ibp按钮显示调整
|
2020-09-21 10:17:37 +08:00 |
|
fan
|
942cbe72a1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-18 18:30:26 +08:00 |
|
fan
|
4eafbd72ea
|
iscs调整&宁波道岔取消故障失表取消动画
|
2020-09-18 18:30:14 +08:00 |
|
sunzhenyu
|
b9247b1bb1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-18 18:29:08 +08:00 |
|
sunzhenyu
|
60554583d1
|
修改三维驾驶列车模型距离，三维编辑器增加车站坐标校准，增加站台停车点显示
|
2020-09-18 18:29:02 +08:00 |
|
joylink_cuiweidong
|
f6f1d45fe5
|
竞赛 剧本代码调整
|
2020-09-18 18:18:02 +08:00 |
|
joylink_cuiweidong
|
ee61b0615b
|
剧本修改代码调整（添加满分时长、及格时长、零分时长字段）
|
2020-09-18 17:04:35 +08:00 |
|
joylink_cuiweidong
|
41548dd32f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/displayNew/dispatherContest/index.vue
|
2020-09-18 16:05:07 +08:00 |
|
joylink_cuiweidong
|
6cad4eabdb
|
竞赛系统 剧本加载逻辑调整
|
2020-09-18 16:02:22 +08:00 |
|
fan
|
6b585fbca6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-18 14:42:27 +08:00 |
|
fan
|
0d31203b74
|
ibp盘状态处理&时间同步
|
2020-09-18 14:42:17 +08:00 |
|
zyy
|
733503afe6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-18 11:08:30 +08:00 |
|
zyy
|
e66a5a5687
|
调整道岔绘制逻辑
|
2020-09-18 11:08:17 +08:00 |
|
sunzhenyu
|
af322ec7aa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-18 09:26:50 +08:00 |
|
sunzhenyu
|
a37a3214f8
|
修改三维通号读取新数据bug
|
2020-09-18 09:26:44 +08:00 |
|
fan
|
89fcb3fe2f
|
iscs调整&ibp接口参数修改
|
2020-09-18 09:26:25 +08:00 |
|
fan
|
aa52945003
|
行调大赛
|
2020-09-17 18:30:31 +08:00 |
|
fan
|
639dc474a1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-17 18:25:52 +08:00 |
|
fan
|
f7e350ca95
|
行调大赛理论考试&福州Iscs
|
2020-09-17 18:25:37 +08:00 |
|
sunzhenyu
|
c7e0380510
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-17 18:12:42 +08:00 |
|
sunzhenyu
|
d409476963
|
增加三维沙盘行车高度行驶数据更新，修改三维设备站台贴图获取，修改三维编辑器区段连接获取
|
2020-09-17 18:12:37 +08:00 |
|
zyy
|
c2e3df8dbc
|
调整ibp按钮点击
|
2020-09-17 17:45:04 +08:00 |
|
zyy
|
3134142ab3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-17 16:33:33 +08:00 |
|
zyy
|
e98b53d8ad
|
调整ibp鼠标逻辑
|
2020-09-17 16:33:22 +08:00 |
|
sunzhenyu
|
465248872f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-17 15:41:02 +08:00 |
|
sunzhenyu
|
308007c6b1
|
修改三维cctv初始化渲染大小
|
2020-09-17 15:40:55 +08:00 |
|
fan
|
28e9bf2dae
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-17 15:37:01 +08:00 |
|
fan
|
588f77173a
|
行调大赛理论考试&福州Iscs
|
2020-09-17 15:36:46 +08:00 |
|
joylink_cuiweidong
|
5428f98843
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/jlmap3d/passflow/jl3dpassflow.vue
|
2020-09-17 15:23:14 +08:00 |
|
joylink_cuiweidong
|
e93755a29f
|
哈尔滨 真实摄像头添加（暂时不能播放）
|
2020-09-17 15:19:00 +08:00 |
|
zyy
|
b6f2de4d0f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-17 13:31:26 +08:00 |
|
zyy
|
6eafb7883c
|
调整道岔绘制流程，ibp鼠标事件
|
2020-09-17 13:31:13 +08:00 |
|
fan
|
f586cced67
|
行调大赛理论考试
|
2020-09-17 09:50:52 +08:00 |
|
fan
|
7dc936a0ac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-17 09:01:38 +08:00 |
|
fan
|
0abd0aaba5
|
福建综合监控
|
2020-09-17 09:01:22 +08:00 |
|
zyy
|
8c9f18f239
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-16 17:53:44 +08:00 |
|
zyy
|
4edcbdf929
|
调整ibp盘操作流程
|
2020-09-16 17:53:33 +08:00 |
|
sunzhenyu
|
22db894742
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-16 17:10:47 +08:00 |
|
sunzhenyu
|
86f49506cd
|
修改三维编辑器连接区段数据。增加三维编辑器邻接区段对齐功能，增加区段高低编辑功能。修改三维cctv配置
|
2020-09-16 17:10:37 +08:00 |
|
zyy
|
309296cb63
|
调整区段逻辑
|
2020-09-16 15:03:45 +08:00 |
|
zyy
|
24266de0f0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-16 14:26:17 +08:00 |
|
zyy
|
64c322751c
|
调整ibp盘流程
|
2020-09-16 14:26:04 +08:00 |
|
fan
|
8a52561c66
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-16 10:49:46 +08:00 |
|
fan
|
e5d83555af
|
添加大赛练习
|
2020-09-16 10:49:16 +08:00 |
|
zyy
|
3ce1418f89
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-16 10:10:27 +08:00 |
|
zyy
|
4264996520
|
调整ibp数据，调整道岔生成逻辑
|
2020-09-16 10:10:13 +08:00 |
|
joylink_cuiweidong
|
0f5099221f
|
站台绘图代码调整
|
2020-09-15 18:28:32 +08:00 |
|
joylink_cuiweidong
|
10cae34098
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-15 17:48:24 +08:00 |
|
joylink_cuiweidong
|
ca45d2ab98
|
代码调整
|
2020-09-15 17:48:08 +08:00 |
|
zyy
|
fdaf3eaa1e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-15 17:41:10 +08:00 |
|
zyy
|
4b2939ff0a
|
调整区段配置
|
2020-09-15 17:40:57 +08:00 |
|
joylink_cuiweidong
|
619474b651
|
屏蔽门 绘图状态代码调整
|
2020-09-15 17:13:36 +08:00 |
|
joylink_cuiweidong
|
0b4fa8f3e0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-15 17:09:07 +08:00 |
|
joylink_cuiweidong
|
ce2d07ea20
|
站台 屏蔽门 绘图代码调整
|
2020-09-15 17:08:28 +08:00 |
|
fan
|
b44e193bcf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-14 18:35:06 +08:00 |
|
fan
|
b7a02f45c1
|
宁波三菜单
|
2020-09-14 18:34:56 +08:00 |
|
zyy
|
072a6282b0
|
调整ibp绘图流程
|
2020-09-14 10:59:02 +08:00 |
|
zyy
|
81ec8fd6a7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-11 18:23:24 +08:00 |
|
zyy
|
e2b212e277
|
调整字段
|
2020-09-11 18:23:12 +08:00 |
|
zyy
|
167e0c4ce0
|
调整流程
|
2020-09-11 18:22:18 +08:00 |
|
sunzhenyu
|
307ec30eab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-11 18:14:26 +08:00 |
|
sunzhenyu
|
70b08584a2
|
修改三维编辑器加载上下站台排序
|
2020-09-11 18:14:22 +08:00 |
|
zyy
|
8b99254099
|
调整系统消息字段
|
2020-09-11 18:03:28 +08:00 |
|
zyy
|
33d5850ed4
|
新增系统信息逻辑
|
2020-09-11 18:02:57 +08:00 |
|
zyy
|
f1000a1528
|
调整道岔生成逻辑
|
2020-09-11 18:02:29 +08:00 |
|
fan
|
40b12de294
|
会话调整
|
2020-09-11 17:57:48 +08:00 |
|
fan
|
e5c9936f6c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-11 17:10:53 +08:00 |
|
fan
|
b5c5488ed5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-11 17:10:26 +08:00 |
|
fan
|
6401255a36
|
会话调整
|
2020-09-11 17:10:11 +08:00 |
|
joylink_cuiweidong
|
e541e19fa2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-11 17:08:01 +08:00 |
|
joylink_cuiweidong
|
feff7d50cc
|
屏蔽门 状态代码调整
|
2020-09-11 17:07:45 +08:00 |
|
zyy
|
f1f4c85405
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-11 16:55:48 +08:00 |
|
zyy
|
51a29de415
|
调整系统消息字段
|
2020-09-11 16:55:36 +08:00 |
|
joylink_cuiweidong
|
c13221c6a2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-11 16:36:30 +08:00 |
|
joylink_cuiweidong
|
e5a5c391f0
|
剧本编制代码调整
|
2020-09-11 16:36:13 +08:00 |
|
zyy
|
bdf348dbaa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-11 16:07:33 +08:00 |
|
zyy
|
27a9a7a744
|
新增系统信息逻辑
|
2020-09-11 16:07:18 +08:00 |
|
joylink_cuiweidong
|
06796c439b
|
剧本编制 会话样式调整
|
2020-09-11 16:01:41 +08:00 |
|
fan
|
34fe136bcb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-11 15:52:26 +08:00 |
|
fan
|
2875444ed7
|
会话调整
|
2020-09-11 15:52:15 +08:00 |
|
joylink_cuiweidong
|
51ed3b83c5
|
剧本编制代码调整
|
2020-09-11 15:09:43 +08:00 |
|
joylink_cuiweidong
|
b35bb2e6fc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-11 14:14:08 +08:00 |
|
joylink_cuiweidong
|
2c74a91e2d
|
屏蔽门 绘图代码调整
|
2020-09-11 14:13:29 +08:00 |
|
sunzhenyu
|
d678d1369c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-11 13:52:27 +08:00 |
|
sunzhenyu
|
9254cb8cb6
|
修改初始化时站台轨顺序bug，修改加载哈尔滨bug
|
2020-09-11 13:52:17 +08:00 |
|
fan
|
5d7b1db6be
|
调整添加仿真成员管理
|
2020-09-11 13:35:08 +08:00 |
|
fan
|
e29bdb35e6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-11 13:23:44 +08:00 |
|
fan
|
3ca753a31b
|
调整会话和drts倒计时时间
|
2020-09-11 13:23:24 +08:00 |
|
zyy
|
e5687c13dd
|
调整道岔生成逻辑
|
2020-09-11 10:28:55 +08:00 |
|
zyy
|
9ca3612715
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-11 10:18:20 +08:00 |
|
zyy
|
50c9a4eabb
|
调整道岔生成 道岔区段问题
|
2020-09-11 10:18:07 +08:00 |
|
fan
|
3ca4cbbfce
|
drts倒计时日期调整
|
2020-09-11 10:15:15 +08:00 |
|
fan
|
07c6d997e0
|
drts添加连接
|
2020-09-11 10:11:49 +08:00 |
|
fan
|
60bfa0504b
|
剧本加载重新获取运行数据&会话调整&drts添加连接
|
2020-09-11 10:08:25 +08:00 |
|
fan
|
7715271b0b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-11 09:27:06 +08:00 |
|
fan
|
f98242374b
|
会话调整
|
2020-09-11 09:26:51 +08:00 |
|
sunzhenyu
|
e8a007cfba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-10 18:12:35 +08:00 |
|
sunzhenyu
|
7b65503938
|
修改编辑器兼容数据，适配西安一，成都一三，北京等数组自动初始化，修改三维页面加载方面区段和站台属性
|
2020-09-10 18:12:25 +08:00 |
|
fan
|
03d4a28ab6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-09 17:42:10 +08:00 |
|
fan
|
281bbc32f8
|
宁波三菜单调整&表单记录页数
|
2020-09-09 17:41:51 +08:00 |
|
fan
|
06ecb8dd1a
|
宁波三菜单调整
|
2020-09-09 14:45:38 +08:00 |
|
zyy
|
273d3073de
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-09 14:36:01 +08:00 |
|
zyy
|
d6fba202b4
|
字段调整
|
2020-09-09 14:35:48 +08:00 |
|
joylink_cuiweidong
|
5aa9d94071
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/shape/Switch/index.js
|
2020-09-09 14:02:15 +08:00 |
|
joylink_cuiweidong
|
ccf2228eeb
|
站台 绘图代码调整
|
2020-09-09 13:55:42 +08:00 |
|