Commit Graph

449 Commits

Author SHA1 Message Date
fan
df70024740 代码调整 2020-03-24 18:42:18 +08:00
fan
1e72a8cff3 状态灯调整 2020-03-24 16:35:09 +08:00
fan
5c7c27d2f3 状态灯调整 2020-03-24 15:02:14 +08:00
fan
e9aad944ae 绘图线条调整 2020-03-24 10:05:51 +08:00
fan
2501a1a70a 综合演练问题调整 2020-03-23 16:00:28 +08:00
fan
f574279afe Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-23 13:59:51 +08:00
fan
a85f1d8f5e 代码调整 2020-03-23 13:52:50 +08:00
zyy
ad6b8f8dba 调整区段流程逻辑,站台流程 2020-03-23 13:48:35 +08:00
zyy
788737369a 调整哈尔滨线路 现地 行调 菜单高度 2020-03-20 17:56:20 +08:00
fan
cc6af4f056 综合演练调整 2020-03-20 17:36:07 +08:00
fan
1e8d304249 Merge remote-tracking branch 'origin/dev_dukang' into dev
# Conflicts:
#	src/scripts/cmdPlugin/CommandEnum.js
#	src/utils/baseUrl.js
2020-03-20 15:16:08 +08:00
fan
80fda91dba 自动折返&引导总锁调整 2020-03-20 14:12:02 +08:00
fan
404d867767 绘图&成三现地调整 2020-03-20 11:09:06 +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
joylink_cuiweidong
65566a1438 添加 贵州装备制造职业学院 案例展示
北京一号线操作代码调整
2020-03-19 13:06:48 +08:00
zyy
3afa12711e 新增哈尔滨线路底部栏 操作 2020-03-18 18:47:37 +08:00
joylink_cuiweidong
0bba854e15 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-18 10:53:56 +08:00
joylink_cuiweidong
ce02703a5a 自动折返和自动进路按钮绘图代码调整 2020-03-18 10:53:42 +08:00
fan
aa97a242b1 绘图问题调整 2020-03-18 10:31:23 +08:00
zyy
11b2ee8130 调整代码 2020-03-18 10:20:49 +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
3beb346ce1 功能按钮代码调整 2020-03-17 18:59:51 +08:00
fan
71d328296f 综合演练调整 2020-03-17 18:44:49 +08:00
joylink_cuiweidong
d8d143ae38 删除地图绘制中,车站里面的引导总锁 2020-03-17 17:59:47 +08:00
zyy
2e7e25dd06 增加功能按钮绘图方式 2020-03-17 16:12:15 +08:00
fan
b94c2b47de 综合演练调整 2020-03-17 14:54:03 +08:00
fan
022cf8c6ac 代码调整 2020-03-17 10:07:02 +08:00
fan
4ab462ed5d 合并代码 2020-03-16 15:32:00 +08:00
fan
cd9915668b 综合演练接口修改 2020-03-16 15:29:26 +08:00
zyy
1745bfbcf1 ibp盘绘制更新保存流程调整完成 2020-03-16 14:47:59 +08:00
zyy
19f64034fb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/jmapNew/theme/chengdu_01/model.js
#	src/utils/baseUrl.js
2020-03-13 18:20:02 +08:00
fan
553900df47 调整成都三操作 2020-03-13 18:19:27 +08:00
zyy
e156bac9ca 增加公共地图ibp配置绘图 逻辑 2020-03-13 18:19:04 +08:00
fan
a7b81a3383 调整车次窗初始显示 2020-03-13 16:35:03 +08:00
fan
7753c53ee0 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/jmapNew/shape/Train/index.js
2020-03-13 13:08:18 +08:00
fan
4a2c539553 哈尔滨现地显示 2020-03-13 13:01:58 +08:00
joylink_cuiweidong
56126bdbf3 列车精确定位代码调整
列车的状态信息调整
去掉仿真里的拖动鼠标生成包围框
2020-03-12 14:41:53 +08:00
zyy
b7ee3e5f6e 增加批量调整区段名称位置 2020-03-12 13:13:00 +08:00
fan
8ad0544dc2 创建小站台时,不设置区段为站台轨 2020-03-11 18:00:45 +08:00
fan
939360917e 调整信号机接近区段颜色变化 2020-03-11 16:58:14 +08:00
fan
3273724484 调整自动折返非空校验 2020-03-11 15:50:47 +08:00
fan
ef60af34c0 绘图预览切换现地行调显示 2020-03-11 15:10:08 +08:00
fan
5d39b8e84e 绘图显示调整 2020-03-11 10:53:09 +08:00
fan
50bb1ad59e 绘图高级数据调整 2020-03-10 18:56:03 +08:00
fan
ee53da67bc 调整点击设备中组成元素的数据处理 2020-03-10 13:05:20 +08:00
fan
a4e5bf3d81 现地行调显示区分 2020-03-10 09:49:05 +08:00
fan
d45950fa68 自动折返调整 2020-03-09 18:35:01 +08:00
fan
7f4e6fb13c 初始化按计划行车状态and其他调整 2020-03-09 17:38:15 +08:00