Commit Graph

323 Commits

Author SHA1 Message Date
zyy
e2c32f2e68 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-31 16:22:43 +08:00
zyy
70114a0014 调整宁波线路操作 2020-07-31 16:22:29 +08:00
joylink_cuiweidong
cb6d891d2b 代码调整 2020-07-31 16:20:07 +08:00
joylink_cuiweidong
48cd28bd88 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-31 16:03:48 +08:00
joylink_cuiweidong
ff912ff0f5 宁波一号线 运行图预览加点选 2020-07-31 16:03:32 +08:00
zyy
d15328de57 调整地图绘制流程 2020-07-31 15:24:44 +08:00
zyy
f1d72d0968 调整综合演练流程 2020-07-30 18:42:41 +08:00
joylink_cuiweidong
8663a4fba0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-30 16:45:22 +08:00
joylink_cuiweidong
c2c3fc0b22 运行图加载根据车次号 运行图颜色代码调整 2020-07-30 16:44:41 +08:00
fan
0a7d3d97bd 调整剧本会话@ 2020-07-30 16:33:08 +08:00
zyy
48491044ce 调整列表样式 2020-07-30 15:32:39 +08:00
fan
955ad3a89d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-30 13:46:55 +08:00
fan
c15860b104 代码调整 2020-07-30 13:43:00 +08:00
joylink_cuiweidong
2408797a04 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-30 11:09:25 +08:00
joylink_cuiweidong
31a2854a15 运行图预览运行列车颜色代码调整 2020-07-30 11:08:59 +08:00
fan
c741783ea0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-29 18:27:19 +08:00
fan
95e4479d04 考试设备定位调整 2020-07-29 18:26:58 +08:00
zyy
841946ce29 调整按钮样式 2020-07-29 17:41:19 +08:00
zyy
e6551dd4a0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-29 16:15:53 +08:00
zyy
480d98deb9 调整成员聊天样式 2020-07-29 16:15:39 +08:00
fan
add4a4dc8b 仿真右下侧按钮调整 2020-07-29 14:40:16 +08:00
zyy
d1362aa923 调整样式按钮位置 2020-07-29 13:52:34 +08:00
zyy
c2b17d3615 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-29 13:23:35 +08:00
zyy
c3e7f8227a 调整区段字段显示,调整功能按钮样式 2020-07-29 13:23:25 +08:00
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