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
|
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
|
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 |
|
joylink_cuiweidong
|
16294b6373
|
代码调整
|
2021-04-15 17:12:41 +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
|
ae263b0dc7
|
运行图样式调整
|
2021-04-14 13:57:35 +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 |
|
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
|
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 |
|
fan
|
8a363c068a
|
大铁调整
|
2021-04-13 14:10:20 +08:00 |
|
fan
|
75e7c00957
|
地图分组管理
|
2021-04-13 10:15:11 +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
|
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 |
|
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
|
7532c86e15
|
宁波三操作调整&导入运行图放开
|
2021-04-08 17:28:46 +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
|
a215004143
|
修改代码
|
2021-04-06 16:01:14 +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
|
fc861b1c70
|
组织管理调整
|
2021-04-02 09:58:45 +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 |
|
joylink_cuiweidong
|
81ecf0ac20
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-01 10:59:05 +08:00 |
|
joylink_cuiweidong
|
fcf7d1b8ee
|
运行图代码调整
|
2021-04-01 10:58:41 +08:00 |
|