Commit Graph

217 Commits

Author SHA1 Message Date
joylink_cuiweidong
23d760d1a9 哈尔滨项目 右下角退出操作 代码调整 2021-06-16 16:06:30 +08:00
joylink_cuiweidong
7ef86d0517 代码调整 2021-04-22 10:52:48 +08:00
fan
9a84b61e5a ISCS调整 2021-04-06 17:48:33 +08:00
ival
a215004143 修改代码 2021-04-06 16:01:14 +08:00
joylink_cuiweidong
770bdff791 代码调整 2021-03-30 09:59:51 +08:00
joylink_cuiweidong
09b2923126 iscs 代码调整 2021-03-30 09:57:05 +08:00
joylink_cuiweidong
7521b8f2db iscs 代码调整 2021-03-29 17:33:31 +08:00
joylink_cuiweidong
ea85ed29ae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-26 16:09:44 +08:00
ival
6f0eca2503 修改 iscs加载的问题 2021-03-26 16:08:39 +08:00
joylink_cuiweidong
ce79c12b7d 代码调整 2021-03-26 16:08:21 +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
fan
7a3677cf8f 调整感温光纤探测系统高度 2021-03-23 17:24:48 +08:00
joylink_cuiweidong
0796a12dd7 iscs 代码调整 2021-03-23 17:12:19 +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
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
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