fan
|
a44132056c
|
地图绘制添加防淹门
|
2020-08-20 13:17:58 +08:00 |
|
zyy
|
e6fb5c0f17
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-20 09:32:34 +08:00 |
|
zyy
|
8f6388e1c2
|
调整多余输出
|
2020-08-20 09:32:22 +08:00 |
|
fan
|
d729e84615
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-19 18:27:45 +08:00 |
|
fan
|
d1cff9ff94
|
宁波三号线站台样式调整
|
2020-08-19 18:27:36 +08:00 |
|
joylink_cuiweidong
|
9d0fe20a88
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-19 17:21:35 +08:00 |
|
joylink_cuiweidong
|
b3b37fd19f
|
宁波三号线 信号机绘图代码调整
|
2020-08-19 17:21:19 +08:00 |
|
fan
|
3520e53679
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-19 17:14:37 +08:00 |
|
fan
|
509b92c71a
|
宁波三号线样式调整
|
2020-08-19 17:14:27 +08:00 |
|
zyy
|
87275e3021
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-19 16:45:16 +08:00 |
|
zyy
|
db065dc76a
|
调整宁波三号线 道岔样式
|
2020-08-19 16:45:05 +08:00 |
|
fan
|
1afb1f3a09
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-19 16:39:19 +08:00 |
|
fan
|
94fbb77912
|
宁波三号线区段调整
|
2020-08-19 16:39:09 +08:00 |
|
zyy
|
2e6d45baab
|
调整宁波三号线配置
|
2020-08-19 15:50:33 +08:00 |
|
fan
|
101ddea2b1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-19 14:12:20 +08:00 |
|
fan
|
d92a86f146
|
代码调整
|
2020-08-19 14:11:58 +08:00 |
|
zyy
|
280b766d91
|
增加宁波三号线配置
|
2020-08-19 14:06:01 +08:00 |
|
zyy
|
70945cbbc1
|
调整区段配置
|
2020-08-19 13:43:13 +08:00 |
|
zyy
|
901af70400
|
调整线路右键操作
|
2020-08-18 16:41:19 +08:00 |
|
zyy
|
899facde01
|
调整发布地图导出名称，注释区段流程
|
2020-08-18 16:02:22 +08:00 |
|
zyy
|
a2dc987445
|
调整区段检测
|
2020-08-18 14:07:29 +08:00 |
|
zyy
|
98e78b3532
|
调整发布地图 导入 导出逻辑及请求配置
|
2020-08-17 17:35:00 +08:00 |
|
zyy
|
e383ab201d
|
调整哈尔滨线路延续保护计时，增加配置项
|
2020-08-17 16:48:19 +08:00 |
|
zyy
|
9f22395605
|
删除多余右键操作组件，调整发布状态
|
2020-08-17 14:46:48 +08:00 |
|
zyy
|
f98faaab8c
|
删除输出
|
2020-08-17 13:26:44 +08:00 |
|
zyy
|
1744ea1262
|
调整信号机高亮配置
|
2020-08-17 13:25:36 +08:00 |
|
zyy
|
179ad8fa1d
|
调整信号机字段调整
|
2020-08-14 16:02:01 +08:00 |
|
zyy
|
d1fdb7af5c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-14 14:32:29 +08:00 |
|
zyy
|
3d4230e78d
|
调整佛山线路错误提示，增加联锁配置字段
|
2020-08-14 14:32:14 +08:00 |
|
joylink_cuiweidong
|
4964bdeaa2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-14 13:29:23 +08:00 |
|
joylink_cuiweidong
|
255c59629b
|
道岔故障模式下右键菜单代码调整
|
2020-08-14 13:28:44 +08:00 |
|
zyy
|
a1856ca710
|
调整延时保护计时位置
|
2020-08-14 13:17:29 +08:00 |
|
zyy
|
3132b982fb
|
调整延时保护计时逻辑
|
2020-08-14 10:49:11 +08:00 |
|
zyy
|
c948e517b4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-13 19:27:13 +08:00 |
|
zyy
|
86d6cf7a14
|
调整区段延时解锁流程
|
2020-08-13 19:27:02 +08:00 |
|
joylink_cuiweidong
|
2615460674
|
剧本编制代码调整
|
2020-08-13 17:25:52 +08:00 |
|
joylink_cuiweidong
|
0ed57e5488
|
剧本编制代码调整
|
2020-08-13 16:45:27 +08:00 |
|
zyy
|
5ff93390cd
|
调整右键操作整合
|
2020-08-13 15:41:40 +08:00 |
|
zyy
|
2e2feac47d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-13 11:03:43 +08:00 |
|
zyy
|
6e61050067
|
整合右键操作
|
2020-08-13 11:03:28 +08:00 |
|
joylink_cuiweidong
|
9c5a8238de
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-13 10:47:19 +08:00 |
|
joylink_cuiweidong
|
60b07ef132
|
剧本编制控制权转移代码还原
|
2020-08-13 10:46:26 +08:00 |
|
zyy
|
54bef31576
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-12 18:26:40 +08:00 |
|
zyy
|
36a0b1dd93
|
调整代码
|
2020-08-12 18:26:27 +08:00 |
|
joylink_cuiweidong
|
c3c65fba5c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-12 17:34:55 +08:00 |
|
joylink_cuiweidong
|
8fd00b3493
|
剧本录制控制权转移代码调整
|
2020-08-12 17:34:37 +08:00 |
|
fan
|
0348d143b5
|
合并代码
|
2020-08-12 11:04:04 +08:00 |
|
fan
|
30e30d5ef3
|
佛山线路问题调整&iscs样式调整
|
2020-08-12 11:02:47 +08:00 |
|
joylink_cuiweidong
|
55911240b6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-12 10:03:14 +08:00 |
|
joylink_cuiweidong
|
1f0aaffe6f
|
佛山有轨电车信号机优化（全线信号机设置成图样类型）
|
2020-08-12 10:02:56 +08:00 |
|
zyy
|
0e36937718
|
添加区段操作
|
2020-08-12 10:02:19 +08:00 |
|
zyy
|
2d5f4520d4
|
增加佛山线路 强制取消扣车
|
2020-08-12 09:50:10 +08:00 |
|
zyy
|
20706dd67f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-10 18:37:43 +08:00 |
|
zyy
|
a2f9e18847
|
调整地图导出流程
|
2020-08-10 18:37:34 +08:00 |
|
joylink_cuiweidong
|
95a4bf40e9
|
宁波一号线 佛山有轨电车 控制权转移代码调整
|
2020-08-10 18:23:14 +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
|
fd6360611b
|
福州一号线，西安三号线控制权转移代码调整
|
2020-08-07 18:20:45 +08:00 |
|
joylink_cuiweidong
|
c4c1f79258
|
控制权转移代码调整
|
2020-08-07 17:33:12 +08:00 |
|
joylink_cuiweidong
|
1895dc42b0
|
西安三号线控制权转移代码调整
|
2020-08-07 17:13:12 +08:00 |
|
joylink_cuiweidong
|
fda52feb52
|
代码调整
|
2020-08-07 14:12:32 +08:00 |
|
joylink_cuiweidong
|
cc6bbe8073
|
北京一号线 成都线路 佛山有轨电车 福州一号线 哈尔滨一号线 控制权转移代码调整
|
2020-08-07 14:00:32 +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 |
|
fan
|
be5f817f03
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-07 11:28:59 +08:00 |
|
fan
|
ea5cb27128
|
运行图预览调整
|
2020-08-07 11:28:50 +08:00 |
|
zyy
|
1f2f7bcf89
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-07 11:10:04 +08:00 |
|
zyy
|
4a1d3d3863
|
增加车站批量设置，调整车站绘图逻辑
|
2020-08-07 11:09:49 +08:00 |
|
fan
|
8e73c01b3f
|
成都一列车样式调整
|
2020-08-07 10:15:39 +08:00 |
|
joylink_cuiweidong
|
849770ab0e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-06 19:34:46 +08:00 |
|
joylink_cuiweidong
|
abb0143988
|
控制权转移代码调整
|
2020-08-06 19:34:13 +08:00 |
|
zyy
|
0e9b731e93
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-06 15:08:07 +08:00 |
|
zyy
|
cde3b39753
|
调整地图绘制流程，调整信号机
|
2020-08-06 15:07:50 +08:00 |
|
fan
|
492c79ffb9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-06 15:02:46 +08:00 |
|
fan
|
e3e62f85f9
|
佛山目的地码显示长度调整&联锁配置添加参数generateFls
|
2020-08-06 15:02:22 +08:00 |
|
joylink_cuiweidong
|
c7f6639801
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-06 13:22:19 +08:00 |
|
joylink_cuiweidong
|
026a8d9a7f
|
仿真左上角菜单样式调整
|
2020-08-06 13:21:55 +08:00 |
|
zyy
|
aa63af422b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/signal/index.vue
|
2020-08-06 11:18:48 +08:00 |
|
zyy
|
7ddbe10832
|
增加信号机批量操作
|
2020-08-06 11:15:46 +08:00 |
|
fan
|
d7fefc6447
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-05 15:12:51 +08:00 |
|
fan
|
aea8dc7eca
|
清理多余状态
|
2020-08-05 15:12:40 +08:00 |
|
zyy
|
33b9618b77
|
调整地图绘制类型显示
|
2020-08-05 14:28:55 +08:00 |
|
zyy
|
1db980b000
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-05 13:14:48 +08:00 |
|
zyy
|
e852eb95db
|
调整流程
|
2020-08-05 13:14:30 +08:00 |
|
joylink_cuiweidong
|
4a8d6fabe3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-05 13:04:12 +08:00 |
|
joylink_cuiweidong
|
96f6d5030b
|
哈尔滨一号线 自动触发进路 绘图代码调整
|
2020-08-05 13:03:53 +08:00 |
|
zyy
|
8bdf189e9c
|
调整哈尔滨操作
|
2020-08-05 10:27:55 +08:00 |
|
zyy
|
6dbac54d1f
|
调整地图绘制相关流程
|
2020-08-04 17:31:07 +08:00 |
|
zyy
|
bd8054bef8
|
删除注释
|
2020-08-03 19:01:16 +08:00 |
|
zyy
|
86197114a1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-03 19:00:04 +08:00 |
|
zyy
|
9aee216961
|
调整哈尔滨操作判断
|
2020-08-03 18:59:48 +08:00 |
|
joylink_cuiweidong
|
dbc017763a
|
宁波线控制权转移代码调整
|
2020-08-03 18:52:39 +08:00 |
|
zyy
|
0f03eee53f
|
调整宁波道岔状态
|
2020-08-03 15:56:56 +08:00 |
|
zyy
|
60986fbfeb
|
大屏修改
|
2020-08-03 15:22:46 +08:00 |
|
zyy
|
31be09323b
|
调整综合演练顶部菜单判断，增加哈尔滨项目 行调设备登陆显示指令模式
|
2020-08-03 14:12:56 +08:00 |
|
joylink_cuiweidong
|
88b03d240b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-31 17:30:43 +08:00 |
|
joylink_cuiweidong
|
5bb59c855e
|
佛山控制权转移代码调整
|
2020-07-31 17:30:26 +08:00 |
|
zyy
|
e2c32f2e68
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-31 16:22:43 +08:00 |
|
zyy
|
70114a0014
|
调整宁波线路操作
|
2020-07-31 16:22:29 +08:00 |
|
joylink_cuiweidong
|
48cd28bd88
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-31 16:03:48 +08:00 |
|
joylink_cuiweidong
|
ff912ff0f5
|
宁波一号线 运行图预览加点选
|
2020-07-31 16:03:32 +08:00 |
|
fan
|
06ed0a6f76
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new
|
2020-07-31 15:53:36 +08:00 |
|
fan
|
deb60acd14
|
绘图调整兼容数据&综合仿真观众咱不关闭三维驾驶&设备配置规整
|
2020-07-31 15:53:25 +08:00 |
|
zyy
|
a011ab03f8
|
增加宁波指令
|
2020-07-31 15:27:37 +08:00 |
|
joylink_cuiweidong
|
329b3efef3
|
宁波一号线 站遥控 控制权转移代码调整
|
2020-07-30 18:59:48 +08:00 |
|
joylink_cuiweidong
|
c2c3fc0b22
|
运行图加载根据车次号 运行图颜色代码调整
|
2020-07-30 16:44:41 +08:00 |
|
zyy
|
33969bd5e8
|
调整哈尔滨站台操作
|
2020-07-30 10:03:00 +08:00 |
|
zyy
|
ef1fd94643
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-29 17:41:32 +08:00 |
|
zyy
|
841946ce29
|
调整按钮样式
|
2020-07-29 17:41:19 +08:00 |
|
joylink_cuiweidong
|
652968bf1b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-29 17:19:30 +08:00 |
|
joylink_cuiweidong
|
7e920993f4
|
宁波一号线控制权转换代码调整
|
2020-07-29 17:19:14 +08:00 |
|
zyy
|
0110502711
|
删除多余注释
|
2020-07-29 16:59:57 +08:00 |
|
joylink_cuiweidong
|
b9f8e1d3ca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-29 16:02:32 +08:00 |
|
joylink_cuiweidong
|
2ba34b5d0b
|
宁波一号线控制权转换代码调整
|
2020-07-29 16:02:14 +08:00 |
|
fan
|
7403c53baa
|
merge
|
2020-07-29 14:16:32 +08:00 |
|
fan
|
fff5acab5d
|
创建考试调整&路由replace调整
|
2020-07-29 14:14:34 +08:00 |
|
joylink_cuiweidong
|
40a7170f69
|
西安三号线宁波一号线 控制权菜单显示代码调整
|
2020-07-29 14:10:44 +08:00 |
|
joylink_cuiweidong
|
7ad5e06a07
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/ningbo_01/menus/passiveDialog/control.vue
|
2020-07-29 13:59:48 +08:00 |
|
joylink_cuiweidong
|
c3e6cf2b56
|
代码调整
|
2020-07-29 13:56:50 +08:00 |
|
fan
|
a18c84f684
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-29 11:14:57 +08:00 |
|
fan
|
24e3a606fa
|
调整会话按钮名称&宁波一剩余菜单回车快捷键
|
2020-07-29 11:14:45 +08:00 |
|
joylink_cuiweidong
|
a13b21613f
|
宁波一号线 键盘操作调整（回车事件）
|
2020-07-29 10:39:58 +08:00 |
|
joylink_cuiweidong
|
ed4b5047bd
|
代码调整
|
2020-07-28 18:47:05 +08:00 |
|
joylink_cuiweidong
|
c0e3df14bc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-28 18:30:10 +08:00 |
|
fan
|
32a8daff56
|
merge
|
2020-07-28 18:30:44 +08:00 |
|
joylink_cuiweidong
|
9cc57c0a44
|
宁波一号线 键盘操作调整（回车事件）
|
2020-07-28 18:29:56 +08:00 |
|
fan
|
f13ba95407
|
宁波菜单回车快捷键（区段、信号机、车站）&设备登录综合演练不显示cctv视图设备视图三维视图&会话切换公共调整
|
2020-07-28 18:28:31 +08:00 |
|
zyy
|
6ca803d06d
|
调整车站颜色，功能栏宽度判断
|
2020-07-28 17:55:07 +08:00 |
|
zyy
|
ac43981c7d
|
调整哈尔滨车站操作
|
2020-07-28 16:59:32 +08:00 |
|
zyy
|
73f3cb0d0d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-28 16:41:36 +08:00 |
|
zyy
|
eec51e7cfd
|
调整哈尔滨车站操作
|
2020-07-28 16:41:21 +08:00 |
|
fan
|
10918d1f06
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-28 16:29:06 +08:00 |
|
fan
|
0ad13f9fe8
|
宁波菜单弹框回车快捷键
|
2020-07-28 16:28:55 +08:00 |
|
zyy
|
2fd8c44f85
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-28 14:44:52 +08:00 |
|
zyy
|
9f53e6e5f0
|
调整综合演练按钮显示逻辑，调整聊天窗口逻辑
|
2020-07-28 14:44:37 +08:00 |
|
fan
|
594087489a
|
调整角色切换bug&通号界面添加成员管理&仿真按钮offset位置修复
|
2020-07-28 14:11:17 +08:00 |
|
zyy
|
027f15102e
|
调整地图加载流程
|
2020-07-28 11:29:39 +08:00 |
|
zyy
|
59a75280a6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/lesson/lessoncategory/edit/chapter/list.vue
# src/views/lesson/trainingRule/list.vue
# src/views/newMap/displayNew/index.vue
|
2020-07-27 18:09:38 +08:00 |
|
zyy
|
42d9906550
|
调整地图加载多余配置，增加宁波右键列车新指令
|
2020-07-27 18:04:47 +08:00 |
|
fan
|
7661d36ca4
|
宁波行调添加单锁&获取操作类型map调整
|
2020-07-27 15:22:26 +08:00 |
|
fan
|
8e6d424453
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-27 14:12:02 +08:00 |
|
fan
|
a74993f217
|
添加地图配置项rmAtpSpeed，urmAtpSpeed&调整课程创建
|
2020-07-27 14:11:43 +08:00 |
|
zyy
|
a8d584ae89
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-27 13:15:12 +08:00 |
|
zyy
|
2c39916217
|
调整运行图预览逻辑
|
2020-07-27 13:15:01 +08:00 |
|
fan
|
a5a55af5ef
|
加载仿真计划失表取消loading状态&暂撤销宁波一计轴故障修改
|
2020-07-27 10:00:08 +08:00 |
|
fan
|
95d754d57c
|
调整宁波线计轴故障为粉色光带
|
2020-07-27 09:12:08 +08:00 |
|
zyy
|
8b5122a88f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 17:17:52 +08:00 |
|
zyy
|
cc5d68de39
|
调整综合演练流程，增加列车操作
|
2020-07-24 17:17:40 +08:00 |
|
fan
|
8a660e75f0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 15:29:01 +08:00 |
|
fan
|
75164e9a5f
|
调整综合仿真现地行调切换显示
|
2020-07-24 15:28:45 +08:00 |
|