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
|
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
|
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 |
|
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 |
|
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
|
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 |
|
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
|
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 |
|
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
|
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
|
85210dbf18
|
设备登录调整
|
2020-07-07 18:22:54 +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
|
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
|
0fd852cc5a
|
聊天室调整
|
2020-07-07 10:54:57 +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 |
|
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 |
|
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
|
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
|
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 |
|
joylink_cuiweidong
|
3ae8582f05
|
剧本接口调整（预览与 删除剧本开始执行接口）
|
2020-07-03 16:29:40 +08:00 |
|
sunzhenyu
|
2282376acf
|
修改通号三维bug
|
2020-07-03 16:29:07 +08:00 |
|
zyy
|
ab94e1f981
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-03 15:19:12 +08:00 |
|
zyy
|
8a5845749e
|
调整绘图流程逻辑 删除多余配置
|
2020-07-03 15:18:58 +08:00 |
|
sunzhenyu
|
92d39f28ac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-03 13:49:13 +08:00 |
|
sunzhenyu
|
0b08bfae9f
|
综合演练三维通号增加设备间，三维编辑器资源管理链接配置
|
2020-07-03 13:49:05 +08:00 |
|
zyy
|
84937e8c5c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-03 11:12:10 +08:00 |
|
zyy
|
f91fc75528
|
调整西安线路进路状态
|
2020-07-03 11:11:57 +08:00 |
|
fan
|
671dff4016
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-03 10:37:41 +08:00 |
|
fan
|
189c649a89
|
调整因缓存路由导致的项目进入其他地图页面错误
|
2020-07-03 10:37:33 +08:00 |
|
joylink_cuiweidong
|
92c10db690
|
剧本录制代码调整
|
2020-07-03 09:46:26 +08:00 |
|
zyy
|
fa5097cd8d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-02 18:47:57 +08:00 |
|
zyy
|
3b39a9a04b
|
调整区段字段，控制权操作
|
2020-07-02 18:47:39 +08:00 |
|
fan
|
872122e92b
|
综合演练仿真调整
|
2020-07-02 17:57:48 +08:00 |
|
joylink_cuiweidong
|
ac4c0baecf
|
西安三号线 仿真右侧列车列表代码调整
修改故障枚举
修改退出聊天会话接口
|
2020-07-02 17:44:20 +08:00 |
|
sunzhenyu
|
b4d6bbbc03
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-02 15:33:42 +08:00 |
|
sunzhenyu
|
c34aa9d223
|
增加三维资源模型上传页面
|
2020-07-02 15:33:35 +08:00 |
|
joylink_cuiweidong
|
146d6c2d0b
|
成都三号线站台操作代码调整
|
2020-07-02 13:28:36 +08:00 |
|
joylink_cuiweidong
|
50c7363791
|
故障操作代码调整
|
2020-07-02 10:10:16 +08:00 |
|
fan
|
13a4ee614c
|
综合演练仿真调整
|
2020-07-01 18:52:29 +08:00 |
|
zyy
|
649704d3ee
|
增加实训类型
|
2020-07-01 18:49:35 +08:00 |
|
zyy
|
64d415dbb3
|
调整地图绘图数据模型
|
2020-07-01 18:08:42 +08:00 |
|
zyy
|
3c6d5b903d
|
调整联锁配置，调整数据模型
|
2020-07-01 14:52:27 +08:00 |
|
joylink_cuiweidong
|
e5fff7388b
|
地图绘制 显示条件（showCondition）调整
|
2020-07-01 13:18:43 +08:00 |
|
sunzhenyu
|
9d855f5910
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-01 12:11:30 +08:00 |
|
sunzhenyu
|
49cd3fee81
|
修改通号设备故障名称显示
|
2020-07-01 12:11:19 +08:00 |
|
joylink_cuiweidong
|
4f866bf257
|
故障操作代码调整
|
2020-07-01 11:27:09 +08:00 |
|
joylink_cuiweidong
|
ff1e707112
|
故障代码调整
|
2020-07-01 09:32:36 +08:00 |
|
joylink_cuiweidong
|
c0e3c99dc8
|
故障代码调整
|
2020-07-01 09:32:01 +08:00 |
|
joylink_cuiweidong
|
79534ffa5e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-30 19:17:45 +08:00 |
|
joylink_cuiweidong
|
1c6eb510c9
|
故障代码调整
|
2020-06-30 19:17:29 +08:00 |
|
fan
|
ce180b1448
|
综合演练仿真调整
|
2020-06-30 18:35:57 +08:00 |
|
zyy
|
58a9b27939
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-30 15:44:48 +08:00 |
|
zyy
|
b43009ab06
|
调整权限分配时间限制
|
2020-06-30 15:44:31 +08:00 |
|
joylink_cuiweidong
|
b934ee7edb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-30 14:41:56 +08:00 |
|
fan
|
6a0433f12f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-30 14:43:20 +08:00 |
|
fan
|
755eab6301
|
调整考试系统获取数据为空时未清除原有数据
|
2020-06-30 14:42:56 +08:00 |
|
joylink_cuiweidong
|
619adde869
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-30 14:41:40 +08:00 |
|
joylink_cuiweidong
|
bb6c5319c7
|
故障管理页面代码调整
|
2020-06-30 14:41:22 +08:00 |
|
fan
|
8f4cecec0c
|
综合演练调整
|
2020-06-30 14:27:32 +08:00 |
|
zyy
|
9748ca2f63
|
调整成都三号线操作定义，位置提示
|
2020-06-30 13:32:50 +08:00 |
|
zyy
|
82415903f5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-30 11:19:58 +08:00 |
|
zyy
|
7df86adff1
|
调整表单赋值拷贝
|
2020-06-30 11:19:33 +08:00 |
|
joylink_cuiweidong
|
f6982eb966
|
解决 实训平台邀请综合演练 设计平台弹出邀请弹窗的问题
仿真代码调整
|
2020-06-29 17:33:19 +08:00 |
|
joylink_cuiweidong
|
ccb976f078
|
仿真代码调整
|
2020-06-29 15:55:31 +08:00 |
|
fan
|
a689103abe
|
综合演练调整
|
2020-06-29 13:11:27 +08:00 |
|
fan
|
103ae24b64
|
仿真成员管理
|
2020-06-29 09:12:30 +08:00 |
|
joylink_cuiweidong
|
237aece890
|
代码调整
|
2020-06-28 18:34:32 +08:00 |
|
zyy
|
2ddd8f12d2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-28 16:04:18 +08:00 |
|
zyy
|
7873917d43
|
调整数据模型过滤空置，调整成都3号线实操
|
2020-06-28 16:03:59 +08:00 |
|