joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
4,642 Commits 20 Branches 0 Tags 448 MiB
399111c682
Commit Graph

4547 Commits

Author SHA1 Message Date
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
571cd461b6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 10:25:20 +08:00
joylink_cuiweidong
dcfc07cd9e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 10:24:30 +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
joylink_cuiweidong
95ccbd47b9 代码调整 2020-05-09 10:24:04 +08:00
zyy
109c581e0e 调整iscs样式 2020-05-09 10:23:56 +08:00
fan
5e81c395fb iscs火灾报警系统状态 2020-05-09 10:12:33 +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
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
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
fan
4b50306981 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-30 17:40:44 +08:00
fan
276620a25e 西安二信号机调整 2020-04-30 17:40:25 +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
4797aa046f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-30 13:19:46 +08:00
fan
e348262118 西安二号线信号机操作调整 2020-04-30 13:19:33 +08:00
zyy
ba2aff1532 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-30 11:29:16 +08:00
zyy
eb6cd7ce2d 调整道岔使能发送流程，及绘图 2020-04-30 11:28:56 +08:00
fan
545b481532 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-30 10:54:20 +08:00
fan
5682ab67b0 信号机批量设置联锁站&区段添加所属车站属性 2020-04-30 10:54:06 +08:00
zyy
a3213c49f8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-30 10:32:27 +08:00
zyy
18334b2f43 调整弹窗名称，右键菜单操作 2020-04-30 10:32:14 +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
ec7be523ba 西安二信号机操作调整 2020-04-29 15:24:17 +08:00
fan
7e790a3bdb 鼠标样式调整 2020-04-29 14:05:50 +08:00
fan
d65c5c2922 合并代码 2020-04-29 13:00:41 +08:00
fan
7d3a6ddafa 西安二号线信号机操作调整 2020-04-29 11:36:16 +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
fan
ce8d6244f1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-28 16:17:55 +08:00
fan
1457492257 西安二操作调整 2020-04-28 16:17:42 +08:00
joylink_cuiweidong
493529d9bb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-28 15:59:58 +08:00
joylink_cuiweidong
fe9251120c 西安二号线 列车右键菜单 代码调整 2020-04-28 15:59:44 +08:00
zyy
4a1c36bfd0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/xian_02/menus/menuSignal.vue
 2020-04-28 15:44:35 +08:00
zyy
96bf9c7f7d 调整右键菜单 2020-04-28 15:43:19 +08:00
joylink_cuiweidong
5c8d9cce44 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-28 14:56:16 +08:00
joylink_cuiweidong
1ee3ea61c7 西安二号线 操作 背景样式调整 2020-04-28 14:55:57 +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
af5567d598 西安二操作问题调整 2020-04-28 10:27:07 +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
fan
c02f42fba1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-27 14:01:37 +08:00
fan
fa60706b66 西安二号线操作调整 2020-04-27 14:01:23 +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
2caeb88bfa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-26 18:49:39 +08:00
fan
e748a8113c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-26 18:49:30 +08:00
joylink_cuiweidong
1d63ad4b36 代码调整 2020-04-26 18:49:22 +08:00
fan
4378cc56cb 西安二号线站台操作调整 2020-04-26 18:49:20 +08:00
zyy
479df7c2b3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-26 18:38:47 +08:00
zyy
cc6c7f92ec 调整西安二号线右键样式 2020-04-26 18:38:27 +08:00
joylink_cuiweidong
c3e76998d3 新版地图绘制 设置交路 代码调整 2020-04-26 18:33:26 +08:00
fan
ddce743683 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-26 17:16:30 +08:00
fan
a1d0c3e7d0 西安二号线绘图调整 2020-04-26 17:16:20 +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
zyy
745f867cb8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/xian_02/menus/dialog/turnBackControl.vue
 2020-04-26 14:48:48 +08:00
zyy
ecd361ddbe 调整西安二号线车站操作 2020-04-26 14:47:43 +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
joylink_cuiweidong
7d5605d170 西安二号线 绘图 站台添加模式筛选标识 2020-04-24 18:23:17 +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
zyy
7997ac6fe0 调整发布地图接口流程 2020-04-24 11:25:30 +08:00
fan
c07660b3d1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-24 10:45:19 +08:00
fan
b40c497361 发布地图管理调整&西安二号线站台操作调整 2020-04-24 10:39:26 +08:00
joylink_cuiweidong
545dc4a62e 综合演练仿真 聊天 发送语音消息 2020-04-23 18:47:43 +08:00
fan
26f59a4e4e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-23 18:36:47 +08:00
fan
9c07e3968d 代码调整 2020-04-23 18:35:27 +08:00
joylink_cuiweidong
203a24a6d0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-23 17:13:33 +08:00
joylink_cuiweidong
cdae58efbe 新版地图绘制 删除地图页面跳转问题 
综合演练仿真 聊天  发送语音消息
 2020-04-23 17:13:11 +08:00
zyy
98ce2d5890 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-23 17:12:06 +08:00
zyy
4d288556b0 调整绘图界面，调整实训平台鼠标隐藏bug 2020-04-23 17:11:51 +08:00
fan
747c56cac1 西安二运行图显示name不包含方向 2020-04-23 15:43:47 +08:00
fan
3c4682249c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-23 15:19:45 +08:00
fan
ca4dc2e2cf 撤销拦截错误，仅拦截500 2020-04-23 15:18:33 +08:00
joylink_cuiweidong
72f78751ce 综合演练仿真 聊天 创建对话，以及对话切换 2020-04-23 14:41:52 +08:00
fan
9dcb650a48 西安二运行图导入 2020-04-23 14:17:43 +08:00
fan
880e837285 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-23 13:37:59 +08:00
fan
5f526a4497 西安二号线运行图导入调整 2020-04-23 13:36:34 +08:00
zyy
56f713a02b 调整报错提示信息 2020-04-23 10:29:41 +08:00
zyy
61c385f570 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-23 10:06:58 +08:00
zyy
0e166416ba 调整catch 监听 2020-04-23 10:06:46 +08:00
fan
1e03ee1a3b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-23 10:05:15 +08:00
fan
97a9ae9f5c 接口报错调整 2020-04-23 10:03:07 +08:00
zyy
c5673fa6cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-23 09:38:12 +08:00
zyy
e5206c8589 调整西安一号线运行图导入 2020-04-23 09:37:46 +08:00
fan
69574ccb0d 接口报错调整 2020-04-23 09:34:54 +08:00
zyy
306e9f4954 调整区段绘图显隐问题 2020-04-22 18:53:20 +08:00
zyy
d2eee7fca8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-22 18:37:23 +08:00
zyy
8882f716e4 调整运行图导入 2020-04-22 18:37:09 +08:00
fan
43378ad6f6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-22 18:26:26 +08:00
fan
06b9fda264 西安一三按计划折返 2020-04-22 18:24:28 +08:00
joylink_cuiweidong
511d5e48d4 综合演练仿真 聊天 socket 订阅 2020-04-22 18:17:27 +08:00
zyy
33e105ce88 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-22 18:02:58 +08:00
zyy
415d762294 调整地图绘制区段显隐关系 2020-04-22 18:02:43 +08:00
fan
a5f56bae2d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-22 17:26:46 +08:00
fan
1afcd2ec4a 仅哈尔滨线路显示客流量视图 2020-04-22 17:24:45 +08:00
joylink_cuiweidong
d9c7874a65 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-22 17:21:54 +08:00
joylink_cuiweidong
1a393e41b6 代码调整 2020-04-22 17:21:36 +08:00
fan
b898042b96 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-22 17:13:37 +08:00
fan
8c122f93d4 运行图加载调整&绘图设备道岔故障&佛山区段颜色 2020-04-22 17:12:29 +08:00
zyy
967e77042b 调整西安一号线导入时间格式化 2020-04-22 17:08:11 +08:00
zyy
45e10ef066 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-22 16:42:09 +08:00
zyy
00936b36ac 调整地图绘制区段关系显隐 2020-04-22 16:41:55 +08:00
joylink_cuiweidong
9523f6e4cc 新版地图 绘图 公里标显示 代码调整 2020-04-22 16:17:35 +08:00
joylink_cuiweidong
a0589d52dd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-22 15:34:08 +08:00
joylink_cuiweidong
f9ca0138c8 综合演练仿真添加聊天窗口调整(未完成) 2020-04-22 15:33:31 +08:00
fan
c3ca6de6d8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-22 14:32:00 +08:00
fan
e51824dc80 紧急停车位置调整&绘图站间分隔&车站批量调整 2020-04-22 14:30:37 +08:00
zyy
6d8d27a931 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-22 13:57:36 +08:00
zyy
7baea26e4d 拦截错误并提示 2020-04-22 13:57:19 +08:00
sunzhenyu
10949ddfbb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-22 13:23:09 +08:00
sunzhenyu
1cd2fd370b 复原三维沙盘行车逻辑 2020-04-22 13:22:54 +08:00
joylink_cuiweidong
d436041233 代码调整 2020-04-22 11:31:09 +08:00
fan
adfe7f0f05 派班工作站&运行图加载调整 2020-04-22 09:42:46 +08:00
fan
05c857aeb6 西安二号线运行图导入过滤TBKE&TWQN 2020-04-22 09:07:58 +08:00
fan
b87a2f5ce2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-21 18:46:41 +08:00
fan
5f4a211bf2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-21 18:45:05 +08:00
fan
0e1d3dc811 运行图加载调整 2020-04-21 18:43:54 +08:00
joylink_cuiweidong
158cad6b73 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-21 18:43:26 +08:00
joylink_cuiweidong
c550466f60 综合演练仿真添加聊天窗口调整 2020-04-21 18:42:57 +08:00
sunzhenyu
7ca5fd07dc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-21 18:32:51 +08:00
sunzhenyu
0ea6430617 修改三维驾驶操作面板，整合实用按钮，修改背景 2020-04-21 18:31:33 +08:00
zyy
19e0eeae6b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-21 17:54:00 +08:00
zyy
75c1cffa11 调整佛山线路行调下道岔操作 2020-04-21 17:53:46 +08:00
joylink_cuiweidong
b10c801550 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-21 17:28:44 +08:00
joylink_cuiweidong
98fc24ab24 综合演练仿真添加聊天窗口(未完成) 2020-04-21 17:28:13 +08:00
fan
f229bc9231 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-21 17:10:15 +08:00
fan
46113e89a7 运行图加载 2020-04-21 17:08:43 +08:00
fan
c8c7f8bded 佛山调整 2020-04-21 17:05:18 +08:00
zyy
4610882f5f 调整列车方向显示 2020-04-21 17:00:19 +08:00
fan
d60c2881d0 添加列车配置 2020-04-21 16:00:10 +08:00
fan
d44faf55ea 调整西安地铁登录页面 2020-04-21 15:47:25 +08:00
fan
dcf7b951ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-21 15:15:03 +08:00
fan
2f4b765d97 运行图加载调整&交路数据调整 2020-04-21 15:08:27 +08:00
zyy
778c2059df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-21 14:14:44 +08:00
zyy
b31ef6bc2d 调整西安一 三号线运行图导入 2020-04-21 14:14:33 +08:00
joylink_cuiweidong
9b0ce027bf 代码调整 2020-04-21 11:26:07 +08:00
joylink_cuiweidong
d4a621d049 代码调整 2020-04-21 10:48:09 +08:00
joylink_cuiweidong
3da6d9c538 删除没有用的接口 2020-04-21 10:07:26 +08:00
zyy
7a25c0b536 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-20 18:30:13 +08:00
zyy
dd4c575062 调整站间运行等级逻辑 2020-04-20 18:29:50 +08:00
joylink_cuiweidong
9f6fe40894 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-20 18:13:50 +08:00
joylink_cuiweidong
ad583bf418 综合演练 发送语音功能代码调整 2020-04-20 18:12:16 +08:00