fan
|
77d024c08c
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/designPlatform/demonList.vue
|
2019-10-21 08:58:17 +08:00 |
|
fan
|
902b1a494b
|
接口调整
|
2019-10-18 18:36:45 +08:00 |
|
joylink_cuiweidong
|
fd4df4f178
|
设计平台地图列表页面调整
|
2019-10-18 18:35:17 +08:00 |
|
ival
|
94288eaecc
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-18 18:31:29 +08:00 |
|
ival
|
36950a331e
|
修改比例
|
2019-10-18 18:31:14 +08:00 |
|
joylink_cuiweidong
|
170c7bcc9e
|
课程设计界面参数调整
|
2019-10-18 18:13:54 +08:00 |
|
ival
|
0864369b35
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-18 17:54:10 +08:00 |
|
ival
|
9a14de60ef
|
修改电子显示屏
|
2019-10-18 17:53:57 +08:00 |
|
joylink_cuiweidong
|
ecef9a4c74
|
设计平台地图列表接口调整
|
2019-10-18 17:45:08 +08:00 |
|
fan
|
b23bff36f0
|
打开实训录制按钮
|
2019-10-18 17:32:14 +08:00 |
|
fan
|
911b8a9057
|
接口调整
|
2019-10-18 17:23:25 +08:00 |
|
fan
|
d5063802f4
|
接口调整
|
2019-10-18 17:15:04 +08:00 |
|
joylink_cuiweidong
|
1b342fee6e
|
地图列表获取城市列表样式调整
|
2019-10-18 16:57:40 +08:00 |
|
ival
|
5e83d06250
|
修改计时组件样式
|
2019-10-18 15:35:48 +08:00 |
|
sunzhenyu
|
a7e7988754
|
修复路径判断
|
2019-10-18 15:29:17 +08:00 |
|
joylink_cuiweidong
|
3f82e45fcb
|
登录页面 密码隐藏显示
|
2019-10-18 14:36:14 +08:00 |
|
joylink_cuiweidong
|
c80c9d467c
|
剧本列表预览调整
|
2019-10-18 11:26:11 +08:00 |
|
joylink_cuiweidong
|
b96ca27907
|
Merge branch 'dev_product' into dev
|
2019-10-17 19:20:12 +08:00 |
|
joylink_cuiweidong
|
b14e2d18f4
|
剧本预览页面调整
|
2019-10-17 18:59:46 +08:00 |
|
sunzhenyu
|
f78d9865a2
|
Merge branch '3dtest' into test
|
2019-10-17 18:56:56 +08:00 |
|
zyy
|
140d84bf56
|
desc: 调整登陆页面样式
|
2019-10-17 18:55:46 +08:00 |
|
sunzhenyu
|
f847629b92
|
修改文字显示，行车路径，行车计算
|
2019-10-17 18:48:36 +08:00 |
|
zyy
|
7b5255c3eb
|
desc: 调整格式化，样式
|
2019-10-17 18:27:49 +08:00 |
|
fan
|
0ebab6201f
|
Merge remote-tracking branch 'origin/dev_product' into dev
# Conflicts:
# src/views/scriptManage/home.vue
|
2019-10-17 18:09:02 +08:00 |
|
fan
|
f6e8375bf8
|
实训管理调整
|
2019-10-17 18:06:49 +08:00 |
|
joylink_cuiweidong
|
99b2cfc05b
|
剧本预览页面调整
|
2019-10-17 18:06:04 +08:00 |
|
fan
|
ab815ec493
|
实训管理调整
|
2019-10-17 17:56:25 +08:00 |
|
fan
|
534fa388e8
|
添加子系统生成页面
|
2019-10-17 17:11:15 +08:00 |
|
fan
|
fa4c7a6599
|
样式微调
|
2019-10-17 16:26:36 +08:00 |
|
fan
|
0fd879dd5d
|
样式微调
|
2019-10-17 16:23:14 +08:00 |
|
fan
|
ee62ceb0e5
|
产品分化调整
|
2019-10-17 16:04:07 +08:00 |
|
fan
|
6e139bcdbb
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_merger
# Conflicts:
# src/router/index.js
|
2019-10-17 14:39:08 +08:00 |
|
zyy
|
6ca619b71f
|
desc: 修改格式化
|
2019-10-17 14:35:10 +08:00 |
|
fan
|
05530e1568
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_merger
|
2019-10-17 14:33:19 +08:00 |
|
fan
|
00c4415fcc
|
代码整合调整
|
2019-10-17 14:31:59 +08:00 |
|
joylink_cuiweidong
|
9cd7234081
|
剧本列表页面调整
|
2019-10-17 13:54:41 +08:00 |
|
zyy
|
5d13162c6b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/utils/baseUrl.js
|
2019-10-17 11:21:01 +08:00 |
|
zyy
|
5d7f736873
|
desc: 调整考试系统英文名称
|
2019-10-17 11:20:09 +08:00 |
|
fan
|
11190ef66f
|
代码整合调整
|
2019-10-17 10:13:08 +08:00 |
|
joylink_cuiweidong
|
a264ab51cb
|
已发布地图剧本列表页面调整
|
2019-10-17 10:06:52 +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
|
1ece7eb215
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-10-17 09:30:02 +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
|
25c4cf957d
|
西铁院项目调整
|
2019-10-16 17:37:03 +08:00 |
|
fan
|
355e06ae2e
|
注释plc相关接口
|
2019-10-16 17:03:21 +08:00 |
|
fan
|
54b078792c
|
西铁院暂存
|
2019-10-16 16:58:40 +08:00 |
|
joylink_cuiweidong
|
35eacb299c
|
剧本预览页面调整
|
2019-10-16 16:36:25 +08:00 |
|
fan
|
f4fc3d0b0b
|
暂存
|
2019-10-16 15:43:07 +08:00 |
|
fan
|
126886e1ce
|
西铁院暂存
|
2019-10-16 15:28:29 +08:00 |
|
fan
|
f0bf595b60
|
国际化添加左、右
|
2019-10-16 14:16:48 +08:00 |
|
fan
|
dd8c1e07f4
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-16 14:01:40 +08:00 |
|
fan
|
1caad290e5
|
ibp盘添加扣车关联
|
2019-10-16 14:00:30 +08:00 |
|
joylink_cuiweidong
|
df5a76ea41
|
剧本管理英文版英文用词修改
|
2019-10-16 11:20:36 +08:00 |
|
joylink_cuiweidong
|
571e221413
|
用户剧本预览页面调整
|
2019-10-16 09:18:26 +08:00 |
|
joylink_cuiweidong
|
c2479d2f68
|
剧本国际化调整
|
2019-10-15 16:46:32 +08:00 |
|
joylink_cuiweidong
|
a33c44dfea
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/scriptManage/scriptRecord/addAction.vue
|
2019-10-15 16:30:45 +08:00 |
|
joylink_cuiweidong
|
089290e979
|
剧本国际化调整以及剧本增加语言参数
|
2019-10-15 16:18:25 +08:00 |
|
zyy
|
6faa018c71
|
desc: 新增剧本编辑页面可拖拽宽度
|
2019-10-15 15:24:41 +08:00 |
|
joylink_cuiweidong
|
ec16767772
|
剧本预览调整
|
2019-10-15 13:41:23 +08:00 |
|
fan
|
0640586712
|
西铁院暂存
|
2019-10-15 13:04:28 +08:00 |
|
fan
|
1ec45e2c19
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-10-15 11:06:16 +08:00 |
|
joylink_cuiweidong
|
232789ca73
|
产品分化路由处理
|
2019-10-15 11:05:30 +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 |
|
joylink_cuiweidong
|
5e320978a9
|
产品分化剧本页面调整
|
2019-10-14 13:58:26 +08:00 |
|
fan
|
d6dbb01bba
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-10-14 13:54:45 +08:00 |
|
fan
|
0a1ec28511
|
产品分化调整
|
2019-10-14 13:54:19 +08:00 |
|
joylink_cuiweidong
|
a622effdde
|
Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/api/designPlatform.js
# src/i18n/langs/en/approval.js
# src/i18n/langs/zh/approval.js
|
2019-10-14 13:12:30 +08:00 |
|
joylink_cuiweidong
|
c60471023f
|
产品分化剧本管理调整
|
2019-10-14 13:10:36 +08:00 |
|
fan
|
6d15a95b3f
|
产品分化运行图发布调整
|
2019-10-14 13:04:23 +08:00 |
|
fan
|
38f4dc1093
|
产品分化调整
|
2019-10-12 18:43:41 +08:00 |
|
fan
|
5af0c7e4c9
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-10-12 17:16:09 +08:00 |
|
fan
|
8366f9a788
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/api/designPlatform.js
# src/router/index.js
|
2019-10-12 17:15:48 +08:00 |
|
joylink_cuiweidong
|
12eed3629a
|
运行图 发布审核流程调整
|
2019-10-12 17:15:25 +08:00 |
|
fan
|
722596cdf4
|
产品分化调整
|
2019-10-12 17:14:03 +08:00 |
|
joylink_cuiweidong
|
af2c431511
|
运行图剧本 审核流程调整
|
2019-10-12 16:47:54 +08:00 |
|
sunzhenyu
|
b32b03bc81
|
修改link为主轨迹运行
|
2019-10-12 16:36:51 +08:00 |
|
zyy
|
842f29e5d9
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/jointTraining/index.vue
|
2019-10-12 13:35:56 +08:00 |
|
zyy
|
99edd29aea
|
desc: 调整格式化问题， 调整列车详情国际化
|
2019-10-12 13:25:47 +08:00 |
|
joylink_cuiweidong
|
6adc8cdd5b
|
剧本国际化调整
|
2019-10-12 13:04:56 +08:00 |
|
joylink_cuiweidong
|
bf66b2c9e0
|
剧本发布申请页面调整
|
2019-10-12 11:11:34 +08:00 |
|
fan
|
a24603aedf
|
综合仿真页面跳转调整
|
2019-10-12 11:03:15 +08:00 |
|
zyy
|
e03aefd80d
|
desc: 调整字段
|
2019-10-11 19:10:27 +08:00 |
|
zyy
|
ef3f909a2d
|
desc: 调整字段显示
|
2019-10-11 19:02:12 +08:00 |
|
zyy
|
3b8da62bf2
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-11 18:40:37 +08:00 |
|
zyy
|
5e8089cacd
|
desc: 修改权限字段
|
2019-10-11 18:40:32 +08:00 |
|
fan
|
862f251adb
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-11 17:45:36 +08:00 |
|
fan
|
3326f1c917
|
ibp调整
|
2019-10-11 17:17:05 +08:00 |
|
zyy
|
1e3486efc6
|
desc: 增加权限分发列表【设置失效】功能
|
2019-10-11 16:09:15 +08:00 |
|
zyy
|
aa0199754a
|
desc: 调整创建权限流程，创建字段修改
|
2019-10-11 15:27:14 +08:00 |
|
fan
|
a4ccfee26d
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/router/index.js
|
2019-10-11 08:57:38 +08:00 |
|
fan
|
5a21420a18
|
课程发布审批流程暂存
|
2019-10-11 08:55:02 +08:00 |
|
zyy
|
f7cf33a5e2
|
desc: 调整登陆页面样式
|
2019-10-10 18:05:26 +08:00 |
|
joylink_cuiweidong
|
2a4bb6dba2
|
剧本发布申请页面
|
2019-10-10 17:37:07 +08:00 |
|
joylink_cuiweidong
|
e31bd2730f
|
Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product
|
2019-10-10 16:18:43 +08:00 |
|
joylink_cuiweidong
|
17ed79b2dd
|
产品分化课程设计页面调整
刷新页面菜单栏选中状态调整
|
2019-10-10 16:18:31 +08:00 |
|
fan
|
f2d614d5af
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-10-10 16:12:47 +08:00 |
|
fan
|
977a6d8b47
|
产品分化调整
|
2019-10-10 16:07:13 +08:00 |
|
joylink_cuiweidong
|
059a4134d5
|
产品分化路由调整以及剧本发布样式调整
|
2019-10-10 14:08:23 +08:00 |
|
fan
|
758eccd074
|
产品分化调整
|
2019-10-10 13:56:33 +08:00 |
|
fan
|
95a6103575
|
产品分化调整
|
2019-10-10 13:16:00 +08:00 |
|
fan
|
c9f9aa6869
|
产品分化调整
|
2019-10-10 13:02:43 +08:00 |
|
fan
|
3381424f0d
|
产品分化调整
|
2019-10-10 09:33:56 +08:00 |
|
zyy
|
a8e491ea6e
|
desc: 所有弹窗可拖拽处理， 增加登陆页面登陆说明
|
2019-10-09 17:05:10 +08:00 |
|
fan
|
e27a189952
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-10-09 15:14:21 +08:00 |
|
fan
|
417c78ec72
|
产品分化调整优化
|
2019-10-09 15:14:00 +08:00 |
|
joylink_cuiweidong
|
28ca25b822
|
处理设计平台菜单栏显示的问题
|
2019-10-09 14:56:32 +08:00 |
|
joylink_cuiweidong
|
bb9cfc965d
|
产品分化 实训平台加载剧本接口修改
|
2019-10-09 14:01:02 +08:00 |
|
joylink_cuiweidong
|
62621b77a0
|
产品分化 设计平台页面调整
|
2019-10-09 11:28:11 +08:00 |
|
joylink_cuiweidong
|
b7cb2a36db
|
产品分化 剧本接口调整
|
2019-10-09 10:14:30 +08:00 |
|
joylink_cuiweidong
|
2d1f13299e
|
产品分化运行图接口调整
|
2019-10-08 18:35:02 +08:00 |
|
joylink_cuiweidong
|
ec4e78548f
|
产品分化页面调整
|
2019-10-08 16:09:18 +08:00 |
|
zyy
|
88c1212af0
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-08 16:08:19 +08:00 |
|
zyy
|
df43ef4cc3
|
desc: 调整登陆界面显示
|
2019-10-08 16:08:13 +08:00 |
|
joylink_cuiweidong
|
672c075ada
|
ibp 车站名称以及上下行车站名称修改
|
2019-10-08 15:51:19 +08:00 |
|
joylink_cuiweidong
|
db971bf591
|
产品分化运行图修改
|
2019-10-08 14:12:53 +08:00 |
|
fan
|
ca413e3331
|
设计平台运行图调整
|
2019-09-30 18:11:31 +08:00 |
|
fan
|
641345e801
|
设计平台调整
|
2019-09-30 17:56:16 +08:00 |
|
fan
|
588c886f3b
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-09-30 16:20:51 +08:00 |
|
fan
|
5075e999b9
|
设计平台调整
|
2019-09-30 16:20:31 +08:00 |
|
joylink_cuiweidong
|
cad6eeb98e
|
产品分化 删除地图调整
|
2019-09-30 16:00:52 +08:00 |
|
joylink_cuiweidong
|
e9638517d8
|
产品分化 运行图列表调整
|
2019-09-30 15:18:34 +08:00 |
|
joylink_cuiweidong
|
4fb174f185
|
产品分化 创建运行图调整
|
2019-09-30 14:17:20 +08:00 |
|
fan
|
2be7de7527
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/api/designPlatform.js
|
2019-09-30 13:26:13 +08:00 |
|
fan
|
5d27847379
|
设计平台系统调整
|
2019-09-30 13:24:47 +08:00 |
|
joylink_cuiweidong
|
c7b5188d74
|
产品分化 设计平台调整
|
2019-09-30 10:46:29 +08:00 |
|
zyy
|
25cb199850
|
desc: 调整登陆页面样式
|
2019-09-29 19:20:10 +08:00 |
|
joylink_cuiweidong
|
2e1f6739eb
|
产品分化调整
|
2019-09-29 16:54:11 +08:00 |
|
sunzhenyu
|
2551a4d595
|
Merge branch 'dev' into 3dtest
|
2019-09-29 16:13:21 +08:00 |
|
zyy
|
64a601c967
|
desc: 调整登陆页面样式
|
2019-09-29 16:09:40 +08:00 |
|
joylink_cuiweidong
|
53a9dc5feb
|
Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product
|
2019-09-29 15:57:33 +08:00 |
|
joylink_cuiweidong
|
8d4bf59c34
|
产品分化调整
|
2019-09-29 15:57:19 +08:00 |
|
fan
|
c9570a4631
|
暂时提交
|
2019-09-29 15:55:01 +08:00 |
|
fan
|
dae0ceff57
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-09-29 15:38:38 +08:00 |
|
joylink_cuiweidong
|
0aa02cc85c
|
产品分化 地图右键操作调整
|
2019-09-29 15:25:23 +08:00 |
|
fan
|
7c69943277
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-09-29 14:28:05 +08:00 |
|
fan
|
6c8a8574da
|
暂时提交
|
2019-09-29 14:27:58 +08:00 |
|
joylink_cuiweidong
|
a502d0a118
|
产品分化 设计平台页面调整以及接口调整
|
2019-09-29 14:21:06 +08:00 |
|
fan
|
a88cbe11d6
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-09-29 13:40:15 +08:00 |
|
fan
|
56878d56ec
|
storage存储关联用户
|
2019-09-29 13:40:01 +08:00 |
|
joylink_cuiweidong
|
2a9f7b38df
|
Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/router/index.js
|
2019-09-27 18:20:10 +08:00 |
|
joylink_cuiweidong
|
1e95cae5e5
|
产品分化 设计系统界面调整
|
2019-09-27 18:16:27 +08:00 |
|
fan
|
fd99f913de
|
城市轨道实训平台调整
|
2019-09-27 18:02:32 +08:00 |
|
zyy
|
f74ce907b8
|
desc: 调整获取二维码登陆接口
|
2019-09-27 15:29:25 +08:00 |
|
fan
|
f9bdaaac4f
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/router/index.js
|
2019-09-27 14:48:50 +08:00 |
|
fan
|
1ced811496
|
产品分化调整
|
2019-09-27 14:46:08 +08:00 |
|
zyy
|
f334814012
|
desc: 增加琏计划心跳接口
|
2019-09-27 10:53:48 +08:00 |
|
joylink_cuiweidong
|
58b429f852
|
地图设计右键操作添加
|
2019-09-27 10:16:11 +08:00 |
|
zyy
|
f712c93622
|
desc: 调整权限分发 组织结构配置
|
2019-09-27 10:06:46 +08:00 |
|
zyy
|
5c973ba468
|
desc: 调整英文版登陆窗口， 登陆样式调整
|
2019-09-26 18:40:38 +08:00 |
|
joylink_cuiweidong
|
9d41af74bd
|
产品分化 导入地图按钮名称修改
|
2019-09-26 17:46:27 +08:00 |
|
zyy
|
91a93da574
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-26 17:42:32 +08:00 |
|
zyy
|
01cb0a699b
|
desc: 调整权限字段限制， 配置英文版登陆页面
|
2019-09-26 17:42:25 +08:00 |
|
joylink_cuiweidong
|
5e3e4b77e1
|
产品分化调整
|
2019-09-26 17:41:58 +08:00 |
|
fan
|
b69433d8c4
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-09-26 16:14:15 +08:00 |
|
fan
|
31721a4738
|
产品分化调整
|
2019-09-26 16:14:07 +08:00 |
|
joylink_cuiweidong
|
1c73b2dba9
|
Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product
|
2019-09-26 15:51:34 +08:00 |
|
joylink_cuiweidong
|
3f516ae26b
|
产品分化 地图绘制按钮调整
|
2019-09-26 15:51:22 +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
|
613f1f3b95
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/router/index.js
|
2019-09-26 15:13:47 +08:00 |
|
fan
|
1fb0cf3e94
|
产品分化调整
|
2019-09-26 15:08:53 +08:00 |
|
joylink_cuiweidong
|
6664d33ed2
|
产品分化剧本设计调整
|
2019-09-26 13:21:15 +08:00 |
|
joylink_cuiweidong
|
293cee8d2f
|
剧本管理bug修改
|
2019-09-26 11:07:30 +08:00 |
|
joylink_cuiweidong
|
5964baeea1
|
国际化调整
|
2019-09-26 10:59:38 +08:00 |
|
joylink_cuiweidong
|
0bb8e6ba0b
|
产品分化剧本修改
|
2019-09-26 10:54:07 +08:00 |
|
zyy
|
bf085f5de6
|
Merge branch 'master' into dev
|
2019-09-26 10:06:27 +08:00 |
|
zyy
|
7ae79fd7e4
|
desc: 调整二维码字段
|
2019-09-26 10:03:20 +08:00 |
|
zyy
|
488ec91f23
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-26 09:23:09 +08:00 |
|
zyy
|
0b1ae44c19
|
desc: 调整三号线现地操作
|
2019-09-26 09:23:02 +08:00 |
|
joylink_cuiweidong
|
bde4904b2a
|
产品分化调整
|
2019-09-26 09:07:19 +08:00 |
|
fan
|
0fac6ce22e
|
产品分化调整
|
2019-09-25 18:56:30 +08:00 |
|
joylink_cuiweidong
|
1f27473d44
|
Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product
|
2019-09-25 15:34:40 +08:00 |
|
joylink_cuiweidong
|
edcfd5f738
|
产品分化调整
|
2019-09-25 15:34:29 +08:00 |
|
fan
|
37dd77bc55
|
上下拖拽尺寸调整
|
2019-09-25 15:32:44 +08:00 |
|
sunzhenyu
|
f5c362ff0b
|
Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev
|
2019-09-25 14:55:34 +08:00 |
|
sunzhenyu
|
4faceb5bd0
|
修改样式
|
2019-09-25 14:55:29 +08:00 |
|
fan
|
6e14ba3382
|
设计平台调整
|
2019-09-25 14:52:21 +08:00 |
|
sunzhenyu
|
af17dbece4
|
新数据存读
|
2019-09-25 14:49:25 +08:00 |
|
fan
|
5f7fe163d5
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-09-25 13:05:10 +08:00 |
|
fan
|
e7d7ad76f0
|
实训平台调整
|
2019-09-25 13:05:01 +08:00 |
|
joylink_cuiweidong
|
2c32dbc655
|
产品分化菜单栏调整
|
2019-09-25 11:21:31 +08:00 |
|
zyy
|
b3830f2cc5
|
desc: 新增现地 自动生成课程
|
2019-09-25 10:46:35 +08:00 |
|
fan
|
a73ae082a8
|
elementUI图标替换英文X
|
2019-09-25 09:39:04 +08:00 |
|
fan
|
575ca24299
|
产品分化调整：添加测试路由跳转
|
2019-09-25 09:32:48 +08:00 |
|
fan
|
155229e205
|
产品分化调整：注释测试路由跳转
|
2019-09-25 09:29:00 +08:00 |
|
fan
|
522b94fcfe
|
产品分化调整
|
2019-09-25 09:18:28 +08:00 |
|
fan
|
8daaffc854
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/views/login/index.vue
|
2019-09-24 15:56:49 +08:00 |
|
fan
|
7e72a54f8c
|
控制只在第一次进入时变全屏
|
2019-09-24 15:54:59 +08:00 |
|
zyy
|
8212759438
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-24 15:06:56 +08:00 |
|
zyy
|
a0ee753bfd
|
desc: 调整成都三号线自动生成课程配置，部分内容 (待调)
|
2019-09-24 15:06:45 +08:00 |
|
fan
|
b998eee746
|
产品分化调整
|
2019-09-24 15:03:03 +08:00 |
|
joylink_cuiweidong
|
27d7431b9e
|
国际化调整
|
2019-09-24 14:09:26 +08:00 |
|
joylink_cuiweidong
|
0d1a4982ee
|
解决 支付产品名称没有拿到的问题
|
2019-09-24 13:44:35 +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 |
|
fan
|
17b4d631d4
|
演练室样式微调
|
2019-09-24 13:16:14 +08:00 |
|
fan
|
d4ec49ea16
|
国际化调整
|
2019-09-24 12:58:41 +08:00 |
|