sunzhenyu
|
0b6415b162
|
修改三维设备视图，修改站台模型贴图，修改客流量加载页面
|
2020-03-20 17:00:12 +08:00 |
|
sunzhenyu
|
3abc9fad16
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-03-20 09:55:23 +08:00 |
|
sunzhenyu
|
2760a4a678
|
修改三维客流视图加载界面，修改仿真站台模型
|
2020-03-20 09:55:13 +08:00 |
|
zyy
|
3b645724cc
|
Merge branch 'dev' into test
|
2020-03-19 18:40:12 +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
|
bd046abd8b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2020-03-19 13:08:34 +08:00 |
|
joylink_cuiweidong
|
65566a1438
|
添加 贵州装备制造职业学院 案例展示
北京一号线操作代码调整
|
2020-03-19 13:06:48 +08:00 |
|
fan
|
73d763b700
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-18 19:06:23 +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 |
|
joylink_cuiweidong
|
d8d143ae38
|
删除地图绘制中，车站里面的引导总锁
|
2020-03-17 17:59:47 +08:00 |
|
zyy
|
2e7e25dd06
|
增加功能按钮绘图方式
|
2020-03-17 16:12:15 +08:00 |
|
sunzhenyu
|
2e0b0913d6
|
修改设计平台三维数据发布
|
2020-03-16 18:47:55 +08:00 |
|
zyy
|
1745bfbcf1
|
ibp盘绘制更新保存流程调整完成
|
2020-03-16 14:47:59 +08:00 |
|
fan
|
47a856e0c1
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-13 18:24:11 +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
|
a124110a86
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2020-03-12 15:13:56 +08:00 |
|
joylink_cuiweidong
|
56126bdbf3
|
列车精确定位代码调整
列车的状态信息调整
去掉仿真里的拖动鼠标生成包围框
|
2020-03-12 14:41:53 +08:00 |
|
zyy
|
b7ee3e5f6e
|
增加批量调整区段名称位置
|
2020-03-12 13:13:00 +08:00 |
|
joylink_cuiweidong
|
42010f4d8d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2020-03-11 18:24:16 +08:00 |
|
fan
|
8ad0544dc2
|
创建小站台时，不设置区段为站台轨
|
2020-03-11 18:00:45 +08:00 |
|
fan
|
bd2938173a
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-11 16:59:47 +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
|
0aac76bb0e
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-11 10:54: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
|
2a61f97663
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-09 18:39:30 +08:00 |
|
fan
|
d45950fa68
|
自动折返调整
|
2020-03-09 18:35:01 +08:00 |
|
fan
|
7f4e6fb13c
|
初始化按计划行车状态and其他调整
|
2020-03-09 17:38:15 +08:00 |
|
zyy
|
e59fe1cae5
|
Merge branch 'dev' into test
|
2020-03-09 17:05:43 +08:00 |
|
fan
|
2b971cdf12
|
初始化按计划行车状态and其他调整
|
2020-03-09 14:23:44 +08:00 |
|
zyy
|
4eff0fc013
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/jmapNew/shape/Station/index.js
|
2020-03-07 11:08:57 +08:00 |
|
joylink_fanyuhong
|
7f53be45b1
|
进路调整，绘图相关调整
(cherry picked from commit e9749da)
|
2020-03-06 20:42:04 +08:00 |
|
joylink_fanyuhong
|
e9749daddb
|
进路调整，绘图相关调整
|
2020-03-06 18:25:05 +08:00 |
|