From f13c3c30079b05f5e58f8e86a339ca9b4b7ea002 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 15 五月 2023 14:45:40 +0800
Subject: [PATCH] 堆垛机异常日志

---
 src/main/webapp/static/js/common.js |  152 +++++++++++++++++++++++++++++---------------------
 1 files changed, 88 insertions(+), 64 deletions(-)

diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 75edf6a..3779158 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/jswcs";
+var baseUrl = "/wcs";
 
 // 璧嬪��
 function setVal(el, val) {
@@ -18,7 +18,7 @@
 }
 
 // 鏃堕棿 ==>> 瀛楃涓�
-function dateToStr(date) {
+function dateToStr(date, millisecond) {
     var time = new Date(date);
     var y = time.getFullYear();
     var M = time.getMonth() + 1;
@@ -31,7 +31,18 @@
     m = m < 10 ? ("0" + m) : m;
     var s = time.getSeconds();
     s = s < 10 ? ("0" + s) : s;
-    return y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
+    if (!millisecond) {
+        return y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
+    } else {
+        var p = time.getMilliseconds();
+        if (p < 10) {
+            p = "00" + p;
+        }
+        if (p <  100) {
+            p = "0" + p;
+        }
+        return y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s + "," + p;
+    }
 }
 
 // 瀛楃涓� ===>> 鏃堕棿
@@ -194,67 +205,80 @@
     return fmt;
 }
 
-// 鍏ㄥ睆 -----------------------------------------------------------------------
 
-//寮�濮嬪叏灞�
-function full() {
-    var docElm = document.documentElement;
-    //W3C
-    if (docElm.requestFullscreen) {
-        docElm.requestFullscreen();
-    }
-    //FireFox
-    else if (docElm.mozRequestFullScreen) {
-        docElm.mozRequestFullScreen();
-    }
-    //Chrome绛�
-    else if (docElm.webkitRequestFullScreen) {
-        docElm.webkitRequestFullScreen();
-    }
-    //IE11
-    else if (elem.msRequestFullscreen) {
-        elem.msRequestFullscreen();
-    }
-}
+var matCols = [
+    {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', width: 180}
+    // {field: 'id', align: 'center',title: 'ID'}
+    // ,{field: 'uuid', align: 'center',title: '缂栧彿'}
+    // ,{field: 'tagId$', align: 'center',title: '鎵�灞炲綊绫�'}
+    ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
+    // ,{field: 'name', align: 'center',title: '鍒悕'}
+    // ,{field: 'specs', align: 'center',title: '閰嶇疆'}
+    // ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: false}
+    // ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
+    ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
+    ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
+    // ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
+    ,{field: 'sku', align: 'center',title: 'sku', hide: true}
+    ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
+    // ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
+    ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
+    ,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
+    ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
+    ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
+    ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
+    ,{field: 'weight', align: 'center',title: '鍑�閲�', hide: false}
+    ,{field: 'length', align: 'center',title: '姣涢噸', hide: false}
+    ,{field: 'volume', align: 'center',title: '浣撶Н', hide: false}
+    ,{field: 'threeCode', align: 'center',title: '灏哄', hide: false}
+    ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
+    ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
+    ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
+    // ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
+    ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
+    ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
+    ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
+    ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+    // ,{field: 'status$', align: 'center',title: '鐘舵��'}
+    // ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
+    // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+    ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true}
+    ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
+    ,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
+]
 
-//閫�鍑哄叏灞�
-function exitFull() {
-    if (document.exitFullscreen) {
-        document.exitFullscreen();
-    }
-    else if (document.mozCancelFullScreen) {
-        document.mozCancelFullScreen();
-    }
-    else if (document.webkitCancelFullScreen) {
-        document.webkitCancelFullScreen();
-    }
-    else if (document.msExitFullscreen) {
-        document.msExitFullscreen();
-    }
-}
+var detlCols = [
+    {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
+    ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
+    // ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
+    ,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true}
+    ,{field: 'anfme', align: 'center',title: '閲嶉噺锛坘g锛�'}
+    // ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
 
-//浜嬩欢鐩戝惉
-document.addEventListener("fullscreenchange", function () {
-    try {
-        fullscreenState.innerHTML = (document.fullscreen) ? "" : "not ";
-    } catch (e) {}
-}, false);
-document.addEventListener("mozfullscreenchange", function () {
-    fullscreenState.innerHTML = (document.mozFullScreen) ? "" : "not ";
-}, false);
-document.addEventListener("webkitfullscreenchange", function () {
-    fullscreenState.innerHTML = (document.webkitIsFullScreen) ? "" : "not ";
-}, false);
-document.addEventListener("msfullscreenchange", function () {
-    fullscreenState.innerHTML = (document.msFullscreenElement) ? "" : "not ";
-}, false);
-document.onkeyup = function (e) {
-    if (window.event)//濡傛灉window.event瀵硅薄瀛樺湪锛屽氨浠ユ浜嬩欢瀵硅薄涓哄噯
-        e = window.event;
-    var key = e.charCode || e.keyCode;
-    if (key === 13 || key === 49 || key === 97) {
-        full();
-    } else if (key === 50 || key === 98) {
-        exitFull();
-    }
-}
+    ,{field: 'specs', align: 'center',title: '閰嶇疆'}
+    ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: false}
+    ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
+    ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
+    ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
+    // ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
+    ,{field: 'sku', align: 'center',title: 'sku', hide: true}
+    ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
+    // ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
+    ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
+    ,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
+    ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
+    ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
+    ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
+    ,{field: 'weight', align: 'center',title: '鍑�閲�', hide: false}
+    ,{field: 'length', align: 'center',title: '姣涢噸', hide: false}
+    ,{field: 'volume', align: 'center',title: '浣撶Н', hide: false}
+    ,{field: 'threeCode', align: 'center',title: '灏哄', hide: false}
+    ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
+    ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
+    ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
+    ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
+    ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
+    ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
+    ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
+    ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+]
\ No newline at end of file

--
Gitblit v1.9.1