joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
8,994 Commits 20 Branches 0 Tags 448 MiB
7d0a4269e6
Commit Graph

8748 Commits

Author SHA1 Message Date
fan
ab804e3b95 南京二号线状态调整 道岔长闪 2021-01-14 16:26:04 +08:00
joylink_cuiweidong
c4f6cde2c4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-14 16:04:03 +08:00
joylink_cuiweidong
28babc78f9 岔心 绘图调整 2021-01-14 16:03:48 +08:00
lVAL
2fc70489eb 修改南京2号线菜单皮肤 2021-01-14 15:44:56 +08:00
lVAL
51096d5ea1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-14 15:32:33 +08:00
lVAL
eb7fa1f5cb 修改实现南京2行调和现地界面操作 2021-01-14 15:32:17 +08:00
joylink_cuiweidong
8118b1ffad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-14 14:59:12 +08:00
joylink_cuiweidong
cadda00719 区段 物理区段 实际长度修改 bug调整 2021-01-14 14:58:42 +08:00
fan
ec87dc8eaf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-14 14:43:03 +08:00
fan
9c7c0f674e 南京二号线状态调整 2021-01-14 14:42:53 +08:00
lVAL
44adeaf24a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-14 14:15:18 +08:00
lVAL
22403b198d 修改南京2号线菜单，以及样式 2021-01-14 14:15:02 +08:00
joylink_cuiweidong
845f10caf6 岔心绘图代码调整 
bug调整：新建完一个信号机 三个状态不发生改变
 2021-01-14 13:04:04 +08:00
joylink_cuiweidong
3be5df98e8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-13 18:33:21 +08:00
joylink_cuiweidong
becb6a03df 岔心代码调整 2021-01-13 18:33:07 +08:00
lVAL
1dfa8f5b19 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-13 18:08:02 +08:00
lVAL
37bc98d706 修改应答器 计算方式 2021-01-13 18:07:49 +08:00
joylink_cuiweidong
c42a184b7b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-13 17:54:11 +08:00
joylink_cuiweidong
7ac59f6006 岔心 绘图代码调整 2021-01-13 17:53:51 +08:00
lVAL
9f4155b70d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-13 17:45:49 +08:00
lVAL
15f94a7d1d 优化 应答器创建 选择关联区段类型 以及优化绘制显示位置 2021-01-13 17:45:38 +08:00
joylink_cuiweidong
752b4e9a26 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/config/skinCode/nanjing_02.js
#	src/jmapNew/utils/parser.js
 2021-01-13 17:43:15 +08:00
joylink_cuiweidong
99644039d3 新建车站以后 无法点击其他的东西 bug 调整 2021-01-13 17:34:57 +08:00
sunzhenyu
d3c833a35f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-13 17:11:20 +08:00
sunzhenyu
90fea11aab 临时增加三维数据创建场景时同步站场图内外侧数据 2021-01-13 17:11:07 +08:00
joylink_cuiweidong
ac6f3673d4 Merge branch 'master' of https://git.code.tencent.com/lian-cbtc/jl-client 2021-01-13 17:02:31 +08:00
joylink_cuiweidong
7599458c8f 岔心 元素绘图代码调整 2021-01-13 17:01:53 +08:00
lVAL
fd3f82e7ba 修改炼精二号线 逻辑区段名称大小 2021-01-13 14:18:48 +08:00
lVAL
006d784178 修改应答器bug 2021-01-13 10:26:52 +08:00
lVAL
47d9e6573d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-13 09:52:24 +08:00
lVAL
ede7335ab1 修改 交路选择起始信号机和终止信号机操作的bug问题 2021-01-13 09:51:59 +08:00
thesai
032ec93af4 Merge remote-tracking branch 'origin/test' 2021-01-12 23:46:38 +08:00
thesai
2d154f1611 设备登录行值显示 2021-01-12 23:46:07 +08:00
thesai
8eb293f074 Merge remote-tracking branch 'origin/test' 2021-01-12 23:14:34 +08:00
thesai
4adc474b54 设备登录行值显示 2021-01-12 23:13:05 +08:00
joylink_cuiweidong
b8c8f773c3 Merge remote-tracking branch 'remotes/origin/test' 2021-01-12 20:22:06 +08:00
joylink_cuiweidong
fbb8157ff1 代码调整 2021-01-12 20:20:56 +08:00
joylink_cuiweidong
b26ec956d0 Merge remote-tracking branch 'remotes/origin/test' 2021-01-12 20:16:07 +08:00
joylink_cuiweidong
5cfef217d0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-12 20:15:28 +08:00
joylink_cuiweidong
0b4636f618 添加 绑定单位 功能 2021-01-12 20:15:14 +08:00
fan
df3c31dd44 Merge remote-tracking branch 'origin/test' into test 2021-01-12 20:06:58 +08:00
fan
67d9af587f 生成组织二维码state修改 2021-01-12 20:06:45 +08:00
joylink_cuiweidong
f9ad56bca6 Merge remote-tracking branch 'remotes/origin/test' 2021-01-12 19:06:59 +08:00
joylink_cuiweidong
b13136df51 代码调整 2021-01-12 19:05:28 +08:00
joylink_cuiweidong
cb35140942 Merge remote-tracking branch 'remotes/origin/test' 2021-01-12 19:01:29 +08:00
joylink_cuiweidong
3a5d5def46 考试系统 添加 修改试卷 代码调整 2021-01-12 18:59:16 +08:00
fan
73f98ce8b4 考试权限调整 2021-01-12 18:51:38 +08:00
fan
378d5430e6 考试权限调整 2021-01-12 18:34:10 +08:00
fan
35790f6693 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-12 18:27:05 +08:00
fan
21e2455472 项目登录行调 运行图预览跳转新页面 2021-01-12 18:26:55 +08:00
joylink_cuiweidong
7378220e85 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-12 18:07:08 +08:00
joylink_cuiweidong
12acee5bc7 代码调整 2021-01-12 18:06:52 +08:00
sunzhenyu
646836ecb4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-12 17:58:12 +08:00
sunzhenyu
057a6e41f8 删除无用注释 2021-01-12 17:57:59 +08:00
joylink_cuiweidong
b33e4b92ed 暂时 注释 西安二号线 未实现的 功能 2021-01-12 17:57:44 +08:00
sunzhenyu
d257bf254b 修改sdy行调沙盘，现地cctv 2021-01-12 17:57:04 +08:00
joylink_cuiweidong
b04792f529 运行图编辑 新增计划代码bug 调整 2021-01-12 17:38:30 +08:00
joylink_cuiweidong
1e2e8c2609 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/config/skinCode/nanjing_02.js
#	src/jmapNew/shape/Responder/index.js
 2021-01-12 17:27:25 +08:00
joylink_cuiweidong
85a88a9431 岔心 绘图代码调整 2021-01-12 17:25:32 +08:00
fan
a6481906fb 编辑用户信息强制要有名称=》去掉避免 2021-01-12 16:19:10 +08:00
fan
63e2a57f36 Bug48: 地图列表的位置锁定&仿真权限判断调整 2021-01-12 15:40:05 +08:00
fan
4b95be70dd 单位添加关联项目 2021-01-12 14:34:20 +08:00
fan
affd81e756 试卷创建调整 2021-01-12 14:13:56 +08:00
fan
e4cf9de494 绑定单位调整 2021-01-12 13:22:24 +08:00
fan
de395f9bb4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-12 13:20:12 +08:00
fan
dbc02056fb 绑定单位调整 2021-01-12 13:18:52 +08:00
lVAL
64df012fc3 设置应答器 绘图显示 仿真不显示 2021-01-12 11:32:39 +08:00
lVAL
ec5be4bccb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-12 11:00:38 +08:00
lVAL
8c261bb3a6 优化应答器 状态处理功能 2021-01-12 11:00:16 +08:00
fan
0e5ebf2445 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-12 10:20:49 +08:00
fan
097c95beaa 教学管理文字调整 2021-01-12 10:19:43 +08:00
joylink_cuiweidong
54a312c20f 岔心 地图绘图 代码调整 2021-01-12 10:11:16 +08:00
lVAL
7bacd3c49f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-12 10:07:50 +08:00
lVAL
9bd12bb82e 增加应答器配置 2021-01-12 10:07:31 +08:00
fan
c8150bfa32 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-11 17:52:12 +08:00
fan
9a74d3ee39 成绩导出调整 2021-01-11 17:51:54 +08:00
sunzhenyu
96e2179bd7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-11 15:55:57 +08:00
sunzhenyu
b2ab6d4fd1 修改综合演练中三维驾驶不显示选择司机 2021-01-11 15:55:48 +08:00
joylink_cuiweidong
e1af8e878e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-11 15:40:15 +08:00
joylink_cuiweidong
6ef0498ffd 添加 岔心 地图绘制页面 2021-01-11 15:39:06 +08:00
fan
0dca101acd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-11 15:24:10 +08:00
fan
84354dde17 课程迁移问题调整&区段限速取消限速仅逻辑区段显示 2021-01-11 15:23:56 +08:00
sunzhenyu
0dbc481e3f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-11 13:05:39 +08:00
sunzhenyu
857307644f 三维沙盒修改，通号VR内容隐藏 2021-01-11 13:05:30 +08:00
fan
ec5b0e0a1e 西门子列车未实现操作注释 2021-01-11 11:04:14 +08:00
fan
b248e69ffe 导入学生信息添加校验&哈尔滨打包不再区分路由文件 2021-01-11 10:55:07 +08:00
fan
be8821435b 课程迁移调整 2021-01-08 17:55:42 +08:00
fan
c6b81eada0 课程迁移调整 2021-01-08 17:53:04 +08:00
fan
ec5c335d37 课程迁移调整 2021-01-08 17:48:25 +08:00
fan
682a47f730 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-08 17:27:36 +08:00
fan
0051560fff 课程迁移调整 2021-01-08 17:27:25 +08:00
zyy
9e355206c7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-08 16:51:07 +08:00
zyy
bb22ed66ed 调整大屏预览显示流程 2021-01-08 16:50:50 +08:00
joylink_cuiweidong
ae722ee86f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-08 16:43:24 +08:00
joylink_cuiweidong
fd89b426b8 bug16 管理运行图计划中的查询功能缺失 代码调整 2021-01-08 16:42:59 +08:00
fan
6b7acc7f97 课程迁移调整 2021-01-08 11:26:43 +08:00
fan
4d3991f3e9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_lesson 2021-01-08 11:13:16 +08:00
fan
dfa815fe6d 课程创建迁移&调度电话调整 2021-01-08 11:12:58 +08:00
joylink_cuiweidong
18ff2dcd22 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-08 09:54:21 +08:00
joylink_cuiweidong
8145673f5d 成都三号线 代码调整 2021-01-08 09:54:04 +08:00
lVAL
d5f94f8539 修改 变量名称 2021-01-07 15:18:48 +08:00
lVAL
f5cfb5f787 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/config/skinCode/xian_01.js
 2021-01-07 15:16:34 +08:00
lVAL
1a0612020e 增加，信号机灯丝故障处理 2021-01-07 15:15:54 +08:00
fan
680b043904 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-07 15:15:11 +08:00
fan
38be92528e 组织单位管理 2021-01-07 15:14:58 +08:00
joylink_cuiweidong
4d8932e155 触发故障管理 布局代码调整 2021-01-07 11:13:03 +08:00
joylink_cuiweidong
5469afd2ec 调度电话 代码调整 
（现地工作站去掉 所有车站）
（呼叫 已经通话的人 会话逻辑处理）
 2021-01-07 10:31:26 +08:00
fan
fe71e0b0a2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-06 18:17:54 +08:00
fan
e94ffd235a 故障模式快捷键&ISCS返回（退出）调整 2021-01-06 18:17:40 +08:00
joylink_cuiweidong
c266442842 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-06 18:15:34 +08:00
joylink_cuiweidong
558ea5cc95 代码调整 2021-01-06 18:15:14 +08:00
joylink_cuiweidong
85a6b0c617 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-06 16:01:51 +08:00
joylink_cuiweidong
35645688a5 代码调整 2021-01-06 16:01:26 +08:00
fan
554d2e994f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-06 13:23:30 +08:00
fan
26d2556502 单位暂提 2021-01-06 13:23:16 +08:00
joylink_cuiweidong
728ba4b47b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-06 11:28:11 +08:00
joylink_cuiweidong
6e3cdc6bd1 bug56 设置运行等级后，查询站台状态显示自动 代码调整 2021-01-06 11:27:55 +08:00
lVAL
9993cc3d63 如果检测实训生成，就清空数据。 2021-01-06 11:21:38 +08:00
lVAL
c4e41ccd6a 修改 实训生成过程中，点击限制的问题 2021-01-06 11:18:15 +08:00
lVAL
0ad6925791 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-06 10:21:20 +08:00
lVAL
0e37349fcd 修改，站台设置跳停和取消跳停现地没有生成实训的配置问题 2021-01-06 10:21:11 +08:00
joylink_cuiweidong
923e3ba05c bug57 苏电院西门子仿真线路：进路控制模式显示有误，自动显示人工 修改 2021-01-06 09:32:27 +08:00
joylink_cuiweidong
411bde3aee bug 64 苏电院交控仿真线路：信号解封无效 调整 2021-01-05 18:19:02 +08:00
joylink_cuiweidong
dd0a0b2fdf bug70（在课程树创建课程章节时，创建二级章节后无法继续创建一级章节）修改 2021-01-05 17:31:03 +08:00
fan
e630f870e2 merge 2021-01-05 16:43:00 +08:00
fan
c352214e89 代码暂提 2021-01-05 16:37:50 +08:00
lVAL
42dd23b716 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/xian_02/menus/menuSignal.vue
 2021-01-05 16:05:52 +08:00
lVAL
cc2814f722 增加西安2号线实训配置 2021-01-05 16:05:13 +08:00
joylink_cuiweidong
c0a949eafa 更改 西安二号线 信号机解封 实训提示 2021-01-05 15:32:12 +08:00
lVAL
e8d1777703 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-05 15:08:08 +08:00
fan
5dadc4747a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-05 15:09:25 +08:00
fan
382336971d BUG 48:地图列表的位置锁定 2021-01-05 15:09:07 +08:00
lVAL
ea7d29f520 增加 信号机解封实训配置 2021-01-05 15:07:54 +08:00
joylink_cuiweidong
9684fd6937 信号机 取消封锁 使能 操作代码调整 2021-01-05 14:45:10 +08:00
fan
0a9ca02ae9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-05 13:57:05 +08:00
fan
175d5b1810 代码调整 2021-01-05 13:56:51 +08:00
joylink_cuiweidong
dcfd22463b 西安二号线 指令操作调整 2021-01-05 13:45:29 +08:00
joylink_cuiweidong
40a367a005 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-05 13:00:25 +08:00
joylink_cuiweidong
50a2085052 西安二号线 绘图代码 调整 2021-01-05 11:33:18 +08:00
lVAL
f11ded27f7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-05 11:30:34 +08:00
lVAL
f35628f130 修改道岔单锁实训流程问题 2021-01-05 11:30:25 +08:00
joylink_cuiweidong
bc791715f4 西安二号线 操作代码调整 2021-01-05 09:43:09 +08:00
lVAL
1c04595c38 补充 西安二号线 实训配置 2021-01-05 09:13:09 +08:00
lVAL
0d183d53ce Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-04 18:25:42 +08:00
lVAL
e9c3a49612 添加缺失的实训配置（未调整，未验证） 2021-01-04 18:25:33 +08:00
fan
d31c9c1da3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-04 17:52:52 +08:00
fan
43f039e5c6 浙大网新 发送请求提示调整 2021-01-04 17:52:38 +08:00
lVAL
7468e2edcb 注释掉，宁波三仿真操作功能无关的操作 2021-01-04 17:37:56 +08:00
sunzhenyu
5751a6bbad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-04 16:21:43 +08:00
sunzhenyu
2a2dfd4d4e 三维沙盘修改 2021-01-04 16:21:38 +08:00
sunzhenyu
edb744cbc2 三维沙盘信号机更新状态验证 2021-01-04 16:19:14 +08:00
joylink_cuiweidong
e3584dc2ea 西安二号线 紧急本地控制（紧急站控） 操作代码调整 2021-01-04 15:39:54 +08:00
fan
b71962d77c 浙大网新 扣车和取消扣车实训调整 2021-01-04 14:50:13 +08:00
joylink_cuiweidong
1a65264d64 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-04 14:48:28 +08:00
joylink_cuiweidong
4151680a6a 西安二号线 现地 控制权转移 代码调整 2021-01-04 14:48:09 +08:00
fan
3c7f96614d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-04 14:03:40 +08:00
fan
f73fcff33e 浙大网新 跳停和取消跳停 2021-01-04 14:03:26 +08:00
lVAL
cfa739338b Merge branch 'master' of https://git.code.tencent.com/lian-cbtc/jl-client 2020-12-31 18:12:07 +08:00
joylink_cuiweidong
ad2e6ed0f6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-31 18:03:17 +08:00
joylink_cuiweidong
a024699e8f 西安二号线 控制模式 绘图调整 2020-12-31 18:02:55 +08:00
fan
c5fd6a97a8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-31 16:40:29 +08:00
fan
386cda6dba Bug54：苏电院交控仿真线路切换到车站一显示调整成员角色失败& 浙大网新部分实训调整 2020-12-31 16:40:13 +08:00
joylink_cuiweidong
5ec5d451d0 西安二号线 右键操作 代码调整 2020-12-31 14:57:53 +08:00
joylink_cuiweidong
2d831ca398 bug12（哈尔滨仿真线路里的交出控制功能逻辑问题）修改 2020-12-31 14:13:51 +08:00
joylink_cuiweidong
18a318cda7 实训平台 添加试卷 编辑试卷规则 代码调整 2020-12-31 13:47:08 +08:00
joylink_cuiweidong
d1ff775c1f 代码调整 2020-12-31 10:37:04 +08:00
joylink_cuiweidong
2aa8f961c6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-31 09:45:55 +08:00
joylink_cuiweidong
d206cb9b18 导出地图 添加iscs 数据 2020-12-31 09:45:18 +08:00
fan
a5c97fc6b5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-31 09:32:40 +08:00
fan
df158da3a5 取消课程详情页面路由记录 2020-12-31 09:32:25 +08:00
joylink_cuiweidong
a09ec3e2f2 实训平台 创建试卷 代码调整 2020-12-30 18:24:35 +08:00
joylink_cuiweidong
aefd1dc9e7 实训平台 创建试卷 代码调整 2020-12-30 17:44:58 +08:00
joylink_cuiweidong
1508578f74 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-30 16:10:13 +08:00
joylink_cuiweidong
ca74569775 iscs 代码调整 
运行图 编制 输入服务号 限制为数字类型
 2020-12-30 16:09:51 +08:00
fan
b8ec1f8d84 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-30 15:30:38 +08:00
fan
48b165e11c 国赛权限调整 2020-12-30 15:30:24 +08:00
lVAL
5e73352856 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-30 15:15:11 +08:00
lVAL
b315e03a3e 修改“修改运行图名称失败”的bug 2020-12-30 15:14:56 +08:00
fan
5860ec4cea Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-30 14:07:44 +08:00
fan
8154ace58b ibp调整 2020-12-30 14:07:21 +08:00
lVAL
87261fdc67 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-30 13:25:35 +08:00
lVAL
79779e2a86 优化代码报错，以及修改保存iscs的数据的lineCode为mapId 2020-12-30 13:25:20 +08:00
fan
82797b16bb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-30 11:15:34 +08:00
fan
730b673da2 泰雷兹屏蔽门 2020-12-30 11:15:05 +08:00
lVAL
75fccbbd01 修改 iscs 数据获取来源 2020-12-30 10:47:25 +08:00
lVAL
07a1403be8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-30 10:09:24 +08:00
lVAL
a5a1a9f63e 调整iscs 修改lineCode 为 mapId 2020-12-30 10:09:05 +08:00
joylink_cuiweidong
7d42eace0a 发布iscs 代码调整 2020-12-30 09:32:19 +08:00
fan
63f1298252 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-29 18:40:02 +08:00
fan
cc71383210 苏电院 设备管理 2020-12-29 18:39:54 +08:00
joylink_cuiweidong
d795e92485 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-29 18:37:51 +08:00
joylink_cuiweidong
1499c69a80 bug[23,22,17] 修改 2020-12-29 18:37:33 +08:00
joylink_cuiweidong
d749b41451 iscs 代码调整 2020-12-29 16:51:00 +08:00
joylink_cuiweidong
5c18a4fed5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-29 16:15:29 +08:00
joylink_cuiweidong
3329053207 仿真 综合演练 添加 联系方式 2020-12-29 16:15:10 +08:00
fan
56a47f48f9 Merge branch 'test' 2020-12-29 16:14:16 +08:00
fan
0ea5ba18ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-29 16:13:44 +08:00
fan
9c729e36f2 调整服务端路径 2020-12-29 16:13:32 +08:00
sunzhenyu
b428536303 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-29 16:07:19 +08:00
sunzhenyu
447a255a35 修复三维车站客流上车人数无限制bug 2020-12-29 16:07:07 +08:00
joylink_cuiweidong
afef8f9e9f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-29 16:00:12 +08:00
joylink_cuiweidong
27eb820781 代码调整 2020-12-29 15:59:43 +08:00
fan
43429fb2cc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-29 15:56:44 +08:00
joylink_cuiweidong
575895afe1 ISCS 代码调整 2020-12-29 15:53:20 +08:00
joylink_cuiweidong
2c8632c362 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-29 15:20:35 +08:00
joylink_cuiweidong
637e766837 iscs 复制功能 添加 2020-12-29 15:20:01 +08:00
sunzhenyu
f45262c245 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-29 11:07:41 +08:00
sunzhenyu
512dd56afb 修改三维路径配置 2020-12-29 11:07:26 +08:00
fan
9a55afa779 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-29 11:04:17 +08:00
fan
72db8b3e94 紧急停车状态调整 2020-12-29 11:04:01 +08:00
joylink_cuiweidong
b2c53c5882 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-29 11:00:13 +08:00
joylink_cuiweidong
0bcdae70db 紧急停车代码调整 2020-12-29 10:59:55 +08:00
fan
855936a5db 调整功能按钮 2020-12-29 10:16:27 +08:00
fan
62f4695c50 Merge remote-tracking branch 'origin/test' 2020-12-29 10:08:38 +08:00
sunzhenyu
ec1f215104 merge 2020-12-29 10:00:44 +08:00
sunzhenyu
0eedf1bd6b merge 2020-12-29 10:00:29 +08:00
sunzhenyu
e857d580ac 修改客流车站模型 2020-12-29 09:59:43 +08:00
fan
8b2291e18b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-29 09:59:26 +08:00
fan
fda2e940a5 调整路径 2020-12-29 09:59:11 +08:00
lVAL
8297ebcf98 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-28 17:40:05 +08:00
lVAL
da1fa87021 修改代码 2020-12-28 17:39:47 +08:00
joylink_cuiweidong
6c3ebbe03e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-28 17:23:39 +08:00
joylink_cuiweidong
d7e2a42712 发布ibp盘 管理代码调整 2020-12-28 17:23:20 +08:00
lVAL
f97a98da21 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-28 16:59:57 +08:00
lVAL
44e42bf5e5 调整宁波3号线操作 2020-12-28 16:59:29 +08:00
fan
1d775c4529 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-28 16:41:56 +08:00
fan
b24e59bc9a 代码调整 2020-12-28 16:41:37 +08:00
joylink_cuiweidong
0b606fbc56 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-28 16:25:49 +08:00
joylink_cuiweidong
dbbd817aad 哈尔滨仿真线路里的交出控制功能逻辑问题 （bug12）代码调整 2020-12-28 16:25:29 +08:00
fan
908aa12c21 bug: 11 设置运行等级显示问题 2020-12-28 16:00:55 +08:00
fan
e9a0359b1f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-28 15:01:35 +08:00
fan
16206cd003 bug: 1 & 紧急停车调整 & bug: 10 2020-12-28 15:01:25 +08:00
joylink_cuiweidong
cdb3ab25c0 发布内容管理添加 发布ibp盘管理 2020-12-28 14:27:38 +08:00
joylink_cuiweidong
906e12d508 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-28 13:03:18 +08:00
joylink_cuiweidong
fc4d130675 宁波三号线 站台操作调整 2020-12-28 13:02:33 +08:00
fan
614f835701 成都一号线两个确认运行至前方站 2020-12-28 11:24:25 +08:00
fan
8028103feb 综合演练行调添加ISCS&ISCS列车时刻表&ISCS信号系统 2020-12-28 11:20:36 +08:00
fan
0401569ef7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-28 09:36:34 +08:00
fan
2c724cd7cd ibp开门允许禁止问题调整 2020-12-28 09:35:56 +08:00
fan
8b23f8aecc 课程设计 提到实训平台 2020-12-25 18:07:15 +08:00
joylink_cuiweidong
940f01a89e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-25 18:07:15 +08:00
joylink_cuiweidong
418e8b86a4 宁波三号线 行调操作代码调整 2020-12-25 18:06:08 +08:00
lVAL
d229e5ca59 调试 宁波3号线 指令 2020-12-25 18:05:49 +08:00
lVAL
ac3ee7cf7e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-25 14:24:59 +08:00
lVAL
d5315ef81b 增阿基指令分页的功能 2020-12-25 14:24:47 +08:00
joylink_cuiweidong
18a8b75a98 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-25 14:02:33 +08:00
joylink_cuiweidong
9dfc64ea0a 宁波三号线 真实运行图 导入代码调整 2020-12-25 14:02:03 +08:00
fan
ada7d199c8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-25 11:18:09 +08:00
fan
2aa6cb1f8f 哈尔滨操作调整&ibp调整 2020-12-25 11:17:56 +08:00
joylink_cuiweidong
1a7b0b0301 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-25 09:08:47 +08:00
joylink_cuiweidong
d74564f9b1 宁波三号线运行图导入代码调整 2020-12-25 09:08:31 +08:00
fan
bef7ccdbb3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-24 18:38:49 +08:00
fan
e32a527b91 indexedDb操作调整 2020-12-24 18:38:38 +08:00
lVAL
c4aba14e1f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-24 18:35:45 +08:00
lVAL
0d8ff932a0 修改组件操作报错的问题 2020-12-24 18:35:26 +08:00
fan
8e058cd4e5 代码调整 2020-12-24 17:49:55 +08:00
fan
4611c4b74b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-24 15:33:17 +08:00
fan
48e37e44f8 indexedDb调整 2020-12-24 15:33:06 +08:00
zyy
ff3857eceb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-24 11:30:42 +08:00
zyy
a415d2e25c 调整格式 2020-12-24 11:30:29 +08:00
joylink_cuiweidong
d9b7c7871d 实训平台 地图列表 tree 展开 收起代码调整 2020-12-24 09:35:47 +08:00
joylink_cuiweidong
c65d02bbd1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-23 18:58:12 +08:00
joylink_cuiweidong
7705afc316 运行图绘制代码调整 2020-12-23 18:57:49 +08:00
sunzhenyu
d3d7b0d330 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-23 18:04:04 +08:00
sunzhenyu
f3e235f783 增加三维特别数据存储和读取，修改沙盘和驾驶读取特定数据模型，修改tdt设备位置 2020-12-23 18:02:41 +08:00
joylink_cuiweidong
0e340e53f3 运行图编制代码调整 2020-12-23 17:49:51 +08:00
joylink_cuiweidong
6525099b5d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-23 16:40:43 +08:00
joylink_cuiweidong
31605db52e 成都三号线 实训定义调整 2020-12-23 16:39:53 +08:00
fan
a27b361dc8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-23 16:08:44 +08:00
fan
ff8811cd75 新建运行图报错调整 2020-12-23 16:08:35 +08:00
joylink_cuiweidong
217c956bae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-23 10:23:59 +08:00
joylink_cuiweidong
8b04f92d7a 成都的三号线 信号封锁状态 绘图代码调整 2020-12-23 10:23:29 +08:00
fan
63917fd931 运行图调整 2020-12-23 09:40:57 +08:00
joylink_cuiweidong
bfeed11be8 运行图 编制代码调整 2020-12-22 18:50:47 +08:00
joylink_cuiweidong
623cbd2143 北交大 客流 代码调整 2020-12-22 18:42:27 +08:00
joylink_cuiweidong
d5fcc4bd36 北交大 客流数据 代码调整 2020-12-22 18:26:31 +08:00
joylink_cuiweidong
7f23431ebd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 18:16:22 +08:00
joylink_cuiweidong
b5ebe1599d 成都三号线 现地工作站 指令操作代码调整 2020-12-22 18:16:06 +08:00
fan
e38833b119 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 17:27:31 +08:00
fan
8b2cd16fe9 运行图调整 2020-12-22 17:27:04 +08:00
zyy
8c245127e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 17:08:19 +08:00
zyy
580c24e785 调整西安二号线操作 2020-12-22 17:08:05 +08:00
joylink_cuiweidong
59371074ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 15:18:58 +08:00
joylink_cuiweidong
b8fde7dd74 地图绘图代码调整 
成都三号线 行调工作站 指令代码调整
 2020-12-22 15:18:10 +08:00
sunzhenyu
af7e9d8dbf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 14:08:33 +08:00
sunzhenyu
e3b9c2f682 修改北交大客流人数颜色图示 2020-12-22 14:08:25 +08:00
fan
fe146045f1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 10:48:21 +08:00
fan
da15b45cac 留言板修改 2020-12-22 10:48:11 +08:00
zyy
3a5eaaa544 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 10:27:30 +08:00
zyy
912d80caec 调整ibp盘创建 保存 2020-12-22 10:27:14 +08:00
fan
bd775d7178 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 10:03:30 +08:00
fan
2c23ec76e9 ZC故障调整 2020-12-22 10:03:17 +08:00
zyy
97636fa64a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 09:03:57 +08:00
zyy
0abba7cdbc 调整实训操作 2020-12-22 09:03:42 +08:00
fan
675bb8e2ab 异步登录调整 2020-12-21 22:02:49 +08:00
fan
4210e2fba7 哈尔滨 重启令解调整 2020-12-21 21:55:36 +08:00
fan
a00b5c0581 道岔名称 站台E灰显 2020-12-21 20:10:48 +08:00
fan
941a127216 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-21 18:33:39 +08:00
fan
01dc500acc 道岔名称 站台E灰显 2020-12-21 18:33:29 +08:00
joylink_cuiweidong
5d4422ca92 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-21 18:04:34 +08:00