caipin 5 years ago
parent
commit
17924416fe
2 changed files with 44 additions and 16 deletions
  1. 9 6
      app/controller/cloudEditionAjaxController.js
  2. 35 10
      app/service/cloudEditionService.js

+ 9 - 6
app/controller/cloudEditionAjaxController.js

@@ -36,7 +36,7 @@ var cloudEditionAjaxController={
 		    //get获得方式
 		    var params = url.parse(req.url, true).query;
 
-		    var curingList= await cloudService.getCuringList(params,currentPage);
+		    var curingList= await cloudService.getCuringList(req, res);
 
 		    res.json({ 'status': 1,'curingList':curingList.curingList,'pageData':curingList.pageData });
 		},	
@@ -47,24 +47,27 @@ var cloudEditionAjaxController={
 		refreshCuringPage: async function(req, res){
 			var params = url.parse(req.url, true).query;
 			
+			var mAge=1000*60*60*24*28;
 			if(hash.isExistence(params.sortField)){//保存到cookie中
-				req.cookie('sortField','create_time', {maxAge: 0});
+				res.cookie('sortField','create_time', {maxAge: mAge});
         		if(params.sortField=='latest_login'){
-        			req.cookie('sortField','latest_login', {maxAge: 0});
+        			res.cookie('sortField','latest_login', {maxAge: mAge});
         		}
         	}
         	if(hash.isExistence(params.sortField)){//保存到cookie中
-        		req.cookie('sort','desc', {maxAge: 0});
+        		res.cookie('sort','desc', {maxAge: mAge});
         		if(params.sortField=='asc'){
-        			req.cookie('sort','asc', {maxAge: 0});
+        			res.cookie('sort','asc', {maxAge: mAge});
         		}
         	}
 			
+        	
         	if(hash.isExistence(req.cookies.sortField)){
         		console.log(req.cookies.sortField);
         	}
         	
-		    var curingList= await cloudService.getCuringList(params);
+        	
+		    var curingList= await cloudService.getCuringList(req, res);
 
 		    res.json({ 'status': 1,'curingList':curingList.curingList,'pageData':curingList.pageData });
 		},	

+ 35 - 10
app/service/cloudEditionService.js

@@ -4,6 +4,7 @@
 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";
@@ -23,32 +24,56 @@ var cloudService={
 	 * -compilation			已升级编办	
 	 * -latestCompilation	最近使用编办
 	 */
-    getCuringList: async function(params,page=1){
+    getCuringList: async function(req, res){
        
     	//获得远程养护用户
     	//分页数据
-    	var limit=12;
-        var offset=0;
-        if(page!=1){
-            var pg=page-1;
-            offset=pg*limit;
-        }
+    	var page=1;
+    	
+    	
+    	
+    	
         var compilation='';
     	var latestCompilation='';
+    	var sortField='create_time';
+        var sort='desc';
     	
     	//编办参数-排序参数
-        if(hash.isExistence(params)){
+        if(hash.isExistence(req.url)){
+        	var params = url.parse(req.url, true).query;
+        	
         	if(hash.isExistence(params.compilation)){
         		compilation=params.compilation;
         	}
         	if(hash.isExistence(params.latestCompilation)){
         		latestCompilation=params.latestCompilation;
         	}
-        	/*
+        	if(hash.isExistence(params.sortField)){
+        		sortField=params.sortField;
+        	}
+        	if(hash.isExistence(params.sort)){
+        		sort=params.sort;
+        	}
+        	
+        	var page=params.currentPage;
+    	    if(!hash.isNotANumber(page)){
+    	        res.json({ 'status': 2,'msg':'currentPage error' });return ;
+    	    }
         	
-        	*/
         }
         
+        //分页参数
+        var limit=12;
+        var offset=0;
+        if(page!=1){
+            var pg=page-1;
+            offset=pg*limit;
+        }
+        
+        
+        console.log(sortField);
+        console.log(sort);
+        
         //排序参数
         //var sortField=curingInterfaceConfig.sort[0];
         //var sort=curingInterfaceConfig.sort[1];