Parcourir la source

添加生产绩效功能

wukai il y a 7 mois
Parent
commit
1b766f4b31
2 fichiers modifiés avec 24 ajouts et 2 suppressions
  1. 1 1
      global.js
  2. 23 1
      main.html

+ 1 - 1
global.js

@@ -1,5 +1,5 @@
 var AutoPlayer = false; //开启自动漫游
-var SERVER_URL = "http://192.168.66.133:8080/api"; //服务接口地址
+var SERVER_URL = "http://localhost:8080/api"; //服务接口地址
 var PLAYER3D_URL = "ws://192.168.66.133:8082"; //
 var DEV_ALAR_COLOR = "ff6c00"; //全局设备告警颜色
 var DEV_HINT_COLOR = "d69d85"; //设备盘头剩余20-50之间的提示颜色

+ 23 - 1
main.html

@@ -33,6 +33,8 @@
     <div itemcode="7"><span>平方米克重</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div>
     <div itemcode="8"><span>送经量</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div>
     <div itemcode="9"><span>纱线规格</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div>
+    <div itemcode="10"><span>生产绩效日报</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div>
+    <div itemcode="11"><span>生产绩效月报</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div>
     <!--			<div itemcode="1"><span>最近7天</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div>-->
     <!--			<div itemcode="2"><span>自定义日期</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div>-->
 </div>
@@ -2530,6 +2532,20 @@
                     });
                     //window.open(SERVER_URL + "/export/yarn-specifications");
                     break;
+                case 10:
+                case 11:
+                    e.stopPropagation();
+                    $("#date_select .hourAreaSelect").hide();
+                    $("#date_select .hourPointSelect").hide();
+                    $date_select.show().css({
+                        "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;
             }
         })
         //自定义导出日期确定
@@ -2538,7 +2554,7 @@
             var s2 = $("#datepicker2").val()
             //var devcode = $.trim($("#imp_devcode").val())
             var itemcode = $("#date_select").attr("itemcode");
-            if (s1 == "" || (s2 == ""&&itemcode!=4)) return;
+            if (s1 == "" || (s2 == ""&&itemcode!=4&&itemcode!=10&&itemcode!=11)) return;
             switch (parseInt(itemcode)) {
                 case 1:
                     window.open(SERVER_URL + "/export/production?start="+s1+"&end="+s2);
@@ -2570,6 +2586,12 @@
                     s2 = s2 +" "+h2+":00:00"
                     window.open(SERVER_URL + "/export/alarms?start="+s1+"&end="+s2);
                     break;
+                case 10:
+                    window.open(SERVER_URL + "/export/productivity-day?date="+s1);
+                    break;
+                case 11:
+                    window.open(SERVER_URL + "/export/productivity-month?date="+s1);
+                    break;
             }
             $("body").trigger('click')
         });