Commit Graph

9998 Commits

Author SHA1 Message Date
ival
f1f2013b27 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-15 16:26:19 +08:00
ival
d903ce7fb7 增加区段的脱轨其设备 2021-04-15 16:26:12 +08:00
joylink_cuiweidong
d3b240989b 代码调整 2021-04-15 16:15:18 +08:00
joylink_cuiweidong
bb928cb37b 代码调整 2021-04-15 15:55:30 +08:00
joylink_cuiweidong
4050ddf937 大铁进路添加 代码调整 2021-04-15 15:53:34 +08:00
joylink_cuiweidong
bebac3b8e5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-14 17:48:55 +08:00
joylink_cuiweidong
9233b651f6 代码调整 2021-04-14 17:48:28 +08:00
sunzhenyu
2412aac899 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-14 17:35:46 +08:00
sunzhenyu
63f935616d 修改三维课程编辑器事件和图片资源部分 2021-04-14 17:35:41 +08:00
joylink_cuiweidong
8d763d00e4 运行图编制代码调整 2021-04-14 16:43:09 +08:00
joylink_cuiweidong
1a7786dd14 运行图编制 代码调整 2021-04-14 15:30:52 +08:00
joylink_cuiweidong
63855ca1ff 运行图编制代码调整 2021-04-14 15:17:34 +08:00
joylink_cuiweidong
a1342ed2b6 运行图代码调整 2021-04-14 14:36:33 +08:00
joylink_cuiweidong
448832293b 运行图代码调整 2021-04-14 14:26:00 +08:00
joylink_cuiweidong
c9985869f1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-14 13:58:33 +08:00
joylink_cuiweidong
ae263b0dc7 运行图样式调整 2021-04-14 13:57:35 +08:00
ival
86ad53cfe9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-14 13:55:30 +08:00
ival
22ddd9f722 修改代码 2021-04-14 13:55:16 +08:00
joylink_cuiweidong
eadb7a5748 大铁线路 车站绘图元素添加 2021-04-14 10:24:57 +08:00
sunzhenyu
2d767c4097 修改三维课程编辑初始界面 2021-04-14 09:22:55 +08:00
sunzhenyu
c9b7d18e43 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-14 09:13:02 +08:00
sunzhenyu
f1ab1f9819 三维课程编辑测试展示(未完成) 2021-04-14 09:12:53 +08:00
joylink_cuiweidong
6b4bdbc8fd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-13 18:24:59 +08:00
joylink_cuiweidong
ea834dc86a 大铁项目 区段状态代码调整 2021-04-13 18:24:41 +08:00
fan
8575de2bd9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-13 18:09:52 +08:00
fan
0b5cc8e15d 信号按钮调整 2021-04-13 18:09:37 +08:00
ival
821d0b28e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-13 17:37:48 +08:00
ival
693938a367 调整 打铁 道岔状态皮肤配置 2021-04-13 17:37:40 +08:00
joylink_cuiweidong
bc83661f1f 大铁线路 区段状态代码调整 2021-04-13 17:23:12 +08:00
joylink_cuiweidong
58d7f9233e 大铁 区段状态代码调整 2021-04-13 17:06:13 +08:00
ival
68cad1616a 删除无用代码 2021-04-13 15:48:01 +08:00
ival
584852038c 增加大铁仿真display
# Conflicts:
#	src/iscs_new/plugins/shapeBuilder/entry.vue
2021-04-13 15:47:49 +08:00
joylink_cuiweidong
de4691da44 代码调整 2021-04-13 15:40:35 +08:00
joylink_cuiweidong
bd5a46e9dc 代码调整 2021-04-13 15:17:09 +08:00
joylink_cuiweidong
7eb6725147 代码调整 2021-04-13 14:27:33 +08:00
fan
e239f1e8c6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-13 14:10:30 +08:00
fan
8a363c068a 大铁调整 2021-04-13 14:10:20 +08:00
joylink_cuiweidong
259ee2570a 添加帮助链接地址 2021-04-13 14:06:24 +08:00
fan
0bb06fd142 大铁调整 2021-04-13 13:52:39 +08:00
fan
34859f8f51 大铁调整 2021-04-13 13:50:24 +08:00
fan
0adef8a9c9 宁波三调整 2021-04-13 13:43:56 +08:00
sunzhenyu
3aa47086a8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-13 11:03:25 +08:00
sunzhenyu
36b203746b 修改三维沙盘特殊车站加载 2021-04-13 11:02:16 +08:00
fan
75e7c00957 地图分组管理 2021-04-13 10:15:11 +08:00
fan
22c6924db8 宁波三操作调整 2021-04-12 18:58:40 +08:00
fan
5fbe0161ac 宁波三操作调整 2021-04-12 18:55:26 +08:00
fan
cbb02621d9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-12 18:19:58 +08:00
fan
7901886d3b 宁波三操作调整 2021-04-12 18:19:52 +08:00
fan
8d5de4cc1a 地图分组管理 2021-04-12 18:09:49 +08:00
ival
dde06f834d 修改语言校验页面 2021-04-12 17:11:36 +08:00