From c425a8afba0a76eb62d5650cc9c98c42d8339f06 Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期四, 12 三月 2026 13:01:23 +0800
Subject: [PATCH] perf: 1.优化储丝柜单柜卷包产量计算方式，支持未出料结束计算统计   2.新增储丝柜单柜卷包产量桑基图

---
 ruoyi-plus-soybean/src/views/analy/feed-match/index.vue |  464 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 232 insertions(+), 232 deletions(-)

diff --git a/ruoyi-plus-soybean/src/views/analy/feed-match/index.vue b/ruoyi-plus-soybean/src/views/analy/feed-match/index.vue
index f76c41a..3f303be 100644
--- a/ruoyi-plus-soybean/src/views/analy/feed-match/index.vue
+++ b/ruoyi-plus-soybean/src/views/analy/feed-match/index.vue
@@ -15,7 +15,6 @@
   name: 'FeedMatchList'
 });
 
-
 const appStore = useAppStore();
 const { download } = useDownload();
 const { hasAuth } = useAuth();
@@ -25,247 +24,248 @@
   pageSize: 10,
   time: null,
   key: null,
+  shift: null,
   params: {}
 });
 
 const { columns, columnChecks, data, getData, getDataByPage, loading, mobilePagination, scrollX } =
   useNaivePaginatedTable({
-  api: () => fetchGetFeedMatchList(searchParams.value),
-  transform: response => defaultTransform(response),
-  onPaginationParamsChange: params => {
-    searchParams.value.pageNum = params.page;
-    searchParams.value.pageSize = params.pageSize;
-  },
-  columns: () => [
-    {
-      type: 'selection',
-      align: 'center',
-      width: 48
+    api: () => fetchGetFeedMatchList(searchParams.value),
+    transform: response => defaultTransform(response),
+    onPaginationParamsChange: params => {
+      searchParams.value.pageNum = params.page;
+      searchParams.value.pageSize = params.pageSize;
     },
-    {
-      key: 'index',
-      title: $t('common.index'),
-      align: 'center',
-      width: 64,
-      render: (_, index) => index + 1
-    },
-    {
-      key: 'time',
-      title: '鏃堕棿鎴�',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'key',
-      title: '鐝+鏈哄彴',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'dacUpTime',
-      title: '鏁版嵁鏇存柊鏃堕棿',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'fs11',
-      title: '1#鍠備笣鏈哄搴旂殑绗竴涓偍涓濇煖',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'fs12',
-      title: '1#鍠備笣鏈哄搴旂殑绗簩涓偍涓濇煖',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'fs21',
-      title: '2#鍠備笣鏈哄搴旂殑绗竴涓偍涓濇煖',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'fs22',
-      title: '2#鍠備笣鏈哄搴旂殑绗簩涓偍涓濇煖',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'fs31',
-      title: '3#鍠備笣鏈哄搴旂殑绗竴涓偍涓濇煖',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'fs32',
-      title: '3#鍠備笣鏈哄搴旂殑绗簩涓偍涓濇煖',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'fs41',
-      title: '4#鍠備笣鏈哄搴旂殑绗竴涓偍涓濇煖',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'fs42',
-      title: '4#鍠備笣鏈哄搴旂殑绗簩涓偍涓濇煖',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'pipe01',
-      title: '1#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'pipe02',
-      title: '2#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'pipe03',
-      title: '3#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'pipe04',
-      title: '4#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'pipe05',
-      title: '5#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'pipe06',
-      title: '6#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'pipe07',
-      title: '7#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'pipe08',
-      title: '8#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'pipe09',
-      title: '9#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'pipe10',
-      title: '10#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'pipe11',
-      title: '11#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'pipe12',
-      title: '12#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'wsjState',
-      title: '鍠備笣鏈虹姸鎬� 1-杩炴帴 0-鏂紑',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'shift',
-      title: '鐝',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'equNo',
-      title: '鏈哄彴',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'remark',
-      title: '澶囨敞',
-      align: 'center',
-      minWidth: 120
-    },
-    {
-      key: 'operate',
-      title: $t('common.operate'),
-      align: 'center',
-      width: 130,
-      render: row => {
-        const divider = () => {
-          if (!hasAuth('analy:feedMatch:edit') || !hasAuth('analy:feedMatch:remove')) {
-            return null;
-          }
-          return <NDivider vertical />;
-        };
+    columns: () => [
+      {
+        type: 'selection',
+        align: 'center',
+        width: 48
+      },
+      {
+        key: 'index',
+        title: $t('common.index'),
+        align: 'center',
+        width: 64,
+        render: (_, index) => index + 1
+      },
+      {
+        key: 'time',
+        title: '鏃堕棿鎴�',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'key',
+        title: '鐝+鏈哄彴',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'dacUpTime',
+        title: '鏁版嵁鏇存柊鏃堕棿',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'fs11',
+        title: '1#鍠備笣鏈哄搴旂殑绗竴涓偍涓濇煖',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'fs12',
+        title: '1#鍠備笣鏈哄搴旂殑绗簩涓偍涓濇煖',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'fs21',
+        title: '2#鍠備笣鏈哄搴旂殑绗竴涓偍涓濇煖',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'fs22',
+        title: '2#鍠備笣鏈哄搴旂殑绗簩涓偍涓濇煖',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'fs31',
+        title: '3#鍠備笣鏈哄搴旂殑绗竴涓偍涓濇煖',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'fs32',
+        title: '3#鍠備笣鏈哄搴旂殑绗簩涓偍涓濇煖',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'fs41',
+        title: '4#鍠備笣鏈哄搴旂殑绗竴涓偍涓濇煖',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'fs42',
+        title: '4#鍠備笣鏈哄搴旂殑绗簩涓偍涓濇煖',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'pipe01',
+        title: '1#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'pipe02',
+        title: '2#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'pipe03',
+        title: '3#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'pipe04',
+        title: '4#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'pipe05',
+        title: '5#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'pipe06',
+        title: '6#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'pipe07',
+        title: '7#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'pipe08',
+        title: '8#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'pipe09',
+        title: '9#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'pipe10',
+        title: '10#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'pipe11',
+        title: '11#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'pipe12',
+        title: '12#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'wsjState',
+        title: '鍠備笣鏈虹姸鎬� 1-杩炴帴 0-鏂紑',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'shift',
+        title: '鐝',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'equNo',
+        title: '鏈哄彴',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'remark',
+        title: '澶囨敞',
+        align: 'center',
+        minWidth: 120
+      },
+      {
+        key: 'operate',
+        title: $t('common.operate'),
+        align: 'center',
+        width: 130,
+        render: row => {
+          const divider = () => {
+            if (!hasAuth('analy:feedMatch:edit') || !hasAuth('analy:feedMatch:remove')) {
+              return null;
+            }
+            return <NDivider vertical />;
+          };
 
-        const editBtn = () => {
-          if (!hasAuth('analy:feedMatch:edit')) {
-            return null;
-          }
+          const editBtn = () => {
+            if (!hasAuth('analy:feedMatch:edit')) {
+              return null;
+            }
+            return (
+              <ButtonIcon
+                text
+                type="primary"
+                icon="material-symbols:drive-file-rename-outline-outline"
+                tooltipContent={$t('common.edit')}
+                onClick={() => edit(row.time)}
+              />
+            );
+          };
+
+          const deleteBtn = () => {
+            if (!hasAuth('analy:feedMatch:remove')) {
+              return null;
+            }
+            return (
+              <ButtonIcon
+                text
+                type="error"
+                icon="material-symbols:delete-outline"
+                tooltipContent={$t('common.delete')}
+                popconfirmContent={$t('common.confirmDelete')}
+                onPositiveClick={() => handleDelete(row.time)}
+              />
+            );
+          };
+
           return (
-            <ButtonIcon
-              text
-              type="primary"
-              icon="material-symbols:drive-file-rename-outline-outline"
-              tooltipContent={$t('common.edit')}
-              onClick={() => edit(row.time)}
-            />
+            <div class="flex-center gap-8px">
+              {editBtn()}
+              {divider()}
+              {deleteBtn()}
+            </div>
           );
-        };
-
-        const deleteBtn = () => {
-          if (!hasAuth('analy:feedMatch:remove')) {
-            return null;
-          }
-          return (
-            <ButtonIcon
-              text
-              type="error"
-              icon="material-symbols:delete-outline"
-              tooltipContent={$t('common.delete')}
-              popconfirmContent={$t('common.confirmDelete')}
-              onPositiveClick={() => handleDelete(row.time)}
-            />
-          );
-        };
-
-        return (
-          <div class="flex-center gap-8px">
-            {editBtn()}
-            {divider()}
-            {deleteBtn()}
-          </div>
-        );
+        }
       }
-    }
-  ]
-});
+    ]
+  });
 
 const { drawerVisible, operateType, editingData, handleAdd, handleEdit, checkedRowKeys, onBatchDeleted, onDeleted } =
   useTableOperate(data, 'time', getData);

--
Gitblit v1.9.3