joylink_cuiweidong
|
ce1ca02392
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-16 17:21:58 +08:00 |
|
joylink_cuiweidong
|
d1a177827d
|
大铁项目 添加进路 代码调整
|
2021-04-16 17:21:15 +08:00 |
|
fan
|
937689b177
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-16 16:51:58 +08:00 |
|
fan
|
0fc9c03d2b
|
宁波三信号右键菜单
|
2021-04-16 16:51:42 +08:00 |
|
joylink_cuiweidong
|
e554ff45b7
|
代码调整
|
2021-04-16 16:36:17 +08:00 |
|
joylink_cuiweidong
|
388f85c3db
|
代码调整
|
2021-04-16 16:26:58 +08:00 |
|
joylink_cuiweidong
|
a3dff96e73
|
大铁 项目 添加进路 代码调整
|
2021-04-16 15:59:08 +08:00 |
|
joylink_cuiweidong
|
3ba63c65ac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-16 14:22:48 +08:00 |
|
joylink_cuiweidong
|
84169141ab
|
大铁 指示灯 代码调整
|
2021-04-16 14:22:29 +08:00 |
|
sunzhenyu
|
93af07c20e
|
修改单体设备亮灯逻辑
|
2021-04-16 13:29:25 +08:00 |
|
sunzhenyu
|
3440daf55e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-16 13:19:07 +08:00 |
|
sunzhenyu
|
72d0bb084f
|
修改三维单体设备信号机亮灯逻辑,修改三维课程编辑播放器
|
2021-04-16 13:18:59 +08:00 |
|
joylink_cuiweidong
|
ad03a0a2bf
|
信号机代码调整
|
2021-04-16 10:56:36 +08:00 |
|
joylink_cuiweidong
|
0de0206192
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-16 09:48:35 +08:00 |
|
joylink_cuiweidong
|
91190c6dc3
|
代码调整
|
2021-04-16 09:48:03 +08:00 |
|
ival
|
14fd6c1a40
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-15 18:15:20 +08:00 |
|
ival
|
14f718ec1a
|
增加指示器显示
|
2021-04-15 18:15:12 +08:00 |
|
joylink_cuiweidong
|
b5b9b493e7
|
代码调整
|
2021-04-15 18:07:51 +08:00 |
|
fan
|
3508380dd1
|
宁波三信号右键按钮
|
2021-04-15 17:51:23 +08:00 |
|
joylink_cuiweidong
|
957f6b08d2
|
代码调整
|
2021-04-15 17:21:18 +08:00 |
|
joylink_cuiweidong
|
06635467a1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-15 17:13:08 +08:00 |
|
joylink_cuiweidong
|
16294b6373
|
代码调整
|
2021-04-15 17:12:41 +08:00 |
|
ival
|
b75483ded0
|
删除无用打印
|
2021-04-15 16:30:28 +08:00 |
|
ival
|
f1f2013b27
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-15 16:26:19 +08:00 |
|
ival
|
d903ce7fb7
|
增加区段的脱轨其设备
|
2021-04-15 16:26:12 +08:00 |
|
joylink_cuiweidong
|
d3b240989b
|
代码调整
|
2021-04-15 16:15:18 +08:00 |
|
joylink_cuiweidong
|
bb928cb37b
|
代码调整
|
2021-04-15 15:55:30 +08:00 |
|
joylink_cuiweidong
|
4050ddf937
|
大铁进路添加 代码调整
|
2021-04-15 15:53:34 +08:00 |
|
joylink_cuiweidong
|
bebac3b8e5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-14 17:48:55 +08:00 |
|
joylink_cuiweidong
|
9233b651f6
|
代码调整
|
2021-04-14 17:48:28 +08:00 |
|
sunzhenyu
|
2412aac899
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-14 17:35:46 +08:00 |
|
sunzhenyu
|
63f935616d
|
修改三维课程编辑器事件和图片资源部分
|
2021-04-14 17:35:41 +08:00 |
|
joylink_cuiweidong
|
8d763d00e4
|
运行图编制代码调整
|
2021-04-14 16:43:09 +08:00 |
|
joylink_cuiweidong
|
1a7786dd14
|
运行图编制 代码调整
|
2021-04-14 15:30:52 +08:00 |
|
joylink_cuiweidong
|
63855ca1ff
|
运行图编制代码调整
|
2021-04-14 15:17:34 +08:00 |
|
joylink_cuiweidong
|
a1342ed2b6
|
运行图代码调整
|
2021-04-14 14:36:33 +08:00 |
|
joylink_cuiweidong
|
448832293b
|
运行图代码调整
|
2021-04-14 14:26:00 +08:00 |
|
joylink_cuiweidong
|
c9985869f1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-14 13:58:33 +08:00 |
|
joylink_cuiweidong
|
ae263b0dc7
|
运行图样式调整
|
2021-04-14 13:57:35 +08:00 |
|
ival
|
86ad53cfe9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-14 13:55:30 +08:00 |
|
ival
|
22ddd9f722
|
修改代码
|
2021-04-14 13:55:16 +08:00 |
|
joylink_cuiweidong
|
eadb7a5748
|
大铁线路 车站绘图元素添加
|
2021-04-14 10:24:57 +08:00 |
|
sunzhenyu
|
2d767c4097
|
修改三维课程编辑初始界面
|
2021-04-14 09:22:55 +08:00 |
|
sunzhenyu
|
c9b7d18e43
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-14 09:13:02 +08:00 |
|
sunzhenyu
|
f1ab1f9819
|
三维课程编辑测试展示(未完成)
|
2021-04-14 09:12:53 +08:00 |
|
joylink_cuiweidong
|
6b4bdbc8fd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-13 18:24:59 +08:00 |
|
joylink_cuiweidong
|
ea834dc86a
|
大铁项目 区段状态代码调整
|
2021-04-13 18:24:41 +08:00 |
|
fan
|
8575de2bd9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-13 18:09:52 +08:00 |
|
fan
|
0b5cc8e15d
|
信号按钮调整
|
2021-04-13 18:09:37 +08:00 |
|
ival
|
821d0b28e2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-13 17:37:48 +08:00 |
|
ival
|
693938a367
|
调整 打铁 道岔状态皮肤配置
|
2021-04-13 17:37:40 +08:00 |
|
joylink_cuiweidong
|
bc83661f1f
|
大铁线路 区段状态代码调整
|
2021-04-13 17:23:12 +08:00 |
|
joylink_cuiweidong
|
58d7f9233e
|
大铁 区段状态代码调整
|
2021-04-13 17:06:13 +08:00 |
|
ival
|
68cad1616a
|
删除无用代码
|
2021-04-13 15:48:01 +08:00 |
|
ival
|
584852038c
|
增加大铁仿真display
# Conflicts:
# src/iscs_new/plugins/shapeBuilder/entry.vue
|
2021-04-13 15:47:49 +08:00 |
|
joylink_cuiweidong
|
de4691da44
|
代码调整
|
2021-04-13 15:40:35 +08:00 |
|
joylink_cuiweidong
|
bd5a46e9dc
|
代码调整
|
2021-04-13 15:17:09 +08:00 |
|
joylink_cuiweidong
|
7eb6725147
|
代码调整
|
2021-04-13 14:27:33 +08:00 |
|
fan
|
e239f1e8c6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-13 14:10:30 +08:00 |
|
fan
|
8a363c068a
|
大铁调整
|
2021-04-13 14:10:20 +08:00 |
|
joylink_cuiweidong
|
259ee2570a
|
添加帮助链接地址
|
2021-04-13 14:06:24 +08:00 |
|
fan
|
0bb06fd142
|
大铁调整
|
2021-04-13 13:52:39 +08:00 |
|
fan
|
34859f8f51
|
大铁调整
|
2021-04-13 13:50:24 +08:00 |
|
fan
|
0adef8a9c9
|
宁波三调整
|
2021-04-13 13:43:56 +08:00 |
|
sunzhenyu
|
3aa47086a8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-13 11:03:25 +08:00 |
|
sunzhenyu
|
36b203746b
|
修改三维沙盘特殊车站加载
|
2021-04-13 11:02:16 +08:00 |
|
fan
|
75e7c00957
|
地图分组管理
|
2021-04-13 10:15:11 +08:00 |
|
fan
|
22c6924db8
|
宁波三操作调整
|
2021-04-12 18:58:40 +08:00 |
|
fan
|
5fbe0161ac
|
宁波三操作调整
|
2021-04-12 18:55:26 +08:00 |
|
fan
|
cbb02621d9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-12 18:19:58 +08:00 |
|
fan
|
7901886d3b
|
宁波三操作调整
|
2021-04-12 18:19:52 +08:00 |
|
fan
|
8d5de4cc1a
|
地图分组管理
|
2021-04-12 18:09:49 +08:00 |
|
ival
|
dde06f834d
|
修改语言校验页面
|
2021-04-12 17:11:36 +08:00 |
|
fan
|
904d84e8ab
|
语音
|
2021-04-12 14:56:21 +08:00 |
|
fan
|
c81be6f866
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-12 13:29:40 +08:00 |
|
fan
|
5ebfa5ce38
|
宁波三号线操作调整
|
2021-04-12 13:29:26 +08:00 |
|
sunzhenyu
|
f86c13ea86
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-09 18:21:45 +08:00 |
|
sunzhenyu
|
cea95f9d92
|
三维课程编辑器课程组件和数据结构修改,升级threejs版本
|
2021-04-09 18:21:24 +08:00 |
|
fan
|
51d2d32979
|
宁波三号线操作调整
|
2021-04-09 17:49:46 +08:00 |
|
fan
|
8e9afa9c9b
|
宁波三号线操作调整
|
2021-04-09 13:18:51 +08:00 |
|
fan
|
c58609528a
|
导入运行图调整
|
2021-04-08 17:55:35 +08:00 |
|
fan
|
7532c86e15
|
宁波三操作调整&导入运行图放开
|
2021-04-08 17:28:46 +08:00 |
|
fan
|
cd936dea42
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-07 17:15:06 +08:00 |
|
fan
|
f5e00dd717
|
宁波三列车操作调整
|
2021-04-07 17:14:54 +08:00 |
|
joylink_cuiweidong
|
5f9e6fe882
|
运行图编制代码调整
|
2021-04-07 14:21:26 +08:00 |
|
fan
|
2d5b863231
|
iscs Button hideType 赋值调整
|
2021-04-07 09:27:31 +08:00 |
|
fan
|
9a84b61e5a
|
ISCS调整
|
2021-04-06 17:48:33 +08:00 |
|
ival
|
a8ec3f1d79
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-06 16:01:23 +08:00 |
|
ival
|
a215004143
|
修改代码
|
2021-04-06 16:01:14 +08:00 |
|
fan
|
17995e2f40
|
取消mfa等故障状态add
|
2021-04-06 15:05:54 +08:00 |
|
fan
|
dd2722180d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-06 09:44:08 +08:00 |
|
fan
|
924e6154a3
|
南京十一站屏蔽门开启影响站停时间显示调整
|
2021-04-06 09:43:45 +08:00 |
|
sunzhenyu
|
fb00e1418e
|
修改三维课程存读
|
2021-04-02 18:05:19 +08:00 |
|
sunzhenyu
|
a9745eb709
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-02 15:49:32 +08:00 |
|
sunzhenyu
|
1cab2116d6
|
三维课程代码,修改课程组件间逻辑,修改课程数据结构。(未实装)
|
2021-04-02 15:49:24 +08:00 |
|
fan
|
4a037c0e77
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-02 09:58:56 +08:00 |
|
fan
|
fc861b1c70
|
组织管理调整
|
2021-04-02 09:58:45 +08:00 |
|
joylink_cuiweidong
|
f8bebd192e
|
南京二号线 封锁岔心 状态代码跳转
|
2021-04-01 17:31:19 +08:00 |
|
fan
|
baf424cfad
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-01 16:37:25 +08:00 |
|
fan
|
a5b3f9cf04
|
组织管理调整
|
2021-04-01 16:28:30 +08:00 |
|