From 58bcfbdfa04296976b358f7726bd07105ef65690 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期四, 13 五月 2021 14:30:07 +0800
Subject: [PATCH] 仓库看板

---
 HDLine.html |   68 +++++++++++++++++++++++++--------
 1 files changed, 51 insertions(+), 17 deletions(-)

diff --git a/HDLine.html b/HDLine.html
index 86c461e..1427b99 100644
--- a/HDLine.html
+++ b/HDLine.html
@@ -255,7 +255,7 @@
             background: #000000;
         }
         
-        .pull-right {
+        .pull-right,.fixed-table-pagination .pagination-detail, .fixed-table-pagination div.pagination {
             display: none;
         }
         
@@ -308,11 +308,21 @@
             DataTable();
             // 瀹氭椂鍣�
             interval = setInterval(function () {
+                hours = [];
+                hoursqty = [];
+                CloseProgress = 0;  //瀹屽伐鐜�
+                LineName = [];  //娴佹按绾挎暟缁�
+                LineOrderQty = [];  //娴佹按绾垮綋澶╄鍗曟�讳换鍔℃暟閲忔暟缁�
+                LineOrderCloseQty = [];  //娴佹按绾垮綋澶╄鍗曟�诲畬鎴愭暟閲忔暟缁�
+                Week = 0;  //鏈懆鍒嗘瀽
+                Month = 0; //鏈湀鍒嗘瀽
                 Chart(mychart1, mychart2, mychart3, mychart4, mychart5);
-            }, 120000);
-            interval1 = setInterval(function () {
-                DataTable();
-            }, 120000);
+            }, 20000);
+            setInterval(function () {
+                //num+=1;
+                //$("#tb_order").bootstrapTable('refreshOptions',{offset:num});  // pageNumber:1, 鎸囧畾椤电爜涓虹1椤�
+                $("#tb_order").bootstrapTable('refresh');
+            }, 10000);
             //鏍规嵁绐楀彛鐨勫ぇ灏忓彉鍔ㄥ浘琛� --- 閲嶇偣
             window.onresize = function () {
                 myChart1.resize();
@@ -330,7 +340,7 @@
                 async: false,//浣跨敤鍚屾鐨勬柟寮�,true涓哄紓姝ユ柟寮�
                 type: "Get",
                 success: function (data) {
-                    console.log(data);
+                    
                     $.each(data.data[0], function (index, val) {
                         hours.push(val.hour + '鐐�');
                         hoursqty.push(parseFloat(val.Count).toFixed(2));
@@ -347,12 +357,29 @@
                         $("#SumDay").html(data.data[1][3].qty.toFixed(2));      //浠婃棩璁㈠崟姹囨��
                     }
                     if (data.data[2].length > 0) {
+                        if(data.data[2][0].FSTATUS==1){
+                            $("#LineStus").html("璁″垝");
+                        }if(data.data[2][0].FSTATUS==2){
+                            $("#LineStus").html("璁″垝纭");
+                        }if(data.data[2][0].FSTATUS==3){
+                            $("#LineStus").html("涓嬭揪");
+                        }if(data.data[2][0].FSTATUS==4){
+                            $("#LineStus").html("寮�宸�");
+                        }if(data.data[2][0].FSTATUS==5){
+                            $("#LineStus").html("瀹屽伐");
+                        }if(data.data[2][0].FSTATUS==6){
+                            $("#LineStus").html("缁撴");
+                        }  
+                        if(data.data[2][0].FSTATUS==7){
+                            $("#LineStus").html("缁撶畻");
+                        }                       
                         $("#OrderWork").html(data.data[2][0].FBILLNO);//褰撳墠璁㈠崟
                         $("#PartName").html(data.data[2][0].FNAME); //褰撳墠鐗╂枡鍚嶇О
                         $("#PartSpec").html(data.data[2][0].FSPECIFICATION);//褰撳墠鐗╂枡瑙勬牸
                         
                     }
                     CloseProgress = parseFloat(data.data[1][1].qty / data.data[1][0].qty).toFixed(2);  //瀹屾垚鐜�
+                    
                     
                     //浠婃棩鍏ㄩ儴娴佹按绾夸骇閲忓姣�
                     $.each(data.data[3], function (index, val) {
@@ -363,9 +390,9 @@
                     });
                     
                     //鏈懆鍒嗘瀽
-                    Week = parseFloat(25000 / data.data[4][0].weekqty).toFixed(2);
+                    Week = parseFloat(data.data[4][1].weekqty / data.data[4][0].weekqty).toFixed(2);
                     //鏈湀鍒嗘瀽
-                    Month = parseFloat(20000 / data.data[4][2].weekqty).toFixed(2);
+                    Month = parseFloat(data.data[4][3].weekqty / data.data[4][2].weekqty).toFixed(2);
                 },
                 error: function (data) {
                     
@@ -507,7 +534,7 @@
                         show: false
                     },
                     labelLine: {
-                        show: true
+                        show: false
                     },
                     itemStyle: {
                         borderWidth: 3,
@@ -662,7 +689,7 @@
                         show: false
                     },
                     labelLine: {
-                        show: true
+                        show: false
                     },
                     itemStyle: {
                         borderWidth: 3,
@@ -725,7 +752,7 @@
                         show: false
                     },
                     labelLine: {
-                        show: true
+                        show: false
                     },
                     itemStyle: {
                         borderWidth: 3,
@@ -754,7 +781,7 @@
                 //data: dataJson,
                 method: 'get',                      //璇锋眰鏂瑰紡锛�*锛�
                 dataType: "json",
-                queryParams: queryParams,//浼犻�掑弬鏁帮紙*锛�
+                queryParams :queryParams,
                 striped: false,                      //鏄惁鏄剧ず琛岄棿闅旇壊
                 cache: false,                       //鏄惁浣跨敤缂撳瓨锛岄粯璁や负true锛屾墍浠ヤ竴鑸儏鍐典笅闇�瑕佽缃竴涓嬭繖涓睘鎬э紙*锛�
                 pagination: true,                   //鏄惁鏄剧ず鍒嗛〉锛�*锛�
@@ -763,9 +790,9 @@
                 search: false,   //鏄惁鍚敤鎼滅储妗�
                 sidePagination: "server",           //鍒嗛〉鏂瑰紡锛歝lient瀹㈡埛绔垎椤碉紝server鏈嶅姟绔垎椤碉紙*锛�
                 pageNumber: 1,                       //鍒濆鍖栧姞杞界涓�椤碉紝榛樿绗竴椤�
-                pageSize: 8,                       //姣忛〉鐨勮褰曡鏁帮紙*锛�
-                pageList: [8],                     //鍙緵閫夋嫨鐨勬瘡椤电殑琛屾暟锛�*锛�
-                strictSearch: false,                 //璁剧疆涓� true鍚敤 鍏ㄥ尮閰嶆悳绱紝鍚﹀垯涓烘ā绯婃悳绱�
+                pageSize: 10,                       //姣忛〉鐨勮褰曡鏁帮紙*锛�
+                pageList: [10],                     //鍙緵閫夋嫨鐨勬瘡椤电殑琛屾暟锛�*锛�
+                strictSearch: false,                //璁剧疆涓� true鍚敤 鍏ㄥ尮閰嶆悳绱紝鍚﹀垯涓烘ā绯婃悳绱�
                 clickToSelect: true,                //鏄惁鍚敤鐐瑰嚮閫変腑琛�
                 singleSelect: true,                  //璁剧疆True 灏嗙姝㈠閫�
                 uniqueId: "ID",                     //姣忎竴琛岀殑鍞竴鏍囪瘑锛屼竴鑸负涓婚敭鍒�
@@ -811,6 +838,9 @@
                             break;
                             case '6':
                             return "缁撴";
+                            break;
+                            case '7':
+                            return "缁撶畻";
                             default:
                             
                         }
@@ -831,7 +861,11 @@
                     
                 },
                 onLoadSuccess: function (row) {
-                    var a = $('#tb_order').bootstrapTable('getSelections');
+                    var num_total = (row.total)/ 10
+                    if (num >= num_total) {
+                        num = 0
+                    }
+                    //var a = $('#tb_order').bootstrapTable('getSelections');
                 }
                 
             })
@@ -868,7 +902,7 @@
         </div>
         <div class="col-sm-3">
             <ul id="cList">
-                <li>鏈嚎鐘舵�侊細<span id="LineStus">鎵ц涓璦a</span></li>
+                <li>鏈嚎鐘舵�侊細<span id="LineStus"></span></li>
                 <li>鎬昏鍗曪細<span id="OrderQty">0</span></li>
                 <li>宸插叆搴擄細<span id="OrderInQty">0</span></li>
                 <li>杩斿伐鏁帮細<span id="FGQty">0</span></li>

--
Gitblit v1.9.1