fan
|
a18c84f684
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-29 11:14:57 +08:00 |
|
fan
|
24e3a606fa
|
调整会话按钮名称&宁波一剩余菜单回车快捷键
|
2020-07-29 11:14:45 +08:00 |
|
zyy
|
d91467db70
|
调整地图加载功能栏样式
|
2020-07-29 10:27:02 +08:00 |
|
zyy
|
1ce9303bcb
|
调整哈尔滨显示左下角菜单栏
|
2020-07-29 09:31:08 +08:00 |
|
zyy
|
6ca803d06d
|
调整车站颜色，功能栏宽度判断
|
2020-07-28 17:55:07 +08:00 |
|
fan
|
10918d1f06
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-28 16:29:06 +08:00 |
|
fan
|
0ad13f9fe8
|
宁波菜单弹框回车快捷键
|
2020-07-28 16:28:55 +08:00 |
|
zyy
|
2fd8c44f85
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-28 14:44:52 +08:00 |
|
zyy
|
9f53e6e5f0
|
调整综合演练按钮显示逻辑，调整聊天窗口逻辑
|
2020-07-28 14:44:37 +08:00 |
|
joylink_cuiweidong
|
66b9d7f85a
|
剧本录制代码调整
|
2020-07-28 13:56:36 +08:00 |
|
zyy
|
027f15102e
|
调整地图加载流程
|
2020-07-28 11:29:39 +08:00 |
|
zyy
|
59a75280a6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/lesson/lessoncategory/edit/chapter/list.vue
# src/views/lesson/trainingRule/list.vue
# src/views/newMap/displayNew/index.vue
|
2020-07-27 18:09:38 +08:00 |
|
zyy
|
42d9906550
|
调整地图加载多余配置，增加宁波右键列车新指令
|
2020-07-27 18:04:47 +08:00 |
|
fan
|
5462c7aa21
|
增加crsc西安工业集团登录页面
|
2020-07-27 17:26:32 +08:00 |
|
zyy
|
2c39916217
|
调整运行图预览逻辑
|
2020-07-27 13:15:01 +08:00 |
|
zyy
|
fdd125e10f
|
修改运行图管理加载失败状态调整
|
2020-07-27 09:49:52 +08:00 |
|
joylink_zyy
|
c50adf149b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-25 15:07:59 +08:00 |
|
joylink_zyy
|
766d2b93a7
|
调整单人仿真获取人员列表
|
2020-07-25 15:07:45 +08:00 |
|
zyy
|
cc5d68de39
|
调整综合演练流程，增加列车操作
|
2020-07-24 17:17:40 +08:00 |
|
zyy
|
b69cc2c4ab
|
调整哈尔滨线路设备管理，判断设备管理显示逻辑
|
2020-07-24 14:11:03 +08:00 |
|
zyy
|
584f65d285
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 11:01:33 +08:00 |
|
zyy
|
fe08980f2f
|
调整判断
|
2020-07-24 11:01:22 +08:00 |
|
joylink_cuiweidong
|
196a611d70
|
仿真聊天代码调整
|
2020-07-24 10:35:05 +08:00 |
|
zyy
|
e7ee0344b0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/displayNew/index.vue
|
2020-07-23 18:07:46 +08:00 |
|
zyy
|
fb0f961b17
|
删除多余线路逻辑
|
2020-07-23 18:04:13 +08:00 |
|
joylink_cuiweidong
|
5a35fa4f29
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/displayNew/index.vue
|
2020-07-23 17:57:36 +08:00 |
|
joylink_cuiweidong
|
986ce16d78
|
仿真系统聊天代码调整
|
2020-07-23 17:51:37 +08:00 |
|
zyy
|
9ec64f1eeb
|
调整加载方式及判断
|
2020-07-23 17:09:29 +08:00 |
|
joylink_cuiweidong
|
ece0ac79a3
|
剧本预览代码调整
|
2020-07-23 10:29:53 +08:00 |
|
joylink_cuiweidong
|
a85a543a39
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-22 17:20:47 +08:00 |
|
joylink_cuiweidong
|
597822430e
|
剧本预览代码调整
|
2020-07-22 17:20:24 +08:00 |
|
fan
|
8c7a78a545
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-22 14:20:12 +08:00 |
|
fan
|
02774eeb1e
|
调整综合演练大屏跳出&限制新窗口预登出
|
2020-07-22 14:19:58 +08:00 |
|
joylink_cuiweidong
|
fbe928749b
|
剧本预览代码调整
|
2020-07-22 13:55:12 +08:00 |
|
zyy
|
31b6241bf7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-22 13:16:21 +08:00 |
|
zyy
|
b9a412943e
|
调整哈尔滨聊天窗口位置
|
2020-07-22 13:16:04 +08:00 |
|
joylink_cuiweidong
|
f3d2982bd2
|
剧本预览代码调整
|
2020-07-21 19:27:32 +08:00 |
|
joylink_cuiweidong
|
1038063860
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 15:23:23 +08:00 |
|
joylink_cuiweidong
|
54b838a46b
|
剧本预览代码调整
聊天会话代码优化
|
2020-07-21 15:15:28 +08:00 |
|
zyy
|
7498e7c844
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 13:38:13 +08:00 |
|
zyy
|
4bb41700bc
|
列车提示信息调整，哈尔滨线路操作
|
2020-07-21 13:37:59 +08:00 |
|
joylink_cuiweidong
|
57ffa85451
|
剧本预览代码调整
|
2020-07-21 10:49:01 +08:00 |
|
joylink_cuiweidong
|
2dc14c9374
|
地图绘制代码调整
|
2020-07-20 15:10:57 +08:00 |
|
joylink_cuiweidong
|
39eace3b40
|
剧本预览代码调整
|
2020-07-20 10:28:31 +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
|
fefd4b53b6
|
会话调整&设备配置调整
|
2020-07-17 16:35:24 +08:00 |
|
fan
|
0a50c69b2c
|
设备配置调整
|
2020-07-16 19:11:20 +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
|
cce290e73c
|
剧本预览代码调整
|
2020-07-15 19:05:32 +08:00 |
|
joylink_cuiweidong
|
94d02dc0f8
|
剧本编制样式调整
|
2020-07-15 18:08:49 +08:00 |
|
joylink_cuiweidong
|
adde89a41d
|
剧本编制代码调整
|
2020-07-15 16:09:15 +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
|
172623c0f1
|
调整宁波线路道岔失表显示
|
2020-07-14 18:14:39 +08:00 |
|
zyy
|
77b02b947e
|
调整设备连接流程
|
2020-07-14 16:07:43 +08:00 |
|
joylink_cuiweidong
|
a96ace44d1
|
剧本预览代码调整
|
2020-07-14 14:48:26 +08:00 |
|
zyy
|
8fb216dbae
|
增加项目中设备管理页面
|
2020-07-14 13:27:00 +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 |
|
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 |
|
joylink_cuiweidong
|
9627e85bf0
|
剧本编制 会话消息代码调整
|
2020-07-10 18:06:55 +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 |
|
joylink_cuiweidong
|
2b5b21c1cf
|
剧本编制 角色列表代码调整
|
2020-07-10 16:40:42 +08:00 |
|
joylink_cuiweidong
|
54a5a29f26
|
剧本预览代码调整
|
2020-07-10 14:46:18 +08:00 |
|
joylink_cuiweidong
|
4c307cc848
|
剧本编制代码调整
|
2020-07-10 10:53:44 +08:00 |
|
joylink_cuiweidong
|
e13fcb02e5
|
故障设置代码调整
|
2020-07-10 10:36:10 +08:00 |
|
joylink_cuiweidong
|
0c9cd52c9a
|
剧本编制代码调整
|
2020-07-09 17:39:43 +08:00 |
|
joylink_cuiweidong
|
3aa0d55ea3
|
剧本编制代码调整
|
2020-07-09 16:54:31 +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
|
c315f9121a
|
剧本编制代码调整
|
2020-07-09 10:50:56 +08:00 |
|
joylink_cuiweidong
|
96ff4c49f6
|
剧本编制代码调整
|
2020-07-09 10:17:55 +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 |
|
fan
|
050fc8141c
|
设备登录调整
|
2020-07-08 17:36:32 +08:00 |
|
fan
|
e8d54bc1d0
|
合并代码
|
2020-07-08 15:42:23 +08:00 |
|
fan
|
714113c819
|
设备登录调整
|
2020-07-08 15:40:55 +08:00 |
|
zyy
|
753172433c
|
调整实训流程
|
2020-07-08 14:40:04 +08:00 |
|
joylink_cuiweidong
|
fc97643116
|
剧本编制代码调整
|
2020-07-08 13:05:09 +08:00 |
|
joylink_cuiweidong
|
eb6aca6114
|
剧本录制接口调整
|
2020-07-08 09:39:25 +08:00 |
|
joylink_cuiweidong
|
30b1163017
|
故障代码调整
设备代码调整
|
2020-07-08 09:21:54 +08:00 |
|
joylink_cuiweidong
|
00a4a8c184
|
自动设置故障（zc故障）代码调整
|
2020-07-07 17:08:01 +08:00 |
|
fan
|
aced111815
|
聊天室调整
|
2020-07-07 14:11:04 +08:00 |
|
joylink_cuiweidong
|
ebf86de377
|
故障操作代码调整
|
2020-07-03 18:39:24 +08:00 |
|
joylink_cuiweidong
|
654b79fc27
|
故障操作代码调整
|
2020-07-03 17:13:24 +08:00 |
|
joylink_cuiweidong
|
3ae8582f05
|
剧本接口调整（预览与 删除剧本开始执行接口）
|
2020-07-03 16:29:40 +08:00 |
|