Commit Graph

12775 Commits

Author SHA1 Message Date
dong
9361a11268 非正常情况接发列车关键环节控制表--实训操作记录 2023-02-07 13:38:08 +08:00
fan
ed1ca1287b Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-02-07 13:17:46 +08:00
fan
6fa8220235 ctc按钮调整 2023-02-07 13:17:21 +08:00
joylink_cuiweidong
31c09eea8e Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-02-06 18:09:21 +08:00
joylink_cuiweidong
d42612d6fa 代码调整 2023-02-06 18:09:04 +08:00
fan
527298f2cf 大铁菜单调整 2023-02-06 17:47:36 +08:00
joylink_cuiweidong
d162b96472 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-02-06 16:38:04 +08:00
joylink_cuiweidong
41d2c9d4d7 行车设备检查登记簿 代码调整 2023-02-06 16:37:47 +08:00
fan
33554fd4fb Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-02-06 16:11:28 +08:00
fan
7d765854e3 试卷实训调整 2023-02-06 16:11:13 +08:00
fan
745c3cfec9 相对运行方向 增加clearable 2023-02-06 16:07:58 +08:00
dong
be2bf8065d 代码调整 2023-02-06 14:34:42 +08:00
joylink_cuiweidong
9fd5ff89a4 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-02-06 14:22:52 +08:00
joylink_cuiweidong
5fc1b0c1e4 大铁联锁终端上的道岔、信号机上的右键操作去掉 2023-02-06 14:22:32 +08:00
fan
639607e72a Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-02-06 14:15:38 +08:00
fan
68feb49b9e X引导总锁调整 2023-02-06 14:15:15 +08:00
dong
bbbcf633b9 添加薄册--非正常情况接发列车关键环节控制表 2023-02-06 13:57:31 +08:00
fan
8023359880 实训调整 2023-02-06 10:41:22 +08:00
fan
6f50c20d19 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-02-03 18:29:23 +08:00
fan
a9717d7eff 考试实训调整 2023-02-03 18:29:14 +08:00
joylink_cuiweidong
376e08eab9 添加 行车设备施工登记簿 防洪安全上岗签到表 页面 2023-02-03 17:56:04 +08:00
fan
e4a614f917 调整 黄金糕 2023-02-03 17:48:32 +08:00
dong
0222c60b1f 薄册增加tab项 2023-02-03 10:14:25 +08:00
dong
c127e36b07 代码调整 2023-02-03 09:38:14 +08:00
dong
0b9b2a14e1 添加调度命令无线受令功能 2023-02-02 18:09:54 +08:00
joylink_cuiweidong
2aae79d71e 【仿真功能】iscs界面,屏蔽门系统切换车站时以前是有订阅的,现在没了 2023-02-02 17:22:14 +08:00
joylink_cuiweidong
9759cb7cc1 【项目设备登录】泰国大铁线路的教员机,无法登录 2023-02-02 13:16:22 +08:00
joylink_cuiweidong
9639e870d0 【仿真功能】故障模式下的驾驶功能调用的接口不对 2023-01-31 17:22:34 +08:00
joylink_cuiweidong
9968af2ecd 代码调整 2023-01-31 15:24:36 +08:00
joylink_cuiweidong
7ed113aebb Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-01-31 14:19:36 +08:00
joylink_cuiweidong
47b5d939e3 bug修复【系统功能】项目设备管理页面的项目数据来源不对,这里项目应该通过查询而来,当前看着还是用的以前的枚举 2023-01-31 14:19:16 +08:00
dong
0f83df0dfc 代码调整 2023-01-31 11:10:59 +08:00
fan
6da9d76334 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-01-31 09:57:54 +08:00
fan
7f7fb6c8a7 考试接口参数变更 2023-01-31 09:57:11 +08:00
dong
9020db03a1 代码调整 2023-01-31 09:43:31 +08:00
dong
5f92af684f 终端菜单垂直拖拽 2023-01-30 17:52:26 +08:00
fan
728d4a1500 考试调整 2023-01-30 10:11:19 +08:00
fan
215e0a9ec6 【标准一号线】控制模式转换,车站应只有转为站控和强制站控操作,行调应该只有转为中控操作 2023-01-30 09:44:47 +08:00
fan
9e4b499399 考试点击实训参数调整 2023-01-30 09:41:23 +08:00
fan
4fbc4900e3 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-01-29 18:13:55 +08:00
fan
b225ee5c4c 【线路功能】线路功能的仿真客户端是否可修改成可配置,因为有的线路某些客户端没有数据无法使用,例如佛山线没有数字沙盘、IBP盘等 2023-01-29 18:13:37 +08:00
dong
55d6c6de91 修改引导总锁参数集中站code错误问题 2023-01-29 16:44:40 +08:00
fan
5d560ad800 【大铁标准站】场景实训将信号员角色放出来 2023-01-29 10:05:23 +08:00
fan
bab270626d 【大铁标准站】车务终端点两次站间透明会出现列车车次窗偏移 2023-01-28 18:04:47 +08:00
fan
d2b5080b6c 【大铁标准站】切换调度角色后,之前的会话消息看不到了 2023-01-28 15:39:15 +08:00
fan
06e2e32150 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-01-28 15:07:41 +08:00
fan
3be9bc566c 【大铁标准站】实训设计时,先编制一个场景添加列车,保存背景,切换到路票,返回列表新建一个场景,点击编制,切换到联锁界面,新建的场景会自动出现列车 2023-01-28 15:07:27 +08:00
joylink_cuiweidong
53031c3d11 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-01-28 14:31:44 +08:00
joylink_cuiweidong
52b9a47ef9 道岔生成代码调整 2023-01-28 14:31:16 +08:00
fan
9c9ccdbfc7 路票填写存值错误 2023-01-28 10:59:01 +08:00
fan
3c7c4c3dfa 路票填写传值错误调整 2023-01-28 10:38:01 +08:00
fan
b27783f7f6 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-01-28 09:51:51 +08:00
fan
6e68fde534 客户端创建调整 2023-01-28 09:51:34 +08:00
dong
61d9307195 大铁显示司机视角客户端 2023-01-18 16:50:42 +08:00
dong
1127412fbb 车务终端界面初始列车右键不显示菜单问题 2023-01-18 15:56:22 +08:00
dong
1751a9a4db 薄册输入记录错误问题 2023-01-18 14:47:08 +08:00
dong
2102d820f0 列车右键菜单显示项 2023-01-18 14:05:41 +08:00
dong
0343792daf 路票调整 2023-01-18 13:53:13 +08:00
dong
e46442cb56 路票不能给予司机问题 2023-01-18 13:24:28 +08:00
joylink_cuiweidong
83505d9a73 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-01-18 11:06:15 +08:00
joylink_cuiweidong
ad518bd988 bug修复 【大铁标准线】聊天室样式错乱 2023-01-18 11:05:58 +08:00
dong
401f3b5668 进路序列管理窗口控制 2023-01-18 10:00:33 +08:00
dong
f61f80d5c2 占线板序号 2023-01-18 09:44:02 +08:00
dong
d921acf107 调度命令调整 2023-01-17 18:27:18 +08:00
fan
6d9ae082ec Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-01-17 17:40:36 +08:00
fan
c488486e6c 【大铁标准站】场景实训编制填写路票或者许可证、簿册无法生成操作 2023-01-17 17:40:07 +08:00
joylink_cuiweidong
d5312a7f2e 代码调整 2023-01-17 17:12:12 +08:00
joylink_cuiweidong
83b1a5427b Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-01-17 17:06:09 +08:00
joylink_cuiweidong
22257e8578 bug 修复 【大铁标准站】封锁按钮点击报错,无法使用 2023-01-17 17:05:50 +08:00
dong
fcadfcca38 初始化后调度命令清空 2023-01-17 16:49:16 +08:00
dong
0a8e08dc65 代码调整 2023-01-17 16:35:42 +08:00
dong
5b56dfe579 代码调整 2023-01-17 16:19:54 +08:00
dong
725373a564 进路序列管理窗口;占线板调整 2023-01-17 16:08:01 +08:00
joylink_cuiweidong
ad0ac9b277 bug修复 【ID1000402】 【运行图编制】缺少测试运行功能 2023-01-17 15:59:13 +08:00
joylink_cuiweidong
93a7c42748 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-01-17 14:01:00 +08:00
joylink_cuiweidong
de8ea66ebd 代码调整 2023-01-17 14:00:39 +08:00
dong
58c1526633 清除阶段计划 2023-01-17 13:52:52 +08:00
dong
4cb891b22c 占线板代码调整 2023-01-17 13:18:14 +08:00
joylink_cuiweidong
ca6e14eadc Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-01-17 13:08:04 +08:00
joylink_cuiweidong
250d678df7 bug修复【ID1000425】 【大铁标准站】点击关闭报错 2023-01-17 13:07:48 +08:00
dong
77e05da3f6 修改占线板无反应 2023-01-17 11:02:49 +08:00
joylink_cuiweidong
4ae18d502c 代码调整 2023-01-17 09:44:29 +08:00
joylink_cuiweidong
a08bce7316 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-01-16 18:22:52 +08:00
joylink_cuiweidong
413ac96e01 bug修复【运行图编制】缺少测试运行功能 (部分) 2023-01-16 18:22:40 +08:00
dong
2bec6887f6 Merge remote-tracking branch 'remotes/origin/test_dispaly' into test 2023-01-16 17:58:42 +08:00
dong
94620bbe41 刷新教学管理当前路由标识 2023-01-16 17:57:58 +08:00
dong
fdc546ef95 修改角色是站长无薄册客户端问题 2023-01-16 17:34:34 +08:00
dong
d671daa67d Merge remote-tracking branch 'remotes/origin/test_dispaly' into test 2023-01-16 15:51:16 +08:00
dong
9edb17f44c 车辆段调度取消右键显示 2023-01-16 15:50:07 +08:00
dong
9fe37f4c64 Merge remote-tracking branch 'remotes/origin/test_dispaly' into test 2023-01-16 14:18:39 +08:00
dong
126b37c205 处理车辆段调度无法排列进路,按钮钮封无反应问题 2023-01-16 14:15:10 +08:00
fan
88c85f4e49 北京折返策略参数调整 2023-01-16 13:24:51 +08:00
fan
7fae657468 BUG:【南京二号线】轨道总览显示不对 2023-01-16 10:50:23 +08:00
fan
807220e7b5 仿真状态订阅放在mounted 2023-01-16 10:45:20 +08:00
fan
a67d2abf65 北京一号线查看站台信息结束后清除数据 2023-01-16 10:30:46 +08:00
fan
35fce14a31 北京一号线折返策略
(cherry picked from commit 910e0c5712)
2023-01-16 10:10:48 +08:00
fan
74db54e2de 北京一号线折返策略
(cherry picked from commit 910e0c5712)
2023-01-16 10:09:09 +08:00
fan
1ae99e90d6 Merge remote-tracking branch 'origin/test_dispaly' into test 2023-01-13 18:50:26 +08:00
fan
c22c93bba4 drts国赛项目三方跳转退出处理 2023-01-13 18:49:57 +08:00
fan
9700682a26 Merge remote-tracking branch 'origin/test_dispaly' into test 2023-01-13 18:48:10 +08:00
fan
da4e5911fd thirdJump 中路由跳转换成replace 2023-01-13 18:47:45 +08:00
fan
aee86e8024 Merge remote-tracking branch 'origin/test_dispaly' into test 2023-01-13 18:12:59 +08:00
fan
ab55f2b1ad Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-01-13 18:10:57 +08:00
joylink_cuiweidong
0c7f55c911 bug 修复 【大铁标准站】大铁车务终端的操作:总取消、信号重开、总人解等报错 2023-01-13 16:53:51 +08:00
fan
2af7b5cc16 成工业iframe嵌入退出调整 2023-01-13 16:48:41 +08:00
dong
36adbaeda1 Merge remote-tracking branch 'remotes/origin/test_dispaly' into test 2023-01-13 16:07:33 +08:00
dong
b0d80ac49e 添加权限分发到组织和项目 2023-01-13 15:54:06 +08:00
joylink_cuiweidong
9c3cdd31d5 bug 修复 【佛山有轨电车仿真线路】区段操作有两个权限取消限速 2023-01-13 15:45:01 +08:00
fan
dca3d00d50 修复:哈尔滨在正式不显示下面button组件 2023-01-13 14:28:34 +08:00
dong
e28b1f3337 Merge remote-tracking branch 'remotes/origin/test_dispaly' into test 2023-01-13 13:15:38 +08:00
fan
3054160b14 Merge remote-tracking branch 'origin/test_dispaly' into test
# Conflicts:
#	src/views/newMap/displayNew/demonMenu.vue
#	src/views/newMap/displayNew/dispatherContest/index.vue
#	src/views/newMap/displayNew/index.vue
#	src/views/newMap/displayNew/menuSchema.vue
#	src/views/newMap/jointTrainingNew/index.vue
2023-01-13 13:10:52 +08:00
dong
816c0d01f5 调度命令socket调整 2023-01-13 11:28:12 +08:00
dong
4778a3c909 代码调整 2023-01-13 11:16:25 +08:00
fan
c3c29d6724 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-01-13 10:36:49 +08:00
fan
2c68be07a3 调整: 路票簿册客户端显示条件修改 2023-01-13 10:36:30 +08:00
dong
2da7b23638 代码调整 2023-01-13 10:25:48 +08:00
fan
211ea96d07 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-01-13 10:11:22 +08:00
fan
164d34ad09 Bug:【大铁标准站】综合演练时,路票无法给与别的车站 2023-01-13 10:11:13 +08:00
joylink_cuiweidong
8eff828381 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-01-13 09:48:19 +08:00
joylink_cuiweidong
50b0358541 bug修复 【大铁标准站】车务终端点击信号机按钮报错,无法排列进路 2023-01-13 09:47:52 +08:00
fan
48cdf34b32 Bug:【大铁标准站】车站路票功能无法使用 2023-01-13 09:20:36 +08:00
fan
3e6d8941c1 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-01-13 09:12:08 +08:00
fan
759154757b 旧代码删除 2023-01-13 09:09:25 +08:00
joylink_cuiweidong
49fb5e5643 bug修改 【大铁标准站】工具里列车固定径路无法打开 2023-01-12 18:15:01 +08:00
joylink_cuiweidong
873af94199 bug调整 【大铁线路】调度台和综合演练一直加载,刷新后可以进去,但是再次进入又一直加载了 2023-01-12 17:50:20 +08:00
joylink_cuiweidong
97c7f73c3c 代码调整 2023-01-12 10:58:45 +08:00
fan
c3db4d4c22 Merge remote-tracking branch 'origin/test_dispaly' into test 2023-01-11 17:48:50 +08:00
fan
62adae7f00 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-01-11 17:45:51 +08:00
fan
fed3a0430e 仿真退出跳转调整 2023-01-11 17:45:33 +08:00
joylink_cuiweidong
f22fac82a0 代码调整 2023-01-11 17:22:12 +08:00
joylink_cuiweidong
eb9829234d 代码调整 2023-01-11 17:06:29 +08:00
dong
03afd57f78 实训管理界面添加分页 2023-01-11 16:10:25 +08:00
fan
bf1f420423 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-01-11 14:20:45 +08:00
fan
082bf8cd65 应急调度指挥调整 2023-01-11 14:20:27 +08:00
dong
f06a5c09ea 代码调整 2023-01-11 13:35:50 +08:00
fan
b1fadb3671 成员管理 信号楼调整 2023-01-11 11:00:02 +08:00
fan
58bcd7223d Merge remote-tracking branch 'origin/test_dispaly' into test
# Conflicts:
#	src/utils/baseUrl.js
#	src/views/login/index.vue
#	src/views/newMap/displayBaSiDi/index.vue
#	src/views/newMap/displayCity/demonMenu.vue
#	src/views/newMap/displayCity/index.vue
2023-01-10 18:00:10 +08:00
fan
de3d60a21e 大铁线路 变更客户端名称 联锁操作终端 2023-01-10 17:31:16 +08:00
fan
849a0be87c 线路功能内容调整 2023-01-10 17:08:35 +08:00
fan
49b7cc1eb3 分组功能调整 2023-01-10 16:45:55 +08:00
fan
140a058f90 线路功能滚动调整 2023-01-10 16:20:04 +08:00
fan
91bdf79bef resourcesUrl => ossUrl 2023-01-10 16:09:04 +08:00
fan
52cfa3ff14 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-01-10 15:41:13 +08:00
fan
0fd4c16d7a 线路功能分组 2023-01-10 15:40:53 +08:00
dong
e6c29ce60b 代码调整 2023-01-10 15:35:04 +08:00
dong
69771dd4b3 代码调整 2023-01-10 15:16:48 +08:00
fan
a2e4f3df9c 三方跳转退出调整 2023-01-10 10:11:20 +08:00
fan
d7be2f8fa2 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-01-09 15:14:55 +08:00
fan
d91fb2d8ac 车辆段工作站调整 2023-01-09 15:14:46 +08:00
joylink_cuiweidong
bdb89c21b3 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-01-09 15:08:07 +08:00
joylink_cuiweidong
b1948fff62 代码调整 2023-01-09 15:07:52 +08:00
fan
40ce6a6a24 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-01-09 15:01:52 +08:00
fan
0ed70c290e 成工业跳转调整 2023-01-09 15:01:38 +08:00
joylink_cuiweidong
32e6d19a75 代码调整 2023-01-09 14:43:51 +08:00
joylink_cuiweidong
f9fa1c2dbe Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-01-09 11:20:48 +08:00
joylink_cuiweidong
f33262ab22 实训 录制和校验 添加 val 参数 2023-01-09 11:20:04 +08:00
dong
5174ba4792 代码调整 2023-01-09 10:22:11 +08:00
dong
e951b099b4 宁波三结束实训关闭弹窗 2023-01-06 18:44:43 +08:00
dong
8baff2936b 代码调整 2023-01-06 18:14:54 +08:00
dong
1e020fdc3d 宁波三限速调整 2023-01-06 18:07:58 +08:00
dong
df7ee34fe3 代码调整 2023-01-06 17:03:24 +08:00
dong
3c06d0421c 调整宁波三站台实训提示问题 2023-01-06 16:50:33 +08:00
dong
205dda94fb 调整宁波三轨道实训提示问题 2023-01-06 16:10:10 +08:00
fan
aaafb5beec 调整:清除步骤是添加步骤一致校验 2023-01-06 15:17:21 +08:00
fan
31d588bf13 调整: 开始场景仅允许选择行调或行值 2023-01-06 15:08:07 +08:00
fan
d3eed2d956 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-01-06 13:55:26 +08:00
fan
1997b0df06 修复:控制权申请弹出有操作 2023-01-06 13:55:15 +08:00
dong
973732c80d 修改宁波三道岔实训问题 2023-01-06 13:42:38 +08:00
dong
b604bc55be 宁波三代码调整 2023-01-06 13:14:18 +08:00
fan
3cdc7106f3 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-01-06 09:41:56 +08:00
fan
47f2e2994a 修复:聊天室 上级部门undefined 2023-01-06 09:41:21 +08:00
dong
067fdb3ca6 宁波三信号机实训提示调整 2023-01-05 18:43:11 +08:00
fan
2237484367 修复:添加备用车切换客户端导致实训编辑成员缺失司机 2023-01-05 16:56:48 +08:00
fan
3d137b7b54 步骤完成关闭提示 2023-01-05 14:14:38 +08:00
fan
6ce41fe243 BUG: 【国赛】行调先请求站控,车站同意,行调再转中控,录制时和预览时的界面显示不一致,录制时定位在中控上,预览的时候记录了上次执行站控的操作,定位在站控上,导致步骤无法一致校验不通过 2023-01-05 13:55:37 +08:00
fan
dff2ebe121 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-01-05 11:27:30 +08:00
fan
21b8f3705d BUG: 【个人信息】使用正常表单样式进行界面优化 2023-01-05 11:27:00 +08:00
fan
a080fdd0c0 BUG: 【帮助】暂时去掉菜单里的帮助 2023-01-05 11:26:38 +08:00
dong
621b67b65a 打开运行图编制调用默认交路接口 2023-01-05 10:32:00 +08:00
fan
e89d160b1c BUG: 【国赛-实训设计】角色切到司机时,这个暂停后无法恢复,然后暂停的图标显示也不对,控制台还有报错 2023-01-05 10:22:05 +08:00
fan
bc61d5a658 道岔失表报错调整 2023-01-05 09:45:53 +08:00
fan
45f8430214 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-01-05 09:27:40 +08:00
fan
d16bf5d046 BUG: 【综合演练】成员管理将角色设置为通号,没有显示对应的角色客户端 2023-01-05 09:26:23 +08:00
dong
4415cdb33f 宁波三信号机引导和进路命令实训提示调整 2023-01-04 18:09:08 +08:00
fan
b1cec0839d 实训列表接口调整 2023-01-04 16:45:33 +08:00
fan
8084698cd8 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-01-04 14:32:20 +08:00
fan
4d75a42afa 实训编制接口调整 2023-01-04 14:32:03 +08:00
joylink_cuiweidong
66fe08074e Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-01-04 13:53:28 +08:00
joylink_cuiweidong
5094610c4c 代码调整 2023-01-04 13:52:51 +08:00
fan
e3dafeac27 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-01-04 10:57:19 +08:00
fan
720bce52a3 试卷编制实训题数量增加校验 2023-01-04 10:57:02 +08:00
fan
5449bd0e29 仿真考试接口增加mapId参数 2023-01-04 10:55:07 +08:00
fan
18da9bb9ea 冗余代码处理 2023-01-04 10:38:45 +08:00
joylink_cuiweidong
79e21f84cc Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-01-03 18:00:29 +08:00
joylink_cuiweidong
07ee176f35 代码调整 2023-01-03 18:00:15 +08:00
fan
3024c3d0e0 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-01-03 17:45:46 +08:00
fan
416590008e 查询实训调整 2023-01-03 17:45:30 +08:00
dong
897c44a6a8 代码调整 2023-01-03 17:24:36 +08:00
dong
9653852c54 道岔命令弹窗内的单选框添加domId 2023-01-03 15:58:12 +08:00
fan
fe080d704f BUG:教学管理成绩查询功能错误携带之前的班级 2023-01-03 15:38:52 +08:00