joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
4,547 Commits 20 Branches 0 Tags 448 MiB
1cae47b8d7
Commit Graph

803 Commits

Author SHA1 Message Date
joylink_cuiweidong
8c2f1cf729 新剧本 仿真类型切换代码调整 2020-03-30 17:39:00 +08:00
zyy
1e2a015955 调整区段实际长度逻辑 2020-03-30 17:07:51 +08:00
joylink_cuiweidong
68f77a25b6 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 16:16:29 +08:00
joylink_cuiweidong
8f6f033870 剧本仿真切换仿真类型代码调整 2020-03-30 16:16:11 +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
c5dbd2b141 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/utils/baseUrl.js
 2020-03-27 18:20:28 +08:00
zyy
47519b7040 调整道岔生成默认状态，调整道岔皮肤配置 2020-03-27 18:19:40 +08:00
fan
6ef1fc2013 实训调整 2020-03-27 18:14:46 +08:00
zyy
a95e940255 调整实训步骤校验 2020-03-27 14:37:28 +08:00
fan
3a8a3b87d8 调整左边弹框显示 2020-03-27 14:01:57 +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
fan
a697ab21d5 调整实训 2020-03-27 13:52:14 +08:00
fan
3c1d038a81 实训仿真调整 2020-03-27 10:51:49 +08:00
fan
f34de4f001 实训调整 2020-03-26 18:42:01 +08:00
zyy
aba49d9ee4 增加联锁表配置查询条件 2020-03-26 17:23:19 +08:00
fan
aadbe543a5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-26 09:44:27 +08:00
zyy
a2875baa19 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-25 18:26:30 +08:00
zyy
41100ac9bf 调整宁波线路 道岔 封锁 单锁状态 2020-03-25 18:26:19 +08:00
fan
5bcb42e0f2 宁波调整 2020-03-25 17:32:57 +08:00
fan
1210496ecb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-25 15:24:08 +08:00
fan
9d38968751 佛山样式调整&&宁波显示调整 2020-03-25 15:22:52 +08:00
zyy
f96c8a11ef Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-25 13:46:14 +08:00
zyy
d5c9799189 删除路径单元模块 新增设置站间运行等级 2020-03-25 13:45:58 +08:00
fan
df70024740 代码调整 2020-03-24 18:42:18 +08:00
fan
1e72a8cff3 状态灯调整 2020-03-24 16:35:09 +08:00
fan
5c7c27d2f3 状态灯调整 2020-03-24 15:02:14 +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
e9aad944ae 绘图线条调整 2020-03-24 10:05:51 +08:00
fan
2501a1a70a 综合演练问题调整 2020-03-23 16:00:28 +08:00
fan
f574279afe Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-23 13:59:51 +08:00
fan
a85f1d8f5e 代码调整 2020-03-23 13:52:50 +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
zyy
788737369a 调整哈尔滨线路 现地 行调 菜单高度 2020-03-20 17:56:20 +08:00
fan
cc6af4f056 综合演练调整 2020-03-20 17:36:07 +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
zyy
473d60ca0c Merge branch 'dev' into test 2020-03-20 13:08:35 +08:00
fan
404d867767 绘图&成三现地调整 2020-03-20 11:09:06 +08:00
sunzhenyu
3abc9fad16 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-03-20 09:55:23 +08:00
sunzhenyu
2760a4a678 修改三维客流视图加载界面，修改仿真站台模型 2020-03-20 09:55:13 +08:00
zyy
3b645724cc Merge branch 'dev' into test 2020-03-19 18:40:12 +08:00
fan
7de2c38af4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-19 16:17:53 +08:00
fan
36b7d7309a 增加绘图表示灯&&线条颜色 2020-03-19 16:17:34 +08:00
joylink_cuiweidong
bd046abd8b Merge remote-tracking branch 'remotes/origin/dev' into test 2020-03-19 13:08:34 +08:00
joylink_cuiweidong
65566a1438 添加 贵州装备制造职业学院 案例展示 
北京一号线操作代码调整
 2020-03-19 13:06:48 +08:00
fan
73d763b700 Merge remote-tracking branch 'origin/dev' into test 2020-03-18 19:06:23 +08:00
zyy
3afa12711e 新增哈尔滨线路底部栏 操作 2020-03-18 18:47:37 +08:00
joylink_cuiweidong
0bba854e15 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-18 10:53:56 +08:00
joylink_cuiweidong
ce02703a5a 自动折返和自动进路按钮绘图代码调整 2020-03-18 10:53:42 +08:00
fan
aa97a242b1 绘图问题调整 2020-03-18 10:31:23 +08:00
zyy
11b2ee8130 调整代码 2020-03-18 10:20:49 +08:00
zyy
12f283cbae Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue
#	src/views/newMap/newMapdraft/mapoperate/index.vue
 2020-03-18 09:12:18 +08:00
zyy
0ceb0c2c65 调整自动折返 type 类型 增加自动折返菜单流程 2020-03-18 09:10:57 +08:00
joylink_cuiweidong
3beb346ce1 功能按钮代码调整 2020-03-17 18:59:51 +08:00
fan
71d328296f 综合演练调整 2020-03-17 18:44:49 +08:00
joylink_cuiweidong
d8d143ae38 删除地图绘制中，车站里面的引导总锁 2020-03-17 17:59:47 +08:00
zyy
2e7e25dd06 增加功能按钮绘图方式 2020-03-17 16:12:15 +08:00
fan
b94c2b47de 综合演练调整 2020-03-17 14:54:03 +08:00
fan
022cf8c6ac 代码调整 2020-03-17 10:07:02 +08:00
sunzhenyu
2e0b0913d6 修改设计平台三维数据发布 2020-03-16 18:47:55 +08:00
fan
4ab462ed5d 合并代码 2020-03-16 15:32:00 +08:00
fan
cd9915668b 综合演练接口修改 2020-03-16 15:29:26 +08:00
zyy
1745bfbcf1 ibp盘绘制更新保存流程调整完成 2020-03-16 14:47:59 +08:00
fan
47a856e0c1 Merge remote-tracking branch 'origin/dev' into test 2020-03-13 18:24:11 +08:00
zyy
19f64034fb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/jmapNew/theme/chengdu_01/model.js
#	src/utils/baseUrl.js
 2020-03-13 18:20:02 +08:00
fan
553900df47 调整成都三操作 2020-03-13 18:19:27 +08:00
zyy
e156bac9ca 增加公共地图ibp配置绘图 逻辑 2020-03-13 18:19:04 +08:00
fan
a7b81a3383 调整车次窗初始显示 2020-03-13 16:35:03 +08:00
fan
7753c53ee0 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/jmapNew/shape/Train/index.js
 2020-03-13 13:08:18 +08:00
fan
4a2c539553 哈尔滨现地显示 2020-03-13 13:01:58 +08:00
joylink_cuiweidong
a124110a86 Merge remote-tracking branch 'remotes/origin/dev' into test 2020-03-12 15:13:56 +08:00
joylink_cuiweidong
56126bdbf3 列车精确定位代码调整 
列车的状态信息调整
去掉仿真里的拖动鼠标生成包围框
 2020-03-12 14:41:53 +08:00
zyy
b7ee3e5f6e 增加批量调整区段名称位置 2020-03-12 13:13:00 +08:00
joylink_cuiweidong
42010f4d8d Merge remote-tracking branch 'remotes/origin/dev' into test 2020-03-11 18:24:16 +08:00
fan
8ad0544dc2 创建小站台时，不设置区段为站台轨 2020-03-11 18:00:45 +08:00
fan
bd2938173a Merge remote-tracking branch 'origin/dev' into test 2020-03-11 16:59:47 +08:00
fan
939360917e 调整信号机接近区段颜色变化 2020-03-11 16:58:14 +08:00
fan
3273724484 调整自动折返非空校验 2020-03-11 15:50:47 +08:00
fan
ef60af34c0 绘图预览切换现地行调显示 2020-03-11 15:10:08 +08:00
fan
0aac76bb0e Merge remote-tracking branch 'origin/dev' into test 2020-03-11 10:54:08 +08:00
fan
5d39b8e84e 绘图显示调整 2020-03-11 10:53:09 +08:00
fan
50bb1ad59e 绘图高级数据调整 2020-03-10 18:56:03 +08:00
fan
ee53da67bc 调整点击设备中组成元素的数据处理 2020-03-10 13:05:20 +08:00
fan
a4e5bf3d81 现地行调显示区分 2020-03-10 09:49:05 +08:00
fan
2a61f97663 Merge remote-tracking branch 'origin/dev' into test 2020-03-09 18:39:30 +08:00
fan
d45950fa68 自动折返调整 2020-03-09 18:35:01 +08:00
fan
7f4e6fb13c 初始化按计划行车状态and其他调整 2020-03-09 17:38:15 +08:00
zyy
e59fe1cae5 Merge branch 'dev' into test 2020-03-09 17:05:43 +08:00
fan
2b971cdf12 初始化按计划行车状态and其他调整 2020-03-09 14:23:44 +08:00
zyy
4eff0fc013 Merge remote-tracking branch 'remotes/origin/dev' into test 
# Conflicts:
#	src/jmapNew/shape/Station/index.js
 2020-03-07 11:08:57 +08:00
joylink_fanyuhong
7f53be45b1 进路调整，绘图相关调整 
(cherry picked from commit e9749da)
 2020-03-06 20:42:04 +08:00
joylink_fanyuhong
e9749daddb 进路调整，绘图相关调整 2020-03-06 18:25:05 +08:00
zyy
93be0b7ff6 调整车站引导总锁在地图绘制中不显示，增加字体的默认状态 2020-03-06 12:18:04 +08:00
zyy
b2a154a3a4 增加车站 站台 屏蔽门批量设置功能 2020-03-06 12:04:00 +08:00
joylink_fanyuhong
e966312a03 Merge remote-tracking branch 'origin/dev' into test 2020-03-06 11:31:42 +08:00
zyy
6d0849f5b3 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/jmapNew/utils/parser.js
 2020-03-06 10:23:14 +08:00
zyy
a1f752fe59 调整地图绘制矩形框保存字段 2020-03-06 10:21:41 +08:00
joylink_fanyuhong
99532acc8a Merge remote-tracking branch 'origin/dev' into test 2020-03-06 10:20:51 +08:00
joylink_fanyuhong
9200cb99f7 站台增加功能按钮，未完 2020-03-05 18:17:47 +08:00
joylink_fanyuhong
c9e8827c3a 合并代码 2020-03-05 16:43:53 +08:00
joylink_fanyuhong
8d58125e1f 自动进路和引导总锁 2020-03-05 16:39:49 +08:00
zyy
30c672026f 增加矩形包围框 2020-03-05 15:48:51 +08:00
joylink_cuiweidong
dc12bd3f88 成都一号线 信号机 信号自动通过 代码调整 
自动通过模式，自动触发模式 状态参数调整
 2020-03-05 13:40:50 +08:00
zyy
8e7fc5104a 调整lc模块保存，自动折返绘图状态配置，流程完善 2020-03-05 12:21:28 +08:00
zyy
af5c108610 创建自动折返模块 2020-03-04 20:59:16 +08:00
zyy
3a5804c578 调整宁波一号线道岔，区段封锁 单锁状态，调整zc模块与站台的关系 2020-03-04 18:03:50 +08:00
sheng
8dc726bbe1 Merge remote-tracking branch 'origin/dev' into test 2020-03-01 18:39:35 +08:00
joylink_fanyuhong
92f4f2f1ca 按计划行车接口报错提示 2020-02-28 16:47:26 +08:00
joylink_fanyuhong
d5539a986b 按计划行车接口报错提示 
(cherry picked from commit 1abad25)
 2020-02-28 11:28:13 +08:00
joylink_fanyuhong
ee33dec8a1 Merge remote-tracking branch 'origin/dev' into test 2020-02-27 22:18:42 +08:00
joylink_fanyuhong
41bc739eab 运行图预览 2020-02-27 22:09:51 +08:00
joylink_fanyuhong
40c8ee9c0c 调整运行图预览尺寸 2020-02-27 16:57:51 +08:00
joylink_fanyuhong
040636e2ce 调整运行图预览尺寸 2020-02-27 16:52:48 +08:00
joylink_fanyuhong
d85f8ea5a8 仿真调整 2020-02-27 16:30:48 +08:00
joylink_fanyuhong
c3ca956bd5 仿真调整 2020-02-26 11:34:50 +08:00
joylink_cuiweidong
b221e8e6b9 车站添加 是否车辆段／停车场 是否折返车站字段 2020-02-25 10:52:13 +08:00
joylink_fanyuhong
aa0f770630 仿真调整 2020-02-24 17:04:39 +08:00
sheng
9f43749e8c Merge remote-tracking branch 'origin/dev' into test 2020-02-18 23:29:04 +08:00
joylink_fanyuhong
412e6bd582 列车调整 2020-02-18 19:24:52 +08:00
sunleking
338f9a75e8 三维客流视图追加人物模型动画 2020-02-18 17:55:29 +08:00
joylink_fanyuhong
c14043f93b 自动进路调整 2020-02-18 14:45:32 +08:00
sunleking
9babb6e9a2 添加新数据显示客流量模拟 2020-02-17 09:41:18 +08:00
sunleking
61394c4b39 增加三维客流量模块，目前完成了基础的行走状态控制流程 2020-02-14 18:22:11 +08:00
joylink_fanyuhong
2cd2f93c20 状态调整 2020-02-14 18:07:54 +08:00
joylink_fanyuhong
86c6ac4a57 进路选中切除状态调整 2020-02-11 15:58:54 +08:00
zyy
fbcaacce01 修改代码添加中间状态转换层 2020-02-11 14:50:56 +08:00
zyy
d5ab36bc5b 增加信号机虚拟信号字段 2020-02-05 14:47:46 +08:00
joylink_zyy
3490c68e83 调整站台属性增加内外站台属性 2020-02-04 11:01:50 +08:00
joylink_zyy
1ef8788c3c 调整绘图逻辑，增加哈尔滨线路 站台 信号机绘图逻辑 2020-02-03 17:17:56 +08:00
joylink_cuiweidong
b11ad0cc4f 新版地图 自动信号列表 添加自动信号名称筛选 
连锁出清区段限制为物理区段和道岔区段
 2020-01-21 16:18:33 +08:00
joylink_cuiweidong
8f191be794 新版绘图 自动信号 出清区段非必填修改 2020-01-21 14:25:36 +08:00
fan
3011285293 发布地图管理调整 2020-01-20 09:54:59 +08:00
fan
155f8abb96 新版绘图停车点偏移量调整+国际化调整 2020-01-19 17:34:03 +08:00
fan
02a6954ffd 仿真接口报错提示调整 2020-01-17 13:17:12 +08:00
fan
269cef7673 仿真接口调整 2020-01-17 11:31:53 +08:00
fan
f9bca1759d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-15 10:31:24 +08:00
fan
e80c0cd07f 延续保护解锁区段不可修改 2020-01-15 10:30:59 +08:00
zyy
77791a00ad 调整车次窗表单样式，调整事件阻止 2020-01-15 10:29:30 +08:00
fan
fbc0e5b28a 哈尔滨盈达调整 2020-01-14 16:19:36 +08:00
zyy
9d42feb47e 增加绘图图层 全选 2020-01-13 17:31:58 +08:00
joylink_cuiweidong
557b1cbfeb 新版绘图 生成道岔计轴区段代码调整 2020-01-13 16:46:10 +08:00
fan
b1bb638af3 修复：路由改变未在地图数据改变前及时清除定时器导致的地图数据污染保存的问题 2020-01-13 16:30:38 +08:00
joylink_cuiweidong
6802f2621a 新版地图绘制键盘delete删除元素代码调整 2020-01-13 13:48:45 +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
joylink_cuiweidong
50ad3bb036 新版绘图道岔代码拆分 2020-01-13 11:25:51 +08:00
fan
e8b616b705 成都一号线菜单调整 2020-01-09 18:21:04 +08:00
fan
09b27a8d62 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-09 09:02:22 +08:00
fan
2b4aa891eb 成都一号线右键菜单调整 2020-01-09 09:02:02 +08:00
zyy
786a37ee2c 增加宁波一号线控制权转移 2020-01-08 14:59:27 +08:00
zyy
473b289692 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-07 14:49:58 +08:00
zyy
5a3b415202 删除运行图工具栏 2020-01-07 14:49:51 +08:00
fan
1f88b03322 连接真实设备-国际化提示调整 2020-01-07 13:50:09 +08:00
fan
5dc3eb83f8 设备管理-配置编辑 信号机配置调整 2020-01-07 13:05:06 +08:00
zyy
5eb56d0a96 调整旧版地图右键菜单操作 2020-01-07 10:52:44 +08:00
fan
f2b62f281e 指令调整，公共地图宽度调整 2020-01-06 18:39:44 +08:00
fan
2554ed1135 代码调整 2020-01-06 14:43:08 +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
1695bb1d21 恢复退出仿真 2020-01-03 14:57:26 +08:00
zyy
496a00c8fe 调整道岔区段坐标点bug 2020-01-02 14:30:03 +08:00
zyy
764f7c479e 调整右键菜单获取 2020-01-02 11:08:01 +08:00
zyy
5db5bb40f8 Merge branch 'dev_cmd' into dev 2020-01-02 10:47:08 +08:00
fan
21c18e8de4 获取每日运行图接口 2020-01-02 09:22:44 +08:00
zyy
00a7517e52 修改指令发送流程及配置文件 2019-12-31 17:10:52 +08:00
fan
ce5c87608a 调整考试提交返回再次进入时未获取到mapId的问题&&题目框自动收取的问题 2019-12-31 16:57:35 +08:00
fan
7dde1958f5 皮肤实例化调整 2019-12-31 15:36:49 +08:00
fan
4ce64c614b 问题调整 2019-12-31 14:30:23 +08:00
fan
eb8f64af27 课程系统左侧栏 2019-12-31 13:15:28 +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
joylink_cuiweidong
cad56a82e9 Merge branch 'dev_prd' into dev 
# Conflicts:
#	src/views/demonstration/detail/index.vue
 2019-12-30 18:45:05 +08:00
joylink_cuiweidong
cbac3d2b9d 权限分发管理，创建权限 打包 接口调整 2019-12-30 17:13:21 +08:00
zyy
4a06c92ea1 修改鼠标静止隐藏移动显示逻辑 2019-12-30 14:06:42 +08:00
fan
c7078dcdb9 新版地图包加载仿真 2019-12-30 09:00:16 +08:00
fan
e5997a5856 修复： 信号机接近区段检索后台无数据是清空之前的数据 2019-12-27 17:32:22 +08:00
fan
a285d28cb3 整理代码 2019-12-27 15:23:42 +08:00
fan
d29bc62dda Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-27 09:41:02 +08:00
fan
573bf83ea8 整理代码 2019-12-27 09:40:52 +08:00
zyy
72ecdae535 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-26 18:07:29 +08:00
zyy
82cbae08ec 调整新旧地图加载方式 2019-12-26 18:07:23 +08:00
fan
dafd6d42cd Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-26 16:54:38 +08:00
fan
2a11b8d697 信号机增加名字旋转标识，区段关联关系增加校验，进路列表增加编码展示列 2019-12-26 16:54:24 +08:00
zyy
6c37fe6bdf 调整点击计轴区段显示高亮，调整区段高亮颜色 2019-12-26 16:38:44 +08:00
zyy
9123a794f0 道岔显示关联区段 2019-12-26 16:06:33 +08:00
fan
45e78f4b67 区段赋值前，清除所有数据 2019-12-26 15:38:33 +08:00
fan
78b28f118b 信号机参数名调整，旋转限制调整 2019-12-26 15:14:17 +08:00
fan
65475abf6f 进路赋值前清除延续保护表单 2019-12-26 14:06:42 +08:00
fan
d327e50a44 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-26 11:04:57 +08:00
fan
8431ff8cc4 增加非空校验 2019-12-26 11:04:21 +08:00
zyy
8d5fce7250 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-26 11:02:00 +08:00
zyy
6e3424e355 调整实训平台新旧地图显示逻辑 2019-12-26 11:01:54 +08:00
fan
6ff30c5b63 增加非空校验 2019-12-26 10:47:40 +08:00
fan
d79d2af32c 区段赋值时清除逻辑区段code列表 2019-12-26 10:44:08 +08:00
zyy
1c04b8d215 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-25 18:45:53 +08:00
zyy
74f0b12e3c 修改运行图显示，调整进路列表展示 2019-12-25 18:45:48 +08:00
joylink_cuiweidong
8b27475499 站台修改对应的车站时，同时修改所属集中站 2019-12-25 17:33:57 +08:00
fan
df7f13d411 延续保护区段预览详情合并rowspan 2019-12-25 10:58:58 +08:00
fan
432b268675 延续保护区段，进路物理区段，信号机接近区段激活状态下，点击已选中的区段删除列表中的该区段 2019-12-25 10:31:42 +08:00
fan
7328b7adb6 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2019-12-25 09:19:54 +08:00
fan
9331180684 调整：信号机接近区段中信号机选中变为黄色 2019-12-25 09:18:28 +08:00
zyy
f23da9be42 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
 2019-12-25 09:13:29 +08:00
zyy
741fccf609 删除多余字段 2019-12-25 09:12:22 +08:00
fan
fc4518b5a0 调整：延续保护区段和信号机接近区段可选逻辑区段 2019-12-25 08:58:50 +08:00
fan
d1cc62cd99 信号机接近区段信号机change，检索后台数据 2019-12-24 18:24:37 +08:00
fan
52eddbaa3d 调整logicSectionCodeList赋值增加校验 2019-12-24 18:05:56 +08:00
fan
6d82f466a6 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-24 14:28:29 +08:00
fan
c31a9aff46 增加：进路始终端信号机为黄色 2019-12-24 14:26:07 +08:00
zyy
da217251c8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-24 13:53:48 +08:00
zyy
a39078990f 设置进路记忆最后一个关联站台，及解锁时间 2019-12-24 13:53:37 +08:00
fan
d842be60ce Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-24 13:52:22 +08:00
fan
f7ff7f7f81 增加：信号机接近区段红色高亮 2019-12-24 13:52:06 +08:00
joylink_cuiweidong
be784efb43 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-24 10:49:39 +08:00
joylink_cuiweidong
f25787da62 进路列表数据展示调整 2019-12-24 10:49:28 +08:00
fan
5fe33a32ec Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-24 09:31:39 +08:00
fan
77be22e9e9 调整：进路列表信号机展示由uniqueName变更为name 2019-12-24 09:31:25 +08:00
zyy
c1f41b4299 修改信号机构建关系逻辑，修改创建逻辑区段偏移量数据逻辑 2019-12-23 17:14:38 +08:00
zyy
72c4bd0bd0 调整信号机接近区段点击事件 2019-12-23 16:23:56 +08:00
fan
ea97fc21b9 修复：选择进路延续保护区段选中逻辑区段替换为其父区段 2019-12-23 15:21:09 +08:00
zyy
d4cf4af2df Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-23 14:50:06 +08:00
zyy
a31e358b41 desc: 修改宁波一号线运行图导入数据修改 2019-12-23 14:49:57 +08:00
fan
907881eb7a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-23 13:32:58 +08:00
fan
663d43c5d2 修复：调整延时解锁创建校验规则（仅当延续保护线路存在时，进行解锁区段解锁时间校验，否则直接放弃创建或删除延续保护） 2019-12-23 13:32:11 +08:00
zyy
e46915e686 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-23 13:24:09 +08:00
zyy
26d06cae27 调整运行图导入判断，删除进路数据字段 2019-12-23 13:24:00 +08:00
joylink_cuiweidong
4ab635e553 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-23 10:54:07 +08:00
joylink_cuiweidong
6d959b816b 修改imagecontrol 为 resource 2019-12-23 10:53:25 +08:00
zyy
d62b023d52 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-23 10:36:40 +08:00
zyy
6e7ad61b4a 调整新版地图，旧版地图在公共地图显示流程 2019-12-23 10:36:32 +08:00
fan
065a3ba72e 修复：调整左右关联区段list数据为计轴区段和道岔区段 2019-12-23 10:15:45 +08:00
fan
4677be1b32 修复：增加选中type类型 2019-12-23 09:44:03 +08:00
fan
35dceb2950 修复：增加非空校验 2019-12-23 09:31:04 +08:00
fan
32d188cdfc Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-23 09:23:58 +08:00
fan
d9bf1af2d9 修复：绘图高级绘图切换高亮显示问题 2019-12-23 09:23:29 +08:00
zyy
0826c93362 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-23 09:15:31 +08:00
zyy
6ec990a1b2 解析宁波一号线运行图 2019-12-23 09:15:25 +08:00
fan
a60971c54e 修复：进路物理区段选中逻辑区段时处理物理区段高亮 2019-12-20 17:15:15 +08:00
fan
0207e54914 进路延续保护区段选中红色 2019-12-20 15:44:12 +08:00
fan
6189318755 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-20 14:24:18 +08:00
fan
ab70d8168b 修复：进路道岔类型不显示 2019-12-20 14:23:59 +08:00
zyy
12bfdcfa66 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-20 13:48:45 +08:00
zyy
6a82d745d9 调整高级数据生成code规范 2019-12-20 13:48:37 +08:00
fan
2cbafa7950 延续保护样式调整 2019-12-20 11:22:30 +08:00
zyy
4f5fe2c9bb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-20 10:54:35 +08:00
zyy
73da545e67 调整信号机偏移量设置 2019-12-20 10:54:29 +08:00
fan
438aef2764 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-20 10:20:38 +08:00
fan
2a517c8aa5 进路调整 延续保护生成线路道岔可为空，创建延续保护必须有解锁区段，时间，线路，更新是若无解锁区段和线路则删除延续保护 2019-12-20 10:20:03 +08:00
zyy
b5cc83a0e0 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-19 18:04:35 +08:00
zyy
3101af9948 增加线路皮肤配置，调整联锁站台显示列表 2019-12-19 18:04:28 +08:00
fan
9cd46588a9 自动信号参数名和默认值调整--0003 2019-12-19 16:43:56 +08:00
fan
6ce29006e5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-19 16:21:15 +08:00
fan
143f35a222 进路物理区段列表连续高亮 2019-12-19 16:21:00 +08:00
joylink_cuiweidong
882bb44fb2 根据设备code高亮 地图对应的设备 2019-12-19 15:52:36 +08:00
fan
30fc3132d3 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-19 14:05:30 +08:00
fan
fbbee9324a 延续保护预览 2019-12-19 14:05:16 +08:00
joylink_cuiweidong
fb7618c8ee Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-19 13:14:40 +08:00
joylink_cuiweidong
27196e9c54 站台创建的时候绑定集中站 2019-12-19 13:14:29 +08:00
zyy
3abc93cbb8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-19 13:12:43 +08:00
zyy
c0c5d620cd 调整站台紧急停车创建逻辑 2019-12-19 13:12:34 +08:00
fan
e300164580 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
 2019-12-19 10:12:54 +08:00
fan
524df9c5e9 进路-延续保护调整 2019-12-19 10:08:12 +08:00
zyy
511701b116 调整数据显示字段，调整创建站台区段属性设置 2019-12-19 10:00:29 +08:00
zyy
1e1f9a598d 修改高级数据字段显示 2019-12-18 17:52:50 +08:00
zyy
c295f97819 调整车站显示坐标，信号机批量操作，调整逻辑代码 2019-12-18 16:20:30 +08:00
joylink_cuiweidong
38c2bc4c55 zc控制代码调整 2019-12-18 15:34:51 +08:00
joylink_cuiweidong
d994ed3d7e 代码调整 2019-12-18 15:00:53 +08:00
zyy
0bb46ab432 高级数据调整顺序 2019-12-18 13:21:07 +08:00
fan
2d068a93ce Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-18 13:06:00 +08:00
fan
7cf546efe6 参数调整 2019-12-18 13:05:29 +08:00
zyy
0a8b0e3264 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-18 11:18:08 +08:00
zyy
436db38200 调整区段字段保存获取 2019-12-18 11:17:57 +08:00
joylink_cuiweidong
d196383a06 批量设置集中站 数据过滤 2019-12-18 10:18:55 +08:00
joylink_cuiweidong
9c54da44f3 站台创建关联集中站 2019-12-18 10:01:58 +08:00
joylink_cuiweidong
e3fb06591c 代码修改 2019-12-17 19:22:07 +08:00
joylink_cuiweidong
b864c717fb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/station.vue
 2019-12-17 19:05:19 +08:00
joylink_cuiweidong
b4ea83eabc zc 集中站设置 2019-12-17 19:03:38 +08:00
zyy
33f140d71c 修改小站台位置 2019-12-17 18:17:33 +08:00
fan
97202631ea Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-17 17:27:54 +08:00
fan
88eeaff1e2 区段站台问题调整 2019-12-17 17:27:35 +08:00
zyy
ea4de2d11d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-17 17:09:13 +08:00
zyy
88b1d10430 调整生成道岔 区段修改字段 2019-12-17 17:09:04 +08:00
fan
6195338947 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-17 16:41:40 +08:00
fan
3723c8696e 区段关系校验 2019-12-17 16:41:18 +08:00
joylink_cuiweidong
cd549d57fc Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/station.vue
 2019-12-17 16:24:24 +08:00
joylink_cuiweidong
b8448aaff8 道岔设置集中站过滤 
区段设置集中站过滤
车站设置集中站和管理车站列表代码调整
 2019-12-17 16:22:07 +08:00
zyy
b05d71667e 调整列车创建 2019-12-17 15:37:11 +08:00
zyy
fce5242e06 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-17 14:34:18 +08:00
zyy
24fd0890dd 调整进路保存 2019-12-17 14:34:09 +08:00
fan
c501445800 折线偏移量调整 2019-12-17 14:26:56 +08:00
fan
e419fd9241 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-17 10:31:24 +08:00
fan
4cecc2d630 逻辑区段增加偏移量参数 2019-12-17 10:31:12 +08:00
zyy
0bb01b4e4c 调整信号机字段 2019-12-17 10:30:27 +08:00
fan
a1be3cf879 逻辑区段增加偏移量参数 2019-12-17 10:26:38 +08:00
zyy
c0e953ceeb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/signal/index.vue
#	src/views/newMap/newMapdraft/mapoperate/stationstand.vue
 2019-12-17 09:16:55 +08:00
zyy
9fe6c9739d 调整代码 2019-12-17 09:13:57 +08:00
fan
1877b05cce 信号机方向属性调整 2019-12-16 18:17:43 +08:00
fan
28c57c1228 站台方向属性调整 2019-12-16 14:51:30 +08:00
fan
c79465b31a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-16 10:57:53 +08:00
fan
7d2d6fb580 站台方向属性调整 2019-12-16 10:57:40 +08:00
zyy
de30f91aed 修改代码 2019-12-13 18:50:01 +08:00
zyy
a6e8f1376f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/section.vue
 2019-12-13 18:01:48 +08:00
zyy
70ae531eff 增加信号机构建偏移量关联关系逻辑， 调整车次窗批量修改 2019-12-13 18:00:12 +08:00
fan
b2c9e34a25 站台方向属性初始值调整 2019-12-13 17:53:34 +08:00
fan
62300d327f 站台方向属性调整 2019-12-13 17:51:00 +08:00
fan
852ac4e601 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/section.vue
 2019-12-13 17:12:10 +08:00
fan
ea3217891a 逻辑区段偏移量 2019-12-13 17:06:17 +08:00
fan
bd1cbf4e40 站台调整 2019-12-13 16:28:34 +08:00
joylink_cuiweidong
36c1b6ceec 车站添加副标题 2019-12-13 16:13:10 +08:00
joylink_cuiweidong
284f7bcc7b 区段删除站台轨对应站台编码 2019-12-13 15:24:51 +08:00
joylink_cuiweidong
6715c48642 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-13 14:58:39 +08:00
joylink_cuiweidong
9123dc050a 车站添加车站编号 2019-12-13 14:58:28 +08:00
fan
13f608a2ff 高级高亮调整 2019-12-13 14:46:38 +08:00
fan
8f6a7c1253 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-13 14:19:49 +08:00
fan
fc3ab4cc21 站台屏蔽门调整 2019-12-13 14:19:38 +08:00
joylink_cuiweidong
eb3b803462 信号机所属集中站数据筛选 
进路所属联锁站数据筛选
 2019-12-13 14:02:15 +08:00
joylink_cuiweidong
0a2e5567a2 代码调整 2019-12-13 13:23:07 +08:00
joylink_cuiweidong
b2b9c5819b 车站增加: 是否连锁站 
区段删除关联站台字段
 2019-12-13 13:19:09 +08:00
fan
083e70dc02 站台屏蔽门调整 2019-12-13 13:10:11 +08:00
zyy
2f639cce5e Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-12 18:15:32 +08:00
zyy
7ef051733a 调整缩放，站台显示，坐标 2019-12-12 18:15:25 +08:00
fan
4af61e8615 drawWay参数调整 2019-12-12 16:10:44 +08:00
fan
811a430ec1 Revert "drawWay参数调整" 
This reverts commit 54be69b
 2019-12-12 16:07:32 +08:00
fan
0ef09ed480 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-12 15:58:39 +08:00
fan
54be69b2e6 drawWay参数调整 2019-12-12 15:58:19 +08:00
zyy
7c9d9c6373 调整站台显示样式问题，修改代码 2019-12-12 15:31:01 +08:00
fan
9a342caad7 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-12 12:23:36 +08:00
fan
80109bb349 区段新建台调整 2019-12-12 12:23:25 +08:00
zyy
6fb6ae9867 调整站台，屏蔽门默认样式 2019-12-12 10:05:28 +08:00
fan
6e50f1eddf Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-11 18:25:22 +08:00
fan
cc014d4ccc 自动折返设置优先级 2019-12-11 18:25:03 +08:00
zyy
159a2b4890 调整点击道岔计轴显示道岔区段 2019-12-11 17:22:01 +08:00
zyy
206496609d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-11 17:07:39 +08:00
zyy
b2dd3d7285 调整站台生成逻辑，调整uid检测方式 2019-12-11 17:07:29 +08:00
fan
eafb83a886 自动折返调整 2019-12-11 14:10:51 +08:00
fan
5fdbbe9295 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-11 13:57:06 +08:00
fan
cd15b3737c 自动折返，进路调整 2019-12-11 13:56:46 +08:00
joylink_cuiweidong
a358b9cdd6 代码调整 2019-12-11 09:42:33 +08:00
joylink_cuiweidong
d5eef0c022 信号机接近区段页面调整 2019-12-10 18:11:11 +08:00
joylink_cuiweidong
b6e6e72d17 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-10 18:02:08 +08:00
joylink_cuiweidong
98c7e1105f 自动信号接口修改 2019-12-10 18:01:52 +08:00
fan
214a74a55a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-10 17:56:08 +08:00
fan
0bde17887f 高级延续保护调整 2019-12-10 17:55:43 +08:00
zyy
914af945c8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-10 16:57:37 +08:00
zyy
9aec1ef099 调整拖拽逻辑 2019-12-10 16:57:31 +08:00