Commit Graph

6281 Commits

Author SHA1 Message Date
fan
49011b95e2 添加线路配置delayWhenCancelRouteWithAbnormalInterlock & 哈尔滨部分问题调整 2021-05-24 15:53:38 +08:00
fan
4796e7f648 代码暂提 2021-05-24 11:29:59 +08:00
sunzhenyu
e031986664 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-21 15:31:29 +08:00
sunzhenyu
351d268e52 三维课程增加场景id显示,修改提示窗下一步功能区分,修改事件驱动条件 2021-05-21 15:30:50 +08:00
joylink_cuiweidong
e17104f537 地图绘制 停站时间/运行等级 代码调整 2021-05-21 15:12:40 +08:00
joylink_cuiweidong
13af28467c 地图绘制 停站时间/运行等级 界面与接口代码调整
生成联锁配置 删除 延续保护构建是否只考虑一个道岔计轴
生成联锁配置 新增 延续保护最小长度
2021-05-21 15:02:28 +08:00
joylink_cuiweidong
4cefb0cfbe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-21 11:34:28 +08:00
joylink_cuiweidong
bf8d0eb574 地图绘制 停站时间 界面与接口代码调整 2021-05-21 11:33:37 +08:00
fan
fbd700d52e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-21 10:01:54 +08:00
fan
2438b9f0a0 删除仿真、绘图、运行图编制的心跳检测 2021-05-21 10:01:45 +08:00
zyy
54ad4bf93b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 17:58:42 +08:00
zyy
55ee64479f 调整系统绘图模块新增 2021-05-20 17:58:23 +08:00
fan
e49840afc8 绑定数据编辑调整 2021-05-20 17:51:00 +08:00
fan
7a33bae3fe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 17:39:32 +08:00
fan
4c948d91ff 绑定数据编辑调整 2021-05-20 17:38:55 +08:00
zyy
89b63e9709 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 17:13:19 +08:00
zyy
c4ec37a403 调整权限字段显示 2021-05-20 17:13:05 +08:00
sunzhenyu
f3c9bfdcb6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 17:06:35 +08:00
sunzhenyu
5392755eda 修改三维课程联控菜单位置,修改三维模型添加bug,修改移动模型指示器,修改操作切换,修改模型场景中显示移除逻辑,修改事件触发器逻辑 2021-05-20 17:06:28 +08:00
zyy
3a2baf8374 调整权限流程 2021-05-20 16:37:55 +08:00
zyy
24aefdebd4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 15:13:54 +08:00
zyy
be1106fc20 调整权限字段显示,地图绘制新增 2021-05-20 15:13:37 +08:00
fan
e212bd52e9 pdf上传检索调整 2021-05-20 15:06:14 +08:00
fan
5ee943a313 暂提 2021-05-20 11:04:21 +08:00
fan
db6e9503f3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test—nanjing02 2021-05-20 09:29:10 +08:00
zyy
fbb9365b62 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-19 18:14:44 +08:00
zyy
83561a2545 调整权限分发 2021-05-19 18:14:27 +08:00
fan
8db97250d8 暂提 2021-05-19 18:03:58 +08:00
fan
9b422cd3b9 南京二号线调整(未完) 2021-05-19 16:07:52 +08:00
fan
6b57369b8f 车站值班员名称显示调整&暂停前端仿真计时&仿真倍速管理员可见 2021-05-19 15:45:49 +08:00
zyy
4cd675cf67 增加系统预览绘制 2021-05-19 15:07:59 +08:00
joylink_cuiweidong
65daf903bf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-19 09:44:05 +08:00
joylink_cuiweidong
17c4fdafa6 代码调整 2021-05-19 09:43:24 +08:00
fan
853e049cc5 哈尔滨运行图调整 2021-05-18 14:19:28 +08:00
joylink_cuiweidong
b87425f8c8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-18 10:49:20 +08:00
joylink_cuiweidong
622885d3d5 删除暂时没有用的npm 模块(lodash,mock)
发布地图 地图分组代码调整
2021-05-18 10:48:58 +08:00
fan
4b83445624 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-18 10:04:20 +08:00
fan
7af49deb90 综合演练添加车站值班员 2021-05-18 10:04:03 +08:00
joylink_cuiweidong
60aeeaedea 代码调整 2021-05-17 19:15:25 +08:00
joylink_cuiweidong
1ca70a08b8 代码调整 2021-05-17 19:07:24 +08:00
joylink_cuiweidong
6a07a81233 代码调整 2021-05-17 19:06:00 +08:00
joylink_cuiweidong
5a6fcc48eb 代码调整 2021-05-17 19:00:27 +08:00
joylink_cuiweidong
c0d2b19589 代码调整 2021-05-17 18:57:20 +08:00
joylink_cuiweidong
ada429fcde pdf上传 代码调整 2021-05-17 18:41:58 +08:00
joylink_cuiweidong
8033c42655 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-17 17:20:49 +08:00
joylink_cuiweidong
57feb88e6c pdf 上传 代码调整 2021-05-17 17:20:26 +08:00
fan
0a9c8665ff 代码调整 2021-05-17 16:37:56 +08:00
fan
5215d8ba2c merge 2021-05-17 13:37:03 +08:00
fan
bc2fa1fbae 代码调整 2021-05-17 13:35:49 +08:00
joylink_cuiweidong
3bbfae4082 pdf上传 代码调整 2021-05-17 10:42:13 +08:00
joylink_cuiweidong
290542ee28 pdf上传代码调整 2021-05-17 09:51:06 +08:00
zyy
1dba8c2e9d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/utils/baseUrl.js
2021-05-14 18:33:09 +08:00
zyy
54295fe452 增加pdf 上传 2021-05-14 18:31:46 +08:00
sunzhenyu
a8d89df500 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-14 18:09:24 +08:00
sunzhenyu
883c70bd30 增加三维课程角色选择,增加三维课程信息提示跳转部分 2021-05-14 18:09:18 +08:00
fan
69c6526516 Bug260 、Bug261、郑州共赢代码调整 2021-05-14 15:59:04 +08:00
fan
006b9762e1 merge 2021-05-14 15:07:00 +08:00
fan
ddfddfa292 代码调整 2021-05-14 15:05:57 +08:00
zyy
9bd90ce182 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-14 13:14:24 +08:00
zyy
af9eb2c8b6 增加文章编辑器 2021-05-14 13:14:08 +08:00
joylink_cuiweidong
d584e7ea7d 添加 图纸管理页面 2021-05-13 18:09:10 +08:00
joylink_cuiweidong
02241f455a 地图绘图 高级数据 代码调整 2021-05-13 14:19:58 +08:00
joylink_cuiweidong
61b982e9b6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-13 13:55:21 +08:00
joylink_cuiweidong
f4cd046f1a 大铁项目 根据车站值班员 显示绘图 2021-05-13 13:55:02 +08:00
fan
149d4cf995 Bug 206 语音训练结果在查询的时候,选择A用户,结果里出现了B用户的语音 2021-05-13 13:22:30 +08:00
fan
bf69914d21 代码问题调整
(cherry picked from commit 7cd36b7446)
2021-05-13 13:13:44 +08:00
sunzhenyu
c5a020e1a6 修改三维设备展示文本错别字 2021-05-12 10:37:39 +08:00
sunzhenyu
7b4d6a267e 修改三维设备手摇道岔文字描述 2021-05-11 16:11:15 +08:00
sunzhenyu
7b73ff0e69 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-11 15:59:44 +08:00
sunzhenyu
14d63ae42a 三维设备视图手摇道岔操作展示 2021-05-11 15:59:35 +08:00
fan
8cf5d36ce3 南京二号线调整 2021-05-11 15:36:11 +08:00
fan
c1d5b84e0b 添加一键校验发布地图 2021-05-10 15:44:34 +08:00
fan
9c7b6e4ab2 运行图解析调整 2021-05-10 15:08:58 +08:00
fan
4f07f16ecf 运行图解析调整 2021-05-10 14:40:37 +08:00
joylink_cuiweidong
d0ce678ca0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-10 13:50:55 +08:00
joylink_cuiweidong
cc259c8a15 哈尔滨项目运行图代码调整 2021-05-10 13:50:17 +08:00
fan
a9da38daf2 运行图解析调整 2021-05-10 09:13:22 +08:00
fan
b2892930ad 语音训练添加录音播放 2021-05-08 14:33:55 +08:00
fan
e597a3ae8f 添加站台紧急停车 2021-05-08 14:11:22 +08:00
fan
cfd6990189 场景语音训练调整 2021-05-06 16:22:10 +08:00
fan
6cb4ee9c27 场景语音训练调整 2021-05-06 16:15:09 +08:00
fan
0b78df8c9c 场景语音训练调整 2021-05-06 15:35:14 +08:00
fan
78c8b39edb 场景语音训练调整 2021-05-06 14:50:34 +08:00
fan
b4a0a42235 场景语音训练调整 2021-05-06 10:30:29 +08:00
fan
8dc44f11f8 场景语音训练调整 2021-05-06 09:54:51 +08:00
fan
21990ebf11 场景语音训练调整 2021-04-30 17:38:15 +08:00
fan
cc00e11304 场景语音训练调整 2021-04-30 17:34:37 +08:00
fan
d3238e77e2 场景语音训练调整 2021-04-30 16:50:04 +08:00
fan
21fe3c8b1e 语音训练调整 2021-04-30 16:35:28 +08:00
fan
f9d2d8a0ac 语音训练调整 2021-04-30 16:14:56 +08:00
sunzhenyu
861065e159 修改三维编辑器v-for key警告 2021-04-30 10:01:36 +08:00
sunzhenyu
528af2fea6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-29 17:56:01 +08:00
sunzhenyu
2f60a7a352 增加静态测试模型,修改三维课程播放器模型触发器模块,增加三维动画模块,修改课程信息模块 2021-04-29 17:55:55 +08:00
fan
0585502691 大铁线路操作调整 2021-04-29 15:50:15 +08:00
fan
acf4f6bea9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-29 13:25:58 +08:00
fan
ae5df5de5b 大铁线路操作调整 2021-04-29 13:25:48 +08:00
joylink_cuiweidong
87c86536df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-29 11:02:37 +08:00
joylink_cuiweidong
9ce15c6d25 代码调整 2021-04-29 11:02:15 +08:00
fan
5ee38364a1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-29 10:35:44 +08:00
fan
ed7c4bb8f5 大铁线路操作调整 2021-04-29 10:35:34 +08:00