优化

2026-03-13 09:41:00 +08:00 · 2026-03-12 17:18:56 +08:00 · 2026-03-12 16:30:30 +08:00 · 2026-03-12 16:12:30 +08:00 · 2026-03-12 15:41:52 +08:00 · 2026-03-11 18:38:45 +08:00
14 changed files with 1304 additions and 570 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,6 +28,7 @@
        "crypto-js": "^4.2.0",
        "dayjs": "^1.11.4",
        "echarts": "^5.4.2",
+        "flv.js": "^1.6.2",
        "jsencrypt": "^3.3.2",
        "lint-staged": "^15.2.10",
        "lodash-es": "^4.17.21",
@@ -765,7 +766,6 @@
    },
    "node_modules/@clack/prompts/node_modules/is-unicode-supported": {
      "version": "1.3.0",
-      "extraneous": true,
      "inBundle": true,
      "license": "MIT",
      "engines": {
@@ -6560,6 +6560,12 @@
        "es6-symbol": "^3.1.1"
      }
    },
+    "node_modules/es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmmirror.com/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
+      "license": "MIT"
+    },
    "node_modules/es6-symbol": {
      "version": "3.1.4",
      "resolved": "https://registry.npmmirror.com/es6-symbol/-/es6-symbol-3.1.4.tgz",
@@ -8254,6 +8260,16 @@
      "dev": true,
      "license": "ISC"
    },
+    "node_modules/flv.js": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmmirror.com/flv.js/-/flv.js-1.6.2.tgz",
+      "integrity": "sha512-xre4gUbX1MPtgQRKj2pxJENp/RnaHaxYvy3YToVVCrSmAWUu85b9mug6pTXF6zakUjNP2lFWZ1rkSX7gxhB/2A==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "es6-promise": "^4.2.8",
+        "webworkify-webpack": "^2.1.5"
+      }
+    },
    "node_modules/follow-redirects": {
      "version": "1.15.9",
      "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.9.tgz",
@@ -16043,6 +16059,12 @@
        "node": ">=4.0"
      }
    },
+    "node_modules/webworkify-webpack": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmmirror.com/webworkify-webpack/-/webworkify-webpack-2.1.5.tgz",
+      "integrity": "sha512-2akF8FIyUvbiBBdD+RoHpoTbHMQF2HwjcxfDvgztAX5YwbZNyrtfUMgvfgFVsgDhDPVTlkbb5vyasqDHfIDPQw==",
+      "license": "MIT"
+    },
    "node_modules/which": {
      "version": "2.0.2",
      "resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz",
--- a/package.json
+++ b/package.json
@@ -34,6 +34,7 @@
    "crypto-js": "^4.2.0",
    "dayjs": "^1.11.4",
    "echarts": "^5.4.2",
+    "flv.js": "^1.6.2",
    "jsencrypt": "^3.3.2",
    "lint-staged": "^15.2.10",
    "lodash-es": "^4.17.21",
--- a/src/apis/material/materialInfo.ts
+++ b/src/apis/material/materialInfo.ts
@@ -78,7 +78,12 @@ export function importMaterial(data: any) {
  return http.post(`${BASE_URL}/import`, data)
 }

-/** @desc 解析物料信息导入数据 */
+/** @desc 物料照片批量导入数据 */
 export function uploadMaterialPhotos(data: FormData) {
  return http.post(`${BASE_URL}/import/uploadMaterialPhotos`, data)
 }
+
+/** @desc 物料照片抓取数据 */
+export function catchPhoto(data: FormData) {
+  return http.post(`${BASE_URL}/import/catch`, data)
+}
--- a/src/apis/weightManage/weightManage.ts
+++ b/src/apis/weightManage/weightManage.ts
@@ -1,6 +1,6 @@
 import http from '@/utils/http'

-const BASE_URL = '/weighManage/material'
+const BASE_URL = '/weighManage/workOrder'

 export interface WeighManageResp {
  id: string
@@ -21,7 +21,17 @@ export function getMaterialDetail(code: string) {
  return http.get<WeighManageResp>(`/admin/materialInfo/code/${code}`)
 }

-/** @desc 新增人员管理 */
-export function addPeople(data: any) {
-  return http.post(`${BASE_URL}`, data)
+/** @desc 校验称重信息 */
+export function validateWeighing(data: any) {
+  return http.post(`${BASE_URL}/validateWeighing`, data)
+}
+
+/** @desc 校验称重信息 */
+export function vmSend(code: string) {
+  return http.get<WeighManageResp>(`/vm/send?msg=${code}`)
+}
+
+/** @desc 获取图片 */
+export function getImg() {
+  return http.get<string>(`/vm/latest-photo`)
 }
--- a/src/apis/workOrder/workOrder.ts
+++ b/src/apis/workOrder/workOrder.ts
@@ -12,10 +12,13 @@ export interface WorkOrderResp {
  materialSpec: string
  photoUrl: string
  totalWeight: string
+  totalCalculatedWeight: string
  totalCount: string
  createUserString: string
  updateUserString: string
  matchResult: string
+  workOrderInfos: Array<WorkOrderInfoResp>
+  qrCodeData: string
 }

 export interface WorkOrderInfoResp {
@@ -46,9 +49,14 @@ export function listWorkOrder(query: WorkOrderPageQuery) {
  return http.get<PageRes<WorkOrderResp[]>>(`${BASE_URL}`, query)
 }

+/** @desc 查询工作订单详情 */
+export function getWorkOrderInfos(id: string) {
+  return http.get<Array<WorkOrderInfoResp>>(`${BASE_URL}/info/${id}`)
+}
+
 /** @desc 查询工作订单详情 */
 export function getWorkOrder(id: string) {
-  return http.get<Array<WorkOrderInfoResp>>(`${BASE_URL}/${id}`)
+  return http.get<WorkOrderResp>(`${BASE_URL}/${id}`)
 }

 /** @desc 新增工作订单 */
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -13,9 +13,7 @@ declare module 'vue' {
    ABreadcrumb: typeof import('@arco-design/web-vue')['Breadcrumb']
    ABreadcrumbItem: typeof import('@arco-design/web-vue')['BreadcrumbItem']
    AButton: typeof import('@arco-design/web-vue')['Button']
-    ACard: typeof import('@arco-design/web-vue')['Card']
    ACheckbox: typeof import('@arco-design/web-vue')['Checkbox']
-    ACheckboxGroup: typeof import('@arco-design/web-vue')['CheckboxGroup']
    ACol: typeof import('@arco-design/web-vue')['Col']
    AConfigProvider: typeof import('@arco-design/web-vue')['ConfigProvider']
    ADatePicker: typeof import('@arco-design/web-vue')['DatePicker']
@@ -37,17 +35,14 @@ declare module 'vue' {
    AInputPassword: typeof import('@arco-design/web-vue')['InputPassword']
    AInputSearch: typeof import('@arco-design/web-vue')['InputSearch']
    ALayout: typeof import('@arco-design/web-vue')['Layout']
-    ALayoutContent: typeof import('@arco-design/web-vue')['LayoutContent']
    ALayoutHeader: typeof import('@arco-design/web-vue')['LayoutHeader']
    ALayoutSider: typeof import('@arco-design/web-vue')['LayoutSider']
    ALink: typeof import('@arco-design/web-vue')['Link']
    AMenu: typeof import('@arco-design/web-vue')['Menu']
    AMenuItem: typeof import('@arco-design/web-vue')['MenuItem']
    AModal: typeof import('@arco-design/web-vue')['Modal']
-    AOption: typeof import('@arco-design/web-vue')['Option']
    AOverflowList: typeof import('@arco-design/web-vue')['OverflowList']
    APagination: typeof import('@arco-design/web-vue')['Pagination']
-    APopconfirm: typeof import('@arco-design/web-vue')['Popconfirm']
    APopover: typeof import('@arco-design/web-vue')['Popover']
    AProgress: typeof import('@arco-design/web-vue')['Progress']
    ARadio: typeof import('@arco-design/web-vue')['Radio']
@@ -57,6 +52,7 @@ declare module 'vue' {
    AScrollbar: typeof import('@arco-design/web-vue')['Scrollbar']
    ASelect: typeof import('@arco-design/web-vue')['Select']
    ASpace: typeof import('@arco-design/web-vue')['Space']
+    ASpin: typeof import('@arco-design/web-vue')['Spin']
    AStatistic: typeof import('@arco-design/web-vue')['Statistic']
    ASubMenu: typeof import('@arco-design/web-vue')['SubMenu']
    ASwitch: typeof import('@arco-design/web-vue')['Switch']
@@ -64,13 +60,9 @@ declare module 'vue' {
    ATabPane: typeof import('@arco-design/web-vue')['TabPane']
    ATabs: typeof import('@arco-design/web-vue')['Tabs']
    ATag: typeof import('@arco-design/web-vue')['Tag']
-    ATextarea: typeof import('@arco-design/web-vue')['Textarea']
    ATooltip: typeof import('@arco-design/web-vue')['Tooltip']
-    ATree: typeof import('@arco-design/web-vue')['Tree']
    ATreeSelect: typeof import('@arco-design/web-vue')['TreeSelect']
-    ATrigger: typeof import('@arco-design/web-vue')['Trigger']
    ATypographyParagraph: typeof import('@arco-design/web-vue')['TypographyParagraph']
-    ATypographyTitle: typeof import('@arco-design/web-vue')['TypographyTitle']
    AUpload: typeof import('@arco-design/web-vue')['Upload']
    Avatar: typeof import('./../components/Avatar/index.vue')['default']
    AWatermark: typeof import('@arco-design/web-vue')['Watermark']
--- a/src/views/barcodePrint/index.vue
+++ b/src/views/barcodePrint/index.vue
@@ -0,0 +1,484 @@
+<template>
+  <div class="gi_page">
+    <div class="container">
+      <h2 class="page-title">标签打印</h2>
+      
+      <!-- 标签参数设置 -->
+      <div class="form-section">
+        <a-form :model="formData" layout="vertical">
+          <div class="form-grid">
+            <div class="form-grid-item">
+              <a-form-item label="物料名称">
+                <a-input v-model="formData.materialName" placeholder="未获取到物料名称" :disabled="true" />
+              </a-form-item>
+            </div>
+            <div class="form-grid-item">
+              <a-form-item label="物料编码">
+                <a-input v-model="formData.encoding" placeholder="未获取到物料编码" :disabled="true" />
+              </a-form-item>
+            </div>
+            <div class="form-grid-item">
+              <a-form-item label="工单编号">
+                <a-input v-model="formData.orderNo" placeholder="未获取到工单编号" :disabled="true" />
+              </a-form-item>
+            </div>
+            <div class="form-grid-item">
+              <a-form-item label="生产批次" required>
+                <a-input v-model="formData.productionBatch" placeholder="请输入生产批次" />
+              </a-form-item>
+            </div>
+          </div>
+          <div class="form-actions">
+            <a-button type="primary" @click="generateLabel" :disabled="!formData.productionBatch">生成标签</a-button>
+          </div>
+        </a-form>
+      </div>
+      
+      <!-- 标签预览 -->
+      <div v-if="labelData.partName" class="label-preview-section">
+<!--      <div  class="label-preview-section">-->
+        <h3>标签预览</h3>
+        <div class="label-container" ref="labelContainer">
+          <div class="label" v-for="index in 1" :key="index">
+            <table class="label-table">
+              <tr>
+                <td class="label-cell">
+                  <div class="label-row">
+                    <div class="label-field">零件名称</div>
+                    <div class="label-value">{{ labelData.partName }}</div>
+                  </div>
+                </td>
+                <td class="label-cell">
+                  <div class="label-row">
+                    <div class="label-field">生产日期</div>
+                    <div class="label-value">{{ labelData.productionDate }}</div>
+                  </div>
+                </td>
+                <td class="label-cell qr-cell" rowspan="4">
+                  <div class="qr-code">
+                    <img :src="`https://api.qrserver.com/v1/create-qr-code/?size=120x120&data=${encodeURIComponent(labelData.qrCodeData)}`" alt="QR Code" />
+                  </div>
+                </td>
+              </tr>
+              <tr>
+                <td class="label-cell">
+                  <div class="label-row">
+                    <div class="label-field">零件号</div>
+                    <div class="label-value">{{ labelData.partNumber }}</div>
+                  </div>
+                </td>
+                <td class="label-cell">
+                  <div class="label-row">
+                    <div class="label-field">数量</div>
+                    <div class="label-value">{{ labelData.totalCount }}</div>
+                  </div>
+                </td>
+              </tr>
+              <tr>
+                <td class="label-cell">
+                  <div class="label-row">
+                    <div class="label-field">标重(kg)</div>
+                    <div class="label-value">{{ labelData.totalCalculatedWeight }}</div>
+                  </div>
+                </td>
+                <td class="label-cell">
+                  <div class="label-row">
+                    <div class="label-field">包装签字</div>
+                    <div class="label-value">{{ labelData.packingSignature || '' }}</div>
+                  </div>
+                </td>
+              </tr>
+              <tr>
+                <td class="label-cell">
+                  <div class="label-row">
+                    <div class="label-field">实重(kg)</div>
+                    <div class="label-value">{{ labelData.totalWeight || '' }}</div>
+                  </div>
+                </td>
+                <td class="label-cell">
+                  <div class="label-row">
+                    <div class="label-field">检验签字</div>
+                    <div class="label-value">{{ labelData.inspectionSignature || '' }}</div>
+                  </div>
+                </td>
+              </tr>
+            </table>
+          </div>
+        </div>
+        <div class="label-actions">
+          <a-button type="primary" @click="printLabel">打印标签</a-button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, nextTick, onMounted } from 'vue'
+import { Message } from '@arco-design/web-vue'
+import { useRoute } from 'vue-router'
+import {getWorkOrder} from "@/apis/workOrder/workOrder";
+
+const route = useRoute()
+
+// 表单数据
+const formData = reactive({
+  workerOrderId: '',
+  encoding: '',
+  materialName: '',
+  orderNo: '',
+  totalCalculatedWeight: '',
+  totalWeight: '',
+  totalCount: '',
+  productionBatch: '',
+  qrCodeData: '',
+})
+
+// 标签数据
+const labelData = reactive({
+  partName: '',
+  partNumber: '',
+  totalCalculatedWeight: '',
+  totalWeight: '',
+  productionDate: '',
+  totalCount: '',
+  packingSignature: '',
+  inspectionSignature: '',
+  qrCodeData: '',
+})
+
+// 标签数据
+// const labelData = reactive({
+//   partName: '物料3',
+//   partNumber: '1',
+//   totalCalculatedWeight: '100',
+//   totalWeight: '100',
+//   productionDate: '202401010000',
+//   totalCount: '100',
+//   packingSignature: '',
+//   inspectionSignature: '',
+//   qrCodeData: '10#$$DY',
+// })
+
+// 标签容器引用
+const labelContainer = ref<HTMLElement | null>(null)
+
+// 生成标签
+const generateLabel = async () => {
+  if (!formData.productionBatch) {
+    Message.error('请输入生产批次')
+    return
+  }
+  if (!formData.materialName) {
+    Message.error('未获取到物料信息')
+    return
+  }
+  
+  try {
+    // 格式化生产日期为 yyyyMMddHHmm 格式
+    const now = new Date()
+    const formattedDate = now.getFullYear().toString() + 
+      String(now.getMonth() + 1).padStart(2, '0') + 
+      String(now.getDate()).padStart(2, '0') + 
+      String(now.getHours()).padStart(2, '0') + 
+      String(now.getMinutes()).padStart(2, '0')
+
+    const formattedDate2 = now.getFullYear().toString() +
+        String(now.getMonth() + 1).padStart(2, '0') +
+        String(now.getDate()).padStart(2, '0');
+    
+    // 直接从 formData 中获取数据
+    Object.assign(labelData, {
+      partName: formData.materialName || '',
+      partNumber: formData.encoding || '',
+      totalCalculatedWeight: formData.totalCalculatedWeight || '',
+      totalWeight: formData.totalWeight || '',
+      productionDate: formattedDate,
+      totalCount: formData.totalCount || '',
+      packingSignature: '',
+      inspectionSignature: '',
+      //10#零件号$11#供应商代码$12#生产批次$17#数量$20#包装日期$31#唯一号$DY
+      qrCodeData: `10#${formData.materialName}$11#9DP$12#${formData.productionBatch}$17#${formData.totalCount}$20#${formattedDate2}$31#${formData.orderNo}$DY`
+    })
+    
+    Message.success('标签生成成功')
+  } catch (error) {
+    console.error('生成标签失败:', error)
+    Message.error('生成标签失败')
+  }
+}
+
+// 组件挂载时，检查是否有参数传递
+onMounted(() => {
+  // 从路由参数中获取数据
+  const workerOrderId = route.query.workerOrderId as string
+  // 如果有参数传递，设置表单数据并标记为不可修改
+  if (workerOrderId) {
+    formData.workerOrderId = workerOrderId
+    getWorkOrder(workerOrderId).then(res => {
+      if (res.code == '0') {
+        formData.encoding = res.data.encoding
+        formData.materialName = res.data.materialName
+        formData.orderNo = res.data.orderNo
+        formData.totalCalculatedWeight = res.data.totalCalculatedWeight
+        formData.totalWeight = res.data.totalWeight
+        formData.totalCount = res.data.totalCount
+      } else {
+        Message.error('获取详情失败')
+      }
+    });
+
+    // 自动生成标签
+    generateLabel()
+  }
+})
+
+// 打印标签
+const printLabel = async () => {
+  await nextTick()
+  if (labelContainer.value) {
+    // 创建打印窗口
+    const printWindow = window.open('', '_blank')
+    if (printWindow) {
+      // 直接构建打印内容，确保二维码图片正确生成
+      const printHTML = `
+        <html>
+          <head>
+            <title>标签打印</title>
+            <style>
+              body { margin: 0; padding: 10mm; font-family: Arial, sans-serif; }
+              .label-container { display: flex; flex-wrap: wrap; gap: 10mm; justify-content: center; }
+              .label { width: 90mm; height: 38.5mm; border: 1px solid #000; padding: 0; box-sizing: border-box; page-break-inside: avoid; }
+              .label-table { width: 100%; height: 100%; border-collapse: collapse; }
+              .label-cell { border: 1px solid #000; padding: 1mm; vertical-align: top; }
+              .qr-cell { width: 24mm; text-align: center; vertical-align: middle; border: 1px solid #000; }
+              .label-row { display: flex; align-items: center; }
+              .label-field { font-size: 7pt; font-weight: bold; margin-right: 2mm; min-width: 25pt; }
+              .label-value { font-size: 7pt; flex: 1; }
+              .qr-code img { width: 20mm; height: 20mm; margin: 1mm 0; }
+              .serial-number { font-size: 7pt; margin-top: 1mm; }
+            </style>
+          </head>
+          <body>
+            <div class="label-container">
+              <div class="label">
+                <table class="label-table">
+                  <tr>
+                    <td class="label-cell">
+                      <div class="label-row">
+                        <div class="label-field">零件名称</div>
+                        <div class="label-value">${labelData.partName}</div>
+                      </div>
+                    </td>
+                    <td class="label-cell">
+                      <div class="label-row">
+                        <div class="label-field">生产日期</div>
+                        <div class="label-value">${labelData.productionDate}</div>
+                      </div>
+                    </td>
+                    <td class="label-cell qr-cell" rowspan="4">
+                      <div class="qr-code">
+                        <img src="https://api.qrserver.com/v1/create-qr-code/?size=120x120&data=${encodeURIComponent(labelData.qrCodeData)}" alt="QR Code" />
+                      </div>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td class="label-cell">
+                      <div class="label-row">
+                        <div class="label-field">零件号</div>
+                        <div class="label-value">${labelData.partNumber}</div>
+                      </div>
+                    </td>
+                    <td class="label-cell">
+                      <div class="label-row">
+                        <div class="label-field">数量</div>
+                        <div class="label-value">${labelData.totalCount}</div>
+                      </div>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td class="label-cell">
+                      <div class="label-row">
+                        <div class="label-field">标重(kg)</div>
+                        <div class="label-value">${labelData.totalCalculatedWeight}</div>
+                      </div>
+                    </td>
+                    <td class="label-cell">
+                      <div class="label-row">
+                        <div class="label-field">包装签字</div>
+                        <div class="label-value">${labelData.packingSignature || ''}</div>
+                      </div>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td class="label-cell">
+                      <div class="label-row">
+                        <div class="label-field">实重(kg)</div>
+                        <div class="label-value">${labelData.totalWeight || ''}</div>
+                      </div>
+                    </td>
+                    <td class="label-cell">
+                      <div class="label-row">
+                        <div class="label-field">检验签字</div>
+                        <div class="label-value">${labelData.inspectionSignature || ''}</div>
+                      </div>
+                    </td>
+                  </tr>
+                </table>
+              </div>
+            </div>
+          </body>
+        </html>
+      `
+
+      printWindow.document.write(printHTML)
+      printWindow.document.close()
+
+      // 等待图片加载完成后再打印
+      printWindow.onload = () => {
+        setTimeout(() => {
+          printWindow.focus()
+          printWindow.print()
+          printWindow.close()
+        }, 500)
+      }
+    }
+  }
+}
+
+defineOptions({ name: 'BarcodePrint' })
+</script>
+
+<style scoped lang="scss">
+.container {
+  max-width: 1200px;
+  margin: 0 auto;
+  padding: 20px;
+}
+
+.page-title {
+  margin-bottom: 30px;
+  text-align: center;
+  color: #333;
+}
+
+/* 表单区域 */
+.form-section {
+  background-color: var(--color-bg-2);
+  padding: 20px;
+  border-radius: 4px;
+  margin-bottom: 30px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
+}
+
+.form-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+  gap: 16px;
+  margin-bottom: 20px;
+}
+
+.form-grid-item {
+  width: 100%;
+}
+
+.form-actions {
+  margin-top: 20px;
+  display: flex;
+  justify-content: center;
+}
+
+/* 标签预览 */
+.label-preview-section {
+  margin-top: 30px;
+  padding: 20px;
+  background-color: var(--color-bg-2);
+  border-radius: 4px;
+}
+
+.label-preview-section h3 {
+  margin: 0 0 20px 0;
+  font-size: 16px;
+  font-weight: bold;
+  text-align: center;
+}
+
+.label-container {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 20px;
+  justify-content: center;
+  margin-bottom: 20px;
+}
+
+.label {
+  width: 450px;
+  height: 180px;
+  border: 1px solid #000;
+  padding: 0;
+  box-sizing: border-box;
+  font-family: Arial, sans-serif;
+}
+
+.label-table {
+  width: 100%;
+  height: 100%;
+  border-collapse: collapse;
+}
+
+.label-cell {
+  border: 1px solid #000;
+  padding: 5px;
+  vertical-align: top;
+}
+
+.qr-cell {
+  width: 120px;
+  text-align: center;
+  vertical-align: middle;
+}
+
+.label-row {
+  display: flex;
+  align-items: center;
+}
+
+.label-field {
+  font-size: 12px;
+  font-weight: bold;
+  margin-right: 10px;
+  min-width: 60px;
+}
+
+.label-value {
+  font-size: 12px;
+  flex: 1;
+}
+
+.qr-code img {
+  width: 100px;
+  height: 100px;
+  margin: 5px 0;
+}
+
+.serial-number {
+  font-size: 12px;
+  margin-top: 5px;
+}
+
+.label-actions {
+  display: flex;
+  justify-content: center;
+  margin-top: 20px;
+}
+
+/* 确保输入框宽度一致 */
+:deep(.arco-input-wrapper) {
+  width: 100%;
+  height: 35px;
+}
+
+:deep(.arco-input) {
+  font-size: 16px;
+}
+</style>
--- a/src/views/login/components/card/index.vue
+++ b/src/views/login/components/card/index.vue
@@ -20,7 +20,7 @@
 </template>

 <script setup lang="ts">
-import { ref, reactive, onMounted } from 'vue'
+import { ref, reactive, onMounted, onUnmounted } from 'vue'
 import { type FormInstance, Message } from '@arco-design/web-vue'
 import { useTabsStore, useUserStore } from '@/stores'

@@ -42,12 +42,24 @@ const loading = ref(false)

 // 登录
 const handleLogin = async () => {
+  // 检查用户是否已经登录
+  if (userStore.token) {
+    return
+  }
+  
  const isInvalid = await formRef.value?.validate()
  if (isInvalid) return
  try {
    loading.value = true
    // 调用后端接口校验卡号
    await userStore.cardLogin(form)
+    
+    // 登录成功后移除事件监听器
+    if (keyDownListener) {
+      document.removeEventListener('keydown', keyDownListener)
+      keyDownListener = null
+    }
+    
    tabsStore.reset()
    const { redirect, ...othersQuery } = router.currentRoute.value.query
    await router.push({
@@ -64,24 +76,30 @@ const handleLogin = async () => {
  }
 }

+// 键盘事件监听器引用
+let keyDownListener: ((e: KeyboardEvent) => void) | null = null
+
 // 监听键盘输入，实现自动识别卡号
 onMounted(() => {
-  // 监听全局键盘事件，用于识别刷卡输入
-  document.addEventListener('keydown', (e) => {
+  // 只监听Enter键，用于自动登录
+  keyDownListener = (e) => {
    // 刷卡器通常会快速输入卡号并以Enter键结束
    if (e.key === 'Enter') {
      // 遇到Enter键，尝试登录
      if (form.cardNumber.trim()) {
        handleLogin()
      }
-    } else if (e.key.length === 1 && !e.ctrlKey && !e.altKey && !e.metaKey) {
-      // 只捕获单个字符的按键，忽略控制键和功能键
-      form.cardNumber += e.key
-    } else if (e.key === 'Backspace') {
-      // 处理退格键
-      form.cardNumber = form.cardNumber.slice(0, -1)
    }
-  })
+  }
+  
+  document.addEventListener('keydown', keyDownListener)
+})
+
+// 组件卸载时移除事件监听器
+onUnmounted(() => {
+  if (keyDownListener) {
+    document.removeEventListener('keydown', keyDownListener)
+  }
 })
 </script>

--- a/src/views/material/index.vue
+++ b/src/views/material/index.vue
@@ -1,17 +1,18 @@
 <template>
  <div class="gi_table_page">
    <GiTable
-      title="物料管理管理"
-      row-key="id"
-      :data="dataList"
-      :columns="columns"
-      :loading="loading"
-      :scroll="{ x: '100%', y: '100%', minWidth: 1000 }"
-      :pagination="pagination"
-      :disabled-tools="['size']"
-      :disabled-column-keys="['name']"
-      @refresh="search"
+        title="物料管理管理"
+        row-key="id"
+        :data="dataList"
+        :columns="columns"
+        :loading="loading"
+        :scroll="{ x: '100%', y: '100%', minWidth: 1000 }"
+        :pagination="pagination"
+        :disabled-tools="['size']"
+        :disabled-column-keys="['name']"
+        @refresh="search"
    >
+      <!-- toolbar 部分保持不变 -->
      <template #toolbar-left>
        <a-input-search v-model="queryForm.materialName" placeholder="请输入物料名称" allow-clear @search="search" />
        <a-input-search v-model="queryForm.encoding" placeholder="请输入物料编码" allow-clear @search="search" />
@@ -38,27 +39,40 @@
          <template #default>照片批量导入</template>
        </a-button>
      </template>
+
+      <!-- 【修改点】照片列插槽 -->
      <template #photoUrl="{ record }">
        <div class="photo-container">
+          <!-- 1. 正常显示图片：有地址 且 未标记为错误 -->
          <img
-            v-if="record.photoUrl"
-            :src="record.photoUrl"
-            alt="物料照片"
-            class="material-photo"
-            @error="handleImgError($event)"
+              v-if="record.photoUrl && !record.photoLoadError"
+              :src="record.photoUrl"
+              alt="物料照片"
+              class="material-photo"
+              @load="handleImgLoad(record)"
+              @error="handleImgError(record, $event)"
          />
-          <span v-else class="no-photo">暂无照片</span>
+
+          <!-- 2. 无地址 -->
+          <span v-else-if="!record.photoUrl" class="no-photo">暂无照片</span>
+
+          <!-- 3. 地址存在但加载失败 -->
+          <span v-else class="photo-error">
+            <icon-exclamation-circle-fill class="error-icon" />
+            照片异常
+          </span>
        </div>
      </template>
+
      <template #action="{ record }">
        <a-space>
          <a-link v-permission="['admin:materialInfo:update']" title="修改" @click="onUpdate(record)">修改</a-link>
          <a-link
-            v-permission="['admin:materialInfo:delete']"
-            status="danger"
-            :disabled="record.disabled"
-            :title="record.disabled ? '不可删除' : '删除'"
-            @click="onDelete(record)"
+              v-permission="['admin:materialInfo:delete']"
+              status="danger"
+              :disabled="record.disabled"
+              :title="record.disabled ? '不可删除' : '删除'"
+              @click="onDelete(record)"
          >
            删除
          </a-link>
@@ -73,6 +87,7 @@
 </template>

 <script setup lang="ts">
+// ... 保持原有的 import 不变
 import MaterialInfoAddModal from './MaterialInfoAddModal.vue'
 import MaterialInfoImportDrawer from './MaterialInfoImportDrawer.vue'
 import PhotosImport from '@/views/material/PhotosImport.vue';
@@ -84,6 +99,12 @@ import has from '@/utils/has'

 defineOptions({ name: 'MaterialInfo' })

+// 扩展类型定义，允许动态添加 photoLoadError 属性
+// 如果 TS 报错，可以在 MaterialInfoResp 接口定义中添加 photoLoadError?: boolean;
+interface MaterialInfoRespWithStatus extends MaterialInfoResp {
+  photoLoadError?: boolean;
+}
+
 const queryForm = reactive<MaterialInfoQuery>({
  materialName: undefined,
  encoding: undefined,
@@ -97,6 +118,7 @@ const {
  search,
  handleDelete,
 } = useTable((page) => listMaterialInfo({ ...queryForm, ...page }), { immediate: true })
+
 const columns = ref<TableInstanceColumns[]>([
  { title: '物料名称', dataIndex: 'materialName', slotName: 'materialName' },
  { title: '物料编码', dataIndex: 'encoding', slotName: 'encoding' },
@@ -116,14 +138,12 @@ const columns = ref<TableInstanceColumns[]>([
  },
 ])

-// 重置
 const reset = () => {
  queryForm.materialName = undefined
  queryForm.encoding = undefined
  search()
 }

-// 删除
 const onDelete = (record: MaterialInfoResp) => {
  return handleDelete(() => deleteMaterialInfo(record.id), {
    content: `是否确定删除该条数据？`,
@@ -131,25 +151,26 @@ const onDelete = (record: MaterialInfoResp) => {
  })
 }

-// 导出
 const onExport = () => {
  useDownload(() => exportMaterialInfo(queryForm))
 }

-// 图片加载失败处理函数（新增）
-const handleImgError = (e: Event) => {
-  // 替换为你的默认图片地址（建议放在/static目录下）
-  const target = e.target as HTMLImageElement
-  target.src = '/static/images/default-material.png'
+// 【修改点】图片加载处理逻辑
+const handleImgLoad = (record: MaterialInfoRespWithStatus) => {
+  record.photoLoadError = false
+}
+
+const handleImgError = (record: MaterialInfoRespWithStatus, e: Event) => {
+  // 标记为加载错误，触发模板渲染 "照片异常"
+  record.photoLoadError = true
+  console.warn(`物料照片加载失败: ${record.photoUrl}`)
 }

 const MaterialInfoAddModalRef = ref<InstanceType<typeof MaterialInfoAddModal>>()
-// 新增
 const onAdd = () => {
  MaterialInfoAddModalRef.value?.onAdd()
 }

-// 修改
 const onUpdate = (record: MaterialInfoResp) => {
  MaterialInfoAddModalRef.value?.onUpdate(record.id)
 }
@@ -166,23 +187,43 @@ const onPhotosImport = () => {
 </script>

 <style scoped lang="scss">
-// 物料照片样式（新增）
 .photo-container {
  display: flex;
  align-items: center;
  justify-content: center;
  height: 80px;
+  width: 100%;
+  overflow: hidden;
 }

 .material-photo {
-  width: 80px;
-  height: 80px;
-  object-fit: cover; // 保持图片比例，避免拉伸
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
  border-radius: 4px;
+  transition: opacity 0.3s;
 }

 .no-photo {
  color: #999;
  font-size: 12px;
+  text-align: center;
+}
+
+// 新增样式
+.photo-error {
+  color: #ff4d4f; // 阿里红/危险色
+  font-size: 12px;
+  text-align: center;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  line-height: 1.4;
+
+  .error-icon {
+    font-size: 18px;
+    margin-bottom: 2px;
+  }
 }
 </style>
--- a/src/views/system/barcodePrint/index.vue
+++ b/src/views/system/barcodePrint/index.vue
@@ -1,377 +0,0 @@
-<template>
-  <div class="gi_page">
-    <div class="container">
-      <h2 class="page-title">标签打印</h2>
-      
-      <!-- 标签参数设置 -->
-      <div class="form-section">
-        <a-form :model="formData" layout="vertical">
-          <div class="form-grid">
-            <div class="form-grid-item">
-              <a-form-item label="物料名称">
-                <a-input v-model="formData.materialName" placeholder="请输入物料名称" :disabled="isFromWorkOrder" />
-              </a-form-item>
-            </div>
-            <div class="form-grid-item">
-              <a-form-item label="物料编码">
-                <a-input v-model="formData.encoding" placeholder="请输入物料编码" :disabled="isFromWorkOrder" />
-              </a-form-item>
-            </div>
-            <div class="form-grid-item">
-              <a-form-item label="工单编号">
-                <a-input v-model="formData.orderNo" placeholder="请输入工单编号" :disabled="isFromWorkOrder" />
-              </a-form-item>
-            </div>
-            <div class="form-grid-item">
-              <a-form-item label="生产批次" required>
-                <a-input v-model="formData.productionBatch" placeholder="请输入生产批次" />
-              </a-form-item>
-            </div>
-          </div>
-          <div class="form-actions">
-            <a-button type="primary" @click="generateLabel" :disabled="!formData.productionBatch">生成标签</a-button>
-          </div>
-        </a-form>
-      </div>
-      
-      <!-- 标签预览 -->
-      <div v-if="labelData.partName" class="label-preview-section">
-        <h3>标签预览</h3>
-        <div class="label-container" ref="labelContainer">
-          <div class="label" v-for="index in 1" :key="index">
-            <table class="label-table">
-              <tr>
-                <td class="label-cell">
-                  <div class="label-field">零件名称</div>
-                  <div class="label-value">{{ labelData.partName }}</div>
-                </td>
-                <td class="label-cell">
-                  <div class="label-field">生产日期</div>
-                  <div class="label-value">{{ labelData.productionDate }}</div>
-                </td>
-                <td class="label-cell qr-cell" rowspan="4">
-                  <div class="qr-code">
-                    <img :src="`https://api.qrserver.com/v1/create-qr-code/?size=120x120&data=${encodeURIComponent(labelData.qrCodeData)}`" alt="QR Code" />
-                  </div>
-                </td>
-              </tr>
-              <tr>
-                <td class="label-cell">
-                  <div class="label-field">零件号</div>
-                  <div class="label-value">{{ labelData.partNumber }}</div>
-                </td>
-                <td class="label-cell">
-                  <div class="label-field">数量</div>
-                  <div class="label-value">{{ labelData.quantity }}</div>
-                </td>
-              </tr>
-              <tr>
-                <td class="label-cell">
-                  <div class="label-field">标重(kg)</div>
-                  <div class="label-value">{{ labelData.standardWeight }}</div>
-                </td>
-                <td class="label-cell">
-                  <div class="label-field">包装签字</div>
-                  <div class="label-value">{{ labelData.packingSignature || '' }}</div>
-                </td>
-              </tr>
-              <tr>
-                <td class="label-cell">
-                  <div class="label-field">实重(kg)</div>
-                  <div class="label-value">{{ labelData.actualWeight || '' }}</div>
-                </td>
-                <td class="label-cell">
-                  <div class="label-field">检验签字</div>
-                  <div class="label-value">{{ labelData.inspectionSignature || '' }}</div>
-                </td>
-              </tr>
-<!--              <tr>-->
-<!--                <td class="label-cell" colspan="2"></td>-->
-<!--                <td class="label-cell qr-cell">-->
-<!--                  <div class="serial-number">序号: {{ labelData.serialNumber }}</div>-->
-<!--                </td>-->
-<!--              </tr>-->
-            </table>
-          </div>
-        </div>
-        <div class="label-actions">
-          <a-button type="primary" @click="printLabel">打印标签</a-button>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref, reactive, nextTick, onMounted } from 'vue'
-import { Message } from '@arco-design/web-vue'
-import { useRoute } from 'vue-router'
-
-const route = useRoute()
-
-// 表单数据
-const formData = reactive({
-  encoding: '',
-  materialName: '',
-  orderNo: '',
-  productionBatch: ''
-})
-
-// 是否是从工单页面跳转过来的
-const isFromWorkOrder = ref(false)
-
-// 标签数据
-const labelData = reactive({
-  partName: '',
-  partNumber: '',
-  standardWeight: '',
-  actualWeight: '',
-  productionDate: '',
-  quantity: '',
-  packingSignature: '',
-  inspectionSignature: '',
-  serialNumber: '',
-  qrCodeData: '',
-})
-
-// 标签容器引用
-const labelContainer = ref<HTMLElement | null>(null)
-
-// 模拟获取标签数据的接口
-const fetchLabelData = async (params: any) => {
-  // 模拟后端接口延迟
-  return new Promise((resolve) => {
-    setTimeout(() => {
-      // 格式化生产日期为 yyyyMMddHHmm 格式
-      const now = new Date()
-      const formattedDate = now.getFullYear().toString() + 
-        String(now.getMonth() + 1).padStart(2, '0') + 
-        String(now.getDate()).padStart(2, '0') + 
-        String(now.getHours()).padStart(2, '0') + 
-        String(now.getMinutes()).padStart(2, '0')
-      
-      // 模拟返回数据
-      const mockData = {
-        partName: params.materialName || 'PP0449002护套',
-        partNumber: params.encoding || 'PP0449002',
-        standardWeight: '0.39500',
-        actualWeight: '',
-        productionDate: formattedDate,
-        quantity: '200',
-        packingSignature: '',
-        inspectionSignature: '',
-        serialNumber: '4',
-        qrCodeData: `PART:${params.encoding || 'PP0449002'},NAME:${params.materialName || 'PP0449002护套'},DATE:${formattedDate},QTY:200`,
-      }
-      resolve(mockData)
-    }, 500)
-  })
-}
-
-// 生成标签
-const generateLabel = async () => {
-  
-  if (!formData.productionBatch) {
-    Message.error('请输入生产批次')
-    return
-  }
-  
-  try {
-    // 获取标签数据
-    const result = await fetchLabelData(formData)
-    Object.assign(labelData, result)
-    Message.success('标签生成成功')
-  } catch (error) {
-    console.error('生成标签失败:', error)
-    Message.error('生成标签失败')
-  }
-}
-
-// 组件挂载时，检查是否有参数传递
-onMounted(() => {
-  // 从路由参数中获取数据
-  const materialName = route.query.materialName as string
-  const encoding = route.query.encoding as string
-  const orderNo = route.query.orderNo as string
-  
-  // 如果有参数传递，设置表单数据并标记为不可修改
-  if (materialName && encoding && orderNo) {
-    formData.materialName = materialName
-    formData.encoding = encoding
-    formData.orderNo = orderNo
-    isFromWorkOrder.value = true
-    
-    // 自动生成标签
-    generateLabel()
-  }
-})
-
-// 打印标签
-const printLabel = async () => {
-  await nextTick()
-  if (labelContainer.value) {
-    // 克隆标签容器内容用于打印
-    const printContent = labelContainer.value.cloneNode(true) as HTMLElement
-    
-    // 创建打印窗口
-    const printWindow = window.open('', '_blank')
-    if (printWindow) {
-      printWindow.document.write(`
-        <html>
-          <head>
-            <title>标签打印</title>
-            <style>
-              body { margin: 0; padding: 10mm; font-family: Arial, sans-serif; }
-              .label-container { display: flex; flex-wrap: wrap; gap: 10mm; justify-content: center; }
-              .label { width: 90mm; height: 36mm; border: 1px solid #000; padding: 0; box-sizing: border-box; page-break-inside: avoid; }
-              .label-table { width: 100%; height: 100%; border-collapse: collapse; }
-              .label-cell { border: 1px solid #000; padding: 1mm; vertical-align: top; }
-              .qr-cell { width: 24mm; text-align: center; vertical-align: middle; }
-              .label-field { font-size: 7pt; font-weight: bold; margin-bottom: 0.5mm; }
-              .label-value { font-size: 7pt; }
-              .qr-code img { width: 20mm; height: 20mm; margin: 1mm 0; }
-              .serial-number { font-size: 7pt; margin-top: 1mm; }
-            </style>
-          </head>
-          <body>
-            ${printContent.innerHTML}
-          </body>
-        </html>
-      `)
-      printWindow.document.close()
-      printWindow.focus()
-      printWindow.print()
-      printWindow.close()
-    }
-  }
-}
-
-defineOptions({ name: 'BarcodePrint' })
-</script>
-
-<style scoped lang="scss">
-.container {
-  max-width: 1200px;
-  margin: 0 auto;
-  padding: 20px;
-}
-
-.page-title {
-  margin-bottom: 30px;
-  text-align: center;
-  color: #333;
-}
-
-/* 表单区域 */
-.form-section {
-  background-color: var(--color-bg-2);
-  padding: 20px;
-  border-radius: 4px;
-  margin-bottom: 30px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
-}
-
-.form-grid {
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
-  gap: 16px;
-  margin-bottom: 20px;
-}
-
-.form-grid-item {
-  width: 100%;
-}
-
-.form-actions {
-  margin-top: 20px;
-  display: flex;
-  justify-content: center;
-}
-
-/* 标签预览 */
-.label-preview-section {
-  margin-top: 30px;
-  padding: 20px;
-  background-color: var(--color-bg-2);
-  border-radius: 4px;
-}
-
-.label-preview-section h3 {
-  margin: 0 0 20px 0;
-  font-size: 16px;
-  font-weight: bold;
-  text-align: center;
-}
-
-.label-container {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 20px;
-  justify-content: center;
-  margin-bottom: 20px;
-}
-
-.label {
-  width: 450px;
-  height: 180px;
-  border: 1px solid #000;
-  padding: 0;
-  box-sizing: border-box;
-  font-family: Arial, sans-serif;
-}
-
-.label-table {
-  width: 100%;
-  height: 100%;
-  border-collapse: collapse;
-}
-
-.label-cell {
-  border: 1px solid #000;
-  padding: 5px;
-  vertical-align: top;
-}
-
-.qr-cell {
-  width: 120px;
-  text-align: center;
-  vertical-align: middle;
-}
-
-.label-field {
-  font-size: 12px;
-  font-weight: bold;
-  margin-bottom: 2px;
-}
-
-.label-value {
-  font-size: 12px;
-}
-
-.qr-code img {
-  width: 100px;
-  height: 100px;
-  margin: 5px 0;
-}
-
-.serial-number {
-  font-size: 12px;
-  margin-top: 5px;
-}
-
-.label-actions {
-  display: flex;
-  justify-content: center;
-  margin-top: 20px;
-}
-
-/* 确保输入框宽度一致 */
-:deep(.arco-input-wrapper) {
-  width: 100%;
-  height: 35px;
-}
-
-:deep(.arco-input) {
-  font-size: 16px;
-}
-</style>
--- a/src/views/system/sysConfig/ConfigAddModal.vue
+++ b/src/views/system/sysConfig/ConfigAddModal.vue
@@ -49,7 +49,7 @@ const columns: ColumnItem[] = reactive([
    field: 'configKey',
    type: 'input',
    span: 24,
-    disabled: true,
+    disabled: isUpdate.value,
  },
  {
    label: '参数键值',
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -168,7 +168,7 @@ const columns: TableInstanceColumns[] = [
    fixed: !isMobile() ? 'left' : undefined,
  },
  { title: '用户名', dataIndex: 'username', slotName: 'username', minWidth: 100, ellipsis: true, tooltip: true },
-  { title: '卡号', dataIndex: 'cardNo', slotName: 'cardNo' },
+  { title:'卡号', dataIndex: 'cardNo', slotName: 'cardNo' },
  { title: '状态', dataIndex: 'status', slotName: 'status', align: 'center' },
  { title: '性别', dataIndex: 'gender', slotName: 'gender', align: 'center' },
  { title: '角色', dataIndex: 'roleNames', slotName: 'roleNames', minWidth: 165 },
@@ -204,7 +204,7 @@ const reset = () => {

 const onDelete = (record: UserResp) => {
  return handleDelete(() => deleteUser(record.id), {
-    content: `是否确定删除用户「${record.username}」？`,
+    content: `是否确定删除用户「${record.nickname}(${record.username})」？`,
    showModal: true,
  })
 }
--- a/src/views/weightManage/index.vue
+++ b/src/views/weightManage/index.vue
--- a/src/views/workOrder/index.vue
+++ b/src/views/workOrder/index.vue
@@ -117,7 +117,7 @@ import {Message} from "@arco-design/web-vue";
 import { useRouter } from 'vue-router';
 import {
  deleteWorkOrder,
-  exportWorkOrder, getWorkOrder,
+  exportWorkOrder, getWorkOrderInfos,
  listWorkOrder,
  type WorkOrderQuery,
  type WorkOrderResp
@@ -172,7 +172,7 @@ const columns = ref<TableInstanceColumns[]>(processColumns([
  { title: '物料编码', dataIndex: 'encoding' },
  { title: '单位克重', dataIndex: 'unitWeight' ,slotName: 'unitWeight'},
  { title: '总重量', dataIndex: 'totalWeight' ,slotName: 'totalWeight'},
-  { title: '称重次数', dataIndex: 'totalCount' },
+  { title: '总数量', dataIndex: 'totalCount' },
  { title: '创建时间', dataIndex: 'createTime', width: 180 },
  {
    title: '操作',
@@ -218,7 +218,7 @@ const onDetail = async (record: WorkOrderResp) => {
  detailModalVisible.value = true
  detailData.value = []

-  getWorkOrder(record.id).then(res => {
+  getWorkOrderInfos(record.id).then(res => {
    if (res.code == '0') {
      detailData.value = res.data;
      detailLoading.value = false
@@ -258,9 +258,7 @@ const onPrint = (record: WorkOrderResp) => {
  router.push({
    path: '/print',
    query: {
-      materialName: record.materialName,
-      encoding: record.encoding,
-      orderNo: record.orderNo
+      workerOrderId: record.id,
    }
  })
 }
Author	SHA1	Message	Date
liuzhu	df67f63137	优化	2026-03-13 09:41:00 +08:00
zc	0f7efec0e1	优化	2026-03-12 17:18:56 +08:00
zc	2171c83d55	优化	2026-03-12 16:30:30 +08:00
zc	db40b1733b	优化	2026-03-12 16:12:30 +08:00
zc	fe56422336	优化	2026-03-12 15:41:52 +08:00
zc	dc395406c3	优化	2026-03-11 18:38:45 +08:00
zc	41db731e40	优化视频样式	2026-03-11 17:40:24 +08:00
zc	35fcd40bd3	优化视频流	2026-03-11 11:09:19 +08:00
zc	e27e44a3c3	优化	2026-03-11 10:56:33 +08:00
zc	47463c9b14	优化	2026-03-09 20:35:02 +08:00
zc	3f8b6e4695	优化	2026-03-09 20:34:20 +08:00
liuzhu	2bf7b6872a	抓取优化	2026-03-09 16:22:17 +08:00
zc	a3cb2263fd	优化	2026-03-09 16:06:00 +08:00
zc	d8273464c5	优化	2026-03-09 15:24:02 +08:00
zc	630a98af65	优化	2026-03-06 18:25:24 +08:00
zc	31178da436	Merge remote-tracking branch 'refs/remotes/origin/master' into dev # Conflicts: # src/views/weightManage/index.vue	2026-03-06 18:15:58 +08:00
liuzhu	f35d64bd91	称重抓取	2026-03-06 18:03:28 +08:00
liuzhu	15ce1cfa13	Merge branch 'refs/heads/dev' into master_lz # Conflicts: # src/views/system/user/index.vue	2026-03-05 16:35:28 +08:00