Commit Graph

116 Commits

Author SHA1 Message Date
fan
8e5a79626a 西安二号线调整 2020-04-16 09:01:52 +08:00
fan
11586aef30 哈尔滨现地显示BUG调整&西安二号线皮肤调整 2020-04-10 16:45:41 +08:00
fan
b089aa6651 实训占位符调整&皮肤调整 2020-04-08 13:23:19 +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
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
1adc50b2d1 站台调整 2020-03-27 10:17:24 +08:00
fan
ead5bd01e6 站台调整 2020-03-26 15:04:52 +08:00
fan
5bcb42e0f2 宁波调整 2020-03-25 17:32:57 +08:00
joylink_cuiweidong
81b2e420d8 宁波线
添加信号机人解进路功能
信号机右键菜单 设置进路改为排列进路
列车鼠标悬停显示信息去掉
佛山线 现地
信号机操作调整
2020-03-25 15:19:39 +08:00
fan
1e72a8cff3 状态灯调整 2020-03-24 16:35:09 +08:00
fan
5c7c27d2f3 状态灯调整 2020-03-24 15:02:14 +08:00
zyy
ad6b8f8dba 调整区段流程逻辑,站台流程 2020-03-23 13:48:35 +08:00
fan
80fda91dba 自动折返&引导总锁调整 2020-03-20 14:12:02 +08:00
fan
36b7d7309a 增加绘图表示灯&&线条颜色 2020-03-19 16:17:34 +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
a9c19cf1ea 现地操作调整 2020-03-18 19:05:02 +08:00
zyy
12f283cbae Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue
#	src/views/newMap/newMapdraft/mapoperate/index.vue
2020-03-18 09:12:18 +08:00
zyy
0ceb0c2c65 调整自动折返 type 类型 增加自动折返菜单流程 2020-03-18 09:10:57 +08:00
joylink_cuiweidong
c01b261638 引导总锁绘制代码调整 2020-03-17 18:25:03 +08:00
joylink_cuiweidong
d8d143ae38 删除地图绘制中,车站里面的引导总锁 2020-03-17 17:59:47 +08:00
joylink_cuiweidong
1a8b37f2b4 北京一号线 现地 排列进路操作代码调整 2020-03-16 16:28:53 +08:00
fan
264310f28e 调整成都三显示 2020-03-13 15:06:14 +08:00
fan
ef60af34c0 绘图预览切换现地行调显示 2020-03-11 15:10:08 +08:00
fan
7f4e6fb13c 初始化按计划行车状态and其他调整 2020-03-09 17:38:15 +08:00
zyy
a1416b9a23 调整哈尔滨线路扣车状态 2020-03-07 11:05:38 +08:00
joylink_cuiweidong
bb204dd72a 列车 跳停 扣车 车门 状态代码调整 2020-03-06 20:47:39 +08:00
zyy
84c379410f 调整站台状态 2020-03-06 19:02:20 +08:00
joylink_cuiweidong
4c02e416bc 成都一号线 列车所在区段位置代码调整(部分) 2020-03-06 15:27:31 +08:00
joylink_fanyuhong
56a5d0f018 调整显示条件 2020-03-06 11:26:52 +08:00
joylink_fanyuhong
217864dbd4 站台功能按钮 2020-03-06 10:05:21 +08:00
joylink_fanyuhong
8d58125e1f 自动进路和引导总锁 2020-03-05 16:39:49 +08:00
joylink_fanyuhong
c1c624dfff Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-02 14:47:08 +08:00
joylink_fanyuhong
692f30fd9f 运行图导入和列车调整 2020-03-02 14:46:59 +08:00
joylink_zyy
448523cf88 调整哈尔滨线路道岔显示问题 2020-02-28 18:10:20 +08:00
joylink_zyy
870a68a476 调整区段,道岔显示样式 2020-02-28 15:20:26 +08:00
joylink_cuiweidong
dbb24a1793 宁波一号线 道岔 封锁 显示状态代码调整 2020-02-19 17:26:15 +08:00
joylink_fanyuhong
680d87e623 列车状态显示 2020-02-19 16:33:59 +08:00
joylink_fanyuhong
00dd268918 列车调整 2020-02-19 11:47:38 +08:00
zyy
3976925669 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-17 17:51:03 +08:00
zyy
73b51bd385 调整站台显示问题 2020-02-17 17:50:15 +08:00
joylink_fanyuhong
c173ce8d6c 状态调整 2020-02-17 15:31:08 +08:00
joylink_fanyuhong
cd8a4c3a2e 状态调整 2020-02-17 14:40:59 +08:00
joylink_fanyuhong
07b5e172dd 状态调整 2020-02-14 10:58:57 +08:00
joylink_fanyuhong
b448cad3c9 道岔状态调整 2020-02-11 15:24:17 +08:00
joylink_fanyuhong
56d93a2f73 区段信号机调整 2020-02-11 11:02:35 +08:00
joylink_zyy
1ef8788c3c 调整绘图逻辑,增加哈尔滨线路 站台 信号机绘图逻辑 2020-02-03 17:17:56 +08:00
zyy
786a37ee2c 增加宁波一号线控制权转移 2020-01-08 14:59:27 +08:00
fan
c501445800 折线偏移量调整 2019-12-17 14:26:56 +08:00
zyy
640b38285a 调整车站默认字体大小,皮肤调整 2019-12-10 15:44:46 +08:00
zyy
c192deb2ca 修改代码 2019-12-06 10:31:19 +08:00
joylink_cuiweidong
09590e7657 删除stationControl 2019-12-05 10:52:45 +08:00
zyy
8bbd5e2600 desc: 修改代码 2019-12-05 10:25:07 +08:00
zyy
22bc27293f 修改代码 2019-12-04 18:39:28 +08:00
fan
5ca78f0ba7 调整绘图相关-(信号机调整,草稿地图列表接口调整) 2019-12-03 13:36:02 +08:00
fan
aef74d32da 调整绘图相关 2019-12-03 09:24:44 +08:00
joylink_cuiweidong
cee4a7a396 代码调整 2019-12-02 16:19:40 +08:00
zyy
11b327984e 新增新版地图绘制文件 2019-11-29 12:51:58 +08:00