ival
|
12b804e110
|
Merge remote-tracking branch 'remotes/origin/test-tj' into test
|
2021-03-08 13:05:11 +08:00 |
|
ival
|
c8296f27db
|
同步代码
|
2021-03-08 13:04:39 +08:00 |
|
ival
|
886bec7aea
|
问题：运行图设置折返例行取值错误的问题
|
2021-03-08 11:30:46 +08:00 |
|
fan
|
2a977c8b43
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-08 10:12:21 +08:00 |
|
fan
|
5614d90776
|
添加线路配置配置generateDestination: '是否生成目的地码定义（泰雷兹）'
|
2021-03-08 10:12:01 +08:00 |
|
ival
|
788ddfc228
|
线路：通用menuBar
问题：点击空白关闭多级菜单时，所有层级都关闭。
|
2021-03-08 09:42:02 +08:00 |
|
ival
|
faaded9b1e
|
线路：通用menuBar
问题：点击空白关闭多级菜单时，所有层级都关闭。
|
2021-03-08 09:41:07 +08:00 |
|
ival
|
c4af252a3e
|
线路：福州
问题：修改福州信号关灯操作中，没有关闭一次弹窗的问题
|
2021-03-08 09:27:02 +08:00 |
|
ival
|
46d139e8a5
|
Merge branch 'test-tj' of https://git.code.tencent.com/lian-cbtc/jl-client into test-tj
|
2021-03-08 09:17:30 +08:00 |
|
ival
|
11df0526b0
|
线路：福州
问题：修改福州信号关灯操作中，没有关闭一次弹窗的问题
|
2021-03-08 09:17:18 +08:00 |
|
joylink_cuiweidong
|
c841a6457c
|
宁波三号线 代码调整
|
2021-03-05 18:03:16 +08:00 |
|
joylink_cuiweidong
|
4e133ff643
|
Merge branch 'test-tj' of https://git.code.tencent.com/lian-cbtc/jl-client into test-tj
# Conflicts:
# src/views/planMonitor/newEditTool/menus/modifyingStationIntervalTime.vue
|
2021-03-05 17:56:54 +08:00 |
|
ival
|
d5c29af3fb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-05 17:54:34 +08:00 |
|
ival
|
4ca2403d36
|
问题：修改弹窗问题
|
2021-03-05 17:53:19 +08:00 |
|
joylink_cuiweidong
|
43c8c577ae
|
代码调整
|
2021-03-05 17:50:22 +08:00 |
|
ival
|
07eaf3d8d4
|
问题：修改弹窗问题
|
2021-03-05 17:47:30 +08:00 |
|
fan
|
ae20d55493
|
成都名称调整
|
2021-03-05 17:44:32 +08:00 |
|
ival
|
a565e1f204
|
修改编辑运行图路基问题
|
2021-03-05 16:44:32 +08:00 |
|
ival
|
b9014f4118
|
问题：运行图到站停站数据计算
|
2021-03-05 16:07:51 +08:00 |
|
ival
|
f3532e980d
|
Merge branch 'test-tj' of https://git.code.tencent.com/lian-cbtc/jl-client into test-tj
|
2021-03-05 15:39:17 +08:00 |
|
ival
|
96ad7becf2
|
修改 增加任务逻辑
|
2021-03-05 15:39:08 +08:00 |
|
joylink_cuiweidong
|
c785523699
|
运行图 代码调整
|
2021-03-05 13:06:06 +08:00 |
|
joylink_cuiweidong
|
e9997a2f7f
|
Merge branch 'test-tj' of https://git.code.tencent.com/lian-cbtc/jl-client into test-tj
|
2021-03-05 09:40:33 +08:00 |
|
joylink_cuiweidong
|
f1b72f8103
|
代码调整
|
2021-03-05 09:40:14 +08:00 |
|
ival
|
f171db029c
|
调整：新版TJ 运行图界面样式
|
2021-03-04 18:31:59 +08:00 |
|
ival
|
6baf23149f
|
Merge branch 'test-tj' of https://git.code.tencent.com/lian-cbtc/jl-client into test-tj
|
2021-03-04 18:22:42 +08:00 |
|
ival
|
20f3acdc1f
|
问题：同级编辑工具模板
|
2021-03-04 18:22:32 +08:00 |
|
joylink_cuiweidong
|
45054de1f9
|
Merge branch 'test-tj' of https://git.code.tencent.com/lian-cbtc/jl-client into test-tj
|
2021-03-04 16:36:42 +08:00 |
|
joylink_cuiweidong
|
66af660f18
|
其他参数的配置页面 折返数据 代码调整
|
2021-03-04 16:36:18 +08:00 |
|
ival
|
2fe27a3c47
|
问题：运行图编辑问题
1：交路设置 ，转换轨<——>折返轨 或者 折返轨 <——>折返轨
2：高亮问题处理
|
2021-03-04 13:45:25 +08:00 |
|
fan
|
7572e39664
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-04 10:26:18 +08:00 |
|
fan
|
d0c129b56b
|
宁波一区域选择退出添加
|
2021-03-04 10:25:54 +08:00 |
|
ival
|
4c649312c1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-04 09:20:42 +08:00 |
|
ival
|
4e4d602400
|
修改同济大学运行图bar
|
2021-03-04 09:20:27 +08:00 |
|
joylink_cuiweidong
|
bf52e1ace9
|
西安三号线 顶部菜单样式调整
|
2021-03-03 17:53:54 +08:00 |
|
joylink_cuiweidong
|
11c2c816b3
|
福州一号线 顶部菜单 弹窗样式调整
西安三号线 顶部菜单 代码调整
|
2021-03-03 17:29:33 +08:00 |
|
joylink_cuiweidong
|
403b8b2ca1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-03 16:15:23 +08:00 |
|
joylink_cuiweidong
|
52e589466f
|
宁波三号线 运行线 操作 代码调整
|
2021-03-03 16:15:02 +08:00 |
|
fan
|
345205fcd7
|
取消quillEditor为全局组件
|
2021-03-03 15:13:19 +08:00 |
|
joylink_cuiweidong
|
ed791a0a2f
|
地图绘图 目的地码 添加起始区段的字段
|
2021-03-03 13:21:41 +08:00 |
|
joylink_cuiweidong
|
5e91907816
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-02 18:51:25 +08:00 |
|
joylink_cuiweidong
|
759d62b52a
|
西安二号线 下令停车 取消停车命令添加 列车绘图状态调整
|
2021-03-02 18:50:58 +08:00 |
|
ival
|
d84f4ba836
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-02 18:22:06 +08:00 |
|
ival
|
aaae6db62e
|
任务：同济大学运行图界面
进路：完成menu的创建
|
2021-03-02 18:21:55 +08:00 |
|
joylink_cuiweidong
|
cc946c8333
|
代码调整
|
2021-03-02 16:02:00 +08:00 |
|
joylink_cuiweidong
|
398e813490
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-02 15:47:12 +08:00 |
|
joylink_cuiweidong
|
972ab3006d
|
宁波三号线 运行线 绘图与操作页面 代码调整
|
2021-03-02 15:45:48 +08:00 |
|
ival
|
a75c603f21
|
线路：成都3
问题：取消引导或进路没有生成实训的问题
|
2021-03-02 15:28:07 +08:00 |
|
ival
|
e48543d5ee
|
线路：西安2
问题：
1.扣车和跳停互斥的问题；
2.为获取控制权时，没有限制排列进路的问题
3.修改车站AU/MN LA 的绘图处理
|
2021-03-02 15:06:40 +08:00 |
|
ival
|
ab9a11ef60
|
线路：西安2
问题：修改优先折法为侧线优先
|
2021-03-02 09:17:35 +08:00 |
|