Commit Graph

233 Commits

Author SHA1 Message Date
zyy
02583b96e4 调整代码 2020-04-01 15:44:54 +08:00
joylink_cuiweidong
5d10d40ea3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-01 14:15:09 +08:00
joylink_cuiweidong
f64c7d5317 代码调整 2020-04-01 14:14:55 +08:00
fan
225a739f60 打包本地项目不进行cdn加载 2020-04-01 13:47:29 +08:00
fan
bfd5b07145 调整本地项目综合演练 2020-03-31 18:50:16 +08:00
zyy
10afb6192b Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-31 15:35:10 +08:00
zyy
4ef3c69f9f 调整显示内容 判断 2020-03-31 15:34:55 +08:00
joylink_cuiweidong
3472860fbd 新版 剧本编制 添加动作指令操作添加 以及 动作指令展示 2020-03-31 14:52:19 +08:00
zyy
aaefa200c4 调整实训定义,调整提示逻辑 2020-03-31 09:42:46 +08:00
zyy
919639ad03 调整哈尔滨现地操作步骤流程完善 2020-03-30 17:53:44 +08:00
zyy
af6eb5917f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 16:15:50 +08:00
zyy
0c56d049ec 调整哈尔滨现地实训操作步骤 2020-03-30 16:15:35 +08:00
fan
dee1efe00f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 13:07:32 +08:00
fan
ab4928d924 差异化打包调整&哈尔滨登录页 2020-03-30 13:07:11 +08:00
zyy
0321340863 调整步骤运行数据 2020-03-30 10:28:08 +08:00
zyy
ba57262d2a 调整实训步骤校验逻辑 2020-03-27 18:53:28 +08:00
zyy
a95e940255 调整实训步骤校验 2020-03-27 14:37:28 +08:00
fan
fb8d0b6615 Merge remote-tracking branch 'origin/dev_training' into dev_n
# Conflicts:
#	src/views/designPlatform/demonList.vue
2020-03-27 13:55:00 +08:00
zyy
7380953642 增加宁波线路实训操作 2020-03-27 13:45:36 +08:00
joylink_cuiweidong
d4279dd03a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-27 11:31:53 +08:00
joylink_cuiweidong
966bed109b 新版剧本代码调整 2020-03-27 11:31:40 +08:00
fan
f34de4f001 实训调整 2020-03-26 18:42:01 +08:00
fan
5bcb42e0f2 宁波调整 2020-03-25 17:32:57 +08:00
joylink_cuiweidong
d3b4c090a9 佛山有轨电车 现地操作调整 2020-03-25 13:20:31 +08:00
joylink_cuiweidong
c31c09e88b 佛山有轨电车 现地操作调整 2020-03-24 18:18:01 +08:00
joylink_cuiweidong
22330bf756 宁波一号线自动折返操作代码调整 2020-03-24 11:09:10 +08:00
fan
39420c1432 存在仿真管理调整 2020-03-24 09:23:24 +08:00
zyy
ad6b8f8dba 调整区段流程逻辑,站台流程 2020-03-23 13:48:35 +08:00
fan
404d867767 绘图&成三现地调整 2020-03-20 11:09:06 +08:00
zyy
1d46deb12a 调整区段绘画逻辑 2020-03-19 14:03:54 +08:00
zyy
6e3dcf6b65 调整哈尔滨线路 区段,信号机操作 处理信号机点击高亮 2020-03-19 10:52:42 +08:00
zyy
3afa12711e 新增哈尔滨线路底部栏 操作 2020-03-18 18:47:37 +08:00
zyy
4203c30e30 调整宁波线路自动折返 计轴复位操作 2020-03-18 11:18:52 +08:00
zyy
11b2ee8130 调整代码 2020-03-18 10:20:49 +08:00
zyy
0ceb0c2c65 调整自动折返 type 类型 增加自动折返菜单流程 2020-03-18 09:10:57 +08:00
joylink_cuiweidong
b088287b6c 北京一号线 现地 站台总取消 站台扣车操作代码操作 2020-03-17 09:54:49 +08:00
fan
0377ef014b 合并代码 2020-03-16 17:16:59 +08:00
zyy
778a7869af 调整默认状态 2020-03-16 11:04:15 +08:00
zyy
1c78d52fed 调整ibp文件配置路径 2020-03-16 11:02:33 +08:00
fan
553900df47 调整成都三操作 2020-03-13 18:19:27 +08:00
zyy
31d50d95e2 增加仿真系统 iscs工作站 2020-03-13 13:23:04 +08:00
fan
f6a43ed6aa 宁波一调整道岔正反操为联动操作 2020-03-10 10:08:28 +08:00
joylink_cuiweidong
dc12bd3f88 成都一号线 信号机 信号自动通过 代码调整
自动通过模式,自动触发模式 状态参数调整
2020-03-05 13:40:50 +08:00
zyy
d342c249ab Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-04 14:15:17 +08:00
zyy
467a9cf982 调整宁波线路现地操作 2020-03-04 14:14:59 +08:00
joylink_cuiweidong
33d711cf49 北京一号线 信号机站台代码调整 2020-03-04 09:17:06 +08:00
joylink_cuiweidong
88a4b01802 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-03 18:01:43 +08:00
joylink_cuiweidong
231c6fda52 代码调整 2020-03-03 17:54:08 +08:00
zyy
aa80b8e74f 调整宁波一信号机现地操作 2020-03-03 17:52:37 +08:00
zyy
12e708028e 区段道岔操作调整 2020-02-24 18:12:05 +08:00
zyy
a225253d25 调整列车操作 2020-02-20 12:24:37 +08:00
joylink_cuiweidong
12198f0c35 北京线 指令代码调整 2020-02-18 16:55:30 +08:00
joylink_cuiweidong
50de519124 北京线 指令operation 代码调整 2020-02-18 14:26:16 +08:00
zyy
d22f2582c3 增加车次窗右键操作 2020-02-12 17:43:18 +08:00
joylink_fanyuhong
c4b37c1519 操作调整 2020-02-12 16:22:44 +08:00
joylink_fanyuhong
5fe9d4c03a 操作调整 2020-02-12 16:06:24 +08:00
joylink_fanyuhong
4275b4dc4a 操作调整 2020-02-12 15:14:14 +08:00
joylink_cuiweidong
fd960d2155 宁波一号线,成都三号线 道岔 定操和反操代码调整 2020-02-11 15:32:48 +08:00
fan
fbc0e5b28a 哈尔滨盈达调整 2020-01-14 16:19:36 +08:00
zyy
d295fb72a5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-13 13:45:50 +08:00
zyy
6feb0ec9c0 新版地图: 调整默认状态,站台状态配置完成。其他元素暂未配置 2020-01-13 13:45:39 +08:00
fan
662e38a22c 添加登录页哈尔滨盈达科技 2020-01-13 13:33:35 +08:00
zyy
fa513a1e8f 调整宁波一号线控制权右键条件 2020-01-08 17:50:16 +08:00
zyy
786a37ee2c 增加宁波一号线控制权转移 2020-01-08 14:59:27 +08:00
zyy
9bbc497488 调整宁波一号线批量扣车key 2020-01-08 09:48:24 +08:00
joylink_cuiweidong
91d1f98f69 北京一号线新版站台区段车站右键菜单调整 2020-01-07 17:40:24 +08:00
zyy
0330e08f89 调整车站状态显示,调整右键菜单显示,设置默认状态 2020-01-07 09:23:04 +08:00
zyy
3d8fcd305a 调整宁波一号线右键菜单流程 2020-01-06 14:42:28 +08:00
zyy
28e0617c87 删除注释,信号机流程完成 2020-01-03 16:01:57 +08:00
zyy
c13963f793 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-03 15:50:32 +08:00
zyy
4f2fb97477 调整宁波线右键菜单显示 2020-01-03 15:50:26 +08:00
fan
766a169282 指令调整参数 2020-01-03 15:03:45 +08:00
zyy
764f7c479e 调整右键菜单获取 2020-01-02 11:08:01 +08:00
zyy
7c5352ce7c 调整宁波一号线站台操作 2020-01-02 10:46:09 +08:00
zyy
8b2158294e 调整指令参数 2019-12-31 18:50:43 +08:00
zyy
cf370249eb 调整指令 2019-12-31 18:10:49 +08:00
zyy
00a7517e52 修改指令发送流程及配置文件 2019-12-31 17:10:52 +08:00
zyy
e03a4d12e0 调整宁波一号线 2019-12-31 16:24:22 +08:00
zyy
3044da2ea4 调整福州使用新版指令方式发送 2019-12-31 16:11:09 +08:00
fan
0504a2a2a6 迁移cmd分支 2019-12-31 14:32:04 +08:00
joylink_cuiweidong
ca6ca0ecc4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-30 18:45:17 +08:00
fan
24ef3fd71d 添加贵州装备制造职业学院项目 2019-12-30 18:06:40 +08:00
joylink_cuiweidong
cb1ca75eb7 用户仿真统计
新增-产品名称改为产品类型
前端维护一个产品类型枚举
2019-12-25 18:56:25 +08:00
fan
4e7e0a256b 修复:调整table数据处理时满足条件后未跳出循环导致的相关问题 2019-12-23 14:50:44 +08:00
zyy
3101af9948 增加线路皮肤配置,调整联锁站台显示列表 2019-12-19 18:04:28 +08:00
zyy
70ae531eff 增加信号机构建偏移量关联关系逻辑, 调整车次窗批量修改 2019-12-13 18:00:12 +08:00
fan
28e9abe13a ibp绘图部分设备添加操作表示关联设备 2019-12-09 11:00:25 +08:00
fan
ac3b2d85fd ibp 添加屏蔽门操作 2019-12-06 17:54:38 +08:00
lVAL
3a190f8fbf 修改 2019-11-25 19:01:31 +08:00
lVAL
9eea637a70 修改 2019-11-25 18:57:17 +08:00
zyy
44f9da4383 desc: 调整绘图进路数据,调整权限修改逻辑,调整设置link中心点BUG 2019-11-22 15:28:02 +08:00
joylink_cuiweidong
5ac012fc79 运行图代码调整 2019-11-21 09:34:55 +08:00
ival
6b23ca6f0d Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-20 10:39:58 +08:00
ival
0c6d17647a 修改代码 2019-11-20 10:39:46 +08:00
joylink_cuiweidong
c264b61f65 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-20 10:39:14 +08:00
joylink_cuiweidong
58d151f9ea 代码调整 2019-11-20 10:39:00 +08:00
ival
898135a61b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-19 18:35:49 +08:00
ival
cd6e2ea224 修改代码 2019-11-19 18:35:31 +08:00
joylink_cuiweidong
5fca43650b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/scripts/plugin/CommandHandler.js
2019-11-19 17:44:18 +08:00
joylink_cuiweidong
13a5df8571 代码调整 2019-11-19 17:06:13 +08:00