Commit Graph

2225 Commits

Author SHA1 Message Date
fan
5ca78f0ba7 调整绘图相关-(信号机调整,草稿地图列表接口调整) 2019-12-03 13:36:02 +08:00
fan
342bb86585 调整绘图相关-(信号机设备集中站非必填) 2019-12-03 09:30:40 +08:00
fan
39edfbe760 调整绘图相关配置 2019-12-03 09:26:55 +08:00
fan
aef74d32da 调整绘图相关 2019-12-03 09:24:44 +08:00
fan
97af268212 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-02 16:21:40 +08:00
fan
52142977f2 调整保存绘图数据调整入参 2019-12-02 16:21:27 +08:00
joylink_cuiweidong
cee4a7a396 代码调整 2019-12-02 16:19:40 +08:00
joylink_cuiweidong
5aaea642df 代码调整 2019-12-02 15:33:08 +08:00
joylink_cuiweidong
40cb954be4 控制模式代码调整 2019-12-02 15:25:26 +08:00
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
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