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 |
|
dong
|
b604bc55be
|
宁波三代码调整
|
2023-01-06 13:14:18 +08:00 |
|
fan
|
3cdc7106f3
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-06 09:41:56 +08:00 |
|
fan
|
47f2e2994a
|
修复：聊天室 上级部门undefined
|
2023-01-06 09:41:21 +08:00 |
|
dong
|
067fdb3ca6
|
宁波三信号机实训提示调整
|
2023-01-05 18:43:11 +08:00 |
|
fan
|
2237484367
|
修复：添加备用车切换客户端导致实训编辑成员缺失司机
|
2023-01-05 16:56:48 +08:00 |
|
fan
|
3d137b7b54
|
步骤完成关闭提示
|
2023-01-05 14:14:38 +08:00 |
|
fan
|
6ce41fe243
|
BUG: 【国赛】行调先请求站控，车站同意，行调再转中控，录制时和预览时的界面显示不一致，录制时定位在中控上，预览的时候记录了上次执行站控的操作，定位在站控上，导致步骤无法一致校验不通过
|
2023-01-05 13:55:37 +08:00 |
|
fan
|
dff2ebe121
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-05 11:27:30 +08:00 |
|
fan
|
21b8f3705d
|
BUG: 【个人信息】使用正常表单样式进行界面优化
|
2023-01-05 11:27:00 +08:00 |
|
fan
|
a080fdd0c0
|
BUG: 【帮助】暂时去掉菜单里的帮助
|
2023-01-05 11:26:38 +08:00 |
|
dong
|
621b67b65a
|
打开运行图编制调用默认交路接口
|
2023-01-05 10:32:00 +08:00 |
|
fan
|
e89d160b1c
|
BUG: 【国赛-实训设计】角色切到司机时，这个暂停后无法恢复，然后暂停的图标显示也不对，控制台还有报错
|
2023-01-05 10:22:05 +08:00 |
|
fan
|
bc61d5a658
|
道岔失表报错调整
|
2023-01-05 09:45:53 +08:00 |
|
fan
|
45f8430214
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-05 09:27:40 +08:00 |
|
fan
|
d16bf5d046
|
BUG: 【综合演练】成员管理将角色设置为通号，没有显示对应的角色客户端
|
2023-01-05 09:26:23 +08:00 |
|
dong
|
4415cdb33f
|
宁波三信号机引导和进路命令实训提示调整
|
2023-01-04 18:09:08 +08:00 |
|