Commit Graph

13 Commits

Author SHA1 Message Date
joylink_cuiweidong
db971bf591 产品分化运行图修改 2019-10-08 14:12:53 +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
b96701aceb desc: 调整运行图加载 2019-09-04 11:28:24 +08:00
ival
61de3c222d App.vue页面增加全局尺寸混入并存放在app store,其他页面删除混入 2019-09-02 15:37:57 +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
ival
276f68e7bc 修改优化代码 2019-07-30 16:47:11 +08:00
ival
05c90f1079 修改代码 2019-07-29 16:03:14 +08:00
ival
9f5130a4f2 代码移植 2019-07-26 13:32:43 +08:00