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

5978 Commits

Author SHA1 Message Date
fan
fac190e91d 代码调整 2020-07-15 10:11:25 +08:00
zyy
ca6a07eb08 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 18:23:16 +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
40fea0108f 宁波线路道岔封锁显示调整 2020-07-14 18:19:19 +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
fan
23d3663e0e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 13:41:28 +08:00
fan
d3626758ee 哈尔滨操作调整 2020-07-14 13:41:17 +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
fan
d18b440c24 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 11:21:31 +08:00
fan
7bbeb6bbd6 哈尔滨指令样式调整 2020-07-14 11:21:24 +08:00
joylink_cuiweidong
7f67225828 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 11:01:40 +08:00
joylink_cuiweidong
a462e540fb socket 退出登陆 断开连接 
绘图代码调整
 2020-07-14 11:01:22 +08:00
sunzhenyu
30b1bf3646 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 10:50:16 +08:00
fan
1c051d0561 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 10:15:37 +08:00
fan
84e4668e40 哈尔滨指令调整 2020-07-14 10:14:59 +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
joylink_cuiweidong
d2f653bc54 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
#	src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
#	src/jmapNew/theme/xian_01/menus/menuTrain.vue
#	src/jmapNew/theme/xian_02/menus/menuTrain.vue
 2020-07-13 18:59:56 +08:00
joylink_cuiweidong
fe5787b3ce 新增 确认列车行驶之前方站台 进路闭塞法行车 指令 2020-07-13 18:54:42 +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
7ac85def7c 合并代码 2020-07-13 16:49:26 +08:00
fan
40402a9a8e 试卷规则bug修复&哈尔滨操作调整 2020-07-13 16:48:23 +08:00
zyy
4704f9e413 增加配置 2020-07-13 15:47:27 +08:00
zyy
321c59b155 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-13 14:37:43 +08:00
zyy
9d74e75624 列车故障配置 2020-07-13 14:37:18 +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
7263bb669d 删除socket提示信息 2020-07-10 11:26:15 +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
zyy
6cc8b3beaa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/newMap/jointTrainingNew/index.vue
 2020-07-10 10:55:48 +08:00
joylink_cuiweidong
4c307cc848 剧本编制代码调整 2020-07-10 10:53:44 +08:00
zyy
348b07afa4 调整大屏系统列车显示问题 2020-07-10 10:52:31 +08:00
joylink_cuiweidong
40fe41a8ff Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 10:36:35 +08:00
joylink_cuiweidong
e13fcb02e5 故障设置代码调整 2020-07-10 10:36:10 +08:00
sunzhenyu
3a25657440 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 10:28:01 +08:00
sunzhenyu
3e84301b42 修改综合演练切换带三维界面的处理 2020-07-10 10:27:49 +08:00
fan
0d5be61a17 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 10:00:51 +08:00
fan
ac3da3ef00 成员管理总数在线人数调整 2020-07-10 10:00:20 +08:00
sunzhenyu
ca83846790 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 09:17:15 +08:00
sunzhenyu
ccd14e903d 三维编辑器修改 2020-07-10 09:17:00 +08:00
sunleking
07d9f8603d 修改hideibp隐藏三维界面 2020-07-09 21:44:11 +08:00
zyy
1847267bef 调整列车大屏状态修改 2020-07-09 19:07:57 +08:00
zyy
ab2d2b004e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 18:52:25 +08:00
zyy
7b6148919c 调整综合监控默认进入第一个界面 2020-07-09 18:52:13 +08:00
fan
cb1e54b410 教研==》教员 2020-07-09 18:27:31 +08:00
fan
4098cba048 heb替换hyd 2020-07-09 18:04:11 +08:00
fan
3061b83c6a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 17:45:02 +08:00
fan
3301d2bebf 哈尔滨打包调整 2020-07-09 17:44:48 +08:00
joylink_cuiweidong
0c9cd52c9a 剧本编制代码调整 2020-07-09 17:39:43 +08:00
fan
82c0cf200d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 17:38:27 +08:00
fan
81de72cab0 哈尔滨打包调整 2020-07-09 17:38:16 +08:00
sunzhenyu
41a0ac6ebd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 17:23:19 +08:00
joylink_cuiweidong
5532bc5eba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 16:54:51 +08:00
joylink_cuiweidong
3aa0d55ea3 剧本编制代码调整 2020-07-09 16:54:31 +08:00
sunzhenyu
f424184363 修改录制界面三维驾驶初始车辆显示 2020-07-09 16:39:58 +08:00
sunzhenyu
df3b8eebd7 修改综合演练三维驾驶退出 2020-07-09 16:03:33 +08:00
sunzhenyu
93e0b71ab4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 15:46:19 +08:00
sunzhenyu
27d4c93775 修改三维编辑器 2020-07-09 15:46:12 +08:00
joylink_cuiweidong
9b3cd2dc3d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 15:45:47 +08:00
fan
22f94f7ef5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 15:47:07 +08:00
fan
81be7e776d 设备登录调整 2020-07-09 15:46:52 +08:00
joylink_cuiweidong
ffab9631ce 代码调整 2020-07-09 15:45:32 +08:00
joylink_cuiweidong
84485c6f1d 剧本编制代码调整 2020-07-09 15:44:12 +08:00
joylink_cuiweidong
b7d0f11b9c 去掉断点 2020-07-09 15:16:12 +08:00
joylink_cuiweidong
15c6a151c9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 15:09:35 +08:00
joylink_cuiweidong
763d04d630 剧本编制 切换角色 过滤掉不在线的司机 2020-07-09 15:09:18 +08:00
fan
8af4eb6187 设备登录调整 2020-07-09 15:06:15 +08:00
fan
6aa7fdf1bc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 13:06:04 +08:00
fan
404c56e874 过滤司机角色调整 2020-07-09 13:05:50 +08:00
fan
577cc3c887 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 11:07:33 +08:00
zyy
8a4bbbd682 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 11:07:20 +08:00
zyy
a16f8ebf00 配置哈尔滨项目路由 2020-07-09 11:07:06 +08:00
fan
e658fb7889 哈尔滨项目调整 2020-07-09 11:07:04 +08:00
joylink_cuiweidong
9e71ca967f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 10:51:14 +08:00
joylink_cuiweidong
c315f9121a 剧本编制代码调整 2020-07-09 10:50:56 +08:00
fan
6bfe538bfc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 10:25:16 +08:00
fan
b14a730bab 哈尔滨项目调整 2020-07-09 10:25:04 +08:00
joylink_cuiweidong
0c95382b7e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 10:18:16 +08:00
joylink_cuiweidong
96ff4c49f6 剧本编制代码调整 2020-07-09 10:17:55 +08:00
zyy
f48d584a8e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 10:16:49 +08:00
zyy
49ac7ba919 调整路由校验权限流程 2020-07-09 10:16:33 +08:00
fan
b07991b21f 登录页面调整 2020-07-09 09:38:51 +08:00
joylink_cuiweidong
3cd9d9416b 剧本代码调整 2020-07-08 18:56:32 +08:00
joylink_cuiweidong
dac800a86f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 18:36:07 +08:00
joylink_cuiweidong
b1005fd2ac 剧本编制代码调整 2020-07-08 18:35:46 +08:00
zyy
3693994526 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 18:35:25 +08:00
zyy
c4ffc859ce 调整大屏配置逻辑，登陆权限流程 2020-07-08 18:35:12 +08:00
fan
37d88998ab 清除会话@成员 2020-07-08 18:22:14 +08:00
fan
14835db67b 仿真清除数据调整 2020-07-08 18:06:22 +08:00
fan
62430ea87b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 17:36:43 +08:00
fan
050fc8141c 设备登录调整 2020-07-08 17:36:32 +08:00
sunzhenyu
eff2657d08 修改综合演练屏蔽门直接显示 2020-07-08 17:24:38 +08:00
fan
3196304f1c 调整虚拟屏蔽门登录跳转路径 2020-07-08 16:43:18 +08:00
fan
5edd9f536e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 16:30:06 +08:00
fan
5b1aad5fc7 调整虚拟屏蔽门配置 2020-07-08 16:29:40 +08:00
sunzhenyu
faa57eb3c9 修改三维设备切换模型bug 2020-07-08 16:15:35 +08:00
zyy
6ff8019898 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 15:49:41 +08:00
zyy
fd89fe974e 调整列车驾驶设备 2020-07-08 15:49:16 +08:00
fan
e8d54bc1d0 合并代码 2020-07-08 15:42:23 +08:00
fan
714113c819 设备登录调整 2020-07-08 15:40:55 +08:00
zyy
7c8d1319f3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 14:40:18 +08:00
zyy
753172433c 调整实训流程 2020-07-08 14:40:04 +08:00
sunzhenyu
6c1c6a8574 修改三维cctv综合演练样式 2020-07-08 14:08:22 +08:00
sunzhenyu
0f39cbd2e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 14:07:32 +08:00
fan
49cd6213c9 调整cctv登录路径 2020-07-08 14:05:46 +08:00
sunzhenyu
2cbe94a16d 修改cctv无贴图配置 2020-07-08 14:04:14 +08:00
fan
3ba4ebe807 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 13:49:23 +08:00
fan
db5c516813 成员参数调整 2020-07-08 13:49:14 +08:00
sunzhenyu
7d8f4e6de2 修改三维设备在设备管理中显示样式 2020-07-08 13:28:06 +08:00
sunzhenyu
37a323ff23 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 13:19:49 +08:00
sunzhenyu
3161e256b8 修改设备界面query 2020-07-08 13:19:40 +08:00
fan
4a5923f263 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 13:11:36 +08:00
fan
1076eb2215 设备登录调整 2020-07-08 13:11:22 +08:00
joylink_cuiweidong
fe3ee372e9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 13:05:53 +08:00
joylink_cuiweidong
fc97643116 剧本编制代码调整 2020-07-08 13:05:09 +08:00
fan
b3ce617230 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 11:09:36 +08:00
fan
413307d6a5 操作类型调整 2020-07-08 11:09:26 +08:00
zyy
b58a4afdda 调整列车过滤 2020-07-08 10:56:14 +08:00
fan
0847988f81 试卷管理问题调整 2020-07-08 10:43:56 +08:00
zyy
6a14aaeace 调整大屏退出流程 2020-07-08 10:41:28 +08:00
zyy
6c1e78be50 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 10:33:31 +08:00
zyy
6112d720be 调整贵州项目大屏配置 2020-07-08 10:33:15 +08:00
fan
d863e88a70 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 10:31:56 +08:00
fan
de617cde50 设备登录调整&试卷管理调整 2020-07-08 10:31:33 +08:00
sunzhenyu
73d1af19d0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 10:21:24 +08:00
sunzhenyu
9c0df60188 三维编辑器修改，三维cctv仿真结束登出 2020-07-08 10:21:14 +08:00
joylink_cuiweidong
eb6aca6114 剧本录制接口调整 2020-07-08 09:39:25 +08:00
joylink_cuiweidong
2121bcbb76 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 09:22:10 +08:00
joylink_cuiweidong
30b1163017 故障代码调整 
设备代码调整
 2020-07-08 09:21:54 +08:00
fan
4d30e317c6 合并代码 2020-07-07 19:02:16 +08:00
fan
086e56c1a7 设备登录调整 2020-07-07 19:00:48 +08:00
zyy
9416ae6729 调整判断 2020-07-07 18:49:14 +08:00
zyy
2c362db7c1 调整贵州项目试卷关联关系 2020-07-07 18:48:12 +08:00
zyy
db230c2622 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-07 18:33:59 +08:00
zyy
3c34494608 调整试卷班级关系 2020-07-07 18:33:43 +08:00
joylink_cuiweidong
f4f5173ea3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/system/deviceManage/editConfig.vue
 2020-07-07 18:26:56 +08:00
joylink_cuiweidong
ac9a39f94c 设备管理代码调整 2020-07-07 18:25:05 +08:00
fan
276d2a8cdf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-07 18:23:04 +08:00
fan
85210dbf18 设备登录调整 2020-07-07 18:22:54 +08:00
joylink_cuiweidong
8d18151425 登陆页面代码调整 2020-07-07 17:54:11 +08:00
fan
a543aa79d1 设备登录调整 2020-07-07 17:45:26 +08:00
zyy
e710e5eb34 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-07 17:37:59 +08:00
zyy
6b0d31dbbc 调整配置项 2020-07-07 17:37:45 +08:00
joylink_cuiweidong
00a4a8c184 自动设置故障（zc故障）代码调整 2020-07-07 17:08:01 +08:00
joylink_cuiweidong
e0eb8f30dc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-07 16:30:23 +08:00
joylink_cuiweidong
e2af1335a3 修改枚举 2020-07-07 16:30:06 +08:00
zyy
2d9bfeee2e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-07 16:17:44 +08:00
zyy
bb500d4c29 调整贵州装备试卷关系，样式 2020-07-07 16:17:29 +08:00
joylink_cuiweidong
b1bca0a1df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-07 16:09:29 +08:00
joylink_cuiweidong
3480ebb7b0 设备管理代码调整 2020-07-07 16:09:14 +08:00
fan
ed92adad02 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-07 16:08:03 +08:00
fan
9dd81d0fd1 实训类型调整 2020-07-07 16:07:48 +08:00
joylink_cuiweidong
02d486c1af Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-07 15:43:46 +08:00
joylink_cuiweidong
c345a60997 项目登陆路径调整（变成 design/login?project=xxx） 2020-07-07 15:42:56 +08:00
fan
a902265f0e 调整贵装备学生管理浮点数问题 2020-07-07 15:09:45 +08:00
fan
f83a60bd88 聊天室调整 2020-07-07 14:58:10 +08:00
fan
aced111815 聊天室调整 2020-07-07 14:11:04 +08:00
joylink_fanyuhong
24daf6aea1 聊天室调整 2020-07-07 13:15:20 +08:00
fan
5dc5b256bf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-07 10:55:07 +08:00
fan
0fd852cc5a 聊天室调整 2020-07-07 10:54:57 +08:00
joylink_cuiweidong
92da104ad0 zc故障灯状态修改 2020-07-07 10:00:55 +08:00
fan
421e591f52 Merge remote-tracking branch 'origin/test_device_login' into test 
# Conflicts:
#	src/layout/components/Title.vue
#	src/views/demonstration/detail/index.vue
 2020-07-07 09:47:21 +08:00
fan
a9b3f614c8 聊天室调整 2020-07-07 09:39:27 +08:00
joylink_cuiweidong
a6b2f62c3e 北京一成都线路手动设置zc故障 2020-07-06 18:45:15 +08:00
zyy
8d09215323 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-06 18:18:13 +08:00
joylink_cuiweidong
bcc24751b4 手动zc故障代码调整 2020-07-06 18:17:44 +08:00
zyy
642027a42f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-06 18:17:03 +08:00
zyy
67edc61d0e 调整大屏分屏预览页面 2020-07-06 18:16:49 +08:00
fan
87d8dd9ea7 聊天室调整 2020-07-06 18:14:03 +08:00
fan
9883d0ed3c 聊天室调整 2020-07-06 18:00:44 +08:00
joylink_cuiweidong
dd8e0f650e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-06 17:49:35 +08:00
joylink_cuiweidong
5f1a5b3092 西安线路和宁波一号线添加动手zc故障 2020-07-06 17:49:17 +08:00
zyy
6be93b39ba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-06 17:02:31 +08:00
zyy
2c5c30216f 调整大屏预览流程，增加大屏分屏配置 2020-07-06 17:02:13 +08:00
joylink_cuiweidong
5cf1fdab5d 新版地图右键操作代码调整 2020-07-06 15:40:59 +08:00
joylink_cuiweidong
75244ca959 任何创建者 创建试卷 有试用选项 2020-07-06 13:31:49 +08:00
fan
75e838b96f 聊天室调整 2020-07-03 18:42:29 +08:00
joylink_cuiweidong
ebf86de377 故障操作代码调整 2020-07-03 18:39:24 +08:00
joylink_cuiweidong
9bef909f27 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-03 18:14:49 +08:00
joylink_cuiweidong
9d85fa7eca 信号机绘图代码调整 2020-07-03 18:14:24 +08:00
sunzhenyu
2a0a45ccef Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-03 17:24:48 +08:00
sunzhenyu
937fc4b1f9 修复通号三维重复显示设备间bug 2020-07-03 17:24:41 +08:00
joylink_cuiweidong
147f2570ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-03 17:13:44 +08:00
joylink_cuiweidong
654b79fc27 故障操作代码调整 2020-07-03 17:13:24 +08:00
sunzhenyu
8213999c4f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-03 16:35:50 +08:00
sunzhenyu
75d754e56c 修改通号三维视角 2020-07-03 16:35:43 +08:00