caipin %!s(int64=5) %!d(string=hai) anos
pai
achega
7e5501d265

+ 4 - 4
app/controller/cloudEditionAjaxController.js

@@ -34,9 +34,9 @@ var cloudEditionAjaxController={
 		        res.json({ 'status': 2,'msg':'currentPage error' });return ;
 		    }
 		    //get获得方式
-		    //var params = url.parse(req.url, true).query;
+		    var params = url.parse(req.url, true).query;
 
-		    var curingList= await cloudService.getCuringList(req,currentPage);
+		    var curingList= await cloudService.getCuringList(params,currentPage);
 
 		    res.json({ 'status': 1,'curingList':curingList.curingList,'pageData':curingList.pageData });
 		},	
@@ -45,9 +45,9 @@ var cloudEditionAjaxController={
 		 * 用户列表刷新
 		 */
 		refreshCuringPage: async function(req, res){
-			//var params = url.parse(req.url, true).query;
+			var params = url.parse(req.url, true).query;
 			
-		    var curingList= await cloudService.getCuringList(req);
+		    var curingList= await cloudService.getCuringList(params);
 
 		    res.json({ 'status': 1,'curingList':curingList.curingList,'pageData':curingList.pageData });
 		},	

+ 8 - 16
app/service/cloudEditionService.js

@@ -4,7 +4,6 @@
 var models=require('../models');
 var moment = require('moment');
 const hash=require('../class/hash');
-const URL=require("url");
 
 //http://qa.smartcost.com.cn:2060/cld
 //"https://yhuat.smartcost.com.cn/cld";
@@ -24,7 +23,7 @@ var cloudService={
 	 * -compilation			已升级编办	
 	 * -latestCompilation	最近使用编办
 	 */
-    getCuringList: async function(req,page=1){
+    getCuringList: async function(params,page=1){
        
     	//获得远程养护用户
     	//分页数据
@@ -36,20 +35,16 @@ var cloudService={
         }
         var compilation='';
     	var latestCompilation='';
-    	//排序参数
-    	var sortField='';
-        var sort='';
-    	console.log(req.url);
+    	
     	//编办参数-排序参数
-        if(hash.isExistence(req.url)){
-        	var params = URL.parse(req.url, true).query;
-        	
+        if(hash.isExistence(params)){
         	if(hash.isExistence(params.compilation)){
         		compilation=paramsCompilation.compilation;
         	}
         	if(hash.isExistence(params.latestCompilation)){
         		latestCompilation=params.latestCompilation;
         	}
+        	/*
         	if(hash.isExistence(params.sortField)){//保存到cookie中
         		res.cookie('sortField','create_time', {maxAge: 0});
         		if(params.sortField=='latest_login'){
@@ -62,15 +57,12 @@ var cloudService={
         			res.cookie('sort','asc', {maxAge: 0});
         		}
         	}
-        	console.log(req.cookies.sortField);
-        	sortField=req.cookies.sortField;
-        	sort=req.cookies.sort;
+        	*/
         }
         
-        
-       
-        
-       
+        //排序参数
+        //var sortField=curingInterfaceConfig.sort[0];
+        //var sort=curingInterfaceConfig.sort[1];
         
     	var url= curingUrl+'/getUserList'+
     	'?page='+page+'&pageSize='+limit+'&latestUsed='+latestCompilation+'&upGrade='+compilation;