Commit Graph

25 Commits

Author SHA1 Message Date
zyy
7992a2e11e 调整格式 2020-05-15 16:55:00 +08:00
zyy
ad6b8f8dba 调整区段流程逻辑,站台流程 2020-03-23 13:48:35 +08:00
fan
1e7fa5de77 Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
#	src/utils/baseUrl.js
2019-12-03 17:47:27 +08:00
sunzhenyu
4b3bb2c142 merge 2019-12-03 13:50:24 +08:00
zyy
5793355e20 修改道岔生成逻辑 2019-12-02 13:05:25 +08:00
zyy
babc713c2b desc: 修改区段拆分问题 2019-11-28 15:53:30 +08:00
zyy
32dbcee7d0 调整绘图宽度 2019-11-19 18:01:49 +08:00
zyy
00877ac164 修改代码 调整绘图逻辑 2019-11-19 16:39:24 +08:00
zyy
4144621be8 desc: 修改代码 2019-11-19 13:00:36 +08:00
zyy
9759950df0 desc: 增加区段实际长度 2019-11-18 15:22:16 +08:00
zyy
8d05730dc4 desc: 修改代码 2019-11-18 14:29:43 +08:00
zyy
7018b4c308 desc: 修改代码 2019-11-12 13:36:21 +08:00
zyy
db1681b54e Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-11 19:24:39 +08:00
zyy
6e29cec983 desc: 修改代码 2019-11-11 19:24:30 +08:00
joylink_cuiweidong
e8c8e491f5 skinCode调整 2019-11-11 15:54:04 +08:00
zyy
a348552d1e desc: 增加选中批量设置集中站操作 2019-11-08 18:32:39 +08:00
zyy
7a359e5f6e desc: 修改代码 2019-11-08 14:36:41 +08:00
zyy
42a5f7076a desc: 调整区段绘图逻辑优化 2019-11-07 15:20:39 +08:00
zyy
d2e99dbfd3 desc: 调整代码 2019-11-07 10:42:22 +08:00
zyy
18fb36b1b9 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/jmap/config/skinCode/fuzhou_01.js
#	src/jmap/map.js
2019-11-06 18:38:50 +08:00
zyy
9f1f02bf0e desc: 增加绘图撤销,重做 2019-11-06 18:37:32 +08:00
ival
5fc745b799 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-05 14:16:09 +08:00
ival
37fdeec4e3 修改代码 2019-11-05 14:15:55 +08:00
zyy
7ec68a75e3 desc: 删除多余文件, 调整路径配置 2019-10-31 17:30:24 +08:00
zyy
2d8547182b desc: 调整文件位置 2019-10-30 18:38:00 +08:00