Commit Graph

19 Commits

Author SHA1 Message Date
lVAL
a5bb60cf68 删除跳转页面中无用的subSystem参数 2019-11-25 18:12:34 +08:00
joylink_cuiweidong
d0d2355367 实训平台仿真页面代码调整 2019-11-18 09:18:07 +08:00
ival
d599e561f6 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/store/modules/exam.js
#	src/utils/baseUrl.js
#	src/views/display/menuExam.vue
2019-11-15 16:34:54 +08:00
zyy
9bfad2fdeb desc: 修改代码 2019-11-15 16:31:48 +08:00
ival
a60b41398b 修改代码 2019-11-15 16:29:11 +08:00
zyy
9b7b1d7bc8 删除不用文件 2019-11-14 13:06:24 +08:00
fan
62a7cce5f1 返回仿真不退出全屏 2019-11-08 18:52:09 +08:00
fan
375773cceb 更换接口:/api/map/skin/{skinCode}/version;/api/map/skin/{skinCode}/details 2019-10-30 13:56:43 +08:00
fan
36b0b048bd 仿真路由调整 2019-10-21 14:09:03 +08:00
fan
4b41c9fd27 考试路由调整 2019-10-21 13:16:49 +08:00
fan
5ba5ca7ea7 Merge remote-tracking branch 'origin/dev_product' into dev
# Conflicts:
#	src/components/QueryListPage/QueryForm.vue
#	src/i18n/langs/en/rules.js
#	src/i18n/langs/en/scriptRecord.js
#	src/i18n/langs/zh/lesson.js
#	src/i18n/langs/zh/rules.js
#	src/i18n/langs/zh/scriptRecord.js
#	src/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
#	src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue
#	src/permission.js
#	src/router/index.js
#	src/utils/baseUrl.js
#	src/views/demonstration/detail/index.vue
#	src/views/display/tipExamList.vue
#	src/views/lesson/lessoncategory/edit/lesson/publish.vue
#	src/views/lesson/taskmanage/createTask.vue
#	src/views/lesson/trainingRule/list.vue
#	src/views/login/index.vue
#	src/views/planMonitor/editTool/statusBar.vue
#	src/views/scriptManage/home.vue
#	src/views/teach/category/tree.vue
#	src/views/trainRoom/index.vue
2019-10-17 09:16:40 +08:00
zyy
0b1ae44c19 desc: 调整三号线现地操作 2019-09-26 09:23:02 +08:00
fan
b998eee746 产品分化调整 2019-09-24 15:03:03 +08:00
joylink_cuiweidong
37f1631585 仿真国际化调整 2019-09-11 14:35:26 +08:00
joylink_cuiweidong
ef5d425942 考试 仿真国际化调整 2019-09-11 13:40:46 +08:00
ival
cc54830f01 修改代码格式以及操作的bug 2019-08-29 10:33:50 +08:00
ival
ae500285ba 修改实训加载顺序错误的问题 2019-08-19 15:59:04 +08:00
ival
d083482b10 修改代码 2019-08-19 10:31:11 +08:00
ival
9f5130a4f2 代码移植 2019-07-26 13:32:43 +08:00