Merge branch 'master' of http://94.191.59.107:3000/wukai/twin-web

main.html

@@ -2668,7 +2668,7 @@
             var s2 = $("#datepicker2").val()
             //var devcode = $.trim($("#imp_devcode").val())
             var itemcode = $("#date_select").attr("itemcode");
-            if (s1 == "" || (s2 == ""&&itemcode!=4&&itemcode!=10&&itemcode!=11)) return;
+            if (s1 == "" || (s2 == ""&&itemcode!=4&&itemcode!=10&&itemcode!=11&&itemcode!=12&&itemcode!=13)) return;
             switch (parseInt(itemcode)) {
                 case 1:
                     window.open(SERVER_URL + "/export/production?start="+s1+"&end="+s2);
@@ -3074,7 +3074,7 @@
     var markerLClickObj=null; //当前点击的标记对象
     var FacStockData = null;//全厂库存统计数据
     var StockTypeName={"pt":"盘头","ycl":"原材料","bpb":"白坯布","cp":"成品"};
-    var StockTypeUnit={"pt":"个","ycl":"KG","bpb":"KG","cp":"条"};
+    var StockTypeUnit={"pt":"个","ycl":"KG","bpb":"KG","cp":"KG"};
     //2.[可选]监听连接成功消息
     player.on("Connected", () => {
         console.log("Has connected to engine")
@@ -3129,7 +3129,7 @@
         var activeImg = $(".bottom img.active");
         activeImg.attr({'src':activeImg.attr('src').replace('_active',''),'class':''});
         $(".bottom img[t='"+currentTargetType+"']").attr({'src':'image/fac_btn_active.png','class':'active'});
-        
+
         $("body>div.hideDiv[for='FAC']").show();
         $("body>div.hideDiv[for!='FAC']").hide();
         await player.Native.Model.setModelVisible("IN02",false);
@@ -3252,7 +3252,7 @@
         var activeImg = $(".bottom img.active");
         activeImg.attr({'src':activeImg.attr('src').replace('_active',''),'class':''});
         $(".bottom img[t='"+currentTargetType+"']").attr({'src':'image/in05_btn_active.png','class':'active'});
-        
+
          await player.Native.Model.setModelVisible("FAC",false);
         await player.Native.Model.setModelVisible("IN02",false);
         await player.Native.Model.setModelVisible("IN03",false);
@@ -3280,7 +3280,7 @@
         var activeImg = $(".bottom img.active");
         activeImg.attr({'src':activeImg.attr('src').replace('_active',''),'class':''});
         $(".bottom img[t='"+currentTargetType+"']").attr({'src':'image/in04_btn_active.png','class':'active'});
-        
+
         await player.Native.Model.setModelVisible("FAC",false);
         await player.Native.Model.setModelVisible("IN02",false);
         await player.Native.Model.setModelVisible("IN03",false);
@@ -3309,7 +3309,7 @@
         var activeImg = $(".bottom img.active");
         activeImg.attr({'src':activeImg.attr('src').replace('_active',''),'class':''});
         $(".bottom img[t='"+currentTargetType+"']").attr({'src':'image/in03_btn_active.png','class':'active'});
-        
+
         await player.Native.Model.setModelVisible("FAC",false);
         await player.Native.Model.setModelVisible("IN02",false);
         await player.Native.Model.setModelVisible("IN04",false);
@@ -3338,7 +3338,7 @@
         var activeImg = $(".bottom img.active");
         activeImg.attr({'src':activeImg.attr('src').replace('_active',''),'class':''});
         $(".bottom img[t='"+currentTargetType+"']").attr({'src':'image/in02_btn_active.png','class':'active'});
-        
+
         await player.Native.Model.setModelVisible("FAC",false);
         await player.Native.Model.setModelVisible("IN03",false);
         await player.Native.Model.setModelVisible("IN04",false);