Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.jsp
===================================================================
diff -u -r25473 -r25677
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.jsp	(.../wahsDataChartOfMarge.jsp)	(revision 25473)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.jsp	(.../wahsDataChartOfMarge.jsp)	(revision 25677)
@@ -86,7 +86,7 @@
 					<td><span class="fieldName">启动时间：</span><input readonly ="true" type="text"class="fieldValue" name="startTime"/></td>
 				</tr>
 				<tr>
-					<td><span class="fieldName">结束时间：</span><input readonly ="true" class="fieldValue" type="text" name="endTime"/></td>
+					<td><span class="fieldName">结束时间(时:分:秒)：</span><input readonly ="true" class="fieldValue" type="text" name="endTime"/></td>
 				</tr>
 	    	</table>
 		</form>
@@ -126,7 +126,7 @@
 				<tr>
 					<td><span class="fieldName">完成状态：</span><input readonly ="true" class="fieldValue" type="text" name="washStatus"/></td>
 					<td><span class="fieldName">启动时间：</span><input readonly ="true" type="text"class="fieldValue" name="startTime"/></td>
-					<td><span class="fieldName">结束时间：</span><input readonly ="true" class="fieldValue" type="text" name="endTime"/></td>
+					<td><span class="fieldName">结束时间(时:分:秒)：</span><input readonly ="true" class="fieldValue" type="text" name="endTime"/></td>
 				</tr>
 	    	</table>
 	    </form>
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.js
===================================================================
diff -u -r25473 -r25677
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.js	(.../wahsDataChartOfMarge.js)	(revision 25473)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.js	(.../wahsDataChartOfMarge.js)	(revision 25677)
@@ -77,17 +77,17 @@
 				var xAxisData = [];
 				//x轴与y轴指标的对应:[{name:"指标名称",type:"line",data:[23,12,33]}...]
 				var seriesData = [];
-				//xy对应数据"xyAxisData":示例 [{
-				//     "xAxisData": "2019-1-18 14:30",
-				//     "yAxisData": [{
-				//         "name": "T1",
-				//         "value": "222"
-				//     },{
-				//         "name":"T2",
-				//         "value":"123"
-				//     }]
-				// },{...},...
-				// ]
+				/* xy对应数据"xyAxisData":示例 [{
+				    "xAxisData": "2019-1-18 14:30",
+				    "yAxisData": [{
+				        "name": "T1",
+				        "value": "222"
+				    },{
+				        "name":"T2",
+				        "value":"123"
+				    }]
+				},{...},...
+				] */
 				var xyAxisDatas = chartsData["xyAxisData"];
 				if(xyAxisDatas){
 					for (var i = 0; i < xyAxisDatas.length; i++) {