Commit Graph

13347 Commits

Author SHA1 Message Date
joylink_zhaoerwei
c60127798c 试卷和任务增加pagesize=999 2024-03-04 09:13:31 +08:00
joylink_zhaoerwei
22457f7f49 模块名字微调 2024-03-01 17:04:18 +08:00
fan
e29dc3860e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-03-01 16:58:47 +08:00
fan
cf421fe32e 维护评分规则添加生成id 2024-03-01 16:58:30 +08:00
joylink_zhaoerwei
1c80c5f56a 微调 2024-03-01 16:46:25 +08:00
fan
ff33bec539 维护评分规则id1 2024-03-01 16:45:06 +08:00
fan
1aca5f00ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-03-01 16:44:20 +08:00
fan
18860dd3e5 维护评分规则id 2024-03-01 16:44:11 +08:00
joylink_zhaoerwei
e1bdbff6ac 微调 2024-03-01 16:29:17 +08:00
joylink_zhaoerwei
ccaefdeb5e 第一个页面调整 2024-03-01 16:20:10 +08:00
fan
7810cfc993 删除日志 2024-03-01 15:32:29 +08:00
fan
e6e2b7567f 评分规则0分不展示 2024-03-01 15:28:38 +08:00
fan
44361f14f6 loading位置调整 2024-03-01 15:25:30 +08:00
fan
a1f2fab981 评分规则调整1 2024-03-01 15:23:02 +08:00
fan
f5dcc979bf 评分规则调整 2024-03-01 15:21:32 +08:00
fan
01b95a3fd4 添加二次确认 2024-03-01 14:45:15 +08:00
fan
c1376ddf8f 大赛训练产品调整 2024-03-01 14:37:54 +08:00
fan
77713154d0 大赛训练产品调整暂提 2024-03-01 14:17:50 +08:00
fan
a69657c8e6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-03-01 13:53:30 +08:00
fan
8b92ce23e4 大赛训练产品调整暂提 2024-03-01 13:53:07 +08:00
joylink_zhaoerwei
e554cda023 增加打分结算路由 2024-03-01 13:18:44 +08:00
joylink_zhaoerwei
0478838734 微调 2024-03-01 11:11:17 +08:00
joylink_zhaoerwei
65b77a3b60 大赛训练第一个页面 2024-03-01 11:08:05 +08:00
joylink_zhaoerwei
a36b8e7c22 新建试卷去掉组别 2024-03-01 10:04:35 +08:00
joylink_zhaoerwei
c2885cb0cc 新建试卷去掉组别 2024-03-01 10:01:54 +08:00
fan
126507f87f 大赛训练产品调整暂提 2024-02-29 18:01:55 +08:00
fan
13aefab82b Merge remote-tracking branch 'origin/test' 2024-02-29 10:42:02 +08:00
fan
32866bab90 大赛训练产品调整暂提 2024-02-29 10:40:22 +08:00
fan
5016a5b175 大赛训练产品调整添加返回 2024-02-28 16:02:15 +08:00
fan
976292fc4c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-02-28 15:58:59 +08:00
fan
d105130eae 大赛训练产品调整new 2024-02-28 15:58:51 +08:00
joylink_zhaoerwei
2d856bc24e 仿真试卷页 2024-02-28 15:57:07 +08:00
fan
b1766b0ac5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-02-28 15:33:59 +08:00
fan
9e1d58f972 大赛训练产品调整 2024-02-28 15:33:41 +08:00
joylink_zhaoerwei
103a63494e 模块绑定评分表 2024-02-28 14:18:05 +08:00
joylink_zhaoerwei
dd4a338a4c 竞赛第一个页面壳提交 2024-02-28 13:24:13 +08:00
fan
fc554ce855 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-02-28 10:04:38 +08:00
fan
5ed4f1e3dc 大赛训练产品路由权限调整 2024-02-28 10:04:26 +08:00
joylink_zhaoerwei
2063900e40 任务选择的顺序 2024-02-27 18:18:01 +08:00
joylink_zhaoerwei
87a86e1de0 加分钟和阻止刷新 2024-02-27 16:52:49 +08:00
joylink_zhaoerwei
7cc8b14555 模块评分非必填 2024-02-27 15:46:03 +08:00
joylink_zhaoerwei
f47f504ada 去掉试卷是否支持拷贝 2024-02-27 15:34:59 +08:00
joylink_zhaoerwei
f42fc8a17c 任务和试卷调整 2024-02-27 14:48:44 +08:00
fan
6912d01d2c 233环境https=>http 2024-02-27 14:21:01 +08:00
fan
cc28f00377 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-02-27 11:13:01 +08:00
fan
dc68ba2397 竞赛产品调整暂提 2024-02-27 11:12:04 +08:00
joylink_zhaoerwei
2dd7c48786 微调 2024-02-27 10:08:56 +08:00
fan
508afb9954 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-02-27 08:46:32 +08:00
fan
2f767d7d31 规则详情注释场景相关内容 2024-02-27 08:46:07 +08:00
joylink_zhaoerwei
7c68ade822 竞赛任务和模块调整 2024-02-26 22:20:22 +08:00
fan
b0a93298cb 规则详情返回空值处理 2024-02-26 15:38:50 +08:00
joylink_fanyuhong
b0461baca0 竞赛调整 2024-02-23 17:02:02 +08:00
joylink_fanyuhong
0dd4837960 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-02-23 14:42:40 +08:00
joylink_fanyuhong
37d4739ea9 竞赛问题调整new 2024-02-23 14:42:24 +08:00
joylink_zhaoerwei
66bfacadb6 竞赛任务调整 2024-02-23 12:14:23 +08:00
joylink_fanyuhong
9949210f89 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-02-23 11:22:25 +08:00
joylink_fanyuhong
6071755a23 竞赛问题调整 2024-02-23 11:22:13 +08:00
joylink_zhaoerwei
de15e693e9 微调 2024-02-23 10:06:49 +08:00
joylink_zhaoerwei
fefbf3ce83 微调 2024-02-23 09:44:38 +08:00
joylink_zhaoerwei
ad8c8de231 微调,待测试接口 2024-02-22 17:56:55 +08:00
joylink_zhaoerwei
f908c8db04 去掉mock 2024-02-22 17:19:06 +08:00
joylink_zhaoerwei
9d2420920c 竞赛任务备用 2024-02-22 17:14:55 +08:00
joylink_fanyuhong
d77e872858 merge 2024-02-22 11:33:03 +08:00
joylink_fanyuhong
d9ba49392d 竞赛调整暂提 2024-02-22 11:10:39 +08:00
joylink_zhaoerwei
8c59b44de1 竞赛模块代码备用 2024-02-21 16:38:20 +08:00
joylink_zhaoerwei
e48289b953 试卷管理代码备用 2024-02-21 10:53:44 +08:00
joylink_zhaoerwei
757f661a22 竞赛任务api提交 2024-02-20 18:16:50 +08:00
joylink_fanyuhong
0be7c03f81 竞赛调整 2024-02-20 09:23:30 +08:00
joylink_fanyuhong
5564e354b4 url调整 2024-02-19 13:23:20 +08:00
joylink_fanyuhong
c769dcf49a 3.233=>33.233 2024-02-19 11:04:05 +08:00
joylink_zhaoerwei
0585807c1e 增加竞赛相关数据管理路由 2024-01-31 16:22:03 +08:00
fan
4804cebfcd Merge remote-tracking branch 'origin/test' 2024-01-16 09:36:39 +08:00
fan
d8219cc2eb 联系方式展示调整 2024-01-16 09:35:55 +08:00
fan
5e38fa05e2 成都工学院第二个项目增加叶佳提供小车操作 2023-12-29 10:51:02 +08:00
fan
ab31f2cefa 语音前缀调整 2023-12-19 16:15:33 +08:00
fan
933a1367c4 还原pis语音播放 2023-12-19 15:40:26 +08:00
fan
28dc2c3739 设备配置关闭时清值 2023-12-19 13:09:56 +08:00
fan
1aaa427dac tms&pis可视化配置 2023-12-19 11:21:24 +08:00
fan
388f4593f1 浙大网新操作调整1207 2023-12-07 17:45:44 +08:00
fan
6e477bef89 浙大网新操作调整 2023-12-06 17:23:47 +08:00
fan
72f730aaa6 浙大网新操作调整
(cherry picked from commit 1ecab822f4)
2023-12-05 11:23:35 +08:00
fan
1ecab822f4 浙大网新操作调整 2023-12-05 10:34:14 +08:00
fan
a9f18f6d61 Merge remote-tracking branch 'origin/test' 2023-12-04 17:55:44 +08:00
fan
241dbcd36f 浙大网新操作调整(控制权操作) 2023-12-04 17:55:20 +08:00
fan
3cb71dce37 浙大网新操作调整(控制权显示&请求中控调整&列车停车) 2023-12-04 16:35:54 +08:00
fan
9d039b3f58 福州一号线新增列车故障操作停车 2023-12-04 10:32:09 +08:00
fan
bd310dbc28 实训管理和项目设备登录调整 2023-12-01 13:27:31 +08:00
fan
3fcf066e66 设备配置调整 2023-12-01 09:28:18 +08:00
fan
c33c50005c Merge remote-tracking branch 'origin/test' 2023-11-30 17:54:51 +08:00
Yuan
29197c56ee tms页面数据修改 2023-11-30 15:55:14 +08:00
dong
6d2dd68108 语言来电铃声,语言其他BUG 2023-11-30 10:51:51 +08:00
fan
81c1806603 列车操作增加受电弓操作 2023-11-30 10:00:42 +08:00
fan
c0bf588334 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-11-30 09:41:55 +08:00
fan
cf2801288f 国赛校验失败不关闭dialog处理 2023-11-30 09:41:22 +08:00
dong
8e68e6e974 语音提示音改为之前电话铃声、语音播完再播另一个、其他语言问题 2023-11-29 17:24:46 +08:00
dong
a95c91f640 收到新消息添加铃声提醒、当前会话接收到新语音直接播放 2023-11-29 10:15:26 +08:00
fan
7094bca4f4 地车通信&受电弓操作 2023-11-24 16:29:22 +08:00
fan
ed9340f261 电力调度=》工电调度 2023-11-24 14:26:28 +08:00
fan
42cb54bf72 实训编制预览调整 2023-11-24 13:17:43 +08:00
fan
a981965452 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-11-23 14:26:21 +08:00
fan
bf54424109 调度大赛控制权调整 2023-11-23 14:25:56 +08:00
Yuan
05788794cd bugfix - 信号机站控操作 2023-11-22 17:14:57 +08:00
Yuan
c6c3a3a377 bugfix - 站台扣车操作菜单 2023-11-22 14:47:50 +08:00
Yuan
e29028ec0e bugfix - 站控信号机操作 2023-11-22 14:17:48 +08:00
Yuan
c513a3e80b bugfix - ZCControl高亮问题 2023-11-22 14:11:17 +08:00
Yuan
9b2db3957e 站控允许信号机操作 2023-11-22 13:28:50 +08:00
Yuan
c2298f9995 站控允许排列进路 2023-11-22 11:31:17 +08:00
fan
74bfcf49f1 成都工学院添加双icon(调换透明icon) 2023-11-16 15:14:21 +08:00
fan
56eea551fb Merge remote-tracking branch 'origin/test' 2023-11-16 15:08:19 +08:00
fan
19fde5c7fc 成都工学院添加双icon 2023-11-16 15:07:43 +08:00
fan
8a3670f51d 国赛列车操作调整 2023-11-15 15:04:35 +08:00
fan
5aefd0dea0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-11-13 17:24:46 +08:00
fan
af3b4b1d97 编辑设备配置NCC,OCC角色显示 2023-11-13 17:24:31 +08:00
Yuan
ad6d96890c tms页面放大 2023-11-13 10:38:30 +08:00
Yuan
8020075b98 tms页面微调 2023-11-10 17:22:37 +08:00
Yuan
dd4bbab000 tms 2023-11-10 10:55:42 +08:00
Yuan
907a88c6ea tms页面数据 2023-11-09 14:57:31 +08:00
fan
0b688dea64 tms客户端新增 2023-11-08 09:57:34 +08:00
Yuan
2bfdb557d1 tms页面 2023-11-07 17:24:15 +08:00
Yuan
f62f8ff273 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2023-11-03 17:37:57 +08:00
Yuan
ae9748a649 tms页面 2023-11-03 17:37:52 +08:00
fan
007548623d Revert "乘客信息发布系统拆分"
This reverts commit 4c67af284c.
2023-11-02 17:02:16 +08:00
fan
285b40091f 乘客信息发布系统拆分
(cherry picked from commit 4c67af284c)
2023-11-02 17:00:09 +08:00
fan
4c67af284c 乘客信息发布系统拆分 2023-11-02 16:59:37 +08:00
fan
684f32c481 Merge remote-tracking branch 'origin/test' 2023-10-31 17:51:57 +08:00
fan
597d4ea7d1 南京二ATP级别灯柱颜色修改&CR2操作完毕交互调整 2023-10-31 16:46:29 +08:00
fan
0867248df3 驾驶方式删除“无”&南京二增加NRM模式和停车 2023-10-30 17:13:35 +08:00
fan
313f716613 岔芯边缘道岔区段关联道岔导致报错调整 2023-10-30 16:26:58 +08:00
fan
c98c50f401 进路增加单列车进路属性&取消进路状态变化更新执行通知 2023-10-30 09:50:56 +08:00
fan
a5d260a340 加载备用车初始化调整 2023-10-26 16:23:33 +08:00
fan
4ba24892fc 南京二叶老师问题调整1 2023-10-26 15:40:25 +08:00
fan
1c76b26541 南京二叶老师问题调整 2023-10-26 13:10:49 +08:00
fan
2ef158851d Merge remote-tracking branch 'origin/test' 2023-10-25 14:05:58 +08:00
fan
e795ba1573 换端指令调整 2023-10-25 13:31:45 +08:00
fan
f9c47cbac6 Merge remote-tracking branch 'origin/test' 2023-10-25 10:36:11 +08:00
fan
efbd29a70a 南京二号线RM调整 2023-10-25 10:35:07 +08:00
fan
8fbddfe40d Merge remote-tracking branch 'origin/test' 2023-10-23 16:42:09 +08:00
fan
ca183eed7e 南京二号线哈尔滨线早晚点显示调整 2023-10-23 16:41:09 +08:00
fan
d9b03b30f6 仿真数据异常loading不关闭问题修复 2023-10-10 15:56:21 +08:00
910082305d Merge branch 'test'
# Conflicts:
#	src/views/newMap/display/terminals/index.vue
2023-09-27 18:11:19 +08:00
fan
16d9ee72bb 实训编制调整 2023-09-27 18:02:34 +08:00
fan
90d52176f2 添加仿真成员角色 2023-09-27 17:32:49 +08:00
fan
82e67c69e6 memberId丢失判定 2023-09-27 16:22:32 +08:00
fan
f01c445b25 实训问题修复
(cherry picked from commit 0598da9a2d)
2023-09-27 15:47:09 +08:00
fan
0598da9a2d 实训问题修复 2023-09-27 15:46:10 +08:00
fan
ac096dd663 Merge remote-tracking branch 'origin/test' 2023-09-20 14:51:28 +08:00
fan
fbdb48dc08 成都三号线现地仿真控制权切换问题调整 2023-09-20 14:51:03 +08:00
fan
2d7cdff431 错误数据跳过 2023-08-29 16:43:32 +08:00
fan
9b3cfdab78 运行图显示调整 2023-08-21 17:25:33 +08:00
fan
5efcec96ec bugfix:双击修改车次号 2023-08-18 13:50:35 +08:00