Merge branch 'yyk'

yuyou_x

2024-03-23 5b529126898f79c90062020389b56702a92bd490

 HTML/views/WareHouseSetting/StorageLegend.html

@@ -152,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>
@@ -569,13 +573,13 @@
                           }
                           
                           //移入中 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);
@@ -624,7 +628,7 @@

                  var list = res.data;
                  //0：空储位 1：有物品 2：入库中 3：出库中 4：移入中 5：移出中  6: 损坏\屏蔽
                  var key = ['空储位', '有物品', '入库中', '出库中', '损坏\屏蔽'];
                  var key = ['空储位', '有物品', '入库中', '出库中','移入中','移出中', '损坏\屏蔽'];
                  var value = [0,0,0,0,0,0,0];
                  list.forEach(item => {
                     value[item.Status] = item.StatusNum;
@@ -637,8 +641,8 @@
                        '#91cc75',
                        '#ffdc60',
                        '#ee6666',
                        // '#ffff7f',
                        // '#ee23ee',
                        '#ffff7f',
                        '#ee23ee',
                        '#808080',
                     ],
                     title: {
@@ -665,9 +669,9 @@
                              { 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[4], name: key[4] }, //移入中
                              { value: value[5], name: key[5] }, //移出中
                              { value: value[6], name: key[6] }, //损坏\屏蔽
                           ],
                        // emphasis: {
                        //    itemStyle: {
@@ -698,7 +702,7 @@

                  var list = res.data;
                  //0：空储位 1：有物品 2：入库中 3：出库中 4：移入中 5：移出中 6：损坏\屏蔽 
                  var key = ['空储位', '有物品', '入库中', '出库中','损坏\屏蔽'];
                  var key = ['空储位', '有物品', '入库中', '出库中','移入中','移出中','损坏\屏蔽'];
                  this.chartLine2 = echarts.init(document.getElementById("zhu"));
                  //巷道
                  var roarylist = [xianga, xiangb];
@@ -707,8 +711,8 @@
                  var status1 = [];
                  var status2 = [];
                  var status3 = [];
                  // var status4 = [];
                  // var status5 = [];
                  var status4 = [];
                  var status5 = [];
                  var status6 = [];
                  //获取
                  //总
@@ -725,12 +729,12 @@
                     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)
                     }
@@ -770,6 +774,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)
                  {
@@ -845,26 +867,26 @@
                           },
                           data: status3
                        },                     
                        // {
                        //    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: '#ffff7f',
                           //label: labelOption,
                           emphasis: {
                              focus: 'series'
                           },
                           data: status4
                        },
                        {
                           name: '移出中',
                           type: 'bar',
                           color: '#ee23ee',
                           //label: labelOption,
                           emphasis: {
                              focus: 'series'
                           },
                           data: status5
                        },
                        {
                           name: '损坏\屏蔽',
                           type: 'bar',