优化

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`)
 }

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 新增工作订单 */

src/types/components.d.ts

@@ -26,6 +26,8 @@ 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']
@@ -39,15 +41,19 @@ declare module 'vue' {
     AMenu: typeof import('@arco-design/web-vue')['Menu']
     AMenuItem: typeof import('@arco-design/web-vue')['MenuItem']
     AModal: typeof import('@arco-design/web-vue')['Modal']
+    AOverflowList: typeof import('@arco-design/web-vue')['OverflowList']
     APagination: typeof import('@arco-design/web-vue')['Pagination']
     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']
     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']
     ATable: typeof import('@arco-design/web-vue')['Table']
@@ -56,6 +62,8 @@ declare module 'vue' {
     ATag: typeof import('@arco-design/web-vue')['Tag']
     ATooltip: typeof import('@arco-design/web-vue')['Tooltip']
     ATreeSelect: typeof import('@arco-design/web-vue')['TreeSelect']
+    ATypographyParagraph: typeof import('@arco-design/web-vue')['TypographyParagraph']
+    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/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>

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>
 

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>

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: '参数键值',

src/views/weightManage/index.vue

@@ -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">
@@ -92,15 +98,16 @@
                 <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>
@@ -135,7 +142,7 @@
             <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>
 
@@ -246,19 +253,18 @@
       <div class="action-buttons">
         <a-button
             v-if="activeStep > 1 && activeStep < 3"
-          @click="handlePrevious"
             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"
+            @click="handleNext"
         >
-          {{ activeStep === 2 ? '完成' : '下一步' }}
+          {{ activeStep === 2 ? '完成' : (compareMatchResult === 'success' ? '下一步' : '开始比对') }}
         </a-button>
       </div>
     </div>
@@ -266,16 +272,12 @@
 </template>
 
 <script setup lang="ts">
-import { nextTick, onBeforeUnmount, onMounted, 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
@@ -293,9 +295,28 @@ 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')
 
@@ -305,8 +326,8 @@ const cameraVideo = ref<HTMLVideoElement | null>(null)
 // FLV播放器实例
 let player: any = null
 
-const reconnectCount = ref(0)
-const maxReconnectAttempts = 5
+const reconnectCount = ref(1)
+const maxReconnectAttempts = 3
 const reconnectTimer = ref<any>(null)
 
 // 直接写死FLV流地址（根据你的实际地址修改）
@@ -368,12 +389,13 @@ const initCamera = () => {
     player.load()
     player.play().then(() => {
       cameraStatus.value = 'connected'
-      reconnectCount.value = 0 // 连接成功，重置重连计数
+      reconnectCount.value = 1 // 连接成功，重置重连计数
     }).catch((error: any) => {
       cameraStatus.value = 'error'
       Message.error('摄像头播放失败,正在重连')
       // 触发自动重连
       handleReconnect()
+      return
     })
 
     // 监听各种事件
@@ -405,7 +427,6 @@ const handleReconnect = () => {
 
   // 检查重连次数
   if (reconnectCount.value >= maxReconnectAttempts) {
-    Message.error('摄像头连接失败，请手动重试')
     return
   }
 
@@ -428,7 +449,7 @@ const handleReconnect = () => {
 
 // 重新连接摄像头（手动）
 const reconnectCamera = () => {
-  reconnectCount.value = 0 // 手动重连时重置计数
+  reconnectCount.value = 1 // 手动重连时重置计数
   initCamera()
 }
 
@@ -455,7 +476,7 @@ let statusCheckTimer: any = null
 watch(activeStep, (newVal) => {
   if (newVal === 2) {
     // 进入称重登记页面，启动摄像头
-    reconnectCount.value = 0 // 重置重连计数
+    reconnectCount.value = 1 // 重置重连计数
     nextTick(() => {
       initCamera()
     })
@@ -473,7 +494,7 @@ watch(activeStep, (newVal) => {
       clearTimeout(reconnectTimer.value)
       reconnectTimer.value = null
     }
-    reconnectCount.value = 0
+    reconnectCount.value = 1
   }
 })
 
@@ -515,9 +536,10 @@ const stopCamera = () => {
     clearTimeout(reconnectTimer.value)
     reconnectTimer.value = null
   }
-  reconnectCount.value = 0
+  reconnectCount.value = 1
 }
 
+
 // 监听步骤变化
 watch(activeStep, (newVal) => {
   if (newVal === 2) {
@@ -526,7 +548,7 @@ watch(activeStep, (newVal) => {
       initCamera()
     })
   } else {
-    // 离开称重登记页面，停止摄像头
+    // 离开相关页面，停止摄像头
     stopCamera()
   }
 })
@@ -534,6 +556,7 @@ watch(activeStep, (newVal) => {
 // 组件挂载时
 onMounted(async () => {
   await loadFlvJs()
+  pollingInterval = setInterval(getImg, 1000)
 })
 
 // 组件卸载时
@@ -554,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)
 
@@ -578,25 +603,25 @@ 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: '抓拍图片',
@@ -622,33 +647,33 @@ const columns = [
     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) {
@@ -659,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) {
@@ -677,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
     }
-  });
+  })
 }
 
 // 处理下一步
@@ -720,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()
@@ -741,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连接
@@ -758,6 +809,8 @@ const handleNext = async () => {
   }
 }
 
+
+
 // 处理上一步
 const handlePrevious = () => {
   if (activeStep.value > 1) {
@@ -771,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()
 }
@@ -779,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)
     }
@@ -790,8 +867,7 @@ const calculateWeight = () => {
 }
 
 
-
-// 处理确定
+//处理确定
 const handleConfirm = () => {
   // 校验输入数量是否为空
   if (!inputQuantity.value || inputQuantity.value.trim() === '') {
@@ -803,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,
@@ -811,21 +899,47 @@ const handleConfirm = () => {
     quantity: inputQuantity.value,
     weight: ahDeviceWeight.value,
     calculatedWeight: calculatedWeight.value,
-    image: captureUrl || '未抓拍',
+    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 = async (): Promise<string> => {
+const capturePhoto = (): Promise<string> => {
+  // eslint-disable-next-line no-async-promise-executor
   return new Promise(async (resolve, reject) => {
     try {
       const video = cameraVideo.value
@@ -852,8 +966,7 @@ const capturePhoto = async (): Promise<string> => {
 
       // 调用后端接口
       const response = await catchPhoto(formData)
-      if (!response.code === '200') {
-        reject(new Error('上传失败'))
+      if (response.msg !== 'ok') {
         return
       }
 
@@ -892,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
@@ -949,6 +1062,9 @@ const closeWebSocket = () => {
 // 组件卸载时关闭WebSocket连接
 onUnmounted(() => {
   closeWebSocket()
+  if (pollingInterval) {
+    clearInterval(pollingInterval)
+  }
 })
 </script>
 

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,
     }
   })
 }