优化

# Conflicts:
#	src/views/weightManage/index.vue

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",

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",

src/apis/material/materialInfo.ts

@@ -78,7 +78,12 @@ export function importMaterial(data: any) {
   return http.post(`${BASE_URL}/import`, data)
 }
 
-/** @desc 解析物料信息导入数据 */
+/** @desc 物料照片批量导入数据 */
 export function uploadMaterialPhotos(data: FormData) {
   return http.post(`${BASE_URL}/import/uploadMaterialPhotos`, data)
 }
+
+/** @desc 物料照片抓取数据 */
+export function catchPhoto(data: FormData) {
+  return http.post(`${BASE_URL}/import/catch`, data)
+}

src/apis/workOrder/workOrder.ts

@@ -5,6 +5,7 @@ const BASE_URL = '/weighManage/workOrder'
 export interface WorkOrderResp {
   id: string
   title: string
+  orderNo: string
   materialName: string
   encoding: string
   unitWeight: string
@@ -14,6 +15,7 @@ export interface WorkOrderResp {
   totalCount: string
   createUserString: string
   updateUserString: string
+  matchResult: string
 }
 
 export interface WorkOrderInfoResp {
@@ -49,6 +51,11 @@ export function getWorkOrder(id: string) {
   return http.get<Array<WorkOrderInfoResp>>(`${BASE_URL}/${id}`)
 }
 
+/** @desc 新增工作订单 */
+export function addWorkOrder(data: any) {
+  return http.post(`${BASE_URL}`, data)
+}
+
 /** @desc 删除工作订单 */
 export function deleteWorkOrder(ids: string | Array<string>) {
   return http.del(`${BASE_URL}/${ids}`)

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']
@@ -28,8 +26,6 @@ declare module 'vue' {
     AEmpty: typeof import('@arco-design/web-vue')['Empty']
     AForm: typeof import('@arco-design/web-vue')['Form']
     AFormItem: typeof import('@arco-design/web-vue')['FormItem']
-    AGrid: typeof import('@arco-design/web-vue')['Grid']
-    AGridItem: typeof import('@arco-design/web-vue')['GridItem']
     AIcon: typeof import('@arco-design/web-vue')['Icon']
     AImage: typeof import('@arco-design/web-vue')['Image']
     AInput: typeof import('@arco-design/web-vue')['Input']
@@ -37,41 +33,29 @@ 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']
     ARadioGroup: typeof import('@arco-design/web-vue')['RadioGroup']
-    ARangePicker: typeof import('@arco-design/web-vue')['RangePicker']
     ARow: typeof import('@arco-design/web-vue')['Row']
     AScrollbar: typeof import('@arco-design/web-vue')['Scrollbar']
     ASelect: typeof import('@arco-design/web-vue')['Select']
     ASpace: typeof import('@arco-design/web-vue')['Space']
-    AStatistic: typeof import('@arco-design/web-vue')['Statistic']
+    ASpin: typeof import('@arco-design/web-vue')['Spin']
     ASubMenu: typeof import('@arco-design/web-vue')['SubMenu']
     ASwitch: typeof import('@arco-design/web-vue')['Switch']
     ATable: typeof import('@arco-design/web-vue')['Table']
     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']
     Breadcrumb: typeof import('./../components/Breadcrumb/index.vue')['default']

src/views/material/index.vue

@@ -12,6 +12,7 @@
         :disabled-column-keys="['name']"
         @refresh="search"
     >
+      <!-- toolbar 部分保持不变 -->
       <template #toolbar-left>
         <a-input-search v-model="queryForm.materialName" placeholder="请输入物料名称" allow-clear @search="search" />
         <a-input-search v-model="queryForm.encoding" placeholder="请输入物料编码" allow-clear @search="search" />
@@ -38,18 +39,31 @@
           <template #default>照片批量导入</template>
         </a-button>
       </template>
+
+      <!-- 【修改点】照片列插槽 -->
       <template #photoUrl="{ record }">
         <div class="photo-container">
+          <!-- 1. 正常显示图片：有地址 且 未标记为错误 -->
           <img
-            v-if="record.photoUrl"
+              v-if="record.photoUrl && !record.photoLoadError"
               :src="record.photoUrl"
               alt="物料照片"
               class="material-photo"
-            @error="handleImgError($event)"
+              @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>
@@ -73,6 +87,7 @@
 </template>
 
 <script setup lang="ts">
+// ... 保持原有的 import 不变
 import MaterialInfoAddModal from './MaterialInfoAddModal.vue'
 import MaterialInfoImportDrawer from './MaterialInfoImportDrawer.vue'
 import PhotosImport from '@/views/material/PhotosImport.vue';
@@ -84,6 +99,12 @@ import has from '@/utils/has'
 
 defineOptions({ name: 'MaterialInfo' })
 
+// 扩展类型定义，允许动态添加 photoLoadError 属性
+// 如果 TS 报错，可以在 MaterialInfoResp 接口定义中添加 photoLoadError?: boolean;
+interface MaterialInfoRespWithStatus extends MaterialInfoResp {
+  photoLoadError?: boolean;
+}
+
 const queryForm = reactive<MaterialInfoQuery>({
   materialName: undefined,
   encoding: undefined,
@@ -97,6 +118,7 @@ const {
   search,
   handleDelete,
 } = useTable((page) => listMaterialInfo({ ...queryForm, ...page }), { immediate: true })
+
 const columns = ref<TableInstanceColumns[]>([
   { title: '物料名称', dataIndex: 'materialName', slotName: 'materialName' },
   { title: '物料编码', dataIndex: 'encoding', slotName: 'encoding' },
@@ -116,14 +138,12 @@ const columns = ref<TableInstanceColumns[]>([
   },
 ])
 
-// 重置
 const reset = () => {
   queryForm.materialName = undefined
   queryForm.encoding = undefined
   search()
 }
 
-// 删除
 const onDelete = (record: MaterialInfoResp) => {
   return handleDelete(() => deleteMaterialInfo(record.id), {
     content: `是否确定删除该条数据？`,
@@ -131,25 +151,26 @@ const onDelete = (record: MaterialInfoResp) => {
   })
 }
 
-// 导出
 const onExport = () => {
   useDownload(() => exportMaterialInfo(queryForm))
 }
 
-// 图片加载失败处理函数（新增）
+// 【修改点】图片加载处理逻辑
-const handleImgError = (e: Event) => {
+const handleImgLoad = (record: MaterialInfoRespWithStatus) => {
-  // 替换为你的默认图片地址（建议放在/static目录下）
+  record.photoLoadError = false
-  const target = e.target as HTMLImageElement
+}
-  target.src = '/static/images/default-material.png'
+
+const handleImgError = (record: MaterialInfoRespWithStatus, e: Event) => {
+  // 标记为加载错误，触发模板渲染 "照片异常"
+  record.photoLoadError = true
+  console.warn(`物料照片加载失败: ${record.photoUrl}`)
 }
 
 const MaterialInfoAddModalRef = ref<InstanceType<typeof MaterialInfoAddModal>>()
-// 新增
 const onAdd = () => {
   MaterialInfoAddModalRef.value?.onAdd()
 }
 
-// 修改
 const onUpdate = (record: MaterialInfoResp) => {
   MaterialInfoAddModalRef.value?.onUpdate(record.id)
 }
@@ -166,23 +187,43 @@ const onPhotosImport = () => {
 </script>
 
 <style scoped lang="scss">
-// 物料照片样式（新增）
 .photo-container {
   display: flex;
   align-items: center;
   justify-content: center;
   height: 80px;
+  width: 100%;
+  overflow: hidden;
 }
 
 .material-photo {
-  width: 80px;
+  width: 100%;
-  height: 80px;
+  height: 100%;
-  object-fit: cover; // 保持图片比例，避免拉伸
+  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>

src/views/system/barcodePrint/index.vue

@@ -0,0 +1,377 @@
+<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>

src/views/weightManage/index.vue

@@ -48,7 +48,7 @@
                   </a-form-item>
                 </div>
                 <div class="form-item">
-                  <a-form-item label="重量">
+                  <a-form-item label="重量(g)">
                     <a-input v-model="formData.unitWeight" placeholder="Kg" disabled />
                   </a-form-item>
                 </div>
@@ -58,8 +58,9 @@
                   <a-form-item label="物料编码">
                     <a-input
                       v-model="formData.inputMaterialCode" 
-                      placeholder="请使用扫码枪扫描物料编码"
+                      placeholder="请点击此处确保光标闪烁，并使用扫码枪扫描物料编码"
-                      @change="handleMaterialCodeChange"
+                      @keydown="handleKeyDown"
+                      @input="handleMaterialCodeChange"
                     />
                   </a-form-item>
                 </div>
@@ -87,7 +88,6 @@
                 </div>
               </div>
 
-
               <div class="info-card">
                 <h4>比对结果</h4>
                 <div class="info-item">
@@ -109,7 +109,7 @@
         </div>
       </div>
 
-      <!-- 称重登记页面 -->
+      <!-- 称重登记页面 - 这里放FLV播放器 -->
       <div v-else-if="activeStep === 2" class="step-content">
         <div class="weighing-content">
           <!-- 左侧输入区域 -->
@@ -128,17 +128,53 @@
             </div>
             <div class="form-row">
               <div class="form-item">
-                <label>计算重量:</label>
+                <label>计算重量(g):</label>
                 <a-input v-model="calculatedWeight" placeholder="-" disabled />
               </div>
             </div>
             <div class="form-row">
               <div class="form-item">
-                <label>对应重量:</label>
+                <label>对应重量(g):</label>
-                <a-input v-model="inputWeight" 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>
@@ -172,12 +208,12 @@
           <div class="completion-icon">
             <a-icon type="check-circle" :size="64" style="color: #52c41a;" />
           </div>
-          <h2>创建完成</h2>
+          <h2>{{ workOrderResp.matchResult === 'success' ? '创建成功' : '创建失败' }}</h2>
-          <p>任务已成功创建，以下是任务详情：</p>
+          <p>{{ workOrderResp.matchResult === 'success' ? '任务创建成功' : '任务创建失败' }}，以下是任务详情：</p>
           <div class="completion-info">
             <div class="info-item">
-              <span class="label">任务ID:</span>
+              <span class="label">任务工单号:</span>
-              <span class="value">{{ taskId }}</span>
+              <span class="value">{{ workOrderResp.orderNo }}</span>
             </div>
             <div class="info-item">
               <span class="label">物料名称:</span>
@@ -192,8 +228,12 @@
               <span class="value">{{ formData.materialSpec }}</span>
             </div>
             <div class="info-item">
-              <span class="label">重量:</span>
+              <span class="label">物料总个数:</span>
-              <span class="value">{{ formData.unitWeight }}</span>
+              <span class="value">{{ workOrderResp.totalCount }}</span>
+            </div>
+            <div class="info-item">
+              <span class="label">物料总重量(g):</span>
+              <span class="value">{{ workOrderResp.totalWeight }}</span>
             </div>
           </div>
           <div class="completion-actions">
@@ -226,9 +266,20 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, computed } from 'vue'
+import { nextTick, onBeforeUnmount, onMounted, ref, reactive, onUnmounted } from 'vue'
-import { Modal } from '@arco-design/web-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 { catchPhoto } from '@/apis/material/materialInfo'
+
+
+
+
+defineOptions({ name: 'WeightManage' })
+
+// 动态导入flv.js
+const flvjs = ref<any>(null)
 
 // 当前步骤
 const activeStep = ref(1)
@@ -236,38 +287,298 @@ const activeStep = ref(1)
 // 表单数据
 const formData = reactive({
   inputMaterialCode: '', // 输入的物料编码
+  id: '', // 物料ID
   encoding: '', // 物料编码
   materialName: '', // 物料名称
   materialSpec: '', // 物料规格
   unitWeight: 0, // 重量
   photoUrl: '', // 样图URL
-  matchResult: '' // 比对结果
+  matchResult: '', // 比对结果
 })
 
+// 摄像头状态
+const cameraStatus = ref<'connected' | 'connecting' | 'disconnected' | 'error'>('disconnected')
+
+// 视频元素引用
+const cameraVideo = ref<HTMLVideoElement | null>(null)
+
+// FLV播放器实例
+let player: any = null
+
+const reconnectCount = ref(0)
+const maxReconnectAttempts = 5
+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 = 0 // 连接成功，重置重连计数
+    }).catch((error: any) => {
+      cameraStatus.value = 'error'
+      Message.error('摄像头播放失败,正在重连')
+      // 触发自动重连
+      handleReconnect()
+    })
+
+    // 监听各种事件
+    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) {
+    Message.error('摄像头连接失败，请手动重试')
+    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 = 0 // 手动重连时重置计数
+  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 = 0 // 重置重连计数
+    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 = 0
+  }
+})
+
+// 组件卸载时清理所有定时器
+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 = 0
+}
+
+// 监听步骤变化
+watch(activeStep, (newVal) => {
+  if (newVal === 2) {
+    // 进入称重登记页面，启动摄像头
+    nextTick(() => {
+      initCamera()
+    })
+  } else {
+    // 离开称重登记页面，停止摄像头
+    stopCamera()
+  }
+})
+
+// 组件挂载时
+onMounted(async () => {
+  await loadFlvJs()
+})
+
+// 组件卸载时
+onBeforeUnmount(() => {
+  stopCamera()
+})
+
+const workOrderResp = ref<WorkOrderResp>({
+  id: '',
+  title: '',
+  orderNo: '',
+  materialName: '',
+  encoding: '',
+  unitWeight: '',
+  materialSpec: '',
+  photoUrl: '',
+  totalWeight: '',
+  totalCount: '',
+  createUserString: '',
+  updateUserString: '',
+  matchResult: 'failed'
+})
+
+
 // 称重登记页面数据
 const inputQuantity = ref('')
-const inputWeight = ref('')
+const ahDeviceWeight = ref('10')
 const calculatedWeight = ref('')
 const weighingCount = ref(1)
 
+// WebSocket连接
+const ws = ref<WebSocket | null>(null)
+const wsConnected = ref(false)
+
 // 称重列表数据
 const weighingList = ref([
   // 初始数据可以在这里添加
 ])
 
-// 任务ID
-const taskId = computed(() => {
-  const date = new Date().toISOString().slice(0, 10).replace(/-/g, '')
-  const random = Math.floor(1000 + Math.random() * 9000)
-  return `${date}${formData.encoding}${random}`
-})
-
 // 称重表格列
 const columns = [
   {
     title: '称重次数',
-    dataIndex: 'count',
+    dataIndex: 'weightTime',
-    key: 'count'
+    key: 'weightTime'
   },
   {
     title: '数量',
@@ -276,13 +587,13 @@ const columns = [
     className: 'green-bg'
   },
   {
-    title: '重量',
+    title: '重量(g)',
     dataIndex: 'weight',
     key: 'weight',
     className: 'green-bg'
   },
   {
-    title: '计算重量',
+    title: '计算重量(g)',
     dataIndex: 'calculatedWeight',
     key: 'calculatedWeight',
     className: 'green-bg'
@@ -291,7 +602,21 @@ const columns = [
     title: '抓拍图片',
     dataIndex: 'image',
     key: 'image',
-    className: 'green-bg'
+    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: '操作',
@@ -301,58 +626,134 @@ const columns = [
   }
 ]
 
+// 防抖函数
+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);
+    timer = setTimeout(() => {
+      func(...args);
+    }, delay);
+  };
+};
 
+// 原始的物料编码变化处理函数
+const originalHandleMaterialCodeChange = async () => {
+  // 确保输入框内容是完整的物料编码
+  const materialCode = formData.inputMaterialCode?.trim();
 
-// 处理物料编码变化
+  // 无论是否有输入，先重置所有物料相关字段，确保新数据能完全覆盖旧数据
-const handleMaterialCodeChange = async () => {
-  if (formData.inputMaterialCode) {
-    try {
-      await fetchMaterialData(formData.inputMaterialCode)
-    } catch (error) {
-      console.error('获取物料数据失败:', error)
-    }
-  } else {
   formData.encoding = "";
   formData.materialName = "";
   formData.materialSpec = "";
   formData.unitWeight = 0;
   formData.photoUrl = "";
   formData.matchResult = "";
+
+  // 如果有物料编码输入，获取物料数据
+  if (materialCode) {
+    try {
+      await fetchMaterialData(materialCode)
+    } catch (error) {
+      console.error('获取物料数据失败:', error)
+      // 即使获取失败，也保持字段为空，避免显示旧数据
+    }
   }
 };
 
-// 模拟调用后端接口
+// 记录上次输入时间，用于判断是否是扫码枪输入
+let lastInputTime = 0;
+// 记录输入内容，用于判断是否是新的扫码
+let previousInput = '';
+
+// 处理键盘按下事件
+const handleKeyDown = (event: KeyboardEvent) => {
+  // 获取当前时间
+  const currentTime = Date.now();
+
+  // 如果输入速度非常快（小于100ms），认为是扫码枪输入
+  if (currentTime - lastInputTime < 100 && formData.inputMaterialCode) {
+    // 扫码枪通常会以回车键结束，这里不做处理
+  } else if (event.key.length === 1 && !event.ctrlKey && !event.altKey) {
+    // 如果是新的输入（不是快速连续输入），清空输入框
+    // 这样可以确保每次扫码都从空输入框开始
+    formData.inputMaterialCode = '';
+  }
+
+  // 更新上次输入时间
+  lastInputTime = currentTime;
+};
+
+// 带防抖的物料编码变化处理函数
+const handleMaterialCodeChange = debounce(originalHandleMaterialCodeChange, 500); // 500ms防抖延迟
+
+// 扫码核验获取物料信息
 const fetchMaterialData = async (code: string) => {
   getMaterialDetail(code).then(res => {
     if (res.code == '0') {
       // 更新表单数据
-      formData.encoding = res.data.encoding
+      formData.id = res.data?.id || "";
-      formData.materialName = res.data.materialName
+      formData.encoding = res.data?.encoding || "";
-      formData.materialSpec = res.data.materialSpec
+      formData.materialName = res.data?.materialName || "";
-      formData.unitWeight = res.data.unitWeight
+      formData.materialSpec = res.data?.materialSpec || "";
-      formData.photoUrl = res.data.photoUrl
+      formData.unitWeight = res.data?.unitWeight || 0;
+      formData.photoUrl = res.data?.photoUrl || "";
       // 假设后端返回比对结果
       // formData.matchResult = res.data.matchResult || 'failed' // 这里根据实际接口返回调整
-      formData.matchResult = res.data.matchResult || 'success' // 这里根据实际接口返回调整
+      formData.matchResult = res.data?.matchResult || 'success' // 这里根据实际接口返回调整
       return true
     }
   });
 }
 
 // 处理下一步
-const handleNext = () => {
+const handleNext = async () => {
   if (activeStep.value < 3) {
     if (activeStep.value === 2) {
       // 当在称重登记页面点击完成时，显示确认弹框
       Modal.confirm({
         title: '确认完成',
         content: '确定要完成称重登记吗？',
-        onOk: () => {
+        onOk: async () => {
+          try {
+            // 准备工作订单数据
+            const workOrderData = {
+              materialId: formData.id,
+              materialName: formData.materialName,
+              workOrderInfos: weighingList.value
+            }
+            // 调用后端接口
+            addWorkOrder(workOrderData).then(res => {
+              if (res.code == '0') {
+                Notification.success({
+                  title: '操作成功',
+                  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 || "";
+
+                // 关闭WebSocket连接
+                closeWebSocket()
+                // 跳转到完成页面
                 activeStep.value++
+                return true
+              }
+            });
+          } catch (error) {
+            console.error('创建工作订单失败:', error)
+            Message.error('创建工作订单失败')
+          }
         }
       })
     } else {
       activeStep.value++
+      // 进入称重页面时建立WebSocket连接
+      if (activeStep.value === 2) {
+        establishWebSocket()
+      }
     }
   }
 }
@@ -361,12 +762,18 @@ const handleNext = () => {
 const handlePrevious = () => {
   if (activeStep.value > 1) {
     activeStep.value--
+    // 离开称重页面时关闭WebSocket连接
+    if (activeStep.value !== 2) {
+      closeWebSocket()
+    }
   }
 }
 
 // 返回第一步
 const handleBackToFirst = () => {
   activeStep.value = 1
+  // 离开称重页面时关闭WebSocket连接
+  closeWebSocket()
 }
 
 // 计算重量
@@ -375,7 +782,7 @@ const calculateWeight = () => {
     const singleWeight = parseFloat(formData.unitWeight.toString())
     const quantity = parseFloat(inputQuantity.value)
     if (!isNaN(singleWeight) && !isNaN(quantity)) {
-      calculatedWeight.value = (singleWeight * quantity).toFixed(2) + 'g'
+      calculatedWeight.value = (singleWeight * quantity).toFixed(2)
     }
   } else {
     calculatedWeight.value = ''
@@ -386,30 +793,99 @@ const calculateWeight = () => {
 
 // 处理确定
 const handleConfirm = () => {
+  // 校验输入数量是否为空
+  if (!inputQuantity.value || inputQuantity.value.trim() === '') {
+    Message.error('请输入数量')
+    return
+  }
+  if (!ahDeviceWeight.value || ahDeviceWeight.value.trim() === '') {
+    Message.error('电子秤称重结果为空！')
+    return
+  }
+
   // 生成新的列表数据
   const newItem = {
     key: (weighingList.value.length + 1).toString(),
-    count: weighingCount.value,
+    weightTime: weighingCount.value,
-    name: formData.materialName,
+    materialId: formData.id,
     quantity: inputQuantity.value,
-    unitWeight: inputWeight.value,
+    weight: ahDeviceWeight.value,
     calculatedWeight: calculatedWeight.value,
-    image: '图片'
+    image: captureUrl || '未抓拍',
   }
   // 添加到列表
   weighingList.value.push(newItem)
   // 重置输入
   inputQuantity.value = ''
-  inputWeight.value = ''
+  ahDeviceWeight.value = '10'
   calculatedWeight.value = ''
   // 称重次数累加
   weighingCount.value = weighingList.value.length + 1
+  Message.success('添加成功')
+}
+
+// 抓拍功能 - 内部方法，不暴露按钮
+const capturePhoto = async (): Promise<string> => {
+  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.code === '200') {
+        reject(new Error('上传失败'))
+        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',
+  })
 }
 
 // 处理重置
 const handleReset = () => {
   inputQuantity.value = ''
-  inputWeight.value = ''
+  ahDeviceWeight.value = ''
   calculatedWeight.value = ''
 }
 
@@ -419,13 +895,61 @@ const handleDelete = (key) => {
   weighingList.value = weighingList.value.filter(item => item.key !== key)
   // 重新排序称重次数
   weighingList.value.forEach((item, index) => {
-    item.count = index + 1
+    item.weightTime = index + 1
   })
   // 更新当前称重次数
   weighingCount.value = weighingList.value.length + 1
 }
 
-defineOptions({ name: 'WeightManage' })
+// 建立WebSocket连接
+const establishWebSocket = () => {
+  try {
+    // 这里替换为实际的WebSocket服务器地址
+    const wsUrl = 'ws://localhost:6609/ws/scale'
+    ws.value = new WebSocket(wsUrl)
+
+    ws.value.onopen = () => {
+      Message.success('已和电子秤建立连接')
+    }
+
+    ws.value.onmessage = (event) => {
+      try {
+        if (event.data) {
+          ahDeviceWeight.value = event.data
+        }
+      } catch (error) {
+        console.error('WebSocket消息解析失败:', error)
+      }
+    }
+
+    ws.value.onclose = () => {
+      wsConnected.value = false
+    }
+
+    ws.value.onerror = (error) => {
+      console.error('WebSocket错误:', error)
+      wsConnected.value = false
+      Message.error('称重连接失败')
+    }
+  } catch (error) {
+    console.error('建立WebSocket连接失败:', error)
+    Message.error('无法建立称重连接')
+  }
+}
+
+// 关闭WebSocket连接
+const closeWebSocket = () => {
+  if (ws.value) {
+    ws.value.close()
+    ws.value = null
+    wsConnected.value = false
+  }
+}
+
+// 组件卸载时关闭WebSocket连接
+onUnmounted(() => {
+  closeWebSocket()
+})
 </script>
 
 <style scoped lang="scss">
@@ -553,10 +1077,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;
+  height: 240px;
-  margin: 20px 0;
 }
 
 .input-placeholder {

src/views/workOrder/index.vue

@@ -18,7 +18,7 @@
       <template #toolbar-left>
         <a-input-search v-model="queryForm.userName" placeholder="请输入姓名" allow-clear @search="search" />
         <a-input-search v-model="queryForm.carNo" placeholder="请输入人员卡号" allow-clear @search="search" />
-	      <a-input-search v-model="queryForm.orderNo" placeholder="请输入订单号" allow-clear @search="search" />
+	      <a-input-search v-model="queryForm.orderNo" placeholder="请输入任务工单号" allow-clear @search="search" />
         <a-input-search v-model="queryForm.materialName" placeholder="请输入物料名称" allow-clear @search="search" />
         <a-input-search v-model="queryForm.encoding" placeholder="请输入物料编码" allow-clear @search="search" />
         <a-date-picker
@@ -67,6 +67,7 @@
       <template #action="{ record }">
         <a-space>
           <a-link v-permission="['workOrder:record:detail']" title="详情" @click="onDetail(record)">详情</a-link>
+          <a-link v-permission="['workOrder:record:print']" title="打印" @click="onPrint(record)">打印</a-link>
           <a-link v-permission="['workOrder:record:delete']" status="danger" :title="'删除'" @click="onDeleteOne(record.id)">删除</a-link>
         </a-space>
       </template>
@@ -113,6 +114,7 @@ import has from '@/utils/has'
 import type GiTable from "@/components/GiTable/index.vue";
 import {ref, reactive} from "vue";
 import {Message} from "@arco-design/web-vue";
+import { useRouter } from 'vue-router';
 import {
   deleteWorkOrder,
   exportWorkOrder, getWorkOrder,
@@ -123,6 +125,7 @@ import {
 
 defineOptions({ name: 'Record' })
 
+const router = useRouter()
 
 
 const queryForm = reactive<WorkOrderQuery>({
@@ -160,9 +163,10 @@ const processColumns = (columns: TableInstanceColumns[]): TableInstanceColumns[]
 
 // 定义列配置，使用工具函数处理
 const columns = ref<TableInstanceColumns[]>(processColumns([
-  { title: '创建人', dataIndex: 'createUserString' },
-  { title: '卡号', dataIndex: 'cardNo' },
   { title: '标题', dataIndex: 'title', width: 180 },
+  { title: '创建人', dataIndex: 'createUserString' },
+  { title: '人员卡号', dataIndex: 'cardNo' },
+  { title: '任务工单号', dataIndex: 'orderNo' },
   { title: '物料图片', dataIndex: 'photoUrl', slotName: 'photoUrl', minWidth: 180, ellipsis: true, tooltip: true },
   { title: '物料名称', dataIndex: 'materialName' },
   { title: '物料编码', dataIndex: 'encoding' },
@@ -248,6 +252,19 @@ const onExport = () => {
   useDownload(() => exportWorkOrder(queryForm))
 }
 
+// 打印
+const onPrint = (record: WorkOrderResp) => {
+  // 跳转到标签打印页面，并传递数据
+  router.push({
+    path: '/print',
+    query: {
+      materialName: record.materialName,
+      encoding: record.encoding,
+      orderNo: record.orderNo
+    }
+  })
+}
+
 </script>
 
 <style scoped lang="scss">