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

3865 Commits

Author SHA1 Message Date
joylink_cuiweidong
95a9d18ccd 地图绘图代码调整 2020-07-20 17:13:56 +08:00
fan
ceb0d0803d 参数名称修改 2020-07-20 17:04:36 +08:00
fan
7b92d4775a 设备配置调整 2020-07-20 17:00:59 +08:00
fan
3d357ba515 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-20 16:54:19 +08:00
fan
60ca3e7376 设备配置调整 2020-07-20 16:54:10 +08:00
joylink_cuiweidong
b1821d8274 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-20 16:46:55 +08:00
joylink_cuiweidong
f809d514a1 地图绘制代码调整 2020-07-20 16:46:38 +08:00
fan
a5961f5651 设备配置title调整 2020-07-20 16:04:43 +08:00
fan
0403b249a1 设备配置调整 2020-07-20 16:00:27 +08:00
fan
072fe55b4f heb取消无法登录提示 2020-07-20 15:22:20 +08:00
fan
1fb660d9e7 heb取消无法登录提示 2020-07-20 15:20:48 +08:00
fan
025b1595c3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-20 15:19:33 +08:00
fan
00608f2cb2 heb取消无法登录提示&会话、设备代码调整 2020-07-20 15:19:11 +08:00
joylink_cuiweidong
e2e66074af Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-20 15:11:17 +08:00
joylink_cuiweidong
2dc14c9374 地图绘制代码调整 2020-07-20 15:10:57 +08:00
fan
01174384ff 设备配置添加显示条件 2020-07-20 14:00:47 +08:00
fan
29c89cf4a7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-20 13:39:11 +08:00
fan
23885760f3 会话调整 2020-07-20 13:38:54 +08:00
zyy
b071b00d21 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/system/commandDictionary/copyParam.vue
 2020-07-20 13:31:02 +08:00
fan
00a98a5b14 merger 2020-07-20 13:29:32 +08:00
zyy
9e90adf9e9 调整指令复制接口 2020-07-20 13:29:22 +08:00
fan
6f20f4db18 会话调整 2020-07-20 13:18:38 +08:00
fan
18344338c5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-20 11:18:34 +08:00
fan
05cf1251b9 psl添加关联屏蔽门属性 2020-07-20 11:18:19 +08:00
fan
826b4da854 公共会话切换 2020-07-20 10:48:53 +08:00
zyy
493a87cf38 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-20 10:47:41 +08:00
zyy
7bd6013565 增加指令字典 复制操作 2020-07-20 10:47:27 +08:00
joylink_cuiweidong
39eace3b40 剧本预览代码调整 2020-07-20 10:28:31 +08:00
zyy
3673eb1015 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/utils/baseUrl.js
 2020-07-20 09:24:02 +08:00
zyy
02157c45a0 修改生成联锁数据提示信息 2020-07-20 09:23:08 +08:00
fan
ba90420115 merger 2020-07-17 19:08:42 +08:00
fan
3038d5571f 会话调整 2020-07-17 19:07:34 +08:00
zyy
e0f7175923 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-17 18:28:56 +08:00
zyy
04f1205e56 调整上行是否向右地图字段 2020-07-17 18:28:38 +08:00
fan
f954e3cf53 设备配置调整 2020-07-17 17:20:32 +08:00
joylink_cuiweidong
f0d0b6db79 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-17 17:19:26 +08:00
joylink_cuiweidong
451b5343e0 剧本编制代码调整 2020-07-17 17:18:48 +08:00
fan
3e1e36c921 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-17 16:35:34 +08:00
fan
fefd4b53b6 会话调整&设备配置调整 2020-07-17 16:35:24 +08:00
joylink_cuiweidong
a5ce9e4a88 地图绘制代码调整 2020-07-17 15:45:44 +08:00
fan
7368cd14ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-17 14:32:43 +08:00
fan
c537063f8a 设备配置调整 2020-07-17 14:32:33 +08:00
joylink_cuiweidong
7449689d2c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-17 14:09:08 +08:00
joylink_cuiweidong
1e91cb616d 地图绘图代码调整 2020-07-17 14:08:14 +08:00
fan
3aa8807e63 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-17 13:05:30 +08:00
fan
b49aa386dd 设备配置调整 2020-07-17 13:05:18 +08:00
joylink_cuiweidong
56089e1a55 地图绘图代码优化 2020-07-17 11:14:50 +08:00
fan
fb4864496a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-16 19:11:35 +08:00
fan
0a50c69b2c 设备配置调整 2020-07-16 19:11:20 +08:00
joylink_cuiweidong
98d55deb64 地图绘制代码调整 2020-07-16 17:49:36 +08:00
joylink_cuiweidong
7ff599d49f 地图绘制布局调整（去掉scrollBar） 2020-07-16 16:18:13 +08:00
joylink_cuiweidong
f6e4e3c324 地图绘图样式调整 2020-07-16 14:41:21 +08:00
joylink_cuiweidong
8a34f47dbc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-16 13:34:11 +08:00
joylink_cuiweidong
2e91788a78 退出登陆 关闭socket连接调整 2020-07-16 13:33:45 +08:00
fan
0451bf1ab2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-16 13:31:36 +08:00
fan
c761e07ba2 设备配置调整 2020-07-16 13:31:05 +08:00
joylink_cuiweidong
a5df03f7c7 退出登陆 断开socket连接 2020-07-16 13:22:33 +08:00
joylink_cuiweidong
d2ae5169d1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-16 10:51:16 +08:00
joylink_cuiweidong
ea429f36a9 地图绘图样式调整 2020-07-16 10:50:59 +08:00
zyy
7b400d83b5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-16 09:38:35 +08:00
zyy
f61ab58d0f 调整设备管理字段显示 2020-07-16 09:38:20 +08:00
joylink_cuiweidong
ae083cb20d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-15 19:05:45 +08:00
joylink_cuiweidong
cce290e73c 剧本预览代码调整 2020-07-15 19:05:32 +08:00
fan
24197cba1a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-15 18:36:58 +08:00
fan
6ed2916b2c 贵州学生管理分数计算精度统一 2020-07-15 18:36:46 +08:00
joylink_cuiweidong
2558f7ce98 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-15 18:09:27 +08:00
joylink_cuiweidong
94d02dc0f8 剧本编制样式调整 2020-07-15 18:08:49 +08:00
fan
531edc0d46 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-15 16:12:07 +08:00
fan
803941e838 设备管理道岔配置调整 2020-07-15 16:11:58 +08:00
joylink_cuiweidong
4fc77ee04b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-15 16:09:34 +08:00
joylink_cuiweidong
adde89a41d 剧本编制代码调整 2020-07-15 16:09:15 +08:00
fan
5c0285969c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-15 14:26:03 +08:00
zyy
a1cbcff9ea 调整道岔绘图，右键操作 2020-07-15 13:31:07 +08:00
fan
897407dde6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-15 10:11:36 +08:00
fan
fac190e91d 代码调整 2020-07-15 10:11:25 +08:00
joylink_cuiweidong
1d6868ee54 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 18:22:31 +08:00
joylink_cuiweidong
f9f58a70c4 剧本预览代码调整 
绘图高级页面代码调整
 2020-07-14 18:21:40 +08:00
zyy
b2f9e388aa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 18:14:53 +08:00
zyy
172623c0f1 调整宁波线路道岔失表显示 2020-07-14 18:14:39 +08:00
fan
9efc0d4bfb 成员管理高度调整 2020-07-14 17:30:35 +08:00
fan
75fdf24d84 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 17:21:47 +08:00
fan
286d38db5c 会话调整 2020-07-14 17:21:39 +08:00
zyy
112b6a8ce3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 17:17:06 +08:00
zyy
fbf4cd7652 调整组件间传递事件 2020-07-14 17:16:49 +08:00
joylink_cuiweidong
28261153df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 16:52:52 +08:00
joylink_cuiweidong
8d41a5d730 剧本发布暂时去掉了审核 
socket断线重连代码调整
 2020-07-14 16:51:22 +08:00
fan
15f095a406 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 16:40:18 +08:00
fan
05284736d3 登录校验二维码登录调整 2020-07-14 16:40:09 +08:00
zyy
77b02b947e 调整设备连接流程 2020-07-14 16:07:43 +08:00
fan
22f70897c4 北信坤成页面调整 2020-07-14 16:04:55 +08:00
zyy
c2d158da5b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 15:35:19 +08:00
zyy
952de95f4c 调整列车列表样式 2020-07-14 15:35:03 +08:00
fan
135fe2d917 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 15:32:29 +08:00
fan
0db415d5ca 北信坤成页面调整&&综合演练会话调整 2020-07-14 15:32:18 +08:00
sunzhenyu
9352cac2b3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 15:03:38 +08:00
sunzhenyu
54a773aa84 修改录制三维驾驶托管模块 2020-07-14 15:03:31 +08:00
joylink_cuiweidong
66070d2157 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 14:48:41 +08:00
joylink_cuiweidong
a96ace44d1 剧本预览代码调整 2020-07-14 14:48:26 +08:00
zyy
b231f2b96f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 14:30:52 +08:00
zyy
dfc478b8d4 调整哈尔滨综合演练按钮位置，调整角色设置样式 2020-07-14 14:30:37 +08:00
joylink_cuiweidong
a752c1e636 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 14:28:14 +08:00
joylink_cuiweidong
99b622ef24 地图绘图代码调整 2020-07-14 14:27:35 +08:00
zyy
cb4e2bec19 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 13:28:08 +08:00
zyy
8fb216dbae 增加项目中设备管理页面 2020-07-14 13:27:00 +08:00
joylink_cuiweidong
a462e540fb socket 退出登陆 断开连接 
绘图代码调整
 2020-07-14 11:01:22 +08:00
sunzhenyu
006fd8f0a3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 09:25:11 +08:00
sunzhenyu
f1cab6fba3 test 2020-07-14 09:24:58 +08:00
fan
440eeed75f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-13 18:40:53 +08:00
fan
7cdc3c5878 贵州导入班级报错提示&哈尔滨指令调整 2020-07-13 18:40:41 +08:00
zyy
1b61866b37 删除样式 2020-07-13 17:28:32 +08:00
zyy
06fecf9aad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-13 17:27:49 +08:00
zyy
1c15fdbdd9 增加所有线路列车故障模式 2020-07-13 17:27:33 +08:00
joylink_cuiweidong
3898f66e78 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-13 17:02:11 +08:00
joylink_cuiweidong
d9ed44b218 剧本预览代码调整 
新版地图绘制代码优化
 2020-07-13 17:01:34 +08:00
fan
40402a9a8e 试卷规则bug修复&哈尔滨操作调整 2020-07-13 16:48:23 +08:00
fan
1b3a491d52 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-13 14:35:07 +08:00
fan
0ca0153c60 旧地图综合演练调整 2020-07-13 14:34:56 +08:00
zyy
ee9cf9f54d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-13 14:30:16 +08:00
zyy
6817323fe1 调整宁波列车故障右键 2020-07-13 14:30:01 +08:00
fan
938e789173 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-13 13:01:44 +08:00
fan
a5649cc6e8 哈尔滨操作调整 2020-07-13 13:01:28 +08:00
joylink_cuiweidong
1add21a740 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-13 10:16:07 +08:00
joylink_cuiweidong
57125367fc 剧本编制与剧本预览代码调整 2020-07-13 10:15:44 +08:00
zyy
fccbc9ecd0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 18:42:05 +08:00
zyy
f205ddf0fc 删除多余配置 2020-07-10 18:41:29 +08:00
fan
32f4657f4e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 18:30:46 +08:00
fan
b10f08df67 设备登录调整&成员管理调整 2020-07-10 18:30:37 +08:00
sunzhenyu
9cc69e471b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 18:13:18 +08:00
sunzhenyu
e95d97136a 三维编辑器存读数据测试 2020-07-10 18:13:09 +08:00
joylink_cuiweidong
9627e85bf0 剧本编制 会话消息代码调整 2020-07-10 18:06:55 +08:00
joylink_cuiweidong
bf7ae6684e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 17:33:55 +08:00
joylink_cuiweidong
fe3ca3af2f 剧本编制代码调整 2020-07-10 17:33:37 +08:00
zyy
e6e0bb6d51 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 17:23:31 +08:00
zyy
1c98da6c11 调整路由配置 2020-07-10 17:23:17 +08:00
sunzhenyu
4dfe9d661b 修改录制三维驾驶托管逻辑 2020-07-10 17:15:57 +08:00
sunzhenyu
135d40ba49 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 17:15:13 +08:00
joylink_cuiweidong
5deef9fe6b 剧本编制代码调整 2020-07-10 17:14:30 +08:00
sunzhenyu
8831528b9a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 16:42:21 +08:00
sunzhenyu
eada9df066 修改录制三维状态 2020-07-10 16:42:12 +08:00
joylink_cuiweidong
2b5b21c1cf 剧本编制 角色列表代码调整 2020-07-10 16:40:42 +08:00
joylink_cuiweidong
6d3cd29a48 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 15:34:35 +08:00
joylink_cuiweidong
4bd986b7eb 剧本编制代码调整 2020-07-10 15:34:19 +08:00
sunzhenyu
b1f2f173b2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 14:48:01 +08:00
sunzhenyu
8b3b151b95 修改三维驾驶录制获取驾驶员托管状态接口 2020-07-10 14:47:52 +08:00
joylink_cuiweidong
c432c8ffcb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 14:46:38 +08:00
joylink_cuiweidong
54a5a29f26 剧本预览代码调整 2020-07-10 14:46:18 +08:00
fan
31c8e8828f 通号打开三维界面 2020-07-10 14:39:47 +08:00
sunzhenyu
9ff6b5f574 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 11:32:37 +08:00
sunzhenyu
8f8192a8f7 修改综合演练三维退出重定向 2020-07-10 11:32:26 +08:00
zyy
9def448e4a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 10:56:16 +08:00