Merge branch 'xgmwcs' of http://47.97.1.152:5880/r/zy-wcs into xgmwcs

luxiaotao1123

2022-01-05 9a9314110bfd44dd60b6b266bb483a713b8db97e

 src/main/webapp/views/console.html

@@ -6,7 +6,7 @@
<!--<link rel="stylesheet" type="text/css" href="../static/css/common.css">-->
      <link rel="stylesheet" href="../static/css/console.css">
<!--      <link rel="stylesheet" type="text/css" href="../static/css/normalize.css">-->

      <link rel="stylesheet" href="../static/css/animate.min.css">

      
      <script src="../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -22,59 +22,59 @@
         </div>
         <!--第1列（宽度 70px） -->
         <div class="site-row site-row-1">
            <div id="site-173" class="site" style="height: 20px;line-height: 20px;margin-bottom: 85px">173</div>
            <div id="site-173" class="site" style="height: 18px;line-height: 18px;margin-bottom: 85px">173</div>
         </div>
         <!--第2列（宽度 70px）-->
         <div class="site-row site-row-2">
            <div id="site-175" class="site" style="height: 20px;line-height: 20px;">175</div>
            <div id="site-174" class="site" style="height: 21px;line-height: 21px;">174</div>
            <div id="site-172" class="site" style="height: 20px;line-height: 20px;margin-bottom: 245px">172</div>
            <div id="site-182" class="site" style="height: 20px;line-height: 20px;">182</div>
            <div id="site-175" class="site" style="height: 18px;line-height: 18px;">175</div>
            <div id="site-174" class="site" style="height: 19px;line-height: 19px;">174</div>
            <div id="site-172" class="site" style="height: 18px;line-height: 18px;margin-bottom: 248px">172</div>
            <div id="site-182" class="site" style="height: 18px;line-height: 18px;">182</div>
         </div>
         <!-- 第3列（宽度 70px） -->
         <div class="site-row site-row-3">
            <div id="site-171" class="site" style="height: 20px;line-height: 20px;margin-bottom: 245px; ">171</div>
            <div id="site-181" class="site" style="height: 20px;line-height: 20px;margin-bottom: 44px; ">181</div>
            <div id="site-171" class="site" style="height: 18px;line-height: 18px;margin-bottom: 248px; ">171</div>
            <div id="site-181" class="site" style="height: 18px;line-height: 18px;margin-bottom: 44px; ">181</div>
         </div>
         <!-- 第4列（宽度 70px 140px） -->
         <div class="site-row site-row-4">
            <div id="site-176" class="site" style="height: 20px;line-height: 20px;width:140px;margin-bottom: 21px">176</div>
            <div id="site-170" class="site" style="height: 20px;line-height: 20px;width:70px;margin-bottom: 245px;position: relative;float: right">170</div>
            <div id="site-180" class="site" style="height: 20px;line-height: 20px;width:70px;position: relative;clear:right;float: right">180</div>
            <div id="site-176" class="site" style="height: 18px;line-height: 18px;width:140px;margin-bottom: 21px">176</div>
            <div id="site-170" class="site" style="height: 18px;line-height: 18px;width:70px;margin-bottom: 248px;position: relative;float: right">170</div>
            <div id="site-180" class="site" style="height: 18px;line-height: 18px;width:70px;position: relative;clear:right;float: right">180</div>
         </div>
         <!--&lt;!&ndash; 第5列（宽度 70px） &ndash;&gt;-->
         <div class="site-row site-row-5">
            <div id="site-163" class="site" style="height: 31px;line-height: 31px">163</div>
            <div id="site-162" class="site" style="height: 31px;line-height: 31px">162</div>
            <div id="site-163" class="site" style="height: 28.5px;line-height: 28.5px">163</div>
            <div id="site-162" class="site" style="height: 28.5px;line-height: 28.5px">162</div>
            <div id="site-161" class="site" style="height: 71px;line-height: 71px">161</div>
            <div id="site-160" class="site" style="height: 31px;line-height: 31px">160</div>
            <div id="site-159" class="site" style="height: 31px;line-height: 31px">159</div>
            <div id="site-158" class="site" style="height: 70px;line-height: 70px">158</div>
            <div id="site-157" class="site" style="height: 31px;line-height: 31px">157</div>
            <div id="site-156" class="site" style="height: 31px;line-height: 31px">156</div>
            <div id="site-155" class="site" style="height: 70px;line-height: 70px">155</div>
            <div id="site-154" class="site" style="height: 31px;line-height: 31px">154</div>
            <div id="site-153" class="site" style="height: 31px;line-height: 31px">153</div>
            <div id="site-152" class="site" style="height: 70px;line-height: 70px">152</div>
            <div id="site-151" class="site" style="height: 31px;line-height: 31px">151</div>
            <div id="site-150" class="site" style="height: 31px;line-height: 31px">150</div>
            <div id="site-160" class="site" style="height: 28.5px;line-height: 28.5px">160</div>
            <div id="site-159" class="site" style="height: 28.5px;line-height: 28.5px">159</div>
            <div id="site-158" class="site" style="height: 71px;line-height: 71px">158</div>
            <div id="site-157" class="site" style="height: 28.5px;line-height: 28.5px">157</div>
            <div id="site-156" class="site" style="height: 28.5px;line-height: 28.5px">156</div>
            <div id="site-155" class="site" style="height: 71px;line-height: 71px">155</div>
            <div id="site-154" class="site" style="height: 28.5px;line-height: 28.5px">154</div>
            <div id="site-153" class="site" style="height: 28.5px;line-height: 28.5px">153</div>
            <div id="site-152" class="site" style="height: 71px;line-height: 71px">152</div>
            <div id="site-151" class="site" style="height: 28.5px;line-height: 28.5px">151</div>
            <div id="site-150" class="site" style="height: 28.5px;line-height: 28.5px">150</div>
         </div>
         <!--&lt;!&ndash; 第6列（宽度 70px） &ndash;&gt;-->
         <div class="site-row site-row-6">
            <div id="site-120" class="site" style="height: 31px;line-height: 31px">120</div>
            <div id="site-121" class="site" style="height: 31px;line-height: 31px">121</div>
            <div id="site-120" class="site" style="height: 28.5px;line-height: 28.5px">120</div>
            <div id="site-121" class="site" style="height: 28.5px;line-height: 28.5px">121</div>
            <div id="site-122" class="site" style="height: 71px;line-height: 71px">122</div>
            <div id="site-123" class="site" style="height: 31px;line-height: 31px">123</div>
            <div id="site-124" class="site" style="height: 31px;line-height: 31px">124</div>
            <div id="site-125" class="site" style="height: 70px;line-height: 70px">125</div>
            <div id="site-126" class="site" style="height: 31px;line-height: 31px">126</div>
            <div id="site-127" class="site" style="height: 31px;line-height: 31px">127</div>
            <div id="site-128" class="site" style="height: 70px;line-height: 70px">128</div>
            <div id="site-129" class="site" style="height: 31px;line-height: 31px">129</div>
            <div id="site-130" class="site" style="height: 31px;line-height: 31px">130</div>
            <div id="site-131" class="site" style="height: 70px;line-height: 71px">131</div>
            <div id="site-132" class="site" style="height: 31px;line-height: 31px">132</div>
            <div id="site-133" class="site" style="height: 31px;line-height: 31px">133</div>
            <div id="site-123" class="site" style="height: 28.5px;line-height: 28.5px">123</div>
            <div id="site-124" class="site" style="height: 28.5px;line-height: 28.5px">124</div>
            <div id="site-125" class="site" style="height: 71px;line-height: 71px">125</div>
            <div id="site-126" class="site" style="height: 28.5px;line-height: 28.5px">126</div>
            <div id="site-127" class="site" style="height: 28.5px;line-height: 28.5px">127</div>
            <div id="site-128" class="site" style="height: 71px;line-height: 71px">128</div>
            <div id="site-129" class="site" style="height: 28.5px;line-height: 28.5px">129</div>
            <div id="site-130" class="site" style="height: 28.5px;line-height: 28.5px">130</div>
            <div id="site-131" class="site" style="height: 71px;line-height: 71px">131</div>
            <div id="site-132" class="site" style="height: 28.5px;line-height: 28.5px">132</div>
            <div id="site-133" class="site" style="height: 28.5px;line-height: 28.5px">133</div>
         </div>
         
         <!-- 货架 + 堆垛机 + 入库站点 -->
@@ -83,8 +83,7 @@
            <div class="lane">
               <!-- 货架 -->
               <div class="stock-group">
                  <div class="site" style="background-color: rgb(108,167,168)   "></div>
                  <button class="item">2</button>
                  <button class="item" style="margin-left: 82px">2</button>
                  <button class="item">4</button>
                  <button class="item">6</button>
                  <button class="item">8</button>
@@ -206,8 +205,7 @@
                  <span class="row-no">3#</span>
               </div>
               <div class="stock-group">
                  <div class="site" style="background-color: rgb(108,167,168)"></div>
                  <button class="item">2</button>
                  <button class="item" style="margin-left: 82px">2</button>
                  <button class="item">4</button>
                  <button class="item">6</button>
                  <button class="item">8</button>
@@ -417,8 +415,7 @@
               <span class="row-no"></span>
               <!-- 货架 -->
               <div class="stock-group">
                  <div class="site" style="background-color: rgb(108,167,168)"></div>
                  <button class="item">2</button>
                  <button class="item" style="margin-left: 82px">2</button>
                  <button class="item">4</button>
                  <button class="item">6</button>
                  <button class="item">8</button>
@@ -540,8 +537,7 @@
                  <span class="row-no">11#</span>
               </div>
               <div class="stock-group">
                  <div class="site" style="background-color:rgb(108,167,168)"></div>
                  <button class="item">2</button>
                  <button class="item" style="margin-left: 82px">2</button>
                  <button class="item">4</button>
                  <button class="item">6</button>
                  <button class="item">8</button>
@@ -584,8 +580,7 @@
               <span class="row-no"></span>
               <!-- 货架 -->
               <div class="stock-group">
                  <div class="site" style="background-color:rgb(108,167,168)"></div>
                  <button class="item">2</button>
                  <button class="item" style="margin-left: 82px">2</button>
                  <button class="item">4</button>
                  <button class="item">6</button>
                  <button class="item">8</button>
@@ -707,8 +702,7 @@
                  <span class="row-no">15#</span>
               </div>
               <div class="stock-group">
                  <div class="site" style="background-color:rgb(108,167,168)"></div>
                  <button class="item">2</button>
                  <button class="item" style="margin-left: 82px">2</button>
                  <button class="item">4</button>
                  <button class="item">6</button>
                  <button class="item">8</button>
@@ -751,8 +745,7 @@
               <span class="row-no"></span>
               <!-- 货架 -->
               <div class="stock-group">
                  <div class="site" style="background-color:rgb(108,167,168)"></div>
                  <button class="item">2</button>
                  <button class="item" style="margin-left: 82px">2</button>
                  <button class="item">4</button>
                  <button class="item">6</button>
                  <button class="item">8</button>
@@ -874,8 +867,7 @@
                  <span class="row-no">19#</span>
               </div>
               <div class="stock-group">
                  <div class="site" style="background-color:rgb(108,167,168)"></div>
                  <button class="item">2</button>
                  <button class="item" style="margin-left: 82px">2</button>
                  <button class="item">4</button>
                  <button class="item">6</button>
                  <button class="item">8</button>
@@ -968,10 +960,46 @@
            </div>
            <div class="bar-code">
               <div class="body-head" id="code">条码扫描器</div>
               <div class="tablebox">
                  <div class="table-head">
                     <li><span>条码名称</span><span class="right">扫码时间</span></li>
                  </div>
                  <div class="table-body">
                     <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                     <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                     <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                     <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                     <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                  </div>
               </div>
               <div class="tablebox">
                  <div class="table-head">
                     <li><span>条码名称</span><span class="right">扫码时间</span></li>
                  </div>
                  <div class="table-body">
                     <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                     <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                     <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                     <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                     <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                  </div>
               </div>
               <div class="tablebox">
                  <div class="table-head">
                     <li><span>条码名称</span><span class="right">扫码时间</span></li>
                  </div>
                  <div class="table-body">
                     <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                     <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                     <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                     <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                     <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                  </div>
               </div>
            </div>
         </div>
         <!-- 堆垛机弹窗 -->
         <div id="crnWindow" style="display: none;">
         <div id="crnWindow" style="display: none;" class="animate__animated animate__fadeIn">
            <div id="crnWindow-head">
               <div class='detailed'></div>
               <button></button>
@@ -983,7 +1011,7 @@
                     <span>堆垛机号：</span>
                  </div>
                  <div class="form-item-input">
                     <input type="text" name="crnNo">
                     <input type="text" name="crnNo" value="">
                  </div>
               </div>
               <!-- 工作号 -->
@@ -992,7 +1020,7 @@
                     <span>工作号：</span>
                  </div>
                  <div class="form-item-input">
                     <input type="text" name="workNo">
                     <input type="text" name="workNo" value="">
                  </div>
               </div>
               <!-- 站源 -->
@@ -1001,7 +1029,7 @@
                     <span>站源：</span>
                  </div>
                  <div class="form-item-input">
                     <input type="text" name="sourceStaNo">
                     <input type="text" name="sourceStaNo" value="">
                  </div>
               </div>
               <!-- 目标站 -->
@@ -1010,7 +1038,7 @@
                     <span>目标站：</span>
                  </div>
                  <div class="form-item-input">
                     <input type="text" name="staNo">
                     <input type="text" name="staNo" value="">
                  </div>
               </div>
               <!-- 工作状态 -->
@@ -1019,7 +1047,7 @@
                     <span>工作状态：</span>
                  </div>
                  <div class="form-item-input">
                     <input type="text" name="wrkSts">
                     <input type="text" name="wrkSts" value="">
                  </div>
               </div>
               <!-- 出入类型 -->
@@ -1028,7 +1056,7 @@
                     <span>出入类型：</span>
                  </div>
                  <div class="form-item-input">
                     <input type="text" name="ioType">
                     <input type="text" name="ioType" value="">
                  </div>
               </div>
               <!-- 源库位 -->
@@ -1037,7 +1065,7 @@
                     <span>源库位：</span>
                  </div>
                  <div class="form-item-input">
                     <input type="text" name="sourceLocNo">
                     <input type="text" name="sourceLocNo" value="">
                  </div>
               </div>
               <!-- 目标库位 -->
@@ -1046,7 +1074,7 @@
                     <span>目标库位：</span>
                  </div>
                  <div class="form-item-input">
                     <input type="text" name="locNo">
                     <input type="text" name="locNo" value="">
                  </div>
               </div>
               <!-- 堆垛机状态 -->
@@ -1055,7 +1083,7 @@
                     <span>堆垛机状态：</span>
                  </div>
                  <div class="form-item-input">
                     <input type="text" name="crnStatus">
                     <input type="text" name="crnStatus" value="">
                  </div>
               </div>
               <!-- 异常 -->
@@ -1064,13 +1092,13 @@
                     <span>异常：</span>
                  </div>
                  <div class="form-item-input">
                     <input type="text" name="error">
                     <input type="text" name="error" value="">
                  </div>
               </div>
            </form>
         </div>
         <!-- 输送设备弹窗 -->
         <div id="siteWindow" style="display: none;">
         <div id="siteWindow" style="display: none;" class="animate__animated animate__fadeIn">
            <!-- 表头 -->
            <div id="siteWindow-head">
               <div class='detailed'></div>
@@ -1083,7 +1111,7 @@
                     <span>设备号：</span>
                  </div>
                  <div class="form-item-input">
                     <input type="text" name="siteId">
                     <input type="text" name="siteId" value="">
                  </div>
               </div>
               <!-- 工作号 -->
@@ -1092,7 +1120,7 @@
                     <span>工作号：</span>
                  </div>
                  <div class="form-item-input">
                     <input type="text" name="workNo">
                     <input type="text" name="workNo" value="">
                  </div>
               </div>
               <!-- 工作状态 -->
@@ -1101,7 +1129,7 @@
                     <span>工作状态：</span>
                  </div>
                  <div class="form-item-input">
                     <input type="text" name="wrkSts">
                     <input type="text" name="wrkSts" value="">
                  </div>
               </div>
               <!-- 自动 -->
@@ -1146,7 +1174,7 @@
                     <span>出入类型：</span>
                  </div>
                  <div class="form-item-input">
                     <input type="text" name="ioType">
                     <input type="text" name="ioType" value="">
                  </div>
               </div>
               <!-- 源站 -->
@@ -1155,7 +1183,7 @@
                     <span>源站：</span>
                  </div>
                  <div class="form-item-input">
                     <input type="text" name="sourceStaNo">
                     <input type="text" name="sourceStaNo" value="">
                  </div>
               </div>
               <!-- 目标站 -->
@@ -1164,7 +1192,7 @@
                     <span>目标站：</span>
                  </div>
                  <div class="form-item-input">
                     <input type="text" name="staNo">
                     <input type="text" name="staNo" value="">
                  </div>
               </div>
               <!-- 源库位 -->
@@ -1173,7 +1201,7 @@
                     <span>源库位：</span>
                  </div>
                  <div class="form-item-input">
                     <input type="text" name="sourceLocNo">
                     <input type="text" name="sourceLocNo" value="">
                  </div>
               </div>
               <!-- 目标库位 -->
@@ -1182,7 +1210,7 @@
                  <span>目标库位：</span>
               </div>
               <div class="form-item-input">
                  <input type="text" name="locNo">
                  <input type="text" name="locNo" value="">
               </div>
            </div>
            
@@ -1201,16 +1229,41 @@
       $("#siteWindow").attr("style","display:block;");//显示div
       $(".detailed").empty();
       $('.detailed').append(id+'站点详细信息');
       $.post(baseUrl+"/console/site/detail", {siteId: id}, function (res) {
          for (var val in res.data) {




       var res = {
           code: 500,
          msg: '服务器异常',
          data: {
             siteId:id,
             workNo:100,
             wrkSts:'运行中',
             autoing:'Y',
             loading:'',
             canining:'',
             canouting:'',
             ioType:'出库',
             sourceStaNo:'站点2',
             staNo:'站点1',
             sourceLocNo:2,
             locNo:2,
          }
       }
      http.post(baseUrl+"/console/site/detail", {siteId: id}, function (res) {

      })
      // res.data
      for (var val in data) {
             var find = $("#siteWindow").find(":input[name='" + val + "']");
             if (find[0].type==='text') {
                find.val(res.data[val]);
            find.val(data[val]);
             } else if (find[0].type === 'checkbox') {
                find.attr("checked", res.data[val] === 'Y');
            find.attr("checked", data[val] === 'Y');
             }
          }
       })

   });
   // 堆垛机信息
   $('.machine').on('click',function(){
@@ -1234,6 +1287,9 @@
      $('#siteWindow').attr('style','display:none')
      $('#crnWindow').attr('style','display:none')
   })



   var crn1Position = 0;
   var crn2Position = 0;
   var crn3Position = 0;