继续解决冲突

src/js/request.js

@@ -547,6 +547,24 @@ const messageGet = (token) => {
 }
 
 /**
+ * 得到tag列表
+ * @param token
+ */
+const  getTagsProjectList
+= (token) =>{
+    return axios({
+        url:api+ "/tags/project/list",
+        method: "get",
+        headers:{
+            'Authorization':'Bearer '+token,
+            'Timestamp': getCurrentTimestamp()
+        }
+    })
+}
+
+/**
+ * 得到tag列表
+ * @param token
  * 获取项目的所有子系统
  */
 const projectWorkGet = (data,token) => {
@@ -562,20 +580,20 @@ const projectWorkGet = (data,token) => {
     })
 }
 
-/**
+// /**
- * 得到tag列表
+//  * 得到tag列表
- * @param token
+//  * @param token
- */
+//  */
-const  getTagsProjectList = (token) =>{
+// const getTagsProjectList = (token) =>{
-    return axios({
+//     return axios({
-        url:api+ "/tags/project/list",
+//         url:api+ "/tags/project/list",
-        method: "get",
+//         method: "get",
-        headers:{
+//         headers:{
-            'Authorization':'Bearer '+token,
+//             'Authorization':'Bearer '+token,
-            'Timestamp': getCurrentTimestamp()
+//             'Timestamp': getCurrentTimestamp()
-        }
+//         }
-    })
+//     })
-}
+// }
 
 
 export default {
@@ -614,6 +632,8 @@ export default {
 
     projectGet,
     projectGetCustom,
+
+    getTagsProjectList,
     projectWorkGet,