fan
|
1601b655d1
|
地图数据维护中提示调整
|
2020-05-09 20:24:59 +08:00 |
|
joylink_cuiweidong
|
5b0d16c920
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-09 20:21:43 +08:00 |
|
joylink_cuiweidong
|
b5a3a195f7
|
代码调整
|
2020-05-09 20:21:20 +08:00 |
|
zyy
|
3212b4362b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-09 20:13:53 +08:00 |
|
zyy
|
fe5f6cecc9
|
调整大屏系统界面加载宽度
|
2020-05-09 20:13:32 +08:00 |
|
fan
|
c5f63c9e52
|
添加地图数据维护中提示&存在仿真管理添加类型
|
2020-05-09 19:35:56 +08:00 |
|
fan
|
fc68903ff5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-09 19:24:22 +08:00 |
|
fan
|
29881aab0b
|
添加地图数据维护中提示&存在仿真管理添加类型
|
2020-05-09 19:24:12 +08:00 |
|
zyy
|
1d2e835b85
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-09 18:48:30 +08:00 |
|
zyy
|
d90996da48
|
调整大屏系统行数放到配置
|
2020-05-09 18:48:08 +08:00 |
|
joylink_cuiweidong
|
81450fbc9e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-09 18:24:37 +08:00 |
|
fan
|
f16936d9c3
|
信号机接近区段
|
2020-05-09 18:24:35 +08:00 |
|
joylink_cuiweidong
|
13ae9eba9c
|
代码调整
|
2020-05-09 18:24:21 +08:00 |
|
joylink_cuiweidong
|
9796280970
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-09 17:49:40 +08:00 |
|
joylink_cuiweidong
|
de024b9a45
|
代码调整
|
2020-05-09 17:49:25 +08:00 |
|
fan
|
d761c287af
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-09 17:32:29 +08:00 |
|
fan
|
e50edafb0c
|
校验调整
|
2020-05-09 17:32:13 +08:00 |
|
zyy
|
17547d31ce
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-09 17:27:42 +08:00 |
|
zyy
|
8e81a00847
|
调整区段绘图方式
|
2020-05-09 17:27:28 +08:00 |
|
joylink_cuiweidong
|
597f5cb990
|
代码调整
|
2020-05-09 16:39:33 +08:00 |
|
fan
|
b990150b0f
|
merger
|
2020-05-09 14:24:55 +08:00 |
|
fan
|
a66f36f293
|
批量设置调整
|
2020-05-09 14:23:20 +08:00 |
|
zyy
|
e59ab1400a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-09 14:16:25 +08:00 |
|
zyy
|
bb7556a876
|
调整宁波线路操作失败提示
|
2020-05-09 14:16:09 +08:00 |
|
fan
|
c4298fa612
|
批量设置调整
|
2020-05-09 13:03:57 +08:00 |
|
fan
|
6b6c7d8402
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-09 10:51:23 +08:00 |
|
fan
|
d8d795c1fb
|
调整绘图页面菜单
|
2020-05-09 10:51:13 +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
|
c1aa6596fa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-09 09:26:32 +08:00 |
|
fan
|
cd57807d1f
|
iscs状态表调整
|
2020-05-09 09:26:19 +08:00 |
|
fan
|
f6b6dd2f46
|
iscs状态表调整
|
2020-05-09 09:15:13 +08:00 |
|
fan
|
09e49a2b0a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-08 18:52:59 +08:00 |
|
fan
|
84e212c48b
|
站台站台轨位置校验&站台属性是否显示不生效修改&站台中站台轨属性不可修改&tab页懒加载导致的数据未展示问题调整
|
2020-05-08 18:52:46 +08:00 |
|
joylink_cuiweidong
|
eb62d2d641
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-08 18:51:44 +08:00 |
|
joylink_cuiweidong
|
285700c10d
|
代码调整
|
2020-05-08 18:51:29 +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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
sunzhenyu
|
3d6612cfbd
|
升级三维继电器动画模块
|
2020-04-30 18:19:32 +08:00 |
|
joylink_cuiweidong
|
c89c18fb21
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 18:06:16 +08:00 |
|
joylink_cuiweidong
|
101e58118a
|
新版地图 绘图 交路代码调整
|
2020-04-30 18:04:59 +08:00 |
|
fan
|
b6105f015d
|
绘图高亮显影调整
|
2020-04-30 17:52:37 +08:00 |
|
joylink_cuiweidong
|
7460abd1f1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 17:30:56 +08:00 |
|
joylink_cuiweidong
|
d189513501
|
新版绘图 交路代码调整
|
2020-04-30 17:30:10 +08:00 |
|
zyy
|
94ca9bce69
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 17:22:25 +08:00 |
|
zyy
|
327eb81aa7
|
调整绘图更新坐标
|
2020-04-30 17:22:10 +08:00 |
|
joylink_cuiweidong
|
268d3f939e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 16:34:08 +08:00 |
|
joylink_cuiweidong
|
81f05de40c
|
添加 根据地图交路一键生成生成所有站间运行等级 接口
修改 根据地图交路区段生成站间运行等级 接口
|
2020-04-30 16:33:26 +08:00 |
|
fan
|
f650e6f29e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 16:19:46 +08:00 |
|
fan
|
15104970bc
|
西安二信号机调整&线路配置添加参数
|
2020-04-30 16:19:33 +08:00 |
|
joylink_cuiweidong
|
48a671c5e2
|
新版地图绘图 交路 区段高亮
|
2020-04-30 15:48:08 +08:00 |
|
joylink_cuiweidong
|
395d15d959
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 15:16:38 +08:00 |
|
joylink_cuiweidong
|
2f8832be83
|
新版绘图 交路代码调整
|
2020-04-30 15:16:20 +08:00 |
|
fan
|
26487c0dd8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 14:50:42 +08:00 |
|
fan
|
744ea986c0
|
绘图调整
|
2020-04-30 14:50:27 +08:00 |
|
joylink_cuiweidong
|
3f942518f1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 14:39:56 +08:00 |
|
joylink_cuiweidong
|
91b377f975
|
交路 列表拖拽问题调整
|
2020-04-30 14:38:46 +08:00 |
|
fan
|
c101ee8f92
|
绘图tab-pane延时渲染
|
2020-04-30 13:40:32 +08:00 |
|
fan
|
e348262118
|
西安二号线信号机操作调整
|
2020-04-30 13:19:33 +08:00 |
|
fan
|
5682ab67b0
|
信号机批量设置联锁站&区段添加所属车站属性
|
2020-04-30 10:54:06 +08:00 |
|
fan
|
60fc5e27d0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 10:12:30 +08:00 |
|
fan
|
77124d842e
|
设备联锁关系数据校验&生成联锁功能
|
2020-04-30 10:12:11 +08:00 |
|
joylink_cuiweidong
|
44108db3bc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 10:08:53 +08:00 |
|
joylink_cuiweidong
|
7961c2c5f9
|
绘图 交路添加 生成交路区段数据的接口
交路和运行等级代码调整
|
2020-04-30 10:07:44 +08:00 |
|
fan
|
f3ab2337e8
|
西安二号线信号封锁调整（未完）
|
2020-04-30 08:54:17 +08:00 |
|
fan
|
35d13ae529
|
区段绘图数据调整roadType不为''
|
2020-04-29 17:53:35 +08:00 |
|
fan
|
1c8929cb08
|
绘图区段添加firstTurnBack&线路配置添加generateCycle&西安二操作调整
|
2020-04-29 17:25:30 +08:00 |
|
fan
|
057aee45fc
|
信号添加属性
|
2020-04-29 16:02:26 +08:00 |
|
fan
|
7e790a3bdb
|
鼠标样式调整
|
2020-04-29 14:05:50 +08:00 |
|
zyy
|
c9e3920461
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-29 11:23:08 +08:00 |
|
zyy
|
be9b8f8432
|
调整右键操作
|
2020-04-29 11:22:54 +08:00 |
|
joylink_cuiweidong
|
70c26426b0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-28 18:16:24 +08:00 |
|
joylink_cuiweidong
|
66cdf061c6
|
新版地图 绘图代码调整
|
2020-04-28 18:16:04 +08:00 |
|
fan
|
e10e0368e6
|
线路管理配置项样式调整
|
2020-04-28 17:03:23 +08:00 |
|
fan
|
f6dd06843f
|
线路管理配置项样式调整
|
2020-04-28 16:59:47 +08:00 |
|
zyy
|
56fa896b6d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-28 14:49:57 +08:00 |
|
zyy
|
7fa5a12e8c
|
调整设置app/height 执行顺序问题
|
2020-04-28 14:49:42 +08:00 |
|
joylink_cuiweidong
|
ef20f2024f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-28 14:04:39 +08:00 |
|
joylink_cuiweidong
|
056b9ffe9e
|
综合演练仿真 聊天 切换聊天 聊天布局 语音播放代码调整
|
2020-04-28 14:04:22 +08:00 |
|
fan
|
e77f5a3be6
|
线路配置管理
|
2020-04-28 09:56:03 +08:00 |
|
fan
|
5d2fff66a8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-27 19:02:20 +08:00 |
|
fan
|
e39a7eadb9
|
西安二号线操作调整&&绘图数据调整
|
2020-04-27 19:02:07 +08:00 |
|
joylink_cuiweidong
|
bfe23bf70b
|
综合演练仿真 聊天 发送语音消息 消息推送代码调整
|
2020-04-27 18:50:15 +08:00 |
|
zyy
|
9ea5cefdc0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/xian_02/menus/index.vue
|
2020-04-27 18:35:44 +08:00 |
|
zyy
|
9427cc5759
|
调整西安二号线右键菜单显示
|
2020-04-27 18:33:29 +08:00 |
|
joylink_cuiweidong
|
1bbbc567ad
|
绘图 设置运行等级代码调整
|
2020-04-27 14:25:40 +08:00 |
|
joylink_cuiweidong
|
edc17912af
|
新版地图 绘图 交路代码调整
|
2020-04-27 13:56:08 +08:00 |
|
joylink_cuiweidong
|
2cbef52398
|
新版绘图 交路代码调整
|
2020-04-27 11:33:17 +08:00 |
|
joylink_cuiweidong
|
0fb3536fff
|
新版地图绘制 交路 停站时间 设置运行等级代码调整
|
2020-04-27 10:54:42 +08:00 |
|
joylink_cuiweidong
|
f318854de7
|
新版绘图 交路代码调整
|
2020-04-27 10:06:17 +08:00 |
|
joylink_cuiweidong
|
1d63ad4b36
|
代码调整
|
2020-04-26 18:49:22 +08:00 |
|
joylink_cuiweidong
|
c3e76998d3
|
新版地图绘制 设置交路 代码调整
|
2020-04-26 18:33:26 +08:00 |
|
joylink_cuiweidong
|
a3d86a4136
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-26 16:35:05 +08:00 |
|
joylink_cuiweidong
|
208ff362e0
|
新版地图绘制 设置运行等级 代码调整
|
2020-04-26 16:34:46 +08:00 |
|
fan
|
f1fac79770
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-26 16:24:49 +08:00 |
|
fan
|
695ea67e27
|
西安二号线绘图调整&西安二号线站台操作调整&派班计划冲突显示调整
|
2020-04-26 16:24:34 +08:00 |
|
joylink_cuiweidong
|
a0e3546b15
|
新版地图绘图 设置运行等级代码调整
|
2020-04-26 14:44:46 +08:00 |
|
joylink_cuiweidong
|
f1ddb0c86a
|
实训地图列表 代码调整
|
2020-04-26 13:39:09 +08:00 |
|
joylink_cuiweidong
|
4d1f6a6a9d
|
新版绘图 高级数据 交路 生成站间运行时间 接口调整
|
2020-04-26 13:18:25 +08:00 |
|
joylink_cuiweidong
|
7234f95b7d
|
新版地图 绘图 交路接口调整
|
2020-04-26 10:25:35 +08:00 |
|
sunzhenyu
|
a190aedb62
|
增加三维站台按钮
|
2020-04-24 18:03:39 +08:00 |
|
sunzhenyu
|
fd14da2cee
|
merge menudemon
|
2020-04-24 18:01:03 +08:00 |
|
sunzhenyu
|
8f15f049f1
|
修改三维动画播放器重复更新bug，增加宁波线路三维背景，修改三维仿真行车逻辑改为后台数据控制
|
2020-04-24 18:00:12 +08:00 |
|
joylink_cuiweidong
|
d0abd7fb56
|
socket 断线重连修改
解决被登出 socket 一直请求的问题
|
2020-04-24 15:34:09 +08:00 |
|
zyy
|
2210965709
|
调整系统关于vue报错误
|
2020-04-24 14:17:15 +08:00 |
|
zyy
|
7536022d33
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-24 11:25:41 +08:00 |
|