fan
|
2a85d2e6cf
|
Merge remote-tracking branch 'origin/test' into thailand
|
2023-06-02 14:27:34 +08:00 |
|
fan
|
b1c0ef11a8
|
设备登录配置调整&列车操作列车图标反转调整
|
2023-06-02 14:21:29 +08:00 |
|
fan
|
c84cc54639
|
泰国翻译
|
2023-06-01 16:17:14 +08:00 |
|
fan
|
795e8d8196
|
泰国翻译
|
2023-06-01 16:16:20 +08:00 |
|
fan
|
6a9aa02cc3
|
Merge remote-tracking branch 'origin/test' into thailand
# Conflicts:
# src/jmapNew/theme/components/menus/dialog/setFault.vue
# src/jmapNew/theme/datie_01/menus/menuDialog/helpAbout.vue
# src/jmapNew/theme/datie_02/menus/menuSection.vue
# src/jmapNew/theme/datie_jd1a/menus/menuDialog/helpAbout.vue
# src/jmapNew/theme/datie_ksk/menus/menuDialog/helpAbout.vue
# src/scripts/ConstConfig.js
# src/views/newMap/display/chatBox.vue
# src/views/newMap/display/memberManage/membersManage.vue
# src/views/newMap/display/simulationMenu/simulationMenu.vue
# src/views/newMap/display/terminals/equipmentConstructionTable.vue
# src/views/newMap/display/terminals/registerBook.vue
# src/views/newMap/display/terminals/terminalMenu.vue
# src/views/newMap/display/trainingList/trainingMenu.vue
# src/views/newMap/display/trainingList/trainingTip.vue
|
2023-06-01 16:15:38 +08:00 |
|
fan
|
928b380811
|
大铁线路二注释新建计划车&新增故障操作添加备用车
|
2023-06-01 15:43:46 +08:00 |
|
fan
|
06ec5fe8e1
|
项目登录客户端选择调整
|
2023-06-01 10:21:24 +08:00 |
|
fan
|
0f22d3c818
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-06-01 09:40:58 +08:00 |
|
fan
|
4471a3000c
|
设备登录query错误数据调整
|
2023-06-01 09:39:43 +08:00 |
|
dong
|
50cf3a826d
|
薄册输入时间日期实训调整
|
2023-05-31 17:39:02 +08:00 |
|
dong
|
61915cd583
|
实训编制时添加跳转到当前步骤功能
|
2023-05-31 14:22:05 +08:00 |
|
dong
|
252d3d69e4
|
会话群创建添加实训操作
|
2023-05-31 14:01:25 +08:00 |
|
fan
|
5ad0421991
|
增加错误日志
|
2023-05-31 10:24:16 +08:00 |
|
fan
|
228044b4c9
|
多人实训调整
|
2023-05-31 09:46:54 +08:00 |
|
fan
|
f13252ff27
|
34234124
|
2023-05-30 17:54:40 +08:00 |
|
fan
|
b863211cca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-05-30 17:07:59 +08:00 |
|
fan
|
06c6cb26c6
|
应急调度按钮调整
|
2023-05-30 17:07:33 +08:00 |
|
fan
|
ad105021fd
|
v-if=>v-show防止单客户端未切换错误
|
2023-05-30 16:52:52 +08:00 |
|
dong
|
b85f8a5011
|
IBP盘计轴预复位鼠标左键接口迟滞，保证实训操作顺序
|
2023-05-30 16:31:03 +08:00 |
|
fan
|
88d09f2645
|
设置限速灰显判断调整
|
2023-05-30 16:00:04 +08:00 |
|
fan
|
62e2c3978f
|
添加赛的专用配置
|
2023-05-30 15:41:07 +08:00 |
|
fan
|
d4f919b54a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-05-30 11:25:02 +08:00 |
|
fan
|
268febaf7f
|
宁波一号线道岔钩锁=》手摇道岔钩锁
|
2023-05-30 11:24:35 +08:00 |
|
fan
|
57f65d45e3
|
添加草稿ibp管理
|
2023-05-30 11:23:52 +08:00 |
|
dong
|
8449d731bd
|
新会话调整
|
2023-05-30 10:58:36 +08:00 |
|
fan
|
ac3457efbd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-05-30 10:21:21 +08:00 |
|
fan
|
b2ce52612f
|
宁波一密码添加提示
|
2023-05-30 10:20:36 +08:00 |
|
fan
|
177bb78883
|
宁波一号线计轴复位区段筛选调整&车站字体大小判断调整&注释宁波一号线车站上电解锁
|
2023-05-30 09:50:51 +08:00 |
|
dong
|
9d193dcd66
|
实训的导入和导出
|
2023-05-29 18:42:34 +08:00 |
|
fan
|
80007a7521
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-05-29 16:28:14 +08:00 |
|
fan
|
a5849d9dd1
|
宁波一号线连锁故障，上电解锁功能增加
|
2023-05-29 16:27:56 +08:00 |
|
dong
|
a54a4d0d3c
|
打开聊天弹窗去掉实训校验
|
2023-05-29 13:57:05 +08:00 |
|
dong
|
77f644fc28
|
代码调整
|
2023-05-29 10:58:53 +08:00 |
|
dong
|
ef3c56b696
|
仿真角色调整
|
2023-05-29 10:49:59 +08:00 |
|
fan
|
a519447c62
|
获取个人信息接口更换
|
2023-05-29 10:32:48 +08:00 |
|
fan
|
94fa725cc7
|
标准线福州一新增连锁故障&上电解锁
|
2023-05-29 10:24:49 +08:00 |
|
fan
|
7ebc8dbf1e
|
第三方登录新窗口打开
|
2023-05-26 17:58:52 +08:00 |
|
fan
|
adf75ebc1a
|
继续仿真获取project错误
|
2023-05-26 17:42:54 +08:00 |
|
fan
|
3d63abcdbd
|
第三方登录还原项目判断
|
2023-05-26 17:18:40 +08:00 |
|
fan
|
18b5780415
|
实训预览不在前端切换成员
|
2023-05-26 15:56:22 +08:00 |
|
fan
|
edcdd8989f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-05-26 15:32:54 +08:00 |
|
fan
|
688c7c3315
|
版权展示调整
|
2023-05-26 15:31:11 +08:00 |
|
dong
|
501dd0b181
|
新会话调整
|
2023-05-26 13:50:52 +08:00 |
|
fan
|
d8f29517d6
|
泰国项目i8n报警调整
|
2023-05-26 10:35:10 +08:00 |
|
fan
|
8a4bc974f4
|
泰国项目屏蔽会话
|
2023-05-26 10:06:46 +08:00 |
|
fan
|
65853dcd7b
|
泰国翻译
|
2023-05-26 10:02:39 +08:00 |
|
fan
|
641084eb3c
|
Merge remote-tracking branch 'origin/test' into thailand
# Conflicts:
# src/views/newMap/display/memberManage/addMember.vue
# src/views/newMap/display/memberManage/membersManage.vue
# src/views/newMap/display/newChat/chatDialog.vue
# src/views/newMap/display/simulationMenu/simulationMenu.vue
|
2023-05-26 10:00:56 +08:00 |
|
fan
|
6fd27205fa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-05-26 09:48:50 +08:00 |
|
fan
|
2bd6088bd3
|
运行图编辑一直加载问题调整
|
2023-05-26 09:48:23 +08:00 |
|
fan
|
b4304099fe
|
泰国翻译526
|
2023-05-26 09:41:02 +08:00 |
|