fan
|
2b035003e2
|
bugfix:打开运行图预览没有数据
|
2023-08-18 10:51:09 +08:00 |
|
fan
|
dd6f8bace4
|
列车操作速度显示调整
|
2023-08-17 13:21:53 +08:00 |
|
fan
|
cad848ce8e
|
自动运行 添加
|
2023-08-17 10:39:37 +08:00 |
|
fan
|
9bc7126509
|
登录路径处理调整
|
2023-08-16 17:50:39 +08:00 |
|
fan
|
b9830714c7
|
登录路径处理调整
|
2023-08-16 16:17:52 +08:00 |
|
fan
|
ae8c202dbe
|
南工院增加列车操作
|
2023-08-14 10:07:07 +08:00 |
|
fan
|
aea0436cbc
|
道岔生成逻辑调整
|
2023-08-09 17:05:03 +08:00 |
|
fan
|
acb8c3455f
|
车辆段放开故障操作
|
2023-07-28 11:11:06 +08:00 |
|
fan
|
52a5a78861
|
标准线调整
|
2023-07-13 10:46:07 +08:00 |
|
fan
|
e08677eabe
|
成员一键生成
|
2023-07-06 09:55:25 +08:00 |
|
fan
|
3dd44c3243
|
设备登录退出路径丢失调整
|
2023-07-05 10:56:02 +08:00 |
|
fan
|
ee58c53b83
|
Merge remote-tracking branch 'origin/test'
|
2023-06-12 10:13:52 +08:00 |
|
fan
|
0600abc0c9
|
实训室功能隐藏
|
2023-06-12 10:03:57 +08:00 |
|
fan
|
8e34a0f267
|
Merge remote-tracking branch 'origin/test'
|
2023-06-08 13:27:05 +08:00 |
|
fan
|
a8e2c9ef3b
|
注册找回账号手机号校验格式调整
|
2023-06-08 10:59:50 +08:00 |
|
fan
|
6b18628b7c
|
Merge remote-tracking branch 'origin/test'
|
2023-06-07 18:01:28 +08:00 |
|
fan
|
d232546e8c
|
新增宁波一号线特殊线路
|
2023-06-07 09:38:15 +08:00 |
|
fan
|
f20378c4b4
|
福州一号线&宁波一号线新增列车连挂操作
|
2023-06-06 17:21:01 +08:00 |
|
fan
|
42779dc952
|
Merge remote-tracking branch 'origin/test'
|
2023-06-06 10:09:00 +08:00 |
|
fan
|
9aab60fe9c
|
区域选择未初始化控制人调整
|
2023-06-06 10:07:31 +08:00 |
|
fan
|
e1f35c56e9
|
项目配置添加删除logo功能
|
2023-06-06 09:53:50 +08:00 |
|
fan
|
92e3e5db31
|
福州一号线道岔失表调整
|
2023-06-05 14:23:07 +08:00 |
|
fan
|
228b4aadc3
|
列车操作调整
|
2023-06-02 17:32:58 +08:00 |
|
fan
|
0df4ffdcf6
|
登录调整
|
2023-06-02 16:54:05 +08:00 |
|
fan
|
b1c0ef11a8
|
设备登录配置调整&列车操作列车图标反转调整
|
2023-06-02 14:21:29 +08:00 |
|
fan
|
3855087abd
|
Merge remote-tracking branch 'origin/test'
|
2023-06-01 18:15:18 +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
|
ca329a4db7
|
Merge remote-tracking branch 'origin/test'
|
2023-05-30 17:55:25 +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
|
e32d8f9b6b
|
Merge remote-tracking branch 'origin/test'
|
2023-05-26 17:59:19 +08:00 |
|
fan
|
7ebc8dbf1e
|
第三方登录新窗口打开
|
2023-05-26 17:58:52 +08:00 |
|
fan
|
23975cd271
|
Merge remote-tracking branch 'origin/test'
|
2023-05-26 17:43:20 +08:00 |
|
fan
|
adf75ebc1a
|
继续仿真获取project错误
|
2023-05-26 17:42:54 +08:00 |
|
fan
|
f4e27a6e31
|
Merge remote-tracking branch 'origin/test'
|
2023-05-26 17:18:59 +08:00 |
|
fan
|
3d63abcdbd
|
第三方登录还原项目判断
|
2023-05-26 17:18:40 +08:00 |
|
fan
|
4424137da9
|
Merge remote-tracking branch 'origin/test'
|
2023-05-26 15:56:44 +08:00 |
|
fan
|
18b5780415
|
实训预览不在前端切换成员
|
2023-05-26 15:56:22 +08:00 |
|
fan
|
ac82fad041
|
Merge remote-tracking branch 'origin/test'
|
2023-05-26 15:34:23 +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
|
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 |
|
dong
|
6d18d374a4
|
新会话调整
|
2023-05-25 15:09:02 +08:00 |
|
dong
|
94c8f30305
|
修改仿真重新进入后之前的角色没有清除
|
2023-05-25 14:23:56 +08:00 |
|
dong
|
8151a465ab
|
新会话在初始化后重新获取会话列表
|
2023-05-25 13:46:01 +08:00 |
|
dong
|
13b63988dd
|
仿真成员界面样式优化
|
2023-05-25 10:31:57 +08:00 |
|
|
|
fd5af534af
|
Merge remote-tracking branch 'origin/test'
|
2023-05-24 19:19:48 +08:00 |
|
dong
|
9426ece04f
|
仿真角色统一
|
2023-05-24 18:34:38 +08:00 |
|
joylink_zhaoerwei
|
8256758a7a
|
微调--NCC消息判断
|
2023-05-24 18:21:49 +08:00 |
|
joylink_zhaoerwei
|
dd4f2a2fe6
|
微调
|
2023-05-24 17:46:01 +08:00 |
|
joylink_zhaoerwei
|
9cde1a5487
|
微调
|
2023-05-24 17:28:03 +08:00 |
|
joylink_zhaoerwei
|
82359d5a4c
|
微调
|
2023-05-24 17:04:45 +08:00 |
|
|
|
c90da32501
|
Merge remote-tracking branch 'origin/test' into test
|
2023-05-24 17:00:41 +08:00 |
|
|
|
f85fba0b5d
|
处理仿真销毁后创建者没有退出页面问题 -by fan
|
2023-05-24 17:00:27 +08:00 |
|
joylink_zhaoerwei
|
5874e8d81f
|
微调
|
2023-05-24 15:44:05 +08:00 |
|
joylink_zhaoerwei
|
82b4d671b2
|
告警分页
|
2023-05-24 15:15:35 +08:00 |
|
fan
|
79b8d24c6a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-05-24 14:25:53 +08:00 |
|
fan
|
e29700534a
|
派班工作站获取列车调整
|
2023-05-24 14:25:22 +08:00 |
|
joylink_zhaoerwei
|
1c31517588
|
微调
|
2023-05-24 14:00:51 +08:00 |
|
joylink_zhaoerwei
|
aa1e6ca4c7
|
微调
|
2023-05-24 13:56:43 +08:00 |
|
joylink_zhaoerwei
|
4e2a36bcb8
|
去分组
|
2023-05-24 13:52:07 +08:00 |
|
joylink_zhaoerwei
|
01471bba12
|
故障报警初提交
|
2023-05-24 11:25:54 +08:00 |
|
fan
|
fa6883fe8f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-05-24 11:13:19 +08:00 |
|
fan
|
bab7cd6c40
|
注释调整
|
2023-05-24 11:12:59 +08:00 |
|
fan
|
43db0d138f
|
项目配置完善全部迁移为配置项
|
2023-05-24 11:04:39 +08:00 |
|
dong
|
404d028585
|
新会话调整
|
2023-05-24 10:55:27 +08:00 |
|
dong
|
248f2a767a
|
新会话调整
|
2023-05-23 18:11:28 +08:00 |
|
dong
|
6c8ae4f763
|
角色信息调度名称修改
|
2023-05-23 17:38:23 +08:00 |
|
fan
|
341e0ff829
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-05-23 16:59:59 +08:00 |
|
fan
|
ca4c184e14
|
实训设计限制新标签页打开客户端
|
2023-05-23 16:59:43 +08:00 |
|
dong
|
f1a7f09cc7
|
添加角色OCC_DISPATCHER信息调度
|
2023-05-23 16:42:31 +08:00 |
|
dong
|
ac1ef8e5a8
|
线路数据管理-生成实训
|
2023-05-23 15:54:33 +08:00 |
|
fan
|
88b9ac889c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-05-23 15:50:56 +08:00 |
|
fan
|
9acd8a8eba
|
生成客户端调整+覆盖生成快捷方式
|
2023-05-23 15:50:40 +08:00 |
|
dong
|
fa906225a7
|
新会话调整
|
2023-05-23 15:02:26 +08:00 |
|
dong
|
642a09f80c
|
新会话优化调整
|
2023-05-23 14:13:02 +08:00 |
|
fan
|
21774b94a3
|
客户端跳转判断调整
|
2023-05-23 13:27:41 +08:00 |
|
fan
|
94a3693337
|
仿真状态判断调整
|
2023-05-23 11:27:36 +08:00 |
|
joylink_zhaoerwei
|
228c06e61d
|
微调
|
2023-05-22 17:55:41 +08:00 |
|
fan
|
1501a75ad3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-05-22 17:16:53 +08:00 |
|
fan
|
fb351cd75d
|
新增推出仿真成员处理
|
2023-05-22 17:16:38 +08:00 |
|
joylink_zhaoerwei
|
4449a25c5b
|
去除警告计数
|
2023-05-22 16:47:09 +08:00 |
|
dong
|
1ee0cad514
|
新会话调整
|
2023-05-22 16:43:49 +08:00 |
|
dong
|
0a2cdb3257
|
新会话调整
|
2023-05-22 16:35:20 +08:00 |
|
fan
|
83ee31034b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-05-22 16:07:08 +08:00 |
|
fan
|
ae3c2ea269
|
统计信息单位调整
|
2023-05-22 16:06:34 +08:00 |
|
dong
|
fe6a835873
|
新会话调整
|
2023-05-22 15:51:56 +08:00 |
|
dong
|
ae4e6b652c
|
私聊实训功能
|
2023-05-22 14:41:35 +08:00 |
|
fan
|
e30494d404
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-05-22 13:47:32 +08:00 |
|
fan
|
545440b7e7
|
统计信息调整
|
2023-05-22 13:47:09 +08:00 |
|
fan
|
06e4bb93c7
|
Revert "Revert "修改新会话实训问题""
This reverts commit 7fa5b1d62e.
|
2023-05-22 11:18:37 +08:00 |
|
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 |
|
dong
|
77a80c2b2d
|
群邀请成员功能
|
2023-05-22 11:02:36 +08:00 |
|
dong
|
2635ea8c57
|
修改群主功能
|
2023-05-22 10:08:13 +08:00 |
|
dong
|
e6b1d2777a
|
添加私聊及成员查看
|
2023-05-22 09:43:36 +08:00 |
|
fan
|
144fecf31a
|
删除日志
|
2023-05-21 16:31:04 +08:00 |
|
fan
|
240f779afb
|
站遥控初始值调整
|
2023-05-21 16:30:43 +08:00 |
|
fan
|
c23bf6ba72
|
仿真倍速同步
|
2023-05-21 13:54:49 +08:00 |
|
fan
|
5e55daf3a4
|
北京佛山线路现地工作站操作新增控制器判断
|
2023-05-21 13:40:14 +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 |
|
dong
|
1afb68818f
|
实训标签只可添加，不能删除
(cherry picked from commit dd45877e1c)
|
2023-05-09 09:13:31 +08:00 |
|
|
|
fff07141b6
|
修改错误的冲突合并
|
2023-05-06 19:00:17 +08:00 |
|
|
|
80178a80f6
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/jmapNew/painter.js
|
2023-05-06 18:37:26 +08:00 |
|
|
|
1d824c135e
|
Merge remote-tracking branch 'origin/test_revert5.6'
|
2023-05-06 18:35:52 +08:00 |
|
Yuan
|
1318ecb97a
|
Merge branch 'test_revert5.6' of git.code.tencent.com:lian-cbtc/jl-client into test_revert5.6
|
2023-05-06 18:03:37 +08:00 |
|
Yuan
|
e3857a75d0
|
bugfix - 试卷规则标签选项
|
2023-05-06 18:03:32 +08:00 |
|
joylink_zhaoerwei
|
f3ae97f7f8
|
故障提示NCC
|
2023-05-06 17:26:09 +08:00 |
|
Yuan
|
b472601fbc
|
bugfix - 查看规则时标签字段未填充
(cherry picked from commit 2e51c9ee4c)
|
2023-05-06 16:31:37 +08:00 |
|
Yuan
|
2e51c9ee4c
|
bugfix - 查看规则时标签字段未填充
|
2023-05-06 16:22:15 +08:00 |
|
dong
|
d0a6b8e951
|
切换考试时实训模式弹窗关闭
|
2023-05-06 16:17:38 +08:00 |
|
dong
|
dd45877e1c
|
实训标签只可添加，不能删除
|
2023-05-06 16:01:16 +08:00 |
|
joylink_zhaoerwei
|
1bca2be560
|
故障提示NCC
|
2023-05-06 15:38:28 +08:00 |
|
fan
|
b6edc4913b
|
Revert "Squashed commit of the following:"
This reverts commit 77560336
|
2023-05-06 10:54:30 +08:00 |
|
fan
|
5c72107b90
|
Revert "添加角色NCC行调"
This reverts commit 6d848115b3.
|
2023-05-06 10:53:25 +08:00 |
|
fan
|
c4028ee8c6
|
Revert "会话群代码调整"
This reverts commit 79fbb8d071.
|
2023-05-06 10:53:15 +08:00 |
|
fan
|
a7b0609389
|
Revert "NCC行调名称调整成NCC调度"
This reverts commit fcae8539d9.
|
2023-05-06 10:53:02 +08:00 |
|
fan
|
204aef1583
|
Revert "群消息已读"
This reverts commit 0805383f
|
2023-05-06 10:52:15 +08:00 |
|
fan
|
c563fe8efa
|
Revert "会话群代码调整"
This reverts commit 2d15eee9f8.
|
2023-05-06 10:49:24 +08:00 |
|
fan
|
1b1ddad29e
|
Revert "修改语音最长秒数"
This reverts commit 20de76047b.
|
2023-05-06 10:49:05 +08:00 |
|
fan
|
7fa5b1d62e
|
Revert "修改新会话实训问题"
This reverts commit eb4cd6ab4a.
|
2023-05-06 10:48:54 +08:00 |
|
fan
|
073e8bfc63
|
考试提交接口新增参数
|
2023-05-06 10:47:09 +08:00 |
|
fan
|
00b4b533a8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-05-05 16:54:19 +08:00 |
|
fan
|
7d0abef1e9
|
实训考试调整
|
2023-05-05 16:54:06 +08:00 |
|
dong
|
9776419202
|
修改实训标签添加权限判断
|
2023-05-05 16:35:05 +08:00 |
|
dong
|
9618acaa9d
|
实训管理添加修改实训标签功能
|
2023-05-05 16:04:02 +08:00 |
|
fan
|
e353289594
|
第三方登录增加组织选择
|
2023-05-05 09:33:54 +08:00 |
|
fan
|
eb579ee0a4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-05-05 09:33:03 +08:00 |
|
fan
|
e68bf8b9f8
|
第三方登录增加组织选择
|
2023-05-05 09:32:34 +08:00 |
|
joylink_zhaoerwei
|
91b1e8f5b3
|
多故障展示初稿
|
2023-05-04 17:39:29 +08:00 |
|
fan
|
bbf9e9ba0e
|
socket重复订阅问题修复
|
2023-05-04 17:23:51 +08:00 |
|
fan
|
1c51094308
|
生成客户端逻辑调整
|
2023-05-04 16:54:45 +08:00 |
|
weizhihong
|
0395d6d470
|
【群组消息已读标识】
|
2023-05-04 11:22:27 +08:00 |
|
fan
|
be9d27d7a2
|
socket异常逻辑调整
|
2023-05-04 11:05:08 +08:00 |
|
dong
|
8ae41273d6
|
地图设计-客户端数据
|
2023-04-28 16:59:13 +08:00 |
|
joylink_zhaoerwei
|
6f8d198f4c
|
报警微调
|
2023-04-28 11:12:48 +08:00 |
|
fan
|
027f00da77
|
socket异常通知调整
|
2023-04-28 11:04:38 +08:00 |
|
fan
|
ce522b6570
|
增加列车接管
|
2023-04-28 11:04:26 +08:00 |
|
fan
|
e3e07dec1b
|
socket错误通知
|
2023-04-28 09:48:59 +08:00 |
|
fan
|
00dbc6d288
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test1
|
2023-04-28 09:22:13 +08:00 |
|
fan
|
f5e1c370cc
|
socket依赖调整
|
2023-04-28 09:21:59 +08:00 |
|
dong
|
eb4cd6ab4a
|
修改新会话实训问题
|
2023-04-27 15:40:04 +08:00 |
|
joylink_zhaoerwei
|
fefed61486
|
多故障备用
|
2023-04-27 14:09:06 +08:00 |
|
fan
|
210a7d0fdd
|
第三方登录页项目配置调整
|
2023-04-27 13:23:14 +08:00 |
|
fan
|
a373d21deb
|
线路数据设置归属项目管理项目数据通过接口查询
|
2023-04-27 13:23:07 +08:00 |
|
fan
|
fb6c187c21
|
第三方登录页项目配置调整
|
2023-04-27 13:21:50 +08:00 |
|
fan
|
fc64ef5f19
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-04-27 09:23:35 +08:00 |
|
fan
|
964ca665a4
|
线路数据设置归属项目管理项目数据通过接口查询
|
2023-04-27 09:23:21 +08:00 |
|
joylink_zhaoerwei
|
d73dea42ec
|
故障报警优化
|
2023-04-26 15:02:21 +08:00 |
|
joylink_zhaoerwei
|
071bfa90f7
|
故障报警初提交备用，待优化
|
2023-04-25 18:08:29 +08:00 |
|
dong
|
20de76047b
|
修改语音最长秒数
|
2023-04-25 17:41:08 +08:00 |
|
fan
|
cc3003dbb0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-04-25 17:39:34 +08:00 |
|
fan
|
a79668095c
|
ncc逻辑调整
|
2023-04-25 17:39:24 +08:00 |
|
dong
|
7c46ad5c62
|
获取project为null时无法找到页面问题
|
2023-04-25 16:22:30 +08:00 |
|
dong
|
2d15eee9f8
|
会话群代码调整
|
2023-04-25 15:56:18 +08:00 |
|
dong
|
0805383fde
|
群消息已读
|
2023-04-25 15:19:30 +08:00 |
|
fan
|
034199ec23
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-04-25 13:56:24 +08:00 |
|
fan
|
1faf4fadc5
|
ncc客户端调整
|
2023-04-25 13:56:09 +08:00 |
|
dong
|
fcae8539d9
|
NCC行调名称调整成NCC调度
|
2023-04-25 10:25:56 +08:00 |
|
fan
|
a188121aac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-04-25 09:42:48 +08:00 |
|
fan
|
7e8fb7cbd1
|
ncc列车颜色调整
|
2023-04-25 09:42:28 +08:00 |
|
dong
|
79fbb8d071
|
会话群代码调整
|
2023-04-24 18:27:36 +08:00 |
|
dong
|
6d848115b3
|
添加角色NCC行调
|
2023-04-24 16:10:50 +08:00 |
|
fan
|
5181b1e98a
|
ncc显示配置
|
2023-04-24 15:43:04 +08:00 |
|
fan
|
68d0d9c83b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-04-24 14:33:33 +08:00 |
|
fan
|
e326a18d80
|
新增同站示意框
|
2023-04-24 14:32:40 +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
|
933ef9ed82
|
ncc代码调整4.24
|
2023-04-24 13:16:07 +08:00 |
|
fan
|
18f67436aa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-04-23 18:15:36 +08:00 |
|
fan
|
42ef83d302
|
ncc代码调整4.23
|
2023-04-23 18:15:13 +08:00 |
|
fan
|
0cdaa7a6ed
|
ncc代码调整
|
2023-04-21 17:46:58 +08:00 |
|
dong
|
f2039927db
|
Squashed commit of the following:
commit d082dc2fbc
Author: dong <58670809@qq.com>
Date: Wed Apr 19 10:41:17 2023 +0800
修改收令单位不显示调度命令问题
commit c52925960c
Merge: a3bc0de08 1f5d891c5
Author: joylink_zhangsai <1021828630@qq.com>
Date: Tue Apr 18 16:25:03 2023 +0800
Merge remote-tracking branch 'origin/test' into test
commit a3bc0de08a
Author: joylink_zhangsai <1021828630@qq.com>
Date: Tue Apr 18 16:24:34 2023 +0800
处理列车异常显示问题 by fan
commit 1f5d891c55
Author: dong <58670809@qq.com>
Date: Mon Apr 17 14:40:39 2023 +0800
修改苏电院交控线路顶部菜单展开后没法收回去问题
commit 0d50ac586b
Author: dong <58670809@qq.com>
Date: Mon Apr 17 13:26:39 2023 +0800
修改弹窗没有高度问题
commit 73c9c0777e
Author: dong <58670809@qq.com>
Date: Fri Apr 14 16:25:38 2023 +0800
去掉实训管理查询项缓存
|
2023-04-19 10:42:38 +08:00 |
|
dong
|
d082dc2fbc
|
修改收令单位不显示调度命令问题
|
2023-04-19 10:41:17 +08:00 |
|
|
|
c52925960c
|
Merge remote-tracking branch 'origin/test' into test
|
2023-04-18 16:25:03 +08:00 |
|
|
|
a3bc0de08a
|
处理列车异常显示问题 by fan
|
2023-04-18 16:24:34 +08:00 |
|
dong
|
c020d69150
|
Squashed commit of the following:
commit 1f5d891c55
Author: dong <58670809@qq.com>
Date: Mon Apr 17 14:40:39 2023 +0800
修改苏电院交控线路顶部菜单展开后没法收回去问题
|
2023-04-17 14:51:08 +08:00 |
|
dong
|
1f5d891c55
|
修改苏电院交控线路顶部菜单展开后没法收回去问题
|
2023-04-17 14:40:39 +08:00 |
|
dong
|
f27fd63e29
|
Squashed commit of the following:
commit 0d50ac586b
Author: dong <58670809@qq.com>
Date: Mon Apr 17 13:26:39 2023 +0800
修改弹窗没有高度问题
|
2023-04-17 13:28:06 +08:00 |
|
dong
|
0d50ac586b
|
修改弹窗没有高度问题
|
2023-04-17 13:26:39 +08:00 |
|
dong
|
857472ba72
|
Squashed commit of the following:
commit 73c9c0777e
Author: dong <58670809@qq.com>
Date: Fri Apr 14 16:25:38 2023 +0800
去掉实训管理查询项缓存
|
2023-04-14 16:26:57 +08:00 |
|
dong
|
73c9c0777e
|
去掉实训管理查询项缓存
|
2023-04-14 16:25:38 +08:00 |
|
fan
|
1aca150711
|
Merge remote-tracking branch 'origin/test'
|
2023-04-14 13:09:38 +08:00 |
|
fan
|
dff6b0f545
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-04-14 13:07:37 +08:00 |
|
fan
|
4285249458
|
教学管理实训数据管理调整
|
2023-04-14 13:07:17 +08:00 |
|
dong
|
d3dd38b883
|
宁波3排路进路校验字段调整
|
2023-04-13 18:25:18 +08:00 |
|
fan
|
8593174685
|
Merge remote-tracking branch 'origin/test'
|
2023-04-13 16:23:01 +08:00 |
|
fan
|
0e1dcbb5fd
|
刷新页面baseUrl调用错误调整
|
2023-04-13 16:04:14 +08:00 |
|
fan
|
f5ffa562ce
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-04-13 14:22:55 +08:00 |
|
fan
|
0438f6b183
|
哈尔滨南京二号线样式调整
|
2023-04-13 14:22:45 +08:00 |
|
dong
|
482d8ba2bf
|
事件总线订阅未销毁导致的重复调用问题
|
2023-04-13 13:29:56 +08:00 |
|
fan
|
47bae5b02c
|
PSL不显示小型站台
|
2023-04-13 10:16:49 +08:00 |
|
fan
|
0626d81356
|
非实训设计司机角色跳转司机驾驶客户端
|
2023-04-13 10:05:11 +08:00 |
|
fan
|
9ea5bef12a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-04-13 09:35:03 +08:00 |
|
fan
|
3ecf5e4da3
|
增加综合演练仿真号复制
|
2023-04-13 09:34:42 +08:00 |
|
dong
|
2bb8c6df92
|
Squashed commit of the following:
commit 30763300ac
Author: dong <58670809@qq.com>
Date: Wed Apr 12 18:31:39 2023 +0800
修改前端配置带id
commit cde33feb22
Author: fan <fanyuhong@joylink.club>
Date: Wed Apr 12 18:07:47 2023 +0800
宁波三进路选择表示样式不取消
commit 34a94e2c6d
Author: fan <fanyuhong@joylink.club>
Date: Wed Apr 12 17:58:11 2023 +0800
区域选择界面调整
commit 52af1d994b
Author: fan <fanyuhong@joylink.club>
Date: Wed Apr 12 13:33:03 2023 +0800
系统管理-教学考试数据管理
commit 6187b449c1
Author: dong <58670809@qq.com>
Date: Fri Apr 7 15:22:33 2023 +0800
代码调整
commit 074453ece7
Author: weizhihong <weizhihong@joylink.club>
Date: Fri Mar 31 16:52:08 2023 +0800
【删除注释】
|
2023-04-12 18:34:06 +08:00 |
|
dong
|
30763300ac
|
修改前端配置带id
|
2023-04-12 18:31:39 +08:00 |
|
fan
|
cde33feb22
|
宁波三进路选择表示样式不取消
|
2023-04-12 18:07:47 +08:00 |
|
fan
|
34a94e2c6d
|
区域选择界面调整
|
2023-04-12 17:58:11 +08:00 |
|
fan
|
52af1d994b
|
系统管理-教学考试数据管理
|
2023-04-12 13:33:03 +08:00 |
|
dong
|
54fb5eb47a
|
Squashed commit of the following:
commit 6187b449c1
Author: dong <58670809@qq.com>
Date: Fri Apr 7 15:22:33 2023 +0800
代码调整
commit 074453ece7
Author: weizhihong <weizhihong@joylink.club>
Date: Fri Mar 31 16:52:08 2023 +0800
【删除注释】
|
2023-04-07 15:27:22 +08:00 |
|
dong
|
6187b449c1
|
代码调整
|
2023-04-07 15:22:33 +08:00 |
|
fan
|
95b6d019dd
|
Merge remote-tracking branch 'origin/test'
|
2023-04-06 17:32:19 +08:00 |
|
weizhihong
|
074453ece7
|
【删除注释】
|
2023-03-31 16:52:08 +08:00 |
|
fan
|
2b6fa6a9f7
|
综合演练生成仿真号&仿真界面刷新bug调整
|
2023-03-31 15:54:37 +08:00 |
|
fan
|
ed1c4c0e53
|
Merge remote-tracking branch 'origin/test'
|
2023-03-23 17:51:52 +08:00 |
|
dong
|
770de3c73c
|
规则重复添加提示
|
2023-03-23 17:41:06 +08:00 |
|
dong
|
a67a736ec3
|
Squashed commit of the following:
commit e3d8637ffe
Author: dong <58670809@qq.com>
Date: Thu Mar 23 10:09:03 2023 +0800
跳转登录时先登入组织再获取用户信息
|
2023-03-23 10:11:20 +08:00 |
|
fan
|
449800f360
|
线路功能样式微调
|
2023-03-13 16:26:18 +08:00 |
|
fan
|
6fd16fcc95
|
三方跳转调整
|
2023-03-13 15:23:19 +08:00 |
|
fan
|
5af47f6ac4
|
设备登录loading调整
|
2023-03-13 15:21:59 +08:00 |
|
fan
|
4150f64f36
|
三方跳转调整
|
2023-03-13 15:01:59 +08:00 |
|
fan
|
4ffdc6a90d
|
缓存project调整
|
2023-03-13 13:24:24 +08:00 |
|
fan
|
191542d0d4
|
项目配置调整
|
2023-03-13 11:01:33 +08:00 |
|
fan
|
8ec88a84a2
|
Merge remote-tracking branch 'origin/test'
|
2023-03-10 09:37:53 +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
|
e5046f3fa8
|
注释自动登录
|
2023-03-07 13:56:09 +08:00 |
|
fan
|
b42c8ea6b5
|
查询项目设备调整
|
2023-03-06 16:31:41 +08:00 |
|
fan
|
0339b04966
|
授权码管理&申请
|
2023-03-02 16:39:44 +08:00 |
|
fan
|
5c0c9c7702
|
授权码显示页面调整
|
2023-03-02 16:23:49 +08:00 |
|
fan
|
71502ba211
|
路由跳转调整
|
2023-03-02 16:11:27 +08:00 |
|
fan
|
8a89c93603
|
获取项目配置接口频繁调用调整
|
2023-03-02 14:31:53 +08:00 |
|
fan
|
8e7b653bd3
|
设备管理配置调整
|
2023-03-01 15:53:20 +08:00 |
|
