zyy
|
27436f8582
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-02 14:50:54 +08:00 |
|
zyy
|
999357c520
|
desc: 修改接口
|
2019-12-02 14:50:48 +08:00 |
|
fan
|
aee552cb43
|
调整保存绘图数据调整入参
|
2019-12-02 14:41:39 +08:00 |
|
fan
|
10036210b7
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-02 14:12:19 +08:00 |
|
fan
|
2a851dc51f
|
关联关系select添加可清除功能
|
2019-12-02 14:12:10 +08:00 |
|
zyy
|
949b265e6b
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-02 14:09:57 +08:00 |
|
zyy
|
d0a986e8bf
|
新版地图保存
|
2019-12-02 14:09:50 +08:00 |
|
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
|
2ade297572
|
实训平台创建试卷考试时间代码调整
|
2019-11-29 17:50:28 +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
|
adbb7c3d8d
|
Merge branch 'master' of https://git.code.tencent.com/lian-cbtc/jl-client
|
2019-11-28 18:45:47 +08:00 |
|
joylink_cuiweidong
|
0f5c3bc2e0
|
自动登录调整
|
2019-11-28 18:45:37 +08:00 |
|
joylink_cuiweidong
|
639f377be8
|
登陆问题修改
(cherry picked from commit d51a060)
|
2019-11-28 18:34:56 +08:00 |
|
joylink_cuiweidong
|
a77d9d0781
|
代码调整
|
2019-11-28 18:10:44 +08:00 |
|
joylink_cuiweidong
|
6f718903c0
|
案例展示调整
|
2019-11-28 17:47:12 +08:00 |
|
zyy
|
1b05046554
|
Merge branch 'master' of https://git.code.tencent.com/lian-cbtc/jl-client
|
2019-11-28 15:53:44 +08:00 |
|
zyy
|
babc713c2b
|
desc: 修改区段拆分问题
|
2019-11-28 15:53:30 +08:00 |
|
joylink_cuiweidong
|
262c4ba91f
|
案例信息添加
|
2019-11-28 15:49:13 +08:00 |
|
joylink_cuiweidong
|
9edbec9d62
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-28 12:44:18 +08:00 |
|
joylink_cuiweidong
|
e9f0364b7e
|
案例展示调整
|
2019-11-28 12:42:33 +08:00 |
|
joylink_cuiweidong
|
b62b6f6448
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-28 11:29:02 +08:00 |
|
joylink_cuiweidong
|
f410a7be67
|
代码调整
|
2019-11-28 11:27:37 +08:00 |
|
joylink_cuiweidong
|
8de6fa219a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-28 09:33:12 +08:00 |
|
joylink_cuiweidong
|
73b321a812
|
添加案例展示
|
2019-11-28 09:32:02 +08:00 |
|