fan
|
eaa60a811b
|
邮箱=》邮箱（账号）
|
2021-07-05 14:28:18 +08:00 |
|
joylink_cuiweidong
|
d5a232c87a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-02 16:46:25 +08:00 |
|
joylink_cuiweidong
|
a39996e457
|
福州一号线 运行图 加线抽线
去除 西安三 运行图 加线抽线
|
2021-07-02 16:45:51 +08:00 |
|
fan
|
9d64d05202
|
删除console
|
2021-07-02 14:10:52 +08:00 |
|
fan
|
4f844f3242
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-02 14:02:27 +08:00 |
|
fan
|
041cabfe00
|
西安延续保护信号机名称显示调整 列车详情调整
|
2021-07-02 14:02:12 +08:00 |
|
joylink_cuiweidong
|
6ddee3ac9d
|
Merge remote-tracking branch 'remotes/origin/test_cx' into test
|
2021-07-02 13:45:32 +08:00 |
|
joylink_cuiweidong
|
7dff579224
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-02 13:45:11 +08:00 |
|
joylink_cuiweidong
|
4e2b07829c
|
西安三号线 运行图 加线抽线功能 添加
|
2021-07-02 13:44:21 +08:00 |
|
fan
|
813a0771d9
|
添加线路配置：transferRouteCanOnlyFaultUnlock 转换轨进路只能通过故障解锁来取消
|
2021-07-02 10:02:41 +08:00 |
|
fan
|
d5357d3614
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-01 16:06:41 +08:00 |
|
fan
|
19058b1935
|
列车遮挡调整
|
2021-07-01 16:06:31 +08:00 |
|
yuan
|
fb7dbd65fb
|
列车信息显示修改
|
2021-07-01 11:29:06 +08:00 |
|
joylink_cuiweidong
|
49812887fc
|
Merge branch 'test' into test_cx
# Conflicts:
# src/jmapNew/theme/xian_01/menus/menuBar.vue
|
2021-07-01 10:34:28 +08:00 |
|
fan
|
78cfce5609
|
西安地铁页面调整
|
2021-07-01 10:17:12 +08:00 |
|
yuan
|
29730c2803
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_jhc
|
2021-07-01 10:15:55 +08:00 |
|
joylink_cuiweidong
|
87095b4f4e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/store/modules/runplan.js
|
2021-07-01 10:09:23 +08:00 |
|
joylink_cuiweidong
|
c7e75739c3
|
西安三加线逻辑调整
|
2021-07-01 10:06:35 +08:00 |
|
fan
|
8d5664d9da
|
西安地铁页面调整
|
2021-07-01 09:42:36 +08:00 |
|
fan
|
a8f4b06fbf
|
删除runPlan 弃用代码
|
2021-07-01 09:42:13 +08:00 |
|
fan
|
52fd77a145
|
Merge remote-tracking branch 'origin/test'
|
2021-06-30 18:08:41 +08:00 |
|
fan
|
4707434ed4
|
添加线路配置：设置头码车时检查方向checkDirectionWhenSetHead
|
2021-06-30 16:59:17 +08:00 |
|
fan
|
d04e35061c
|
无人自折=》无人折返
|
2021-06-30 16:51:23 +08:00 |
|
fan
|
5954a01554
|
西安三号线添加设头码车车次编号限制
|
2021-06-30 16:33:35 +08:00 |
|
fan
|
ae59cdac36
|
西安三设置头码车时不根据车次号搜索列车信息
|
2021-06-30 16:11:16 +08:00 |
|
fan
|
9a352c50fa
|
调整折返策略回显
|
2021-06-30 15:28:59 +08:00 |
|
fan
|
b5a225905e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-30 14:55:41 +08:00 |
|
fan
|
bcf9cc1d7f
|
左键点击关闭车次窗
|
2021-06-30 14:55:28 +08:00 |
|
yuan
|
e208182caa
|
ibp盘增加试灯
|
2021-06-30 13:01:24 +08:00 |
|
yuan
|
6d6d64c408
|
停站时间显示修改
|
2021-06-30 09:58:37 +08:00 |
|
yuan
|
b2398b5563
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_xa3
|
2021-06-29 17:25:11 +08:00 |
|
yuan
|
c736bb89b0
|
西安三-bug47-列车详情显示
|
2021-06-29 17:25:03 +08:00 |
|
fan
|
3992310427
|
修改折返默认值
|
2021-06-29 15:07:11 +08:00 |
|
fan
|
6cee614d56
|
更换折返方式枚举
|
2021-06-29 14:03:58 +08:00 |
|
fan
|
faf5383c5f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-29 13:54:04 +08:00 |
|
fan
|
53041725ac
|
更换折返方式枚举
|
2021-06-29 13:53:39 +08:00 |
|
joylink_cuiweidong
|
835e638a31
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-29 10:33:32 +08:00 |
|
joylink_cuiweidong
|
94102b6c98
|
第三方登陆代码调整
|
2021-06-29 10:33:09 +08:00 |
|
fan
|
bd962d5320
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-29 10:24:30 +08:00 |
|
fan
|
cae193b929
|
Bug327 西安三：道岔计轴区段无法设置ARB橙光带故障
|
2021-06-29 10:23:36 +08:00 |
|
joylink_cuiweidong
|
cd2c43ac97
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-29 09:43:38 +08:00 |
|
joylink_cuiweidong
|
95882eeeef
|
第三方登陆联系方式调整
|
2021-06-29 09:43:20 +08:00 |
|
fan
|
e0f672cb7d
|
西安三列车故障处理添加连挂操作
|
2021-06-28 15:28:33 +08:00 |
|
fan
|
1c2037f9e4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-28 14:55:30 +08:00 |
|
fan
|
e6f479379b
|
列车限速区间选择5-65
|
2021-06-28 14:55:18 +08:00 |
|
yuan
|
7514ff3270
|
bugfix-xa3-048 修改列车识别号字段显示错误
|
2021-06-28 10:40:35 +08:00 |
|
yuan
|
118a8d07d4
|
错别字修改
|
2021-06-28 10:21:16 +08:00 |
|
yuan
|
0c219aff71
|
抽线
|
2021-06-25 15:34:51 +08:00 |
|
yuan
|
51a0ebd5fe
|
抽线
|
2021-06-25 15:34:35 +08:00 |
|
fan
|
5a02b528c3
|
Merge remote-tracking branch 'origin/test' into master2
|
2021-06-24 18:19:00 +08:00 |
|