Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp
===================================================================
diff -u -r41248 -r41479
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp (.../washDataLineChart.jsp) (revision 41248)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp (.../washDataLineChart.jsp) (revision 41479)
@@ -49,7 +49,7 @@
color: red;
}
- #div2 {
+ #div2,#div3 {
width: 280px;
/* height:400px; */
overflow: auto;
@@ -58,7 +58,7 @@
font-size: 14px;
}
- #div2 table {
+ #div2 table,#div3 table {
width: 260px;
}
@@ -245,6 +245,8 @@
html += '';
document.getElementById("div2").innerHTML = html;
document.getElementById("div2").style.display = "block";
+ document.getElementById("div3").innerHTML = html;
+ document.getElementById("div3").style.display = "block";
}
}
});
@@ -385,6 +387,7 @@
结束时间:
清洗操作人:
AO值:
+
@@ -404,7 +407,7 @@
|
-
+
|
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
===================================================================
diff -u -r41452 -r41479
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 41452)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 41479)
@@ -131,8 +131,10 @@
}
var data = resultStr.data;
if (data.deviceBrand == marge) {
- if (data.deviceModel == MARGE_MODEL_MAG_CL4 || data.deviceModel == MARGE_MODEL_MAG_GSZK260_CSV) {
+ if (data.deviceModel == MARGE_MODEL_MAG_CL4) {
winByDeviceModel(id, data.deviceModel);
+ }else if(data.deviceModel == MARGE_MODEL_MAG_GSZK260_CSV){
+ getWashDataLineCharByIframeUtil(id, data.deviceModel, data.deviceBrand);
} else {
var deviceModel = encodeURIComponent(data.deviceModel);
openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.jsp?washAndDisinfectRecordId=' + id + '&deviceModel=' + deviceModel, '', '清洗参数', '800', '600');