Commit Graph

214 Commits

Author SHA1 Message Date
zyy
7b6148919c 调整综合监控默认进入第一个界面 2020-07-09 18:52:13 +08:00
fan
de617cde50 设备登录调整&试卷管理调整 2020-07-08 10:31:33 +08:00
fan
086e56c1a7 设备登录调整 2020-07-07 19:00:48 +08:00
fan
a543aa79d1 设备登录调整 2020-07-07 17:45:26 +08:00
fan
86c7e44876 iscs调整 2020-06-24 15:02:09 +08:00
fan
9a620f8629 西安三道岔设置故障&iscs调整(未完) 2020-06-24 13:27:58 +08:00
zyy
b530818a7e 调整综合检控 cctv 流程 2020-06-17 10:29:56 +08:00
zyy
17158401de 调整综合监控导航栏 2020-06-17 09:16:03 +08:00
zyy
73338a7eaa 增加宁波线路车站折返逻辑 2020-06-16 17:49:55 +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
a166d492f1 调整字段名称,删除注释 2020-06-12 17:16:08 +08:00
zyy
5a01bbfbcf 调整综合监控加载数据流程 2020-06-12 17:12:13 +08:00
zyy
64a7e0e1ab 调整综合监控元素点击事件, 调整右键菜单样式 2020-06-12 15:34:53 +08:00
fan
0f1ae1e8a8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-11 17:06:49 +08:00
fan
fb570eb522 sics调整 2020-06-11 17:06:37 +08:00
zyy
ffd5fc79bd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-11 14:48:54 +08:00
zyy
24acb1ba86 调整配置,增加综合监控数据 2020-06-11 14:48:40 +08:00
fan
7d7583a7e2 时间表管理&添加通用配置项 2020-06-11 11:26:41 +08:00
fan
139066d66f 综合演练非管理员同步计时&综合演练切大屏&iscs机电时间表管理 2020-06-10 16:56:52 +08:00
fan
1d56ae8249 合并代码 2020-06-09 18:33:17 +08:00
fan
fa8c31b2d4 iscs 照明系统模式表&时间表 2020-06-09 18:31:21 +08:00
zyy
015dd9e113 调整综合监控数据,调整绘图 2020-06-09 17:48:08 +08:00
fan
4b67f81cf0 iscs 小系统模式表 2020-06-09 14:39:32 +08:00
fan
de2defc461 iscs 小系统模式表&交互 2020-06-08 18:40:48 +08:00
fan
1170ed5f0c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-05 18:59:42 +08:00
fan
fc0772a11c iscs调整&站后折返显示调整 2020-06-05 18:59:35 +08:00
zyy
768c62333c 调整站台操作,增加综合监控调节 2020-06-05 18:04:27 +08:00
zyy
465da976d8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-05 14:52:20 +08:00
fan
7d8a8f8fb6 实操竞赛计时调整&iscs调整 2020-06-05 14:46:37 +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
4f4be3b33a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/iscs/constant/iscsData.js
2020-06-02 18:11:52 +08:00
zyy
ad3694c7f5 调整综合监控模型,调整信号机自动触发显示,综合监控数据保存 2020-06-02 18:05:35 +08:00
fan
c1d88ab3e9 iscs调整&列车调整 2020-06-02 17:50:56 +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
013596a502 iscs调整 2020-06-02 10:21:33 +08:00
fan
e72538f66b 合并代码 2020-06-01 18:35:01 +08:00
fan
d93e40ab48 iscs调整 2020-06-01 18:33:17 +08:00
zyy
dfe10ea585 增加综合监控绘图 复制粘贴 元素功能 2020-06-01 18:21:36 +08:00