From 58bcfbdfa04296976b358f7726bd07105ef65690 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期四, 13 五月 2021 14:30:07 +0800
Subject: [PATCH] 仓库看板
---
HDHouse.html | 646 +++++++++++++++--------------------------------------
HDLine.html | 68 ++++-
2 files changed, 240 insertions(+), 474 deletions(-)
diff --git a/HDHouse.html b/HDHouse.html
index 61061e9..8433649 100644
--- a/HDHouse.html
+++ b/HDHouse.html
@@ -27,16 +27,16 @@
margin-top: -75px;
margin-right: 5px;
color: #09d1ea;
-
+
}
-
+
.clock #Date {
text-align: center;
text-shadow: 0 0 0px #00c6ff;
-
-
+
+
}
-
+
.clock ul {
width: 450px;
margin: 0 auto;
@@ -46,7 +46,7 @@
margin-left: 15px;
position: relative;
}
-
+
.clock ul li {
display: inline;
font-size: 24px;
@@ -54,14 +54,14 @@
font-family: 'BebasNeueRegular', Arial, Helvetica, sans-serif;
text-shadow: 0 0 0px #00c6ff;
}
-
+
body {
padding-left: 50px;
padding-right: 50px;
}
-
+
.title {
-
+
font-size: 44px;
font-family: PingFangSC;
font-weight: 500;
@@ -70,7 +70,7 @@
background: url(img/img_little_new.png) center no-repeat;
margin-bottom: 30px;
}
-
+
.flex {
display: flex;
display: -webkit-flex;
@@ -78,7 +78,7 @@
flex-direction: row;
flex-wrap: wrap;
}
-
+
.flex .flex_item {
width: 16%;
height: 180px;
@@ -87,14 +87,14 @@
margin-bottom: 10px;
background: url(img/3-3.png) #02040d no-repeat center top;
position: relative;
-
-
+
+
}
-
+
.flex span {
position: absolute;
top: 50%;
-
+
margin-top: 0;
font-size: 23px;
font-family: PingFangSC;
@@ -103,9 +103,9 @@
width: 100%;
text-align: center;
}
-
+
.flex p {
-
+
margin-bottom: 5px;
color: #a5a5a7;
position: absolute;
@@ -115,7 +115,7 @@
font-weight: 400;
width: 100%
}
-
+
.title_o {
margin-top: 15px;
margin-bottom: 10px;
@@ -124,12 +124,12 @@
font-weight: 400;
color: rgba(9, 209, 234, 1);
}
-
+
.flex_t li {
width: 100%;
-
+
}
-
+
.content_name {
font-size: 16px;
font-family: PingFangSC;
@@ -137,47 +137,47 @@
color: rgba(255, 255, 255, 1);
margin-bottom: 12px;
}
-
+
.content_style {
display: inline-block;
vertical-align: top;
-
+
}
-
+
.w44 {
width: 44%;
margin-right: 15px;
padding: 10px 13px 5px 13px;
}
-
+
.w58 {
width: 53.5%;
-
+
}
-
+
.bg_color {
background: #0C0C18;
}
-
+
.icon_style {
display: inline-block;
width: 40px;
height: 40px;
margin-right: 10px;
}
-
+
.icon_n {
background: url(img/icon_n.png) no-repeat center;
}
-
+
.icon_r {
background: url(img/icon_r.png) no-repeat center;
}
-
+
.icon_c {
background: url(img/icon_c.png) no-repeat center;
}
-
+
.content {
display: inline-block;
width: 49.3%;
@@ -189,68 +189,68 @@
margin-right: 20px;
margin-bottom: 10px;
}
-
+
.content:nth-child(2n) {
margin-right: 0;
}
-
+
.content_style span {
font-size: 14px;
font-family: PingFangSC;
font-weight: 400;
color: rgba(255, 255, 255, 1);
}
-
+
.mr {
margin-right: 35px;
}
-
+
.text_s {
vertical-align: 12px;
}
-
+
.content_mod {
width: 80px;
height: 60px;
border-radius: 2px;
display: inline-block;
-
+
margin-right: 10px;
vertical-align: top;
}
-
+
.content_mod:nth-child(5n) {
margin-right: 0px;
}
-
+
.content_mod_bg_true {
background: url(img/new_icon_true.png) no-repeat center;
border: 1px solid rgba(55, 184, 200, 1);
}
-
+
.content_mod_bg_tf {
background: url(img/new_icon_tf.png) no-repeat center;
border: 1px solid rgba(124, 87, 255, 1);
}
-
+
.content_mod_bg_false {
background: url(img/new_icon_false.png) no-repeat center;
}
-
+
.mt12 {
margin: 12px 0 0 0;
}
-
+
.mb9 {
margin: 0 0 7px 0;
}
-
+
.flex_t {
height: 680px;
overflow: hidden;
}
-
-
+
+
.col-sm-12 {
position: relative;
min-height: 1px;
@@ -262,7 +262,7 @@
var Warehouse = '160'; //姣涘澂浠撳簱
var interval0;//璁℃椂鍣�
$(document).ready(function () {
-
+
// 鍒涘缓涓や釜鍙橀噺锛屼竴涓暟缁勪腑鐨勬湀鍜屾棩鐨勫悕绉�
var monthNames = ["1 鏈�", "2 鏈�", "3 鏈�", "4 鏈�", "5 鏈�", "6 鏈�", "7 鏈�", "8 鏈�", "9 鏈�", "10 鏈�", "11 鏈�", "12 鏈�"];
setInterval(function () {
@@ -275,427 +275,159 @@
var ss = date1.getSeconds();
var dayNames = new Array("鏄熸湡鏃�", "鏄熸湡涓�", "鏄熸湡浜�", "鏄熸湡涓�", "鏄熸湡鍥�", "鏄熸湡浜�", "鏄熸湡鍏�");
var Stamp = new Date();
-
-
+
+
$('#Date').html(year + " 骞�" + " " + monthNames[month] + ' ' + day + " 鏃� " + ' ' + dayNames[Stamp.getDay()]);
$("#hours").html((hh < 10 ? ("0" + hh) : hh));
$("#min").html((mm < 10 ? ("0" + mm) : mm));
$("#sec").html((ss < 10 ? ("0" + ss) : ss));
-
+
}, 1000);
-
+
});
$(function () {
+ TopMap();
DataGrid();
// 瀹氭椂鍣�
interval0 = setInterval(function () {
DataGrid();
}, 120000);
})
- function DataGrid() {
- var data = {
- "dt":
- [
- {
- "STOCKQTY": "10",
- "TODAYINQTY": "10",
- "TODAYOUTQTY": "10",
- "THISMONTHINQTY": "10",
- "THISMONTHOUTQTY": "10",
- "TURNOVERDAY": "10"
- }
- ],
- "dt1":
- [
- {
- "PartName": "#铻虹汗001",
- "StockQty": "10",
- "InRoomQty": "10",
- "OutRoomQty": "10",
- "list": [
- {
- "LocationStatus": "Y",
- "LocationCode": "#10",
- "LocationQty": "10"
- },
- {
- "LocationStatus": "N",
- "LocationCode": "#10",
- "LocationQty": "10"
- }
- ]
- },
- {
- "PartName": "#铻虹汗002",
- "StockQty": "10",
- "InRoomQty": "10",
- "OutRoomQty": "10",
- "list": [
- {
- "LocationStatus": "Y",
- "LocationCode": "#10",
- "LocationQty": "10"
- },
- {
- "LocationStatus": "N",
- "LocationCode": "#10",
- "LocationQty": "10"
- },
- {
- "LocationStatus": "",
- "LocationCode": "#10",
- "LocationQty": "10"
- }
- ]
- },
- {
- "PartName": "#铻虹汗002",
- "StockQty": "10",
- "InRoomQty": "10",
- "OutRoomQty": "10",
- "list": [
- {
- "LocationStatus": "Y",
- "LocationCode": "#10",
- "LocationQty": "10"
- },
- {
- "LocationStatus": "N",
- "LocationCode": "#10",
- "LocationQty": "10"
- },
- {
- "LocationStatus": "",
- "LocationCode": "#10",
- "LocationQty": "10"
- }
- ]
- },
- {
- "PartName": "#铻虹汗002",
- "StockQty": "10",
- "InRoomQty": "10",
- "OutRoomQty": "10",
- "list": [
- {
- "LocationStatus": "Y",
- "LocationCode": "#10",
- "LocationQty": "10"
- },
- {
- "LocationStatus": "N",
- "LocationCode": "#10",
- "LocationQty": "10"
- },
- {
- "LocationStatus": "",
- "LocationCode": "#10",
- "LocationQty": "10"
- }
- ]
- },
- {
- "PartName": "#铻虹汗002",
- "StockQty": "10",
- "InRoomQty": "10",
- "OutRoomQty": "10",
- "list": [
- {
- "LocationStatus": "Y",
- "LocationCode": "#10",
- "LocationQty": "10"
- },
- {
- "LocationStatus": "N",
- "LocationCode": "#10",
- "LocationQty": "10"
- },
- {
- "LocationStatus": "",
- "LocationCode": "#10",
- "LocationQty": "10"
- }
- ]
- },
- {
- "PartName": "#铻虹汗002",
- "StockQty": "10",
- "InRoomQty": "10",
- "OutRoomQty": "10",
- "list": [
- {
- "LocationStatus": "Y",
- "LocationCode": "#10",
- "LocationQty": "10"
- },
- {
- "LocationStatus": "N",
- "LocationCode": "#10",
- "LocationQty": "10"
- },
- {
- "LocationStatus": "",
- "LocationCode": "#10",
- "LocationQty": "10"
- }
- ]
- },
- {
- "PartName": "#铻虹汗002",
- "StockQty": "10",
- "InRoomQty": "10",
- "OutRoomQty": "10",
- "list": [
- {
- "LocationStatus": "Y",
- "LocationCode": "#10",
- "LocationQty": "10"
- },
- {
- "LocationStatus": "N",
- "LocationCode": "#10",
- "LocationQty": "10"
- },
- {
- "LocationStatus": "",
- "LocationCode": "#10",
- "LocationQty": "10"
- }
- ]
- },
- {
- "PartName": "#铻虹汗002",
- "StockQty": "10",
- "InRoomQty": "10",
- "OutRoomQty": "10",
- "list": [
- {
- "LocationStatus": "Y",
- "LocationCode": "#10",
- "LocationQty": "10"
- },
- {
- "LocationStatus": "N",
- "LocationCode": "#10",
- "LocationQty": "10"
- },
- {
- "LocationStatus": "",
- "LocationCode": "#10",
- "LocationQty": "10"
- }
- ]
- },
- {
- "PartName": "#铻虹汗002",
- "StockQty": "10",
- "InRoomQty": "10",
- "OutRoomQty": "10",
- "list": [
- {
- "LocationStatus": "Y",
- "LocationCode": "#10",
- "LocationQty": "10"
- },
- {
- "LocationStatus": "N",
- "LocationCode": "#10",
- "LocationQty": "10"
- },
- {
- "LocationStatus": "",
- "LocationCode": "#10",
- "LocationQty": "10"
- }
- ]
- },
- {
- "PartName": "#铻虹汗002",
- "StockQty": "10",
- "InRoomQty": "10",
- "OutRoomQty": "10",
- "list": [
- {
- "LocationStatus": "Y",
- "LocationCode": "#10",
- "LocationQty": "10"
- },
- {
- "LocationStatus": "N",
- "LocationCode": "#10",
- "LocationQty": "10"
- },
- {
- "LocationStatus": "",
- "LocationCode": "#10",
- "LocationQty": "10"
- }
- ]
- },
- {
- "PartName": "#铻虹汗002",
- "StockQty": "10",
- "InRoomQty": "10",
- "OutRoomQty": "10",
- "list": [
- {
- "LocationStatus": "Y",
- "LocationCode": "#10",
- "LocationQty": "10"
- },
- {
- "LocationStatus": "N",
- "LocationCode": "#10",
- "LocationQty": "10"
- },
- {
- "LocationStatus": "",
- "LocationCode": "#10",
- "LocationQty": "10"
- }
- ]
- },
- {
- "PartName": "#铻虹汗002",
- "StockQty": "10",
- "InRoomQty": "10",
- "OutRoomQty": "10",
- "list": [
- {
- "LocationStatus": "Y",
- "LocationCode": "#10",
- "LocationQty": "10"
- },
- {
- "LocationStatus": "N",
- "LocationCode": "#10",
- "LocationQty": "10"
- },
- {
- "LocationStatus": "",
- "LocationCode": "#10",
- "LocationQty": "10"
- }
- ]
- }
- ]
- }
- console.info(data)
- $("#stockqty").html(data.dt[0].STOCKQTY);
- $("#todayinqty").html(data.dt[0].TODAYINQTY);
- $("#todayoutqty").html(data.dt[0].TODAYOUTQTY);
- $("#thismonthinqty").html(data.dt[0].THISMONTHINQTY);
- $("#thismonthoutqty").html(data.dt[0].THISMONTHOUTQTY);
- $("#turnoverday").html(data.dt[0].TURNOVERDAY);
- $(".hd").html("");
- var StepHtml = "";
- StepHtml += "<ul>";
- var result = [];
- for (var i = 0; i < data.dt1.length; i += 2) {
- result.push(data.dt1.slice(i, i + 2));
- }
- for (var j = 0; j < result.length; j++) {
- StepHtml += "<li>";
- for (var m = 0; m < result[j].length; m++) {
- StepHtml += "<div class='content'>";
- StepHtml += "<div class='content_name'>" + result[j][m].PartName + "</div>";
- StepHtml += "<div class='content_style bg_color w44'>";
- StepHtml += "<span class='mr'><i class='icon_style icon_n'></i><span class='text_s'>" + result[j][m].StockQty + "</span></span>";
- StepHtml += "<span class='mr'><i class='icon_style icon_r'></i><span class='text_s'>" + result[j][m].InRoomQty + "</span></span>";
- StepHtml += "<span><i class='icon_style icon_c'></i><span class=text_s>" + result[j][m].OutRoomQty + "</span></span>";
- StepHtml += "</div>";
- StepHtml += "<div class='content_style w58'>";
- for (var k = 0; k < result[j][m].list.length; k++) {
- if (result[j][m].list[k].LocationStatus == "Y") {
- StepHtml += "<div class='content_mod content_mod_bg_true'>";
- StepHtml += "<p class='mt12'>" + result[j][m].list[k].LocationCode + "</p>";
- StepHtml += "<p class='mb9'>" + result[j][m].list[k].LocationQty + "</p>";
- StepHtml += "</div>";
- }
- else if (result[j][m].list[k].LocationStatus == "N") {
- StepHtml += "<div class='content_mod content_mod_bg_tf'>";
- StepHtml += "<p class='mt12'>" + result[j][m].list[k].LocationCode + "</p>";
- StepHtml += "<p class='mb9'>" + result[j][m].list[k].LocationQty + "</p>";
- StepHtml += "</div>";
- }
- else {
- StepHtml += "<div class='content_mod content_mod_bg_false'>";
- StepHtml += " </div>";
- }
- }
- StepHtml += "</div>";
- StepHtml += "</div>";
+ function TopMap(){
+ $.ajax({
+ url: "http://localhost:12298/api/loaddata/HouseTopData",
+ dataType: "JSON",
+ async: false,//浣跨敤鍚屾鐨勬柟寮�,true涓哄紓姝ユ柟寮�
+ type: "Get",
+ success: function (data) {
+ $("#stockqty").html(data.data[0].FQTY);
+ $("#todayinqty").html(data.data[1].FQTY);
+ $("#todayoutqty").html(data.data[2].FQTY);
+ $("#thismonthinqty").html(data.data[3].FQTY);
+ $("#thismonthoutqty").html(data.data[4].FQTY);
+ $("#turnoverday").html("");
+ },
+ error: function (data) {
+
}
- StepHtml += "</li>";
- }
- StepHtml += "</ul>";
- $(".hd").append(StepHtml);
- var time = 80;
- $(".flex_t").slide({ mainCell: ".hd ul", autoPlay: true, effect: "topMarquee", opp: false, vis: 6, interTime: time, mouseOverStop: false });
-
-
+ })
}
- </script>
-</head>
-
-<body>
- <div class='title'>鎴愬搧浠撳簱FIFO鐪嬫澘</div>
-
- <div class="clock">
- <ul>
- <li id="Date"></li>
- <li id="hours"> </li>
- <li id="point">:</li>
- <li id="min"> </li>
- <li id="point">:</li>
- <li id="sec"> </li>
- </ul>
-
- </div>
- <div class="col-sm-12">
- <div class='flex'>
- <div class='flex_item'>
- <span id="stockqty"></span>
- <p>褰撳墠搴撳瓨閲�</p>
- </div>
-
- <div class='flex_item'>
- <span id="todayinqty"></span>
- <p>浠婃棩鍏ュ簱鏁�</p>
- </div>
-
- <div class='flex_item'>
- <span id="todayoutqty"></span>
- <p>浠婃棩鍑哄簱鏁�</p>
- </div>
-
- <div class='flex_item'>
- <span id="thismonthinqty"></span>
- <p>鏈湀鍏ュ簱鏁�</p>
- </div>
-
- <div class='flex_item'>
- <span id="thismonthoutqty"></span>
- <p>鏈湀鍑哄簱鏁�</p>
- </div>
-
-
- <div class='flex_item'>
- <span id="turnoverday"></span>
- <p>搴撳瓨鍛ㄨ浆澶╂暟</p>
- </div>
-
-
- </div>
- </div>
- <div class='title_o'>FIFO璇︽儏</div>
- <div class='flex_t'>
- <div class='hd'>
- <ul>
-
- </ul>
- </div>
- </div>
-</body>
-
-</html>
\ No newline at end of file
+ function DataGrid() {
+ $.ajax({
+ url: "http://localhost:12298/api/loaddata/HouseDataTable",
+ dataType: "JSON",
+ async: false,//浣跨敤鍚屾鐨勬柟寮�,true涓哄紓姝ユ柟寮�
+ type: "Get",
+ success: function (data) {
+ console.info(data);
+ $(".hd").html("");
+ var StepHtml = "";
+ StepHtml += "<ul>";
+ var result = [];
+ for (var i = 0; i < data.data.length; i += 2) {
+ result.push(data.data.slice(i, i + 2));
+ }
+ for (var j = 0; j < result.length; j++) {
+ StepHtml += "<li>";
+ for (var m = 0; m < result[j].length; m++) {
+ StepHtml += "<div class='content'>";
+ StepHtml += "<div class='content_name'>" + result[j][m].FNAME + "</div>";
+ StepHtml += "<div class='content_style bg_color w44'>";
+ StepHtml += "<span class='mr'><i class='icon_style icon_n'></i><span class='text_s'>" + result[j][m].FQTY + "</span></span>";
+ StepHtml += "<span class='mr'><i class='icon_style icon_r'></i><span class='text_s'>" + result[j][m].InQty + "</span></span>";
+ StepHtml += "<span><i class='icon_style icon_c'></i><span class=text_s>" + result[j][m].OutQty + "</span></span>";
+ StepHtml += "</div>";
+ StepHtml += "<div class='content_style w58'>";
+ StepHtml += "<div class='content_mod content_mod_bg_true'>";
+ StepHtml += "<p class='mt12'>鍥哄畾搴撲綅1</p>";
+ StepHtml += "<p class='mb9'>" + result[j][m].FQTY + "</p>";
+ StepHtml += "</div>";
+ StepHtml += "</div>";
+ StepHtml += "</div>";
+ StepHtml += "<div class='content_mod content_mod_bg_tf'>";
+ StepHtml += "<p class='mt12'>" + result[j][m].list[k].LocationCode + "</p>";
+ StepHtml += "<p class='mb9'>" + result[j][m].list[k].LocationQty + "</p>";
+ StepHtml += "</div>";
+ StepHtml += "<div class='content_mod content_mod_bg_false'>";
+ StepHtml += " </div>";
+ }
+ StepHtml += "</li>";
+ }
+ StepHtml += "</ul>";
+ $(".hd").append(StepHtml);
+ var time = 80;
+ $(".flex_t").slide({ mainCell: ".hd ul", autoPlay: true, effect: "topMarquee", opp: false, vis: 6, interTime: time, mouseOverStop: false });
+ },
+ error: function (data) {
+
+ }
+ })
+
+
+
+
+ }
+ </script>
+ </head>
+
+ <body>
+ <div class='title'>鎴愬搧浠撳簱FIFO鐪嬫澘</div>
+
+ <div class="clock">
+ <ul>
+ <li id="Date"></li>
+ <li id="hours"> </li>
+ <li id="point">:</li>
+ <li id="min"> </li>
+ <li id="point">:</li>
+ <li id="sec"> </li>
+ </ul>
+
+ </div>
+ <div class="col-sm-12">
+ <div class='flex'>
+ <div class='flex_item'>
+ <span id="stockqty"></span>
+ <p>褰撳墠搴撳瓨閲�</p>
+ </div>
+
+ <div class='flex_item'>
+ <span id="todayinqty"></span>
+ <p>浠婃棩鍏ュ簱鏁�</p>
+ </div>
+
+ <div class='flex_item'>
+ <span id="todayoutqty"></span>
+ <p>浠婃棩鍑哄簱鏁�</p>
+ </div>
+
+ <div class='flex_item'>
+ <span id="thismonthinqty"></span>
+ <p>鏈湀鍏ュ簱鏁�</p>
+ </div>
+
+ <div class='flex_item'>
+ <span id="thismonthoutqty"></span>
+ <p>鏈湀鍑哄簱鏁�</p>
+ </div>
+
+
+ <div class='flex_item'>
+ <span id="turnoverday"></span>
+ <p>搴撳瓨鍛ㄨ浆澶╂暟</p>
+ </div>
+
+
+ </div>
+ </div>
+ <div class='title_o'>FIFO璇︽儏</div>
+ <div class='flex_t'>
+ <div class='hd'>
+ <ul>
+
+ </ul>
+ </div>
+ </div>
+ </body>
+
+ </html>
\ No newline at end of file
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