1

app/cloudAjaxRouter.js

@@ -9,14 +9,14 @@ router.get('/cloud/curing/ajax/curingInfo/:mobile', function(req, res, next) {
     cloudAjaxController.getCuringInfo(req, res);
 });
 
-router.get('/cloud/curing/ajax/getCuringByCompilationId/:compilation_id', function(req, res, next) {
+router.get('/cloud/curing/ajax/getCuringByCompilationId/:compilation/:latestCompilation', function(req, res, next) {
     cloudAjaxController.getCuringByCompilationId(req, res);
 });
 router.get('/cloud/curing/ajax/getCuringByCompilationId', function(req, res, next) {
     cloudAjaxController.getCuringByCompilationId(req, res);
 });
 
-//养护分页
+//锟斤拷锟斤拷锟斤拷页
 router.get('/cloud/curing/ajax/getCuringPage/:currentPage', function(req, res, next) {
     cloudAjaxController.getCuringPage(req, res);
 });
@@ -25,24 +25,24 @@ router.get('/cloud/curing/ajax/checkMobile/:mobile', function(req, res, next) {
     cloudAjaxController.checkMobile(req, res);
 });
 
-//根据通行证ID获得养护用户信息
+//����ͨ��֤ID��������û���Ϣ
 router.get('/cloud/curing/ajax/getCuringBySsoid', function(req, res, next) {
     cloudAjaxController.getCuringBySsoid(req, res);
 });
 
-//养护详情页 数据
+//锟斤拷锟斤拷锟斤拷锟斤拷页 锟斤拷锟斤拷
 router.get('/cloud/curing/ajax/getCuringById/:sso_id', function(req, res, next) {
     cloudAjaxController.getCuringById(req, res);
 });
-//养护用写入CLD，并升级养护产品
+//锟斤拷锟斤拷锟斤拷写锟斤拷CLD锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷品
 router.post('/cloud/curing/ajax/upCuringDo', function(req, res, next) {
     cloudAjaxController.upCuringDo(req, res);
 });
-//养护用户关联CLD客户
+//锟斤拷锟斤拷锟矫伙拷锟斤拷锟斤拷CLD锟酵伙拷
 router.post('/cloud/curing/ajax/relevanceClientDo', function(req, res, next) {
     cloudAjaxController.relevanceClientDo(req, res);
 });
-//养护用户移除CLD客户
+//锟斤拷锟斤拷锟矫伙拷锟狡筹拷CLD锟酵伙拷
 router.post('/cloud/curing/ajax/relieveClientDo', function(req, res, next) {
     cloudAjaxController.relieveClientDo(req, res);
 });

app/controller/cloudEditionAjaxController.js

@@ -49,8 +49,9 @@ var cloudEditionAjaxController={
 
 //根据编办ID获得养护升级用户
 getCuringByCompilationId: async function(req, res){
-    var compilation_id=req.params.compilation_id;
-    var curingList= await cloudService.getCuringList(compilation_id);
+//    var compilation=req.params.compilation;
+//    var latestCompilation=req.params.latestCompilation;
+    var curingList= await cloudService.getCuringList(=req.params);
 
     res.json({ 'status': 1,'curingList':curingList.curingList,'pageData':curingList.pageData });
 },
@@ -64,7 +65,7 @@ getCuringPage: async function(req, res){
     //get获得方式
     var params = url.parse(req.url, true).query;
 
-    var curingList= await cloudService.getCuringList(params.compilation_id,currentPage);
+    var curingList= await cloudService.getCuringList(params,currentPage);
 
     res.json({ 'status': 1,'curingList':curingList.curingList,'pageData':curingList.pageData });
 },

app/service/cloudEditionService.js

@@ -19,9 +19,11 @@ var cloudService={
     
 	/**
 	 * 获得养护列表
-	 * compilation_id 编办ID
+	 * paramsCompilation	传参包含
+	 * -compilation			已升级编办	
+	 * -latestCompilation	最近使用编办
 	 */
-    getCuringList: async function(compilation_id,page=1){
+    getCuringList: async function(paramsCompilation,page=1){
        
     	//获得远程养护用户
     	//分页数据
@@ -31,10 +33,14 @@ var cloudService={
             var pg=page-1;
             offset=pg*limit;
         }
-        if(!hash.isExistence(compilation_id)){
-        	compilation_id='';
+        var compilation='';
+    	var latestCompilation='';
+        if(hash.isExistence(paramsCompilation)){
+        	compilation=paramsCompilation.compilation;
+        	latestCompilation=paramsCompilation.latestCompilation;
         }
-    	var url= curingUrl+'/getUserList?page='+page+'&pageSize='+limit+'&latestUsed='+compilation_id;
+    	var url= curingUrl+'/getUserList'+
+    	'?page='+page+'&pageSize='+limit+'&latestUsed='+latestCompilation+'&upGrade='+compilation;
     	/*	接口请求获得的信息
     	 *  userInfo	
     	 *  pageData
@@ -53,7 +59,7 @@ var cloudService={
         }
        
         //获得指定数据
-        var curingList = await models.cloud_curing.getCuringInMobile(mobile,compilation_id);
+        var curingList = await models.cloud_curing.getCuringInMobile(mobile);
        
         //组合同步云版数据
         var falg=false;
@@ -74,7 +80,7 @@ var cloudService={
         		var obj = {
                         mobile: cclValue.mobile,
                         sso_id: cclValue.ssoId,
-                        //compilation_id: cclValue.filter.compilationID,
+                        
                        // curingCompany: cclValue.company,
                         sid: sid,
                         cid: STAFF.cid,
@@ -146,7 +152,7 @@ var cloudService={
             
         });
         
-        var parameter='?compilation_id='+compilation_id;
+        var parameter='?compilation='+compilation+'&latestCompilation='+latestCompilation;
         //分页计算
         var pageData = await getPage('','',page,limit,parameter,curingCloudData.pageData.total);
         

global/js/cloud/curing.js

@@ -405,34 +405,23 @@ $(function() {
         })
     });
 
-
-    //编办下拉选择
+    
+    /**
+     * 编办下拉选择
+     */
     $('select[curingByCompilation]').on('change', function(e){
-        var id=$(this).val();
-
-        $.ajax({
-            cache :false,
-            type: 'GET',
-            url: '/cloud/curing/ajax/getCuringByCompilationId/'+id,
-            //data: { mobile: mobile },
-            dataType: 'json',
-
-            context: $('body'),
-            success: function(data){
-                console.log(data);
-                if(data.status==1||data.status==2){
-                    fnStructureCuringUser(data.curingList);
-                    fnPage(data.pageData);
-                }else if(data.status==3){
-                    //$('div[upCuringBox]').hide();
-                    //$('p[upCuringBox]').show();
-                }
-            },
-            error: function(xhr, type){
-                console.log('Ajax error!')
-            }
-        })
+        var compilation=$(this).val();
+        var latestCompilation=$('select[curingByLatestCompilation]').val();
+        curingByCompilation(compilation,latestCompilation);
     });
-
+    $('select[curingByLatestCompilation]').on('change', function(e){
+        var latestCompilation=$(this).val();
+        var compilation=$('select[curingByCompilation]').val();
+        curingByCompilation(compilation,latestCompilation);
+    });
+    
+    
+    
+    
 
 })

global/js/pagination/page.js

@@ -10,7 +10,7 @@ function fnPage(data){
 
     if( data.currentPage>=data.pageWidth ) {
     	html+='<li class="page-item">'+
-    		'<a parameter="'+data.parameter+'" currentPage="1" class="page-link" href="javascript:void(0)">1</a></li><li class="page-item disabled"><span class="page-link" aria-label="Previous"><span aria-hidden="true">...</span></span></li>';
+    		'<a parameter="'+data.parameter+'" currentPage="1" class="page-link" href="javascript:void(0)">1</a></li><li class="page-item disabled"><span ><span aria-hidden="true">...</span></span></li>';
     }
     
     for (i = data.startPage; i <= data.endPage; i++) {
@@ -26,7 +26,7 @@ function fnPage(data){
     }
 
     if( data.totalPage >data.pageWidth && data.totalPage!= data.currentPage ) {
-    	html+='<li class="page-item disabled"><span class="page-link" aria-label="Previous"><span aria-hidden="true">...</span></span></li>';
+    	html+='<li class="page-item disabled"><span><span aria-hidden="true">...</span></span></li>';
     }
     
     

views/cloud/curing.html

@@ -124,7 +124,7 @@
                                     </select>
                                 </div>
                                 <div class="col-auto pr-0">
-                                    <select curingByCompilation class="custom-select form-control custom-select-sm">
+                                    <select curingByLatestCompilation class="custom-select form-control custom-select-sm">
 										<option value="">最近使用</option>
                                         <% compilationList.forEach(function(compilation) { %>
                                         <option value="<%= compilation._id %>"><%= compilation.name %></option>
@@ -250,21 +250,17 @@
                                             <td><%= curing.clientInfo.companyname %></td>
                                             
                                             <td><%= curing.latest_login %></td>
-                                            <td>
-                                           <%= curing.latest_usedName %>
-                                            </td>
+                                            <td><%= curing.latest_usedName %></td>
                                             <td><%= curing.online_newest %></td>
                                             <td><%= curing.addtime %></td>
-                                            <td>
-                                            <%= curing.upgradeListName %>
-                                            </td>
+                                            <td><%= curing.upgradeListName %></td>
                                         </tr>
                                         <% }); %>
 
                                         </tbody>
                                     </table>
                                     <!--翻页-->
-                                    <div page class=" justify-content-center">
+                                    <div page class="d-flex justify-content-center">
                                     	<div pageDetail >
                                         <ul  class="pagination pagination-sm">
 
@@ -287,8 +283,8 @@
 	  							<li class="page-item">
                                    <a parameter="<%= pageData.parameter %>" currentPage="1" class="page-link" href="javascript:void(0)">1</a>
                                 </li>
-	  							<li class="page-item disabled">
-	                                                <span class="page-link" aria-label="Previous">
+	  							<li class="page-item ">
+	                                                <span >
 	                                                    <span aria-hidden="true">...</span>
 	                                                </span>
 	                             </li>