解决冲突

bklLiudl

2024-08-23 5423ea50d00ce05c87ba443413037d86d7669638

 HTML/views/WareHouseSetting/StorageLegend.html

@@ -85,7 +85,7 @@


      .btnShow {
         width: 20px;
         width: 17px;
         height: 15px;
         cursor: pointer;
      }
@@ -197,7 +197,7 @@
                  </div>
               </div>
            </div>
				
 
         </div>
      </div>
   </div>
@@ -266,7 +266,116 @@
         });
         //巷道变更
         form.on('select(getRoadwayNo)', function (data) {
            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');
            }
            getRow(); //获取巷道中排
            GetSlotChartz($("#WareHouseNo").val(), $("#RoadwayNo").val()); //获取柱状信息
         })
         //排变更
         form.on('select(SelectRow)', function (data) {
@@ -327,6 +436,64 @@
                  $("#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');
                  }
                  getRow(); //获取排
                  GetSlotChartz($("#WareHouseNo").val(), $("#RoadwayNo").val()); //获取柱状信息
               } else { //不成功
@@ -433,7 +600,7 @@

         // 加载仓库图例
         //圆
         function GetSlotChart(warehouseNo) {
         function GetSlotChart1(warehouseNo) {

            sendData(IP + "/Sys/GetStorageProportion?WareHouseNo=" + warehouseNo, {}, 'get', function (res) {
               // console.log("园数据",res)
@@ -508,6 +675,174 @@
            });

         };
         //新版圆形图
         function GetSlotChart(warehouseNo) {
            sendData(IP + "/Sys/GetStorageProportion?WareHouseNo=" + warehouseNo, {}, 'get', function (res) {
               // console.log("圆数据",res)
               if (res.code == 0) {
                  // console.log("圆数据",res.data)
                  var LayerName = res.data[0].warehouseNo;

                  var list = res.data;
                  //0：空储位 1：有物品 2：入库中 3：出库中 4：移入中 5：移出中  6: 损坏\屏蔽
                  var key = ['空储位', '有物品', '入库中', '出库中','移入中','移出中', '损坏/屏蔽'];
                  var value = [0,0,0,0,0,0,0];
                  list.forEach(item => {
                     value[item.Status] = item.StatusNum;
                  });
                  // console.log(value)

                  this.chartLine2 = echarts.init(document.getElementById("yuan"));
					
                  var option2 = {
                     tooltip: {   //弹出信息
                        trigger: 'item',
                        formatter: '{a} <br/>{b}: {c} ({d}%)'
                     },
                     legend: { //左侧信息
                        top:'5%',
                        orient: 'vertical',
                        left: 'left'
                     },
                     series: [
                        { //中心图
                           type: 'pie',
                           radius: [0, '30%'],
                           label: {
                              position: 'inner',
                              fontSize: 35,
                           },
                           title:'12',
                        },
                        { //侧边图
                           color: [ //颜色
                              '#5470c6', //空储位
                              '#91cc75', //有物品
                              '#ffdc60', //入库中
                              '#ee6666', //出库中
                              '#ffff7f', //移入中
                              '#ee23ee', //移出中
                              '#808080', //损坏/屏蔽
                           ],
                           name: '储位状态',
                           type: 'pie',
                           radius: ['40%', '70%'],
                           avoidLabelOverlap: false,
                           itemStyle: {
                              borderRadius: 10,
                              borderColor: '#fff',
                              borderWidth: 2
                           },
                           label: { //是否显示外部线条信息
                              show: false,
                              position: 'center'
                           },
                           emphasis: { //鼠标移入是否中间显示信息
                              label: {
                                 show: true,
                                 fontSize: 20,
                                 fontWeight: 'bold'
                              }
                           },
                           labelLine: { //标签线条
                              show: false
                           },
                           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[6] }, //损坏\屏蔽
                              // { value: 1048, name: '空储位' },
                              // { value: 735, name: '有物品' },
                              // { value: 580, name: '入库中' },
                              // { value: 484, name: '出库中' },
                              // { value: 484, name: '移入中' },
                              // { value: 484, name: '移出中' },
                              // { value: 300, name: '损坏/屏蔽' }
                           ]
                        },
                     ],
                  };

                  this.chartLine2.setOption(option2);

               } else {
                  layer.msg(res.msg, {
                     icon: 2,
                     time: 2000
                  }, function () { })
               }
            });
         };
         // option = {
         //    tooltip: { //弹出信息
         //       trigger: 'item',
         //       formatter: '{a} <br/>{b}: {c} ({d}%)'
         //    },
         //    legend: { //左侧信息
         //       top:'5%',
         //       orient: 'vertical',
         //       left: 'left'
         //    },
         //    series: [
         //       //中心图
         //       {
         //          type: 'pie',
         //          radius: [0, '30%'],
         //          label: {
         //             position: 'inner',
         //             fontSize: 35,
         //          },
         //          title:'12',
         //       },
         //       {
         //       color: [
         //                   '#5470c6', //空储位
         //                   '#91cc75', //有物品
         //                   '#ffdc60', //入库中
         //                   '#ee6666', //出库中
         //                   '#ffff7f', //移入中
         //                   '#ee23ee', //移出中
         //                   '#808080', //损坏/屏蔽
         //                ],
         //       name: '储位状态',
         //       type: 'pie',
         //       radius: ['40%', '70%'],
         //       avoidLabelOverlap: false,
         //       itemStyle: {
         //          borderRadius: 10,
         //          borderColor: '#fff',
         //          borderWidth: 2
         //       },
         //       label: { //是否显示外部线条信息
         //          show: false,
         //          position: 'center'
         //       },
         //       emphasis: { //鼠标移入是否中间显示信息
         //          label: {
         //          show: true,
         //          fontSize: 40,
         //          fontWeight: 'bold'
         //          }
         //       },
         //       labelLine: { //标签线条
         //          show: false
         //       },
         //       data: [
         //          { value: 1048, name: '空储位' },
         //          { value: 735, name: '有物品' },
         //          { value: 580, name: '入库中' },
         //          { value: 484, name: '出库中' },
         //          { value: 484, name: '移入中' },
         //          { value: 484, name: '移出中' },
         //          { value: 300, name: '损坏/屏蔽' }
         //       ]
         //       }
         //    ]
         //    };
         //柱
         function GetSlotChartz(warehouseNo, roadwayNo) {

@@ -624,7 +959,7 @@
                           type: 'shadow'
                        }
                     },
                     // legend: {
                     // legend: { //顶部列表
                     //    data: ['空储位','有物品','入库中','出库中','移入中','移出中']
                     // },
                     xAxis: [