zyy
|
a95e940255
|
调整实训步骤校验
|
2020-03-27 14:37:28 +08:00 |
|
fan
|
3a8a3b87d8
|
调整左边弹框显示
|
2020-03-27 14:01:57 +08:00 |
|
fan
|
fb8d0b6615
|
Merge remote-tracking branch 'origin/dev_training' into dev_n
# Conflicts:
# src/views/designPlatform/demonList.vue
|
2020-03-27 13:55:00 +08:00 |
|
fan
|
a697ab21d5
|
调整实训
|
2020-03-27 13:52:14 +08:00 |
|
fan
|
3c1d038a81
|
实训仿真调整
|
2020-03-27 10:51:49 +08:00 |
|
fan
|
f34de4f001
|
实训调整
|
2020-03-26 18:42:01 +08:00 |
|
zyy
|
aba49d9ee4
|
增加联锁表配置查询条件
|
2020-03-26 17:23:19 +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 |
|
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 |
|
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 |
|
zyy
|
f96c8a11ef
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-25 13:46:14 +08:00 |
|
zyy
|
d5c9799189
|
删除路径单元模块 新增设置站间运行等级
|
2020-03-25 13:45:58 +08:00 |
|
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
|
9ff1d7e30c
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/store/modules/socket.js
|
2020-03-24 10:13:01 +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 |
|
fan
|
88ca3a568e
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-20 18:51:36 +08:00 |
|
zyy
|
788737369a
|
调整哈尔滨线路 现地 行调 菜单高度
|
2020-03-20 17:56:20 +08:00 |
|
fan
|
cc6af4f056
|
综合演练调整
|
2020-03-20 17:36:07 +08:00 |
|
sunzhenyu
|
d55ca741dc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-03-20 17:00:46 +08:00 |
|
sunzhenyu
|
0b6415b162
|
修改三维设备视图，修改站台模型贴图，修改客流量加载页面
|
2020-03-20 17:00:12 +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 |
|
zyy
|
473d60ca0c
|
Merge branch 'dev' into test
|
2020-03-20 13:08:35 +08:00 |
|
fan
|
404d867767
|
绘图&成三现地调整
|
2020-03-20 11:09:06 +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 |
|
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 |
|
sunzhenyu
|
2e0b0913d6
|
修改设计平台三维数据发布
|
2020-03-16 18:47:55 +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 |
|
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 |
|
zyy
|
93be0b7ff6
|
调整车站引导总锁在地图绘制中不显示，增加字体的默认状态
|
2020-03-06 12:18:04 +08:00 |
|
zyy
|
b2a154a3a4
|
增加车站 站台 屏蔽门批量设置功能
|
2020-03-06 12:04:00 +08:00 |
|
joylink_fanyuhong
|
e966312a03
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-06 11:31:42 +08:00 |
|
zyy
|
6d0849f5b3
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/jmapNew/utils/parser.js
|
2020-03-06 10:23:14 +08:00 |
|
zyy
|
a1f752fe59
|
调整地图绘制矩形框保存字段
|
2020-03-06 10:21:41 +08:00 |
|
joylink_fanyuhong
|
99532acc8a
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-06 10:20:51 +08:00 |
|
joylink_fanyuhong
|
9200cb99f7
|
站台增加功能按钮，未完
|
2020-03-05 18:17:47 +08:00 |
|
joylink_fanyuhong
|
c9e8827c3a
|
合并代码
|
2020-03-05 16:43:53 +08:00 |
|
joylink_fanyuhong
|
8d58125e1f
|
自动进路和引导总锁
|
2020-03-05 16:39:49 +08:00 |
|
zyy
|
30c672026f
|
增加矩形包围框
|
2020-03-05 15:48:51 +08:00 |
|
joylink_cuiweidong
|
dc12bd3f88
|
成都一号线 信号机 信号自动通过 代码调整
自动通过模式，自动触发模式 状态参数调整
|
2020-03-05 13:40:50 +08:00 |
|
zyy
|
8e7fc5104a
|
调整lc模块保存，自动折返绘图状态配置，流程完善
|
2020-03-05 12:21:28 +08:00 |
|
zyy
|
af5c108610
|
创建自动折返模块
|
2020-03-04 20:59:16 +08:00 |
|