Bläddra i källkod

修复小BUG,增加导出列表及接口

wukai 11 månader sedan
förälder
incheckning
7273ec643f
2 ändrade filer med 62 tillägg och 27 borttagningar
  1. 6 6
      css/main.css
  2. 56 21
      main.html

+ 6 - 6
css/main.css

@@ -11,7 +11,7 @@
         border: 1px solid #7DA2CD;
         height: 32px;
     }
-    tbody tr{ 
+    tbody tr{
         background: rgba(25,57,103,0.3);
         border: 1px solid #7DA2CD;
         height: 32px;
@@ -110,7 +110,7 @@
     #imp_item{
         position: absolute;
         width: 160px;
-        height: 150px;
+        height: 250px;
         background: rgba(19, 47, 95, 0.8);
         box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.2);
         border-radius: 2px 2px 2px 2px;
@@ -312,7 +312,7 @@
         margin-left:-400px;
         z-index: 2;
         background-color: rgba(9,28,67,0.9);
-        border: 2px solid #445985;      
+        border: 2px solid #445985;
         display: none;
         color: #7E96D9;
     }
@@ -358,7 +358,7 @@
     }
     .newwin .btn_active{
         background-color: #a09ef5;
-        font-weight: bold; 
+        font-weight: bold;
         color: #fff;
     }
     .newwin table{
@@ -436,7 +436,7 @@
         font-size: 11px;
         cursor: pointer;
         padding: 0 3px;
-        border-radius: 3px;        
+        border-radius: 3px;
     }
     .ui-datepicker-calendar tbody tr{
         font-size: 14px !important
@@ -461,4 +461,4 @@
         margin-top: 10px;
         padding: 0 9px;
         border-radius: 3px;
-    }
+    }

+ 56 - 21
main.html

@@ -24,12 +24,14 @@
          onclick="backMasterView()"><img src="image/view.png"></div>
 </div>
 <div id="imp_item">
-<!--    <div itemcode="1"><span>停机原因</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 itemcode="3"><span>稼动率</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div>-->
-<!--    <div itemcode="4"><span>生产趋势</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div>-->
-<!--    <div itemcode="5"><span>能耗趋势</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div>-->
-    <div itemcode="6"><span>送经量</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div>
+    <div itemcode="1"><span>生产数据</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 itemcode="3"><span>叫料分析</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div>
+    <div itemcode="4"><span>断纱分析</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div>
+    <div itemcode="5"><span>下卷分析</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div>
+    <div itemcode="6"><span>告警分析</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div>
+    <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="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>
@@ -2297,22 +2299,55 @@
         $("#imp_item>div").on('click', function (e) {
             //导出数据
             var code = $(this).attr("itemcode")
+            switch (parseInt(code)) {
+                case 1:
+                    //alert("生产");
+                    window.open(SERVER_URL + "/export/production");
+                    break;
+                case 2:
+                    // alert("停机原因");
+                    window.open(SERVER_URL + "/export/stops?start=2024-07-05%2014:00:00&end=2024-07-05%2018:00:00");
+                    break;
+                case 3:
+                    // alert("叫料");
+                    window.open(SERVER_URL + "/export/export/stops/type/7?start=2024-07-05&end=2024-07-05&st=7&et=19");
+                    break;
+                case 4:
+                    // alert("断纱");
+                    window.open(SERVER_URL + "/export/export/stops/type/1?start=2024-07-05&end=2024-07-05&st=7&et=19");
+                    break;
+                case 5:
+                    // alert("下卷");
+                    window.open(SERVER_URL + "/export/export/stops/type/6?start=2024-07-05&end=2024-07-05&st=7&et=19");
+                    break;
+                case 6:
+                    // alert("告警");
+                    window.open(SERVER_URL + "/export/alarms?start=2024-07-05%2014:00:00&end=2024-07-05%2018:00:00");
+                    break;
+                case 7:
+                    // alert("平方米克重")
+                    window.open(SERVER_URL + "/export/gram-mass");
+                    break;
+                case 8:
+                    // alert("送经量");
+                    window.open(SERVER_URL + "/export/warp-run-in");
+                    break;
+            }
             //var devcode =$.trim($("#imp_devcode").val())
-            if(code=='6'){
-                window.open(SERVER_URL + "/warp/run-in");
-            }else if (code == "2") {
-                //自定义日期导出
-                e.stopPropagation();
-                var day = new Date();
-                var day1 = new Date().setDate(day.getDate() - 7)
-                $("#datepicker1").val(new Date(day1).Format("yyyy-MM-dd"))
-                $("#datepicker2").val(day.Format("yyyy-MM-dd"))
-                $("#date_select").show().css({
-                    "top": $(this).offset().top + 47 + "px",
-                    "left": $(this).offset().left + $("#imp_item").width() - $("#date_select").width() - 5 + "px"
-                })
-            } else if (code == "1"){ window.open(SERVER_URL + "/export")
-            }else {e.stopPropagation();}
+
+            // if (code == "2") {
+            //      //自定义日期导出
+            //      e.stopPropagation();
+            //      var day = new Date();
+            //      var day1 = new Date().setDate(day.getDate() - 7)
+            //      $("#datepicker1").val(new Date(day1).Format("yyyy-MM-dd"))
+            //      $("#datepicker2").val(day.Format("yyyy-MM-dd"))
+            //      $("#date_select").show().css({
+            //          "top": $(this).offset().top + 47 + "px",
+            //          "left": $(this).offset().left + $("#imp_item").width() - $("#date_select").width() - 5 + "px"
+            //      })
+            //  } else if (code == "1"){ window.open(SERVER_URL + "/export")
+            //  }else {e.stopPropagation();}
         })
         //自定义导出日期确定
         $("#date_select .dateSelected_ok").on('click', function () {