joylink_cuiweidong
|
95ae0de627
|
skinCode调整
|
2019-11-08 16:12:23 +08:00 |
|
fan
|
71171625fa
|
删除console
|
2019-11-08 13:44:49 +08:00 |
|
fan
|
b4ba9cb3b8
|
代码修改
|
2019-11-08 13:41:22 +08:00 |
|
fan
|
7e13f98167
|
发布课程管理form 添加城市与地图的级联关系
|
2019-11-08 10:57:07 +08:00 |
|
fan
|
f8d6a3eb9f
|
课程发布管理添加归属地图
|
2019-11-08 10:21:54 +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
|
347e49f55c
|
调整接口
|
2019-11-04 13:29:51 +08:00 |
|
joylink_cuiweidong
|
075cdf5fd9
|
页面样式调整
代码优化
|
2019-11-04 10:59:50 +08:00 |
|
joylink_cuiweidong
|
96452b8dde
|
代码调整
|
2019-11-01 17:08:28 +08:00 |
|
joylink_cuiweidong
|
f3298cdb83
|
页面调整
|
2019-11-01 15:12:00 +08:00 |
|
fan
|
7455fb17ea
|
发布地图管理国际化调整，添加ibp角色多人时disable为true 调整
|
2019-10-31 16:52:49 +08:00 |
|
zyy
|
dfd148897b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-31 14:47:20 +08:00 |
|
zyy
|
dc8524e52a
|
desc: 调整试题高度
|
2019-10-31 14:47:05 +08:00 |
|
fan
|
547589331b
|
发布地图管理调整调整
|
2019-10-31 14:35:28 +08:00 |
|
fan
|
934b67fea3
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-31 13:57:36 +08:00 |
|
fan
|
3996f03e55
|
实训首页样式调整和复制地图调整
|
2019-10-31 13:57:17 +08:00 |
|
zyy
|
a87372ea2c
|
desc: 发布高度调整
|
2019-10-31 13:24:45 +08:00 |
|
fan
|
ea219e6310
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/publish/publishMap/index.vue
# src/views/publish/publishMap/project.vue
|
2019-10-31 10:36:30 +08:00 |
|
fan
|
900abcbe36
|
添加复制地图和调整实训平台树节点key
|
2019-10-31 10:32:46 +08:00 |
|
zyy
|
c006a98f2e
|
desc: 修改代码
|
2019-10-31 10:09:43 +08:00 |
|
fan
|
6d37627e3d
|
发布地图管理调整
|
2019-10-31 09:09:43 +08:00 |
|
fan
|
3dff70d821
|
运行图调整
|
2019-10-30 19:04:21 +08:00 |
|
fan
|
1242c7e3d7
|
修改接口：/api/runPlan/template/{id}/copyAs/{skinCode} 改为 /api/runPlan/template/{id}/copyAs/{mapId}
|
2019-10-30 18:18:09 +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
|
85733f5f0a
|
接口调整
无效文件删除
|
2019-10-30 14:40:31 +08:00 |
|
fan
|
973168970c
|
西铁院项目调整
|
2019-10-29 14:14:14 +08:00 |
|
joylink_cuiweidong
|
7ed9387731
|
更新发布课程信息
地图预览bug调整
|
2019-10-28 10:29:17 +08:00 |
|
joylink_cuiweidong
|
0f39f495af
|
发布地图管理页面添加更新城市
|
2019-10-25 17:50:55 +08:00 |
|
fan
|
515a9a60ae
|
代码调整
|
2019-10-22 13:40:42 +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 |
|
joylink_cuiweidong
|
df5a76ea41
|
剧本管理英文版英文用词修改
|
2019-10-16 11:20:36 +08:00 |
|
zyy
|
a8e491ea6e
|
desc: 所有弹窗可拖拽处理， 增加登陆页面登陆说明
|
2019-10-09 17:05:10 +08:00 |
|
fan
|
1ced811496
|
产品分化调整
|
2019-09-27 14:46:08 +08:00 |
|
zyy
|
01cb0a699b
|
desc: 调整权限字段限制， 配置英文版登陆页面
|
2019-09-26 17:42:25 +08:00 |
|
joylink_cuiweidong
|
27d7431b9e
|
国际化调整
|
2019-09-24 14:09:26 +08:00 |
|
fan
|
d863e61b33
|
Revert "revert 01c97f45aea75ec8db5a0726c82a2e83fa14750e"
This reverts commit 6ad0eebb2e.
|
2019-09-24 13:32:28 +08:00 |
|
fan
|
6ad0eebb2e
|
revert 01c97f45ae
|
2019-09-24 13:23:50 +08:00 |
|
zyy
|
01c97f45ae
|
desc: 调整琏计划导入excel, 样式， 流程
|
2019-09-23 13:37:11 +08:00 |
|
joylink_cuiweidong
|
5f4412dd40
|
国际化调整
|
2019-09-18 17:28:24 +08:00 |
|
joylink_cuiweidong
|
9ace0842a5
|
发布内容管理 国际化
|
2019-09-18 16:04:34 +08:00 |
|
joylink_cuiweidong
|
ae68018734
|
发布内容管理 国际化
|
2019-09-18 13:36:57 +08:00 |
|
ival
|
f13685da07
|
修改代码
|
2019-09-18 10:03:58 +08:00 |
|
ival
|
b52bb52888
|
修改地图导出以及登录失败错误信息提示
|
2019-09-16 14:29:43 +08:00 |
|
zyy
|
11a49d1442
|
desc: 增加加载运行图模板接口，调整地图绘制优化
|
2019-09-06 14:21:01 +08:00 |
|
zyy
|
abec58b726
|
desc: 修改弹窗点击蒙层不取消
|
2019-09-03 18:59:46 +08:00 |
|
zyy
|
40b67b8cf3
|
desc: 调整修改权限逻辑
|
2019-09-03 16:13:23 +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
|
0388b2a1df
|
desc: 修改权限列表显示字段内容，逻辑流程
|
2019-09-02 14:43:16 +08:00 |
|
ival
|
94d1103e58
|
设置全局尺寸变化
|
2019-09-02 10:38:10 +08:00 |
|
ival
|
546957e926
|
增加排版计划处理
|
2019-08-30 15:46:08 +08:00 |
|
ival
|
fd03ed6d59
|
修改每日运行图查询接口
|
2019-08-29 14:48:26 +08:00 |
|
ival
|
1616639f6f
|
修改运行图接口
|
2019-08-29 13:52:34 +08:00 |
|
ival
|
0954312cac
|
修改用户emgail国际化的问题和保存规则提示的问题
|
2019-08-29 09:02:02 +08:00 |
|
ival
|
5fdc80855d
|
修改规则编辑的问题
|
2019-08-27 10:28:24 +08:00 |
|
ival
|
a4d06b7743
|
修改试题编辑页面的bug
|
2019-08-26 15:30:36 +08:00 |
|
zyy
|
b9b2fd5b77
|
desc: 调整地图绘制数据逻辑， 新增发布历史列表
|
2019-08-23 18:40:02 +08:00 |
|
ival
|
4270053326
|
修改国际化
|
2019-08-21 11:28:56 +08:00 |
|
ival
|
433360f979
|
增加回放的国际化
|
2019-08-20 17:22:45 +08:00 |
|
ival
|
8259b24f6c
|
增加国际化配置
|
2019-08-20 17:01:09 +08:00 |
|
ival
|
d1417983cc
|
修改国际化
|
2019-08-20 15:44:16 +08:00 |
|
ival
|
03eec83e9c
|
增加交路目的地码的展示
|
2019-08-20 14:02:55 +08:00 |
|
ival
|
8e431bade1
|
修改地图导入导出
|
2019-08-16 16:28:11 +08:00 |
|
ival
|
87e35cb38d
|
同步master代码以及修改交路的问题
|
2019-08-14 16:37:17 +08:00 |
|
ival
|
78a805cd2f
|
修改皮肤skinStyle为skinCode
|
2019-08-14 09:35:38 +08:00 |
|
ival
|
db109f2a9e
|
调整地图进路相关的接口
|
2019-08-13 16:59:38 +08:00 |
|
ival
|
dc0b5301e0
|
增加导出部分地图数据
|
2019-08-12 18:22:14 +08:00 |
|
zyy
|
c3f600b015
|
优化代码
|
2019-08-08 15:57:36 +08:00 |
|
ival
|
66c599c0da
|
修改格式问题
|
2019-08-08 14:32:32 +08:00 |
|
zyy
|
98a0533b20
|
修改代码格式
|
2019-08-06 10:11:32 +08:00 |
|
ival
|
9f5130a4f2
|
代码移植
|
2019-07-26 13:32:43 +08:00 |
|