优化

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
19 changed files with 1760 additions and 665 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
@@ -1,12 +1,12 @@
 import http from '@/utils/http'

-const BASE_URL = '/admin/meterialInfo'
+const BASE_URL = '/admin/materialInfo'

-export interface MeterialInfoResp {
+export interface MaterialInfoResp {
  materialName: string
  encoding: string
  unitWeight: string
-  maxWeight: string
+  materialSpec: string
  photoUrl: string
  createUser: string
  createTime: string
@@ -19,16 +19,33 @@ export interface MaterialInfoQuery {
  encoding: string | undefined
  sort: Array<string>
 }
+
+/* 物料信息导入结果类型 */
+export interface MaterialImportResp {
+  importKey: string
+  totalRows: number
+  validRows: number
+  duplicateNameRows: number
+  duplicateCodeRows: number
+}
 export interface MaterialInfoPageQuery extends MaterialInfoQuery, PageQuery {}

 /** @desc 查询物料信息列表 */
 export function listMaterialInfo(query: MaterialInfoPageQuery) {
-  return http.get<PageRes<MeterialInfoResp[]>>(`${BASE_URL}`, query)
+  return http.get<PageRes<MaterialInfoResp[]>>(`${BASE_URL}`, query)
+}
+
+interface MaterialInfoDetailResp {
+}
+
+/** @desc 下载物料信息导入模板 */
+export function downloadMaterialInfoImportTemplate() {
+  return http.download(`${BASE_URL}/import/template`)
 }

 /** @desc 查询物料信息详情 */
 export function getMaterialInfo(id: string) {
-  return http.get<MeterialInfoDetailResp>(`${BASE_URL}/${id}`)
+  return http.get<MaterialInfoDetailResp>(`${BASE_URL}/${id}`)
 }

 /** @desc 新增物料信息 */
@@ -47,6 +64,26 @@ export function deleteMaterialInfo(id: string) {
 }

 /** @desc 导出物料信息 */
-export function exportMaterialInfo(query: MeterialInfoQuery) {
+export function exportMaterialInfo(query: MaterialInfoQuery) {
  return http.download(`${BASE_URL}/export`, query)
 }
+
+/** @desc 解析物料信息导入数据 */
+export function parseImportMaterial(data: FormData) {
+  return http.post(`${BASE_URL}/import/parse`, data)
+}
+
+/** @desc 导入物料信息 */
+export function importMaterial(data: any) {
+  return http.post(`${BASE_URL}/import`, data)
+}
+
+/** @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/dashboard/analysis/index.vue
+++ b/src/views/dashboard/analysis/index.vue
@@ -5,9 +5,10 @@
      <div class="guide-section full-background">
        <div class="guide-content full-height">
          <!-- 标题 -->
+          <!-- 注意：标题现在不再强制占满全宽，而是适应内容 -->
          <h1 class="page-title">物料领取流程</h1>

-          <!-- 图片和按钮卡片 - 确保在任何比例下完全显示 -->
+          <!-- 图片和按钮卡片 -->
          <div class="guide-card centered">
            <!-- 图片展示区 -->
            <div class="image-wrapper">
@@ -36,7 +37,7 @@ defineOptions({ name: 'Analysis' })
 const router = useRouter()

 const handleStart = () => {
-  router.push('')
+  router.push('/weightManage')
 }
 </script>

@@ -66,10 +67,10 @@ const handleStart = () => {
    height: 100%;
    min-height: 100vh;
    display: flex;
-    justify-content: center;
+    justify-content: flex-start; // 整体靠左，由子元素 margin 控制位置
    align-items: center;
    background: #f5f7fa;
-    padding: 10px; // 减小内边距
+    padding: 10px;
    box-sizing: border-box;

    .guide-content.full-height {
@@ -79,10 +80,13 @@ const handleStart = () => {
      margin: 0;
      display: flex;
      flex-direction: column;
+      align-items: flex-start; // 【关键】让子元素（标题和卡片）从左侧开始排列，而不是拉伸

      .page-title {
-        text-align: center;
-        font-size: 42px; // 稍微减小字体
+        // 【修改】让标题宽度适应内容，以便通过 margin 控制其整体位置
+        width: fit-content;
+        text-align: center; // 文字本身在标题块内居中
+        font-size: 42px;
        font-weight: 800;
        color: #1e293b;
        margin-bottom: 15px;
@@ -92,13 +96,17 @@ const handleStart = () => {
        flex-shrink: 0;
        padding: 0 10px;

+        // 【关键修改】应用与卡片相同的左侧偏移，确保标题在卡片正上方
+        margin-left: 30%; // 必须与 .guide-card 的 margin-left 一致
+        margin-right: auto;
+
        &::after {
          content: '';
          display: block;
-          width: 80px; // 减小下划线宽度
+          width: 80px;
          height: 4px;
          background: linear-gradient(90deg, #165dff, #6aa1ff);
-          margin: 10px auto 0;
+          margin: 10px auto 0; // 下划线在标题块内居中
          border-radius: 2px;
        }
      }
@@ -108,22 +116,23 @@ const handleStart = () => {
  .guide-card {
    display: flex;
    align-items: center;
-    justify-content: center;
-    gap: 40px; // 减小间距
+    gap: 40px;
    background: white;
-    border-radius: 30px; // 减小圆角
+    border-radius: 30px;
    box-shadow: 0 20px 40px rgba(0, 0, 0, 0.1);
-    padding: 20px 30px; // 减小内边距
+    padding: 20px 30px;
    flex-wrap: wrap;
    border: 1px solid rgba(0, 0, 0, 0.05);
-    min-height: 400px; // 减小最小高度
+    min-height: 400px;
    width: auto;
-    max-width: 90vw; // 使用视口宽度的90%，确保有边距
-    margin: 0 auto;
+    max-width: 90vw;
+
+    // 【核心修改】设置左边距实现左偏移
+    margin-left: 10%;  // 与标题保持一致
+    margin-right: auto;

    &.centered {
-      margin-left: auto;
-      margin-right: auto;
+      // 移除原本的居中逻辑
    }

    .image-wrapper {
@@ -131,16 +140,16 @@ const handleStart = () => {
      display: flex;
      justify-content: center;
      align-items: center;
-      min-width: 300px; // 减小最小宽度
-      max-width: 600px; // 减小最大宽度
+      min-width: 300px;
+      max-width: 600px;
      height: 100%;

      .guide-image.enlarged {
        max-width: 100%;
        width: auto;
        height: auto;
-        max-height: 50vh; // 减小最大高度
-        min-height: 250px; // 减小最小高度
+        max-height: 50vh;
+        min-height: 250px;
        object-fit: contain;
        border-radius: 16px;
        filter: drop-shadow(0 10px 20px rgba(0, 0, 0, 0.08));
@@ -159,13 +168,13 @@ const handleStart = () => {
      align-items: center;
      justify-content: center;
      gap: 12px;
-      min-width: 180px; // 减小最小宽度
+      min-width: 180px;

      .button-hint {
-        font-size: 14px; // 减小字体
+        font-size: 14px;
        color: #475569;
        background: #f1f5f9;
-        padding: 6px 18px; // 减小内边距
+        padding: 6px 18px;
        border-radius: 24px;
        white-space: nowrap;
        box-shadow: 0 2px 6px rgba(0, 0, 0, 0.02);
@@ -180,9 +189,9 @@ const handleStart = () => {
      }

      .start-button.enlarged {
-        min-width: 160px; // 减小按钮宽度
-        height: 56px; // 减小按钮高度
-        font-size: 22px; // 减小字体
+        min-width: 160px;
+        height: 56px;
+        font-size: 22px;
        border-radius: 40px;
        box-shadow: 0 10px 20px rgba(22, 93, 255, 0.2);
        transition: all 0.3s ease;
@@ -209,12 +218,11 @@ const handleStart = () => {
 // 针对不同屏幕尺寸的精细调整
@media (min-width: 1920px) {
  .guide-card {
-    max-width: 1600px; // 超大屏幕限制最大宽度
+    max-width: 1600px;
    padding: 30px 50px;
-
-    .image-wrapper {
-      max-width: 800px;
-    }
+  }
+  .guide-content.full-height .page-title {
+    // 大屏幕保持同步
  }
 }

@@ -222,15 +230,7 @@ const handleStart = () => {
  .guide-card {
    gap: 30px;
    padding: 20px 25px;
-
-    .image-wrapper {
-      min-width: 280px;
-      max-width: 500px;
-
-      .guide-image.enlarged {
-        max-height: 45vh;
-      }
-    }
+    // 如果需要，可以在这里微调 margin-left，记得同时微调 title
  }
 }

@@ -242,43 +242,26 @@ const handleStart = () => {
  .guide-card {
    gap: 25px;
    padding: 15px 20px;
-    max-width: 95vw; // 在小屏幕上使用更宽的百分比
-
-    .image-wrapper {
-      min-width: 250px;
-      max-width: 450px;
-
-      .guide-image.enlarged {
-        max-height: 40vh;
-        min-height: 200px;
-      }
-    }
-
-    .button-wrapper {
-      min-width: 160px;
-
-      .button-hint {
-        font-size: 13px;
-        padding: 5px 15px;
-      }
-
-      .start-button.enlarged {
-        min-width: 150px;
-        height: 50px;
-        font-size: 20px;
-      }
-    }
+    max-width: 95vw;
+    // 平板端如果需要调整偏移，请同时调整下方 title 的 margin
  }
 }

@media (max-width: 768px) {
  .guide-section.full-background {
    padding: 5px;
+    justify-content: center; // 移动端恢复整体居中

    .guide-content.full-height {
+      align-items: center; // 移动端子元素也居中
+
      .page-title {
        font-size: 28px;
        margin-bottom: 10px;
+        // 【重要】移动端重置 margin，恢复自动居中
+        margin-left: auto;
+        margin-right: auto;
+        width: fit-content; // 保持适应内容

        &::after {
          width: 60px;
@@ -294,7 +277,11 @@ const handleStart = () => {
    padding: 20px 15px;
    gap: 20px;
    min-height: auto;
-    max-width: 98vw; // 移动端几乎占满宽度
+    max-width: 98vw;
+
+    // 【重要】移动端强制居中
+    margin-left: auto;
+    margin-right: auto;

    .image-wrapper {
      min-width: auto;
@@ -334,14 +321,12 @@ const handleStart = () => {
  .guide-section.full-background {
    .guide-card {
      @media (min-width: 1025px) {
-        margin-left: 5%; // 在有侧边栏时左移
-        margin-right: auto;
+        // 如果有侧边栏，确保标题和卡片偏移量依然一致
      }
    }
  }
 }

-// 确保父容器占满且无滚动问题
 html, body {
  margin: 0;
  padding: 0;
@@ -359,22 +344,22 @@ html, body {
  overflow-y: auto;
 }

-// 针对100%缩放比例的特殊处理
+// 针对特定分辨率的微调（可选）
@media screen and (min-width: 1280px) and (max-width: 1366px) {
  .guide-card {
-    max-width: 85vw; // 在常见笔记本屏幕上使用85%宽度
+    max-width: 85vw;
  }
 }

@media screen and (min-width: 1367px) and (max-width: 1440px) {
  .guide-card {
-    max-width: 80vw; // 在1440p屏幕上使用80%宽度
+    max-width: 80vw;
  }
 }

@media screen and (min-width: 1441px) and (max-width: 1680px) {
  .guide-card {
-    max-width: 75vw; // 在更大屏幕上使用75%宽度
+    max-width: 75vw;
  }
 }
 </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/MaterialInfoAddModal.vue
+++ b/src/views/material/MaterialInfoAddModal.vue
@@ -58,9 +58,9 @@ const columns: ColumnItem[] = reactive([
    span: 24,
  },
  {
-    label: '物料单次可称量最大重量(kg)',
-    field: 'maxWeight',
-    type: 'input-number',
+    label: '物料规格',
+    field: 'materialSpec',
+    type: 'input',
    span: 24,
  },
  {
--- a/src/views/material/MaterialInfoImportDrawer.vue
+++ b/src/views/material/MaterialInfoImportDrawer.vue
@@ -0,0 +1,201 @@
+<template>
+  <a-drawer
+    v-model:visible="visible"
+    title="导入物料信息"
+    :mask-closable="false"
+    :esc-to-close="false"
+    :width="width >= 600 ? 600 : '100%'"
+    ok-text="确认导入"
+    cancel-text="取消导入"
+    @before-ok="save"
+    @close="reset"
+  >
+    <a-form ref="formRef" :model="form" size="large" auto-label-width>
+      <a-alert v-if="!form.disabled" style="margin-bottom: 15px">
+        请按照模板要求填写数据，填写完毕后，请先上传并进行解析。
+        <template #action>
+          <a-link @click="downloadTemplate">
+            <template #icon><GiSvgIcon name="file-excel" :size="16" /></template>
+            <template #default>下载模板</template>
+          </a-link>
+        </template>
+      </a-alert>
+      <fieldset>
+        <legend>1.解析数据</legend>
+        <div class="file-box">
+          <a-upload
+            draggable
+            :custom-request="handleUpload"
+            :limit="1"
+            :show-retry-butto="false"
+            :show-cancel-button="false" tip="仅支持xls、xlsx格式"
+            :file-list="uploadFile"
+            accept=".xls, .xlsx, application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+          />
+        </div>
+        <div v-if="dataResult.importKey">
+          <div class="file-box">
+            <a-space size="large">
+              <a-statistic title="总计行数" :value="dataResult.totalRows" />
+              <a-statistic title="正常行数" :value="dataResult.validRows" />
+            </a-space>
+          </div>
+          <div class="file-box">
+            <a-space size="large">
+              <a-statistic title="已存在物料名" :value="dataResult.duplicateNameRows" />
+              <a-statistic title="已存在编码" :value="dataResult.duplicateCodeRows" />
+            </a-space>
+          </div>
+        </div>
+      </fieldset>
+      <fieldset>
+        <legend>2.导入策略</legend>
+        <a-form-item label="物料名已存在" field="duplicateName">
+          <a-radio-group v-model="form.duplicateName" type="button">
+            <a-radio :value="1">跳过该行</a-radio>
+            <a-radio :value="2">修改数据</a-radio>
+            <a-radio :value="3">停止导入</a-radio>
+          </a-radio-group>
+        </a-form-item>
+        <a-form-item label="编码已存在" field="duplicateCode">
+          <a-radio-group v-model="form.duplicateCode" type="button">
+            <a-radio :value="1">跳过该行</a-radio>
+            <a-radio :value="2">修改数据</a-radio>
+            <a-radio :value="3">停止导入</a-radio>
+          </a-radio-group>
+        </a-form-item>
+        <a-form-item label="默认状态" field="defaultStatus">
+          <a-switch
+            v-model="form.defaultStatus"
+            :checked-value="1"
+            :unchecked-value="2"
+            checked-text="启用"
+            unchecked-text="禁用"
+            type="round"
+          />
+        </a-form-item>
+      </fieldset>
+    </a-form>
+  </a-drawer>
+</template>
+
+<script setup lang="ts">
+import { type FormInstance, Message, type RequestOption } from '@arco-design/web-vue'
+import { useWindowSize } from '@vueuse/core'
+import {
+  type MaterialImportResp,
+  downloadMaterialInfoImportTemplate,
+  importMaterial,
+  parseImportMaterial,
+} from '@/apis/material/materialInfo'
+import { useDownload, useResetReactive } from '@/hooks'
+
+const emit = defineEmits<{
+  (e: 'save-success'): void
+}>()
+
+const { width } = useWindowSize()
+
+const visible = ref(false)
+const formRef = ref<FormInstance>()
+const uploadFile = ref([])
+
+const [form, resetForm] = useResetReactive({
+  importKey: '',
+  errorPolicy: 1,
+  duplicateName: 1,
+  duplicateCode: 1,
+  defaultStatus: 1,
+})
+
+const dataResult = ref<MaterialImportResp>({
+  importKey: '',
+  totalRows: 0,
+  validRows: 0,
+  duplicateNameRows: 0,
+  duplicateCodeRows: 0,
+})
+
+// 重置
+const reset = () => {
+  formRef.value?.resetFields()
+  dataResult.value.importKey = ''
+  uploadFile.value = []
+  resetForm()
+}
+
+// 下载模板
+const downloadTemplate = () => {
+  useDownload(() => downloadMaterialInfoImportTemplate())
+}
+
+// 上传解析导入数据
+const handleUpload = (options: RequestOption) => {
+  const controller = new AbortController();
+  (async function requestWrap() {
+    const { onProgress, onError, onSuccess, fileItem, name = 'file' } = options
+    onProgress(20)
+    const formData = new FormData()
+    formData.append(name as string, fileItem.file as Blob)
+    try {
+      const res = await parseImportMaterial(formData)
+      dataResult.value = res.data
+      Message.success('上传解析成功')
+      onSuccess(res)
+    } catch (error) {
+      onError(error)
+    }
+  })()
+  return {
+    abort() {
+      controller.abort()
+    },
+  }
+}
+
+// 执行导入
+const save = async () => {
+  try {
+    if (!dataResult.value.importKey) {
+      Message.warning('请先上传文件，解析导入数据')
+      return false
+    }
+    form.importKey = dataResult.value.importKey
+    const res = await importMaterial(form)
+    Message.success(`导入成功! 新增${res.data.insertRows}, 修改${res.data.updateRows},总计处理${res.data.totalRows}`)
+    emit('save-success')
+    return true
+  } catch (error) {
+    return false
+  }
+}
+
+// 打开
+const onOpen = () => {
+  reset()
+  visible.value = true
+}
+
+defineExpose({ onOpen })
+</script>
+
+<style scoped lang="scss">
+fieldset {
+  padding: 15px 15px 0 15px;
+  margin-bottom: 15px;
+  border: 1px solid var(--color-neutral-3);
+  border-radius: 3px;
+}
+
+fieldset legend {
+  color: rgb(var(--gray-10));
+  padding: 2px 5px 2px 5px;
+  border: 1px solid var(--color-neutral-3);
+  border-radius: 3px;
+}
+
+.file-box {
+  margin-bottom: 20px;
+  margin-left: 10px;
+}
+</style>
--- a/src/views/material/PhotosImport.vue
+++ b/src/views/material/PhotosImport.vue
@@ -0,0 +1,134 @@
+<template>
+  <a-drawer
+    v-model:visible="visible"
+    title="批量导入物料照片"
+    :mask-closable="false"
+    :esc-to-close="false"
+    :width="width >= 600 ? 600 : '100%'"
+    ok-text="确认导入"
+    cancel-text="取消导入"
+    @before-ok="save"
+    @close="reset"
+  >
+    <a-form ref="formRef" :model="form" size="large" auto-label-width>
+      <fieldset>
+        <legend>zip文件上传</legend>
+        <div class="file-box">
+          <a-upload
+            draggable
+            :custom-request="handleUpload"
+            :limit="1"
+            :show-retry-button="false"
+            :show-cancel-button="false"
+            tip="仅支持zip格式"
+            :file-list="uploadFile"
+            accept=".zip"
+          />
+        </div>
+      </fieldset>
+    </a-form>
+  </a-drawer>
+</template>
+
+<script setup lang="ts">
+import { type FormInstance, Message, type RequestOption } from '@arco-design/web-vue'
+import { useWindowSize } from '@vueuse/core'
+import { uploadMaterialPhotos } from '@/apis/material/materialInfo'
+import { useResetReactive } from '@/hooks'
+
+const emit = defineEmits<{
+  (e: 'save-success'): void
+}>()
+
+const { width } = useWindowSize()
+
+const visible = ref(false)
+const formRef = ref<FormInstance>()
+const uploadFile = ref([])
+// 新增：保存上传的文件对象
+const uploadFileObj = ref<File | null>(null)
+
+// 移除不必要的表单字段，只保留空对象即可
+const [form, resetForm] = useResetReactive({})
+
+// 重置
+const reset = () => {
+  formRef.value?.resetFields()
+  uploadFile.value = []
+  uploadFileObj.value = null // 重置文件对象
+  resetForm()
+}
+
+// 修改上传逻辑：仅保存文件对象，不做解析
+const handleUpload = (options: RequestOption) => {
+  const { onProgress, onError, onSuccess, fileItem } = options
+  onProgress(100) // 直接标记上传完成（仅前端显示）
+
+  // 保存文件对象供后续提交使用
+  uploadFileObj.value = fileItem.file as File
+  uploadFile.value = [fileItem] // 更新文件列表显示
+
+  Message.success('文件已选择，点击确认导入即可上传')
+  onSuccess({}) // 通知上传组件完成
+  return {
+    abort() {
+      // 空实现，取消时会走reset逻辑
+    },
+  }
+}
+
+// 执行导入：直接上传文件到后端
+const save = async () => {
+  try {
+    // 校验是否选择了文件
+    if (!uploadFileObj.value) {
+      Message.warning('请先选择要上传的ZIP文件')
+      return false
+    }
+
+    // 构建FormData
+    const formData = new FormData()
+    formData.append('zipFile', uploadFileObj.value) // 后端接收参数名保持为zipFile
+
+    // 调用后端照片批量导入接口
+    await uploadMaterialPhotos(formData)
+
+    Message.success('物料照片批量导入成功！')
+    emit('save-success') // 通知父组件刷新列表
+    visible.value = false // 关闭抽屉
+    return true
+  } catch (error) {
+    Message.error('物料照片导入失败，请重试！')
+    return false
+  }
+}
+
+// 打开抽屉
+const onOpen = () => {
+  reset()
+  visible.value = true
+}
+
+defineExpose({ onOpen })
+</script>
+
+<style scoped lang="scss">
+fieldset {
+  padding: 15px 15px 0 15px;
+  margin-bottom: 15px;
+  border: 1px solid var(--color-neutral-3);
+  border-radius: 3px;
+}
+
+fieldset legend {
+  color: rgb(var(--gray-10));
+  padding: 2px 5px 2px 5px;
+  border: 1px solid var(--color-neutral-3);
+  border-radius: 3px;
+}
+
+.file-box {
+  margin-bottom: 20px;
+  margin-left: 10px;
+}
+</style>
--- 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" />
@@ -25,33 +26,53 @@
          <template #icon><icon-plus /></template>
          <template #default>新增</template>
        </a-button>
+        <a-button v-permission="['admin:materialInfo:import']" @click="onImport">
+          <template #icon><icon-upload /></template>
+          <template #default>导入</template>
+        </a-button>
        <a-button v-permission="['admin:materialInfo:export']" @click="onExport">
          <template #icon><icon-download /></template>
          <template #default>导出</template>
        </a-button>
+        <a-button v-permission="['admin:materialInfo:import']" @click="onPhotosImport">
+          <template #icon><icon-upload /></template>
+          <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>
@@ -60,11 +81,16 @@
    </GiTable>

    <MaterialInfoAddModal ref="MaterialInfoAddModalRef" @save-success="search" />
+    <MaterialInfoImportDrawer ref="MaterialInfoImportDrawerRef" @save-success="search" />
+    <PhotosImport ref="PhotosImportRef" @save-success="search"/>
  </div>
 </template>

 <script setup lang="ts">
+// ... 保持原有的 import 不变
 import MaterialInfoAddModal from './MaterialInfoAddModal.vue'
+import MaterialInfoImportDrawer from './MaterialInfoImportDrawer.vue'
+import PhotosImport from '@/views/material/PhotosImport.vue';
 import { type MaterialInfoQuery, type MaterialInfoResp, deleteMaterialInfo, exportMaterialInfo, listMaterialInfo } from '@/apis/material/materialInfo'
 import type { TableInstanceColumns } from '@/components/GiTable/type'
 import { useDownload, useTable } from '@/hooks'
@@ -73,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,
@@ -86,12 +118,12 @@ const {
  search,
  handleDelete,
 } = useTable((page) => listMaterialInfo({ ...queryForm, ...page }), { immediate: true })
+
 const columns = ref<TableInstanceColumns[]>([
  { title: '物料名称', dataIndex: 'materialName', slotName: 'materialName' },
  { title: '物料编码', dataIndex: 'encoding', slotName: 'encoding' },
  { title: '物料单位重量(g)', dataIndex: 'unitWeight', slotName: 'unitWeight' },
-  { title: '物料单次可称量最大重量(kg)', dataIndex: 'maxWeight', slotName: 'maxWeight' },
-  // 可给photoUrl列添加宽度，优化显示
+  { title: '物料规格', dataIndex: 'materialSpec', slotName: 'materialSpec' },
  { title: '物料照片', dataIndex: 'photoUrl', slotName: 'photoUrl', width: 120, align: 'center' },
  { title: '创建人', dataIndex: 'createUserString', slotName: 'createUser' },
  { title: '创建时间', dataIndex: 'createTime', slotName: 'createTime' },
@@ -106,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: `是否确定删除该条数据？`,
@@ -121,54 +151,79 @@ 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)
 }

-// 详情（补充定义，避免报错）
-const onDetail = (record: MaterialInfoResp) => {
-  // 可补充详情逻辑，如打开详情弹窗
-  console.log('物料详情', record)
+const MaterialInfoImportDrawerRef = ref<InstanceType<typeof MaterialInfoImportDrawer>>()
+const onImport = () => {
+  MaterialInfoImportDrawerRef.value?.onOpen()
+}
+
+const PhotosImportRef = ref<InstanceType<typeof PhotosImport>>()
+const onPhotosImport = () => {
+  PhotosImportRef.value?.onOpen()
 }
 </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/UserAddDrawer.vue
+++ b/src/views/system/user/UserAddDrawer.vue
@@ -13,7 +13,7 @@
 </template>

 <script setup lang="ts">
-import { Message, type TreeNodeData } from '@arco-design/web-vue'
+import { Message } from '@arco-design/web-vue'
 import { useWindowSize } from '@vueuse/core'
 import { addUser, getUser, updateUser } from '@/apis/system/user'
 import { type ColumnItem, GiForm } from '@/components/GiForm'
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -123,7 +123,7 @@ const queryFormColumns: ColumnItem[] = reactive([
      hideLabel: true,
    },
    props: {
-      placeholder: '搜索用户名/昵称/描述',
+      placeholder: '搜索用户名',
      showWordLimit: false,
    },
  },
@@ -227,11 +227,6 @@ const onUpdate = (record: UserResp) => {
  UserAddDrawerRef.value?.onUpdate(record.id)
 }

-const UserDetailDrawerRef = ref<InstanceType<typeof UserDetailDrawer>>()
-const onDetail = (record: UserResp) => {
-  UserDetailDrawerRef.value?.onOpen(record.id)
-}
-
 const UserResetPwdModalRef = ref<InstanceType<typeof UserResetPwdModal>>()
 const onResetPwd = (record: UserResp) => {
  UserResetPwdModalRef.value?.onOpen(record.id)
--- a/src/views/weightManage/index.vue
+++ b/src/views/weightManage/index.vue
@@ -25,7 +25,7 @@
        <div class="main-content">
          <!-- 左侧表单 -->
          <div class="left-section">
-            <a-image  v-if="!formData.photoUrl" :src="formData.photoUrl"/>
+            <a-image v-if="!formData.photoUrl" :src="formData.photoUrl" />
            <img v-else :src="formData.photoUrl" class="sample-image square-image" alt="样图">

            <a-form :model="formData" layout="vertical">
@@ -57,10 +57,10 @@
                <div class="form-item">
                  <a-form-item label="物料编码">
                    <a-input
-                      v-model="formData.inputMaterialCode" 
-                      placeholder="请点击此处确保光标闪烁，并使用扫码枪扫描物料编码"
-                      @keydown="handleKeyDown"
-                      @input="handleMaterialCodeChange"
+                        v-model="formData.inputMaterialCode"
+                        placeholder="请点击此处确保光标闪烁，并使用扫码枪扫描物料编码"
+                        @keydown="handleKeyDown"
+                        @input="handleMaterialCodeChange"
                    />
                  </a-form-item>
                </div>
@@ -71,8 +71,14 @@
          <!-- 右侧信息 -->
          <div class="right-section">
            <div class="camera-section">
-              <div class="image-placeholder square-image">实时画面 相机1</div>
-              <div class="image-placeholder square-image">实时画面 相机2</div>
+              <!-- 图片展示 -->
+              <div class="image-placeholder square-image">
+                <img 
+                  :src="imgData.imgUrl"
+                  alt="图片展示"
+                  style="width: 100%; height: 100%; object-fit: cover; border-radius: 4px;"
+                />
+              </div>
            </div>

            <div class="info-section">
@@ -88,20 +94,20 @@
                </div>
              </div>

-
              <div class="info-card">
                <h4>比对结果</h4>
                <div class="info-item">
                  <span class="label">比对结果:</span>
-                  <span class="value match-result" :class="{
-                    'match-success': formData.matchResult === 'success',
-                    'match-failed': formData.matchResult === 'failed',
-                    'match-pending': !formData.matchResult
-                  }">
-                    <icon-check-circle-fill v-if="formData.matchResult === 'success'" style="color: #52c41a; margin-right: 8px; font-size: 25px;"/>
-                    <icon-close-circle-fill v-else-if="formData.matchResult === 'failed'" style="color: #ff4d4f; margin-right: 8px; font-size: 25px;"/>
-
-                    {{ formData.matchResult === 'success' ? '成功' : formData.matchResult === 'failed' ? '失败' : '-' }}
+                  <span
+                      class="value match-result" :class="{
+                      'match-success': compareMatchResult === 'success',
+                      'match-failed': compareMatchResult === 'failed',
+                      'match-pending': !compareMatchResult,
+                    }"
+                  >
+                    <icon-check-circle-fill v-if="compareMatchResult === 'success'" style="color: #52c41a; margin-right: 8px; font-size: 25px;" />
+                    <icon-close-circle-fill v-else-if="compareMatchResult === 'failed'" style="color: #ff4d4f; margin-right: 8px; font-size: 25px;" />
+                    {{ compareMatchResult === 'success' ? '成功' : compareMatchResult === 'failed' ? '失败' : '请放置需比对的物料到扫描区域！' }}
                  </span>
                </div>
              </div>
@@ -110,7 +116,7 @@
        </div>
      </div>

-      <!-- 称重登记页面 -->
+      <!-- 称重登记页面 - 这里放FLV播放器 -->
      <div v-else-if="activeStep === 2" class="step-content">
        <div class="weighing-content">
          <!-- 左侧输入区域 -->
@@ -136,10 +142,46 @@
            <div class="form-row">
              <div class="form-item">
                <label>对应重量(g):</label>
-                <a-input v-model="ahDeviceWeight" placeholder="-" disabled/>
+                <a-input v-model="ahDeviceWeight" placeholder="-" disabled />
              </div>
            </div>
-            <div class="image-placeholder large-image">实时画面</div>
+
+            <!-- 这里是摄像头画面 - 替换成FLV播放器 -->
+            <div class="video-container large-image">
+              <video
+                  ref="cameraVideo"
+                  autoplay
+                  muted
+                  playsinline
+                  style="width: 100%; height: 100%; object-fit: cover;"
+              ></video>
+
+              <!-- 加载状态 -->
+              <div v-if="cameraStatus === 'connecting'" class="video-overlay">
+                <a-spin />
+                <span style="margin-left: 8px;">加载中...</span>
+              </div>
+
+              <!-- 错误状态 -->
+              <div v-if="cameraStatus === 'error'" class="video-overlay error">
+                <icon-close-circle-fill style="color: #ff4d4f; font-size: 24px;" />
+                <span>连接失败</span>
+                <a-button size="small" type="primary" @click="reconnectCamera">重试</a-button>
+              </div>
+
+              <!-- 未连接状态 -->
+              <div v-if="cameraStatus === 'disconnected'" class="video-overlay">
+                <icon-pause-circle-fill style="color: #999; font-size: 24px;" />
+                <span>未连接</span>
+                <a-button size="small" type="primary" @click="initCamera">连接</a-button>
+              </div>
+
+              <!-- 摄像头状态标识 -->
+              <div v-if="cameraStatus === 'connected'" class="camera-badge">
+                <span class="live-badge">LIVE</span>
+              </div>
+            </div>
+
            <div class="weighing-actions">
              <a-button type="primary" @click="handleConfirm">确定</a-button>
              <a-button style="margin-left: 12px;" @click="handleReset">重置</a-button>
@@ -210,20 +252,19 @@
      <!-- 操作按钮 -->
      <div class="action-buttons">
        <a-button
-          v-if="activeStep > 1 && activeStep < 3"
-          @click="handlePrevious"
-          class="previous-button"
+            v-if="activeStep > 1 && activeStep < 3"
+            class="previous-button"
+            @click="handlePrevious"
        >
          上一步
        </a-button>
        <a-button
-          v-if="activeStep < 3" 
-          type="primary" 
-          @click="handleNext"
-          :disabled="activeStep === 1 && formData.matchResult !== 'success'"
-          class="next-button"
+            v-if="activeStep < 3"
+            type="primary"
+            class="next-button"
+            @click="handleNext"
        >
-          {{ activeStep === 2 ? '完成' : '下一步' }}
+          {{ activeStep === 2 ? '完成' : (compareMatchResult === 'success' ? '下一步' : '开始比对') }}
        </a-button>
      </div>
    </div>
@@ -231,11 +272,16 @@
 </template>

 <script setup lang="ts">
-import { ref, reactive, onUnmounted } from 'vue'
-import { Modal, Message } from '@arco-design/web-vue'
-import { getMaterialDetail } from "@/apis/weightManage/weightManage";
-import {addWorkOrder, type WorkOrderResp} from "@/apis/workOrder/workOrder";
-import { Notification } from "@arco-design/web-vue"
+import { nextTick, onBeforeUnmount, onMounted, onUnmounted, reactive, ref } from 'vue'
+import { Message, Modal, Notification } from '@arco-design/web-vue'
+import {getImg, getMaterialDetail, validateWeighing, vmSend} from '@/apis/weightManage/weightManage'
+import {type WorkOrderResp, addWorkOrder, getWorkOrder} from '@/apis/workOrder/workOrder'
+import { catchPhoto } from '@/apis/material/materialInfo'
+
+defineOptions({ name: 'WeightManage' })
+
+// 动态导入flv.js
+const flvjs = ref<any>(null)

 // 当前步骤
 const activeStep = ref(1)
@@ -249,7 +295,273 @@ const formData = reactive({
  materialSpec: '', // 物料规格
  unitWeight: 0, // 重量
  photoUrl: '', // 样图URL
-  matchResult: '' // 比对结果
+})
+
+const imgData = reactive({
+  imgUrl: '', // 样图URL
+})
+
+// 定时器引用
+let pollingInterval = null
+
+// 获取图片的方法
+const getImage = () => {
+
+  getImg().then((res) => {
+    if (res.code === '0') {
+      imgData.imgUrl = res.data?.imgUrl || ''
+    }
+  })
+}
+
+//比对结果
+const compareMatchResult = ref('')
+
+// 摄像头状态
+const cameraStatus = ref<'connected' | 'connecting' | 'disconnected' | 'error'>('disconnected')
+
+// 视频元素引用
+const cameraVideo = ref<HTMLVideoElement | null>(null)
+
+// FLV播放器实例
+let player: any = null
+
+const reconnectCount = ref(1)
+const maxReconnectAttempts = 3
+const reconnectTimer = ref<any>(null)
+
+// 直接写死FLV流地址（根据你的实际地址修改）
+const FLV_URL = 'http://192.168.2.87:8866/live?url=rtsp://admin:admin%40123@192.168.2.59:554/media/video1' // 摄像头的FLV地址
+
+// 加载flv.js
+const loadFlvJs = async () => {
+  if (typeof window !== 'undefined') {
+    const module = await import('flv.js')
+    flvjs.value = module.default
+  }
+}
+
+// 初始化摄像头
+const initCamera = () => {
+  if (!cameraVideo.value || !flvjs.value) {
+    return
+  }
+
+  // 检查浏览器支持
+  if (!flvjs.value.isSupported()) {
+    Message.error('当前浏览器不支持FLV播放')
+    cameraStatus.value = 'error'
+    return
+  }
+
+  cameraStatus.value = 'connecting'
+
+  // 清除之前的重连定时器
+  if (reconnectTimer.value) {
+    clearTimeout(reconnectTimer.value)
+    reconnectTimer.value = null
+  }
+
+  try {
+    // 销毁旧的播放器
+    if (player) {
+      player.destroy()
+      player = null
+    }
+
+    // 创建新的播放器
+    player = flvjs.value.createPlayer({
+      type: 'flv',
+      url: FLV_URL,
+      isLive: true,
+      hasAudio: false,
+      hasVideo: true,
+      enableStashBuffer: false,
+      stashInitialSize: 128,
+      enableWorker: true,
+      autoCleanupSourceBuffer: true,
+    })
+
+    // 绑定视频元素
+    player.attachMediaElement(cameraVideo.value)
+
+    // 加载并播放
+    player.load()
+    player.play().then(() => {
+      cameraStatus.value = 'connected'
+      reconnectCount.value = 1 // 连接成功，重置重连计数
+    }).catch((error: any) => {
+      cameraStatus.value = 'error'
+      Message.error('摄像头播放失败,正在重连')
+      // 触发自动重连
+      handleReconnect()
+      return
+    })
+
+    // 监听各种事件
+    player.on(flvjs.value.Events.ERROR, (err: any) => {
+      cameraStatus.value = 'error'
+      // 触发自动重连
+      handleReconnect()
+    })
+
+    player.on(flvjs.value.Events.STALLED, () => {
+      // 可以在这里处理卡顿，但不立即重连
+    })
+
+    player.on(flvjs.value.Events.RECOVERED_EARLY, () => {
+      if (cameraStatus.value !== 'connected') {
+        cameraStatus.value = 'connected'
+      }
+    })
+  } catch (error) {
+    cameraStatus.value = 'error'
+    handleReconnect()
+  }
+}
+
+// 处理自动重连
+const handleReconnect = () => {
+  // 只有当前在称重页面才重连
+  if (activeStep.value !== 2) return
+
+  // 检查重连次数
+  if (reconnectCount.value >= maxReconnectAttempts) {
+    return
+  }
+
+  // 增加重连计数
+  reconnectCount.value++
+
+  // 计算重连延迟（指数退避）
+  const delay = Math.min(1000 * 2 ** (reconnectCount.value - 1), 30000)
+
+  // 清除旧的定时器
+  if (reconnectTimer.value) {
+    clearTimeout(reconnectTimer.value)
+  }
+
+  // 设置新的重连定时器
+  reconnectTimer.value = setTimeout(() => {
+    initCamera()
+  }, delay)
+}
+
+// 重新连接摄像头（手动）
+const reconnectCamera = () => {
+  reconnectCount.value = 1 // 手动重连时重置计数
+  initCamera()
+}
+
+// 添加一个定时检查状态的函数
+const checkCameraStatus = () => {
+  if (!player || !cameraVideo.value) return
+
+  try {
+    // 检查播放器状态
+    if (player.isPlaying && !player.isPlaying()) {
+      if (cameraStatus.value === 'connected') {
+        cameraStatus.value = 'error'
+        handleReconnect()
+      }
+    }
+  } catch (error) {
+  }
+}
+
+// 启动状态检查定时器
+let statusCheckTimer: any = null
+
+// 监听步骤变化
+watch(activeStep, (newVal) => {
+  if (newVal === 2) {
+    // 进入称重登记页面，启动摄像头
+    reconnectCount.value = 1 // 重置重连计数
+    nextTick(() => {
+      initCamera()
+    })
+
+    // 启动状态检查（每30秒检查一次）
+    statusCheckTimer = setInterval(checkCameraStatus, 30000)
+  } else {
+    // 离开称重登记页面，停止摄像头和定时器
+    stopCamera()
+    if (statusCheckTimer) {
+      clearInterval(statusCheckTimer)
+      statusCheckTimer = null
+    }
+    if (reconnectTimer.value) {
+      clearTimeout(reconnectTimer.value)
+      reconnectTimer.value = null
+    }
+    reconnectCount.value = 1
+  }
+})
+
+// 组件卸载时清理所有定时器
+onBeforeUnmount(() => {
+  stopCamera()
+  if (statusCheckTimer) {
+    clearInterval(statusCheckTimer)
+    statusCheckTimer = null
+  }
+  if (reconnectTimer.value) {
+    clearTimeout(reconnectTimer.value)
+    reconnectTimer.value = null
+  }
+})
+
+// 重新连接摄像头
+// const reconnectCamera = () => {
+//   if (player) {
+//     player.unload()
+//     player.detachMediaElement()
+//     player.destroy()
+//     player = null
+//   }
+//   setTimeout(() => initCamera(), 1000)
+// }
+
+// 停止摄像头
+const stopCamera = () => {
+  if (player) {
+    player.pause()
+    player.unload()
+    player.detachMediaElement()
+    player.destroy()
+    player = null
+    cameraStatus.value = 'disconnected'
+  }
+  if (reconnectTimer.value) {
+    clearTimeout(reconnectTimer.value)
+    reconnectTimer.value = null
+  }
+  reconnectCount.value = 1
+}
+
+
+// 监听步骤变化
+watch(activeStep, (newVal) => {
+  if (newVal === 2) {
+    // 进入称重登记页面，启动摄像头
+    nextTick(() => {
+      initCamera()
+    })
+  } else {
+    // 离开相关页面，停止摄像头
+    stopCamera()
+  }
+})
+
+// 组件挂载时
+onMounted(async () => {
+  await loadFlvJs()
+  pollingInterval = setInterval(getImg, 1000)
+})
+
+// 组件卸载时
+onBeforeUnmount(() => {
+  stopCamera()
 })

 const workOrderResp = ref<WorkOrderResp>({
@@ -265,13 +577,15 @@ const workOrderResp = ref<WorkOrderResp>({
  totalCount: '',
  createUserString: '',
  updateUserString: '',
-  matchResult: 'failed'
+  totalCalculatedWeight: '',
+  workOrderInfos: [],
+  matchResult: 'failed',
+  qrCodeData: '',
 })

-
 // 称重登记页面数据
 const inputQuantity = ref('')
-const ahDeviceWeight = ref('10')
+const ahDeviceWeight = ref('')
 const calculatedWeight = ref('')
 const weighingCount = ref(1)

@@ -289,65 +603,77 @@ const columns = [
  {
    title: '称重次数',
    dataIndex: 'weightTime',
-    key: 'weightTime'
+    key: 'weightTime',
  },
  {
    title: '数量',
    dataIndex: 'quantity',
    key: 'quantity',
-    className: 'green-bg'
+    className: 'green-bg',
  },
  {
    title: '重量(g)',
    dataIndex: 'weight',
    key: 'weight',
-    className: 'green-bg'
+    className: 'green-bg',
  },
  {
    title: '计算重量(g)',
    dataIndex: 'calculatedWeight',
    key: 'calculatedWeight',
-    className: 'green-bg'
+    className: 'green-bg',
  },
  {
    title: '抓拍图片',
-    dataIndex: 'imgUrl',
-    key: 'imgUrl',
-    className: 'green-bg'
+    dataIndex: 'image',
+    key: 'image',
+    className: 'green-bg',
+    // 使用自定义渲染
+    render: ({ record }) => {
+      if (record.image && record.image !== '未抓拍') {
+        return h('div', { class: 'image-preview' }, [
+          h('img', {
+            src: record.image,
+            alt: '抓拍图片',
+            style: 'width: 60px; height: 45px; object-fit: cover; border-radius: 4px; cursor: pointer;',
+            onClick: () => previewImage(record.image),
+          }),
+        ])
+      }
+      return h('span', record.image || '-')
+    },
  },
  {
    title: '操作',
    dataIndex: 'action',
    key: 'action',
-    slotName: 'action'
-  }
+    slotName: 'action',
+  },
 ]

-
-
 // 防抖函数
 const debounce = <T extends (...args: any[]) => any>(func: T, delay: number): ((...args: Parameters<T>) => void) => {
-  let timer: ReturnType<typeof setTimeout> | null = null;
-  return function(...args: Parameters<T>) {
-    if (timer) clearTimeout(timer);
+  let timer: ReturnType<typeof setTimeout> | null = null
+  return function (...args: Parameters<T>) {
+    if (timer) clearTimeout(timer)
    timer = setTimeout(() => {
-      func(...args);
-    }, delay);
-  };
-};
+      func(...args)
+    }, delay)
+  }
+}

 // 原始的物料编码变化处理函数
 const originalHandleMaterialCodeChange = async () => {
  // 确保输入框内容是完整的物料编码
-  const materialCode = formData.inputMaterialCode?.trim();
+  const materialCode = formData.inputMaterialCode?.trim()

  // 无论是否有输入，先重置所有物料相关字段，确保新数据能完全覆盖旧数据
-  formData.encoding = "";
-  formData.materialName = "";
-  formData.materialSpec = "";
-  formData.unitWeight = 0;
-  formData.photoUrl = "";
-  formData.matchResult = "";
+  formData.encoding = ''
+  formData.materialName = ''
+  formData.materialSpec = ''
+  formData.unitWeight = 0
+  formData.photoUrl = ''
+  compareMatchResult.value = '';

  // 如果有物料编码输入，获取物料数据
  if (materialCode) {
@@ -358,17 +684,17 @@ const originalHandleMaterialCodeChange = async () => {
      // 即使获取失败，也保持字段为空，避免显示旧数据
    }
  }
-};
+}

 // 记录上次输入时间，用于判断是否是扫码枪输入
-let lastInputTime = 0;
+let lastInputTime = 0
 // 记录输入内容，用于判断是否是新的扫码
-let previousInput = '';
+const previousInput = ''

 // 处理键盘按下事件
 const handleKeyDown = (event: KeyboardEvent) => {
  // 获取当前时间
-  const currentTime = Date.now();
+  const currentTime = Date.now()

  // 如果输入速度非常快（小于100ms），认为是扫码枪输入
  if (currentTime - lastInputTime < 100 && formData.inputMaterialCode) {
@@ -376,33 +702,30 @@ const handleKeyDown = (event: KeyboardEvent) => {
  } else if (event.key.length === 1 && !event.ctrlKey && !event.altKey) {
    // 如果是新的输入（不是快速连续输入），清空输入框
    // 这样可以确保每次扫码都从空输入框开始
-    formData.inputMaterialCode = '';
+    formData.inputMaterialCode = ''
  }

  // 更新上次输入时间
-  lastInputTime = currentTime;
-};
+  lastInputTime = currentTime
+}

 // 带防抖的物料编码变化处理函数
-const handleMaterialCodeChange = debounce(originalHandleMaterialCodeChange, 500); // 500ms防抖延迟
+const handleMaterialCodeChange = debounce(originalHandleMaterialCodeChange, 500) // 500ms防抖延迟

 // 扫码核验获取物料信息
 const fetchMaterialData = async (code: string) => {
-  getMaterialDetail(code).then(res => {
-    if (res.code == '0') {
+  getMaterialDetail(code).then((res) => {
+    if (res.code === '0') {
      // 更新表单数据
-      formData.id = res.data?.id || "";
-      formData.encoding = res.data?.encoding || "";
-      formData.materialName = res.data?.materialName || "";
-      formData.materialSpec = res.data?.materialSpec || "";
-      formData.unitWeight = res.data?.unitWeight || 0;
-      formData.photoUrl = res.data?.photoUrl || "";
-      // 假设后端返回比对结果
-      // formData.matchResult = res.data.matchResult || 'failed' // 这里根据实际接口返回调整
-      formData.matchResult = res.data?.matchResult || 'success' // 这里根据实际接口返回调整
+      formData.id = res.data?.id || ''
+      formData.encoding = res.data?.encoding || ''
+      formData.materialName = res.data?.materialName || ''
+      formData.materialSpec = res.data?.materialSpec || ''
+      formData.unitWeight = res.data?.unitWeight || 0
+      formData.photoUrl = res.data?.photoUrl || ''
      return true
    }
-  });
+  })
 }

 // 处理下一步
@@ -419,20 +742,20 @@ const handleNext = async () => {
            const workOrderData = {
              materialId: formData.id,
              materialName: formData.materialName,
-              workOrderInfos: weighingList.value
+              workOrderInfos: weighingList.value,
            }
            // 调用后端接口
-            addWorkOrder(workOrderData).then(res => {
-              if (res.code == '0') {
+            addWorkOrder(workOrderData).then((res) => {
+              if (res.code === '0') {
                Notification.success({
                  title: '操作成功',
-                  content: `工单创建成功！`
+                  content: `工单创建成功！`,
                })
-                workOrderResp.value.matchResult = 'success';
-                workOrderResp.value.title = res.data?.title || "";
-                workOrderResp.value.orderNo = res.data?.orderNo || "";
-                workOrderResp.value.totalWeight = res.data?.totalWeight || "";
-                workOrderResp.value.totalCount = res.data?.totalCount || "";
+                workOrderResp.value.matchResult = 'success'
+                workOrderResp.value.title = res.data?.title || ''
+                workOrderResp.value.orderNo = res.data?.orderNo || ''
+                workOrderResp.value.totalWeight = res.data?.totalWeight || ''
+                workOrderResp.value.totalCount = res.data?.totalCount || ''

                // 关闭WebSocket连接
                closeWebSocket()
@@ -440,13 +763,42 @@ const handleNext = async () => {
                activeStep.value++
                return true
              }
-            });
+            })
          } catch (error) {
            console.error('创建工作订单失败:', error)
            Message.error('创建工作订单失败')
          }
-        }
+        },
      })
+    } else if (activeStep.value === 1 && compareMatchResult.value !== 'success') {
+      // 当在扫码核验页面点击开始比对时，调用后端接口获取比对结果
+      try {
+        // 这里应该调用后端的比对接口，暂时使用fetchMaterialData模拟
+        // 实际项目中应该替换为专门的比对接口
+        const materialCode = formData.inputMaterialCode?.trim()
+        if (!materialCode) {
+          Message.error('请先扫描物料编码')
+          return
+        }
+
+        // 调用后端接口获取比对结果
+        vmSend(materialCode).then((res) => {
+          if (res.code === '0') {
+            compareMatchResult.value = JSON.parse(res.data?.matchResult || '')
+          }
+        })
+
+        if (compareMatchResult.value === 'success') {
+          // 比对成功，按钮变为下一步
+          Message.success('比对成功')
+        } else {
+          // 比对失败，提示错误
+          Message.error('比对失败')
+        }
+      } catch (error) {
+        console.error('比对失败:', error)
+        Message.error('比对失败，请重试')
+      }
    } else {
      activeStep.value++
      // 进入称重页面时建立WebSocket连接
@@ -457,6 +809,8 @@ const handleNext = async () => {
  }
 }

+
+
 // 处理上一步
 const handlePrevious = () => {
  if (activeStep.value > 1) {
@@ -470,7 +824,31 @@ const handlePrevious = () => {

 // 返回第一步
 const handleBackToFirst = () => {
+  // 重置所有数据
  activeStep.value = 1
+
+  // 重置表单数据
+  formData.inputMaterialCode = ''
+  formData.id = ''
+  formData.encoding = ''
+  formData.materialName = ''
+  formData.materialSpec = ''
+  formData.unitWeight = 0
+  formData.photoUrl = ''
+
+  compareMatchResult.value = ''
+
+  // 重置称重登记页面数据
+  inputQuantity.value = ''
+  ahDeviceWeight.value = ''
+  calculatedWeight.value = ''
+  weighingCount.value = 1
+  // 清空称重列表
+  weighingList.value = []
+
+  // 重置工作订单响应数据
+  workOrderResp.value = {}
+
  // 离开称重页面时关闭WebSocket连接
  closeWebSocket()
 }
@@ -478,8 +856,8 @@ const handleBackToFirst = () => {
 // 计算重量
 const calculateWeight = () => {
  if (inputQuantity.value && formData.unitWeight) {
-    const singleWeight = parseFloat(formData.unitWeight.toString())
-    const quantity = parseFloat(inputQuantity.value)
+    const singleWeight = Number.parseFloat(formData.unitWeight.toString())
+    const quantity = Number.parseFloat(inputQuantity.value)
    if (!isNaN(singleWeight) && !isNaN(quantity)) {
      calculatedWeight.value = (singleWeight * quantity).toFixed(2)
    }
@@ -489,8 +867,7 @@ const calculateWeight = () => {
 }


-
-// 处理确定
+//处理确定
 const handleConfirm = () => {
  // 校验输入数量是否为空
  if (!inputQuantity.value || inputQuantity.value.trim() === '') {
@@ -502,7 +879,19 @@ const handleConfirm = () => {
    return
  }

-  // 生成新的列表数据
+  const data = {
+    materialId: formData.id,
+    inputQuantity: inputQuantity.value,
+    ahDeviceWeight: ahDeviceWeight.value,
+  }
+
+  validateWeighing(data).then(res => {
+    if (res.code != '0') {
+      Message.error(res.msg || '系统异常！')
+    }
+  });
+
+  // 立即创建一个新项的基本数据
  const newItem = {
    key: (weighingList.value.length + 1).toString(),
    weightTime: weighingCount.value,
@@ -510,16 +899,100 @@ const handleConfirm = () => {
    quantity: inputQuantity.value,
    weight: ahDeviceWeight.value,
    calculatedWeight: calculatedWeight.value,
-    imgUrl: '图片'
+    image: '加载中...', // 先显示加载状态
  }
-  // 添加到列表
+
+  // 先添加到列表，让用户能立即看到记录
  weighingList.value.push(newItem)
-  // 重置输入
+
+  // 重置输入（让用户能继续输入）
  inputQuantity.value = ''
-  ahDeviceWeight.value = '10'
+  ahDeviceWeight.value = ''
  calculatedWeight.value = ''
-  // 称重次数累加
  weighingCount.value = weighingList.value.length + 1
+
+  // 异步执行抓拍，不阻塞主流程
+  if (cameraVideo.value && cameraStatus.value === 'connected') {
+    // 立即执行异步抓拍
+    capturePhoto().then((captureUrl) => {
+      // 找到刚刚添加的项，更新图片URL
+      const addedItem = weighingList.value.find((item) => item.key === newItem.key)
+      if (addedItem) {
+        addedItem.image = captureUrl || '抓拍失败'
+        // 触发视图更新
+        weighingList.value = [...weighingList.value]
+      }
+      Message.success('图片抓拍成功')
+    }).catch((error) => {
+    })
+  } else {
+    // 摄像头未连接，直接显示未抓拍
+    const addedItem = weighingList.value.find((item) => item.key === newItem.key)
+    if (addedItem) {
+      addedItem.image = '未抓拍'
+      weighingList.value = [...weighingList.value]
+    }
+  }
+
+  Message.success('添加成功')
+}
+
+// 抓拍功能 - 内部方法，不暴露按钮
+const capturePhoto = (): Promise<string> => {
+  // eslint-disable-next-line no-async-promise-executor
+  return new Promise(async (resolve, reject) => {
+    try {
+      const video = cameraVideo.value
+      if (!video) {
+        reject(new Error('视频未初始化'))
+        return
+      }
+
+      // 创建canvas抓取当前帧
+      const canvas = document.createElement('canvas')
+      canvas.width = video.videoWidth || 640
+      canvas.height = video.videoHeight || 480
+      const ctx = canvas.getContext('2d')
+      ctx.drawImage(video, 0, 0, canvas.width, canvas.height)
+
+      // 转换为Blob
+      const blob = await new Promise<Blob>((resolve) => {
+        canvas.toBlob((b) => resolve(b), 'image/jpeg', 0.9)
+      })
+
+      // 创建FormData
+      const formData = new FormData()
+      formData.append('file', blob, `capture_${Date.now()}.jpg`)
+
+      // 调用后端接口
+      const response = await catchPhoto(formData)
+      if (response.msg !== 'ok') {
+        return
+      }
+
+      const imageUrl = await response.data
+      resolve(imageUrl)
+    } catch (error) {
+      reject(error)
+    }
+  })
+}
+
+// 图片预览函数
+const previewImage = (url: string) => {
+  // 使用Arco Design的图片预览组件
+  Modal.info({
+    title: '图片预览',
+    content: () => h('div', { style: 'text-align: center;' }, [
+      h('img', {
+        src: url,
+        style: 'max-width: 100%; max-height: 500px; object-fit: contain;',
+      }),
+    ]),
+    okText: '关闭',
+    hideCancel: true,
+    width: 'auto',
+  })
 }

 // 处理重置
@@ -532,7 +1005,7 @@ const handleReset = () => {
 // 处理删除
 const handleDelete = (key) => {
  // 过滤掉要删除的项
-  weighingList.value = weighingList.value.filter(item => item.key !== key)
+  weighingList.value = weighingList.value.filter((item) => item.key !== key)
  // 重新排序称重次数
  weighingList.value.forEach((item, index) => {
    item.weightTime = index + 1
@@ -589,9 +1062,10 @@ const closeWebSocket = () => {
 // 组件卸载时关闭WebSocket连接
 onUnmounted(() => {
  closeWebSocket()
+  if (pollingInterval) {
+    clearInterval(pollingInterval)
+  }
 })
-
-defineOptions({ name: 'WeightManage' })
 </script>

 <style scoped lang="scss">
@@ -719,10 +1193,68 @@ defineOptions({ name: 'WeightManage' })
  font-weight: bold;
 }

+/* 视频容器 - 替换原来的image-placeholder */
+.video-container {
+  position: relative;
+  width: 100%;
+  height: 240px;
+  background: #000;
+  border-radius: 4px;
+  overflow: hidden;
+  margin: 20px 0;
+}
+
+.video-container video {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
+
+.video-overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.7);
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  color: #fff;
+  gap: 10px;
+}
+
+.video-overlay.error {
+  background: rgba(255, 77, 79, 0.2);
+}
+
+.camera-badge {
+  position: absolute;
+  top: 10px;
+  right: 10px;
+  z-index: 10;
+}
+
+.live-badge {
+  background: #ff4d4f;
+  color: white;
+  padding: 2px 8px;
+  border-radius: 4px;
+  font-size: 12px;
+  font-weight: bold;
+  animation: pulse 1.5s infinite;
+}
+
+@keyframes pulse {
+  0% { opacity: 1; }
+  50% { opacity: 0.7; }
+  100% { opacity: 1; }
+}
+
 .large-image {
  width: 100%;
-  height: 200px;
-  margin: 20px 0;
+  height: 240px;
 }

 .input-placeholder {
--- 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
zc	323a641fa3	Merge branch 'refs/heads/master' into dev # Conflicts: # src/views/system/user/index.vue	2026-03-06 18:06:34 +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
liuzhu	7058245cdf	物料新增批量导入照片按钮	2026-03-05 14:48:32 +08:00
liuzhu	7f5ab90f22	优化	2026-03-04 18:04:37 +08:00
liuzhu	124de2926e	优化	2026-03-03 15:05:20 +08:00