joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
12,024 Commits 20 Branches 0 Tags 448 MiB
2892517d36
Commit Graph

440 Commits

Author SHA1 Message Date
ival
ba51c50417 修改代码 2021-03-25 14:10:18 +08:00
ival
988f879d46 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/iscs/iscsDraw/icscComponents/picture.vue
 2021-03-25 13:20:26 +08:00
ival
85f73964d3 调整iscs站厅子图顺序 2021-03-25 13:19:28 +08:00
fan
0d57d977a1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-25 13:07:34 +08:00
ival
ee7453d5cd 修改 站厅子图列表 2021-03-25 13:08:03 +08:00
fan
5106ae8d14 meger 2021-03-25 13:07:02 +08:00
fan
1c85c5a502 教学管理调整 2021-03-25 13:03:12 +08:00
ival
1ba979c02c 增加 iscs站厅资源 2021-03-25 11:31:31 +08:00
fan
caafa7578b iscs添加设备图片 2021-03-24 15:00:45 +08:00
fan
022b946592 iscs添加背景图片 2021-03-24 14:12:35 +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
joylink_cuiweidong
0796a12dd7 iscs 代码调整 2021-03-23 17:12:19 +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
ival
fcc8cbf988 修改iscs 2021-03-23 10:41:47 +08:00
ival
a63b8e0179 增加iscs图样 2021-03-22 18:40:29 +08:00
ival
12f6bae8e5 解决冲突 2021-03-19 10:52:57 +08:00
ival
1b2abcffb3 Merge branch 'test-ival' into test 
# Conflicts:
#	src/permission.js
#	src/views/demo/index.vue
#	src/views/newMap/displayNew/demoTraining/index.vue
#	src/views/newMap/displayNew/lesson/index.vue
 2021-03-19 10:15:43 +08:00
ival
d03315f8fd 重构运行图解析代码逻辑 2021-03-19 10:10:51 +08:00
ival
e183f40611 提交代码 2021-03-17 13:35:15 +08:00
fan
b620e0f3a3 iscs报错修改 2021-03-11 10:58:03 +08:00
fan
e94ffd235a 故障模式快捷键&ISCS返回（退出）调整 2021-01-06 18:17:40 +08:00
joylink_cuiweidong
ca74569775 iscs 代码调整 
运行图 编制 输入服务号 限制为数字类型
 2020-12-30 16:09:51 +08:00
lVAL
79779e2a86 优化代码报错，以及修改保存iscs的数据的lineCode为mapId 2020-12-30 13:25:20 +08:00
lVAL
75fccbbd01 修改 iscs 数据获取来源 2020-12-30 10:47:25 +08:00
lVAL
a5a1a9f63e 调整iscs 修改lineCode 为 mapId 2020-12-30 10:09:05 +08:00
joylink_cuiweidong
575895afe1 ISCS 代码调整 2020-12-29 15:53:20 +08:00
fan
8028103feb 综合演练行调添加ISCS&ISCS列车时刻表&ISCS信号系统 2020-12-28 11:20:36 +08:00
joylink_cuiweidong
f9bac6886a 删除暂时无用代码 2020-11-30 10:23:32 +08:00
zyy
9ba73cbb77 调整哈尔滨综合监控数据 2020-11-24 17:35:14 +08:00
zyy
c6b03fa4ee 增加列车托管、连挂流程 2020-11-09 18:24:57 +08:00
zyy
04d73495b7 调整综合监控关联关系 2020-11-04 16:32:19 +08:00
zyy
109511d02b 调整报警窗口样式逻辑 2020-11-04 10:14:54 +08:00
zyy
6684ffd729 调整综合监控故障流程显示 2020-11-03 18:48:02 +08:00
zyy
85fee71570 删除打印 2020-11-03 13:54:26 +08:00
zyy
5c6ce655d6 增加了报警声音 2020-11-03 13:21:56 +08:00
zyy
333c8b2c86 调整福州综合监控故障设置 2020-11-03 10:30:26 +08:00
zyy
081f5a6566 调整综合监控问题 2020-10-28 11:09:12 +08:00
zyy
2babec750f 调整综合监控故障流程 2020-10-28 09:18:46 +08:00
zyy
ed32515215 调整综合监控流程 2020-10-26 16:03:06 +08:00
zyy
cdf91f98d2 调整综合监控流程 2020-10-26 15:24:08 +08:00
fan
7e91cb2b3c 删除旧版地图drawWay参数使用 2020-10-26 11:07:49 +08:00
zyy
c3d3adbc3e 调整福州综合监控逻辑 2020-10-23 15:09:20 +08:00
zyy
8053b51e24 增加iscs事件弹窗 2020-10-22 13:03:26 +08:00
zyy
a5d3b9b008 调整综合监控流程 2020-10-16 11:07:44 +08:00
zyy
26b0b146de 调整页面逻辑 2020-10-15 17:06:55 +08:00
zyy
c000d35911 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-15 17:02:46 +08:00
zyy
83f696cb25 调整综合监控页面展示 2020-10-15 17:02:34 +08:00
joylink_cuiweidong
cd55c5b269 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-15 15:39:50 +08:00
joylink_cuiweidong
45932bb10a 代码调整 2020-10-15 15:39:33 +08:00
zyy
114516abb8 调整综合监控 2020-10-15 15:28:23 +08:00
zyy
78dd2f3d26 调整综合监控开关状态 2020-10-15 10:30:30 +08:00
zyy
3770b4a153 保存状态 2020-10-15 09:38:36 +08:00
zyy
f28262bb72 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-14 19:10:10 +08:00
zyy
4b9a98c35a 调整综合监控流程 2020-10-14 19:09:53 +08:00
joylink_cuiweidong
f91dd07cab 竞赛 场景代码调整 2020-10-14 18:10:32 +08:00
joylink_cuiweidong
a5025eda1c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 18:42:18 +08:00
joylink_cuiweidong
cafa638438 竞赛代码调整 2020-10-13 18:41:55 +08:00
lVAL
7f4f0d661f 修改代码 2020-10-13 18:38:43 +08:00
lVAL
9bcb18baae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 18:36:03 +08:00
lVAL
a042147faf 增加group组功能 2020-10-13 18:35:50 +08:00
zyy
e625f4ddb7 增加编组元素列表 2020-10-13 18:31:34 +08:00
zyy
e2518c3eef Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 16:19:22 +08:00
zyy
eb87177bae 调整编组内容数字跟着变化 2020-10-13 16:19:13 +08:00
lVAL
d07db0e516 增加 card页面 2020-10-13 15:38:07 +08:00
zyy
4c00f1f2bd 调整综合监控绘图流程 2020-10-13 14:55:42 +08:00
lVAL
d62f17b3d8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 14:09:00 +08:00
lVAL
0feea5cb1a 增加绘图实例此操作界面 2020-10-13 14:08:47 +08:00
zyy
8ad2b2b3a3 调整综合监控字典及图片展示 2020-10-13 14:01:24 +08:00
joylink_cuiweidong
512973eb3a 剧本 添加 仿真角色 2020-10-13 13:06:17 +08:00
joylink_cuiweidong
24d93e9c64 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/iscs/shape/stateTable.js
 2020-10-12 18:35:00 +08:00
joylink_cuiweidong
63824fb35f 福州一号线 iscs 页面代码调整 2020-10-12 18:33:15 +08:00
lVAL
43b837c7d4 添加风扇机 2020-10-12 17:55:28 +08:00
zyy
e336410a58 调整图片 2020-10-12 16:45:24 +08:00
lVAL
24252fc5ff 添加活塞风井 2020-10-12 15:00:16 +08:00
lVAL
fae5fd0332 修改冲突 2020-10-12 14:33:22 +08:00
lVAL
dcd0c86998 修改代码-冲突 2020-10-12 14:32:30 +08:00
lVAL
d141ec87ed Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/iscs/shape/picture.js
#	src/views/iscs/iscsDraw/icscComponents/picture.vue
 2020-10-12 14:30:12 +08:00
lVAL
68f6cb5841 增加图片 2020-10-12 14:28:25 +08:00
zyy
b3af89582d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/iscs/shape/picture.js
#	src/views/iscs/iscsDraw/icscComponents/picture.vue
 2020-10-12 13:05:57 +08:00
zyy
d27266ab7a 调整线段画法 2020-10-12 13:04:13 +08:00
lVAL
b3ba6a0d73 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 12:20:24 +08:00
lVAL
5893c6a2c1 增加图片 2020-10-12 12:20:07 +08:00
zyy
d05cb2e3bd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/iscs/iscsSystem/stationConfig/index.vue
 2020-10-12 09:27:53 +08:00
zyy
19bf12c627 调整页面 2020-10-12 09:26:14 +08:00