joylink_cuiweidong
|
8eff828381
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-01-13 09:48:19 +08:00 |
|
joylink_cuiweidong
|
50b0358541
|
bug修复 【大铁标准站】车务终端点击信号机按钮报错，无法排列进路
|
2023-01-13 09:47:52 +08:00 |
|
fan
|
48cdf34b32
|
Bug:【大铁标准站】车站路票功能无法使用
|
2023-01-13 09:20:36 +08:00 |
|
fan
|
3e6d8941c1
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-13 09:12:08 +08:00 |
|
fan
|
759154757b
|
旧代码删除
|
2023-01-13 09:09:25 +08:00 |
|
joylink_cuiweidong
|
49fb5e5643
|
bug修改 【大铁标准站】工具里列车固定径路无法打开
|
2023-01-12 18:15:01 +08:00 |
|
joylink_cuiweidong
|
873af94199
|
bug调整 【大铁线路】调度台和综合演练一直加载，刷新后可以进去，但是再次进入又一直加载了
|
2023-01-12 17:50:20 +08:00 |
|
joylink_cuiweidong
|
97c7f73c3c
|
代码调整
|
2023-01-12 10:58:45 +08:00 |
|
fan
|
c3db4d4c22
|
Merge remote-tracking branch 'origin/test_dispaly' into test
|
2023-01-11 17:48:50 +08:00 |
|
fan
|
62adae7f00
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-11 17:45:51 +08:00 |
|
fan
|
fed3a0430e
|
仿真退出跳转调整
|
2023-01-11 17:45:33 +08:00 |
|
joylink_cuiweidong
|
f22fac82a0
|
代码调整
|
2023-01-11 17:22:12 +08:00 |
|
joylink_cuiweidong
|
eb9829234d
|
代码调整
|
2023-01-11 17:06:29 +08:00 |
|
dong
|
03afd57f78
|
实训管理界面添加分页
|
2023-01-11 16:10:25 +08:00 |
|
fan
|
bf1f420423
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-11 14:20:45 +08:00 |
|
fan
|
082bf8cd65
|
应急调度指挥调整
|
2023-01-11 14:20:27 +08:00 |
|
dong
|
f06a5c09ea
|
代码调整
|
2023-01-11 13:35:50 +08:00 |
|
fan
|
b1fadb3671
|
成员管理 信号楼调整
|
2023-01-11 11:00:02 +08:00 |
|
fan
|
58bcd7223d
|
Merge remote-tracking branch 'origin/test_dispaly' into test
# Conflicts:
# src/utils/baseUrl.js
# src/views/login/index.vue
# src/views/newMap/displayBaSiDi/index.vue
# src/views/newMap/displayCity/demonMenu.vue
# src/views/newMap/displayCity/index.vue
|
2023-01-10 18:00:10 +08:00 |
|
fan
|
de3d60a21e
|
大铁线路 变更客户端名称 联锁操作终端
|
2023-01-10 17:31:16 +08:00 |
|
fan
|
849a0be87c
|
线路功能内容调整
|
2023-01-10 17:08:35 +08:00 |
|
fan
|
49b7cc1eb3
|
分组功能调整
|
2023-01-10 16:45:55 +08:00 |
|
fan
|
140a058f90
|
线路功能滚动调整
|
2023-01-10 16:20:04 +08:00 |
|
fan
|
91bdf79bef
|
resourcesUrl => ossUrl
|
2023-01-10 16:09:04 +08:00 |
|
fan
|
52cfa3ff14
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-10 15:41:13 +08:00 |
|
fan
|
0fd4c16d7a
|
线路功能分组
|
2023-01-10 15:40:53 +08:00 |
|
dong
|
e6c29ce60b
|
代码调整
|
2023-01-10 15:35:04 +08:00 |
|
dong
|
69771dd4b3
|
代码调整
|
2023-01-10 15:16:48 +08:00 |
|
fan
|
a2e4f3df9c
|
三方跳转退出调整
|
2023-01-10 10:11:20 +08:00 |
|
fan
|
d7be2f8fa2
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-09 15:14:55 +08:00 |
|
fan
|
d91fb2d8ac
|
车辆段工作站调整
|
2023-01-09 15:14:46 +08:00 |
|
joylink_cuiweidong
|
bdb89c21b3
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-01-09 15:08:07 +08:00 |
|
joylink_cuiweidong
|
b1948fff62
|
代码调整
|
2023-01-09 15:07:52 +08:00 |
|
fan
|
40ce6a6a24
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-09 15:01:52 +08:00 |
|
fan
|
0ed70c290e
|
成工业跳转调整
|
2023-01-09 15:01:38 +08:00 |
|
joylink_cuiweidong
|
32e6d19a75
|
代码调整
|
2023-01-09 14:43:51 +08:00 |
|
joylink_cuiweidong
|
f9fa1c2dbe
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-01-09 11:20:48 +08:00 |
|
joylink_cuiweidong
|
f33262ab22
|
实训 录制和校验 添加 val 参数
|
2023-01-09 11:20:04 +08:00 |
|
dong
|
5174ba4792
|
代码调整
|
2023-01-09 10:22:11 +08:00 |
|
dong
|
e951b099b4
|
宁波三结束实训关闭弹窗
|
2023-01-06 18:44:43 +08:00 |
|
dong
|
8baff2936b
|
代码调整
|
2023-01-06 18:14:54 +08:00 |
|
dong
|
1e020fdc3d
|
宁波三限速调整
|
2023-01-06 18:07:58 +08:00 |
|
dong
|
df7ee34fe3
|
代码调整
|
2023-01-06 17:03:24 +08:00 |
|
dong
|
3c06d0421c
|
调整宁波三站台实训提示问题
|
2023-01-06 16:50:33 +08:00 |
|
dong
|
205dda94fb
|
调整宁波三轨道实训提示问题
|
2023-01-06 16:10:10 +08:00 |
|
fan
|
aaafb5beec
|
调整：清除步骤是添加步骤一致校验
|
2023-01-06 15:17:21 +08:00 |
|
fan
|
31d588bf13
|
调整： 开始场景仅允许选择行调或行值
|
2023-01-06 15:08:07 +08:00 |
|
fan
|
d3eed2d956
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-06 13:55:26 +08:00 |
|
fan
|
1997b0df06
|
修复：控制权申请弹出有操作
|
2023-01-06 13:55:15 +08:00 |
|
dong
|
973732c80d
|
修改宁波三道岔实训问题
|
2023-01-06 13:42:38 +08:00 |
|