fan
|
11190ef66f
|
代码整合调整
|
2019-10-17 10:13:08 +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
|
db971bf591
|
产品分化运行图修改
|
2019-10-08 14:12:53 +08:00 |
|
fan
|
ca413e3331
|
设计平台运行图调整
|
2019-09-30 18:11:31 +08:00 |
|
zyy
|
01c97f45ae
|
desc: 调整琏计划导入excel, 样式， 流程
|
2019-09-23 13:37:11 +08:00 |
|
zyy
|
b5b9f4c1ff
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/rules.js
# src/i18n/langs/en/tip.js
# src/i18n/langs/zh/rules.js
# src/i18n/langs/zh/tip.js
# src/views/planMonitor/editTool/menuBar.vue
# src/views/planMonitor/editTool/menus/createEmptyPlan.vue
# src/views/planMonitor/editTool/menus/editPlanName.vue
# src/views/planMonitor/editTool/menus/modifyingTask.vue
# src/views/planMonitor/editTool/menus/openRunPlan.vue
|
2019-09-19 17:28:31 +08:00 |
|
zyy
|
48ea44a980
|
desc: 调整权限国际化，调整琏计划导入运行图逻辑
|
2019-09-19 17:22:48 +08:00 |
|
fan
|
cf8f562a48
|
国际化调整
|
2019-09-19 14:14:49 +08:00 |
|
zyy
|
118ed1296c
|
desc: 增加琏计划运行图修改
|
2019-09-04 16:32:41 +08:00 |
|
zyy
|
a037937627
|
desc: 调整运行图生成逻辑
|
2019-09-04 14:47:52 +08:00 |
|
zyy
|
b96701aceb
|
desc: 调整运行图加载
|
2019-09-04 11:28:24 +08:00 |
|
sunzhenyu
|
d7efef41e4
|
pull
|
2019-08-29 17:16:33 +08:00 |
|
zyy
|
9049d793cc
|
desc: 修改琏计划界面样式，修改界面交互
|
2019-08-13 15:54:26 +08:00 |
|
ival
|
763cff0a7c
|
修改页面不刷新的问题
|
2019-08-09 18:29:08 +08:00 |
|
ival
|
dbc3cbf482
|
修改运行图编辑工具报错bug
|
2019-08-08 13:36:53 +08:00 |
|
zyy
|
a010f71252
|
调整运行图加载， eventbus代码调整
|
2019-08-02 10:58:28 +08:00 |
|
zyy
|
04e13a7a73
|
调整代码
|
2019-08-02 10:36:17 +08:00 |
|
ival
|
ce82f25422
|
修改代码
|
2019-07-30 09:48:14 +08:00 |
|
ival
|
9f5130a4f2
|
代码移植
|
2019-07-26 13:32:43 +08:00 |
|