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 |
|
zyy
|
0ed3d83273
|
调整表格配置
|
2020-09-22 18:45:20 +08:00 |
|
joylink_cuiweidong
|
d56e713232
|
iscs 系统代码调整
|
2020-09-22 18:45:00 +08:00 |
|
zyy
|
d93cbc4beb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 18:03:58 +08:00 |
|
zyy
|
2ef9409527
|
增加图片
|
2020-09-22 18:03:46 +08:00 |
|
joylink_cuiweidong
|
5d0f5ad4fd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 17:51:32 +08:00 |
|
joylink_cuiweidong
|
f26726055c
|
iscs 绘图代码调整
|
2020-09-22 17:51:15 +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 |
|
joylink_cuiweidong
|
1e8577cefd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 11:31:35 +08:00 |
|
joylink_cuiweidong
|
d346ec8f2e
|
iscs 系统代码调整
|
2020-09-22 11:31:18 +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 |
|
joylink_cuiweidong
|
af7b9c5545
|
iscs系统页面代码调整
|
2020-09-21 18:55:23 +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
|
893ecd7ff4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 17:39:18 +08:00 |
|
fan
|
8199d383fb
|
iscs调整
|
2020-09-21 17:39:06 +08:00 |
|
joylink_cuiweidong
|
0945448549
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 16:00:41 +08:00 |
|
joylink_cuiweidong
|
0b380b3b0f
|
福州线路iscs系统 样式调整
|
2020-09-21 16:00:24 +08:00 |
|
zyy
|
165cef3f69
|
调整文件路径
|
2020-09-21 14:23:51 +08:00 |
|
zyy
|
1636659889
|
增加综合监控配置文件
|
2020-09-21 14:11:02 +08:00 |
|
fan
|
0a33127068
|
iscs调整
|
2020-09-21 13:20:30 +08:00 |
|
fan
|
1c5f972e74
|
调整iscs
|
2020-09-21 10:26:34 +08:00 |
|
fan
|
942cbe72a1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-18 18:30:26 +08:00 |
|
fan
|
4eafbd72ea
|
iscs调整&宁波道岔取消故障失表取消动画
|
2020-09-18 18:30:14 +08:00 |
|
joylink_cuiweidong
|
41548dd32f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/displayNew/dispatherContest/index.vue
|
2020-09-18 16:05:07 +08:00 |
|
joylink_cuiweidong
|
6cad4eabdb
|
竞赛系统 剧本加载逻辑调整
|
2020-09-18 16:02:22 +08:00 |
|
fan
|
0d31203b74
|
ibp盘状态处理&时间同步
|
2020-09-18 14:42:17 +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
|
cc0803630c
|
设备跳转运行图等（未完）
|
2020-08-13 11:23:07 +08:00 |
|
fan
|
a97c1fcb74
|
iscs工作站仿真取消订阅问题调整
|
2020-08-13 09:40:40 +08:00 |
|
fan
|
066340930f
|
退出iscs工作站清理仿真
|
2020-08-13 09:22:31 +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 |
|
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 |
|
fan
|
76990e129e
|
iscs调整
|
2020-06-01 10:32:02 +08:00 |
|
fan
|
95e4f4c938
|
西安一三号线道岔失表调整&iscs调整
|
2020-05-29 16:57:21 +08:00 |
|
fan
|
f21751fcd3
|
哈尔滨title调整&理论考试缓存调整
|
2020-05-29 11:08:38 +08:00 |
|
joylink_cuiweidong
|
6886ea3190
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 13:04:21 +08:00 |
|
joylink_cuiweidong
|
a354264097
|
竞赛代码调整
|
2020-05-26 13:03:37 +08:00 |
|
fan
|
ae9cce3557
|
LCD屏控制
|
2020-05-26 11:10:37 +08:00 |
|
joylink_cuiweidong
|
3a48755817
|
竞赛裁判系统代码调整
|
2020-05-21 16:59:36 +08:00 |
|
fan
|
19bd41b214
|
调整hydIcon路径
|
2020-05-21 10:02:13 +08:00 |
|
fan
|
ea8222504e
|
添加竞赛接口
|
2020-05-20 10:02:07 +08:00 |
|
fan
|
597af25b40
|
iscs&站台故障
|
2020-05-19 18:38:58 +08:00 |
|
zyy
|
93f7210596
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 19:01:18 +08:00 |
|
zyy
|
674bcea387
|
调整综合监控
|
2020-05-15 19:01:07 +08:00 |
|
fan
|
c0d75502fa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 18:48:38 +08:00 |
|
fan
|
d47a986fcc
|
故障操作&贵州状态班级展示
|
2020-05-15 18:48:10 +08:00 |
|
zyy
|
2faa2688e5
|
综合监控广播
|
2020-05-15 18:36:31 +08:00 |
|
fan
|
b3dfe242e2
|
iscs
|
2020-05-12 14:17:47 +08:00 |
|
fan
|
68fdc7f2ec
|
问题调整
|
2020-05-11 17:40:52 +08:00 |
|
fan
|
115f1da928
|
批量生成区段逻辑始终端偏移量
|
2020-05-11 13:25:09 +08:00 |
|
joylink_zyy
|
4d16abe984
|
注释综合监控请求
|
2020-05-10 21:51:44 +08:00 |
|
joylink_zyy
|
fa70eb85ca
|
注释iscs事件
|
2020-05-10 15:58:08 +08:00 |
|
joylink_cuiweidong
|
597f5cb990
|
代码调整
|
2020-05-09 16:39:33 +08:00 |
|
zyy
|
d45a7fa39d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-09 10:24:17 +08:00 |
|
zyy
|
109c581e0e
|
调整iscs样式
|
2020-05-09 10:23:56 +08:00 |
|
fan
|
e56aa4d004
|
iscs火灾报警系统状态
|
2020-05-09 10:04:57 +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 |
|
joylink_cuiweidong
|
0200d8acf9
|
iscs 绘图代码调整
|
2020-05-08 14:17:51 +08:00 |
|
joylink_cuiweidong
|
ec0d0ccc29
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/iscs/iscsSystem/config/index.vue
|
2020-05-08 10:21:17 +08:00 |
|
joylink_cuiweidong
|
01ff826744
|
iscs 绘图调整
|
2020-05-08 10:18:47 +08:00 |
|
fan
|
dff19a4e8f
|
iscs调整
|
2020-05-07 18:48:51 +08:00 |
|
fan
|
b0e63f77ed
|
iscs调整
|
2020-05-07 18:47:13 +08:00 |
|
joylink_cuiweidong
|
2084f4cf03
|
iscs 绘图代码调整
|
2020-05-07 18:15:13 +08:00 |
|
joylink_cuiweidong
|
d2586049e3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/iscs/constant/iscsData.js
# src/views/iscs/iscsSystem/config/index.vue
|
2020-05-07 16:47:52 +08:00 |
|
fan
|
0965e291fa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-07 16:39:53 +08:00 |
|
fan
|
62d12e8ed5
|
iscs调整图元说明公共区域
|
2020-05-07 16:39:38 +08:00 |
|
joylink_cuiweidong
|
11e1c23402
|
iscs 绘图代码调整
iscs 绘图 添加虚线
iscs 绘图数据调整
|
2020-05-07 16:38:24 +08:00 |
|
joylink_cuiweidong
|
5712885f8a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-07 15:06:29 +08:00 |
|