From 2b31fa203f3435a582be51f45899d99164c9917a Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期四, 09 四月 2026 13:34:59 +0800
Subject: [PATCH] Merge branch 'master' of http://lanpucloud.cn:1111/r/SC/gfzl
---
ruoyi-plus-soybean/src/views/analy/store-silk/index.vue | 22 +++++-----------------
1 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/ruoyi-plus-soybean/src/views/analy/store-silk/index.vue b/ruoyi-plus-soybean/src/views/analy/store-silk/index.vue
index 141fbeb..90aa24c 100755
--- a/ruoyi-plus-soybean/src/views/analy/store-silk/index.vue
+++ b/ruoyi-plus-soybean/src/views/analy/store-silk/index.vue
@@ -21,8 +21,6 @@
const { download } = useDownload();
const { hasAuth } = useAuth();
-
-
const selectedRollerDetailList = ref<any[]>([]);
const selectedPackerDetailList = ref<any[]>([]);
@@ -140,11 +138,9 @@
render: row => {
const box = calcRollerBox((row as any).rollerOutput);
if (box === null || box <= 0) return '-';
- const jobinput = Number((row as any).jobinput);
const weight = Number((row as any).weight);
- const diff = jobinput - weight;
- if (!Number.isFinite(diff)) return '-';
- const val = diff / box;
+ if (!Number.isFinite(weight)) return '-';
+ const val = weight / box;
if (!Number.isFinite(val)) return '-';
return val.toFixed(2);
}
@@ -168,11 +164,9 @@
render: row => {
const box = calcPackerBox((row as any).packerOutput);
if (box === null || box <= 0) return '-';
- const jobinput = Number((row as any).jobinput);
const weight = Number((row as any).weight);
- const diff = jobinput - weight;
- if (!Number.isFinite(diff)) return '-';
- const val = diff / box;
+ if (!Number.isFinite(weight)) return '-';
+ const val = weight / box;
if (!Number.isFinite(val)) return '-';
return val.toFixed(2);
}
@@ -247,7 +241,6 @@
if (!Number.isFinite(v)) return null;
return v;
}
-
function calcPackerBox(val: unknown) {
if (val === null || val === undefined) return null;
const v = Number(val) / 10 / 250;
@@ -284,12 +277,7 @@
@refresh="getData"
>
<template #prefix>
- <NButton
- size="small"
- ghost
- :type="showSankey ? 'primary' : 'default'"
- @click="showSankey = !showSankey"
- >
+ <NButton size="small" ghost :type="showSankey ? 'primary' : 'default'" @click="showSankey = !showSankey">
{{ showSankey ? '鍒楄〃' : '妗戝熀鍥�' }}
</NButton>
</template>
--
Gitblit v1.9.3