Commit Graph

405 Commits

Author SHA1 Message Date
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
joylink_cuiweidong
4357b5dac2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-10 19:28:33 +08:00
joylink_cuiweidong
ae55d28a38 场景编辑代码调整 2020-10-10 19:28:15 +08:00
lVAL
a8c7e81890 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-10 18:40:19 +08:00
lVAL
5167486c74 增加图片资源,增加图片旋转功能 2020-10-10 18:39:56 +08:00
joylink_cuiweidong
c70af998d7 福州一号线 iscs 页面代码调整 2020-10-10 15:37:45 +08:00
joylink_cuiweidong
20be6012d8 福州一号线 iscs 界面代码调整 2020-10-10 15:03:05 +08:00
lVAL
b50f950b80 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-10 14:03:37 +08:00
lVAL
a3f19c2c46 修改代码 2020-10-10 14:03:21 +08:00
joylink_cuiweidong
d77563e17a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-10 13:17:34 +08:00
joylink_cuiweidong
48bc783755 福州线 iscs 界面代码调整 2020-10-10 13:17:16 +08:00
lVAL
22b48e7e78 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-10 09:38:14 +08:00
lVAL
3ac15df91e 修改table的绘制表格的问题 2020-10-10 09:37:58 +08:00
joylink_cuiweidong
cbdd8eb810 竞赛平台 运营统计数据提交代码调整 2020-10-09 19:46:54 +08:00
lVAL
dbdb3f7e51 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-09 13:16:49 +08:00
lVAL
d40821f404 增加部分图层 2020-10-09 13:16:34 +08:00
joylink_cuiweidong
03a3dd8b4e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-09 10:58:09 +08:00
joylink_cuiweidong
fa4ada05e4 场景编辑代码调整 2020-10-09 10:57:52 +08:00
lVAL
96d77eb652 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-09 10:25:32 +08:00
lVAL
c53219ea25 编排 iscs系统下 “环境与设备监控系统” 的菜单 2020-10-09 10:25:11 +08:00
joylink_cuiweidong
9c8af370fa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 18:17:33 +08:00
joylink_cuiweidong
9885c50891 竞赛 场景代码调整 2020-09-30 18:16:08 +08:00
lVAL
3e623fe0a2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 17:18:15 +08:00
lVAL
15a08feef8 补充优化键盘事件处理bug 2020-09-30 17:18:01 +08:00
joylink_cuiweidong
6a0fbe5dc5 福州一号线 iscs 系统代码调整 2020-09-30 16:57:38 +08:00
lVAL
d5c9706311 增加绘制园以及修改圆的最小半径值 2020-09-28 13:15:54 +08:00
lVAL
0e47dfcff1 适配图片APF 2020-09-27 16:12:25 +08:00
zyy
118f95efc4 调整ibp 触摸板 2020-09-27 13:41:25 +08:00
zyy
4362038f13 调整综合监控元素绘制 2020-09-25 16:07:53 +08:00
joylink_cuiweidong
7753f831f1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-23 18:44:24 +08:00
joylink_cuiweidong
d67aa6804f 竞赛 理论考试 代码调整 2020-09-23 18:44:00 +08:00
zyy
5109f7b558 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-23 10:38:35 +08:00
zyy
21f5208c21 调整综合监控 2020-09-23 10:38:22 +08:00
joylink_cuiweidong
dc8ae0bbfe iscs 绘图调整 2020-09-23 10:22:52 +08:00
joylink_cuiweidong
1faf2cbf91 代码调整 2020-09-22 18:47:34 +08:00
joylink_cuiweidong
465391b20e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-22 18:46:12 +08:00