Commit Graph

2209 Commits

Author SHA1 Message Date
joylink_cuiweidong
b4bfdd55b2 站台代码调整 2019-12-02 13:57:25 +08:00
fan
4da5ce2e52 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-02 13:50:22 +08:00
fan
3d192fe447 调整绘图区段关联关系校验 2019-12-02 13:50:13 +08:00
joylink_cuiweidong
ae3258203e 代码调整 2019-12-02 13:17:41 +08:00
zyy
829d1b7e0c Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/section.vue
2019-12-02 13:09:09 +08:00
zyy
5793355e20 修改道岔生成逻辑 2019-12-02 13:05:25 +08:00
fan
438e633ec4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-02 13:01:36 +08:00
fan
a3936c0e5b 调整绘图相关 2019-12-02 13:01:26 +08:00
joylink_cuiweidong
4b7683248c 代码调整 2019-12-02 11:12:45 +08:00
joylink_cuiweidong
52816d6397 删除link相关字段 2019-12-02 09:49:44 +08:00
fan
e8cfe647b5 调整区段关联关系 2019-11-29 18:49:16 +08:00
fan
35fceeec08 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-11-29 18:33:09 +08:00
fan
0afb9666fc 添加区段关联关系 2019-11-29 18:32:34 +08:00
joylink_cuiweidong
9a6647f256 新建区段代码调整 2019-11-29 18:16:21 +08:00
joylink_cuiweidong
c203ede054 区段添加代码调整 2019-11-29 18:06:47 +08:00
zyy
103e8c9c49 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-11-29 17:53:12 +08:00
zyy
fb17f2eb61 desc: 修改区段创建 2019-11-29 17:53:01 +08:00
joylink_cuiweidong
d0f9bd4d65 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-11-29 17:47:00 +08:00
joylink_cuiweidong
8bc69347e7 实训平台创建试卷代码调整 2019-11-29 17:46:14 +08:00
fan
15eed0ddf1 删除 2019-11-29 17:01:51 +08:00
fan
476615957f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-11-29 17:00:31 +08:00
fan
16fc5d7aa3 区段调整 2019-11-29 17:00:06 +08:00
zyy
44046f8776 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-11-29 16:32:30 +08:00
zyy
0f9ce4c521 desc: 修改权限 2019-11-29 16:32:24 +08:00
joylink_cuiweidong
1e9ac72960 代码调整 2019-11-29 13:37:26 +08:00
joylink_cuiweidong
46713bf074 删除页面link设置 2019-11-29 13:27:17 +08:00
joylink_cuiweidong
34272d7644 新版地图绘制调整 2019-11-29 13:10:18 +08:00
zyy
11b327984e 新增新版地图绘制文件 2019-11-29 12:51:58 +08:00
joylink_cuiweidong
e9f0364b7e 案例展示调整 2019-11-28 12:42:33 +08:00
joylink_cuiweidong
f410a7be67 代码调整 2019-11-28 11:27:37 +08:00
joylink_cuiweidong
73b321a812 添加案例展示 2019-11-28 09:32:02 +08:00
joylink_cuiweidong
a4b1d35711 代码调整 2019-11-27 17:48:35 +08:00
joylink_cuiweidong
0a216685c2 添加案例展示 2019-11-27 13:43:08 +08:00
lVAL
e66ddd1b84 修改代码 2019-11-26 10:01:55 +08:00
lVAL
58e11bf90a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-11-26 09:44:47 +08:00
lVAL
5852ca6ebf 修改代码 2019-11-26 09:44:37 +08:00
joylink_cuiweidong
c3642d67eb 代码调整 2019-11-26 09:21:26 +08:00
lVAL
fc2d35404b Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-11-25 19:01:39 +08:00
lVAL
3a190f8fbf 修改 2019-11-25 19:01:31 +08:00
fan
c4079984d0 代码调整 2019-11-25 18:58:39 +08:00
lVAL
9eea637a70 修改 2019-11-25 18:57:17 +08:00
lVAL
899f4a4216 修改跳转bug 2019-11-25 18:21:56 +08:00
lVAL
a5bb60cf68 删除跳转页面中无用的subSystem参数 2019-11-25 18:12:34 +08:00
joylink_cuiweidong
f04eb49964 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-11-25 15:57:23 +08:00
joylink_cuiweidong
84ad30ee6d 登陆问题调整 2019-11-25 15:57:11 +08:00
zyy
1317b182c5 调整权限生成延迟问题 2019-11-25 11:19:52 +08:00
zyy
93094cf623 desc: 屏蔽获取不到list 报错问题 2019-11-25 11:01:57 +08:00
zyy
811e919236 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-11-25 10:44:55 +08:00
zyy
1d82ce738f desc: 修改考试规则定义,调整更新商品更新样式 2019-11-25 10:44:48 +08:00
joylink_cuiweidong
e9009c0198 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-11-25 10:31:14 +08:00