fan
|
8a966ac5ae
|
Revert "Revert "群消息已读""
This reverts commit 204aef15
|
2023-05-22 11:18:16 +08:00 |
|
fan
|
5eb2a3f80c
|
Revert "Revert "NCC行调名称调整成NCC调度""
This reverts commit a7b0609389.
|
2023-05-22 11:18:02 +08:00 |
|
fan
|
e1bf3dbcea
|
Revert "Revert "添加角色NCC行调""
This reverts commit 5c72107b
|
2023-05-22 11:16:59 +08:00 |
|
fan
|
67ea7ef5ae
|
Revert "Revert "Squashed commit of the following:""
This reverts commit b6edc491
|
2023-05-22 11:16:27 +08:00 |
|
fan
|
3fc6f13c6a
|
Merge remote-tracking branch 'origin/test'
# Conflicts:
# src/store/modules/map.js
# src/views/newMap/display/index.vue
# src/views/newMap/display/newChat/chatContent.vue
# src/views/newMap/display/newChat/chatDialog.vue
# src/views/newMap/display/newChat/editGroup.vue
# src/views/newMap/newMapdraft/mapoperate/simulationMember/index.vue
# src/views/organization/index.vue
# src/views/publish/examRule/draft/editRule.vue
|
2023-05-20 18:13:52 +08:00 |
|
fan
|
bc6ad0226b
|
会话使用旧组件
|
2023-05-20 18:04:58 +08:00 |
|
fan
|
dea3207c22
|
删除日志
|
2023-05-20 17:59:37 +08:00 |
|
fan
|
6bc46647d7
|
删除日志
|
2023-05-20 17:50:32 +08:00 |
|
fan
|
f5a2ca8eaf
|
考试规则问题调整
|
2023-05-20 16:39:05 +08:00 |
|
fan
|
27a88795f7
|
考试时不显示实训模式
|
2023-05-20 16:12:13 +08:00 |
|
fan
|
516a3a4041
|
试卷考试添加倒计时，倒计时结束提交试卷&试卷规则调整
|
2023-05-20 16:10:54 +08:00 |
|
fan
|
2d1558b011
|
实训客户端切换调整
|
2023-05-20 13:57:10 +08:00 |
|
fan
|
d5e515fbfa
|
删除日志
|
2023-05-20 13:36:18 +08:00 |
|
dongq107
|
ce62a19aa0
|
到第三方登录页面时先删除之前的token
|
2023-05-18 15:12:31 +08:00 |
|
dongq107
|
d09e415720
|
第三方登录必需调接口
|
2023-05-18 14:12:51 +08:00 |
|
fan
|
47f55642e3
|
ncc报警客户端切换调整&角色变更客户端切换调整
|
2023-05-15 17:22:45 +08:00 |
|
fan
|
1bdc04fb8e
|
客户端生成问题调整
|
2023-05-15 16:41:33 +08:00 |
|
fan
|
25acb80335
|
socket提示调整
|
2023-05-15 16:41:15 +08:00 |
|
fan
|
87aeb03cb0
|
派班工作站客户端初始化异常调整
|
2023-05-15 14:05:01 +08:00 |
|
fan
|
ee04af801a
|
客户端调整
|
2023-05-15 13:24:50 +08:00 |
|
fan
|
89ab468d6b
|
注释部分无用代码
|
2023-05-15 11:02:30 +08:00 |
|
fan
|
ac9f364e39
|
模板线路功能注掉初始客户端
|
2023-05-15 10:28:08 +08:00 |
|
fan
|
4b3114c9b5
|
新窗口打开客户端跳转错误处理
|
2023-05-15 09:51:32 +08:00 |
|
fan
|
7aa44293f2
|
ncc客户端跳转调整
|
2023-05-12 16:30:13 +08:00 |
|
fan
|
0d323cac5f
|
教学管理图片更换
|
2023-05-12 16:29:51 +08:00 |
|
fan
|
38ee6fc4c6
|
初始无仿真角色且有初始客户端逻辑调整
|
2023-05-12 16:18:40 +08:00 |
|
fan
|
47d4af94ed
|
应急调度客户端逻辑生成调整&客户端切换调整
|
2023-05-12 15:57:40 +08:00 |
|
fan
|
c142102de1
|
Merge remote-tracking branch 'origin/test_client' into test
|
2023-05-12 13:55:06 +08:00 |
|
fan
|
9e8917ccc1
|
客户端调整
|
2023-05-12 13:48:18 +08:00 |
|
dong
|
80067ca6aa
|
新会话代码调整
|
2023-05-11 16:11:00 +08:00 |
|
fan
|
503c4c4ed3
|
扬工院教学管理隐藏班级管理
|
2023-05-11 15:22:37 +08:00 |
|
fan
|
86eff63658
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-05-11 15:21:55 +08:00 |
|
fan
|
d13dc9696e
|
扬工院教学管理隐藏班级管理
|
2023-05-11 15:21:46 +08:00 |
|
fan
|
a4525be99e
|
客户端调整
|
2023-05-11 15:13:39 +08:00 |
|
dong
|
564ca5a845
|
地图设计-会话群调整
|
2023-05-11 15:03:57 +08:00 |
|
dong
|
9b07bfacea
|
修改ningbo01列车信息
|
2023-05-10 17:39:57 +08:00 |
|
dong
|
2cddeac881
|
添加ningbo01列车信息
|
2023-05-10 14:51:44 +08:00 |
|
dong
|
4f7b04fde5
|
实训开始清理之前的操作记录
|
2023-05-10 11:07:05 +08:00 |
|
fan
|
5887fada7a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-05-09 17:08:13 +08:00 |
|
fan
|
0ce2ed98bd
|
宁波一报警信息
|
2023-05-09 17:08:02 +08:00 |
|
dong
|
4cae954cd8
|
修改beijing01实训时现地切换到行调时操作按钮未置空导致报错
|
2023-05-09 14:09:05 +08:00 |
|
dong
|
c065542c22
|
修改报警详细信息弹窗时间错误问题
|
2023-05-09 13:41:41 +08:00 |
|
fan
|
38e492bde7
|
宁波一列车车次窗操作调整
|
2023-05-09 13:37:51 +08:00 |
|
fan
|
0f15e2d41f
|
模板线路功能调整
|
2023-05-09 10:37:07 +08:00 |
|
dong
|
7f63638c0e
|
修改实训报错问题
|
2023-05-09 09:47:28 +08:00 |
|
fan
|
623f8968b7
|
ncc比例参数调整
|
2023-05-09 09:35:58 +08:00 |
|
Yuan
|
7ff9a044b8
|
bugfix - 试卷规则标签选项
(cherry picked from commit e3857a75d0)
|
2023-05-09 09:15:53 +08:00 |
|
dong
|
e66295f016
|
调整已加入仿真提示功能
|
2023-05-09 09:13:47 +08:00 |
|
dong
|
cda47e5b64
|
Squashed commit of the following:
commit 4af4e7ea9c440cdf1a7dba0f6ed6b4774910b2ee
Author: dong <58670809@qq.com>
Date: Sat May 6 18:11:16 2023 +0800
登录时判断用户已经加入的仿真
|
2023-05-09 09:13:43 +08:00 |
|
dong
|
06cab3d7fe
|
切换考试时实训模式弹窗关闭
(cherry picked from commit d0a6b8e951)
|
2023-05-09 09:13:38 +08:00 |
|