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 |
|
zyy
|
bba506b46d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-16 17:13:28 +08:00 |
|
zyy
|
cf49d3a50e
|
desc: 修改国际化实训名称详情
|
2019-10-16 17:13:20 +08:00 |
|
joylink_cuiweidong
|
664435bdd7
|
剧本国际化调整
|
2019-10-16 17:05:38 +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
|
0edfc7ad6e
|
扣车指示灯状态调整
|
2019-10-16 15:31:23 +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 |
|
program-walker
|
fdf6f9804c
|
Merge remote-tracking branch 'origin/test' into test
|
2019-10-15 22:20:57 +08:00 |
|
sunzhenyu
|
6fa90f5c79
|
修改行车逻辑
|
2019-10-15 19:03:21 +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 |
|
program-walker
|
8a67661639
|
Merge remote-tracking branch 'origin/test' into test
|
2019-10-15 10:01:54 +08:00 |
|
fan
|
729be7ec69
|
西铁院暂存
|
2019-10-15 09:39:01 +08:00 |
|
sunzhenyu
|
1ddb55091a
|
修改行车逻辑
|
2019-10-14 18:18:11 +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 |
|
sunzhenyu
|
8b71f08de0
|
修改行车逻辑
|
2019-10-12 19:03:21 +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 |
|