|
@@ -43,14 +43,14 @@
|
|
|
<input type="text" id="datepicker1" readonly="readonly" style="pointer-events: none;">
|
|
|
</div>
|
|
|
<div style="margin-top: 5px;" class="hourPointSelect">
|
|
|
- <select id="hourP1" style="margin-left: 34px;width: 147px;border-radius: 4px;height: 18px;"></select>
|
|
|
+ <select id="hourP1" style="margin-left: 45px;width: 173px;border-radius: 4px;height: 24px;"></select>
|
|
|
</div>
|
|
|
<div style="margin-top: 5px;">
|
|
|
<label for="datepicker2">结束:</label>
|
|
|
<input type="text" id="datepicker2" readonly="readonly" style="pointer-events: none;">
|
|
|
</div>
|
|
|
<div style="margin-top: 5px;" class="hourPointSelect">
|
|
|
- <select id="hourP2" style="margin-left: 34px;width: 147px;border-radius: 4px;height: 18px;"></select>
|
|
|
+ <select id="hourP2" style="margin-left: 45px;width: 173px;border-radius: 4px;height: 24px;"></select>
|
|
|
</div>
|
|
|
<div style="margin-top: 5px;" class="hourAreaSelect">
|
|
|
<label>时间:</label>
|
|
@@ -2337,7 +2337,8 @@
|
|
|
$("#datepicker2").datepicker("option", "minDate", new Date(day1).Format("yyyy-MM-dd"));
|
|
|
$("#datepicker2").val(new Date(day).Format("yyyy-MM-dd"))
|
|
|
$("#hour1,#hourP1").val("7")
|
|
|
- $("#hour2,#hourP2").val("19")
|
|
|
+ $("#hour2,#hourP2").val("19");
|
|
|
+ $("#datepicker2").parent().show();//显示结束日期选择
|
|
|
switch (parseInt(code)) {
|
|
|
case 1:
|
|
|
//alert("生产");
|
|
@@ -2354,7 +2355,7 @@
|
|
|
// alert("停机原因");
|
|
|
e.stopPropagation();
|
|
|
$("#date_select .hourAreaSelect").hide();
|
|
|
- $("#date_select .hourPointSelect").show();
|
|
|
+ $("#date_select .hourPointSelect").show();
|
|
|
$date_select.show().css({
|
|
|
"top": $(this).offset().top-10 + "px",
|
|
|
"left": $("#imp_item").offset().left- $("#date_select").width()-20 + "px"
|
|
@@ -2379,6 +2380,10 @@
|
|
|
"top": $(this).offset().top-10 + "px",
|
|
|
"left": $(this).offset().left - $("#date_select").width()-20 + "px"
|
|
|
})
|
|
|
+ $("#datepicker2").parent().hide();//隐藏结束日期选择
|
|
|
+ var preday=new Date();
|
|
|
+ preday = preday.setDate(new Date().getDate()-1);
|
|
|
+ $("#datepicker1,#datepicker2").val(new Date(preday).Format("yyyy-MM-dd"));//默认为前一天
|
|
|
break;
|
|
|
case 5:
|
|
|
// alert("并发下卷分析");
|