Merge remote-tracking branch 'origin/yuekuo' into zhoulingpo

# Conflicts:
#	src/router/modules/userCenter.js
#	src/views/Report/ReportList.vue
#	src/views/Report/ReportManager.vue
#	src/views/userCenter/processCenter.vue

src/api/modules/report.js

@@ -18,10 +18,10 @@ export default {
       params: data
     })
   },
-  // 标签管理
+  // 标签增加
   labelAdd (data) {
     return request({
-      url: '/api/label/add',
+      url: 'api/tree-label/add',
       method: 'POST',
       data
     })
@@ -29,7 +29,7 @@ export default {
   // 标签列表
   labelList (data) {
     return request({
-      url: '/api/label/list',
+      url: 'api/tree-label/list',
       method: 'GET',
       params: data
     })
@@ -37,11 +37,16 @@ export default {
   // 标签删除|单个
   labelDeleteId (data) {
     return request({
-      url: `/api/label/delete/${data.id}`,
+      url: `api/tree-label/${data.id}`,
       method: 'POST'
     })
   },
-
+labelUpdate(){
+  return request({
+    url: 'api/tree-label/update',
+    method: 'POST'
+  })
+},
   // 新增或编辑报告
   reportAdd (data) {
     return request({
@@ -129,4 +134,5 @@ export default {
       params: data
     })
   }
+  //
 }