joylink_cuiweidong
|
589306de80
|
产品分化菜单栏调整
|
2019-09-24 13:47:52 +08:00 |
|
joylink_cuiweidong
|
823eb02b90
|
产品分化菜单栏调整
|
2019-09-24 10:51:41 +08:00 |
|
fan
|
e2ee048f56
|
产品分化调整
|
2019-09-23 18:06:29 +08:00 |
|
fan
|
622ba7b5f2
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-09-23 17:53:16 +08:00 |
|
joylink_cuiweidong
|
fd8a1817c5
|
菜单栏调整
|
2019-09-23 17:52:44 +08:00 |
|
fan
|
9c3071dc4b
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-09-23 17:51:34 +08:00 |
|
joylink_cuiweidong
|
7514a7657f
|
菜单栏调整
|
2019-09-23 17:50:07 +08:00 |
|
fan
|
b7043ff7de
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-09-23 17:49:16 +08:00 |
|
fan
|
d063625c45
|
产品分化调整
|
2019-09-23 17:49:04 +08:00 |
|
joylink_cuiweidong
|
5ba93805c1
|
菜单栏调整
|
2019-09-23 17:47:54 +08:00 |
|
fan
|
dc5edddde0
|
国际化调整
|
2019-09-19 18:53:28 +08:00 |
|
fan
|
a182d7d0b2
|
国际化调整
|
2019-09-19 18:51:57 +08:00 |
|
zyy
|
bdfd65eadb
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-19 17:34:12 +08:00 |
|
zyy
|
9371d956af
|
desc: 调整冲突, 增加导入运行图国际化
|
2019-09-19 17:34:04 +08:00 |
|
joylink_cuiweidong
|
d798439a26
|
链计划 国际化调整
|
2019-09-19 17:32:33 +08:00 |
|
joylink_cuiweidong
|
4f4912fcbc
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-19 17:31:02 +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 |
|
joylink_cuiweidong
|
33caa49dcf
|
国际化提交
|
2019-09-19 17:15:30 +08:00 |
|
joylink_cuiweidong
|
98054a93ff
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-19 17:11:11 +08:00 |
|
joylink_cuiweidong
|
706a9502d8
|
国际化调整
|
2019-09-19 17:11:00 +08:00 |
|
fan
|
9b40afa4ea
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-19 16:12:22 +08:00 |
|
fan
|
676fc71ee5
|
国际化调整
|
2019-09-19 16:12:05 +08:00 |
|
joylink_cuiweidong
|
94eeeb0916
|
国际化调整
|
2019-09-19 14:58:41 +08:00 |
|
fan
|
607abd877f
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-19 14:15:22 +08:00 |
|
fan
|
cf8f562a48
|
国际化调整
|
2019-09-19 14:14:49 +08:00 |
|
joylink_cuiweidong
|
0e7fdb354c
|
国际化调整
|
2019-09-19 13:19:35 +08:00 |
|
zyy
|
72aa282942
|
Merge branch 'dev' into test
|
2019-09-19 10:08:10 +08:00 |
|
zyy
|
4f716b502c
|
desc: 恢复权限创建按钮
|
2019-09-19 09:34:18 +08:00 |
|
ival
|
9201402911
|
Merge branch 'test' of https://git.qcloud.com/joylink/jl-nclient into test
|
2019-09-18 18:48:57 +08:00 |
|
ival
|
c432a9f536
|
Merge branch 'dev' into test
|
2019-09-18 18:48:15 +08:00 |
|
ival
|
8b4aee040a
|
注释掉订单入口
|
2019-09-18 18:45:18 +08:00 |
|
ival
|
e224ed8bea
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-18 18:44:04 +08:00 |
|
ival
|
aa727c0f09
|
修改信号解封不能操作菜单的问题
|
2019-09-18 18:43:50 +08:00 |
|
zyy
|
591110ddec
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/zh/orderAuthor.js
# src/i18n/langs/zh/permission.js
# src/views/orderauthor/permission/create/order.vue
|
2019-09-18 18:41:46 +08:00 |
|
zyy
|
1d26a9f1fb
|
desc: 新增创建权限流程
|
2019-09-18 18:39:55 +08:00 |
|
joylink_cuiweidong
|
6b3fe88797
|
仿真国际化修改
|
2019-09-18 18:36:47 +08:00 |
|
joylink_cuiweidong
|
5f4412dd40
|
国际化调整
|
2019-09-18 17:28:24 +08:00 |
|
joylink_cuiweidong
|
9ace0842a5
|
发布内容管理 国际化
|
2019-09-18 16:04:34 +08:00 |
|
joylink_cuiweidong
|
ae68018734
|
发布内容管理 国际化
|
2019-09-18 13:36:57 +08:00 |
|
sunzhenyu
|
18418cadde
|
Merge branch 'dev' into test
|
2019-09-18 13:23:05 +08:00 |
|
sunzhenyu
|
23f5889b6d
|
s
|
2019-09-18 13:22:59 +08:00 |
|
sunzhenyu
|
7772a13c61
|
pull
|
2019-09-18 13:22:26 +08:00 |
|
sunzhenyu
|
0ae296a87f
|
pull前准备
|
2019-09-18 13:21:36 +08:00 |
|
sunzhenyu
|
d5380f8bf2
|
pull
|
2019-09-18 13:20:38 +08:00 |
|
sunzhenyu
|
dfef5a28e9
|
修改三维界面声音返回和退出播放bug，更换音轨
|
2019-09-18 13:20:08 +08:00 |
|
joylink_cuiweidong
|
9bc06e4f59
|
地图绘制国际化调整
|
2019-09-18 11:11:23 +08:00 |
|
ival
|
e699d0176e
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-18 10:04:26 +08:00 |
|
ival
|
f13685da07
|
修改代码
|
2019-09-18 10:03:58 +08:00 |
|
joylink_cuiweidong
|
3059b7006d
|
国际化调整
|
2019-09-17 18:39:32 +08:00 |
|