5 éve · a9bce10a14
--- a/watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_statistics.ftl
+++ b/watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_statistics.ftl
@@ -168,7 +168,7 @@
 
				                                 trigger: 'axis'
			
 
				                             },
			
 
				                             legend: {
			
 
				-                                data:['本月故障机器']
			
 
				+                                data:['返厂日期']
			
 
				                             },
			
 
				                             toolbox: {
			
 
				                                 show : true,
			
@@ -192,16 +192,16 @@
 
				                                 }
			
 
				                             ],
			
 
				                             series : {
			
 
				-                                name:'本月故障机器',
			
 
				+                                name:'返厂日期',
			
 
				                                 type:'bar',
			
 
				-                                data:newNumArray,
			
 
				+                                data:newNumArray
			
 
				 //								barWidth : 10%,
			
 
				-                                markPoint : {
			
 
				-                                    data : [
			
 
				-                                        {type : 'max', name: '最大值'},
			
 
				-                                        {type : 'min', name: '最小值'}
			
 
				-                                    ]
			
 
				-                                }
			
 
				+//                                markPoint : {
			
 
				+//                                    data : [
			
 
				+//                                        {type : 'max', name: '最大值'},
			
 
				+//                                        {type : 'min', name: '最小值'}
			
 
				+//                                    ]
			
 
				+//                                }
			
 
				 //                                ,markLine : {
			
 
				 //                                    data : [
			
 
				 //                                        {type : 'average', name: '平均值'}
			
--- a/watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_statistics_config.ftl
+++ b/watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_statistics_config.ftl
@@ -33,7 +33,7 @@
 
				 	<body>
			
 
				 
			
 
				         <div class="input-box" style="height: 45px;" class="dataTableStatis" seachType="2">
			
 
				-            <label class="form-label col-2 col-sm-2 huanhang" style="text-align: right;margin: 10px 0px;font-weight: bold;font-size: 23px;">${detectionConfig.configDetectContent!''}</label>
			
 
				+            <label class="form-label col-2 col-sm-2 huanhang" style="text-align: right;margin: 10px 0px;font-weight: bold;font-size: 23px;">${detectionConfig.configDetectContent!''}: </label>
			
 
				             <div class="formControls col-2 col-sm-2 text-c huanhang" style="margin-left: -4%;margin: 10px 0px 10px -19px;">
			
 
				                 <input class="my-input beginTime" style="width: 90%;" type="text" value="" name="beginTime_2" id="beginTime_2" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M',dateFmt: 'yyyy-MM',onpicked: getResetDateByTime,oncleared :getResetDateByTime })" placeholder="生产日期(开始)" readonly="readonly"/>
			
 
				             </div>
			
@@ -145,7 +145,7 @@
 
				                         };
			
 
				 
			
 
				                         // 使用刚指定的配置项和数据显示图表。
			
 
				-                        myChart.setOption(option);
			
 
				+                        myChart.setOption(option,true);
			
 
				                     }else{
			
 
				                         layer.msg("获取信息失败！", {icon: 5, time: 3000});
			
 
				                     }