Commit Graph

74 Commits

Author SHA1 Message Date
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
zyy
b3830f2cc5 desc: 新增现地 自动生成课程 2019-09-25 10:46:35 +08:00
fan
522b94fcfe 产品分化调整 2019-09-25 09:18:28 +08:00
fan
b998eee746 产品分化调整 2019-09-24 15:03:03 +08:00
fan
ce7decc188 产品分化调整 2019-09-24 11:05:10 +08:00
fan
d063625c45 产品分化调整 2019-09-23 17:49:04 +08:00
zyy
11a49d1442 desc: 增加加载运行图模板接口,调整地图绘制优化 2019-09-06 14:21:01 +08:00
ival
3ade8f6d92 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-02 15:38:11 +08:00
ival
61de3c222d App.vue页面增加全局尺寸混入并存放在app store,其他页面删除混入 2019-09-02 15:37:57 +08:00
zyy
6fa64dd26b desc: 修改显示字段,增加loading 2019-09-02 11:04:23 +08:00
zyy
22beeffc53 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/utils/baseUrl.js
#	src/views/screenMonitor/list/demonList.vue
2019-08-30 17:03:51 +08:00
zyy
0398179e0d desc: 用户权限流程修改,接口对接 2019-08-30 17:00:18 +08:00
ival
3da74652c5 增加派班计划 2019-08-30 09:00:36 +08:00
ival
30e590afc7 封装车次窗鼠标事件以及车次窗操作 2019-08-29 11:26:05 +08:00
zyy
2250bc970d desc: 修改名称显示放到皮肤配置中 2019-08-23 14:24:30 +08:00
fan
9a480393f5 国际化调整+loading调整 2019-08-21 13:54:53 +08:00
fan
36a1f8e878 调整: 快速入口调整 2019-08-19 20:27:23 +08:00
fan
ecc4885ad0 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-19 14:09:54 +08:00
fan
2115c952cc 修改:loading调整 2019-08-19 14:09:37 +08:00
ival
9ca049157c Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-19 14:02:32 +08:00
ival
d87a4fff22 国际化处理 2019-08-19 14:02:20 +08:00
fan
a669d093b1 修改:删除全局loading 2019-08-19 13:27:15 +08:00
ival
068dbdbbde 修改代码 2019-08-19 10:58:14 +08:00
ival
00f0fd84a3 修改车站公里表隐藏的问题 2019-08-19 09:38:11 +08:00