joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
10,121 Commits 20 Branches 0 Tags 448 MiB
4d89906af4
Commit Graph

9873 Commits

Author SHA1 Message Date
fan
edbd6d55cf 信号机坐标编辑显示 2021-04-28 17:14:48 +08:00
fan
823c30118c 大铁仿真操作调整 2021-04-28 16:58:29 +08:00
fan
6ec82c158f 大铁仿真操作调整 2021-04-28 13:36:58 +08:00
fan
2d044a6810 大铁仿真操作调整 2021-04-28 09:01:27 +08:00
fan
83eddd42d3 大铁仿真操作调整 2021-04-27 15:52:39 +08:00
fan
b107ae58d6 大铁仿真操作调整 2021-04-27 14:40:17 +08:00
fan
19e3bb91d0 大铁仿真操作调整 2021-04-27 13:24:33 +08:00
fan
fad65a0d66 大铁仿真操作调整 2021-04-27 13:02:38 +08:00
fan
c99194f84e 新版仿真订阅消息调整 2021-04-27 10:17:51 +08:00
fan
09781774c7 大铁线路操作调整 2021-04-26 17:59:23 +08:00
fan
cd84fbb4cd 大铁线路操作调整 2021-04-26 16:00:39 +08:00
fan
bb973a23d2 大铁线路操作调整 2021-04-26 13:39:19 +08:00
fan
d917ccce3d 大铁线路操作调整 2021-04-25 18:13:47 +08:00
fan
c22a40b6f0 BUG234 => 测试环境中苏电院教学管理页面显示问题 2021-04-25 14:54:05 +08:00
fan
2bd741d4ab 大铁操作调整 2021-04-25 10:09:43 +08:00
fan
b26d17f607 信号机状态调整 2021-04-23 18:11:07 +08:00
fan
13e0f107f0 后端状态转译 2021-04-23 17:43:45 +08:00
fan
87daa342d6 query newApi 判断调整 2021-04-23 15:14:10 +08:00
fan
c6f5f84d77 query测试 2021-04-23 15:01:04 +08:00
fan
bd2165ff35 大铁仿真调整 2021-04-23 14:11:29 +08:00
fan
4fcaffae50 大铁仿真调整 2021-04-23 10:24:05 +08:00
fan
6f06822793 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-23 09:01:26 +08:00
fan
7379945c42 大铁仿真调整 2021-04-23 09:01:12 +08:00
sunzhenyu
cf930c1e72 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-22 18:08:05 +08:00
sunzhenyu
e9b9345e95 增加三维课程播放器，增加第一人称控制碰撞检测，完善编辑器数据 2021-04-22 18:07:56 +08:00
joylink_cuiweidong
e1757e4114 代码调整 2021-04-22 11:30:07 +08:00
joylink_cuiweidong
7ef86d0517 代码调整 2021-04-22 10:52:48 +08:00
joylink_cuiweidong
40909b073e 代码调整 2021-04-21 17:55:41 +08:00
fan
38199d0606 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-21 17:22:44 +08:00
joylink_cuiweidong
5039c09c16 样式调整 2021-04-21 17:19:25 +08:00
fan
863e383311 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-21 16:06:43 +08:00
joylink_cuiweidong
54ec91a835 添加 修改检查配置接口 2021-04-21 15:46:37 +08:00
joylink_cuiweidong
70e9ab6a87 代码调整 2021-04-21 15:25:08 +08:00
fan
045840e109 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-21 15:20:12 +08:00
joylink_cuiweidong
62698088d8 代码调整 2021-04-21 15:19:32 +08:00
joylink_cuiweidong
97a07bb70e 大铁 进路删除 代码调整 2021-04-21 15:17:27 +08:00
fan
e068496c75 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-21 15:02:38 +08:00
joylink_cuiweidong
6fe2bf0aca 大铁 进路预览代码调整 2021-04-21 14:40:44 +08:00
joylink_cuiweidong
d13292b8f1 大铁线路 进路预览代码调整 2021-04-21 13:40:37 +08:00
fan
a29de2d3da Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-21 10:44:24 +08:00
fan
16fb67127b 信号按钮名称显示调整 2021-04-21 10:44:15 +08:00
joylink_cuiweidong
af13800539 大铁线路 进路添加代码调整 2021-04-21 09:20:48 +08:00
fan
3ba2f8ac5b merge 2021-04-20 17:29:32 +08:00
fan
0226042942 宁波三Bug调整 2021-04-20 17:25:27 +08:00
joylink_cuiweidong
852d53f4a4 代码调整 2021-04-19 17:54:13 +08:00
joylink_cuiweidong
dfb80a8eb2 代码调整 2021-04-19 09:31:07 +08:00
joylink_cuiweidong
48c91eb1a9 信号机按钮绘图代码调整 2021-04-16 18:06:12 +08:00
joylink_cuiweidong
1ffac1ba84 代码调整 2021-04-16 17:46:07 +08:00
joylink_cuiweidong
ce1ca02392 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-16 17:21:58 +08:00
joylink_cuiweidong
d1a177827d 大铁项目 添加进路 代码调整 2021-04-16 17:21:15 +08:00
fan
937689b177 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-16 16:51:58 +08:00
fan
0fc9c03d2b 宁波三信号右键菜单 2021-04-16 16:51:42 +08:00
joylink_cuiweidong
e554ff45b7 代码调整 2021-04-16 16:36:17 +08:00
joylink_cuiweidong
388f85c3db 代码调整 2021-04-16 16:26:58 +08:00
joylink_cuiweidong
a3dff96e73 大铁 项目 添加进路 代码调整 2021-04-16 15:59:08 +08:00
joylink_cuiweidong
3ba63c65ac Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-16 14:22:48 +08:00
joylink_cuiweidong
84169141ab 大铁 指示灯 代码调整 2021-04-16 14:22:29 +08:00
sunzhenyu
93af07c20e 修改单体设备亮灯逻辑 2021-04-16 13:29:25 +08:00
sunzhenyu
3440daf55e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-16 13:19:07 +08:00
sunzhenyu
72d0bb084f 修改三维单体设备信号机亮灯逻辑，修改三维课程编辑播放器 2021-04-16 13:18:59 +08:00
joylink_cuiweidong
ad03a0a2bf 信号机代码调整 2021-04-16 10:56:36 +08:00
joylink_cuiweidong
0de0206192 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-16 09:48:35 +08:00
joylink_cuiweidong
91190c6dc3 代码调整 2021-04-16 09:48:03 +08:00
ival
14fd6c1a40 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-15 18:15:20 +08:00
ival
14f718ec1a 增加指示器显示 2021-04-15 18:15:12 +08:00
joylink_cuiweidong
b5b9b493e7 代码调整 2021-04-15 18:07:51 +08:00
fan
3508380dd1 宁波三信号右键按钮 2021-04-15 17:51:23 +08:00
joylink_cuiweidong
957f6b08d2 代码调整 2021-04-15 17:21:18 +08:00
joylink_cuiweidong
06635467a1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-15 17:13:08 +08:00
joylink_cuiweidong
16294b6373 代码调整 2021-04-15 17:12:41 +08:00
ival
b75483ded0 删除无用打印 2021-04-15 16:30:28 +08:00
ival
f1f2013b27 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-15 16:26:19 +08:00
ival
d903ce7fb7 增加区段的脱轨其设备 2021-04-15 16:26:12 +08:00
joylink_cuiweidong
d3b240989b 代码调整 2021-04-15 16:15:18 +08:00
joylink_cuiweidong
bb928cb37b 代码调整 2021-04-15 15:55:30 +08:00
joylink_cuiweidong
4050ddf937 大铁进路添加 代码调整 2021-04-15 15:53:34 +08:00
joylink_cuiweidong
bebac3b8e5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-14 17:48:55 +08:00
joylink_cuiweidong
9233b651f6 代码调整 2021-04-14 17:48:28 +08:00
sunzhenyu
2412aac899 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-14 17:35:46 +08:00
sunzhenyu
63f935616d 修改三维课程编辑器事件和图片资源部分 2021-04-14 17:35:41 +08:00
joylink_cuiweidong
8d763d00e4 运行图编制代码调整 2021-04-14 16:43:09 +08:00
joylink_cuiweidong
1a7786dd14 运行图编制 代码调整 2021-04-14 15:30:52 +08:00
joylink_cuiweidong
63855ca1ff 运行图编制代码调整 2021-04-14 15:17:34 +08:00
joylink_cuiweidong
a1342ed2b6 运行图代码调整 2021-04-14 14:36:33 +08:00
joylink_cuiweidong
448832293b 运行图代码调整 2021-04-14 14:26:00 +08:00
joylink_cuiweidong
c9985869f1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-14 13:58:33 +08:00
joylink_cuiweidong
ae263b0dc7 运行图样式调整 2021-04-14 13:57:35 +08:00
ival
86ad53cfe9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-14 13:55:30 +08:00
ival
22ddd9f722 修改代码 2021-04-14 13:55:16 +08:00
joylink_cuiweidong
eadb7a5748 大铁线路 车站绘图元素添加 2021-04-14 10:24:57 +08:00
sunzhenyu
2d767c4097 修改三维课程编辑初始界面 2021-04-14 09:22:55 +08:00
sunzhenyu
c9b7d18e43 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-14 09:13:02 +08:00
sunzhenyu
f1ab1f9819 三维课程编辑测试展示(未完成) 2021-04-14 09:12:53 +08:00
joylink_cuiweidong
6b4bdbc8fd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-13 18:24:59 +08:00
joylink_cuiweidong
ea834dc86a 大铁项目 区段状态代码调整 2021-04-13 18:24:41 +08:00
fan
8575de2bd9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-13 18:09:52 +08:00
fan
0b5cc8e15d 信号按钮调整 2021-04-13 18:09:37 +08:00
ival
821d0b28e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-13 17:37:48 +08:00
ival
693938a367 调整 打铁 道岔状态皮肤配置 2021-04-13 17:37:40 +08:00
joylink_cuiweidong
bc83661f1f 大铁线路 区段状态代码调整 2021-04-13 17:23:12 +08:00
joylink_cuiweidong
58d7f9233e 大铁 区段状态代码调整 2021-04-13 17:06:13 +08:00
ival
68cad1616a 删除无用代码 2021-04-13 15:48:01 +08:00
ival
584852038c 增加大铁仿真display 
# Conflicts:
#	src/iscs_new/plugins/shapeBuilder/entry.vue
 2021-04-13 15:47:49 +08:00
joylink_cuiweidong
de4691da44 代码调整 2021-04-13 15:40:35 +08:00
joylink_cuiweidong
bd5a46e9dc 代码调整 2021-04-13 15:17:09 +08:00
joylink_cuiweidong
7eb6725147 代码调整 2021-04-13 14:27:33 +08:00
fan
e239f1e8c6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-13 14:10:30 +08:00
fan
8a363c068a 大铁调整 2021-04-13 14:10:20 +08:00
joylink_cuiweidong
259ee2570a 添加帮助链接地址 2021-04-13 14:06:24 +08:00
fan
0bb06fd142 大铁调整 2021-04-13 13:52:39 +08:00
fan
34859f8f51 大铁调整 2021-04-13 13:50:24 +08:00
fan
0adef8a9c9 宁波三调整 2021-04-13 13:43:56 +08:00
sunzhenyu
3aa47086a8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-13 11:03:25 +08:00
sunzhenyu
36b203746b 修改三维沙盘特殊车站加载 2021-04-13 11:02:16 +08:00
fan
75e7c00957 地图分组管理 2021-04-13 10:15:11 +08:00
fan
22c6924db8 宁波三操作调整 2021-04-12 18:58:40 +08:00
fan
5fbe0161ac 宁波三操作调整 2021-04-12 18:55:26 +08:00
fan
cbb02621d9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-12 18:19:58 +08:00
fan
7901886d3b 宁波三操作调整 2021-04-12 18:19:52 +08:00
fan
8d5de4cc1a 地图分组管理 2021-04-12 18:09:49 +08:00
ival
dde06f834d 修改语言校验页面 2021-04-12 17:11:36 +08:00
fan
904d84e8ab 语音 2021-04-12 14:56:21 +08:00
fan
c81be6f866 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-12 13:29:40 +08:00
fan
5ebfa5ce38 宁波三号线操作调整 2021-04-12 13:29:26 +08:00
sunzhenyu
f86c13ea86 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-09 18:21:45 +08:00
sunzhenyu
cea95f9d92 三维课程编辑器课程组件和数据结构修改，升级threejs版本 2021-04-09 18:21:24 +08:00
fan
51d2d32979 宁波三号线操作调整 2021-04-09 17:49:46 +08:00
fan
8e9afa9c9b 宁波三号线操作调整 2021-04-09 13:18:51 +08:00
fan
c58609528a 导入运行图调整 2021-04-08 17:55:35 +08:00
fan
7532c86e15 宁波三操作调整&导入运行图放开 2021-04-08 17:28:46 +08:00
fan
cd936dea42 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-07 17:15:06 +08:00
fan
f5e00dd717 宁波三列车操作调整 2021-04-07 17:14:54 +08:00
joylink_cuiweidong
5f9e6fe882 运行图编制代码调整 2021-04-07 14:21:26 +08:00
fan
2d5b863231 iscs Button hideType 赋值调整 2021-04-07 09:27:31 +08:00
fan
9a84b61e5a ISCS调整 2021-04-06 17:48:33 +08:00
ival
a8ec3f1d79 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-06 16:01:23 +08:00
ival
a215004143 修改代码 2021-04-06 16:01:14 +08:00
fan
17995e2f40 取消mfa等故障状态add 2021-04-06 15:05:54 +08:00
fan
dd2722180d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-06 09:44:08 +08:00
fan
924e6154a3 南京十一站屏蔽门开启影响站停时间显示调整 2021-04-06 09:43:45 +08:00
sunzhenyu
fb00e1418e 修改三维课程存读 2021-04-02 18:05:19 +08:00
sunzhenyu
a9745eb709 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-02 15:49:32 +08:00
sunzhenyu
1cab2116d6 三维课程代码，修改课程组件间逻辑，修改课程数据结构。(未实装) 2021-04-02 15:49:24 +08:00
fan
4a037c0e77 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-02 09:58:56 +08:00
fan
fc861b1c70 组织管理调整 2021-04-02 09:58:45 +08:00
joylink_cuiweidong
f8bebd192e 南京二号线 封锁岔心 状态代码跳转 2021-04-01 17:31:19 +08:00
fan
baf424cfad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-01 16:37:25 +08:00
fan
a5b3f9cf04 组织管理调整 2021-04-01 16:28:30 +08:00
joylink_cuiweidong
81ecf0ac20 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-01 10:59:05 +08:00
joylink_cuiweidong
fcf7d1b8ee 运行图代码调整 2021-04-01 10:58:41 +08:00
fan
f1824ad324 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-01 09:59:11 +08:00
fan
f327889bca 组织管理调整 2021-04-01 09:59:01 +08:00
joylink_cuiweidong
45c51157a1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-01 09:42:12 +08:00
joylink_cuiweidong
618d975d68 运行图编制 代码调整 2021-04-01 09:41:14 +08:00
fan
0253e6e590 组织管理调整 2021-03-31 18:27:29 +08:00
fan
887edee9e6 考试系统按钮位置调整 2021-03-31 09:35:51 +08:00
fan
30bf7487ae 试卷编辑调整 2021-03-31 09:31:50 +08:00
fan
076c7192ec 教学管理调整 2021-03-30 18:07:45 +08:00
fan
1d50b1582d BUG：208、209、210 2021-03-30 15:51:15 +08:00
fan
28d092401e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-30 15:23:48 +08:00
fan
d42579479b 教学管理问题调整 2021-03-30 15:23:37 +08:00
joylink_cuiweidong
0c407dbfa9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-30 14:59:09 +08:00
joylink_cuiweidong
b78454781b 运行图编制 添加任务/修改任务 代码调整 2021-03-30 14:58:51 +08:00
fan
51bce2825e 教学管理问题调整 2021-03-30 14:49:47 +08:00
fan
0968bcfa9e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-30 14:31:43 +08:00
fan
d8462bb404 教学管理问题调整 2021-03-30 14:31:25 +08:00
joylink_cuiweidong
4713f1d30f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-30 11:26:45 +08:00
joylink_cuiweidong
0fb623ef59 运行图编制 折返数据解析 代码调整 2021-03-30 11:26:25 +08:00
fan
692c9f0c03 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-30 10:41:48 +08:00
fan
894dc96ea5 教学管理问题调整 2021-03-30 10:41:27 +08:00
joylink_cuiweidong
770bdff791 代码调整 2021-03-30 09:59:51 +08:00
joylink_cuiweidong
65595cbe85 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-30 09:57:35 +08:00
joylink_cuiweidong
09b2923126 iscs 代码调整 2021-03-30 09:57:05 +08:00
fan
def94fee3e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-29 18:05:30 +08:00
fan
d0f756ed2f BUG202\200:成绩查询页面点击重置报错;删除课程的提示需要修改 2021-03-29 18:05:22 +08:00
joylink_cuiweidong
14b98e0e3e 代码调整 2021-03-29 17:34:57 +08:00
joylink_cuiweidong
7521b8f2db iscs 代码调整 2021-03-29 17:33:31 +08:00
fan
c4ae02df0d BUG196:进入其他用户创建的班级的学生管理界面，建议删除导入模板下载 2021-03-29 17:08:45 +08:00
fan
ac56715942 课程详情调整 2021-03-29 17:07:14 +08:00
fan
1395beacb8 考试调整 2021-03-29 16:17:52 +08:00
fan
577fc1444f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-29 15:01:56 +08:00
fan
64a673419b 考试调整 2021-03-29 15:01:43 +08:00
ival
3440c5ddc0 增加 圆 2021-03-29 15:00:02 +08:00
ival
a1fd2ed090 修改 福州door设备图层问题 2021-03-29 14:57:18 +08:00
joylink_cuiweidong
3c61302df1 代码调整 2021-03-29 13:13:35 +08:00
ival
99dd5f5877 删除 test分支的iscs_new的代码 2021-03-29 13:13:06 +08:00
ival
7456a19b3e 增加 门禁iscs背景图，以及iscs_new的部分代码 2021-03-29 13:09:51 +08:00
ival
45027796e7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-29 11:32:00 +08:00
ival
7ffff137b5 修改 删除生成计划的 滚动 2021-03-29 11:31:47 +08:00
fan
5090b14819 merge 2021-03-29 11:10:57 +08:00
fan
57f3b563fd 考试调整 2021-03-29 11:04:57 +08:00
fan
d3b4a73595 留言板调整 2021-03-29 11:04:18 +08:00
ival
3e3ca007e1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-29 11:00:44 +08:00
ival
2a66a7b2c6 修改代码 2021-03-29 11:00:24 +08:00
joylink_cuiweidong
0a796d4218 运行图编制 代码调整 2021-03-29 10:09:33 +08:00
joylink_cuiweidong
ea85ed29ae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-26 16:09:44 +08:00
ival
83c630bfc7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/utils/baseUrl.js
 2021-03-26 16:09:05 +08:00
joylink_cuiweidong
c22b59733a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-26 16:08:43 +08:00
ival
6f0eca2503 修改 iscs加载的问题 2021-03-26 16:08:39 +08:00
joylink_cuiweidong
ce79c12b7d 代码调整 2021-03-26 16:08:21 +08:00
fan
ab49d70a61 教学管理返回按钮调整 2021-03-26 13:31:12 +08:00
fan
c519f74189 教学管理问题调整 2021-03-26 13:09:56 +08:00
fan
a70597a267 教学管理问题调整 2021-03-25 20:01:21 +08:00
fan
0607e63d37 教学管理问题调整 2021-03-25 19:46:02 +08:00
fan
a267b1b64f 教学管理问题调整 2021-03-25 18:34:41 +08:00
fan
81d30804bb 教学管理问题调整 2021-03-25 17:38:46 +08:00
fan
c0add0cf1a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-25 16:08:53 +08:00
fan
bffb689e72 教学管理调整 2021-03-25 16:08:44 +08:00
joylink_cuiweidong
04ec5432d9 运行图编制代码调整 2021-03-25 15:18:58 +08:00
joylink_cuiweidong
c541e62be4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-25 15:07:34 +08:00
joylink_cuiweidong
f8d7ad88bb 运行图编制 代码调整 2021-03-25 15:07:14 +08:00
fan
c1580ca6ea 应用处班级添加提示文字 2021-03-25 15:00:30 +08:00
fan
6ea5a3e3aa url 2021-03-25 14:11:57 +08:00
ival
d6e24e40fa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-25 14:10:24 +08:00
ival
ba51c50417 修改代码 2021-03-25 14:10:18 +08:00
fan
19421566de Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-25 14:09:38 +08:00
fan
159aec918f 教学管理调整 2021-03-25 14:09:03 +08:00
joylink_cuiweidong
8a8cc8e04c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-25 13:39:51 +08:00
joylink_cuiweidong
ccc4970a1a 运行图编制 生成计划 获取交路代码调整 2021-03-25 13:39:28 +08:00
ival
988f879d46 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/iscs/iscsDraw/icscComponents/picture.vue
 2021-03-25 13:20:26 +08:00
ival
85f73964d3 调整iscs站厅子图顺序 2021-03-25 13:19:28 +08:00
fan
0d57d977a1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-25 13:07:34 +08:00
ival
ee7453d5cd 修改 站厅子图列表 2021-03-25 13:08:03 +08:00
fan
5106ae8d14 meger 2021-03-25 13:07:02 +08:00
fan
7dc0535ecf 教学管理调整 2021-03-25 13:05:30 +08:00
fan
a3d6dc727f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-25 13:03:27 +08:00
fan
1c85c5a502 教学管理调整 2021-03-25 13:03:12 +08:00
ival
d8d3b64dcf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-25 11:31:40 +08:00
ival
1ba979c02c 增加 iscs站厅资源 2021-03-25 11:31:31 +08:00
joylink_cuiweidong
7619d9097e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-25 10:38:55 +08:00
joylink_cuiweidong
ca3f01104e 运行图编制 代码调整 2021-03-25 10:38:36 +08:00
ival
74b260782d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-25 09:22:17 +08:00
ival
1eef45efe4 注释代码 2021-03-25 09:22:07 +08:00
joylink_cuiweidong
9984b13759 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-25 09:15:37 +08:00
joylink_cuiweidong
76fccbc643 运行图编制 生成计划 代码调整 2021-03-25 09:15:07 +08:00
fan
caafa7578b iscs添加设备图片 2021-03-24 15:00:45 +08:00
fan
022b946592 iscs添加背景图片 2021-03-24 14:12:35 +08:00
fan
b93daf1f8e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-24 13:50:26 +08:00
fan
6cca650a98 教学管理调整 2021-03-24 13:49:59 +08:00
ival
dd1fb890ad 修改 运行图 修改接口 2021-03-24 13:30:26 +08:00
ival
fd5716925b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-24 11:09:16 +08:00
ival
833117dc45 1.修改 运行图 接口 
2.增加 iscs 资源
 2021-03-24 11:09:02 +08:00
joylink_cuiweidong
213e654abc iscs 代码调整 2021-03-23 18:20:06 +08:00
joylink_cuiweidong
d62d6ba815 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/iscs/iscsSystem/stationConfig/index.vue
 2021-03-23 18:19:47 +08:00
joylink_cuiweidong
6db9593a40 iscs 代码调整 2021-03-23 18:17:54 +08:00
fan
aed6392c88 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-23 17:52:42 +08:00
fan
ebb618e053 iscs自动售检票 2021-03-23 17:52:32 +08:00
joylink_cuiweidong
5c5366e46a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-23 17:52:11 +08:00
joylink_cuiweidong
9c31d4963c iscs 代码调整 2021-03-23 17:51:36 +08:00
ival
04444b2b12 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-23 17:35:50 +08:00
ival
27e938c102 修改 复制iscs图形 生成codebug的问题 2021-03-23 17:35:42 +08:00
fan
7a3677cf8f 调整感温光纤探测系统高度 2021-03-23 17:24:48 +08:00
fan
2f4cd5569a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-23 17:14:17 +08:00
joylink_cuiweidong
0796a12dd7 iscs 代码调整 2021-03-23 17:12:19 +08:00
fan
65dfe7d570 url调整 2021-03-23 17:12:18 +08:00
joylink_cuiweidong
f749aa6709 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-23 16:42:21 +08:00
joylink_cuiweidong
cbedee3c3b iscs 代码调整 2021-03-23 16:42:06 +08:00
joylink_cuiweidong
9398ccfa7c iSCS 代码调整 2021-03-23 16:41:40 +08:00
fan
c146dacecb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-23 15:55:38 +08:00
fan
7a5e1bf701 评价规则调整 2021-03-23 15:55:23 +08:00
ival
160cbaf2bf 增加 iscs 火灾 展厅和站台 背景图 2021-03-23 15:29:42 +08:00
fan
c6cfa2d816 merge 2021-03-23 11:08:11 +08:00
fan
e38b236aed 教学管理暂提 2021-03-23 11:06:14 +08:00
ival
09ec3247ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-23 10:42:01 +08:00
ival
fcc8cbf988 修改iscs 2021-03-23 10:41:47 +08:00
joylink_cuiweidong
393f3fe68a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-23 10:37:14 +08:00
joylink_cuiweidong
43e0379926 运行图编制 生成计划 界面调整 2021-03-23 10:36:56 +08:00
ival
050141025a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-22 18:40:41 +08:00
ival
a63b8e0179 增加iscs图样 2021-03-22 18:40:29 +08:00
joylink_cuiweidong
ba18a549fb 运行图编制 生成计划代码调整 2021-03-22 17:39:12 +08:00
joylink_cuiweidong
b383815100 地图绘制 交路预览 显示代码调整 2021-03-22 16:04:33 +08:00
joylink_cuiweidong
7e80c71fef 代码调整 2021-03-22 15:49:14 +08:00
joylink_cuiweidong
74c5764087 代码调整 2021-03-22 15:30:10 +08:00
joylink_cuiweidong
7ac00f45dc 运行图编制 代码调整 2021-03-22 15:12:34 +08:00
joylink_cuiweidong
42b59cc752 代码调整 2021-03-22 14:51:34 +08:00
joylink_cuiweidong
9b4309d0c1 代码调整 2021-03-22 14:38:19 +08:00
joylink_cuiweidong
2dae1bc8d8 代码调整 2021-03-22 14:30:21 +08:00
joylink_cuiweidong
26b72f9228 代码调整 2021-03-22 13:20:51 +08:00
joylink_cuiweidong
e945d654eb 代码调整 2021-03-22 13:16:07 +08:00
sunzhenyu
2ce3d41cad mergetest 2021-03-19 18:14:58 +08:00
sunzhenyu
d22f9d62de 新三维客流逻辑基本完成(未实装) 2021-03-19 18:14:21 +08:00
fan
82fe1f3dc9 权重藐视调整 2021-03-19 17:34:37 +08:00
fan
6e6e6ac31d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-19 17:20:30 +08:00
fan
f3aed3f16e 评价规则创建调整 2021-03-19 17:20:22 +08:00
ival
c2a9a73f28 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-19 17:14:22 +08:00
ival
7625666431 调整成都01，显示车站为等间距 2021-03-19 17:14:14 +08:00
fan
268ae6ad88 评价结果展示调整 2021-03-19 16:47:06 +08:00
fan
061df7a389 评价规则管理宽度调整 2021-03-19 16:27:44 +08:00
fan
5732f85453 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-19 16:17:23 +08:00
fan
36e9d7c6bd 课程管理调整 2021-03-19 16:17:01 +08:00
ival
ffb4dbbba3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-19 16:11:55 +08:00
ival
9dabd1604f 注释同济运行图中不用模块 2021-03-19 16:11:45 +08:00
fan
efee6ddfc4 merge 2021-03-19 15:55:05 +08:00
fan
44b2c5d0f8 教学管理调整 2021-03-19 15:49:05 +08:00
joylink_cuiweidong
3230f15415 代码调整 2021-03-19 14:50:52 +08:00
joylink_cuiweidong
5e271d3320 运行图代码调整 2021-03-19 14:49:33 +08:00
joylink_cuiweidong
8acee05b38 运行图代码调整 2021-03-19 13:38:53 +08:00
joylink_cuiweidong
82f8db41d1 运行图 代码调整 2021-03-19 13:23:58 +08:00
joylink_cuiweidong
70260cfbe3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-19 11:19:00 +08:00
joylink_cuiweidong
5fdf48b7ab 运行图 代码调整 2021-03-19 11:18:37 +08:00