Commit Graph

259 Commits

Author SHA1 Message Date
joylink_cuiweidong
24c975184c 设计平台 课程设计代码优化 2020-06-28 13:44:04 +08:00
fan
8c476d0dcc 新建课程参数丢失问题调整 2020-06-24 10:00:13 +08:00
fan
d5cd233e98 调整故障操作 2020-06-24 09:24:54 +08:00
fan
a2664eb5dc 登录调整&综合演练调整&菜单调整 2020-06-23 15:18:44 +08:00
fan
5cfec3e09f 课程创建角色可以直接发布课程&&sockjs恢复版本 2020-06-22 10:49:41 +08:00
zyy
28cc15fd10 调整综合监控数据,调整系统右键菜单样式 2020-06-15 17:16:26 +08:00
fan
1d5210db45 调整课程新建时路由参数drawWay丢失的问题 2020-06-04 13:20:32 +08:00
fan
9e03602403 草稿地图右键点击改变tree选中状态 2020-05-18 16:08:49 +08:00
fan
c8d7347e61 课程问题调整 2020-05-18 15:47:55 +08:00
fan
d47a986fcc 故障操作&贵州状态班级展示 2020-05-15 18:48:10 +08:00
zyy
399111c682 调整列表字段显示 2020-05-15 14:59:53 +08:00
fan
c30b221dc3 学生管理调整 2020-05-13 17:59:08 +08:00
fan
92eaa38aef 贵州装备班级相关&绘图逻辑区段调整 2020-05-12 19:07:48 +08:00
zyy
2dc975ef7a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-13 17:04:01 +08:00
zyy
df92090509 增加配置中侧防数据,调整接口 2020-04-13 17:03:48 +08:00
joylink_cuiweidong
fe41d48a73 旧版课程 实训定义 代码调整 2020-04-13 10:37:47 +08:00
fan
528aa24bd0 实训添加页面调整 2020-04-10 19:19:55 +08:00
fan
78d2271d2d 实训课程编辑路由调整 2020-04-10 17:54:24 +08:00
fan
08d02e9563 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 17:51:36 +08:00
fan
b0797644f9 实训课程编辑调整&线二号线调整 2020-04-10 17:50:26 +08:00
joylink_cuiweidong
f0fc3712f9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 16:54:34 +08:00
joylink_cuiweidong
c9f7a72d0b 代码调整 2020-04-10 16:54:17 +08:00
fan
26e9c33736 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 16:47:20 +08:00
fan
11586aef30 哈尔滨现地显示BUG调整&西安二号线皮肤调整 2020-04-10 16:45:41 +08:00
joylink_cuiweidong
e3f5d5210b 代码调整 2020-04-10 16:00:38 +08:00
joylink_cuiweidong
e05057bf3f 宁波一号线 自动折返代码调整 2020-04-10 14:05:20 +08:00
fan
47e692d3a4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 16:52:19 +08:00
fan
5036229c47 操作定义老地图处理 2020-04-09 16:51:17 +08:00
joylink_cuiweidong
3db904a75e 代码调整 2020-04-09 16:45:34 +08:00
fan
0adcf6dac1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 16:14:29 +08:00
fan
79f473ad8b 实训管理老地图处理(未完) 2020-04-09 16:11:36 +08:00
zyy
184ff9d1e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 15:21:57 +08:00
zyy
ee10377b04 调整区段字段显示逻辑,道岔计轴区段显示道岔菜单 2020-04-09 15:21:44 +08:00
fan
f2ba430cc5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 14:49:06 +08:00
fan
50579656eb 进路控制信号机按消息批次处理&西安二计轴调整&&实训管理老地图处理(未完) 2020-04-09 14:47:44 +08:00
joylink_cuiweidong
bcca3c5858 一键生成实训代码调整 2020-04-09 09:42:35 +08:00
joylink_cuiweidong
2ddd132327 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 09:23:25 +08:00
joylink_cuiweidong
c942d4e840 实训一键生成代码调整 2020-04-09 09:23:09 +08:00
fan
88bb30c413 实训管理调整(tabel 实训类型和操作不显示) 2020-04-08 18:47:48 +08:00
fan
5bd90ea0d1 实训操作类型筛选调整 2020-04-08 15:32:35 +08:00
fan
507e28adde Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 13:25:45 +08:00
fan
b089aa6651 实训占位符调整&皮肤调整 2020-04-08 13:23:19 +08:00
joylink_cuiweidong
08a3480dad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/scripts/OperationConfig.js
2020-04-08 13:10:31 +08:00
joylink_cuiweidong
613a88ca90 实训操作步骤文件拆分 2020-04-08 11:26:55 +08:00
zyy
a27ee1e859 调整一键生成实训延迟显示 2020-04-08 10:42:06 +08:00
zyy
635b593b56 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 18:23:48 +08:00
zyy
f12f84f97b 调整实训一键生成,调整宁波线路实训定义 2020-04-07 18:22:26 +08:00
fan
88b4bcf2bb 指令接口调整 2020-04-07 16:44:36 +08:00
fan
d3bd167c70 实训管理调整 2020-04-07 16:41:08 +08:00
zyy
6fd9276fe8 调整实训步骤,及地图加载状态 2020-04-03 13:30:04 +08:00
zyy
34c7ad0fba 调整实训查询表头逻辑 2020-04-02 17:15:55 +08:00
zyy
af6eb5917f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 16:15:50 +08:00
zyy
0c56d049ec 调整哈尔滨现地实训操作步骤 2020-03-30 16:15:35 +08:00
fan
dee1efe00f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 13:07:32 +08:00
fan
ab4928d924 差异化打包调整&哈尔滨登录页 2020-03-30 13:07:11 +08:00
zyy
c5dbd2b141 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/utils/baseUrl.js
2020-03-27 18:20:28 +08:00
zyy
47519b7040 调整道岔生成默认状态,调整道岔皮肤配置 2020-03-27 18:19:40 +08:00
fan
6ef1fc2013 实训调整 2020-03-27 18:14:46 +08:00
fan
fb8d0b6615 Merge remote-tracking branch 'origin/dev_training' into dev_n
# Conflicts:
#	src/views/designPlatform/demonList.vue
2020-03-27 13:55:00 +08:00
fan
a697ab21d5 调整实训 2020-03-27 13:52:14 +08:00
zyy
faf772712c 调整增加自动生成实训操作步骤 2020-03-27 11:24:47 +08:00
fan
3c1d038a81 实训仿真调整 2020-03-27 10:51:49 +08:00
fan
f34de4f001 实训调整 2020-03-26 18:42:01 +08:00
joylink_cuiweidong
0486d0211b prdType对应接口修改 2019-12-27 18:48:56 +08:00
joylink_cuiweidong
1ad20fe522 删除实训平台 权限 权限打包 2019-12-27 11:11:38 +08:00
joylink_cuiweidong
f985a93c9e 设计平台 课程设计 实训管理 prdtype 接口调整 2019-12-27 10:47:07 +08:00
joylink_cuiweidong
9b3c41dbfb 设计平台,课程 创建章节 获取实训列表接口修改 2019-12-27 09:47:07 +08:00
joylink_cuiweidong
11de837332 设计平台课程设计实训管理 生成实训/删除实训/修改实训 调整 2019-12-26 19:58:34 +08:00
joylink_cuiweidong
4a30ced825 创建课程时,所属产品变为产品类型 2019-12-25 19:40:49 +08:00
ival
c5c813753c 修改代码 2019-11-14 13:59:33 +08:00
fan
c35cef4800 样式调整 2019-11-11 18:42:14 +08:00
fan
04ec094ded 样式调整 2019-11-11 13:34:35 +08:00
joylink_cuiweidong
b3a4e6ca8c Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/i18n/langs/zh/global.js
2019-11-11 13:11:50 +08:00
fan
56d11976db 设计平台剧本课程运行图统一风格样式 2019-11-11 13:10:36 +08:00
joylink_cuiweidong
aade09a303 权限分发调整 2019-11-11 13:10:23 +08:00
joylink_cuiweidong
fcf4f542e0 代码调整 2019-11-08 18:57:27 +08:00
fan
daec7d5e4d bug 调整 2019-11-08 18:43:46 +08:00
fan
e677b24f6d 调整查询地图列表接口 2019-11-08 16:22:05 +08:00
fan
a82474dc14 产品编码修改 2019-11-07 17:18:08 +08:00
joylink_cuiweidong
b4400f9226 代码调整 2019-11-07 16:26:55 +08:00
joylink_cuiweidong
5465eb61c1 prdCode改成prdId 2019-11-07 15:54:49 +08:00
joylink_cuiweidong
5cb7fe51b9 skinCode处理 2019-11-07 10:25:34 +08:00
fan
1bd3debbde 西铁院登录页样式调整,测试问题调整 2019-11-04 18:41:58 +08:00
zyy
bc332c1a9d desc: 调整国际化,高度问题 2019-11-01 18:08:05 +08:00
joylink_cuiweidong
f3298cdb83 页面调整 2019-11-01 15:12:00 +08:00
joylink_cuiweidong
0c938f5928 接口调整 2019-11-01 13:36:14 +08:00
joylink_cuiweidong
ccd71601d1 接口调整 2019-11-01 11:28:10 +08:00
joylink_cuiweidong
444d60ce2a 接口调整 2019-11-01 10:28:15 +08:00
joylink_cuiweidong
d0608dd29e 接口调整
文件位置调整
2019-11-01 10:06:47 +08:00
joylink_cuiweidong
cfdea6ea12 接口调整 2019-10-31 17:45:15 +08:00
joylink_cuiweidong
24a56a9695 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/router/index.js
#	src/views/lesson/lessoncategory/edit/lesson/index.vue
2019-10-31 16:11:29 +08:00
joylink_cuiweidong
ad97697406 接口调整 2019-10-31 15:56:07 +08:00
zyy
834d4e30cd Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-31 15:44:51 +08:00
zyy
ff4829e037 desc: 调整路径 2019-10-31 15:44:43 +08:00
ival
6df897316b 移植system 2019-10-31 15:43:37 +08:00
ival
07ef079f1b 修改代码 2019-10-31 15:34:38 +08:00
joylink_cuiweidong
681ac5e886 路由调整
接口调整
2019-10-31 13:56:42 +08:00
joylink_cuiweidong
b5b08a0afd 接口调整 2019-10-31 11:03:19 +08:00
joylink_cuiweidong
3636bd06b4 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-30 19:37:07 +08:00
joylink_cuiweidong
de76904dfc 接口调整 2019-10-30 19:36:29 +08:00