Commit Graph

218 Commits

Author SHA1 Message Date
zyy
0330e08f89 调整车站状态显示,调整右键菜单显示,设置默认状态 2020-01-07 09:23:04 +08:00
zyy
3d8fcd305a 调整宁波一号线右键菜单流程 2020-01-06 14:42:28 +08:00
zyy
308f82c14e 提交请求进路接口 2020-01-03 15:52:51 +08:00
zyy
c13963f793 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-03 15:50:32 +08:00
zyy
4f2fb97477 调整宁波线右键菜单显示 2020-01-03 15:50:26 +08:00
fan
e022b00a00 项目设备综合演练调整 2020-01-03 11:18:18 +08:00
zyy
496a00c8fe 调整道岔区段坐标点bug 2020-01-02 14:30:03 +08:00
fan
24ef3fd71d 添加贵州装备制造职业学院项目 2019-12-30 18:06:40 +08:00
zyy
ce44ec4429 调整宁波线 样式,显示宁波线右键操作 2019-12-30 13:24:40 +08:00
fan
c7078dcdb9 新版地图包加载仿真 2019-12-30 09:00:16 +08:00
zyy
6e3424e355 调整实训平台新旧地图显示逻辑 2019-12-26 11:01:54 +08:00
zyy
74f0b12e3c 修改运行图显示,调整进路列表展示 2019-12-25 18:45:48 +08:00
zyy
bfe6c5a537 调整线路配置项流程,对接字段 2019-12-20 14:02:11 +08:00
zyy
6a82d745d9 调整高级数据生成code规范 2019-12-20 13:48:37 +08:00
fan
143f35a222 进路物理区段列表连续高亮 2019-12-19 16:21:00 +08:00
fan
fbbee9324a 延续保护预览 2019-12-19 14:05:16 +08:00
fan
05a4ca76dc Merge remote-tracking branch 'origin/dev' into test 2019-12-19 10:13:55 +08:00
zyy
c295f97819 调整车站显示坐标,信号机批量操作,调整逻辑代码 2019-12-18 16:20:30 +08:00
fan
7cf546efe6 参数调整 2019-12-18 13:05:29 +08:00
zyy
97dc97d8db Merge branch 'dev' into test 2019-12-18 10:14:33 +08:00
zyy
399093bc72 调整站台计算坐标 2019-12-18 09:49:44 +08:00
sunzhenyu
a9a62b924f 添加继电器界面动画,修改继电器显示模式 2019-12-13 09:14:28 +08:00
zyy
b2dd3d7285 调整站台生成逻辑,调整uid检测方式 2019-12-11 17:07:29 +08:00
zyy
9e50f2eacf Merge branch 'dev' into test 2019-12-11 09:08:28 +08:00
fan
6afb5f35a8 高级延续保护调整 2019-12-10 16:50:38 +08:00
joylink_cuiweidong
a15cb8d43c 获取发布地图接口修改(添加drawWay参数) 2019-12-09 17:38:08 +08:00
zyy
2bac1022b4 修改生成规则,调整新版地图右键操作 2019-12-09 10:50:21 +08:00
fan
e281045268 Merge remote-tracking branch 'origin/dev' into test 2019-12-06 18:11:05 +08:00
zyy
dc381e2a63 desc: 新增屏蔽门绘制以及紧急停车按钮生成流程 2019-12-06 18:03:13 +08:00
zyy
824b4ca414 修改命名规则 2019-12-06 13:03:45 +08:00
sunzhenyu
70c0e78179 baseurl 2019-12-03 13:51:50 +08:00
zyy
d0a986e8bf 新版地图保存 2019-12-02 14:09:50 +08:00
zyy
5793355e20 修改道岔生成逻辑 2019-12-02 13:05:25 +08:00
joylink_cuiweidong
8de6fa219a Merge remote-tracking branch 'remotes/origin/dev' into test 2019-11-28 09:33:12 +08:00
lVAL
5852ca6ebf 修改代码 2019-11-26 09:44:37 +08:00
joylink_cuiweidong
5d7739c947 Merge remote-tracking branch 'remotes/origin/dev' into test 2019-11-26 09:23:29 +08:00
joylink_cuiweidong
c3642d67eb 代码调整 2019-11-26 09:21:26 +08:00
lVAL
aee030f01d Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
#	src/router/index.js
#	src/scripts/plugin/MenuContextHandler.js
2019-11-25 18:25:17 +08:00
zyy
1d82ce738f desc: 修改考试规则定义,调整更新商品更新样式 2019-11-25 10:44:48 +08:00
zyy
0880801c1f desc: 增加检测地图名称唯一性 2019-11-22 16:50:30 +08:00
1165524548 修改测试打包环境和websocket日志 2019-11-22 02:11:24 +08:00
zyy
fa3d0cb099 desc: 调整代码书写逻辑 2019-11-20 16:31:41 +08:00
zyy
00877ac164 修改代码 调整绘图逻辑 2019-11-19 16:39:24 +08:00
ival
ed7acb5abe 修改目录大小写 2019-11-19 13:11:52 +08:00
zyy
4144621be8 desc: 修改代码 2019-11-19 13:00:36 +08:00
ival
5a4f6f5999 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-18 14:44:13 +08:00
ival
50e9a242e7 修改代码 2019-11-18 14:44:01 +08:00
zyy
7938876d85 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/scripts/GlobalPlugin.js
2019-11-18 14:30:25 +08:00
zyy
8d05730dc4 desc: 修改代码 2019-11-18 14:29:43 +08:00
ival
cb8e55e546 修改代码 2019-11-15 16:36:23 +08:00