joylink_cuiweidong
|
e8c8e491f5
|
skinCode调整
|
2019-11-11 15:54:04 +08:00 |
|
fan
|
56d11976db
|
设计平台剧本课程运行图统一风格样式
|
2019-11-11 13:10:36 +08:00 |
|
joylink_cuiweidong
|
ee600f8915
|
skinCode调整
|
2019-11-08 18:19:35 +08:00 |
|
fan
|
75a871265e
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-08 16:22:32 +08:00 |
|
fan
|
e677b24f6d
|
调整查询地图列表接口
|
2019-11-08 16:22:05 +08:00 |
|
joylink_cuiweidong
|
b923fa2a6b
|
代码调整
|
2019-11-08 15:17:04 +08:00 |
|
zyy
|
4483ee9253
|
desc: 导入运行图增加提示
|
2019-11-08 14:56:39 +08:00 |
|
joylink_cuiweidong
|
11226b84ab
|
运行图设计代码调整
|
2019-11-08 14:35:58 +08:00 |
|
joylink_cuiweidong
|
713f411ffc
|
运行图设计调整
|
2019-11-08 13:47:51 +08:00 |
|
fan
|
c203f7b839
|
skinCode 调整
|
2019-11-08 10:08:28 +08:00 |
|
joylink_cuiweidong
|
1a13c9ad2c
|
权限分发接口调整
|
2019-11-05 13:20:27 +08:00 |
|
fan
|
d54ed0329b
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-04 18:42:07 +08:00 |
|
fan
|
1bd3debbde
|
西铁院登录页样式调整，测试问题调整
|
2019-11-04 18:41:58 +08:00 |
|
joylink_cuiweidong
|
cf69d44833
|
代码优化
系统管理用户实训统计接口调整
|
2019-11-04 14:05:55 +08:00 |
|
zyy
|
1c373822ee
|
desc: 修改代码
|
2019-11-04 10:33:45 +08:00 |
|
joylink_cuiweidong
|
f3298cdb83
|
页面调整
|
2019-11-01 15:12:00 +08:00 |
|
zyy
|
7ec68a75e3
|
desc: 删除多余文件， 调整路径配置
|
2019-10-31 17:30:24 +08:00 |
|
fan
|
3dff70d821
|
运行图调整
|
2019-10-30 19:04:21 +08:00 |
|
fan
|
36c33ed416
|
修改接口：/api/runPlan/template/skin/{mapId} 改为 /api/runPlan/template/{mapId}/list
|
2019-10-30 17:21:32 +08:00 |
|
fan
|
6d0edb2370
|
合并代码
|
2019-10-30 16:57:01 +08:00 |
|
fan
|
4918c78204
|
删除接口：/api/runPlan/draft/station/{skinCode}/bySkin
|
2019-10-30 16:50:35 +08:00 |
|
joylink_cuiweidong
|
c80d2ed536
|
接口调整
多余文件删除
|
2019-10-30 14:00:50 +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
|
2107549d72
|
更换接口：/api/map/skin/{skinCode}/version;/api/map/skin/{skinCode}/details
|
2019-10-30 13:07:07 +08:00 |
|
joylink_cuiweidong
|
81921a4a0d
|
国际化调整
|
2019-10-30 09:58:23 +08:00 |
|
joylink_cuiweidong
|
462b0cfb6c
|
样式调整
|
2019-10-29 16:23:57 +08:00 |
|
fan
|
78f9d58321
|
登录token存储修改
|
2019-10-25 18:30:23 +08:00 |
|
fan
|
d5b6f172e9
|
Merge remote-tracking branch 'origin/test' into dev
|
2019-10-25 17:09:02 +08:00 |
|
fan
|
12d25d1643
|
运行图测试运行调整，西铁院登录页路由调整
|
2019-10-25 16:45:17 +08:00 |
|
joylink_cuiweidong
|
6df1eecfc3
|
代码调整
|
2019-10-25 16:33:35 +08:00 |
|
zyy
|
033c6f40fa
|
desc: 调整高度
|
2019-10-24 18:28:06 +08:00 |
|
joylink_cuiweidong
|
a1761fd2fc
|
添加copyRight
|
2019-10-23 19:15:02 +08:00 |
|
joylink_cuiweidong
|
2282f27239
|
设计系统运行图样式调整
|
2019-10-22 16:10:39 +08:00 |
|
joylink_cuiweidong
|
1b342fee6e
|
地图列表获取城市列表样式调整
|
2019-10-18 16:57:40 +08:00 |
|
fan
|
ab815ec493
|
实训管理调整
|
2019-10-17 17:56:25 +08:00 |
|
fan
|
534fa388e8
|
添加子系统生成页面
|
2019-10-17 17:11:15 +08:00 |
|
fan
|
11190ef66f
|
代码整合调整
|
2019-10-17 10:13:08 +08:00 |
|
fan
|
ece8f0cf21
|
Merge remote-tracking branch 'origin/dev_product' into dev_merger
# Conflicts:
# src/router/index.js
# src/scripts/ConstDic.js
|
2019-10-17 09:36:32 +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
|
0fc9db098c
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-10-15 11:04:43 +08:00 |
|
fan
|
729be7ec69
|
西铁院暂存
|
2019-10-15 09:39:01 +08:00 |
|
joylink_cuiweidong
|
aba4efe129
|
运行图页面调整
|
2019-10-14 17:03:54 +08:00 |
|
joylink_cuiweidong
|
bca95d4ca1
|
运行图增加计划和删除计划 更新运行图数据
|
2019-10-14 15:35:11 +08:00 |
|
fan
|
0a1ec28511
|
产品分化调整
|
2019-10-14 13:54:19 +08:00 |
|
fan
|
6d15a95b3f
|
产品分化运行图发布调整
|
2019-10-14 13:04:23 +08:00 |
|
joylink_cuiweidong
|
bb9cfc965d
|
产品分化 实训平台加载剧本接口修改
|
2019-10-09 14:01:02 +08:00 |
|
joylink_cuiweidong
|
2d1f13299e
|
产品分化运行图接口调整
|
2019-10-08 18:35:02 +08:00 |
|
joylink_cuiweidong
|
db971bf591
|
产品分化运行图修改
|
2019-10-08 14:12:53 +08:00 |
|
fan
|
ca413e3331
|
设计平台运行图调整
|
2019-09-30 18:11:31 +08:00 |
|
joylink_cuiweidong
|
e9638517d8
|
产品分化 运行图列表调整
|
2019-09-30 15:18:34 +08:00 |
|