Commit Graph

9635 Commits

Author SHA1 Message Date
ival
1eef45efe4 注释代码 2021-03-25 09:22:07 +08:00
fan
caafa7578b iscs添加设备图片 2021-03-24 15:00:45 +08:00
fan
022b946592 iscs添加背景图片 2021-03-24 14:12:35 +08:00
fan
b93daf1f8e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-24 13:50:26 +08:00
fan
6cca650a98 教学管理调整 2021-03-24 13:49:59 +08:00
ival
dd1fb890ad 修改 运行图 修改接口 2021-03-24 13:30:26 +08:00
ival
fd5716925b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-24 11:09:16 +08:00
ival
833117dc45 1.修改 运行图 接口
2.增加 iscs 资源
2021-03-24 11:09:02 +08:00
joylink_cuiweidong
213e654abc iscs 代码调整 2021-03-23 18:20:06 +08:00
joylink_cuiweidong
d62d6ba815 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/iscs/iscsSystem/stationConfig/index.vue
2021-03-23 18:19:47 +08:00
joylink_cuiweidong
6db9593a40 iscs 代码调整 2021-03-23 18:17:54 +08:00
fan
aed6392c88 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-23 17:52:42 +08:00
fan
ebb618e053 iscs自动售检票 2021-03-23 17:52:32 +08:00
joylink_cuiweidong
5c5366e46a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-23 17:52:11 +08:00
joylink_cuiweidong
9c31d4963c iscs 代码调整 2021-03-23 17:51:36 +08:00
ival
04444b2b12 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-23 17:35:50 +08:00
ival
27e938c102 修改 复制iscs图形 生成codebug的问题 2021-03-23 17:35:42 +08:00
fan
7a3677cf8f 调整感温光纤探测系统高度 2021-03-23 17:24:48 +08:00
fan
2f4cd5569a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-23 17:14:17 +08:00
joylink_cuiweidong
0796a12dd7 iscs 代码调整 2021-03-23 17:12:19 +08:00
fan
65dfe7d570 url调整 2021-03-23 17:12:18 +08:00
joylink_cuiweidong
f749aa6709 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-23 16:42:21 +08:00
joylink_cuiweidong
cbedee3c3b iscs 代码调整 2021-03-23 16:42:06 +08:00
joylink_cuiweidong
9398ccfa7c iSCS 代码调整 2021-03-23 16:41:40 +08:00
fan
c146dacecb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-23 15:55:38 +08:00
fan
7a5e1bf701 评价规则调整 2021-03-23 15:55:23 +08:00
ival
160cbaf2bf 增加 iscs 火灾 展厅和站台 背景图 2021-03-23 15:29:42 +08:00
fan
c6cfa2d816 merge 2021-03-23 11:08:11 +08:00
fan
e38b236aed 教学管理暂提 2021-03-23 11:06:14 +08:00
ival
09ec3247ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-23 10:42:01 +08:00
ival
fcc8cbf988 修改iscs 2021-03-23 10:41:47 +08:00
joylink_cuiweidong
393f3fe68a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-23 10:37:14 +08:00
joylink_cuiweidong
43e0379926 运行图编制 生成计划 界面调整 2021-03-23 10:36:56 +08:00
ival
050141025a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-22 18:40:41 +08:00
ival
a63b8e0179 增加iscs图样 2021-03-22 18:40:29 +08:00
joylink_cuiweidong
ba18a549fb 运行图编制 生成计划代码调整 2021-03-22 17:39:12 +08:00
joylink_cuiweidong
b383815100 地图绘制 交路预览 显示代码调整 2021-03-22 16:04:33 +08:00
joylink_cuiweidong
7e80c71fef 代码调整 2021-03-22 15:49:14 +08:00
joylink_cuiweidong
74c5764087 代码调整 2021-03-22 15:30:10 +08:00
joylink_cuiweidong
7ac00f45dc 运行图编制 代码调整 2021-03-22 15:12:34 +08:00
joylink_cuiweidong
42b59cc752 代码调整 2021-03-22 14:51:34 +08:00
joylink_cuiweidong
9b4309d0c1 代码调整 2021-03-22 14:38:19 +08:00
joylink_cuiweidong
2dae1bc8d8 代码调整 2021-03-22 14:30:21 +08:00
joylink_cuiweidong
26b72f9228 代码调整 2021-03-22 13:20:51 +08:00
joylink_cuiweidong
e945d654eb 代码调整 2021-03-22 13:16:07 +08:00
sunzhenyu
2ce3d41cad mergetest 2021-03-19 18:14:58 +08:00
sunzhenyu
d22f9d62de 新三维客流逻辑基本完成(未实装) 2021-03-19 18:14:21 +08:00
fan
82fe1f3dc9 权重藐视调整 2021-03-19 17:34:37 +08:00
fan
6e6e6ac31d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-19 17:20:30 +08:00
fan
f3aed3f16e 评价规则创建调整 2021-03-19 17:20:22 +08:00