fan
|
d92a86f146
|
代码调整
|
2020-08-19 14:11:58 +08:00 |
|
joylink_cuiweidong
|
5e5f322c3b
|
剧本预览 剧本编制代码调整
|
2020-08-18 18:37:38 +08:00 |
|
joylink_cuiweidong
|
74d7b6695c
|
剧本预览代码优化
|
2020-08-18 16:29:23 +08:00 |
|
joylink_cuiweidong
|
cb916647c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-17 18:48:46 +08:00 |
|
joylink_cuiweidong
|
c7bd321446
|
剧本录制代码调整
|
2020-08-17 18:47:38 +08:00 |
|
fan
|
19b4b48c3f
|
merge
|
2020-08-17 18:16:31 +08:00 |
|
fan
|
6008dfc143
|
运行图调整
|
2020-08-17 18:12:51 +08:00 |
|
zyy
|
d4219d81f7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-17 14:46:58 +08:00 |
|
zyy
|
9f22395605
|
删除多余右键操作组件，调整发布状态
|
2020-08-17 14:46:48 +08:00 |
|
joylink_cuiweidong
|
c8ecd5bcb5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/displayNew/menuSchema.vue
|
2020-08-17 13:28:15 +08:00 |
|
joylink_cuiweidong
|
9080e14e2a
|
剧本预览编制代码调整
|
2020-08-17 13:21:27 +08:00 |
|
fan
|
fe0fcec173
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-14 18:30:15 +08:00 |
|
fan
|
44e05a0875
|
哈尔滨设备编辑运行图
|
2020-08-14 18:30:04 +08:00 |
|
joylink_cuiweidong
|
c10588289a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-14 17:52:37 +08:00 |
|
joylink_cuiweidong
|
8692fdfd1b
|
综合演练仿真菜单层级调整
|
2020-08-14 17:52:14 +08:00 |
|
zyy
|
179ad8fa1d
|
调整信号机字段调整
|
2020-08-14 16:02:01 +08:00 |
|
zyy
|
3d4230e78d
|
调整佛山线路错误提示，增加联锁配置字段
|
2020-08-14 14:32:14 +08:00 |
|
fan
|
9405b19195
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-14 11:18:46 +08:00 |
|
fan
|
150f047552
|
设备登录添加实训考试运行图编辑
|
2020-08-14 10:55:32 +08:00 |
|
joylink_cuiweidong
|
3f11212183
|
剧本录制默认行调操作
|
2020-08-14 10:29:33 +08:00 |
|
joylink_cuiweidong
|
21401af2b3
|
代码调整
|
2020-08-13 18:31:23 +08:00 |
|
joylink_cuiweidong
|
ddabadba45
|
剧本仿真代码调整
|
2020-08-13 18:30:03 +08:00 |
|
joylink_cuiweidong
|
75a240d66b
|
剧本预览代码调整
|
2020-08-13 18:07:43 +08:00 |
|
joylink_cuiweidong
|
64a335cc05
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-13 16:19:14 +08:00 |
|
joylink_cuiweidong
|
cd877b8800
|
剧本编制代码调整
|
2020-08-13 16:18:19 +08:00 |
|
sunzhenyu
|
165a84da5a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-13 15:55:33 +08:00 |
|
sunzhenyu
|
5b4db675a8
|
修改三维通号进入的界面，修改三维vr维修Gui
|
2020-08-13 15:55:25 +08:00 |
|
fan
|
cc0803630c
|
设备跳转运行图等（未完）
|
2020-08-13 11:23:07 +08:00 |
|
fan
|
f4f1b8792d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-13 09:07:54 +08:00 |
|
fan
|
2c2d704ee7
|
运行图预览重复数据调整
|
2020-08-13 09:07:42 +08:00 |
|
joylink_cuiweidong
|
8fd00b3493
|
剧本录制控制权转移代码调整
|
2020-08-12 17:34:37 +08:00 |
|
zyy
|
09b151e830
|
调整地图绘制流程
|
2020-08-11 15:46:15 +08:00 |
|
joylink_cuiweidong
|
c82edc8516
|
地图绘图代码调整
|
2020-08-11 14:17:00 +08:00 |
|
joylink_cuiweidong
|
be112d3b96
|
代码调整
|
2020-08-11 13:34:55 +08:00 |
|
joylink_cuiweidong
|
b0f238c655
|
地图绘制代码调整
|
2020-08-11 13:13:38 +08:00 |
|
joylink_cuiweidong
|
740757896b
|
地图绘制代码调整
|
2020-08-11 10:57:20 +08:00 |
|
fan
|
870ee5130f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-10 17:40:33 +08:00 |
|
fan
|
a0bd7a309d
|
整合申请管理
|
2020-08-10 17:40:17 +08:00 |
|
joylink_cuiweidong
|
d03532ecea
|
剧本预览和加载剧本 添加指令提示
|
2020-08-10 16:29:32 +08:00 |
|
joylink_cuiweidong
|
76bf1706ab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-10 15:55:01 +08:00 |
|
joylink_cuiweidong
|
11dc3abf42
|
剧本编制代码调整（剧本编制对应的会话逻辑调整）
|
2020-08-10 15:54:38 +08:00 |
|
zyy
|
a4beb31ee6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-10 13:02:11 +08:00 |
|
zyy
|
fda63a7ca6
|
调整多余注释
|
2020-08-10 13:01:59 +08:00 |
|
joylink_cuiweidong
|
4b11c2e28f
|
剧本编制代码调整
|
2020-08-10 09:47:01 +08:00 |
|
fan
|
a5ee8ebed2
|
问题调整
|
2020-08-07 18:28:40 +08:00 |
|
fan
|
115f5a539f
|
有扣车跳停显示状态时调整菜单位置
|
2020-08-07 14:09:00 +08:00 |
|
fan
|
dcfd07c267
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-07 13:59:29 +08:00 |
|
fan
|
76512af530
|
运行图预览数据调整
|
2020-08-07 13:59:19 +08:00 |
|
joylink_cuiweidong
|
e2a7f160cb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/shape/Station/index.js
|
2020-08-07 13:23:08 +08:00 |
|
joylink_cuiweidong
|
e08dcd9c8d
|
宁波一号线控制权转移代码调整
综合演练页面 后退退出房间
|
2020-08-07 13:17:09 +08:00 |
|