From 9096f4ff47567b613441a3d239e969514b0b9f76 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期三, 21 八月 2024 10:30:42 +0800
Subject: [PATCH] 修改页面权限显示错误
---
HTML/views/WareHouseSetting/StorageLegend.html | 476 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 371 insertions(+), 105 deletions(-)
diff --git a/HTML/views/WareHouseSetting/StorageLegend.html b/HTML/views/WareHouseSetting/StorageLegend.html
index f3ac81a..298542f 100644
--- a/HTML/views/WareHouseSetting/StorageLegend.html
+++ b/HTML/views/WareHouseSetting/StorageLegend.html
@@ -83,6 +83,7 @@
Opacity: .8;
}
+
.btnShow {
width: 20px;
height: 15px;
@@ -120,13 +121,22 @@
<div class="layui-inline">
<label class="layui-form-label">鎺�</label>
<div class="layui-input-inline">
- <select name="Detph" id="Detph" lay-filter="SelectLayer">
- <option value="1">绗竴鎺�</option>
- <option value="2">绗簩鎺�</option>
+ <select name="Row" id="Row" lay-filter="SelectLayer">
+ <!-- <option value="1">绗竴鎺�</option>
+ <option value="2">绗簩鎺�</option> -->
</select>
</div>
</div>
- <!-- 瀹氭椂鑷埛鏂板簱浣嶅浘渚� -->
+ <div class="layui-inline">
+ <label class="layui-form-label">娣卞害</label>
+ <div class="layui-input-inline">
+ <select name="Depth" id="Depth" lay-filter="SelectDepth">
+ <option value="01" selected>娣卞害1</option>
+ <option value="02" id="shendu2">娣卞害2</option>
+ </select>
+ </div>
+ </div>
+ <!-- //瀹氭椂鑷埛鏂板簱浣嶅浘渚� -->
<div class="layui-inline" style="float: right;">
<label class="layui-form-label" style="margin-top: 10px;">鑷姩鍒锋柊</label>
<div class="layui-input-inline" style="width: auto;">
@@ -142,14 +152,18 @@
<!-- 鍌ㄤ綅鍥句緥 -->
<table style="margin:0 auto;">
<tr>
- <td><button class="btnShow three" disabled></button></td>
- <td>鍑哄簱涓�</td>
- <td><button class="btnShow two" disabled></button></td>
- <td>鍏ュ簱涓�</td>
- <td><button class="btnShow one" disabled></button></td>
- <td>鏈夌墿鍝�</td>
<td><button class="btnShow zero" disabled></button></td>
<td>绌哄簱浣�</td>
+ <td><button class="btnShow one" disabled></button></td>
+ <td>鏈夌墿鍝�</td>
+ <td><button class="btnShow two" disabled></button></td>
+ <td>鍏ュ簱涓�</td>
+ <td><button class="btnShow three" disabled></button></td>
+ <td>鍑哄簱涓�</td>
+ <td><button class="btnShow four" disabled></button></td>
+ <td>绉诲叆涓�</td>
+ <td><button class="btnShow five" disabled></button></td>
+ <td>绉诲嚭涓�</td>
<td><button class="btnShow filg" disabled></button></td>
<td>鎹熷潖\灞忚斀</td>
</tr>
@@ -212,8 +226,8 @@
var cengShu = "1";
var dom = $('#LAY_app_tabsheader', parent.document).children();//.find(s=>s.s.nodeType == 1 && className == "layui-this")
-
- //绠楀嚭button鐧惧垎姣斿ぇ灏�
+ var xianga = "";
+ var xiangb = "";
//鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
synData(IP + "/Sys/GetWarehouseDic", {}, 'get', function (res) {
@@ -225,7 +239,7 @@
continue;
}
- $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' +
+ $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
res.data[i].WareHouseName + '</option>');
}
$("#WareHouseNo option[value='" + res.data[0].WareHouseNo + "']").attr("selected", "selected")
@@ -238,40 +252,285 @@
}
});
getRoadway();
- var svmwidth = 0;
- GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Detph").val());
+ GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());
GetSlotChart($("#WareHouseNo").val());
GetSlotChartz($("#WareHouseNo").val(), $("#RoadwayNo").val())
// 鏌ヨ浜嬩欢
form.on('select(getWareHouseNo)', function (data) {
- GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Detph").val());
+ GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());
getRoadway()
GetSlotChart($("#WareHouseNo").val())
});
form.on('select(getRoadwayNo)', function (data) {
- GetSlotChartz($("#WareHouseNo").val(), $("#RoadwayNo").val())
-
- GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Detph").val());
+ if (data.value == "R01")
+ {
+ xianga = "宸烽亾1鎺�";
+ xiangb = "宸烽亾2鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='1']").attr("selected", "selected")
+ $("#Row").append('<option value =1>绗�1鎺�</option>');
+ $("#Row").append('<option value =2>绗�2鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R02")
+ {
+ xianga = "宸烽亾3鎺�";
+ xiangb = "宸烽亾4鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='3']").attr("selected", "selected")
+ $("#Row").append('<option value =3>绗�3鎺�</option>');
+ $("#Row").append('<option value =4>绗�4鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R03")
+ {
+
+ xianga = "宸烽亾5鎺�";
+ xiangb = "宸烽亾6鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='5']").attr("selected", "selected")
+ $("#Row").append('<option value =5>绗�5鎺�</option>');
+ $("#Row").append('<option value =6>绗�6鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R04")
+ {
+
+ xianga = "宸烽亾7鎺�";
+ xiangb = "宸烽亾8鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='7']").attr("selected", "selected")
+ $("#Row").append('<option value =7>绗�7鎺�</option>');
+ $("#Row").append('<option value =8>绗�8鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R05")
+ {
+
+ xianga = "宸烽亾9鎺�";
+ xiangb = "宸烽亾10鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='9']").attr("selected", "selected")
+ $("#Row").append('<option value =9>绗�9鎺�</option>');
+ $("#Row").append('<option value =10>绗�10鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R06")
+ {
+
+ xianga = "宸烽亾11鎺�";
+ xiangb = "宸烽亾12鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='11']").attr("selected", "selected")
+ $("#Row").append('<option value =11>绗�11鎺�</option>');
+ $("#Row").append('<option value =12>绗�12鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R07")
+ {
+
+ xianga = "宸烽亾13鎺�";
+ xiangb = "宸烽亾14鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='13']").attr("selected", "selected")
+ $("#Row").append('<option value =13>绗�13鎺�</option>');
+ $("#Row").append('<option value =14>绗�14鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R08")
+ {
+
+ xianga = "宸烽亾15鎺�";
+ xiangb = "宸烽亾16鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='15']").attr("selected", "selected")
+ $("#Row").append('<option value =15>绗�15鎺�</option>');
+ $("#Row").append('<option value =16>绗�16鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R09")
+ {
+
+ xianga = "宸烽亾17鎺�";
+ xiangb = "宸烽亾18鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='17']").attr("selected", "selected")
+ $("#Row").append('<option value =17>绗�17鎺�</option>');
+ $("#Row").append('<option value =18>绗�18鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R10")
+ {
+
+ xianga = "宸烽亾19鎺�";
+ xiangb = "宸烽亾20鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='19']").attr("selected", "selected")
+ $("#Row").append('<option value =19>绗�19鎺�</option>');
+ $("#Row").append('<option value =20>绗�20鎺�</option>');
+ form.render('select');
+ }
+ funLayer();
+ GetSlotChartz($("#WareHouseNo").val(), $("#RoadwayNo").val());
+ GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());
+
})
form.on('select(SelectLayer)', function (data) {
- GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Detph").val());
+ if($("#Row").val() == "2" || $("#Row").val() == "5" || $("#Row").val() == "9" || $("#Row").val() == "13" || $("#Row").val() == "17")
+ {
+ $("#Depth").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Depth option[value ='01']").attr("selected", "selected")
+ $("#Depth").append('<option value =01>娣卞害1</option>');
+ }
+ else
+ {
+ $("#Depth").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Depth option[value ='01']").attr("selected", "selected")
+ $("#Depth").append('<option value =01>娣卞害1</option>');
+ $("#Depth").append('<option value =02>娣卞害2</option>');
+ }
+ form.render('select');
+ GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());
});
+ form.on('select(SelectDepth)', function (data) {
+ GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());
+ });
+ function funLayer()
+ {
+ if($("#Row").val() == "2" || $("#Row").val() == "5" || $("#Row").val() == "9" || $("#Row").val() == "13" || $("#Row").val() == "17")
+ {
+ $("#Depth").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Depth option[value ='01']").attr("selected", "selected")
+ $("#Depth").append('<option value =01>娣卞害1</option>');
+ }
+ else
+ {
+ $("#Depth").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Depth option[value ='01']").attr("selected", "selected")
+ $("#Depth").append('<option value =01>娣卞害1</option>');
+ $("#Depth").append('<option value =02>娣卞害2</option>');
+ }
+ form.render('select');
+ GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());
+ }
//鑾峰彇浠撳簱宸烽亾
function getRoadway() {
$("#RoadwayNo").empty();
synData(IP + "/Sys/GetRoadwayList", { WareHouseNo: $("#WareHouseNo").val() }, 'get', function (res) {
- //console.log(res)
+ // console.log(res)
if (res.code == 0) { //鎴愬姛
for (var i = 0; i < res.data.length; i++) {
- $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' +
- res.data[i].RoadwayName + '</option>');
+ $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' + res.data[i].RoadwayNo + '-' +
+ res.data[i].RoadwayName + '</option>');
}
$("#RoadwayNo option[value='" + res.data[0].RoadwayNo + "']").attr("selected", "selected")
+ $("#Depth option[value ='01']").attr("selected", "selected")
form.render('select');
+ if ($("#RoadwayNo").val() == "R01")
+ {
+ xianga = "宸烽亾1鎺�";
+ xiangb = "宸烽亾2鎺�";
+ $("#Row option[value ='1']").attr("selected", "selected")
+ $("#Row").append('<option value =1>绗�1鎺�</option>');
+ $("#Row").append('<option value =2>绗�2鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R02")
+ {
+ xianga = "宸烽亾3鎺�";
+ xiangb = "宸烽亾4鎺�";
+ $("#Row option[value ='3']").attr("selected", "selected")
+ $("#Row").append('<option value =3>绗�3鎺�</option>');
+ $("#Row").append('<option value =4>绗�4鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R03")
+ {
+
+ xianga = "宸烽亾5鎺�";
+ xiangb = "宸烽亾6鎺�";
+ $("#Row option[value ='5']").attr("selected", "selected")
+ $("#Row").append('<option value =5>绗�5鎺�</option>');
+ $("#Row").append('<option value =6>绗�6鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R04")
+ {
+
+ xianga = "宸烽亾7鎺�";
+ xiangb = "宸烽亾8鎺�";
+ $("#Row option[value ='7']").attr("selected", "selected")
+ $("#Row").append('<option value =7>绗�7鎺�</option>');
+ $("#Row").append('<option value =8>绗�8鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R05")
+ {
+
+ xianga = "宸烽亾9鎺�";
+ xiangb = "宸烽亾10鎺�";
+ $("#Row option[value ='9']").attr("selected", "selected")
+ $("#Row").append('<option value =9>绗�9鎺�</option>');
+ $("#Row").append('<option value =10>绗�10鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R06")
+ {
+
+ xianga = "宸烽亾11鎺�";
+ xiangb = "宸烽亾12鎺�";
+ $("#Row option[value ='11']").attr("selected", "selected")
+ $("#Row").append('<option value =11>绗�11鎺�</option>');
+ $("#Row").append('<option value =12>绗�12鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R07")
+ {
+
+ xianga = "宸烽亾13鎺�";
+ xiangb = "宸烽亾14鎺�";
+ $("#Row option[value ='13']").attr("selected", "selected")
+ $("#Row").append('<option value =13>绗�13鎺�</option>');
+ $("#Row").append('<option value =14>绗�14鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R08")
+ {
+
+ xianga = "宸烽亾15鎺�";
+ xiangb = "宸烽亾16鎺�";
+ $("#Row option[value ='15']").attr("selected", "selected")
+ $("#Row").append('<option value =15>绗�15鎺�</option>');
+ $("#Row").append('<option value =16>绗�16鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R09")
+ {
+
+ xianga = "宸烽亾17鎺�";
+ xiangb = "宸烽亾18鎺�";
+ $("#Row option[value ='17']").attr("selected", "selected")
+ $("#Row").append('<option value =17>绗�17鎺�</option>');
+ $("#Row").append('<option value =18>绗�18鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R10")
+ {
+
+ xianga = "宸烽亾19鎺�";
+ xiangb = "宸烽亾20鎺�";
+ $("#Row option[value ='19']").attr("selected", "selected")
+ $("#Row").append('<option value =19>绗�19鎺�</option>');
+ $("#Row").append('<option value =20>绗�20鎺�</option>');
+ form.render('select');
+ }
+ funLayer();
+ GetSlotChartz($("#WareHouseNo").val(), $("#RoadwayNo").val());
+ GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
icon: 2,
@@ -283,11 +542,12 @@
}
//鑾峰彇鏁版嵁娓叉煋搴撲綅鍥�
- function GetSlotVm(houseNo, roadway, row) {
+ function GetSlotVm(houseNo, roadway, row, depth) {
var param = {
WareHouseNo: houseNo,
roadway: roadway,
- Row: row
+ Row: row,
+ Depth: depth
}
sendData(IP + "/Sys/GetStorageLocatLists", param, 'get', function (res) {
if (res.code == 0) {
@@ -306,6 +566,7 @@
var statu = list.find(r => r.Column == a && r.Layer == i);
if (statu != undefined) {
+ //鍒ゆ柇鍌ㄤ綅鏍囪瘑鏄惁涓�0
if(statu.Flag != '0')
{
html += '<td><button value=' + statu.LocatNo + ' class="btnShow filg" ></button></td>'
@@ -313,32 +574,33 @@
}
//绌哄偍浣� 0
if (statu.Status == 0) {
- html += '<td><button value=' + statu.LocatNo + ' class="btnShow zero" ></button></td>'
+ html += '<td><button value=' + statu.LocatNo + ' class="btnShow zero" ></button></td>'
continue;
}
//鏈夌墿鍝� 1
if (statu.Status == 1) {
- html += '<td><button value=' + statu.LocatNo + ' class="btnShow one" ></button></td>'
+ html += '<td><button value=' + statu.LocatNo + ' class="btnShow one" ></button></td>'
continue;
}
//鍏ュ簱涓� 2
if (statu.Status == 2) {
- html += '<td><button value=' + statu.LocatNo + ' class="btnShow two" ></button></td>'
+ html += '<td><button value=' + statu.LocatNo + ' class="btnShow two" ></button></td>'
continue;
}
//鍑哄簱涓� 3
if (statu.Status == 3) {
- html += '<td><button value=' + statu.LocatNo + ' class="btnShow three" ></button></td>'
+ html += '<td><button value=' + statu.LocatNo + ' class="btnShow three" ></button></td>'
continue;
}
+
//绉诲叆涓� 4
- // if (statu.Status == 4) {
- // html += '<td style="height:auto;width:auto"><button value=' + statu.LocatNo + ' class="btnShow four" style="height:' + height3 + 'px;width:' + svmwidth + 'px"></button></td>'
- // }
+ if (statu.Status == 4) {
+ html += '<td><button value=' + statu.LocatNo + ' class="btnShow four"></button></td>'
+ }
//绉诲嚭涓� 5
- // if (statu.Status == 5) {
- // html += '<td style="height:auto;width:auto"><button value=' + statu.LocatNo + ' class="btnShow five" style="height:' + height3 + 'px;width:' + svmwidth + 'px"></button></td>'
- // }
+ if (statu.Status == 5) {
+ html += '<td><button value=' + statu.LocatNo + ' class="btnShow five"></button></td>'
+ }
} else {
// console.log(i, a);
@@ -353,13 +615,12 @@
let num = 1;
if (i == 1) {
html += '<tr style="height:10px;"><td></td>'
+
for (let aa = 0; aa < list.length; aa++) {
//let num = Number(aa) + 1;
if (list[aa].Layer == i) {
-
html += '<td><p> ' + num + '</p></td>'
num = Number(num) + 1;
-
}
}
html += '</tr>'
@@ -376,31 +637,19 @@
});
}
+
// 鍔犺浇浠撳簱鍥句緥
//鍦�
function GetSlotChart(warehouseNo) {
sendData(IP + "/Sys/GetStorageProportion?WareHouseNo=" + warehouseNo, {}, 'get', function (res) {
+ // console.log("鍥暟鎹�",res)
if (res.code == 0) {
var LayerName = res.data[0].warehouseNo;
var list = res.data;
//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑 6: 鎹熷潖\灞忚斀
- var key = ['绌哄偍浣�', '鏈夌墿鍝�', '鍏ュ簱涓�', '鍑哄簱涓�', '鎹熷潖\灞忚斀'];
- // var value = [];
- // var a = 0;
- // for (var i = 0; i < key.length; i++) {
-
- // if (a < list.length) {
- // if (i == list[a].Status) {
- // value.push(list[a].StatusNum)
- // a = a + 1;
- // }
- // }
- // else {
- // value.push(0)
- // }
- // }
+ var key = ['绌哄偍浣�', '鏈夌墿鍝�', '鍏ュ簱涓�', '鍑哄簱涓�','绉诲叆涓�','绉诲嚭涓�', '鎹熷潖\灞忚斀'];
var value = [0,0,0,0,0,0,0];
list.forEach(item => {
value[item.Status] = item.StatusNum;
@@ -409,13 +658,13 @@
this.chartLine2 = echarts.init(document.getElementById("yuan"));
var option2 = {
color: [
- '#5470c6', //绌哄偍浣�
- '#91cc75', //鏈夌墿鍝�
- '#ffdc60', //鍏ュ簱涓�
- '#ee6666', //鍑哄簱涓�
- // '#ffff7f', //绉诲叆涓�
- // '#ee23ee' //绉诲嚭涓�
- '#808080', //鎹熷潖灞忚斀
+ '#5470c6',
+ '#91cc75',
+ '#ffdc60',
+ '#ee6666',
+ '#ffff7f',
+ '#ee23ee',
+ '#808080',
],
title: {
text: LayerName,
@@ -437,13 +686,13 @@
radius: '85%',
data:
[
- { value: value[0], name: key[0] },
- { value: value[1], name: key[1] },
- { value: value[2], name: key[2] },
- { value: value[3], name: key[3] },
- // { value: value[4], name: key[4] },
- // { value: value[5], name: key[5] },
- { value: value[6], name: key[4] }, //鎹熷潖\灞忚斀
+ { value: value[0], name: key[0] }, //绌哄偍浣�
+ { value: value[1], name: key[1] }, //鏈夌墿鍝�
+ { value: value[2], name: key[2] }, //鍏ュ簱涓�
+ { value: value[3], name: key[3] }, //鍑哄簱涓�
+ { value: value[4], name: key[4] }, //绉诲叆涓�
+ { value: value[5], name: key[5] }, //绉诲嚭涓�
+ { value: value[6], name: key[6] }, //鎹熷潖\灞忚斀
],
// emphasis: {
// itemStyle: {
@@ -473,19 +722,18 @@
if (res.code == 0) {
var list = res.data;
- console.log(list)
//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑 6锛氭崯鍧廫灞忚斀
- var key = ['绌哄偍浣�', '鏈夌墿鍝�', '鍏ュ簱涓�', '鍑哄簱涓�','鎹熷潖\灞忚斀'];
+ var key = ['绌哄偍浣�', '鏈夌墿鍝�', '鍏ュ簱涓�', '鍑哄簱涓�','绉诲叆涓�','绉诲嚭涓�','鎹熷潖\灞忚斀'];
this.chartLine2 = echarts.init(document.getElementById("zhu"));
//宸烽亾
- var roarylist = ['宸烽亾1鎺�', '宸烽亾2鎺�'];
+ var roarylist = [xianga, xiangb];
//鍚勫偍浣嶇姸鎬佹暟閲�
var status0 = [];
var status1 = [];
var status2 = [];
var status3 = [];
- // var status4 = [];
- // var status5 = [];
+ var status4 = [];
+ var status5 = [];
var status6 = [];
//鑾峰彇
//鎬�
@@ -502,17 +750,16 @@
if (list[i].Status == '3') {
status3.push(list[i].StatusNum)
}
- // if (list[i].Status == '4') {
- // status4.push(list[i].StatusNum)
- // }
- // if (list[i].Status == '5') {
- // status5.push(list[i].StatusNum)
- // }
+ if (list[i].Status == '4') {
+ status4.push(list[i].StatusNum)
+ }
+ if (list[i].Status == '5') {
+ status5.push(list[i].StatusNum)
+ }
if (list[i].Status == '6') {
status6.push(list[i].StatusNum)
}
}
- console.log(status3.length)
if (status0.length == 0)
{
status0.push(0)
@@ -548,6 +795,24 @@
else
{
status3.push(0)
+ }
+ if (status4.length == 0)
+ {
+ status4.push(0)
+ status4.push(0)
+ }
+ else
+ {
+ status4.push(0)
+ }
+ if (status5.length == 0)
+ {
+ status5.push(0)
+ status5.push(0)
+ }
+ else
+ {
+ status5.push(0)
}
if (status6.length == 0)
{
@@ -622,27 +887,27 @@
focus: 'series'
},
data: status3
+ },
+ {
+ name: '绉诲叆涓�',
+ type: 'bar',
+ color: '#ffff7f',
+ //label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: status4
},
- // ,{
- // name: '绉诲叆涓�',
- // type: 'bar',
- // color: '#ffff7f',
- // //label: labelOption,
- // emphasis: {
- // focus: 'series'
- // },
- // data: status4
- // },
- // {
- // name: '绉诲嚭涓�',
- // type: 'bar',
- // color: '#ee23ee',
- // //label: labelOption,
- // emphasis: {
- // focus: 'series'
- // },
- // data: status5
- // },
+ {
+ name: '绉诲嚭涓�',
+ type: 'bar',
+ color: '#ee23ee',
+ //label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: status5
+ },
{
name: '鎹熷潖\灞忚斀',
type: 'bar',
@@ -678,27 +943,28 @@
var className=$(that)[0].className;
if(className=='btnShow zero'){
html = "<p style='word-wrap:break-word;width: 100%;height:100%;line-height:24px;font-size:18px'>鍌ㄤ綅缂栫爜锛�" + locatNo + "<br/>鍌ㄤ綅鐘舵�侊細绌哄偍浣�</p>";
- tipsVal=layer.tips(html,that,{tips:[1,"rgb(58, 61, 73)"],area: ['200px'],time: 0});
+ tipsVal=layer.tips(html,that,{tips:[1,"rgb(58, 61, 73)"],area: ['220px'],time: 0});
}else{
var param={
locatNo:locatNo
}
sendData(IP + "/Sys/GetLocateInfo", param, 'get', function (res) {
+ console.log(res)
if (res.code == 0) {
html = "<p style='word-wrap:break-word;width: 100%;height:100%;line-height:24px;font-size:18px;'>";
html += "鍌ㄤ綅缂栫爜锛�" + locatNo;
html += "<br/>鍌ㄤ綅鐘舵�侊細"+res.data.Status;
if (res.data.GoodsInfoList != null)
{
+ html += "<br/>鎵樼洏鍙凤細 "+res.data.PalletNo;
for(var i=0;i<res.data.GoodsInfoList.length;i++){
- html += "<br/>鎵樼洏鍙凤細 "+res.data.PalletNo;
html += "<br/><br/>鐗╂枡缂栫爜锛�"+res.data.GoodsInfoList[i].SkuNo;
html += "<br/>鐗╂枡鍚嶇О锛�"+res.data.GoodsInfoList[i].SkuName;
html += "<br/>鎵规鍙凤細 "+res.data.GoodsInfoList[i].LotNo;
html += "<br/>鏁伴噺锛� "+res.data.GoodsInfoList[i].Qty;
}
- }
- html += "</p>"
+ html += "</p>"
+ }
tipsVal=layer.tips(html,that,{tips:[1,"rgb(58, 61, 73)"],area: ['260px'],time: 0});
} else {
layer.msg(res.msg, {
@@ -716,7 +982,7 @@
});
//#endregion
- //#region 瀹氭椂鍒锋柊搴撲綅鍥句緥
+ // #region 瀹氭椂鍒锋柊搴撲綅鍥句緥
//鑾峰彇鏄惁鑷姩鍒锋柊
var autoRefresh=$('#autoRefresh').prop('checked');
//缁戝畾鑷姩鍒锋柊change浜嬩欢鐩戝惉鍣�
@@ -726,12 +992,12 @@
//瀹氭椂鍣�
setInterval(function(){
if(autoRefresh){
- GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Detph").val());
+ GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());
//var currentDate = new Date();
//console.log('鑷姩鍒锋柊浜嗭紝'+currentDate)
}
},10000)//10绉掕嚜鍔ㄥ埛鏂颁竴娆�
- //#endregion
+ // #endregion
});
</script>
</body>
--
Gitblit v1.8.0