fan
|
a7f55fd52c
|
token清除位置调整
|
2023-02-27 13:46:29 +08:00 |
|
fan
|
d1133c947c
|
自动登录调整
|
2023-02-27 13:41:08 +08:00 |
|
fan
|
d9b6b3fb2c
|
Merge remote-tracking branch 'origin/test_dispaly' into test
|
2023-02-24 13:28:27 +08:00 |
|
fan
|
2aadaaf100
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-24 13:06:38 +08:00 |
|
dong
|
87a603e52d
|
区段右键添加分路不良功能
|
2023-02-24 10:29:06 +08:00 |
|
fan
|
f24c36dbed
|
鉴权调整
|
2023-02-23 18:18:01 +08:00 |
|
fan
|
be047fff67
|
组织管理添加人员操作方式调整
|
2023-02-22 17:49:12 +08:00 |
|
fan
|
18663fd5bd
|
泰国翻译
|
2023-02-22 13:07:56 +08:00 |
|
fan
|
05cebda4cb
|
Merge remote-tracking branch 'origin/test_dispaly' into thailand
# Conflicts:
# src/jmapNew/theme/datie_02/menus/dialog/applyOrAgreeModeCovert.vue
# src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
|
2023-02-21 17:29:47 +08:00 |
|
fan
|
014c743a10
|
模板线路功能&线路功能里新增分组
|
2023-02-21 17:11:28 +08:00 |
|
fan
|
f5b0fcb452
|
仿真页面调整2
|
2023-02-21 16:43:59 +08:00 |
|
fan
|
fea4cf4fe2
|
线路功能上传图片命名添加随机数
|
2023-02-21 11:30:17 +08:00 |
|
fan
|
224105fb16
|
仿真页面样式调整1
|
2023-02-21 11:22:52 +08:00 |
|
fan
|
5c43facb36
|
仿真页面样式调整
|
2023-02-21 11:18:59 +08:00 |
|
fan
|
582cc02722
|
一键生成form注释调整
|
2023-02-21 10:58:18 +08:00 |
|
fan
|
e0649fd4c8
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-21 10:56:48 +08:00 |
|
fan
|
80bb63a4a2
|
线路功能上传图片命名调整
|
2023-02-21 10:56:38 +08:00 |
|
dong
|
abfda9a3e7
|
登录页英文显示
|
2023-02-20 16:52:36 +08:00 |
|
dong
|
275e39b42b
|
修改配置项目客户端登陆报错问题
|
2023-02-20 16:17:24 +08:00 |
|
fan
|
9a04a38ac4
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-20 16:12:32 +08:00 |
|
fan
|
7590552db2
|
模板线路功能调整
|
2023-02-20 16:12:18 +08:00 |
|
dong
|
a7616055dc
|
修改从车务终端切到联锁界面后无法操作增加列车问题
|
2023-02-20 15:01:22 +08:00 |
|
dong
|
cf5e633187
|
代码调整
|
2023-02-20 14:19:12 +08:00 |
|
fan
|
dd0fd19720
|
Merge remote-tracking branch 'origin/test_dispaly' into test
|
2023-02-18 12:21:23 +08:00 |
|
fan
|
640b609831
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-18 12:18:25 +08:00 |
|
fan
|
de7623b475
|
发布报错调整
|
2023-02-18 12:18:09 +08:00 |
|
dong
|
35cd45786f
|
代码调整
|
2023-02-17 18:15:55 +08:00 |
|
fan
|
85ca94a66a
|
Merge remote-tracking branch 'origin/test_dispaly' into test
|
2023-02-17 18:15:07 +08:00 |
|
dong
|
960e16dfa2
|
代码调整
|
2023-02-17 18:05:16 +08:00 |
|
dong
|
9697bf81f8
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-17 17:59:18 +08:00 |
|
dong
|
8b38960f14
|
代码调整
|
2023-02-17 17:58:59 +08:00 |
|
fan
|
d4ce77e8bc
|
撤销：重复修改 权限分发到指定用户页面
|
2023-02-17 16:37:20 +08:00 |
|
fan
|
b07d540134
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-17 16:18:08 +08:00 |
|
fan
|
6ae073a557
|
调整：权限分发到指定用户添加账户查询条件
|
2023-02-17 16:18:00 +08:00 |
|
dong
|
4005b3783d
|
修改权限分发到指定用户弹窗和账号管理界面一致
|
2023-02-17 16:14:25 +08:00 |
|
fan
|
fd87f62c25
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-17 15:59:50 +08:00 |
|
fan
|
39f2019251
|
调整：仿真退出未重置activeTrainList
|
2023-02-17 15:59:40 +08:00 |
|
dong
|
25fcd0d671
|
代码调整
|
2023-02-17 15:49:44 +08:00 |
|
fan
|
ba21c4fe95
|
添加翻译
|
2023-02-17 15:39:18 +08:00 |
|
dong
|
fcb9ce5e08
|
模式转换功能调整
|
2023-02-17 15:01:59 +08:00 |
|
dong
|
2c41be9df5
|
代码调整
|
2023-02-17 11:23:02 +08:00 |
|
fan
|
7cfa33ecc0
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-17 10:36:53 +08:00 |
|
fan
|
73514ebc1f
|
Bug:参演角色重复问题修复
|
2023-02-17 10:36:22 +08:00 |
|
fan
|
ec03a5b6b7
|
Merge remote-tracking branch 'origin/test_dispaly' into thailand
# Conflicts:
# src/jmapNew/theme/components/menus/dialog/setFault.vue
# src/jmapNew/theme/datie_01/menus/menuSection.vue
# src/jmapNew/theme/datie_01/menus/menuSignal.vue
# src/jmapNew/theme/datie_01/menus/menuStation.vue
# src/jmapNew/theme/datie_01/menus/menuStationStand.vue
# src/jmapNew/theme/datie_01/menus/menuSwitch.vue
# src/jmapNew/theme/datie_01/menus/menuTrain.vue
# src/jmapNew/theme/datie_02/menus/menuButton.vue
# src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
# src/jmapNew/theme/datie_02/menus/menuSection.vue
# src/jmapNew/theme/datie_02/menus/menuSignal.vue
# src/jmapNew/theme/datie_02/menus/menuStation.vue
# src/jmapNew/theme/datie_02/menus/menuStationStand.vue
# src/jmapNew/theme/datie_02/menus/menuSwitch.vue
# src/jmapNew/theme/datie_02/menus/menuTrain.vue
# src/jmapNew/theme/datie_jd1a/menus/menuSection.vue
# src/jmapNew/theme/datie_jd1a/menus/menuSignal.vue
# src/jmapNew/theme/datie_jd1a/menus/menuStation.vue
# src/jmapNew/theme/datie_jd1a/menus/menuStationStand.vue
# src/jmapNew/theme/datie_jd1a/menus/menuSwitch.vue
# src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue
# src/jmapNew/theme/datie_ksk/menus/menuSection.vue
# src/jmapNew/theme/datie_ksk/menus/menuSignal.vue
# src/jmapNew/theme/datie_ksk/menus/menuStation.vue
# src/jmapNew/theme/datie_ksk/menus/menuStationStand.vue
# src/jmapNew/theme/datie_ksk/menus/menuSwitch.vue
# src/jmapNew/theme/datie_ksk/menus/menuTrain.vue
# src/jmapNew/theme/datie_tky/menus/menuTrain.vue
# src/views/newMap/display/lineBoard.vue
# src/views/newMap/display/terminals/registerBook.vue
# src/views/newMap/display/trainingList/trainingMenu.vue
|
2023-02-17 10:28:46 +08:00 |
|
dong
|
abdfcaef41
|
调整模式转换
|
2023-02-17 09:51:09 +08:00 |
|
fan
|
f38fb8891a
|
调整：驾驶至目的地添加清除操作
|
2023-02-16 17:28:17 +08:00 |
|
fan
|
0c6ef6e834
|
调整：删除触发故障操作
|
2023-02-16 17:27:01 +08:00 |
|
fan
|
fc36b56ef7
|
调整：实训增加立即执行操作(判断逻辑调整)
|
2023-02-16 14:02:27 +08:00 |
|
fan
|
90c74ee23c
|
调整：实训增加立即执行操作
|
2023-02-16 13:17:25 +08:00 |
|
fan
|
3dc5c22bf0
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-16 10:36:46 +08:00 |
|