zyy
|
41b9adcc28
|
调整宁波三号线列车配置
|
2020-08-20 16:02:21 +08:00 |
|
fan
|
af132ae2dd
|
宁波三号线菜单调整
|
2020-08-20 15:42:47 +08:00 |
|
fan
|
862262a6c4
|
merge
|
2020-08-20 13:19:14 +08:00 |
|
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 |
|
joylink_cuiweidong
|
f06a025792
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 15:24:45 +08:00 |
|
joylink_cuiweidong
|
d5215a3c1c
|
哈尔滨线路 停站时间状态绘图调整
|
2020-07-24 15:23:55 +08:00 |
|
fan
|
fd4acc0a82
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 14:21:22 +08:00 |
|
fan
|
d4da17ae09
|
调整哈尔滨成都一故障样式&哈尔滨现地切换显示
|
2020-07-24 14:20:38 +08:00 |
|
joylink_cuiweidong
|
196a611d70
|
仿真聊天代码调整
|
2020-07-24 10:35:05 +08:00 |
|
fan
|
14d787ea9c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 17:57:43 +08:00 |
|
fan
|
a9233a082e
|
代码调整
|
2020-07-23 17:57:35 +08:00 |
|
zyy
|
2434de38bd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 17:09:43 +08:00 |
|
zyy
|
9ec64f1eeb
|
调整加载方式及判断
|
2020-07-23 17:09:29 +08:00 |
|
joylink_cuiweidong
|
81bfb35e67
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 16:43:01 +08:00 |
|
joylink_cuiweidong
|
6210df54de
|
代码调整
|
2020-07-23 16:42:39 +08:00 |
|
fan
|
9d7c11dca6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 16:07:44 +08:00 |
|
fan
|
e561f77c12
|
代码调整&socket重连前进行初始化
|
2020-07-23 16:07:27 +08:00 |
|
joylink_cuiweidong
|
72b137435c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 13:38:59 +08:00 |
|
joylink_cuiweidong
|
478a8f0ba4
|
宁波线的列车，RM模式的时候，前面的箭头设置为灰色
|
2020-07-23 13:38:31 +08:00 |
|
zyy
|
11c021feb8
|
调整屏蔽门绘图
|
2020-07-23 13:16:45 +08:00 |
|
zyy
|
e9b8e6e1b9
|
调整哈尔滨线路屏蔽门样式
|
2020-07-23 10:32:58 +08:00 |
|
zyy
|
b1b8324484
|
调整列车，道岔故障模式右键操作
|
2020-07-22 13:37:56 +08:00 |
|
joylink_cuiweidong
|
c6878dd7ab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-22 11:26:16 +08:00 |
|
joylink_cuiweidong
|
517b41b586
|
控制权转换指令添加报错信息
|
2020-07-22 11:25:54 +08:00 |
|
zyy
|
dd22ce9940
|
调整西安线路故障模式操作
|
2020-07-22 11:23:02 +08:00 |
|
zyy
|
aeb3e24c24
|
修改操作字段
|
2020-07-21 16:43:15 +08:00 |
|
zyy
|
8715ce2f97
|
调整哈尔滨列车操作
|
2020-07-21 16:17:04 +08:00 |
|
zyy
|
85203bfbe1
|
增加哈尔滨线路故障操作
|
2020-07-21 16:00:41 +08:00 |
|
zyy
|
ed9815393a
|
调整线路列车右键操作
|
2020-07-21 15:11:33 +08:00 |
|
zyy
|
1d2bf7693f
|
调整哈尔滨操作禁用配置
|
2020-07-21 13:55:35 +08:00 |
|
zyy
|
7498e7c844
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 13:38:13 +08:00 |
|
zyy
|
4bb41700bc
|
列车提示信息调整，哈尔滨线路操作
|
2020-07-21 13:37:59 +08:00 |
|
fan
|
c97291e225
|
北京皮肤调整
|
2020-07-21 11:20:05 +08:00 |
|
fan
|
bbadc59bf1
|
宁波皮肤调整
|
2020-07-21 11:19:06 +08:00 |
|
zyy
|
7bd6013565
|
增加指令字典 复制操作
|
2020-07-20 10:47:27 +08:00 |
|
zyy
|
e0f7175923
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-17 18:28:56 +08:00 |
|
zyy
|
04f1205e56
|
调整上行是否向右地图字段
|
2020-07-17 18:28:38 +08:00 |
|
joylink_cuiweidong
|
da2fa63253
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-17 10:52:35 +08:00 |
|
joylink_cuiweidong
|
70b1dd7815
|
列车通信故障/ 取消故障操作调整
|
2020-07-17 10:51:45 +08:00 |
|
zyy
|
6042d58262
|
调整列车发送指令流程
|
2020-07-17 10:22:47 +08:00 |
|
zyy
|
b37fbdd967
|
调整西安线路列车操作
|
2020-07-16 13:35:54 +08:00 |
|
fan
|
5c0285969c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-15 14:26:03 +08:00 |
|
zyy
|
a1cbcff9ea
|
调整道岔绘图，右键操作
|
2020-07-15 13:31:07 +08:00 |
|
fan
|
897407dde6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-15 10:11:36 +08:00 |
|
fan
|
fac190e91d
|
代码调整
|
2020-07-15 10:11:25 +08:00 |
|
zyy
|
40fea0108f
|
宁波线路道岔封锁显示调整
|
2020-07-14 18:19:19 +08:00 |
|
zyy
|
172623c0f1
|
调整宁波线路道岔失表显示
|
2020-07-14 18:14:39 +08:00 |
|
fan
|
d3626758ee
|
哈尔滨操作调整
|
2020-07-14 13:41:17 +08:00 |
|
fan
|
7bbeb6bbd6
|
哈尔滨指令样式调整
|
2020-07-14 11:21:24 +08:00 |
|
fan
|
1c051d0561
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 10:15:37 +08:00 |
|
fan
|
84e4668e40
|
哈尔滨指令调整
|
2020-07-14 10:14:59 +08:00 |
|
joylink_cuiweidong
|
d2f653bc54
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
# src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
# src/jmapNew/theme/xian_01/menus/menuTrain.vue
# src/jmapNew/theme/xian_02/menus/menuTrain.vue
|
2020-07-13 18:59:56 +08:00 |
|
joylink_cuiweidong
|
fe5787b3ce
|
新增 确认列车行驶之前方站台 进路闭塞法行车 指令
|
2020-07-13 18:54:42 +08:00 |
|
fan
|
440eeed75f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 18:40:53 +08:00 |
|
fan
|
7cdc3c5878
|
贵州导入班级报错提示&哈尔滨指令调整
|
2020-07-13 18:40:41 +08:00 |
|
zyy
|
06fecf9aad
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 17:27:49 +08:00 |
|
zyy
|
1c15fdbdd9
|
增加所有线路列车故障模式
|
2020-07-13 17:27:33 +08:00 |
|
fan
|
40402a9a8e
|
试卷规则bug修复&哈尔滨操作调整
|
2020-07-13 16:48:23 +08:00 |
|
fan
|
1b3a491d52
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 14:35:07 +08:00 |
|
fan
|
0ca0153c60
|
旧地图综合演练调整
|
2020-07-13 14:34:56 +08:00 |
|
zyy
|
ee9cf9f54d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 14:30:16 +08:00 |
|
zyy
|
6817323fe1
|
调整宁波列车故障右键
|
2020-07-13 14:30:01 +08:00 |
|
fan
|
a5649cc6e8
|
哈尔滨操作调整
|
2020-07-13 13:01:28 +08:00 |
|
fan
|
b10f08df67
|
设备登录调整&成员管理调整
|
2020-07-10 18:30:37 +08:00 |
|
zyy
|
7263bb669d
|
删除socket提示信息
|
2020-07-10 11:26:15 +08:00 |
|
zyy
|
348b07afa4
|
调整大屏系统列车显示问题
|
2020-07-10 10:52:31 +08:00 |
|
zyy
|
1847267bef
|
调整列车大屏状态修改
|
2020-07-09 19:07:57 +08:00 |
|
zyy
|
6112d720be
|
调整贵州项目大屏配置
|
2020-07-08 10:33:15 +08:00 |
|
joylink_cuiweidong
|
92da104ad0
|
zc故障灯状态修改
|
2020-07-07 10:00:55 +08:00 |
|
joylink_cuiweidong
|
a6b2f62c3e
|
北京一成都线路手动设置zc故障
|
2020-07-06 18:45:15 +08:00 |
|
joylink_cuiweidong
|
bcc24751b4
|
手动zc故障代码调整
|
2020-07-06 18:17:44 +08:00 |
|
joylink_cuiweidong
|
dd8e0f650e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-06 17:49:35 +08:00 |
|
joylink_cuiweidong
|
5f1a5b3092
|
西安线路和宁波一号线添加动手zc故障
|
2020-07-06 17:49:17 +08:00 |
|
zyy
|
6be93b39ba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-06 17:02:31 +08:00 |
|
zyy
|
2c5c30216f
|
调整大屏预览流程，增加大屏分屏配置
|
2020-07-06 17:02:13 +08:00 |
|
joylink_cuiweidong
|
5cf1fdab5d
|
新版地图右键操作代码调整
|
2020-07-06 15:40:59 +08:00 |
|
joylink_cuiweidong
|
75244ca959
|
任何创建者 创建试卷 有试用选项
|
2020-07-06 13:31:49 +08:00 |
|
joylink_cuiweidong
|
9d85fa7eca
|
信号机绘图代码调整
|
2020-07-03 18:14:24 +08:00 |
|
fan
|
8fa62ec9ce
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-03 13:55:20 +08:00 |
|
fan
|
0a594f5e09
|
屏蔽门故障打开
|
2020-07-03 13:55:04 +08:00 |
|
joylink_cuiweidong
|
41cc1af21a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-03 11:27:29 +08:00 |
|
joylink_cuiweidong
|
ec1c5a9bbb
|
信号机故障 绘图代码调整
|
2020-07-03 11:27:01 +08:00 |
|
zyy
|
84937e8c5c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-03 11:12:10 +08:00 |
|
zyy
|
f91fc75528
|
调整西安线路进路状态
|
2020-07-03 11:11:57 +08:00 |
|
fan
|
aa66cbb277
|
列车驾驶模式显示调整
|
2020-07-03 11:02:35 +08:00 |
|
zyy
|
fa5097cd8d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-02 18:47:57 +08:00 |
|
zyy
|
3b39a9a04b
|
调整区段字段，控制权操作
|
2020-07-02 18:47:39 +08:00 |
|
joylink_cuiweidong
|
2141c8d426
|
成都三号线信号机操作代码调整
|
2020-07-02 18:28:12 +08:00 |
|
joylink_cuiweidong
|
ac4c0baecf
|
西安三号线 仿真右侧列车列表代码调整
修改故障枚举
修改退出聊天会话接口
|
2020-07-02 17:44:20 +08:00 |
|
joylink_cuiweidong
|
1b714c86c8
|
成都三号线 站台操作代码调整
|
2020-07-02 16:01:22 +08:00 |
|
joylink_cuiweidong
|
146d6c2d0b
|
成都三号线站台操作代码调整
|
2020-07-02 13:28:36 +08:00 |
|
zyy
|
58a874c9b8
|
调整设置和取消故障的时候，默认选择第一个选项
|
2020-07-02 09:56:51 +08:00 |
|
zyy
|
901dad45ee
|
调整宁波线路区段计算提示位置逻辑
|
2020-07-02 09:35:41 +08:00 |
|
zyy
|
e0b45e01b4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-01 18:08:57 +08:00 |
|
zyy
|
64d415dbb3
|
调整地图绘图数据模型
|
2020-07-01 18:08:42 +08:00 |
|
joylink_cuiweidong
|
eef26afafa
|
成都三号线右键菜单调整
|
2020-07-01 17:29:10 +08:00 |
|
joylink_cuiweidong
|
47186e0948
|
成都三号线右键操作代码调整
|
2020-07-01 16:56:00 +08:00 |
|
joylink_cuiweidong
|
b0f7d125a3
|
成都三号线右键操作代码调整
|
2020-07-01 16:10:07 +08:00 |
|
joylink_cuiweidong
|
9068de551c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-01 14:22:51 +08:00 |
|
joylink_cuiweidong
|
e66723adff
|
右键操作折返策略代码调整
地图绘图转化函数调整
|
2020-07-01 14:22:06 +08:00 |
|
zyy
|
086cf6d3a0
|
调整成都三号线现地操作实训配置
|
2020-07-01 13:34:08 +08:00 |
|
zyy
|
485533ff33
|
调整成都三号线现地操作
|
2020-07-01 09:39:13 +08:00 |
|
zyy
|
4eee003b97
|
调整成都按钮发送事件
|
2020-06-30 17:03:35 +08:00 |
|
zyy
|
7eeece3b59
|
调整mapDevice 数据更新
|
2020-06-30 16:20:51 +08:00 |
|
zyy
|
58a9b27939
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-30 15:44:48 +08:00 |
|
zyy
|
b43009ab06
|
调整权限分配时间限制
|
2020-06-30 15:44:31 +08:00 |
|
fan
|
6a0433f12f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-30 14:43:20 +08:00 |
|
zyy
|
405158b2e3
|
调整成都三号线现地操作定义
|
2020-06-30 14:39:09 +08:00 |
|
zyy
|
9748ca2f63
|
调整成都三号线操作定义，位置提示
|
2020-06-30 13:32:50 +08:00 |
|
zyy
|
7df86adff1
|
调整表单赋值拷贝
|
2020-06-30 11:19:33 +08:00 |
|
fan
|
f7e162cab0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-29 14:25:45 +08:00 |
|
fan
|
3f80fc1d0e
|
公共菜单提取
|
2020-06-29 14:25:35 +08:00 |
|
zyy
|
4f8371ce22
|
调整成都三号线 行调实操
|
2020-06-29 13:27:01 +08:00 |
|
zyy
|
db1c1daf2f
|
调整成都三号线行调操作，及现地样式
|
2020-06-29 09:53:30 +08:00 |
|
zyy
|
2ddd8f12d2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-28 16:04:18 +08:00 |
|
zyy
|
7873917d43
|
调整数据模型过滤空置，调整成都3号线实操
|
2020-06-28 16:03:59 +08:00 |
|
joylink_cuiweidong
|
be2a5e7150
|
福州一号线行调操作调整
|
2020-06-28 15:55:25 +08:00 |
|
fan
|
fe7b727f31
|
福州行调仿真增加信号机操作
|
2020-06-28 15:28:20 +08:00 |
|
fan
|
9637c7edc6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-28 14:50:22 +08:00 |
|
fan
|
1fc6bd7058
|
控制权转移调整
|
2020-06-28 14:50:09 +08:00 |
|
zyy
|
621a077e86
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-28 13:27:24 +08:00 |
|
zyy
|
e3ee44aae7
|
调整道岔失表状态，成都3号线实操定义
|
2020-06-28 13:27:10 +08:00 |
|
fan
|
fd2347e4e7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-28 11:01:34 +08:00 |
|
fan
|
618419e4ba
|
佛山信号机操作调整
|
2020-06-28 11:01:13 +08:00 |
|
joylink_cuiweidong
|
dea4481783
|
北京一号线现地操作代码调整
|
2020-06-28 10:38:34 +08:00 |
|
zyy
|
6b78dc89f4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 18:40:09 +08:00 |
|
zyy
|
b5a22e2dd1
|
调整佛山实训定义操作配置
|
2020-06-24 18:39:49 +08:00 |
|
joylink_cuiweidong
|
c0c60e0bb4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 18:39:11 +08:00 |
|
joylink_cuiweidong
|
97320237c3
|
西安三号线道岔添加 道岔钩锁操作
|
2020-06-24 18:38:46 +08:00 |
|
zyy
|
678f0ba839
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 17:37:24 +08:00 |
|
zyy
|
c570e418e1
|
调整佛山操作定义，调整个人信息
|
2020-06-24 17:37:09 +08:00 |
|
fan
|
92000b3d09
|
宁波一运行图预览调整
|
2020-06-24 17:31:21 +08:00 |
|
joylink_cuiweidong
|
f3859ba247
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 16:22:18 +08:00 |
|
joylink_cuiweidong
|
73b2da9421
|
右键操作取消故障代码调整
|
2020-06-24 16:21:56 +08:00 |
|
fan
|
8722316b7d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 16:19:59 +08:00 |
|
fan
|
2399be67d0
|
宁波道岔失表增加表示红色矩形
|
2020-06-24 16:19:47 +08:00 |
|
zyy
|
3bd16e211f
|
调整佛山新路操作定义配置
|
2020-06-24 16:04:05 +08:00 |
|
zyy
|
74b5f8a291
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 15:44:14 +08:00 |
|
zyy
|
e4b730f300
|
调整配置
|
2020-06-24 15:43:58 +08:00 |
|
joylink_cuiweidong
|
12ab61179e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 14:07:22 +08:00 |
|
joylink_cuiweidong
|
5715c7cc98
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 14:06:48 +08:00 |
|
zyy
|
45cac99681
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 14:06:45 +08:00 |
|
zyy
|
3b330a0932
|
调整佛山线路实训定义，删除区段定义
|
2020-06-24 14:06:17 +08:00 |
|
joylink_cuiweidong
|
eec3d47b84
|
西安二号线操作代码整理
|
2020-06-24 14:06:12 +08:00 |
|
fan
|
e71f74a769
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 13:28:07 +08:00 |
|
fan
|
9a620f8629
|
西安三道岔设置故障&iscs调整（未完）
|
2020-06-24 13:27:58 +08:00 |
|
joylink_cuiweidong
|
ccdbf781a0
|
西安二号线信号机右键操作代码调整
|
2020-06-24 11:25:17 +08:00 |
|
joylink_cuiweidong
|
555552af28
|
删除多余的文件
|
2020-06-24 10:56:40 +08:00 |
|
fan
|
0128576386
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 09:25:04 +08:00 |
|
fan
|
d5cd233e98
|
调整故障操作
|
2020-06-24 09:24:54 +08:00 |
|
joylink_cuiweidong
|
b85362460e
|
剧本代码调整
|
2020-06-23 18:59:20 +08:00 |
|
joylink_cuiweidong
|
9e3ee28611
|
车站右键操作代码调整
|
2020-06-23 17:15:17 +08:00 |
|
fan
|
0ae6ec9237
|
调整登录状态检测&删除冗余配置
|
2020-06-23 16:21:54 +08:00 |
|
fan
|
e67f98e9a0
|
合并代码
|
2020-06-23 15:26:26 +08:00 |
|
fan
|
a2664eb5dc
|
登录调整&综合演练调整&菜单调整
|
2020-06-23 15:18:44 +08:00 |
|
joylink_cuiweidong
|
2462ba7413
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-23 13:58:20 +08:00 |
|
joylink_cuiweidong
|
83c348ef55
|
删除多余文件
|
2020-06-23 13:58:03 +08:00 |
|
zyy
|
293a9b0204
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-23 13:52:47 +08:00 |
|
zyy
|
143325e6f6
|
调整西安一三线路 导航名称显示流程
|
2020-06-23 13:52:34 +08:00 |
|
joylink_cuiweidong
|
3aba371b1f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-23 13:28:05 +08:00 |
|
joylink_cuiweidong
|
9752bd4244
|
佛山右键操作代码调整
|
2020-06-23 13:27:46 +08:00 |
|
zyy
|
98b24fac42
|
删除多余注释
|
2020-06-23 11:24:02 +08:00 |
|
zyy
|
81cde0b3d5
|
调整默认值
|
2020-06-23 09:40:15 +08:00 |
|
zyy
|
88211cee8f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-23 09:27:10 +08:00 |
|
zyy
|
4e36c7b456
|
调整默认配置
|
2020-06-23 09:26:58 +08:00 |
|
joylink_cuiweidong
|
d3d17f7bf6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-22 14:30:14 +08:00 |
|
joylink_cuiweidong
|
5580a79344
|
仿真右侧列车列表调整
福州线操作代码调整
|
2020-06-22 14:29:55 +08:00 |
|
zyy
|
e934860885
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-22 13:49:59 +08:00 |
|
zyy
|
58ab773ec9
|
删除多余配置
|
2020-06-22 13:49:42 +08:00 |
|
joylink_cuiweidong
|
717e04c4c5
|
宁波车站操作添加，哈尔滨右键操作代码调整
|
2020-06-22 11:00:39 +08:00 |
|
fan
|
0f519c8a89
|
贵装备导入学生信息后刷新班级列表
|
2020-06-22 09:49:45 +08:00 |
|
joylink_cuiweidong
|
c463f8ef69
|
宁波一号线哈尔滨一号线操作代码调整
|
2020-06-19 18:32:31 +08:00 |
|
joylink_cuiweidong
|
8c7a5e7796
|
右键操作代码整理
|
2020-06-19 17:03:39 +08:00 |
|
joylink_cuiweidong
|
ee12c33025
|
西安一号线右键操作代码调整
|
2020-06-19 16:13:21 +08:00 |
|
joylink_cuiweidong
|
5b5949b23d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 15:34:35 +08:00 |
|
joylink_cuiweidong
|
dd9959b2f4
|
右键菜单代码调整
|
2020-06-19 15:34:20 +08:00 |
|
fan
|
a1c3935ba7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 15:19:40 +08:00 |
|
fan
|
75116c32da
|
控制模式实操调整&sock降至1.0.0
|
2020-06-19 15:19:28 +08:00 |
|
joylink_cuiweidong
|
b4394a7092
|
右键菜单代码整理
|
2020-06-19 14:20:57 +08:00 |
|
zyy
|
bcc5fdf92c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 14:16:35 +08:00 |
|
zyy
|
5334049fcc
|
提取公共函数组件 删除线路多余配置
|
2020-06-19 14:16:21 +08:00 |
|
joylink_cuiweidong
|
f5ee525b20
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 14:09:08 +08:00 |
|
joylink_cuiweidong
|
b34a9fdf25
|
右键菜单代码整理
|
2020-06-19 14:08:52 +08:00 |
|
zyy
|
3a66119f81
|
删除多余配置
|
2020-06-19 13:40:56 +08:00 |
|
zyy
|
996a0d1a89
|
删除多余文件
|
2020-06-19 13:33:55 +08:00 |
|
zyy
|
5934c61b8f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/beijing_01/menus/dialog/cancelAllLimit.vue
|
2020-06-19 13:32:40 +08:00 |
|
zyy
|
8e409078d9
|
调整公共文件
|
2020-06-19 13:31:31 +08:00 |
|
joylink_cuiweidong
|
645e425e2c
|
宁波北京一号线操作代码调整
|
2020-06-19 13:28:53 +08:00 |
|
joylink_cuiweidong
|
9138fab486
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 13:01:35 +08:00 |
|
joylink_cuiweidong
|
100c651068
|
剧本代码调整
|
2020-06-19 11:30:12 +08:00 |
|
zyy
|
96456b2280
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 11:29:30 +08:00 |
|
zyy
|
6236e70494
|
调整限速配置
|
2020-06-19 11:29:12 +08:00 |
|
joylink_cuiweidong
|
411c1cc13e
|
宁波线路操作代码整理
|
2020-06-19 09:44:03 +08:00 |
|
fan
|
5bf46c151c
|
合并代码
|
2020-06-19 09:18:50 +08:00 |
|
fan
|
915f1fb959
|
故障操作和新建计划车迁移&信号机处理添加canSetCi属性(是否可设置联锁触发)
|
2020-06-19 09:17:03 +08:00 |
|
joylink_cuiweidong
|
30cd335845
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 18:32:37 +08:00 |
|
joylink_cuiweidong
|
aedf2b85fd
|
宁波一号线操作代码整理（部分）
|
2020-06-18 18:32:02 +08:00 |
|
zyy
|
914eb55b03
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 18:13:41 +08:00 |
|
zyy
|
0da6a64af7
|
调整临时限速配置
|
2020-06-18 18:13:28 +08:00 |
|
joylink_cuiweidong
|
aa632c457d
|
西安一号线 操作代码整理
|
2020-06-18 18:00:17 +08:00 |
|
joylink_cuiweidong
|
81f418afe5
|
西安二号线操作调整
|
2020-06-18 17:50:26 +08:00 |
|