Merge branch 'devChenXinLei' of http://124.70.43.205:3000/lining/jn_manager

src/api/station.js

@@ -21,7 +21,7 @@ const deleteCompanys =(data)=>{
 }
 const lines=(data)=>{
   return request({
-      url:`/line/listByPage?id=${data.id}&name=${data.name}&pagenum=${data.pageNum}&pagesize=${data.pageSize}`,
+      url:`/line/listByPage?id=${data.id}&name=${encodeURIComponent(data.name)}&pagenum=${data.pageNum}&pagesize=${data.pageSize}`,
       method:"get"
   })
 }
@@ -100,7 +100,7 @@ const deleteLine =(data)=>{
 
 const windturbine =(data)=>{
   return request({
-      url:`/windturbine/companys?name=${data.name}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
+      url:`/windturbine/companys?pageNum=${data.pageNum}&pageSize=${data.pageSize}&name=${encodeURIComponent(data.name)}`,
       method:"get"
   })
 }
@@ -117,6 +117,12 @@ const deleteWindturbine =(data)=>{
       method:"delete",
   })
 }
+const newtreeTreels=(data)=>{
+  return request({ 
+      url:`/newtree/treels?tag=${data.tag}`,
+      method:"get"
+  })
+}
 export default {
   companys,
   addCompanys,
@@ -136,4 +142,5 @@ export default {
   windturbine,
   addWindturbine,
   deleteWindturbine,
+  newtreeTreels
 };

src/api/table.js

@@ -45,6 +45,12 @@ const removeIndicators =(data)=>{
       method:"delete",
   })
 }
+const newtreeTreels=(data)=>{
+  return request({ 
+      url:`/newtree/treels?tag=${data.tag}`,
+      method:"get"
+  })
+}
 export default {
   projectplan,
   addProjectplan,
@@ -53,4 +59,5 @@ export default {
   indicators,
   addIndicators,
   removeIndicators,
+  newtreeTreels
 };