sunzhenyu
|
ffb90ccdfd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-08 18:06:41 +08:00 |
|
sunzhenyu
|
eed9189d7a
|
继电器逻辑修改
|
2020-05-08 18:06:33 +08:00 |
|
fan
|
5eeac156db
|
添加批量设置关联站台区段所属车站
|
2020-05-08 17:39:38 +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 |
|
zyy
|
cae74ae6ff
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-08 16:12:20 +08:00 |
|
zyy
|
1e7e17c709
|
调整西安一号线行调右键操作
|
2020-05-08 16:12:03 +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
|
e8820f82c4
|
iscs 绘图数据调整
|
2020-05-07 16:54:49 +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 |
|
zyy
|
d5740a991f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-07 16:14:55 +08:00 |
|
zyy
|
85324dee05
|
调整西安一号线信号机操作
|
2020-05-07 16:14:39 +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 |
|
joylink_cuiweidong
|
842f8f44f8
|
iscs 机电 传感器 页面布局调整
|
2020-05-07 15:06:13 +08:00 |
|
fan
|
5bd0c97238
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-07 13:49:23 +08:00 |
|
fan
|
0f81decc2c
|
iscs调整
|
2020-05-07 13:49:03 +08:00 |
|
zyy
|
5e0d2e5cb3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-07 13:35:39 +08:00 |
|
zyy
|
1c12b88d6d
|
调整大屏预览显示过滤
|
2020-05-07 13:35:25 +08:00 |
|
joylink_cuiweidong
|
260bc0a69e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-07 11:21:16 +08:00 |
|
joylink_cuiweidong
|
135e9bddb7
|
iscs 机电传感器页面布局
|
2020-05-07 11:20:52 +08:00 |
|
fan
|
06a0eaf285
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-07 10:16:41 +08:00 |
|
fan
|
ed3f1cee82
|
iscs调整&新版考试实训类型匹配
|
2020-05-07 10:16:15 +08:00 |
|
joylink_cuiweidong
|
a2470debf2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-07 09:42:44 +08:00 |
|
joylink_cuiweidong
|
ea138e7f3c
|
iscs系统 添加机电下的菜单
|
2020-05-07 09:42:26 +08:00 |
|
zyy
|
4b53a2a1c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-07 09:04:41 +08:00 |
|
zyy
|
ca4a4689fc
|
调整大屏偏移
|
2020-05-07 09:04:28 +08:00 |
|
fan
|
30e794ddb8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-07 09:03:27 +08:00 |
|
fan
|
81c6b76485
|
大屏调整
|
2020-05-07 09:03:10 +08:00 |
|
joylink_cuiweidong
|
bc9cd67681
|
代码调整
|
2020-05-06 18:29:08 +08:00 |
|
fan
|
faa2b72003
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-06 17:18:16 +08:00 |
|
fan
|
997b962851
|
大屏禁用拖拽
|
2020-05-06 17:18:06 +08:00 |
|
fan
|
15d88d2f7f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-06 16:57:18 +08:00 |
|
fan
|
22fffd340f
|
大屏测试
|
2020-05-06 16:57:07 +08:00 |
|
joylink_cuiweidong
|
de1a37f199
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-06 16:56:56 +08:00 |
|
joylink_cuiweidong
|
4a32fddddb
|
绘图 交路代码调整
iscs 系统代码调整
考试保存规则代码调整
|
2020-05-06 16:56:30 +08:00 |
|
zyy
|
515880d1c9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-06 13:11:52 +08:00 |
|
zyy
|
adf2627fec
|
调整西安二号线鼠标移入
|
2020-05-06 13:11:37 +08:00 |
|
joylink_cuiweidong
|
b15bae51cf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 18:48:27 +08:00 |
|
joylink_cuiweidong
|
fbd0baba41
|
代码调整
|
2020-04-30 18:48:07 +08:00 |
|
fan
|
ddd707c38a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 18:25:32 +08:00 |
|
fan
|
6eb648199e
|
西安二信号机操作问题修改
|
2020-04-30 18:25:21 +08:00 |
|
sunzhenyu
|
3f429baad2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 18:19:44 +08:00 |
|