caipin 5 år sedan
förälder
incheckning
6ae8daf071
4 ändrade filer med 20 tillägg och 37 borttagningar
  1. 1 1
      app/service/cloudEditionService.js
  2. 6 17
      global/js/cloud/curing.js
  3. 9 17
      global/js/cloud/curingFN.js
  4. 4 2
      views/cloud/curing.html

+ 1 - 1
app/service/cloudEditionService.js

@@ -91,7 +91,7 @@ var cloudService={
         
     	var url= curingUrl+'/getUserList'+
     	'?page='+page+'&pageSize='+limit+'&latestUsed='+latestCompilation+'&upGrade='+compilation+'&sortField='+sortField+'&sort='+sort;
-    	console.log(url);
+    	
     	/*	接口请求获得的信息
     	 *  userInfo	
     	 *  pageData

+ 6 - 17
global/js/cloud/curing.js

@@ -237,12 +237,12 @@ $(function() {
     $('select[curingByCompilation]').on('change', function(e){
         var compilation=$(this).val();
         var latestCompilation=$('select[curingByLatestCompilation]').val();
-        curingByCompilation(compilation,latestCompilation);
+        refreshCuringPage(compilation,latestCompilation);
     });
     $('select[curingByLatestCompilation]').on('change', function(e){
         var latestCompilation=$(this).val();
         var compilation=$('select[curingByCompilation]').val();
-        curingByCompilation(compilation,latestCompilation);
+        refreshCuringPage(compilation,latestCompilation);
     });
     
     /**
@@ -252,21 +252,10 @@ $(function() {
     	var sortField=$(this).attr('data');
     	var latestCompilation=$('select[curingByLatestCompilation]').val();
     	var compilation=$('select[curingByCompilation]').val();
-    	console.log(sortField);
-    	$.ajax({
-            cache :false,
-            type: 'get',
-            url: '/cloud/curing/ajax/refreshCuringPage?sortField='+sortField+'&compilation='+compilation+'&latestCompilation='+latestCompilation,
-            dataType: 'json',
-            success: function(data) {
-                if (data.status == 1) {
-                	fnStructureCuringUser(data.curingList);
-                    fnPage(data.pageData);
-                } else {
-                    alert(data.msg);
-                }
-            }
-        })
+    	
+    	refreshCuringPage(compilation,latestCompilation,sortField);
+    	
+    	
     });
     
     

+ 9 - 17
global/js/cloud/curingFN.js

@@ -1,31 +1,23 @@
 /**
- * 编办下拉筛选-统一请求
+ * 筛选-统一请求--刷新用户列表
  * @returns
  */
-function curingByCompilation(compilation,latestCompilation){
+function refreshCuringPage(compilation,latestCompilation,sortField,sort){
 	
 	
 	
 	$.ajax({
         cache :false,
-        type: 'GET',
-        url: '/cloud/curing/ajax/refreshCuringPage?compilation='+compilation+'&latestCompilation='+latestCompilation,
-        //data: { mobile: mobile },
+        type: 'get',
+        url: '/cloud/curing/ajax/refreshCuringPage?sortField='+sortField+'&sort='+sort+'&compilation='+compilation+'&latestCompilation='+latestCompilation,
         dataType: 'json',
-
-        context: $('body'),
-        success: function(data){
-            console.log(data);
-            if(data.status==1||data.status==2){
-                fnStructureCuringUser(data.curingList);
+        success: function(data) {
+            if (data.status == 1) {
+            	fnStructureCuringUser(data.curingList);
                 fnPage(data.pageData);
-            }else if(data.status==3){
-                //$('div[upCuringBox]').hide();
-                //$('p[upCuringBox]').show();
+            } else {
+                alert(data.msg);
             }
-        },
-        error: function(xhr, type){
-            console.log('Ajax error!')
         }
     })
 }

+ 4 - 2
views/cloud/curing.html

@@ -206,13 +206,15 @@
                                               <ul class="list-unstyled px-3 pt-2 mb-0 border-top">
                                                 <li class="mb-2">
                                                   <div class="custom-control custom-radio">
-                                                    <input type="radio" class="custom-control-input" id="pdown" data="desc" name="sort" checked="">
+                                                    <input type="radio" <% if( sortList[1] == -1) {  %>  checked  <% }; %>
+                                                     class="custom-control-input" id="pdown" data="-1" name="sort" >
                                                     <label class="custom-control-label" for="pdown">降序</label>
                                                   </div>
                                                 </li>
                                                 <li class="mb-2">
                                                   <div class="custom-control custom-radio">
-                                                    <input type="radio" class="custom-control-input" id="pup" data="asc" name="sort">
+                                                    <input type="radio" <% if( sortList[1] == 1) {  %>  checked  <% }; %>
+                                                     class="custom-control-input" id="pup" data="1" name="sort">
                                                     <label class="custom-control-label" for="pup">升序</label>
                                                   </div>
                                                 </li>