Index: ssts-web/src/main/webapp/disinfectsystem/instrumentInstanceManager/instrumentInstanceForm.js =================================================================== diff -u -r34710 -r34714 --- ssts-web/src/main/webapp/disinfectsystem/instrumentInstanceManager/instrumentInstanceForm.js (.../instrumentInstanceForm.js) (revision 34710) +++ ssts-web/src/main/webapp/disinfectsystem/instrumentInstanceManager/instrumentInstanceForm.js (.../instrumentInstanceForm.js) (revision 34714) @@ -231,12 +231,15 @@ //加载器械实例使用记录 function useRecordStoreFun(instrumentInstanceId) { - var useRecordStore = new top.Ext4.data.JsonStore({ + var pageSize = 20; + var useRecordStore = top.Ext4.create('Ext.data.Store', { + pageSize: pageSize, proxy: { type: 'ajax', url: WWWROOT + '/disinfectSystem/baseData/instrumentInstanceController/loadInstrumentInstanceUseRecord.mhtml', reader: { - root: 'data' + root: 'data', + totalProperty: 'rowCount' } }, fields: [ Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/instrumentConfig.js =================================================================== diff -u -r34674 -r34714 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/instrumentConfig.js (.../instrumentConfig.js) (revision 34674) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/instrumentConfig.js (.../instrumentConfig.js) (revision 34714) @@ -254,8 +254,8 @@ }), baseParams: { instrumentInstanceId: instrumentInstanceId, - pageSize: 3, - pageNum: 0 + limit: 3, + page: 0 }, reader: new Ext.data.JsonReader({ root: 'data' Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/controller/InstrumentInstanceController.java =================================================================== diff -u -r34678 -r34714 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/controller/InstrumentInstanceController.java (.../InstrumentInstanceController.java) (revision 34678) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/controller/InstrumentInstanceController.java (.../InstrumentInstanceController.java) (revision 34714) @@ -74,10 +74,10 @@ * @return */ @RequestMapping("/loadInstrumentInstanceUseRecord") - public String loadInstrumentInstanceUseRecord(Long instrumentInstanceId, String spell, Integer pageSize, Integer pageNum){ + public String loadInstrumentInstanceUseRecord(Long instrumentInstanceId, String spell, Integer limit, Integer page){ JSONObject result = JSONUtil.buildJsonObject(true); try { - result = instrumentInstanceManager.loadInstrumentInstanceUseRecord(instrumentInstanceId, spell, pageSize, pageNum); + result = instrumentInstanceManager.loadInstrumentInstanceUseRecord(instrumentInstanceId, spell, limit, page); } catch (Exception e) { result = JSONUtil.buildJsonObject(false, "加载失败:" + e.getMessage()); }