From e69345c81150863c4a716819984693fd0487b419 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 07 二月 2026 11:52:25 +0800
Subject: [PATCH] 客户问题优化调整6-出入库详单取消入库重量，监管下出入库报表查询数据一样问题
---
fzzy-igdss-web/src/main/resources/static/security/quantity.js | 100 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 88 insertions(+), 12 deletions(-)
diff --git a/fzzy-igdss-web/src/main/resources/static/security/quantity.js b/fzzy-igdss-web/src/main/resources/static/security/quantity.js
index 0970d82..3b6670f 100644
--- a/fzzy-igdss-web/src/main/resources/static/security/quantity.js
+++ b/fzzy-igdss-web/src/main/resources/static/security/quantity.js
@@ -59,9 +59,6 @@
//娓叉煋璁板綍
ajaxListRecord();
-
- //娓叉煋鎶撴媿鍥�
- ajaxSnapImg();
}
/**
@@ -83,7 +80,7 @@
contentType: "application/json;charset=UTF-8",
data: JSON.stringify(data),
success: function (result) {
- if (result.code != "SUCCESS") {
+ if (result.code != "0000") {
renderSnapImg();
} else {
fileRecord = result.data;
@@ -143,7 +140,6 @@
}
}
-
/**
* 璇锋眰鍥捐〃淇℃伅
*/
@@ -158,7 +154,7 @@
contentType: "application/json;charset=UTF-8",
data: JSON.stringify(data),
success: function (result) {
- if (result.code != "SUCCESS") {
+ if (result.code != "0000") {
renderEcharts(null);
} else {
renderEcharts(result.data);
@@ -177,11 +173,11 @@
function renderEcharts(chartData) {
var chart = hisChart;
if (chartData && chartData.xaxis.length > 0 && chartData.seriesData.length > 0) {
- chart.option.xAxis.data = chartData.xaxis;
+ chart.option.xAxis[0].data = chartData.xaxis;
chart.option.series[0].data = chartData.seriesData;
chart.chart.setOption(chart.option, true);
} else {
- chart.option.xAxis.data = names;
+ chart.option.xAxis[0].data = names;
chart.option.series[0].data = data;
chart.chart.setOption(chart.option, true);
}
@@ -204,7 +200,7 @@
contentType: "application/json;charset=UTF-8",
data: JSON.stringify(data),
success: function (result) {
- if (result.code != "SUCCESS") {
+ if (result.code != "0000") {
renderListRecord();
} else {
listRecord = result.data;
@@ -223,9 +219,17 @@
*/
function renderListRecord() {
- if (!listRecord) return null;
+ if (!listRecord) {
+ //娓叉煋鎶撴媿鍥�
+ ajaxSnapImg();
+ return null;
+ }
- if (listRecord.length === 0) return null;
+ if (listRecord.length === 0) {
+ //娓叉煋鎶撴媿鍥�
+ ajaxSnapImg();
+ return null;
+ }
var record = listRecord[0];
if (record) {
@@ -271,6 +275,9 @@
$("#record_time4").text("----");
$("#record_content4").text("妫�娴嬮噸閲忎负---- KG锛屽疄闄呴噸閲忎负---- KG锛岃宸皬浜�-%銆�");
}
+
+ //娓叉煋鎶撴媿鍥�
+ ajaxSnapImg();
}
/**
@@ -317,6 +324,68 @@
$("#divPlugin2").html(html);
}
+/**
+ * 鍚姩寮�濮嬫娴�
+ */
+function checkStart() {
+ if (!curCamera) {
+ shoTips("璇峰厛閫夋嫨璁惧锛�");
+ return;
+ }
+ layer.msg("寮�濮嬫墽琛屸�︹��");
+ var data = {
+ 'depotId': curCamera.depotId
+ };
+ $.ajax({
+ type: "POST",
+ url: "/security/check-single",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(data),
+ success: function (result) {
+ if (result.code == "ORDER_SUCCESS") {
+ shoTips("鍛戒护鍙戠敓鎴愬姛锛岃绛夊緟缁堢杩斿洖缁撴灉鈥︹��");
+ } else {
+ shoTips("鍛戒护鍙戦�佸け璐ワ細" + result.msg);
+ }
+ },
+ error: function () {
+ shoTips("妫�娴嬪嚭鐜板紓甯革紝鎵ц澶辫触锛�");
+ }
+ });
+}
+
+/**
+ * 鍋滄妫�娴�
+ */
+function checkStop() {
+ if (!curCamera) {
+ shoTips("璇峰厛閫夋嫨浠撳簱锛�");
+ return;
+ }
+ layer.msg("寮�濮嬫墽琛屸�︹��");
+ var data = {
+ 'depotId': curCamera.depotId
+ };
+ $.ajax({
+ type: "POST",
+ url: "/security/check-stop",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(data),
+ success: function (result) {
+ if (result.code == "ORDER_SUCCESS") {
+ shoTips("鍛戒护鍙戠敓鎴愬姛鈥︹��");
+ } else {
+ shoTips("鍛戒护鍙戦�佸け璐ワ細" + result.msg);
+ }
+ },
+ error: function () {
+ shoTips("妫�娴嬪嚭鐜板紓甯革紝鎵ц澶辫触锛�");
+ }
+ });
+}
+
// 鍒濆鍖朎Charts娓╁害璧板娍鍥�
function initEcharts(names, data) {
// 鍒濆鍖朎Charts娓╁害璧板娍鍥�
@@ -356,7 +425,7 @@
type: 'value',
name: '鏁伴噺 (KG)',
min: 0,
- max: 3000000,
+ // max: 3000000,
axisLabel: {
formatter: '{value} KG'
}
@@ -389,4 +458,11 @@
window.addEventListener('resize', function () {
temperatureChart.resize();
});
+}
+
+function shoTips(msg) {
+ layer.msg(msg,
+ {time: 3000, shift: 5, offset: "rb"},
+ function () {
+ });
}
\ No newline at end of file
--
Gitblit v1.9.3