Commit Graph

110 Commits

Author SHA1 Message Date
zyy
2ef9409527 增加图片 2020-09-22 18:03:46 +08:00
zyy
0a01ea04c6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-22 17:12:39 +08:00
zyy
57de1331e2 调整福州一号线综合监控配置 2020-09-22 17:12:28 +08:00
joylink_cuiweidong
f2bbefc27e iscs 三角形绘图元素添加 2020-09-22 15:25:33 +08:00
fan
8f3f722d4a sics文字矩形组合元素添加 2020-09-22 11:28:28 +08:00
fan
e4be43ad37 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-22 09:51:22 +08:00
fan
87bee8bcb5 iscs调整&去除创建会话提示 2020-09-22 09:51:01 +08:00
zyy
a620e029e0 调整绘图配置 2020-09-21 18:14:17 +08:00
zyy
212138f370 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-21 18:05:36 +08:00
zyy
dd99815868 福州一号线绘图配置 2020-09-21 18:05:25 +08:00
fan
8199d383fb iscs调整 2020-09-21 17:39:06 +08:00
zyy
165cef3f69 调整文件路径 2020-09-21 14:23:51 +08:00
zyy
1636659889 增加综合监控配置文件 2020-09-21 14:11:02 +08:00
fan
4eafbd72ea iscs调整&宁波道岔取消故障失表取消动画 2020-09-18 18:30:14 +08:00
fan
89fcb3fe2f iscs调整&ibp接口参数修改 2020-09-18 09:26:25 +08:00
fan
f7e350ca95 行调大赛理论考试&福州Iscs 2020-09-17 18:25:37 +08:00
fan
588f77173a 行调大赛理论考试&福州Iscs 2020-09-17 15:36:46 +08:00
fan
0abd0aaba5 福建综合监控 2020-09-17 09:01:22 +08:00
fan
fbda89c39e iscs调整 2020-08-12 15:19:38 +08:00
fan
30e30d5ef3 佛山线路问题调整&iscs样式调整 2020-08-12 11:02:47 +08:00
fan
8687650e41 ibp系统调整&发布地图管理调整 2020-08-11 14:34:17 +08:00
fan
86c7e44876 iscs调整 2020-06-24 15:02:09 +08:00
zyy
7f242ba443 调整综合监控绘图元素, 调整按图折返配置 2020-06-16 16:39:07 +08:00
zyy
dfdbddad2b 调整综合监控数据,调整地图绘制功能按钮显示状态逻辑判断 2020-06-16 14:45:34 +08:00
zyy
428967e843 调整地图绘制右键菜单样式,调整道岔触发居中,绘制综合监控数据 2020-06-15 16:13:28 +08:00
zyy
24acb1ba86 调整配置,增加综合监控数据 2020-06-11 14:48:40 +08:00
zyy
015dd9e113 调整综合监控数据,调整绘图 2020-06-09 17:48:08 +08:00
zyy
768c62333c 调整站台操作,增加综合监控调节 2020-06-05 18:04:27 +08:00
zyy
fbf26cfafc 调整综合监控绘图元素,保存绘图数据 2020-06-05 13:24:38 +08:00
zyy
f4fca9a083 调整策略右键弹出窗口,增加综合监控元素配置 2020-06-05 10:32:32 +08:00
zyy
5a9a837e02 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/iscs/constant/iscsData.js
#	src/utils/baseUrl.js
#	src/views/iscs/iscsDraw/iscsBasOperate/index.vue
2020-06-04 17:32:45 +08:00
zyy
9be9c9a313 增加西安 三号线设置折返策略元素 2020-06-04 17:29:18 +08:00
fan
5ad0464fcd iscs调整 2020-06-04 11:17:43 +08:00
fan
44bb0f0f29 实操竞赛调整 2020-06-03 18:17:52 +08:00
fan
f6997d3bd9 合并代码 2020-06-03 14:30:14 +08:00
fan
8bf9f77e0b 西安三号线控制权调整&iscs调整 2020-06-03 14:27:54 +08:00
zyy
631fba04bb 调整道岔佛山线路显示, 综合监控元素添加 2020-06-03 10:12:36 +08:00
zyy
ad3694c7f5 调整综合监控模型,调整信号机自动触发显示,综合监控数据保存 2020-06-02 18:05:35 +08:00
zyy
a1978bd266 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/iscs/iscsDraw/iscsCommonElem/button.vue
2020-06-02 16:17:53 +08:00
zyy
de49bba2ad 调整信号机流程 综合监控操作 2020-06-02 16:17:00 +08:00
fan
e473199e24 iscs调整 2020-06-02 16:12:34 +08:00
fan
d93e40ab48 iscs调整 2020-06-01 18:33:17 +08:00
joylink_cuiweidong
a354264097 竞赛代码调整 2020-05-26 13:03:37 +08:00
joylink_cuiweidong
597f5cb990 代码调整 2020-05-09 16:39:33 +08:00
fan
cd57807d1f iscs状态表调整 2020-05-09 09:26:19 +08:00
fan
f6b6dd2f46 iscs状态表调整 2020-05-09 09:15:13 +08:00
joylink_cuiweidong
107cc4b73b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-08 18:37:56 +08:00
joylink_cuiweidong
76fd09cf08 iscs 绘图代码调整
新版地图 交路绘图代码调整
2020-05-08 18:37:00 +08:00
fan
d7da333e07 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-08 17:20:52 +08:00
fan
d524dc9d4d iscs调整 2020-05-08 17:20:43 +08:00