From 651dfb24aa82ea28e6348907bc02dc8c84a6e13f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 29 六月 2023 19:33:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-web/src/main/resources/static/admin/inout/in-sample.js | 189 +++-------------------------------------------
1 files changed, 15 insertions(+), 174 deletions(-)
diff --git a/igds-web/src/main/resources/static/admin/inout/in-sample.js b/igds-web/src/main/resources/static/admin/inout/in-sample.js
index 525ebf8..575d438 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-sample.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-sample.js
@@ -14,7 +14,6 @@
form = layui.form;
table = layui.table;
laydate = layui.laydate;
-
laydate.render({
elem: '#start',
theme: '#7b8e9f',
@@ -44,31 +43,11 @@
showDetail(obj);
}
});
-
- //鐩戝惉绮鍝佺
- layui.form.on('select(select_foodVariety)', function (data) {
- updateFoodVariety(data.value);
- });
-
- //鐩戝惉鍖栭獙缁撴灉鍗曞～鍐欐暟鎹�,骞剁粰鍑烘彁绀虹粨鏋�
- table.on('edit(tableCheckItem)', function (obj) {
- getResult(obj);
- });
});
//鏄剧ず鍏ュ簱娴佺▼
showProgress();
-
- // 鍒濆鍖朩ebSocket
- initInoutWS(deptId, bizType, progress, userId);
});
-
-
-// socket淇℃伅杩斿洖铏曠悊
-function socketOnMessage(packet) {
- layer.alert(packet.data);
- window.parent.sysNotify(packet.data);
-}
/**
* 鏉′欢鏌ヨ
@@ -193,55 +172,6 @@
form.render();
};
-//鏍规嵁濉啓鍖栭獙鏁版嵁,缁欏嚭鎻愰啋鏄惁鍚堟牸
-function getResult(obj) {
- var data = obj.data;
- //濉啓鐨勬暟鎹��
- var newValue = data.value;
- //鏍囧噯鍊�
- var limit = data.upperLimit;
- //杩愮畻绗�
- var symbol = data.operaSymbol;
-
- if (symbol && limit) {
- if (">=" == symbol) {
- if (newValue < limit) {
- data.remarks = "涓嶅悎鏍�";
- } else {
- data.remarks = "鍚堟牸";
- }
- }
- if ("<=" == symbol) {
- if (newValue > limit) {
- data.remarks = "涓嶅悎鏍�";
- } else {
- data.remarks = "鍚堟牸";
- }
- }
- if ("==" == symbol) {
- if (newValue != limit) {
- data.remarks = "涓嶅悎鏍�";
- } else {
- data.remarks = "鍚堟牸";
- }
- }
- }
- obj.update(data);
- //鏍规嵁鍖栭獙缁撴灉鎻愰啋鏄惁鍚堟牸
- updateCheckResultTip();
-}
-
-//鏍规嵁閫夋嫨浠撳簱鏄剧ず绮鍝佺
-function updateFoodVariety(foodVariety) {
- if (null == foodVariety || "" == foodVariety) return;
- form.val("form-detail", {
- foodVariety: foodVariety
- });
- form.render();
-
- flushCheckItem(foodVariety);
-}
-
// 鏍规嵁妯″紡鍚姩寮�濮嬫墻鏍�
function checkExe(type) {
@@ -257,14 +187,14 @@
success: function (result) {
layer.close(index);
if (result.code != "0000") {
- layer.alert(result.msg);
+ alertError(result.msg);
} else {
- layer.msg("鎿嶄綔鍛戒护鍙戦�佹垚鍔燂紒");
+ alertSuccess("鎿嶄綔鍛戒护鍙戦�佹垚鍔�!");
}
},
error: function () {
layer.close(index);
- layer.alert("鍚庡彴寮傚父锛屾搷浣滃懡浠ゅ彂閫佸け璐ワ紒");
+ alertError("鍚庡彴寮傚父锛屾搷浣滃懡浠ゅ彂閫佸け璐ワ紒");
}
});
};
@@ -348,51 +278,23 @@
* 鏃堕棿绛�
*/
function getTime() {
-
- var now = new Date();
- var time = now.toLocaleString('chinese', {
- hour12: false
- });
- return time;
-}
-
-function formatDateTime(date, format) {
- const o = {
- 'M+': date.getMonth() + 1, // 鏈堜唤
- 'd+': date.getDate(), // 鏃�
- 'h+': date.getHours() % 12 === 0 ? 12 : date.getHours() % 12, // 灏忔椂
- 'H+': date.getHours(), // 灏忔椂
- 'm+': date.getMinutes(), // 鍒�
- 's+': date.getSeconds(), // 绉�
- 'q+': Math.floor((date.getMonth() + 3) / 3), // 瀛ｅ害
- S: date.getMilliseconds(), // 姣
- a: date.getHours() < 12 ? '涓婂崍' : '涓嬪崍', // 涓婂崍/涓嬪崍
- A: date.getHours() < 12 ? 'AM' : 'PM', // AM/PM
- };
- if (/(y+)/.test(format)) {
- format = format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
- }
- for (let k in o) {
- if (new RegExp('(' + k + ')').test(format)) {
- format = format.replace(
- RegExp.$1,
- RegExp.$1.length === 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length)
- );
- }
- }
- return format;
+ var now = new Date();
+ var time = now.toLocaleString('chinese', {
+ hour12: false
+ });
+ return time;
}
function showDetail(obj) {
curSampleData = null;
- var nowTime = formatDateTime(new Date(), "yyyy-MM-dd HH:mm:ss");
+ var nowTime = dateFtt("yyyy-MM-dd hh:mm:ss", new Date());
$("#printTime").html(nowTime);
curSampleData = obj.data;
- if(!curSampleData.sampleTime){
+ if (!curSampleData.sampleTime) {
curSampleData.sampleTime = nowTime;
}
- if(!curSampleData.sampleUser){
+ if (!curSampleData.sampleUser) {
curSampleData.sampleUser = sampleUser;
}
// 璧嬪��
@@ -406,9 +308,9 @@
shade: 0,
content: $('#checkDetail'),
btnAlign: 'c',
- btn: ['淇濆瓨骞舵墦鍗�', '淇濆瓨鎻愪氦','鍏抽棴鍙栨秷'],
+ btn: ['淇濆瓨骞舵墦鍗�', '淇濆瓨鎻愪氦', '鍏抽棴鍙栨秷'],
yes: function () {
- layer.alert("鏉″舰鐮佸緟纭畾锛�");
+ alertSuccess("鏉″舰鐮佸緟纭畾锛�");
}, btn2: function () {
// 鏇存柊鍒伴〉闈�
var data = form.val("form-detail");
@@ -436,11 +338,10 @@
layer.alert("璇疯緭鍏ユ墻鏍锋椂闂达紒锛�");
return;
}
-
var index = layer.load();
$.ajax({
type: "POST",
- url: "../../basic/inout/update-sample",
+ url: "../../basic/inout/submit-sample",
dataType: "json",
contentType: "application/json;charset=UTF-8",
data: JSON.stringify(curSampleData),
@@ -457,67 +358,7 @@
},
error: function () {
layer.close(index);
- layer.alert("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯锛�");
+ alertError("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯");
}
});
-}
-
-//鎺у埗娴佺▼鐜妭鏄剧ず
-function showProgress() {
- if (!inoutProgress) {
- return;
- }
- if (inoutProgress.indexOf("REGISTER") == -1) {
- $("#progress-register").css("display", "none");
- }
- if (inoutProgress.indexOf("CHECK") == -1) {
- $("#progress-check").css("display", "none");
- }
- if (inoutProgress.indexOf("WEIGHT_FULL") == -1) {
- $("#progress-fullWeight").css("display", "none");
- }
- if (inoutProgress.indexOf("HANDLE") == -1) {
- $("#progress-hand").css("display", "none");
- }
- if (inoutProgress.indexOf("WEIGHT_EMPTY") == -1) {
- $("#progress-emptyWeight").css("display", "none");
- }
- if (inoutProgress.indexOf("CARD_BACK") == -1) {
- $("#progress-cardBack").css("display", "none");
- }
-}
-
-/**
- * 寮瑰嚭鎻愰啋妗�
- * @param msg 鎻愰啋淇℃伅
- * @param data 鏁版嵁淇℃伅锛屽彲鑳戒负绌�
- */
-function notify(msg, data) {
- if (data) {
- //璧嬪��
- $("#resultMsg").text(msg);
- $("#resultUserName").text(data.userName);
- $("#resultPlateNum").text(data.plateNum);
- if ("IN" == data.type) {
- $("#resultType").text("鍏ュ簱-" + INOUT_PROGRESS_MSG(data.progress));
- } else {
- $("#resultType").text("鍑哄簱-" + INOUT_PROGRESS_MSG(data.progress));
- }
- $("#resultIntelCard").text(data.intelCard);
-
- layer.open({
- type: 1,
- offset: ['150px', '200px'],
- area: '450px;',
- shade: 0.8,
- id: 'dialog_notify_info',
- btn: ['纭畾'],
- content: $('#dialog-from-notify'),
- yes: function (index) {
- layer.closeAll();
- }
- });
- } else {
- layer.alert(msg, {offset: ['300px', '300px']});
- }
}
\ No newline at end of file
--
Gitblit v1.9.3