Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.js =================================================================== diff -u -r41118 -r41288 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.js (.../qualitymonitoringInstanceView.js) (revision 41118) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.js (.../qualitymonitoringInstanceView.js) (revision 41288) @@ -16,7 +16,7 @@ height: 550, id: 'qualityMonitoringWin', grid: grid, - url: WWWROOT + '/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.jsp' + url: WWWROOT + '/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.jsp?id='+id } getFormByIframeUtil(params, function (contentWindow) { contentWindow.addQualityMonitoring(id); Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js =================================================================== diff -u -r41278 -r41288 --- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js (.../routineMonitoringForm.js) (revision 41278) +++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js (.../routineMonitoringForm.js) (revision 41288) @@ -483,13 +483,13 @@ }, { id: 'name', header: "监测项名称", - width: 180, + width: actualWidth > 500 ? 180 : actualWidth / 3, menuDisabled: true, dataIndex: 'name' }, { id: 'dateTime', header: "录入时间", - width: 120, + width: actualWidth > 500 ? 120 : actualWidth / 3, menuDisabled: true, dataIndex: 'dateTime' }, { @@ -525,7 +525,7 @@ id: 'qmGridPanel', store: qmInstanceStore, cm: cm, - width: 620, + width: actualWidth > 500 ? 620 : (actualWidth - 30), height: 120, tbar: tbar, viewConfig: { Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringQmForm.js =================================================================== diff -u -r41278 -r41288 --- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringQmForm.js (.../routineMonitoringQmForm.js) (revision 41278) +++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringQmForm.js (.../routineMonitoringQmForm.js) (revision 41288) @@ -41,7 +41,7 @@ //返回炉次显示框 质量监测 function createRoutineMonitoringElementSterNameQW(value) { return { - columnWidth: .5, + columnWidth: columnWidth, layout: 'form', labelWidth: 90, items: [{ @@ -60,7 +60,7 @@ // 返回炉号显示框 质量监测 function createRoutineMonitoringElementSterFreQW(value) { return { - columnWidth: .5, + columnWidth: columnWidth, layout: 'form', labelWidth: 90, items: [{ @@ -151,6 +151,10 @@ * qmInstanceId */ function addQualityMonitoring(qmInstanceId) { + var actualWidth = document.body.clientWidth; + var actualHeight = document.body.clientHeight; + var columnWidth = actualWidth > 500 ? 0.5 : 1; + var materialDefinitionStore = new Ext.data.Store({ proxy: new Ext.data.HttpProxy({ url: WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getMaterialDefinitionData.do', @@ -222,8 +226,8 @@ frame: true, labelSeparator: ':', bodyStyle: 'padding:5px 5px 0px 5px', - width: 600, - height: 500, + width: actualWidth, + height: actualHeight, labelAlign: 'right', buttonAlign: 'center', autoScroll: true, @@ -272,7 +276,7 @@ id: 'optionAmount2' }, { layout: 'form', - columnWidth: .5, + columnWidth: columnWidth, labelWidth: 90, items: [{ xtype: 'combo', @@ -313,7 +317,7 @@ }] }, { layout: 'form', - columnWidth: .5, + columnWidth: columnWidth, labelWidth: 90, items: [{ xtype: 'datefieldWithMin', @@ -328,7 +332,7 @@ }] }, { layout: 'form', - columnWidth: .5, + columnWidth: columnWidth, labelWidth: 90, items: [{ xtype: 'textfield', @@ -347,7 +351,7 @@ }] }, { layout: 'form', - columnWidth: .5, + columnWidth: columnWidth, labelWidth: 90, items: [{ xtype: 'combo', @@ -383,7 +387,7 @@ }] }, { layout: 'form', - columnWidth: .5, + columnWidth: columnWidth, labelWidth: 90, items: [{ xtype: 'combo', @@ -409,7 +413,7 @@ }] }, { layout: 'form', - columnWidth: .5, + columnWidth: columnWidth, labelWidth: 90, items: [{ xtype: 'numberfield', @@ -421,7 +425,7 @@ }] }, { layout: 'form', - columnWidth: .5, + columnWidth: columnWidth, labelWidth: 90, items: [{ xtype: 'textfield', @@ -434,7 +438,7 @@ }] }, { layout: 'form', - columnWidth: .5, + columnWidth: columnWidth, labelWidth: 90, items: [{ xtype: 'textfield', @@ -478,7 +482,7 @@ id: 'qualityMonitoringWin', layout: 'fit', title: '质量监测信息', - width: 700, + width: actualWidth, modal: true, autoHeight: true, border: false,