From 65df168408e508f4ef0ea79e40f2828669d7967e Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期六, 20 五月 2023 09:14:16 +0800 Subject: [PATCH] 工作号变任务号等 --- src/main/webapp/views/basErrLog/basErrLog.html | 2 +- src/main/webapp/views/wrkMast/wrkDetl.html | 6 +++--- src/main/webapp/views/commandManageLog/commandManageLog.html | 2 +- src/main/webapp/static/wms/js/basErrLog/basErrLog.js | 4 ++-- src/main/webapp/static/wms/js/commandManageLog/commandManageLog.js | 2 +- src/main/webapp/static/wcs/css/render.css | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/webapp/static/wcs/css/render.css b/src/main/webapp/static/wcs/css/render.css index 318a0ab..c00b658 100644 --- a/src/main/webapp/static/wcs/css/render.css +++ b/src/main/webapp/static/wcs/css/render.css @@ -529,7 +529,7 @@ } .main-part { position: relative; - top: -50px; + top: 0px; left: -150px; width: 100%; height: 100%; @@ -540,7 +540,7 @@ top: 0; right: 0; width: 500px; - height: 200px; + height: 230px; background: rgba(255, 255, 255, 0.7); overflow: auto; } diff --git a/src/main/webapp/static/wms/js/basErrLog/basErrLog.js b/src/main/webapp/static/wms/js/basErrLog/basErrLog.js index a38e3b6..cdc88ff 100644 --- a/src/main/webapp/static/wms/js/basErrLog/basErrLog.js +++ b/src/main/webapp/static/wms/js/basErrLog/basErrLog.js @@ -21,10 +21,10 @@ {type: 'checkbox'} // ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80} ,{field: 'uuid', align: 'center',title: '缂栧彿', hide: true} - ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'} + ,{field: 'wrkNo', align: 'center',title: '浠诲姟鍙�'} ,{field: 'startTime$', align: 'center',title: '鍙戠敓鏃堕棿'} ,{field: 'endTime$', align: 'center',title: '缁撴潫鏃堕棿'} - ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'} + ,{field: 'wrkSts$', align: 'center',title: '浠诲姟鐘舵��'} ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'} ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈�'} ,{field: 'plcNo', align: 'center',title: 'plc', hide: true} diff --git a/src/main/webapp/static/wms/js/commandManageLog/commandManageLog.js b/src/main/webapp/static/wms/js/commandManageLog/commandManageLog.js index 72b4d35..4592d15 100644 --- a/src/main/webapp/static/wms/js/commandManageLog/commandManageLog.js +++ b/src/main/webapp/static/wms/js/commandManageLog/commandManageLog.js @@ -21,7 +21,7 @@ cellMinWidth: 50, cols: [[ {field: 'id', align: 'center',title: '鎸囦护缂栧彿',event: 'wrkNo', sort: true} - ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',event: 'wrkNo', sort: true} + ,{field: 'wrkNo', align: 'center',title: '浠诲姟鍙�',event: 'wrkNo', sort: true} ,{field: 'commandStatus$', align: 'center',title: '鎸囦护鐘舵��'} ,{field: 'durationTime', align: 'center',title: '鎸佺画鏃堕暱', width: 160} ,{field: 'commandType', align: 'center',title: '鎸囦护绫诲瀷'} diff --git a/src/main/webapp/views/basErrLog/basErrLog.html b/src/main/webapp/views/basErrLog/basErrLog.html index b9ee2a2..3ba715f 100644 --- a/src/main/webapp/views/basErrLog/basErrLog.html +++ b/src/main/webapp/views/basErrLog/basErrLog.html @@ -16,7 +16,7 @@ <div id="search-box" class="layui-form layui-card-header"> <div class="layui-inline"> <div class="layui-input-inline"> - <input class="layui-input" type="text" name="wrk_no" placeholder="宸ヤ綔鍙�" autocomplete="off"> + <input class="layui-input" type="text" name="wrk_no" placeholder="浠诲姟鍙�" autocomplete="off"> </div> </div> <div class="layui-inline"> diff --git a/src/main/webapp/views/commandManageLog/commandManageLog.html b/src/main/webapp/views/commandManageLog/commandManageLog.html index 304c165..c85667f 100644 --- a/src/main/webapp/views/commandManageLog/commandManageLog.html +++ b/src/main/webapp/views/commandManageLog/commandManageLog.html @@ -20,7 +20,7 @@ </div> <div class="layui-inline"> <div class="layui-input-inline"> - <input class="layui-input" type="text" name="wrk_no" id="wrkNo" placeholder="宸ヤ綔鍙�" autocomplete="off"> + <input class="layui-input" type="text" name="wrk_no" id="wrkNo" placeholder="浠诲姟鍙�" autocomplete="off"> </div> </div> diff --git a/src/main/webapp/views/wrkMast/wrkDetl.html b/src/main/webapp/views/wrkMast/wrkDetl.html index acfae3c..d36d887 100644 --- a/src/main/webapp/views/wrkMast/wrkDetl.html +++ b/src/main/webapp/views/wrkMast/wrkDetl.html @@ -14,7 +14,7 @@ </head> <body> <div class="layui-inline" style="width:31%;margin-top: 20px"> - <label class="layui-form-label">宸� 浣� 鍙凤細</label> + <label class="layui-form-label">浠� 鍔� 鍙凤細</label> <div class="layui-input-inline"> <input id="wrkNo" class="layui-input" type="text" disabled="disabled"> </div> @@ -30,8 +30,8 @@ var pageCur; function getCol() { var cols = [ - {field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'} - ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'} + {field: 'wrkNo', align: 'center',title: '浠诲姟鍙�'} + ,{field: 'ioTime$', align: 'center',title: '浠诲姟鏃堕棿'} ]; cols.push.apply(cols, detlCols); return cols; -- Gitblit v1.9.1