分页参数修改

src/views/xm/core/components/XmIterationSelect.vue

@@ -182,7 +182,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -238,7 +238,7 @@
 				this.getXmIterations();
 			}, 
 			searchXmIterations(){
-				 this.pageInfo.count=true;
+				 this.pageInfo.countSql=true;
 				 this.getXmIterations(); 
 			},
 			//获取列表 XmIteration 迭代定义
@@ -247,7 +247,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				}; 
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -278,7 +278,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmIterations = res.data.data;
 						if(this.productId){
 							 map.set(this.productId,this.xmIterations)

src/views/xm/core/components/XmProductSelect.vue

@@ -252,7 +252,7 @@ export default {
         //分页数据
         total: 0, //服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
         pageSize: 10, //每页数据
-        count: false, //是否需要重新计算总记录数
+        countSql: false, //是否需要重新计算总记录数
         pageNum: 1, //当前页码、从1开始计算
         orderFields: [], //排序列 如 ['sex','student_id']，必须为数据库字段
         orderDirs: [], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -313,7 +313,7 @@ export default {
       this.getXmProducts();
     },
     searchXmProducts() {
-      this.pageInfo.count = true;
+      this.pageInfo.countSql = true;
       this.getXmProducts();
     },
     //获取列表 XmProduct 产品表
@@ -322,7 +322,7 @@ export default {
         pageSize: this.pageInfo.pageSize,
         pageNum: this.pageInfo.pageNum,
         total: this.pageInfo.total,
-        count: this.pageInfo.count,
+        countSql: this.pageInfo.countSql,
       };
       if (
         this.pageInfo.orderFields != null &&
@@ -358,7 +358,7 @@ export default {
           var tips = res.data.tips;
           if (tips.isOk) {
             this.pageInfo.total = res.data.total;
-            this.pageInfo.count = false;
+            this.pageInfo.countSql = false;
             this.xmProducts = res.data.data;
             if (this.iterationId) {
               map.set(this.iterationId, this.xmProducts);

src/views/xm/core/components/XmProjectSelect.vue

@@ -252,7 +252,7 @@ export default {
         //分页数据
         total: 0, //服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
         pageSize: 10, //每页数据
-        count: false, //是否需要重新计算总记录数
+        countSql: false, //是否需要重新计算总记录数
         pageNum: 1, //当前页码、从1开始计算
         orderFields: [], //排序列 如 ['sex','student_id']，必须为数据库字段
         orderDirs: [], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -310,7 +310,7 @@ export default {
       this.getXmProjects();
     },
     searchXmProjects() {
-      this.pageInfo.count = true;
+      this.pageInfo.countSql = true;
       this.getXmProjects();
     },
     //获取列表 XmProject 项目表
@@ -319,7 +319,7 @@ export default {
         pageSize: this.pageInfo.pageSize,
         pageNum: this.pageInfo.pageNum,
         total: this.pageInfo.total,
-        count: this.pageInfo.count,
+        countSql: this.pageInfo.countSql,
       };
       if (
         this.pageInfo.orderFields != null &&
@@ -355,7 +355,7 @@ export default {
           var tips = res.data.tips;
           if (tips.isOk) {
             this.pageInfo.total = res.data.total;
-            this.pageInfo.count = false;
+            this.pageInfo.countSql = false;
             this.xmProjects = res.data.data;
             if (this.linkIterationId) {
               map.set(this.linkIterationId, this.xmProjects);

src/views/xm/core/crowd/XmTaskCrowdMng.vue

@@ -691,7 +691,7 @@ export default {
         //分页数据
         total: 0, //服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
         pageSize: this.queryScope==='plan' || this.queryScope==='planTask'?50:20, //每页数据
-        count: false, //是否需要重新计算总记录数
+        countSql: false, //是否需要重新计算总记录数
         pageNum: 1, //当前页码、从1开始计算
         orderFields: ["create_time"], //排序列 如 ['sex','student_id']，必须为数据库字段
         orderDirs: ["desc"], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -853,7 +853,7 @@ export default {
       this.getXmTasks();
     },
     searchXmTasks() {
-      this.pageInfo.count = true;
+      this.pageInfo.countSql = true;
       this.getXmTasks();
     },
     //获取列表 XmTask xm_task
@@ -862,7 +862,7 @@ export default {
         pageSize: this.pageInfo.pageSize,
         pageNum: this.pageInfo.pageNum,
         total: this.pageInfo.total,
-        count: this.pageInfo.count,
+        countSql: this.pageInfo.countSql,
       };
       if (
         this.pageInfo.orderFields != null &&
@@ -884,7 +884,7 @@ export default {
           var tips = res.data.tips;
           if (tips.isOk) {
             this.pageInfo.total = res.data.total;
-            this.pageInfo.count = false;
+            this.pageInfo.countSql = false;
             var xmTasks = res.data.data;
             this.xmTasks = xmTasks;
             if (this.editForm != null) {

src/views/xm/core/wiki/archive/WikiList.vue

@@ -229,7 +229,7 @@
 			...util,
 			handleSizeChange(pageSize) { 
 				this.pageInfo.pageSize=pageSize;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				
 				this.getArchives();
 			},
@@ -253,7 +253,7 @@
 			},
 			searchArchives(){
 				 
-				 this.pageInfo.count=true;
+				 this.pageInfo.countSql=true;
 				 this.getArchives();
 			},
 			//获取列表 Archive 档案信息表
@@ -261,7 +261,7 @@
 				let params = {
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
-					total: this.pageInfo.total,count:this.pageInfo.count,
+					total: this.pageInfo.total,countSql:this.pageInfo.countSql,
 				};  
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -307,7 +307,7 @@
 					this.load.list=false;
 					var tips=res.data.tips;
 					if(tips.isOk){ 
-						this.pageInfo.total = res.data.data.total;this.pageInfo.count=false;
+						this.pageInfo.total = res.data.data.total;this.pageInfo.countSql=false;
 						this.archives = res.data.data; 
 					}else{
 						this.$message({ message: tips.msg, type: 'error' });
@@ -346,7 +346,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.categoryTree.refreshTree=!this.categoryTree.refreshTree
 				this.getArchives();
 			},
@@ -373,7 +373,7 @@
 						this.load.del = false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getArchives();
 							this.categoryTree.refreshTree=!this.categoryTree.refreshTree
 						}
@@ -395,7 +395,7 @@
 						this.load.del = false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getArchives(); 
 							this.categoryTree.refreshTree=!this.categoryTree.refreshTree
 						}

src/views/xm/core/xmAttachment/XmAttachmentMng.vue

@@ -64,7 +64,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -113,7 +113,7 @@
 				this.getXmAttachments();
 			},
 			searchXmAttachments(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmAttachments();
 			},
 			//获取列表 XmAttachment xm_attachment
@@ -122,7 +122,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -141,7 +141,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmAttachments = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -162,7 +162,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmAttachments();
 			},
 			afterEditSubmit(){
@@ -183,7 +183,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmAttachments();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
@@ -201,7 +201,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmAttachments(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmBranchState/XmBranchStateMng.vue

@@ -130,7 +130,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -180,7 +180,7 @@
 				this.getXmBranchStates();
 			},
 			searchXmBranchStates(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmBranchStates();
 			},
 			//获取列表 XmBranchState 机构内所有项目指标汇总
@@ -189,7 +189,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -207,7 +207,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmBranchStates = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -228,7 +228,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmBranchStates();
 			},
 			afterEditSubmit(){
@@ -249,7 +249,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmBranchStates();
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error' });
@@ -272,7 +272,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmBranchStates(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmBranchStateHis/XmBranchStateHisMng.vue

@@ -130,7 +130,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -180,7 +180,7 @@
 				this.getXmBranchStateHiss();
 			},
 			searchXmBranchStateHiss(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmBranchStateHiss();
 			},
 			//获取列表 XmBranchStateHis 机构内所有项目指标汇总
@@ -189,7 +189,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -207,7 +207,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmBranchStateHiss = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -228,7 +228,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmBranchStateHiss();
 			},
 			afterEditSubmit(){
@@ -249,7 +249,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmBranchStateHiss();
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error' });
@@ -272,7 +272,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmBranchStateHiss(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue

@@ -77,7 +77,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -128,7 +128,7 @@
 				this.getXmBranchTaskTypeStates();
 			},
 			searchXmBranchTaskTypeStates(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmBranchTaskTypeStates();
 			},
 			//获取列表 XmBranchTaskTypeState 按机构编号任务类型汇总
@@ -137,7 +137,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -156,7 +156,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmBranchTaskTypeStates = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -177,7 +177,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmBranchTaskTypeStates();
 			},
 			afterEditSubmit(){
@@ -198,7 +198,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmBranchTaskTypeStates();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
@@ -216,7 +216,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmBranchTaskTypeStates(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmBudgetLabor/XmBudgetLaborMng.vue

@@ -127,7 +127,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -180,7 +180,7 @@
 				this.getXmBudgetLabors();
 			},
 			searchXmBudgetLabors(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmBudgetLabors();
 			},
 			//获取列表 XmBudgetLabor 项目人力成本预算
@@ -189,7 +189,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -207,7 +207,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmBudgetLabors = res.data.data;
 					}else{
 						this.$notify({ position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -228,7 +228,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmBudgetLabors();
 			},
 			afterEditSubmit(){

src/views/xm/core/xmBudgetNlabor/XmBudgetNlaborMng.vue

@@ -122,7 +122,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -175,7 +175,7 @@
 				this.getXmBudgetNlabors();
 			},
 			searchXmBudgetNlabors(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmBudgetNlabors();
 			},
 			//获取列表 XmBudgetNlabor 项目人力成本预算
@@ -184,7 +184,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -215,7 +215,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmBudgetNlabors = res.data.data;
 					}else{
 						this.$notify({ position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -236,7 +236,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmBudgetNlabors();
 			},
 			afterEditSubmit(){

src/views/xm/core/xmContract/XmContractMng.vue

@@ -87,7 +87,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -112,7 +112,7 @@
 				
 				//编辑contractCard界面初始化数据
 				detailForm: {
-					htId:'',draftId:'',cpId:'',cpName:'',linkName:'',linkPhone:'',cpAddress:'',cpOpenBank:'',cpBankAccount:'',htName:'',htSn:'',htGrossAmount:'',htKaiPiaoAmount:'',htReceivedAmount:'',htReceivableAmount:'',htPayedAmount:'',htPayableAmount:'',htFile:'',htEffectDate:'',htFzUserid:'',htFzUsername:'',htParentType:'',htType:'',htSignDate:'',htExpireDate:'',htStatus:'',htDemand:'',htParty:'',htPartyName:'',htImportantClause:'',branchId:'',createTime:'',createUserId:'',createUserName:''
+					htId:'',draftId:'',cpId:'',cpName:'',linkName:'',linkPhone:'',cpAddress:'',cpOpenBank:'',cpBankAccountSql:'',htName:'',htSn:'',htGrossAmount:'',htKaiPiaoAmount:'',htReceivedAmount:'',htReceivableAmount:'',htPayedAmount:'',htPayableAmount:'',htFile:'',htEffectDate:'',htFzUserid:'',htFzUsername:'',htParentType:'',htType:'',htSignDate:'',htExpireDate:'',htStatus:'',htDemand:'',htParty:'',htPartyName:'',htImportantClause:'',branchId:'',createTime:'',createUserId:'',createUserName:''
 				},
 				/**begin 自定义属性请在下面加 请加备注**/
 				tableHeight:300,
@@ -143,7 +143,7 @@
 				this.getXmContracts();
 			},
 			searchXmContracts(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmContracts();
 			},
 			//获取列表 XmContract xm_project_contract
@@ -152,7 +152,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -192,7 +192,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmContracts = res.data.data;
 						console.log(res.data.data);
 					}else{
@@ -219,7 +219,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmContracts();
 			},
 			afterEditSubmit(){
@@ -240,7 +240,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmContracts();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
@@ -258,7 +258,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmContracts(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmCostNlabor/XmCostNlaborMng.vue

@@ -125,7 +125,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -178,7 +178,7 @@
 				this.getXmCostNlabors();
 			},
 			searchXmCostNlabors(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmCostNlabors();
 			},
 			//获取列表 XmCostNlabor 项目实际人工成本费用
@@ -187,7 +187,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -205,7 +205,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmCostNlabors = res.data.data;
 					}else{
 						this.$notify({ position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -226,7 +226,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmCostNlabors();
 			},
 			afterEditSubmit(){

src/views/xm/core/xmEnvList/XmEnvListMng.vue

@@ -73,7 +73,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:['end_time'],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:['desc']//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -137,7 +137,7 @@
 				this.getXmEnvLists();
 			},
 			searchXmEnvLists(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmEnvLists();
 			},
 			//获取列表 XmEnvList xm_env_list
@@ -146,7 +146,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -172,7 +172,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmEnvLists = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -193,7 +193,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmEnvLists();
 			},
 			afterEditSubmit(){
@@ -215,7 +215,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmEnvLists();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
@@ -233,7 +233,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmEnvLists(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmFile/XmFileMng.vue

@@ -70,7 +70,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:['create_time'],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:['desc']//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -122,7 +122,7 @@
 				this.getXmFiles();
 			},
 			searchXmFiles(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmFiles();
 			},
 			//获取列表 XmFile xm_file
@@ -131,7 +131,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -151,7 +151,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmFiles = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -174,7 +174,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmFiles();
 			},
 			afterEditSubmit(){
@@ -196,7 +196,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmFiles();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
@@ -213,7 +213,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmFiles(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmFunc/XmFuncMng.vue

@@ -108,7 +108,7 @@ export default {
             pageInfo:{//分页数据
                 total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
                 pageSize:10,//每页数据
-                count:false,//是否需要重新计算总记录数
+                countSql:true,//是否需要重新计算总记录数
                 pageNum:1,//当前页码、从1开始计算
                 orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
                 orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -161,7 +161,7 @@ export default {
             this.getXmFuncs();
         },
         searchXmFuncs(){
-             this.pageInfo.count=true;
+             this.pageInfo.countSql=true;
              this.getXmFuncs();
         },
         //获取列表 XmFunc 功能模块表
@@ -170,7 +170,7 @@ export default {
                 pageSize: this.pageInfo.pageSize,
                 pageNum: this.pageInfo.pageNum,
                 total: this.pageInfo.total,
-                count:this.pageInfo.count
+                countSql:this.pageInfo.countSql
             };
             if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
                 let orderBys=[];
@@ -188,7 +188,7 @@ export default {
                 var tips=res.data.tips;
                 if(tips.isOk){
                     this.pageInfo.total = res.data.total;
-                    this.pageInfo.count=false;
+                    this.pageInfo.countSql=false;
                     this.xmFuncs = res.data.data;
                 }else{
                     this.$notify({ position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -209,7 +209,7 @@ export default {
         },
         afterAddSubmit(){
             this.addFormVisible=false;
-            this.pageInfo.count=true;
+            this.pageInfo.countSql=true;
             this.getXmFuncs();
         },
         afterEditSubmit(){

src/views/xm/core/xmFunc/XmFuncSelect.vue

@@ -85,7 +85,7 @@ export default {
             pageInfo:{//分页数据
                 total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
                 pageSize:10,//每页数据
-                count:false,//是否需要重新计算总记录数
+                countSql:true,//是否需要重新计算总记录数
                 pageNum:1,//当前页码、从1开始计算
                 orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
                 orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -139,7 +139,7 @@ export default {
             this.getXmFuncs();
         },
         searchXmFuncs(){
-             this.pageInfo.count=true;
+             this.pageInfo.countSql=true;
              this.getXmFuncs();
         },
         //获取列表 XmFunc 功能模块表
@@ -148,7 +148,7 @@ export default {
                 pageSize: this.pageInfo.pageSize,
                 pageNum: this.pageInfo.pageNum,
                 total: this.pageInfo.total,
-                count:this.pageInfo.count
+                countSql:this.pageInfo.countSql
             };
             if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
                 let orderBys=[];
@@ -169,7 +169,7 @@ export default {
                 var tips=res.data.tips;
                 if(tips.isOk){
                     this.pageInfo.total = res.data.total;
-                    this.pageInfo.count=false;
+                    this.pageInfo.countSql=false;
                     this.xmFuncs = res.data.data;
                 }else{
                     this.$notify({ position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -211,7 +211,7 @@ export default {
         },
         afterAddSubmit(){
             this.addFormVisible=false;
-            this.pageInfo.count=true;
+            this.pageInfo.countSql=true;
             this.getXmFuncs();
         },
         afterEditSubmit(){

src/views/xm/core/xmGroup/XmGroupMng.vue

@@ -325,7 +325,7 @@ XmTaskExecuserSelect,
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:50,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -391,7 +391,7 @@ XmTaskExecuserSelect,
 				this.getXmGroups();
 			},
 			searchXmGroups(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmGroups();
 			},
 			loadNexGroup(){
@@ -415,7 +415,7 @@ XmTaskExecuserSelect,
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						var childrens = res.data.data;
 						childrens=childrens.filter(i=>!this.xmGroups.some(k=>k.id==i.id))
 						this.xmGroups.push(...childrens)
@@ -434,7 +434,7 @@ XmTaskExecuserSelect,
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -471,7 +471,7 @@ XmTaskExecuserSelect,
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmGroups = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -542,7 +542,7 @@ XmTaskExecuserSelect,
 			},
 			afterAddSubmit(group){
 				this.addFormVisible=false;
-				//this.pageInfo.count=true;
+				//this.pageInfo.countSql=true;
 				this.groupOperSelectVisible=false;
 				this.xmGroups.push(group)
 				//this.getXmGroups();
@@ -568,7 +568,7 @@ XmTaskExecuserSelect,
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmGroups();
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error' });
@@ -587,7 +587,7 @@ XmTaskExecuserSelect,
 						this.groupOperSelectVisible=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmGroups(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error'});
@@ -761,7 +761,7 @@ XmTaskExecuserSelect,
 						var tips=res.data.tips;
 						if(tips.isOk){  
 							this.groupOperSelectVisible=false;
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmGroups();
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error' });

src/views/xm/core/xmGroupState/XmGroupStateMng.vue

@@ -81,7 +81,7 @@ import XmGroupStateOverview from './XmGroupStateOverview.vue';
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -134,7 +134,7 @@ import XmGroupStateOverview from './XmGroupStateOverview.vue';
 				this.getXmGroupStates();
 			},
 			searchXmGroupStates(){
-				 this.pageInfo.count=true;
+				 this.pageInfo.countSql=true;
 				 this.getXmGroupStates();
 			},
 			//获取列表 XmGroupState 功能状态表,无需前端维护，所有数据由汇总统计得出
@@ -143,7 +143,7 @@ import XmGroupStateOverview from './XmGroupStateOverview.vue';
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -173,7 +173,7 @@ import XmGroupStateOverview from './XmGroupStateOverview.vue';
 					var tips=res.data.tips;
 					if(tips.isOk){
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmGroupStates = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -194,7 +194,7 @@ import XmGroupStateOverview from './XmGroupStateOverview.vue';
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmGroupStates();
 			},
 			afterEditSubmit(){
@@ -215,7 +215,7 @@ import XmGroupStateOverview from './XmGroupStateOverview.vue';
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmGroupStates();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
@@ -233,7 +233,7 @@ import XmGroupStateOverview from './XmGroupStateOverview.vue';
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmGroupStates();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmGroupUser/XmGroupUserMng.vue

@@ -93,7 +93,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -143,7 +143,7 @@
 				this.getXmGroupUsers();
 			},
 			searchXmGroupUsers(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmGroupUsers();
 			},
 			//获取列表 XmGroupUser xm_group_user
@@ -152,7 +152,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -183,7 +183,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmGroupUsers = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -204,7 +204,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmGroupUsers();
 			},
 			afterEditSubmit(){
@@ -225,7 +225,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmGroupUsers();
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error' });
@@ -243,7 +243,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmGroupUsers(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmIteration/XmIterationBox.vue

@@ -166,7 +166,7 @@ import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue'
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -235,7 +235,7 @@ import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue'
 				this.getXmIterations();
 			},
 			searchXmIterations(){
-				 this.pageInfo.count=true;
+				 this.pageInfo.countSql=true;
 				 this.getXmIterations();
 			},
 			//获取列表 XmIteration 迭代定义
@@ -244,7 +244,7 @@ import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue'
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				}; 
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -290,7 +290,7 @@ import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue'
 					var tips=res.data.tips;
 					if(tips.isOk){
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmIterations = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -321,7 +321,7 @@ import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue'
 			},
 			afterAddSubmit(xmIteration){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				if(this.xmProduct){//如果是产品试图界面添加的迭代，直接添加产品与迭代的关联关系
 					this.onXmIterationSelect(xmIteration);
 				}else{
@@ -358,7 +358,7 @@ import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue'
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmIterations();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
@@ -379,7 +379,7 @@ import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue'
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmIterations();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmIteration/XmIterationMng.vue

@@ -359,7 +359,7 @@ export default {
         //分页数据
         total: 0, //服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
         pageSize: 10, //每页数据
-        count: false, //是否需要重新计算总记录数
+        countSql: false, //是否需要重新计算总记录数
         pageNum: 1, //当前页码、从1开始计算
         orderFields: [], //排序列 如 ['sex','student_id']，必须为数据库字段
         orderDirs: [], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -489,7 +489,7 @@ export default {
       this.getXmIterations();
     },
     searchXmIterations() {
-      this.pageInfo.count = true;
+      this.pageInfo.countSql = true;
       this.getXmIterations();
     },
     //获取列表 XmIteration 迭代定义
@@ -498,7 +498,7 @@ export default {
         pageSize: this.pageInfo.pageSize,
         pageNum: this.pageInfo.pageNum,
         total: this.pageInfo.total,
-        count: this.pageInfo.count,
+        countSql: this.pageInfo.countSql,
       };
       if (
         this.pageInfo.orderFields != null &&
@@ -558,7 +558,7 @@ export default {
           var tips = res.data.tips;
           if (tips.isOk) {
             this.pageInfo.total = res.data.total;
-            this.pageInfo.count = false;
+            this.pageInfo.countSql = false;
             this.xmIterations = res.data.data;
           } else {
             this.$notify({
@@ -589,7 +589,7 @@ export default {
     },
     afterAddSubmit(xmIteration) {
       this.addFormVisible = false;
-      this.pageInfo.count = true;
+      this.pageInfo.countSql = true;
       this.getXmIterations();
     },
     afterEditSubmit() {
@@ -633,7 +633,7 @@ export default {
             this.load.del = false;
             var tips = res.data.tips;
             if (tips.isOk) {
-              this.pageInfo.count = true;
+              this.pageInfo.countSql = true;
               this.getXmIterations();
             }
             this.$notify({
@@ -666,7 +666,7 @@ export default {
             this.load.del = false;
             var tips = res.data.tips;
             if (tips.isOk) {
-              this.pageInfo.count = true;
+              this.pageInfo.countSql = true;
               this.getXmIterations();
             }
             this.$notify({

src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue

@@ -115,7 +115,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:20,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -178,7 +178,7 @@
 				this.getXmIterationMenus();
 			},
 			searchXmIterationMenus(){
-				 this.pageInfo.count=true;
+				 this.pageInfo.countSql=true;
 				 this.getXmIterationMenus();
 			},
 			//获取列表 XmIterationMenu 迭代定义
@@ -187,7 +187,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -213,7 +213,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmIterationMenus = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -234,7 +234,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmIterationMenus();
 			},
 			afterEditSubmit(){
@@ -255,7 +255,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){
-							this.pageInfo.count=true; 
+							this.pageInfo.countSql=true; 
 							this.getXmIterationMenus();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
@@ -279,7 +279,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmIterationMenus();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmIterationState/XmIterationStateMng.vue

@@ -98,7 +98,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -148,7 +148,7 @@
 				this.getXmIterationStates();
 			},
 			searchXmIterationStates(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmIterationStates();
 			},
 			//获取列表 XmIterationState 迭代定义
@@ -157,7 +157,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -175,7 +175,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmIterationStates = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -196,7 +196,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmIterationStates();
 			},
 			afterEditSubmit(){
@@ -217,7 +217,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmIterationStates();
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error' });
@@ -240,7 +240,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmIterationStates(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmIterationState/XmIterationStateShow.vue

@@ -77,7 +77,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -128,7 +128,7 @@
 				this.getXmIterationStates();
 			},
 			searchXmIterationStates(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmIterationStates();
 			},
 			//获取列表 XmIterationState 迭代定义
@@ -137,7 +137,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -159,7 +159,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmIterationStates = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -180,7 +180,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmIterationStates();
 			},
 			afterEditSubmit(){
@@ -201,7 +201,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmIterationStates();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
@@ -219,7 +219,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmIterationStates(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmIterationStateHis/XmIterationStateHisMng.vue

@@ -98,7 +98,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -148,7 +148,7 @@
 				this.getXmIterationStateHiss();
 			},
 			searchXmIterationStateHiss(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmIterationStateHiss();
 			},
 			//获取列表 XmIterationStateHis 迭代定义
@@ -157,7 +157,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -175,7 +175,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmIterationStateHiss = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -196,7 +196,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmIterationStateHiss();
 			},
 			afterEditSubmit(){
@@ -217,7 +217,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmIterationStateHiss();
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error' });
@@ -240,7 +240,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmIterationStateHiss(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmMenu/XmEpicFeatures.vue

@@ -220,7 +220,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:100,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -314,7 +314,7 @@
 				this.getXmMenus();
 			},
 			searchXmMenus(){
-				 this.pageInfo.count=true;
+				 this.pageInfo.countSql=true;
 				 this.getXmMenus();
 			},
 			getParams(params){
@@ -406,7 +406,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				//this.xmMenus=[]
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
@@ -424,7 +424,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmMenus = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -505,7 +505,7 @@
 			},
 			afterAddSubmit(row){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				//this.getXmMenus(); 
 				this.xmMenus.push(row); 
 				if(this.parentMenu){
@@ -557,7 +557,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){
-							this.pageInfo.count=true;  
+							this.pageInfo.countSql=true;  
 							this.getXmMenus();
 
 						}
@@ -579,7 +579,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmMenus(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});
@@ -765,7 +765,7 @@
 					this.load.edit=false;
 					var tips=res.data.tips;
 					if(tips.isOk){
-						this.pageInfo.count=true;
+						this.pageInfo.countSql=true;
 						this.xmMenus=[];
 						this.getXmMenus();
 					}
@@ -773,7 +773,7 @@
 				}).catch( err  => this.load.edit=false );
 			},    
 			searchSubMenus(row,index){
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.searchXmMenus();
 			},
 			clearFiltersTag(tag){

src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue

@@ -117,7 +117,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:100,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -181,7 +181,7 @@
 				this.getXmMenus();
 			},
 			searchXmMenus(){
-				 this.pageInfo.count=true;
+				 this.pageInfo.countSql=true;
 				 this.getXmMenus();
 			},
 			getParams(params){
@@ -273,7 +273,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				//this.xmMenus=[]
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
@@ -294,7 +294,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmMenus = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });

src/views/xm/core/xmMenu/XmMenuMng.vue

@@ -499,7 +499,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:20,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -590,7 +590,7 @@
 				this.getXmMenus();
 			},
 			searchXmMenus(){
-				 this.pageInfo.count=true;
+				 this.pageInfo.countSql=true;
 				 this.getXmMenus();
 			},
 			getParams(params){
@@ -719,7 +719,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				//this.xmMenus=[]
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
@@ -737,7 +737,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmMenus = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -813,7 +813,7 @@
 			},
 			afterAddSubmit(row){
 				this.addFormVisible=false;
-				this.pageInfo.count=true; 
+				this.pageInfo.countSql=true; 
 				this.xmMenus.push(row); 
 				if(this.parentMenu){
 					this.parentMenu.childrenCnt=this.parentMenu.childrenCnt?this.parentMenu.childrenCnt+1:1;
@@ -855,7 +855,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){
-							this.pageInfo.count=true; 
+							this.pageInfo.countSql=true; 
  							this.getXmMenus();
 
 						}
@@ -877,7 +877,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmMenus();
  						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});
@@ -1056,7 +1056,7 @@
 					this.load.edit=false;
 					var tips=res.data.tips;
 					if(tips.isOk){
-						this.pageInfo.count=true;
+						this.pageInfo.countSql=true;
 						this.xmMenus=[];
 						this.getXmMenus();
 					}
@@ -1070,7 +1070,7 @@
 				this.productVisible=true;
 			},
 			searchSubMenus(row,index){
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.searchXmMenus();
 			},
 			clearFiltersTag(tag){

src/views/xm/core/xmMenu/XmMenuSelect.vue

@@ -264,7 +264,7 @@ import XmEpicFeatures from './XmEpicFeaturesSelect.vue';
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:50,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:['seq_no'],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:['asc']//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -320,7 +320,7 @@ import XmEpicFeatures from './XmEpicFeaturesSelect.vue';
 				this.getXmMenus();
 			},
 			searchXmMenus(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmMenus();
 			},
 			getParams(params){ 
@@ -431,7 +431,7 @@ import XmEpicFeatures from './XmEpicFeaturesSelect.vue';
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -456,7 +456,7 @@ import XmEpicFeatures from './XmEpicFeaturesSelect.vue';
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmMenus = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });

src/views/xm/core/xmMenu/XmMenuWithPlan.vue

@@ -210,7 +210,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -281,7 +281,7 @@
 				this.getXmMenus();
 			},
 			searchXmMenus(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmMenus();
 			},
 			
@@ -352,7 +352,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -369,7 +369,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmMenus = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -390,7 +390,7 @@
 					this.load.edit=false;
 					var tips=res.data.tips;
 					if(tips.isOk){ 
-						this.pageInfo.count=true;
+						this.pageInfo.countSql=true;
 						this.getXmMenus();
 					}
 					this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
@@ -404,7 +404,7 @@
 					this.load.add=false;
 					var tips=res.data.tips;
 					if(tips.isOk){ 
-						this.pageInfo.count=true;
+						this.pageInfo.countSql=true;
 						this.getXmMenus();
 					}
 					this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
@@ -421,7 +421,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmMenus(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmMenuComment/comment-area.vue

@@ -53,7 +53,7 @@ export default {
       pageInfo: {//分页数据
         total: 0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
         pageSize: 10,//每页数据
-        count: false,//是否需要重新计算总记录数
+        countSql: false,//是否需要重新计算总记录数
         pageNum: 1,//当前页码、从1开始计算
         orderFields: ['CDATE'],//排序列 如 ['sex','student_id']，必须为数据库字段
         orderDirs: ['desc']//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -128,7 +128,7 @@ export default {
         pageSize: this.pageInfo.pageSize,
         pageNum: this.pageInfo.pageNum,
         total: this.pageInfo.total,
-        count: this.pageInfo.count,
+        countSql: this.pageInfo.countSql,
         menuId: this.targetId,
         pidIsNull: "1",
       };
@@ -144,7 +144,7 @@ export default {
         let tips = res.data.tips;
         if (tips.isOk) {
           this.pageInfo.total = res.data.total;
-          this.pageInfo.count = false;
+          this.pageInfo.countSql = false;
           let list = res.data.data;
           this.commentsList = list;
           if (res.data.children && res.data.children.length > 0) {

src/views/xm/core/xmMenuState/XmMenuStateMng.vue

@@ -188,7 +188,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -246,7 +246,7 @@
 				this.getXmMenus();
 			},
 			searchXmMenus(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmMenus();
 			},
 			//获取列表 XmMenu xm_project_menu
@@ -255,7 +255,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -273,7 +273,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmMenus = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -294,7 +294,7 @@
 					this.load.edit=false;
 					var tips=res.data.tips;
 					if(tips.isOk){ 
-						this.pageInfo.count=true;
+						this.pageInfo.countSql=true;
 						this.getXmMenus();
 					}
 					this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
@@ -308,7 +308,7 @@
 					this.load.add=false;
 					var tips=res.data.tips;
 					if(tips.isOk){ 
-						this.pageInfo.count=true;
+						this.pageInfo.countSql=true;
 						this.getXmMenus();
 					}
 					this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
@@ -325,7 +325,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmMenus(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue

@@ -79,7 +79,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -133,7 +133,7 @@
 				this.getXmMenuTemplates();
 			},
 			searchXmMenuTemplates(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmMenuTemplates();
 			},
 			//获取列表 XmMenuTemplate xm_project_menu
@@ -142,7 +142,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -165,7 +165,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmMenuTemplates = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -198,7 +198,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.parentMenu=null;
 				this.getXmMenuTemplates();
 			},
@@ -224,7 +224,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmMenuTemplates();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
@@ -242,7 +242,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmMenuTemplates(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmMyFocus/XmMyFocusList.vue

@@ -113,7 +113,7 @@ export default {
             pageInfo:{//分页数据
                 total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
                 pageSize:10,//每页数据
-                count:false,//是否需要重新计算总记录数
+                countSql:true,//是否需要重新计算总记录数
                 pageNum:1,//当前页码、从1开始计算
                 orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
                 orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -166,7 +166,7 @@ export default {
             this.getXmMyFocuss();
         },
         searchXmMyFocuss:function(){
-             this.pageInfo.count=true;
+             this.pageInfo.countSql=true;
              this.getXmMyFocuss();
         },
         //获取列表 XmMyFocus 我关注的项目或者任务
@@ -176,7 +176,7 @@ export default {
                 pageSize: this.pageInfo.pageSize,
                 pageNum: this.pageInfo.pageNum,
                 total: this.pageInfo.total,
-                count:this.pageInfo.count
+                countSql:this.pageInfo.countSql
             };
             if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
                 let orderBys=[];
@@ -195,7 +195,7 @@ export default {
                 var tips=res.data.tips;
                 if(tips.isOk){
                     this.pageInfo.total = res.data.total;
-                    this.pageInfo.count=false;
+                    this.pageInfo.countSql=false;
                     this.xmMyFocuss = res.data.data;
                     localStorage.setItem('xm-my-focus-list',JSON.stringify( this.xmMyFocuss ))
                 }else{
@@ -237,7 +237,7 @@ export default {
         },
         afterAddSubmit(){
             this.addFormVisible=false;
-            this.pageInfo.count=true;
+            this.pageInfo.countSql=true;
             this.getXmMyFocuss();
         },
         afterEditSubmit(){

src/views/xm/core/xmMyFocus/XmMyFocusMng.vue

@@ -108,7 +108,7 @@ export default {
             pageInfo:{//分页数据
                 total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
                 pageSize:10,//每页数据
-                count:false,//是否需要重新计算总记录数
+                countSql:true,//是否需要重新计算总记录数
                 pageNum:1,//当前页码、从1开始计算
                 orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
                 orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -161,7 +161,7 @@ export default {
             this.getXmMyFocuss();
         },
         searchXmMyFocuss(){
-             this.pageInfo.count=true;
+             this.pageInfo.countSql=true;
              this.getXmMyFocuss();
         },
         //获取列表 XmMyFocus 我关注的项目或者任务
@@ -170,7 +170,7 @@ export default {
                 pageSize: this.pageInfo.pageSize,
                 pageNum: this.pageInfo.pageNum,
                 total: this.pageInfo.total,
-                count:this.pageInfo.count
+                countSql:this.pageInfo.countSql
             };
             if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
                 let orderBys=[];
@@ -188,7 +188,7 @@ export default {
                 var tips=res.data.tips;
                 if(tips.isOk){
                     this.pageInfo.total = res.data.total;
-                    this.pageInfo.count=false;
+                    this.pageInfo.countSql=false;
                     this.xmMyFocuss = res.data.data;
                 }else{
                     this.$notify({ position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -209,7 +209,7 @@ export default {
         },
         afterAddSubmit(){
             this.addFormVisible=false;
-            this.pageInfo.count=true;
+            this.pageInfo.countSql=true;
             this.getXmMyFocuss();
         },
         afterEditSubmit(){

src/views/xm/core/xmProduct/XmProductMng.vue

@@ -440,7 +440,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -508,7 +508,7 @@
 				this.getXmProducts();
 			},
 			searchXmProducts(){
-				 this.pageInfo.count=true;
+				 this.pageInfo.countSql=true;
 				 this.getXmProducts();
 			},
 			showProductState(row){
@@ -523,7 +523,7 @@
 					this.load.edit=false;
 					var tips=res.data.tips;
 					if(tips.isOk){
-						this.pageInfo.count=true;
+						this.pageInfo.countSql=true;
 						this.getXmProducts();
 					}
 					this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
@@ -535,7 +535,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -581,7 +581,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmProducts = res.data.data; 
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -607,7 +607,7 @@
 			},
 			afterAddSubmit(xmProduct){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				if(this.xmIteration){//如果是迭代试图进入的迭代界面，创建了产品直接添加产品与迭代的关系
 					this.onXmProductSelect(xmProduct);
 				}else{
@@ -644,7 +644,7 @@
 							this.load.del=false;
 							var tips=res.data.tips;
 							if(tips.isOk){
-								this.pageInfo.count=true;
+								this.pageInfo.countSql=true;
 								this.getXmProducts();
 							}
 							this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
@@ -671,7 +671,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProducts();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmProduct/XmProductRecycle.vue

@@ -168,7 +168,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -224,7 +224,7 @@
 				this.getXmProducts();
 			},
 			searchXmProducts(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmProducts();
 			}, 
 			//获取列表 XmProduct 产品表
@@ -233,7 +233,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -281,7 +281,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmProducts = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -332,7 +332,7 @@
 							this.load.del=false;
 							var tips=res.data.tips;
 							if(tips.isOk){
-								this.pageInfo.count=true;
+								this.pageInfo.countSql=true;
 								this.getXmProducts();
 							}
 							this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });

src/views/xm/core/xmProduct/XmProductTplMng.vue

@@ -157,7 +157,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -220,7 +220,7 @@
 				this.getXmProducts();
 			},
 			searchXmProducts(){
-				 this.pageInfo.count=true;
+				 this.pageInfo.countSql=true;
 				 this.getXmProducts();
 			},
 			showProductState(row){
@@ -235,7 +235,7 @@
 					this.load.edit=false;
 					var tips=res.data.tips;
 					if(tips.isOk){
-						this.pageInfo.count=true;
+						this.pageInfo.countSql=true;
 						this.getXmProducts();
 					}
 					this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
@@ -247,7 +247,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -268,7 +268,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmProducts = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -289,7 +289,7 @@
 			},
 			afterAddSubmit(xmProduct){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				if(this.xmIteration){//如果是迭代试图进入的迭代界面，创建了产品直接添加产品与迭代的关系
 					this.onXmProductSelect(xmProduct);
 				}else{
@@ -323,7 +323,7 @@
 							this.load.del=false;
 							var tips=res.data.tips;
 							if(tips.isOk){
-								this.pageInfo.count=true;
+								this.pageInfo.countSql=true;
 								this.getXmProducts();
 							}
 							this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
@@ -345,7 +345,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProducts();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue

@@ -83,7 +83,7 @@ import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect.vue'
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:['seq'],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:['asc']//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -136,7 +136,7 @@ import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect.vue'
 				this.getXmProductProjectLinks();
 			},
 			searchXmProductProjectLinks(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmProductProjectLinks();
 			},
 			//获取列表 XmProductProjectLink 产品与项目的关联关系表，一般由产品经理挂接项目到产品上
@@ -145,7 +145,7 @@ import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect.vue'
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -168,7 +168,7 @@ import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect.vue'
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmProductProjectLinks = res.data.data;
 					}else{
 						this.$notify({ message: tips.msg, type: 'error' });
@@ -189,7 +189,7 @@ import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect.vue'
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmProductProjectLinks();
 			},
 			afterEditSubmit(){
@@ -210,7 +210,7 @@ import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect.vue'
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProductProjectLinks();
 						}
 						this.$notify({ message: tips.msg, type: tips.isOk?'success':'error' }); 
@@ -228,7 +228,7 @@ import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect.vue'
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProductProjectLinks(); 
 						}
 						this.$notify({ message: tips.msg, type: tips.isOk?'success':'error'});
@@ -252,7 +252,7 @@ import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect.vue'
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProductProjectLinks(); 
 						}
 						this.$notify({ message: tips.msg, type: tips.isOk?'success':'error'});
@@ -270,7 +270,7 @@ import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect.vue'
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProductProjectLinks(); 
 						}
 						this.$notify({ message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmProductState/XmProductStateMng.vue

@@ -110,7 +110,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -160,7 +160,7 @@
 				this.getXmProductStates();
 			},
 			searchXmProductStates(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmProductStates();
 			},
 			//获取列表 XmProductState 功能状态表,无需前端维护，所有数据由汇总统计得出
@@ -169,7 +169,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -187,7 +187,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmProductStates = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -208,7 +208,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmProductStates();
 			},
 			afterEditSubmit(){
@@ -229,7 +229,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProductStates();
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error' });
@@ -252,7 +252,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProductStates(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmProductStateHis/XmProductStateHisMng.vue

@@ -110,7 +110,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -160,7 +160,7 @@
 				this.getXmProductStateHiss();
 			},
 			searchXmProductStateHiss(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmProductStateHiss();
 			},
 			//获取列表 XmProductStateHis 功能状态表,无需前端维护，所有数据由汇总统计得出
@@ -169,7 +169,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -187,7 +187,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmProductStateHiss = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -208,7 +208,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmProductStateHiss();
 			},
 			afterEditSubmit(){
@@ -229,7 +229,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProductStateHiss();
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error' });
@@ -252,7 +252,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProductStateHiss(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue

@@ -71,7 +71,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -120,7 +120,7 @@
 				this.getXmProductTemplates();
 			},
 			searchXmProductTemplates(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmProductTemplates();
 			},
 			//获取列表 XmProductTemplate 产品表
@@ -129,7 +129,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -150,7 +150,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmProductTemplates = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -171,7 +171,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmProductTemplates();
 			},
 			afterEditSubmit(){
@@ -192,7 +192,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProductTemplates();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
@@ -210,7 +210,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProductTemplates(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmProject/XmProjectForLink.vue

@@ -83,7 +83,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:['create_time'],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:['desc']//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -133,7 +133,7 @@
 				this.getXmProjects();
 			},
 			searchXmProjects(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmProjects();
 			},
 			//获取列表 XmProject xm_project
@@ -142,7 +142,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count,
+					countSql:this.pageInfo.countSql,
 				};
 				
 				if(this.xmProduct){
@@ -172,7 +172,7 @@
 					if(tips.isOk){ 
 						console.log(res.data);
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false; 
+						this.pageInfo.countSql=false; 
 						this.xmProjects = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });

src/views/xm/core/xmProject/XmProjectMng.vue

@@ -410,7 +410,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:['create_time'],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:['desc']//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -474,7 +474,7 @@
 				this.getXmProjects();
 			},
 			searchXmProjects(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmProjects();
 			},
 			//获取列表 XmProject xm_project
@@ -483,7 +483,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count,
+					countSql:this.pageInfo.countSql,
 				};
 				if(this.filters.key!==""){
 					//params.xxx=this.filters.key
@@ -520,7 +520,7 @@
 					if(tips.isOk){ 
 						console.log(res.data);
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false; 
+						this.pageInfo.countSql=false; 
 						this.xmProjects = res.data.data; 
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -588,7 +588,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmProjects();
 			},
 			afterEditSubmit(){
@@ -611,7 +611,7 @@
 							this.load.del=false;
 							var tips=res.data.tips;
 							if(tips.isOk){ 
-								this.pageInfo.count=true;
+								this.pageInfo.countSql=true;
 								this.getXmProjects();
 							}
 							this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
@@ -635,7 +635,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProjects(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});
@@ -876,7 +876,7 @@
 						this.load.edit=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.searchXmProjects(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmProject/XmProjectRecycle.vue

@@ -66,7 +66,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:['create_time'],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:['desc']//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -118,7 +118,7 @@
 				this.getXmProjects();
 			},
 			searchXmProjects(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmProjects();
 			},
 			//获取列表 XmProject xm_project
@@ -127,7 +127,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count,
+					countSql:this.pageInfo.countSql,
 				};
 
 				if(this.filters.key){
@@ -148,7 +148,7 @@
 					if(tips.isOk){ 
 						console.log(res.data);
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false; 
+						this.pageInfo.countSql=false; 
 						this.xmProjects = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -172,7 +172,7 @@
 							this.load.del=false;
 							var tips=res.data.tips;
 							if(tips.isOk){ 
-								this.pageInfo.count=true;
+								this.pageInfo.countSql=true;
 								this.getXmProjects();
 							}
 							this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 

src/views/xm/core/xmProject/XmProjectTplMng.vue

@@ -137,7 +137,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:['create_time'],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:['desc']//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -198,7 +198,7 @@
 				this.getXmProjects();
 			},
 			searchXmProjects(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmProjects();
 			},
 			//获取列表 XmProject xm_project
@@ -207,7 +207,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count,
+					countSql:this.pageInfo.countSql,
 				};
 				if(this.filters.key!==""){
 					 params.key='%'+this.filters.key+'%';
@@ -237,7 +237,7 @@
 					if(tips.isOk){ 
 						console.log(res.data);
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false; 
+						this.pageInfo.countSql=false; 
 						this.xmProjects = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -268,7 +268,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmProjects();
 			},
 			afterEditSubmit(){
@@ -290,7 +290,7 @@
 							this.load.del=false;
 							var tips=res.data.tips;
 							if(tips.isOk){ 
-								this.pageInfo.count=true;
+								this.pageInfo.countSql=true;
 								this.getXmProjects();
 							}
 							this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
@@ -314,7 +314,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProjects(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue

@@ -83,7 +83,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -133,7 +133,7 @@
 				this.getXmProjectKpis();
 			},
 			searchXmProjectKpis(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmProjectKpis();
 			},
 			//获取列表 XmProjectKpi xm_project_kpi
@@ -142,7 +142,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -166,7 +166,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmProjectKpis = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -187,7 +187,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmProjectKpis();
 			},
 			afterEditSubmit(){
@@ -208,7 +208,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProjectKpis();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
@@ -226,7 +226,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProjectKpis(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisMng.vue

@@ -74,7 +74,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -123,7 +123,7 @@
 				this.getXmProjectKpiHiss();
 			},
 			searchXmProjectKpiHiss(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmProjectKpiHiss();
 			},
 			//获取列表 XmProjectKpiHis xm_project_kpi_his
@@ -132,7 +132,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -151,7 +151,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmProjectKpiHiss = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -172,7 +172,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmProjectKpiHiss();
 			},
 			afterEditSubmit(){
@@ -193,7 +193,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProjectKpiHiss();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
@@ -211,7 +211,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProjectKpiHiss(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmProjectState/XmCockpit.vue

@@ -128,7 +128,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -179,7 +179,7 @@
 				this.getXmProjectStates();
 			},
 			searchXmProjectStates(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmProjectStates();
 			},
 			//获取列表 XmProjectState 项目指标日统计表
@@ -188,7 +188,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -207,7 +207,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmProjectStates = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -228,7 +228,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmProjectStates();
 			},
 			afterEditSubmit(){
@@ -249,7 +249,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProjectStates();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
@@ -267,7 +267,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProjectStates(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmProjectState/XmProjectStateMng.vue

@@ -130,7 +130,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -180,7 +180,7 @@
 				this.getXmProjectStates();
 			},
 			searchXmProjectStates(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmProjectStates();
 			},
 			//获取列表 XmProjectState 项目指标日统计表
@@ -189,7 +189,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -207,7 +207,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmProjectStates = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -228,7 +228,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmProjectStates();
 			},
 			afterEditSubmit(){
@@ -249,7 +249,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProjectStates();
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error' });
@@ -272,7 +272,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProjectStates(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmProjectStateHis/XmProjectStateHisMng.vue

@@ -130,7 +130,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -180,7 +180,7 @@
 				this.getXmProjectStateHiss();
 			},
 			searchXmProjectStateHiss(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmProjectStateHiss();
 			},
 			//获取列表 XmProjectStateHis 项目指标日统计表
@@ -189,7 +189,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -207,7 +207,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmProjectStateHiss = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -228,7 +228,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmProjectStateHiss();
 			},
 			afterEditSubmit(){
@@ -249,7 +249,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProjectStateHiss();
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error' });
@@ -272,7 +272,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProjectStateHiss(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue

@@ -78,7 +78,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -130,7 +130,7 @@
 				this.getXmProjectTaskTypeStates();
 			},
 			searchXmProjectTaskTypeStates(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmProjectTaskTypeStates();
 			},
 			//获取列表 XmProjectTaskTypeState 按任务类型汇总
@@ -139,7 +139,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -158,7 +158,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmProjectTaskTypeStates = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -179,7 +179,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmProjectTaskTypeStates();
 			},
 			afterEditSubmit(){
@@ -200,7 +200,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProjectTaskTypeStates();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
@@ -218,7 +218,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProjectTaskTypeStates(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue

@@ -70,7 +70,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -124,7 +124,7 @@
 				this.getXmProjectTemplates();
 			},
 			searchXmProjectTemplates(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmProjectTemplates();
 			},
 			//获取列表 XmProjectTemplate xm_project_template
@@ -133,7 +133,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -151,7 +151,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmProjectTemplates = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -172,7 +172,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmProjectTemplates();
 			},
 			afterEditSubmit(){

src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue

@@ -84,7 +84,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -138,7 +138,7 @@
 				this.getXmProjectTemplates();
 			},
 			searchXmProjectTemplates(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmProjectTemplates();
 			},
 			//获取列表 XmProjectTemplate xm_project_template
@@ -147,7 +147,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -164,7 +164,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmProjectTemplates = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -185,7 +185,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmProjectTemplates();
 			},
 			afterEditSubmit(){
@@ -206,7 +206,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProjectTemplates();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
@@ -224,7 +224,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmProjectTemplates(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmQuestion/XmQuestionMng.vue

@@ -295,7 +295,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:['ltime'],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:['desc']//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -405,7 +405,7 @@
 				this.getXmQuestions();
 			},
 			searchXmQuestions(){
-				 this.pageInfo.count=true;
+				 this.pageInfo.countSql=true;
 				 this.getXmQuestions();
 			},
 			//获取列表 XmQuestion xm_question
@@ -415,7 +415,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -519,7 +519,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmQuestions = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -589,7 +589,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmQuestions();
 			},
 			afterEditSubmit(){
@@ -611,7 +611,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmQuestions();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
@@ -632,7 +632,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmQuestions();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue

@@ -60,7 +60,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:['last_update_time'],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:['desc']//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -114,7 +114,7 @@
 				this.getXmQuestionHandles();
 			},
 			searchXmQuestionHandles(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmQuestionHandles();
 			},
 			//获取列表 XmQuestionHandle xm_question_handle
@@ -123,7 +123,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -145,7 +145,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmQuestionHandles = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -166,7 +166,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmQuestionHandles();
 			},
 			afterEditSubmit(){
@@ -187,7 +187,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmQuestionHandles();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
@@ -205,7 +205,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmQuestionHandles(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmRecord/XmRecord.vue

@@ -86,7 +86,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:["oper_time"],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:["desc"]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -136,7 +136,7 @@
 				this.getXmRecords();
 			},
 			searchXmRecords(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmRecords();
 			},
 			//获取列表 XmRecord xm_record
@@ -145,7 +145,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -171,7 +171,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmRecords = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -192,7 +192,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmRecords();
 			},
 			afterEditSubmit(){
@@ -213,7 +213,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmRecords();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
@@ -231,7 +231,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmRecords(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmRecordVisit/XmRecordVisitMng.vue

@@ -138,7 +138,7 @@ export default {
             pageInfo:{//分页数据
                 total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
                 pageSize:10,//每页数据
-                count:false,//是否需要重新计算总记录数
+                countSql:true,//是否需要重新计算总记录数
                 pageNum:1,//当前页码、从1开始计算
                 orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
                 orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -191,7 +191,7 @@ export default {
             this.getXmRecordVisits();
         },
         searchXmRecordVisits(){
-             this.pageInfo.count=true;
+             this.pageInfo.countSql=true;
              this.getXmRecordVisits();
         },
         //获取列表 XmRecordVisit 重要页面访问记录
@@ -200,7 +200,7 @@ export default {
                 pageSize: this.pageInfo.pageSize,
                 pageNum: this.pageInfo.pageNum,
                 total: this.pageInfo.total,
-                count:this.pageInfo.count
+                countSql:this.pageInfo.countSql
             };
             if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
                 let orderBys=[];
@@ -218,7 +218,7 @@ export default {
                 var tips=res.data.tips;
                 if(tips.isOk){
                     this.pageInfo.total = res.data.total;
-                    this.pageInfo.count=false;
+                    this.pageInfo.countSql=false;
                     this.xmRecordVisits = res.data.data;
                 }else{
                     this.$notify({ position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -239,7 +239,7 @@ export default {
         },
         afterAddSubmit(){
             this.addFormVisible=false;
-            this.pageInfo.count=true;
+            this.pageInfo.countSql=true;
             this.getXmRecordVisits();
         },
         afterEditSubmit(){

src/views/xm/core/xmRptConfig/XmRptConfigMng.vue

@@ -113,7 +113,7 @@ export default {
             pageInfo:{//分页数据
                 total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
                 pageSize:10,//每页数据
-                count:false,//是否需要重新计算总记录数
+                countSql:true,//是否需要重新计算总记录数
                 pageNum:1,//当前页码、从1开始计算
                 orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
                 orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -166,7 +166,7 @@ export default {
             this.getXmRptConfigs();
         },
         searchXmRptConfigs(){
-             this.pageInfo.count=true;
+             this.pageInfo.countSql=true;
              this.getXmRptConfigs();
         },
         //获取列表 XmRptConfig 测试报告配置表
@@ -175,7 +175,7 @@ export default {
                 pageSize: this.pageInfo.pageSize,
                 pageNum: this.pageInfo.pageNum,
                 total: this.pageInfo.total,
-                count:this.pageInfo.count
+                countSql:this.pageInfo.countSql
             };
             if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
                 let orderBys=[];
@@ -193,7 +193,7 @@ export default {
                 var tips=res.data.tips;
                 if(tips.isOk){
                     this.pageInfo.total = res.data.total;
-                    this.pageInfo.count=false;
+                    this.pageInfo.countSql=false;
                     this.xmRptConfigs = res.data.data;
                 }else{
                     this.$notify({ position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -214,7 +214,7 @@ export default {
         },
         afterAddSubmit(){
             this.addFormVisible=false;
-            this.pageInfo.count=true;
+            this.pageInfo.countSql=true;
             this.getXmRptConfigs();
         },
         afterEditSubmit(){

src/views/xm/core/xmTask/XmPhase.vue

@@ -399,7 +399,7 @@ export default {
         //分页数据
         total: 0, //服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
         pageSize: 100, //每页数据
-        count: false, //是否需要重新计算总记录数
+        countSql: false, //是否需要重新计算总记录数
         pageNum: 1, //当前页码、从1开始计算
         orderFields: ["sort_level"], //排序列 如 ['sex','student_id']，必须为数据库字段
         orderDirs: ["asc"], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -564,7 +564,7 @@ export default {
       this.getXmTasks();
     },
     searchXmTasks() {
-      this.pageInfo.count = true;
+      this.pageInfo.countSql = true;
       this.getXmTasks();
     },
     //获取列表 XmTask xm_task
@@ -573,7 +573,7 @@ export default {
         pageSize: this.pageInfo.pageSize,
         pageNum: this.pageInfo.pageNum,
         total: this.pageInfo.total,
-        count: this.pageInfo.count,
+        countSql: this.pageInfo.countSql,
       };
       if (
         this.pageInfo.orderFields != null &&
@@ -608,7 +608,7 @@ export default {
           var tips = res.data.tips;
           if (tips.isOk) {
             this.pageInfo.total = res.data.total;
-            this.pageInfo.count = false;
+            this.pageInfo.countSql = false;
             var xmTasks = res.data.data;
             this.xmTasks = xmTasks;
             if (this.editForm != null) {
@@ -750,7 +750,7 @@ export default {
     },
     afterAddSubmit(row) {
       this.addFormVisible = false;
-      this.pageInfo.count = true;
+      this.pageInfo.countSql = true;
         this.getXmTasks()
      },
     afterEditSubmit() {
@@ -782,7 +782,7 @@ export default {
             this.load.del = false;
             var tips = res.data.tips;
             if (tips.isOk) {
-              this.pageInfo.count = true;
+              this.pageInfo.countSql = true;
               this.getXmTasks()
              }
             this.$notify({
@@ -809,7 +809,7 @@ export default {
             this.load.del = false;
             var tips = res.data.tips;
             if (tips.isOk) {
-              this.pageInfo.count = true;
+              this.pageInfo.countSql = true;
 							this.searchXmTasks()
              }
             this.$notify({

src/views/xm/core/xmTask/XmPhaseSelect.vue

@@ -168,7 +168,7 @@ export default {
         //分页数据
         total: 0, //服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
         pageSize: 100, //每页数据
-        count: false, //是否需要重新计算总记录数
+        countSql: false, //是否需要重新计算总记录数
         pageNum: 1, //当前页码、从1开始计算
         orderFields: ["sort_level"], //排序列 如 ['sex','student_id']，必须为数据库字段
         orderDirs: ["asc"], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -291,7 +291,7 @@ export default {
       this.getXmTasks();
     },
     searchXmTasks() {
-      this.pageInfo.count = true;
+      this.pageInfo.countSql = true;
       this.getXmTasks();
     },
     //获取列表 XmTask xm_task
@@ -300,7 +300,7 @@ export default {
         pageSize: this.pageInfo.pageSize,
         pageNum: this.pageInfo.pageNum,
         total: this.pageInfo.total,
-        count: this.pageInfo.count,
+        countSql: this.pageInfo.countSql,
       };
       if (
         this.pageInfo.orderFields != null &&
@@ -321,7 +321,7 @@ export default {
           var tips = res.data.tips;
           if (tips.isOk) {
             this.pageInfo.total = res.data.total;
-            this.pageInfo.count = false;
+            this.pageInfo.countSql = false;
             var xmTasks = res.data.data;
             this.xmTasks = xmTasks;
             if (this.editForm != null) {

src/views/xm/core/xmTask/XmTaskList.vue

@@ -138,7 +138,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:20,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:['create_time'],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:['desc']//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -216,7 +216,7 @@
 				this.getXmTasks();
 			},
 			searchXmTasks(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmTasks();
 			},
 			//获取列表 XmTask xm_task
@@ -225,7 +225,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -265,7 +265,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						var xmTasks=res.data.data;
 						this.xmTasks=xmTasks;  
 					}else{

src/views/xm/core/xmTask/XmTaskListForMenu.vue

@@ -123,7 +123,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:['create_time'],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:['desc']//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -191,7 +191,7 @@
 				this.getXmTasks();
 			},
 			searchXmTasks(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmTasks();
 			},
 			//获取列表 XmTask xm_task
@@ -200,7 +200,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -229,7 +229,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						var xmTasks=res.data.data;
 						this.xmTasks=xmTasks;  
 					}else{

src/views/xm/core/xmTask/XmTaskMng.vue

@@ -1001,7 +1001,7 @@ export default {
         //分页数据
         total: 0, //服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
         pageSize: 20, //每页数据
-        count: false, //是否需要重新计算总记录数
+        countSql: false, //是否需要重新计算总记录数
         pageNum: 1, //当前页码、从1开始计算
         orderFields: ['menu_id',"start_time"], //排序列 如 ['sex','student_id']，必须为数据库字段
         orderDirs: ["asc","desc"], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -1130,7 +1130,7 @@ export default {
       this.getXmTasks();
     },
     searchXmTasks() {
-      this.pageInfo.count = true;
+      this.pageInfo.countSql = true;
       this.getXmTasks();
     },
     //获取列表 XmTask xm_task
@@ -1139,7 +1139,7 @@ export default {
         pageSize: this.pageInfo.pageSize,
         pageNum: this.pageInfo.pageNum,
         total: this.pageInfo.total,
-        count: this.pageInfo.count,
+        countSql: this.pageInfo.countSql,
       };
       if (
         this.pageInfo.orderFields != null &&
@@ -1181,7 +1181,7 @@ export default {
           var tips = res.data.tips;
           if (tips.isOk) {
             this.pageInfo.total = res.data.total;
-            this.pageInfo.count = false;
+            this.pageInfo.countSql = false;
             var xmTasks = res.data.data;
             this.xmTasks = xmTasks;
             if (this.editForm != null) {
@@ -1417,7 +1417,7 @@ export default {
     },
     afterAddSubmit(row) {
       this.addFormVisible = false;
-      this.pageInfo.count = true;
+      this.pageInfo.countSql = true;
       this.xmTasks.push(row)
         //this.getXmTasks()
         //treeTool.reloadChildren(this.$refs.table,this.maps,row.parentTaskid,'parentTaskid',this.loadXmTaskLazy)
@@ -1453,7 +1453,7 @@ export default {
             this.load.del = false;
             var tips = res.data.tips;
             if (tips.isOk) {
-              this.pageInfo.count = true;
+              this.pageInfo.countSql = true;
               this.getXmTasks()
               //treeTool.reloadChildren(this.$refs.table,this.maps,row.parentTaskid,'parentTaskid',this.loadXmTaskLazy)
             }
@@ -1481,7 +1481,7 @@ export default {
             this.load.del = false;
             var tips = res.data.tips;
             if (tips.isOk) {
-              this.pageInfo.count = true;
+              this.pageInfo.countSql = true;
 							this.searchXmTasks()
 							//treeTool.reloadAllChildren(this.$refs.table,this.maps,this.sels,'parentTaskid',this.loadXmTaskLazy)
             }

src/views/xm/core/xmTaskEval/XmTaskEvalMng.vue

@@ -158,7 +158,7 @@ export default {
             pageInfo:{//分页数据
                 total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
                 pageSize:10,//每页数据
-                count:false,//是否需要重新计算总记录数
+                countSql:true,//是否需要重新计算总记录数
                 pageNum:1,//当前页码、从1开始计算
                 orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
                 orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -211,7 +211,7 @@ export default {
             this.getXmTaskEvals();
         },
         searchXmTaskEvals(){
-             this.pageInfo.count=true;
+             this.pageInfo.countSql=true;
              this.getXmTaskEvals();
         },
         //获取列表 XmTaskEval xm_task_eval
@@ -220,7 +220,7 @@ export default {
                 pageSize: this.pageInfo.pageSize,
                 pageNum: this.pageInfo.pageNum,
                 total: this.pageInfo.total,
-                count:this.pageInfo.count
+                countSql:this.pageInfo.countSql
             };
             if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
                 let orderBys=[];
@@ -238,7 +238,7 @@ export default {
                 var tips=res.data.tips;
                 if(tips.isOk){
                     this.pageInfo.total = res.data.total;
-                    this.pageInfo.count=false;
+                    this.pageInfo.countSql=false;
                     this.xmTaskEvals = res.data.data;
                 }else{
                     this.$notify({ position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -259,7 +259,7 @@ export default {
         },
         afterAddSubmit(){
             this.addFormVisible=false;
-            this.pageInfo.count=true;
+            this.pageInfo.countSql=true;
             this.getXmTaskEvals();
         },
         afterEditSubmit(){

src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue

@@ -169,7 +169,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:['create_time'],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:['desc']//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -237,7 +237,7 @@
 				this.getXmTaskExecusers();
 			},
 			searchXmTaskExecusers(){
-				 this.pageInfo.count=true;
+				 this.pageInfo.countSql=true;
 				 this.getXmTaskExecusers();
 			},
 			//获取列表 XmTaskExecuser xm_task_execuser
@@ -246,7 +246,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -274,7 +274,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmTaskExecusers = res.data.data;
 						this.$emit("loadExecUserList",this.xmTaskExecusers);
 					}else{
@@ -326,7 +326,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.$emit("after-add-submit",this.addForm);
 
 				this.getXmTaskExecusers();
@@ -356,7 +356,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.afterDeleteSubmit();
  						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
@@ -373,7 +373,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.afterDeleteSubmit();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue

@@ -221,7 +221,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:['res.create_time'],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:['desc']//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -290,7 +290,7 @@
 				this.getXmTaskExecusers();
 			},
 			searchXmTaskExecusers(){
-				 this.pageInfo.count=true;
+				 this.pageInfo.countSql=true;
 				 this.getXmTaskExecusers();
 			},
 			//获取列表 XmTaskExecuser xm_task_execuser
@@ -299,7 +299,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -338,7 +338,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmTaskExecusers = res.data.data;
 						this.$emit("loadExecUserList",this.xmTaskExecusers);
 					}else{
@@ -390,7 +390,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.$emit("after-add-submit",this.addForm);
 
 				this.getXmTaskExecusers();
@@ -420,7 +420,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.afterDeleteSubmit();
  						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
@@ -437,7 +437,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.afterDeleteSubmit();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmTaskExecuser/XmTaskExecuserSelect.vue

@@ -126,7 +126,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:['res.create_time'],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:['desc']//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -181,7 +181,7 @@
 				this.getXmTaskExecusers();
 			},
 			searchXmTaskExecusers(){
-				 this.pageInfo.count=true;
+				 this.pageInfo.countSql=true;
 				 this.getXmTaskExecusers();
 			},
 			//获取列表 XmTaskExecuser xm_task_execuser
@@ -190,7 +190,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -226,7 +226,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmTaskExecusers = res.data.data;
 						this.$emit("loadExecUserList",this.xmTaskExecusers);
 					}else{

src/views/xm/core/xmTaskOrder/XmTaskOrderMng.vue

@@ -328,7 +328,7 @@ export default {
             pageInfo:{//分页数据
                 total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
                 pageSize:10,//每页数据
-                count:false,//是否需要重新计算总记录数
+                countSql:true,//是否需要重新计算总记录数
                 pageNum:1,//当前页码、从1开始计算
                 orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
                 orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -381,7 +381,7 @@ export default {
             this.getXmTaskOrders();
         },
         searchXmTaskOrders(){
-             this.pageInfo.count=true;
+             this.pageInfo.countSql=true;
              this.getXmTaskOrders();
         },
         //获取列表 XmTaskOrder 任务相关费用订单表
@@ -390,7 +390,7 @@ export default {
                 pageSize: this.pageInfo.pageSize,
                 pageNum: this.pageInfo.pageNum,
                 total: this.pageInfo.total,
-                count:this.pageInfo.count
+                countSql:this.pageInfo.countSql
             };
             if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
                 let orderBys=[];
@@ -408,7 +408,7 @@ export default {
                 var tips=res.data.tips;
                 if(tips.isOk){
                     this.pageInfo.total = res.data.total;
-                    this.pageInfo.count=false;
+                    this.pageInfo.countSql=false;
                     this.xmTaskOrders = res.data.data;
                 }else{
                     this.$notify({ position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -429,7 +429,7 @@ export default {
         },
         afterAddSubmit(){
             this.addFormVisible=false;
-            this.pageInfo.count=true;
+            this.pageInfo.countSql=true;
             this.getXmTaskOrders();
         },
         afterEditSubmit(){

src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue

@@ -184,7 +184,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -243,7 +243,7 @@
 				this.getXmTaskSbills();
 			},
 			searchXmTaskSbills(){
-				 this.pageInfo.count=true;
+				 this.pageInfo.countSql=true;
 				 this.getXmTaskSbills();
 			},
 			//获取列表 XmTaskSbill 任务结算表
@@ -252,7 +252,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -288,7 +288,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmTaskSbills = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -309,7 +309,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmTaskSbills();
 			},
 			afterEditSubmit(){
@@ -330,7 +330,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmTaskSbills();
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error' });
@@ -348,7 +348,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmTaskSbills();
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmTaskSbillDetail/XmTaskSbillDetailMng.vue

@@ -278,7 +278,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -349,7 +349,7 @@
 				this.getXmTaskSbillDetails();
 			},
 			searchXmTaskSbillDetails(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmTaskSbillDetails();
 			},
 			//获取列表 XmTaskSbillDetail 工时登记表
@@ -358,7 +358,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -394,7 +394,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmTaskSbillDetails = res.data.data;
 					}else{
 						this.$notify({ position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -415,7 +415,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmTaskSbillDetails();
 			},
 			afterEditSubmit(){

src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue

@@ -76,7 +76,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -127,7 +127,7 @@
 				this.getXmTaskSkills();
 			},
 			searchXmTaskSkills(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmTaskSkills();
 			},
 			//获取列表 XmTaskSkill xm_task_skill
@@ -136,7 +136,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -156,7 +156,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmTaskSkills = res.data.data;
 						let ids = [];
 						this.xmTaskSkills.forEach(i=>{
@@ -185,7 +185,7 @@
 
 			// afterAddSubmit(){
 			// 	this.addFormVisible=false;
-			// 	this.pageInfo.count=true;
+			// 	this.pageInfo.countSql=true;
 			// 	this.getXmTaskSkills();
 			// },
 
@@ -207,7 +207,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmTaskSkills();
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
@@ -225,7 +225,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){ 
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmTaskSkills(); 
 						}
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue

@@ -79,7 +79,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:20,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -130,7 +130,7 @@
 				this.getXmTaskTemplates();
 			},
 			searchXmTaskTemplates(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.countSql=true; 
 				 this.getXmTaskTemplates();
 			},
 			//获取列表 XmTaskTemplate xm_task_template
@@ -139,7 +139,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -167,7 +167,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmTaskTemplates = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -203,7 +203,7 @@
 			afterAddSubmit(){
 				this.parentTaskTemplate=null;
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmTaskTemplates();
 			},
 			afterEditSubmit(){

src/views/xm/core/xmTestCase/XmTestCaseMng.vue

@@ -136,7 +136,7 @@ export default {
             pageInfo:{//分页数据
                 total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
                 pageSize:10,//每页数据
-                count:false,//是否需要重新计算总记录数
+                countSql:true,//是否需要重新计算总记录数
                 pageNum:1,//当前页码、从1开始计算
                 orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
                 orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -190,7 +190,7 @@ export default {
             this.getXmTestCases();
         },
         searchXmTestCases(){
-             this.pageInfo.count=true;
+             this.pageInfo.countSql=true;
              this.getXmTestCases();
         },
         //获取列表 XmTestCase 测试用例
@@ -199,7 +199,7 @@ export default {
                 pageSize: this.pageInfo.pageSize,
                 pageNum: this.pageInfo.pageNum,
                 total: this.pageInfo.total,
-                count:this.pageInfo.count
+                countSql:this.pageInfo.countSql
             };
             if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
                 let orderBys=[];
@@ -234,7 +234,7 @@ export default {
                 var tips=res.data.tips;
                 if(tips.isOk){
                     this.pageInfo.total = res.data.total;
-                    this.pageInfo.count=false;
+                    this.pageInfo.countSql=false;
                     this.xmTestCases = res.data.data;
                 }else{
                     this.$notify({ position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -255,7 +255,7 @@ export default {
         },
         afterAddSubmit(){
             this.addFormVisible=false;
-            this.pageInfo.count=true;
+            this.pageInfo.countSql=true;
             this.getXmTestCases();
         },
         afterEditSubmit(){

src/views/xm/core/xmTestCase/XmTestCaseSelect.vue

@@ -111,7 +111,7 @@ export default {
             pageInfo:{//分页数据
                 total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
                 pageSize:10,//每页数据
-                count:false,//是否需要重新计算总记录数
+                countSql:true,//是否需要重新计算总记录数
                 pageNum:1,//当前页码、从1开始计算
                 orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
                 orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -165,7 +165,7 @@ export default {
             this.getXmTestCases();
         },
         searchXmTestCases(){
-             this.pageInfo.count=true;
+             this.pageInfo.countSql=true;
              this.getXmTestCases();
         },
         //获取列表 XmTestCase 测试用例
@@ -174,7 +174,7 @@ export default {
                 pageSize: this.pageInfo.pageSize,
                 pageNum: this.pageInfo.pageNum,
                 total: this.pageInfo.total,
-                count:this.pageInfo.count
+                countSql:this.pageInfo.countSql
             };
             if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
                 let orderBys=[];
@@ -202,7 +202,7 @@ export default {
                 var tips=res.data.tips;
                 if(tips.isOk){
                     this.pageInfo.total = res.data.total;
-                    this.pageInfo.count=false;
+                    this.pageInfo.countSql=false;
                     this.xmTestCases = res.data.data;
                 }else{
                     this.$notify({ position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -223,7 +223,7 @@ export default {
         },
         afterAddSubmit(){
             this.addFormVisible=false;
-            this.pageInfo.count=true;
+            this.pageInfo.countSql=true;
             this.getXmTestCases();
         },
         afterEditSubmit(){

src/views/xm/core/xmTestCasedb/XmTestCasedbMng.vue

@@ -112,7 +112,7 @@ export default {
             pageInfo:{//分页数据
                 total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
                 pageSize:10,//每页数据
-                count:false,//是否需要重新计算总记录数
+                countSql:true,//是否需要重新计算总记录数
                 pageNum:1,//当前页码、从1开始计算
                 orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
                 orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -165,7 +165,7 @@ export default {
             this.getXmTestCasedbs();
         },
         searchXmTestCasedbs(){
-             this.pageInfo.count=true;
+             this.pageInfo.countSql=true;
              this.getXmTestCasedbs();
         },
         //获取列表 XmTestCasedb 测试用例库
@@ -174,7 +174,7 @@ export default {
                 pageSize: this.pageInfo.pageSize,
                 pageNum: this.pageInfo.pageNum,
                 total: this.pageInfo.total,
-                count:this.pageInfo.count
+                countSql:this.pageInfo.countSql
             };
             if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
                 let orderBys=[];
@@ -195,7 +195,7 @@ export default {
                 var tips=res.data.tips;
                 if(tips.isOk){
                     this.pageInfo.total = res.data.total;
-                    this.pageInfo.count=false;
+                    this.pageInfo.countSql=false;
                     this.xmTestCasedbs = res.data.data;
                 }else{
                     this.$notify({ position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -216,7 +216,7 @@ export default {
         },
         afterAddSubmit(){
             this.addFormVisible=false;
-            this.pageInfo.count=true;
+            this.pageInfo.countSql=true;
             this.getXmTestCasedbs();
         },
         afterEditSubmit(){

src/views/xm/core/xmTestPlan/XmTestPlanMng.vue

@@ -126,7 +126,7 @@ export default {
             pageInfo:{//分页数据
                 total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
                 pageSize:10,//每页数据
-                count:false,//是否需要重新计算总记录数
+                countSql:true,//是否需要重新计算总记录数
                 pageNum:1,//当前页码、从1开始计算
                 orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
                 orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -180,7 +180,7 @@ export default {
             this.getXmTestPlans();
         },
         searchXmTestPlans(){
-             this.pageInfo.count=true;
+             this.pageInfo.countSql=true;
              this.getXmTestPlans();
         },
         //获取列表 XmTestPlan 测试计划
@@ -189,7 +189,7 @@ export default {
                 pageSize: this.pageInfo.pageSize,
                 pageNum: this.pageInfo.pageNum,
                 total: this.pageInfo.total,
-                count:this.pageInfo.count
+                countSql:this.pageInfo.countSql
             };
             if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
                 let orderBys=[];
@@ -211,7 +211,7 @@ export default {
                 var tips=res.data.tips;
                 if(tips.isOk){
                     this.pageInfo.total = res.data.total;
-                    this.pageInfo.count=false;
+                    this.pageInfo.countSql=false;
                     this.xmTestPlans = res.data.data;
                 }else{
                     this.$notify({ position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -236,7 +236,7 @@ export default {
         },
         afterAddSubmit(){
             this.addFormVisible=false;
-            this.pageInfo.count=true;
+            this.pageInfo.countSql=true;
             this.getXmTestPlans();
         },
         afterEditSubmit(){

src/views/xm/core/xmTestPlan/rpt/biz/questionSort.vue

@@ -137,7 +137,7 @@
 					//分页数据
 					total: 0, //服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize: 20, //每页数据
-					count: false, //是否需要重新计算总记录数
+					countSql: false, //是否需要重新计算总记录数
 					pageNum: 1, //当前页码、从1开始计算
 					orderFields: ["value"], //排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs: ["desc"], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -178,7 +178,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count: this.pageInfo.count,
+					countSql: this.pageInfo.countSql,
 				};
 				Object.assign(params,this.filters)
 

src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue

@@ -140,7 +140,7 @@ export default {
             pageInfo:{//分页数据
                 total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
                 pageSize:10,//每页数据
-                count:false,//是否需要重新计算总记录数
+                countSql:true,//是否需要重新计算总记录数
                 pageNum:1,//当前页码、从1开始计算
                 orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
                 orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -194,7 +194,7 @@ export default {
             this.getXmTestPlanCases();
         },
         searchXmTestPlanCases(){
-             this.pageInfo.count=true;
+             this.pageInfo.countSql=true;
              this.getXmTestPlanCases();
         },
         //获取列表 XmTestPlanCase 测试计划与用例关系表
@@ -203,7 +203,7 @@ export default {
                 pageSize: this.pageInfo.pageSize,
                 pageNum: this.pageInfo.pageNum,
                 total: this.pageInfo.total,
-                count:this.pageInfo.count
+                countSql:this.pageInfo.countSql
             };
             if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
                 let orderBys=[];
@@ -237,7 +237,7 @@ export default {
                 var tips=res.data.tips;
                 if(tips.isOk){
                     this.pageInfo.total = res.data.total;
-                    this.pageInfo.count=false;
+                    this.pageInfo.countSql=false;
                     this.xmTestPlanCases = res.data.data;
                 }else{
                     this.$notify({ position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -258,7 +258,7 @@ export default {
         },
         afterAddSubmit(){
             this.addFormVisible=false;
-            this.pageInfo.count=true;
+            this.pageInfo.countSql=true;
             this.getXmTestPlanCases();
         },
         afterEditSubmit(){

src/views/xm/core/xmTestPlanCase/XmTestPlanCaseSelect.vue

@@ -108,7 +108,7 @@ export default {
             pageInfo:{//分页数据
                 total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
                 pageSize:10,//每页数据
-                count:false,//是否需要重新计算总记录数
+                countSql:true,//是否需要重新计算总记录数
                 pageNum:1,//当前页码、从1开始计算
                 orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
                 orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -162,7 +162,7 @@ export default {
             this.getXmTestPlanCases();
         },
         searchXmTestPlanCases(){
-             this.pageInfo.count=true;
+             this.pageInfo.countSql=true;
              this.getXmTestPlanCases();
         },
         //获取列表 XmTestPlanCase 测试计划与用例关系表
@@ -171,7 +171,7 @@ export default {
                 pageSize: this.pageInfo.pageSize,
                 pageNum: this.pageInfo.pageNum,
                 total: this.pageInfo.total,
-                count:this.pageInfo.count
+                countSql:this.pageInfo.countSql
             };
             if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
                 let orderBys=[];
@@ -205,7 +205,7 @@ export default {
                 var tips=res.data.tips;
                 if(tips.isOk){
                     this.pageInfo.total = res.data.total;
-                    this.pageInfo.count=false;
+                    this.pageInfo.countSql=false;
                     this.xmTestPlanCases = res.data.data;
                 }else{
                     this.$notify({ position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });

src/views/xm/core/xmWorkload/XmTaskSbillSelect.vue

@@ -116,7 +116,7 @@ export default {
       pageInfo:{//分页数据
         total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
         pageSize:10,//每页数据
-        count:false,//是否需要重新计算总记录数
+        countSql:true,//是否需要重新计算总记录数
         pageNum:1,//当前页码、从1开始计算
         orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
         orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -162,7 +162,7 @@ export default {
       this.getXmTaskSbills();
     },
     searchXmTaskSbills(){
-      this.pageInfo.count=true;
+      this.pageInfo.countSql=true;
       this.getXmTaskSbills();
     },
     //获取列表 XmTaskSbill 项目表
@@ -172,7 +172,7 @@ export default {
         pageSize: this.pageInfo.pageSize,
         pageNum: this.pageInfo.pageNum,
         total: this.pageInfo.total,
-        count:this.pageInfo.count,
+        countSql:this.pageInfo.countSql,
         projectId: this.projectId,
         status:'0'
       };
@@ -202,7 +202,7 @@ export default {
         var tips=res.data.tips;
         if(tips.isOk){
           this.pageInfo.total = res.data.total;
-          this.pageInfo.count=false;
+          this.pageInfo.countSql=false;
           this.xmTaskSbills = res.data.data;
         }else{
           this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });

src/views/xm/core/xmWorkload/XmWorkloadInfo.vue

@@ -258,7 +258,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -318,7 +318,7 @@
 				this.getXmWorkloads();
 			},
 			searchXmWorkloads(){
-				 this.pageInfo.count=true;
+				 this.pageInfo.countSql=true;
 				 this.getXmWorkloads();
 			},
 			//获取列表 XmWorkload 工时登记表
@@ -327,7 +327,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count,
+					countSql:this.pageInfo.countSql,
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -383,7 +383,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmWorkloads = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -404,7 +404,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmWorkloads();
 			},
 			afterEditSubmit(){
@@ -425,7 +425,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmWorkloads();
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error' });
@@ -452,7 +452,7 @@
 						this.load.edit=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmWorkloads();
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error'});
@@ -475,7 +475,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmWorkloads();
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmWorkload/XmWorkloadList.vue

@@ -169,7 +169,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -250,7 +250,7 @@
 				this.getXmWorkloads();
 			},
 			searchXmWorkloads(){
-				 this.pageInfo.count=true;
+				 this.pageInfo.countSql=true;
 				 this.getXmWorkloads();
 			},
 			//获取列表 XmWorkload 工时登记表
@@ -259,7 +259,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -296,7 +296,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmWorkloads = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -317,7 +317,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmWorkloads();
 				this.$emit('submit',this.editForm)
 			},
@@ -340,7 +340,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmWorkloads();
 							this.$emit('submit',this.editForm)
 						}
@@ -364,7 +364,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmWorkloads();
 							this.$emit('submit')
 						}

src/views/xm/core/xmWorkload/XmWorkloadMng.vue

@@ -315,7 +315,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -375,7 +375,7 @@
 				this.getXmWorkloads();
 			},
 			searchXmWorkloads(){
-				 this.pageInfo.count=true;
+				 this.pageInfo.countSql=true;
 				 this.getXmWorkloads();
 			},
 			//获取列表 XmWorkload 工时登记表
@@ -384,7 +384,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count,
+					countSql:this.pageInfo.countSql,
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -439,7 +439,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmWorkloads = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -460,7 +460,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmWorkloads();
 			},
 			afterEditSubmit(){
@@ -481,7 +481,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmWorkloads();
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error' });
@@ -508,7 +508,7 @@
 						this.load.edit=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmWorkloads();
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error'});
@@ -531,7 +531,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmWorkloads();
 						}
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/core/xmWorkload/XmWorkloadSimpleList.vue

@@ -141,7 +141,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -228,7 +228,7 @@
 				this.getXmWorkloads();
 			},
 			searchXmWorkloads(){
-				 this.pageInfo.count=true;
+				 this.pageInfo.countSql=true;
 				 this.getXmWorkloads();
 			},
 			//获取列表 XmWorkload 工时登记表
@@ -237,7 +237,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -272,7 +272,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmWorkloads = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -293,7 +293,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmWorkloads();
 				this.$emit('submit',this.editForm)
 			},
@@ -316,7 +316,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmWorkloads();
 							this.$emit('submit',this.editForm)
 						}
@@ -340,7 +340,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmWorkloads();
 							this.$emit('submit')
 						}

src/views/xm/core/xmWorkload/XmWorkloadSimpleListForBizDate.vue

@@ -126,7 +126,7 @@
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
+					countSql:true,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -221,7 +221,7 @@
 				this.getXmWorkloads();
 			},
 			searchXmWorkloads(){
-				 this.pageInfo.count=true;
+				 this.pageInfo.countSql=true;
 				 this.getXmWorkloads();
 			},
 			//获取列表 XmWorkload 工时登记表
@@ -230,7 +230,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count:this.pageInfo.count
+					countSql:this.pageInfo.countSql
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -281,7 +281,7 @@
 					var tips=res.data.tips;
 					if(tips.isOk){
 						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
+						this.pageInfo.countSql=false;
 						this.xmWorkloads = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
@@ -302,7 +302,7 @@
 			},
 			afterAddSubmit(){
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.countSql=true;
 				this.getXmWorkloads();
 				this.$emit('submit',this.editForm)
 			},
@@ -325,7 +325,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if(tips.isOk){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmWorkloads();
 							this.$emit('submit',this.editForm)
 						}
@@ -349,7 +349,7 @@
 						this.load.del=false;
 						var tips=res.data.tips;
 						if( tips.isOk ){
-							this.pageInfo.count=true;
+							this.pageInfo.countSql=true;
 							this.getXmWorkloads();
 							this.$emit('submit')
 						}
@@ -391,7 +391,7 @@
 					this.load.edit=false;
 					var tips=res.data.tips;
 					if( tips.isOk ){
-						this.pageInfo.count=true;
+						this.pageInfo.countSql=true;
 						this.getXmWorkloads();
 					}
 					this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error'});

src/views/xm/rpt/product/menuSort.vue

@@ -123,7 +123,7 @@
 					//分页数据
 					total: 0, //服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize: this.queryScope==='plan' || this.queryScope==='planTask'?50:20, //每页数据
-					count: false, //是否需要重新计算总记录数
+					countSql: false, //是否需要重新计算总记录数
 					pageNum: 1, //当前页码、从1开始计算
 					orderFields: ["value"], //排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs: ["desc"], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -171,7 +171,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count: this.pageInfo.count,
+					countSql: this.pageInfo.countSql,
 				};
 				if(this.filters.dtype){
 					params.dtype=this.filters.dtype

src/views/xm/rpt/product/questionSort.vue

@@ -136,7 +136,7 @@
 					//分页数据
 					total: 0, //服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize: 20, //每页数据
-					count: false, //是否需要重新计算总记录数
+					countSql: false, //是否需要重新计算总记录数
 					pageNum: 1, //当前页码、从1开始计算
 					orderFields: ["value"], //排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs: ["desc"], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -184,7 +184,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count: this.pageInfo.count,
+					countSql: this.pageInfo.countSql,
 				};
 				if(this.filters.solution){
 					params.solution=this.filters.solution

src/views/xm/rpt/project/taskSort.vue

@@ -120,7 +120,7 @@
 					//分页数据
 					total: 0, //服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
 					pageSize: 20, //每页数据
-					count: false, //是否需要重新计算总记录数
+					countSql: false, //是否需要重新计算总记录数
 					pageNum: 1, //当前页码、从1开始计算
 					orderFields: ["value"], //排序列 如 ['sex','student_id']，必须为数据库字段
 					orderDirs: ["desc"], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -168,7 +168,7 @@
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
 					total: this.pageInfo.total,
-					count: this.pageInfo.count,
+					countSql: this.pageInfo.countSql,
 				};
 				if(this.filters.taskType){
 					params.taskType=this.filters.taskType