Commit Graph

34 Commits

Author SHA1 Message Date
zyy
4f716b502c desc: 恢复权限创建按钮 2019-09-19 09:34:18 +08:00
ival
8b4aee040a 注释掉订单入口 2019-09-18 18:45:18 +08:00
zyy
1d26a9f1fb desc: 新增创建权限流程 2019-09-18 18:39:55 +08:00
zyy
815c2e6db4 desc: 调整信号机显示位置 2019-09-16 17:58:01 +08:00
zyy
c5c71253df desc: 调整信号机字段显示,调整创建权限逻辑 2019-09-16 17:31:12 +08:00
zyy
ab9a02e232 desc: 调整琏计划运行图样式 2019-09-16 15:59:53 +08:00
fan
2dffe78baf 国际化调整 2019-09-12 13:22:30 +08:00
fan
0c11453197 权限打包搜索条件调整 2019-09-11 15:26:40 +08:00
fan
d1c146f9da 权限回收调整 2019-09-11 14:28:22 +08:00
fan
fa4ccafc58 权限分发调整 2019-09-11 10:42:15 +08:00
fan
5c2e2cebe8 权限分发调整 2019-09-11 10:35:34 +08:00
joylink_cuiweidong
1ced2a4911 国际化调整 2019-09-11 09:34:12 +08:00
zyy
abec58b726 desc: 修改弹窗点击蒙层不取消 2019-09-03 18:59:46 +08:00
zyy
870a4de01b desc: 修改socekt断连逻辑, 调整权限显示及细节,样式问题 2019-09-03 10:45:58 +08:00
zyy
fa91bc22d9 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/views/orderauthor/author/draft/ruleForm.vue
2019-09-02 17:06:32 +08:00
zyy
d38b3761b8 desc: 对接权限编辑接口,修改显示字段内容 2019-09-02 17:05:53 +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
zyy
6fa64dd26b desc: 修改显示字段,增加loading 2019-09-02 11:04:23 +08:00
zyy
0398179e0d desc: 用户权限流程修改,接口对接 2019-08-30 17:00:18 +08:00
ival
8c4efb83db 修改国际化导致的界面布局问题 2019-08-20 09:12:54 +08:00
ival
67cf6f5a29 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/i18n/langs/en/orderAuthor.js
#	src/i18n/langs/en/rules.js
#	src/i18n/langs/zh/orderAuthor.js
#	src/i18n/langs/zh/rules.js
#	src/views/orderauthor/commodity/index.vue
#	src/views/orderauthor/order/draft.vue
2019-08-19 18:49:40 +08:00
ival
68e7eaeeb6 修改字典菜单的国际化 2019-08-19 18:42:53 +08:00
fan
c91a4efdcc 修改:国际化调整 2019-08-19 16:35:27 +08:00
fan
d0f7bd46a9 修改:国际化调整 2019-08-19 15:46:52 +08:00
fan
2ab09d664f Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-13 18:12:14 +08:00
fan
a3ecc1dfc6 调整:国际化 2019-08-13 18:11:58 +08:00
ival
db109f2a9e 调整地图进路相关的接口 2019-08-13 16:59:38 +08:00
fan
13d7e5df8b 调整:国际化 2019-08-12 18:54:32 +08:00
zyy
c3f600b015 优化代码 2019-08-08 15:57:36 +08:00
zyy
a010f71252 调整运行图加载, eventbus代码调整 2019-08-02 10:58:28 +08:00
zyy
04e13a7a73 调整代码 2019-08-02 10:36:17 +08:00
ival
9f5130a4f2 代码移植 2019-07-26 13:32:43 +08:00