Commit Graph

294 Commits

Author SHA1 Message Date
joylink_cuiweidong
901ab1a8bd 剧本添加提示 2020-05-15 16:54:31 +08:00
joylink_cuiweidong
ddbf334419 剧本代码调整 2020-05-14 19:13:44 +08:00
joylink_cuiweidong
a416b7b443 剧本代码调整 2020-05-14 17:58:26 +08:00
joylink_cuiweidong
70f06409df 综合演练 语音聊天接口调整
剧本预览 代码调整
2020-05-14 14:36:15 +08:00
joylink_cuiweidong
36ca6dc3d1 综合演练 聊天代码调整 2020-05-13 19:31:14 +08:00
joylink_cuiweidong
4631590df0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-13 18:06:15 +08:00
joylink_cuiweidong
2b8757a074 实训平台 综合演练 聊天代码调整 2020-05-13 18:05:48 +08:00
zyy
ecf563e8de 调整大屏系统保存 2020-05-13 16:29:10 +08:00
zyy
0a09f6a79b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-13 10:07:34 +08:00
zyy
781f96f89c 调整大屏预览,区段字段调整 2020-05-13 10:07:07 +08:00
joylink_cuiweidong
13a3ccf066 代码调整 2020-05-12 19:02:53 +08:00
joylink_cuiweidong
376662d96e 实训平台 综合演练 聊天代码调整 2020-05-12 17:49:00 +08:00
joylink_cuiweidong
6fe5363706 实训平台 综合演练 聊天代码调整 2020-05-12 16:46:41 +08:00
joylink_fanyuhong
6cf999deee 列车调整 2020-05-10 20:43:21 +08:00
fan
62d12e8ed5 iscs调整图元说明公共区域 2020-05-07 16:39:38 +08:00
zyy
eb6cd7ce2d 调整道岔使能发送流程,及绘图 2020-04-30 11:28:56 +08:00
fan
f3ab2337e8 西安二号线信号封锁调整(未完) 2020-04-30 08:54:17 +08:00
fan
7d3a6ddafa 西安二号线信号机操作调整 2020-04-29 11:36:16 +08:00
joylink_cuiweidong
056b9ffe9e 综合演练仿真 聊天 切换聊天 聊天布局 语音播放代码调整 2020-04-28 14:04:22 +08:00
joylink_cuiweidong
bfe23bf70b 综合演练仿真 聊天 发送语音消息 消息推送代码调整 2020-04-27 18:50:15 +08:00
fan
695ea67e27 西安二号线绘图调整&西安二号线站台操作调整&派班计划冲突显示调整 2020-04-26 16:24:34 +08:00
joylink_cuiweidong
511d5e48d4 综合演练仿真 聊天 socket 订阅 2020-04-22 18:17:27 +08:00
fan
2f4b765d97 运行图加载调整&交路数据调整 2020-04-21 15:08:27 +08:00
fan
a1869a531f 集中站分隔调整&线路管理配置调整 2020-04-15 14:13:08 +08:00
zyy
b7edbc8697 侧防列表更新 2020-04-13 18:59:01 +08:00
joylink_cuiweidong
8475870cf8 哈尔滨/宁波 现地 实训设置当前所在集中站 代码调整 2020-04-13 14:54:35 +08:00
zyy
289f1dbff0 调整现地列车显示 2020-04-09 17:37:27 +08:00
fan
6667adca07 实训调整 2020-04-07 14:40:24 +08:00
fan
2a59c51b00 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-01 13:49:18 +08:00
fan
225a739f60 打包本地项目不进行cdn加载 2020-04-01 13:47:29 +08:00
joylink_cuiweidong
995460afdf 仿真界面添加列车详情 2020-04-01 12:53:58 +08:00
joylink_cuiweidong
955ddacbe0 Merge branch 'dev' into test 2020-03-31 19:09:06 +08:00
joylink_cuiweidong
bc6940f80b 仿真界面添加列车详情(未完成) 2020-03-31 19:06:23 +08:00
sunzhenyu
ec0f59682b merge 2020-03-31 18:45:00 +08:00
sunzhenyu
d4f7da9c8b 添加驾驶操作面板,三维模型资源改本地 2020-03-31 18:30:15 +08:00
fan
335132c9b9 Merge remote-tracking branch 'origin/dev' into test 2020-03-31 16:55:58 +08:00
joylink_cuiweidong
3472860fbd 新版 剧本编制 添加动作指令操作添加 以及 动作指令展示 2020-03-31 14:52:19 +08:00
fan
63c73ab78c Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
#	src/views/jlmap3d/simulation/jl3dsimulation.vue
2020-03-31 11:14:33 +08:00
fan
ab4928d924 差异化打包调整&哈尔滨登录页 2020-03-30 13:07:11 +08:00
fan
5bcb42e0f2 宁波调整 2020-03-25 17:32:57 +08:00
fan
9ff1d7e30c Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
#	src/store/modules/socket.js
2020-03-24 10:13:01 +08:00
fan
09a51635f5 综合演练问题调整 2020-03-23 16:42:21 +08:00
zyy
ad6b8f8dba 调整区段流程逻辑,站台流程 2020-03-23 13:48:35 +08:00
fan
88ca3a568e Merge remote-tracking branch 'origin/dev' into test 2020-03-20 18:51:36 +08:00
sunzhenyu
d55ca741dc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-03-20 17:00:46 +08:00
sunzhenyu
0b6415b162 修改三维设备视图,修改站台模型贴图,修改客流量加载页面 2020-03-20 17:00:12 +08:00
fan
1e8d304249 Merge remote-tracking branch 'origin/dev_dukang' into dev
# Conflicts:
#	src/scripts/cmdPlugin/CommandEnum.js
#	src/utils/baseUrl.js
2020-03-20 15:16:08 +08:00
fan
80fda91dba 自动折返&引导总锁调整 2020-03-20 14:12:02 +08:00
fan
404d867767 绘图&成三现地调整 2020-03-20 11:09:06 +08:00
fan
36b7d7309a 增加绘图表示灯&&线条颜色 2020-03-19 16:17:34 +08:00