Commit Graph

97 Commits

Author SHA1 Message Date
fan
7df417424e 调整本地项目快速入口 2020-04-01 09:07:42 +08:00
fan
bfd5b07145 调整本地项目综合演练 2020-03-31 18:50:16 +08:00
fan
e35149248d 调整本地项目 2020-03-31 15:11:20 +08:00
fan
ab4928d924 差异化打包调整&哈尔滨登录页 2020-03-30 13:07:11 +08:00
fan
2501a1a70a 综合演练问题调整 2020-03-23 16:00:28 +08:00
fan
a435040ef1 综合演练调整 2020-03-23 10:30:23 +08:00
fan
43ffec406d 综合演练调整 2020-03-18 09:59:54 +08:00
fan
cd9915668b 综合演练接口修改 2020-03-16 15:29:26 +08:00
zyy
e156bac9ca 增加公共地图ibp配置绘图 逻辑 2020-03-13 18:19:04 +08:00
zyy
31d50d95e2 增加仿真系统 iscs工作站 2020-03-13 13:23:04 +08:00
fan
582fc354db 快速入口增加参数projectCode 2020-01-17 14:20:31 +08:00
joylink_cuiweidong
5357d5c23c 解决 页面刷新 用户进入房间的问题 2020-01-16 15:08:03 +08:00
fan
fbc0e5b28a 哈尔滨盈达调整 2020-01-14 16:19:36 +08:00
fan
f2b62f281e 指令调整,公共地图宽度调整 2020-01-06 18:39:44 +08:00
fan
f8c7a46743 调整合并问题 2019-12-30 18:58:23 +08:00
joylink_cuiweidong
cad56a82e9 Merge branch 'dev_prd' into dev
# Conflicts:
#	src/views/demonstration/detail/index.vue
2019-12-30 18:45:05 +08:00
joylink_cuiweidong
dc9a059a7b 实训平台仿真权限代码调整 2019-12-30 18:14:52 +08:00
fan
c7078dcdb9 新版地图包加载仿真 2019-12-30 09:00:16 +08:00
joylink_cuiweidong
40bc4840e7 prdType 接口调整 2019-12-27 19:36:29 +08:00
joylink_cuiweidong
0486d0211b prdType对应接口修改 2019-12-27 18:48:56 +08:00
zyy
6e3424e355 调整实训平台新旧地图显示逻辑 2019-12-26 11:01:54 +08:00
joylink_cuiweidong
cf03ac1e3d 综合演练的分发按钮去掉
所有的转增按钮去掉
2019-12-18 11:16:35 +08:00
zyy
03d766f5ee 修改实训平台购买提示 2019-12-05 18:12:09 +08:00
lVAL
899f4a4216 修改跳转bug 2019-11-25 18:21:56 +08:00
lVAL
a5bb60cf68 删除跳转页面中无用的subSystem参数 2019-11-25 18:12:34 +08:00
fan
3ad044be4f 打开支付跳转页面 2019-11-15 09:42:53 +08:00
ival
c5c813753c 修改代码 2019-11-14 13:59:33 +08:00
joylink_cuiweidong
b1d19febe6 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-12 13:40:05 +08:00
joylink_cuiweidong
5ce2e1a5b7 仿真skinCode调整 2019-11-12 13:39:52 +08:00
fan
92f2292592 暂无法购买,添加提示 2019-11-12 09:40:36 +08:00
joylink_cuiweidong
c4f79f3b1a skinCode调整 2019-11-11 18:28:21 +08:00
ival
8855bb6c27 修改代码 2019-11-08 20:03:33 +08:00
joylink_cuiweidong
5465eb61c1 prdCode改成prdId 2019-11-07 15:54:49 +08:00
zyy
7ec68a75e3 desc: 删除多余文件, 调整路径配置 2019-10-31 17:30:24 +08:00
fan
fa1fc4c3cf 删除接口:/api/mapPrd/tree 2019-10-30 18:03:30 +08:00
joylink_cuiweidong
462b0cfb6c 样式调整 2019-10-29 16:23:57 +08:00
fan
73e9c995c2 综合演练房间快速入口添加线路 2019-10-25 17:49:44 +08:00
fan
ca736a93f3 登录过期不显示获取子系统信息失败 2019-10-25 13:16:07 +08:00
fan
bfce5a2103 问题调整 2019-10-25 12:59:24 +08:00
fan
36b0b048bd 仿真路由调整 2019-10-21 14:09:03 +08:00
fan
34a8cbf270 接口调整 2019-10-21 08:59:27 +08:00
fan
d5063802f4 接口调整 2019-10-18 17:15:04 +08:00
fan
fa4c7a6599 样式微调 2019-10-17 16:26:36 +08:00
fan
0fd879dd5d 样式微调 2019-10-17 16:23:14 +08:00
zyy
6ca619b71f desc: 修改格式化 2019-10-17 14:35:10 +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
fan
1ced811496 产品分化调整 2019-09-27 14:46:08 +08:00
fan
bc68f1adc9 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-26 15:43:56 +08:00
fan
2ce7cde8cb 调整icon导致x替换问题 2019-09-26 15:43:19 +08:00
fan
e7d7ad76f0 实训平台调整 2019-09-25 13:05:01 +08:00