判断检测项，调整请求

yaowanxin

3 天以前 093615ab71eebddeea28a74a6c21898fc929450f

判断检测项，调整请求

 src/utils/connect.js

@@ -4,24 +4,12 @@
    let reader = null;
    let accumulatedData = ""; // 移到全局，便于关闭时重置
    let weightList = []; // 用于存储重量值的列表

    async function sendWeightsToBackend(weights) {
      try {
        // 使用 await 等待 request 函数返回结果
        const response = await request({
          url: "/weight/handleWeights",
          method: "POST",
          data: weights, // 通常 request 函数使用 data 字段传递数据
        });
        // 根据 request 函数的实现判断响应是否成功
        if (response.code !== 200) { // 假设 response 有 code 字段，200 表示成功
          throw new Error(`Backend response error: ${response.message}`);
        }
        return response.data; // 假设响应数据在 data 字段中
      } catch (error) {
        console.error('发送重量数据到后端失败:', error);
        throw error;
      }
    export function sendWeightsToBackend(weights) {
      return request({
        url: "/weight/handleWeights",
        method: "POST",
        data: weights,
      });
    }

    async function connect() {
@@ -49,66 +37,66 @@
          console.error("串口错误:", error);
        }
    }
      function processAccumulatedData(data) {
    function processAccumulatedData(data) {

        if (data.includes("\n")) {
          const messages = data.split("\n");
      if (data.includes("\n")) {
        const messages = data.split("\n");

          for (let i = 0; i < messages.length - 1; i++) {
            const completeMessage = messages[i];
            console.log("完整消息:", completeMessage);
            // 提取数值
            const weightValue = extractWeightValue(completeMessage);
            if (!isNaN(weightValue)) {
              console.log("提取的重量值:", weightValue); 
              // 将有效重量值添加到列表
              weightList.push(weightValue);
        for (let i = 0; i < messages.length - 1; i++) {
          const completeMessage = messages[i];
          console.log("完整消息:", completeMessage);
          // 提取数值
          const weightValue = extractWeightValue(completeMessage);
          if (!isNaN(weightValue)) {
            console.log("提取的重量值:", weightValue); 
            // 将有效重量值添加到列表
            weightList.push(weightValue);

              // 当列表长度达到 6 时，发送数据到后端并清空列表
              if (weightList.length === 6) { 
                sendWeightsToBackend({
                  weights: weightList
                })
                .then(() => {
                  console.log('数据发送成功');
                  weightList = [];
                })
                .catch(() => {
                  console.log('发送失败，保留数据待重试');
                });
              }
            // 当列表长度达到 6 时，发送数据到后端并清空列表
            if (weightList.length === 6) { 
              sendWeightsToBackend({
                weights: weightList
              })
              .then(() => {
                console.log('数据发送成功');
                weightList = [];
              })
              .catch(() => {
                console.log('发送失败，保留数据待重试');
              });
            }
          }

          accumulatedData = messages[messages.length - 1];
        }

        // 其他消息拆分示例保持不变
        /*
        while (accumulatedData.length >= 32) {
          const message = accumulatedData.substring(0, 32);
          accumulatedData = accumulatedData.substring(32);
          handleMessage(message);
        }
        */

        /*
        let startIndex = 0;
        while (true) {
          const start = accumulatedData.indexOf(0xAA, startIndex);
          if (start === -1) break;
          
          const end = accumulatedData.indexOf(0x55, start + 1);
          if (end === -1) break;
          
          const message = accumulatedData.substring(start, end + 1);
          accumulatedData = accumulatedData.substring(end + 1);
          handleMessage(message);
          startIndex = start;
        }
        */
        accumulatedData = messages[messages.length - 1];
      }

      // 其他消息拆分示例保持不变
      /*
      while (accumulatedData.length >= 32) {
        const message = accumulatedData.substring(0, 32);
        accumulatedData = accumulatedData.substring(32);
        handleMessage(message);
      }
      */

      /*
      let startIndex = 0;
      while (true) {
        const start = accumulatedData.indexOf(0xAA, startIndex);
        if (start === -1) break;
        
        const end = accumulatedData.indexOf(0x55, start + 1);
        if (end === -1) break;
        
        const message = accumulatedData.substring(start, end + 1);
        accumulatedData = accumulatedData.substring(end + 1);
        handleMessage(message);
        startIndex = start;
      }
      */
    }
    
    // 新增提取重量数值的方法
    function extractWeightValue(message) {
      // 匹配数值部分，可处理正负号

 src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue

@@ -268,8 +268,8 @@
        { label: "db", value: ".db" },
        { label: "mdb", value: ".mdb" },
        { label: "word", value: ".docx" },
        { label: "excel", value: ".xlsx" },
        { label: "excel", value: ".xls" },
        { label: "excelxlsx", value: ".xlsx" },
        { label: "excelxls", value: ".xls" },
        { label: "txt", value: ".txt" },
        { label: "mysql", value: ".mysql" },
        { label: "mqtt", value: ".mqtt" },

 src/views/business/inspectionTask/inspection.vue

@@ -1152,17 +1152,24 @@
  getDataAcquisitionDevice() {
      (async () => {
        try {
          // 检查是否支持 Web Serial API
          if ('serial' in navigator) {
            // 请求可用串口
            const ports = await navigator.serial.getPorts();
            if (ports.length > 0) {
              await connect();
          // 检查页面中检测项是否包含密度
          const hasDensityItem = this.currentSample.insProduct.some(item => {
            // 假设密度相关的检测项名称包含 "密度" 关键字，可按需修改
            return item.inspectionItem && item.inspectionItem.includes('密度');
          });
          if (hasDensityItem) {
            // 检查是否支持 Web Serial API
            if ('serial' in navigator) {
              // 请求可用串口
              const ports = await navigator.serial.getPorts();
              if (ports.length > 0) {
                await connect();
              } else {
                console.log('没有可用的串口');
              }
            } else {
              console.log('没有可用的串口');
              console.log('当前浏览器不支持 Web Serial API');
            }
          } else {
            console.log('当前浏览器不支持 Web Serial API');
          }
        } catch (error) {
          console.error('检测串口时出错:', error);