Commit Graph

220 Commits

Author SHA1 Message Date
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
fan
00dcbdf7bd 任务管理调整 2019-10-30 19:36:26 +08:00
joylink_cuiweidong
2df4c5f8cb Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-30 18:07:45 +08:00
joylink_cuiweidong
ce0230150b 接口调整 2019-10-30 18:07:09 +08:00
fan
e5c832aa00 修改接口:/api/mapPrd/{skinStyle}/list 改为 /api/mapPrd/{mapId}/list 2019-10-30 17:41:29 +08:00
fan
b6f11064da Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-30 13:07:27 +08:00
fan
0489cf2fd3 删除接口:/api/map/{skinCode}/train 2019-10-30 11:18:41 +08:00
joylink_cuiweidong
81921a4a0d 国际化调整 2019-10-30 09:58:23 +08:00
joylink_cuiweidong
e8cacb4a84 样式调整 2019-10-29 18:55:10 +08:00
zyy
3fa60b2e8b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/scripts/ConstDic.js
#	src/views/lesson/lessoncategory/edit/sorttree/index.vue
#	src/views/lesson/lessoncategory/index.vue
#	src/views/login/index.vue
2019-10-29 17:36:48 +08:00
zyy
df8d104bd1 desc: 高度修改,登陆页面英文调整 2019-10-29 17:33:11 +08:00
joylink_cuiweidong
462b0cfb6c 样式调整 2019-10-29 16:23:57 +08:00
joylink_cuiweidong
b1c3e10eb1 课程设计内容排序样式调整 2019-10-29 13:43:23 +08:00
zyy
0222dfe5c2 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-29 13:16:04 +08:00
zyy
c08e2afaaa desc: 调整高度样式 2019-10-29 13:15:57 +08:00
joylink_cuiweidong
9fc78c18c3 课程设计内容排序调整
运行图发布弹出提示调整
2019-10-29 13:06:55 +08:00
fan
8710a6231a 综合演练房间调整 2019-10-23 16:13:36 +08:00
fan
3119f4f308 设计平台课程设计调整 2019-10-23 15:01:25 +08:00
fan
89d71ed661 发现问题调整 2019-10-23 13:33:09 +08:00
fan
48fafacdc2 获取上次用户登录系统 2019-10-22 20:01:03 +08:00
fan
21510d9464 创建章节修改 2019-10-22 19:49:37 +08:00
fan
5c5c2412fd 章节下添加创建章节 2019-10-22 19:23:01 +08:00
fan
ff37fe128e 问题调整 2019-10-22 18:49:46 +08:00
fan
9134be8c19 问题调整 2019-10-22 18:18:21 +08:00
fan
0cafd0c7f3 设计平台课程系统调整 2019-10-22 17:24:41 +08:00
fan
0e23a62b39 调整代码 2019-10-22 16:05:58 +08:00
fan
e89211a873 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-22 14:28:41 +08:00
fan
a49b195090 调整代码 2019-10-22 14:28:22 +08:00
zyy
a61f917f4a desc: 调整站台扣车状态显示 2019-10-22 14:07:20 +08:00
zyy
ac0fafebc0 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-22 13:41:29 +08:00
zyy
0c6de0e011 desc: 修改代码 2019-10-22 13:41:23 +08:00
fan
515a9a60ae 代码调整 2019-10-22 13:40:42 +08:00
fan
b68dd99bde 仿真路由调整 2019-10-21 16:07:15 +08:00
fan
be2bbc67cd 接口参数调整 2019-10-21 11:15:15 +08:00
fan
9d072c4a6c 产品分化调整 2019-10-21 10:02:49 +08:00
fan
34a8cbf270 接口调整 2019-10-21 08:59:27 +08:00
fan
902b1a494b 接口调整 2019-10-18 18:36:45 +08:00
fan
b23bff36f0 打开实训录制按钮 2019-10-18 17:32:14 +08:00
fan
d5063802f4 接口调整 2019-10-18 17:15:04 +08:00
zyy
7b5255c3eb desc: 调整格式化,样式 2019-10-17 18:27:49 +08:00