Commit Graph

147 Commits

Author SHA1 Message Date
fan
4bce310d4f 福州皮肤调整 2020-04-02 11:10:27 +08:00
zyy
1599b82719 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-02 10:52:17 +08:00
zyy
8117a31c80 调整代码 2020-04-02 10:51:47 +08:00
fan
1017058855 站台状态显示位置调整 2020-04-02 09:48:55 +08:00
fan
ebd90d2485 本地项目调整&elementUI升版本至2.12.0 2020-04-01 15:32:06 +08:00
fan
848875bd57 关闭gzip 2020-04-01 14:39:29 +08:00
fan
e344e63469 宁波停站时间调整 2020-04-01 14:30:11 +08:00
zyy
4ef3c69f9f 调整显示内容 判断 2020-03-31 15:34:55 +08:00
fan
643c12335c Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_stand
# Conflicts:
#	src/utils/baseUrl.js
2020-03-30 14:26:27 +08:00
fan
e82e77a507 站台调整 2020-03-30 14:22:57 +08:00
fan
8f69177fe1 暂存 2020-03-30 09:47:26 +08:00
zyy
c5dbd2b141 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/utils/baseUrl.js
2020-03-27 18:20:28 +08:00
zyy
47519b7040 调整道岔生成默认状态,调整道岔皮肤配置 2020-03-27 18:19:40 +08:00
fan
19b945962b 站台调整 2020-03-27 17:26:17 +08:00
fan
5c7394454d 调整 2020-03-27 11:35:46 +08:00
fan
723f8ff3e8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-27 10:18:58 +08:00
fan
1adc50b2d1 站台调整 2020-03-27 10:17:24 +08:00
zyy
d92813ed72 调整道岔定位绘图 2020-03-27 10:02:41 +08:00
fan
ead5bd01e6 站台调整 2020-03-26 15:04:52 +08:00
fan
aadbe543a5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-26 09:44:27 +08:00
joylink_cuiweidong
8c01b4129f 列车绘图代码调整 2020-03-25 18:34:43 +08:00
zyy
a2875baa19 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-25 18:26:30 +08:00
zyy
41100ac9bf 调整宁波线路 道岔 封锁 单锁状态 2020-03-25 18:26:19 +08:00
fan
5bcb42e0f2 宁波调整 2020-03-25 17:32:57 +08:00
joylink_cuiweidong
ad4de2cd45 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-25 17:16:16 +08:00
joylink_cuiweidong
ef33f0f628 宁波一号线 增加列车移入显示边框 2020-03-25 17:15:16 +08:00
fan
1210496ecb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-25 15:24:08 +08:00
fan
9d38968751 佛山样式调整&&宁波显示调整 2020-03-25 15:22:52 +08:00
joylink_cuiweidong
81b2e420d8 宁波线
添加信号机人解进路功能
信号机右键菜单 设置进路改为排列进路
列车鼠标悬停显示信息去掉
佛山线 现地
信号机操作调整
2020-03-25 15:19:39 +08:00
joylink_cuiweidong
7604e276e1 宁波一号线 列车样式调整 2020-03-25 10:43:32 +08:00
fan
652aa43a2a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-24 16:37:26 +08:00
fan
1e72a8cff3 状态灯调整 2020-03-24 16:35:09 +08:00
zyy
a22ec53e39 调整佛山线路信号机,站台状态 2020-03-24 15:09:25 +08:00
fan
5c7c27d2f3 状态灯调整 2020-03-24 15:02:14 +08:00
zyy
bd48b2844c 佛山线路道岔状态调整,修改道岔绘图元素逻辑 2020-03-24 13:39:20 +08:00
zyy
688aa7310b 增加佛山有轨线路文件,调整区段显示状态 2020-03-23 14:27:57 +08:00
zyy
ad6b8f8dba 调整区段流程逻辑,站台流程 2020-03-23 13:48:35 +08:00
zyy
21c453f68d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-20 17:17:32 +08:00
zyy
7a15c07782 调整哈尔滨信号机状态 2020-03-20 17:17:23 +08:00
fan
80fda91dba 自动折返&引导总锁调整 2020-03-20 14:12:02 +08:00
zyy
2f654975d5 调整哈尔滨信号机状态 2020-03-19 18:39:20 +08:00
fan
7de2c38af4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-19 16:17:53 +08:00
fan
36b7d7309a 增加绘图表示灯&&线条颜色 2020-03-19 16:17:34 +08:00
zyy
1d46deb12a 调整区段绘画逻辑 2020-03-19 14:03:54 +08:00
zyy
6570028b95 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-19 10:52:54 +08:00
zyy
6e3dcf6b65 调整哈尔滨线路 区段,信号机操作 处理信号机点击高亮 2020-03-19 10:52:42 +08:00
fan
acc05f770e 调整进路状态影响自动进路功能按钮 2020-03-19 10:23:24 +08:00
fan
838f2311f8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-18 19:05:12 +08:00
fan
a9c19cf1ea 现地操作调整 2020-03-18 19:05:02 +08:00
zyy
4203c30e30 调整宁波线路自动折返 计轴复位操作 2020-03-18 11:18:52 +08:00