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
|
6bc46647d7
|
删除日志
|
2023-05-20 17:50:32 +08:00 |
|
fan
|
516a3a4041
|
试卷考试添加倒计时，倒计时结束提交试卷&试卷规则调整
|
2023-05-20 16:10:54 +08:00 |
|
fan
|
d5e515fbfa
|
删除日志
|
2023-05-20 13:36:18 +08:00 |
|
fan
|
25acb80335
|
socket提示调整
|
2023-05-15 16:41:15 +08:00 |
|
fan
|
b6edc4913b
|
Revert "Squashed commit of the following:"
This reverts commit 77560336
|
2023-05-06 10:54:30 +08:00 |
|
fan
|
bbf9e9ba0e
|
socket重复订阅问题修复
|
2023-05-04 17:23:51 +08:00 |
|
fan
|
be9d27d7a2
|
socket异常逻辑调整
|
2023-05-04 11:05:08 +08:00 |
|
fan
|
027f00da77
|
socket异常通知调整
|
2023-04-28 11:04:38 +08:00 |
|
fan
|
e3e07dec1b
|
socket错误通知
|
2023-04-28 09:48:59 +08:00 |
|
fan
|
f5e1c370cc
|
socket依赖调整
|
2023-04-28 09:21:59 +08:00 |
|
fan
|
a79668095c
|
ncc逻辑调整
|
2023-04-25 17:39:24 +08:00 |
|
dong
|
775603368d
|
Squashed commit of the following:
commit b5705b12c2
Author: dong <58670809@qq.com>
Date: Mon Apr 24 13:19:45 2023 +0800
代码调整
commit 196f8e5306
Author: dong <58670809@qq.com>
Date: Mon Apr 24 10:42:18 2023 +0800
线路设计-仿真成员-会话群名称显示调整
commit 4fe929cd37
Author: dong <58670809@qq.com>
Date: Sun Apr 23 16:24:52 2023 +0800
代码调整
commit 7dd973c13e
Author: dong <58670809@qq.com>
Date: Sun Apr 23 15:58:34 2023 +0800
会话群调整
commit 50e5e92a05
Author: dong <58670809@qq.com>
Date: Sun Apr 23 15:43:17 2023 +0800
会话群调整
commit 740e676971
Author: dong <58670809@qq.com>
Date: Fri Apr 21 15:17:10 2023 +0800
会话群调整
commit 6d4e28a0dc
Author: dong <58670809@qq.com>
Date: Fri Apr 21 11:02:38 2023 +0800
会话群调整
commit 2d2f3e9fdc
Author: dong <58670809@qq.com>
Date: Fri Apr 21 10:12:14 2023 +0800
会话群调整
commit 3b21f72e38
Author: dong <58670809@qq.com>
Date: Fri Apr 21 09:37:56 2023 +0800
会话群调整
commit baaa8e4bbb
Author: dong <58670809@qq.com>
Date: Thu Apr 20 15:38:48 2023 +0800
会话群调整
commit 53ef9b5930
Author: dong <58670809@qq.com>
Date: Thu Apr 20 11:16:18 2023 +0800
群组信息接口
commit df2cae5c2b
Author: dong <58670809@qq.com>
Date: Thu Apr 20 10:57:56 2023 +0800
Squashed commit of the following:
commit d0722f229c376afa241441bc91d085f6c6f68d4e
Author: dong <58670809@qq.com>
Date: Thu Apr 20 10:51:28 2023 +0800
新会话群
|
2023-04-24 13:38:05 +08:00 |
|
fan
|
0cdaa7a6ed
|
ncc代码调整
|
2023-04-21 17:46:58 +08:00 |
|
fan
|
4aa0474586
|
恢复正式接口调用判断
|
2023-03-09 10:20:56 +08:00 |
|
fan
|
aa4ab3ce91
|
撤销token存在local
|
2023-03-07 14:26:02 +08:00 |
|
fan
|
a7f55fd52c
|
token清除位置调整
|
2023-02-27 13:46:29 +08:00 |
|
fan
|
d1133c947c
|
自动登录调整
|
2023-02-27 13:41:08 +08:00 |
|
fan
|
f24c36dbed
|
鉴权调整
|
2023-02-23 18:18:01 +08:00 |
|
dong
|
abdfcaef41
|
调整模式转换
|
2023-02-17 09:51:09 +08:00 |
|
joylink_cuiweidong
|
7a04b580b8
|
添加 电力工务 角色
|
2023-02-10 11:09:10 +08:00 |
|
joylink_cuiweidong
|
bfd75b723b
|
代码调整
|
2023-02-09 18:11:52 +08:00 |
|
fan
|
96eb526713
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-07 18:00:59 +08:00 |
|
dong
|
9361a11268
|
非正常情况接发列车关键环节控制表--实训操作记录
|
2023-02-07 13:38:08 +08:00 |
|
fan
|
6fa8220235
|
ctc按钮调整
|
2023-02-07 13:17:21 +08:00 |
|
fan
|
7f7fb6c8a7
|
考试接口参数变更
|
2023-01-31 09:57:11 +08:00 |
|
dong
|
d921acf107
|
调度命令调整
|
2023-01-17 18:27:18 +08:00 |
|
dong
|
816c0d01f5
|
调度命令socket调整
|
2023-01-13 11:28:12 +08:00 |
|
fan
|
759154757b
|
旧代码删除
|
2023-01-13 09:09:25 +08:00 |
|
fan
|
aaafb5beec
|
调整：清除步骤是添加步骤一致校验
|
2023-01-06 15:17:21 +08:00 |
|
fan
|
3d137b7b54
|
步骤完成关闭提示
|
2023-01-05 14:14:38 +08:00 |
|
joylink_cuiweidong
|
36dabd5735
|
cctv视图 数字沙盘 派班工作站 代码调整
|
2022-12-29 16:45:39 +08:00 |
|
fan
|
687ffa563a
|
【北京一号线】这个提示位置修改下，11G是那个圆弧
|
2022-12-16 10:23:31 +08:00 |
|
fan
|
0f2a40b6cb
|
【标准一号线】强制站控提示位置有问题
|
2022-12-15 14:47:40 +08:00 |
|
fan
|
7e2ce3c8b0
|
前端配置项trainingType为空串时删除
|
2022-12-14 10:22:27 +08:00 |
|
fan
|
0cf34a6aeb
|
【【哈尔滨一号线】这里原本的步骤是点击字母E，现在点了站台门也触发下一步了，会导致实训无法继续】需重新进路录制
|
2022-12-14 09:36:33 +08:00 |
|
fan
|
1b7ecb0aad
|
实训调整
|
2022-12-12 11:16:07 +08:00 |
|
Yuan
|
0fce737944
|
考试管理 - 成绩查询&成绩统计
|
2022-12-09 15:11:59 +08:00 |
|
fan
|
2a593facb1
|
北京一号线菜单调整&线路页面调整
|
2022-12-08 09:56:53 +08:00 |
|
Yuan
|
60cf75f3c0
|
考试管理标签bug修改 && 试卷状态改动
|
2022-12-07 16:28:35 +08:00 |
|
fan
|
d73bc4d577
|
发送文字替换发送语音
|
2022-12-06 14:05:07 +08:00 |
|
fan
|
42d8e9fe60
|
聊天室调整
|
2022-12-02 17:22:51 +08:00 |
|
fan
|
a52872de5c
|
综合演练问题调整2
|
2022-12-01 14:09:09 +08:00 |
|
fan
|
797afc7258
|
综合演练问题调整
|
2022-12-01 10:58:16 +08:00 |
|
fan
|
9ffd70de63
|
菜单调整
|
2022-11-28 17:59:12 +08:00 |
|
fan
|
e0dd6ae248
|
问题调整
|
2022-11-18 16:50:41 +08:00 |
|
fan
|
9edb55d72c
|
应急调度仿真
|
2022-11-16 14:49:46 +08:00 |
|
fan
|
64c58f511b
|
实训调整
|
2022-11-09 14:47:42 +08:00 |
|