spring
2025-04-21 86d4b4787748a83e76d048cd6a0b5583a2cd0651
修改多线程导致数采不成功的问题
已修改3个文件
193 ■■■■ 文件已修改
src/views/business/inspectionTask/inspection.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/workers/DataWorker.worker.js 131 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
vue.config.js 59 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/inspectionTask/inspection.vue
@@ -289,7 +289,7 @@
                      state == 1
                    "><span :style="`font-family:${n.v.ff} !important;`">{{
                      toFixed(n.v.v, n.v.ct)
                        }}</span></template>
                    }}</span></template>
                    <template v-else-if="
                      n.v.ps != undefined &&
                      n.v.ps.value === '最终值' &&
@@ -1471,6 +1471,7 @@
    },
    // 多线程
    startWorker() {
      console.log(`Worker 线程开始运行...`, this.worker, this.worker0)
      if (this.worker) {
        this.stopWorker(); // 确保之前的 Worker 已停止
      }
src/workers/DataWorker.worker.js
@@ -45,7 +45,7 @@
          if (num == 1) {
            str = str + m.v.v + ",";
            num++;
          } else {
          } else if (num == 0) {
            str = m.v.v + ",";
            num++;
          }
@@ -74,6 +74,11 @@
              n.v.ps.value.includes("检验值")
            ) {
              let arr = n.v.ps.value.split("值");
              // console.log(
              //   `dataAcquisitionInfo[str].value`,
              //   dataAcquisitionInfo[str].value,
              //   str
              // );
              if (Array.isArray(dataAcquisitionInfo[str].value)) {
                // 如果数据源为数组,则执行
                for (
@@ -84,37 +89,34 @@
                  if (i + 1 == arr[1]) {
                    // 赋值数采优化检验项列表
                    arrSpecial.push(n.i);
                    setTimeout(() => {
                      let num0 = 0;
                      if (
                        n.v.ct &&
                        n.v.ct.fa &&
                        typeof n.v.ct.fa == "string" &&
                        n.v.ct.fa.includes(".")
                      ) {
                        // 保留模板配置的小数点位数
                        let str0 = n.v.ct.fa.split(".")[1];
                        num0 = str0.length;
                        n.v.v = dataAcquisitionInfo[str].value[i]
                          ? Number(dataAcquisitionInfo[str].value[i]).toFixed(
                              num0
                            )
                          : dataAcquisitionInfo[str].value[i];
                      } else {
                        // 直接赋值
                        console.log(44444, dataAcquisitionInfo, str);
                        n.v.v = dataAcquisitionInfo[str].value[i];
                      }
                      // 传递给主线程
                      result = {
                        method: "changeInput",
                        value: {
                          list: list,
                          n: n,
                        },
                      };
                      self.postMessage(JSON.stringify(result));
                    }, 2000);
                    let num0 = 0;
                    if (
                      n.v.ct &&
                      n.v.ct.fa &&
                      typeof n.v.ct.fa == "string" &&
                      n.v.ct.fa.includes(".")
                    ) {
                      // 保留模板配置的小数点位数
                      let str0 = n.v.ct.fa.split(".")[1];
                      num0 = str0.length;
                      n.v.v = dataAcquisitionInfo[str].value[i]
                        ? Number(dataAcquisitionInfo[str].value[i]).toFixed(
                            num0
                          )
                        : dataAcquisitionInfo[str].value[i];
                    } else {
                      // 直接赋值
                      n.v.v = dataAcquisitionInfo[str].value[i];
                    }
                    // 传递给主线程
                    result = {
                      method: "changeInput",
                      value: {
                        list: list,
                        n: n,
                      },
                    };
                    self.postMessage(JSON.stringify(result));
                  }
                }
              } else {
@@ -122,7 +124,36 @@
                if (arr[1] == dataAcquisitionInfo[str].frequency) {
                  // 如果数采次数等于检验值序号,则赋值给当前检验值
                  arrSpecial.push(n.i);
                  setTimeout(() => {
                  let num0 = 0;
                  if (
                    n.v.ct &&
                    n.v.ct.fa &&
                    typeof n.v.ct.fa == "string" &&
                    n.v.ct.fa.includes(".")
                  ) {
                    // 保留模板配置的小数点位数
                    let str0 = n.v.ct.fa.split(".")[1];
                    num0 = str0.length;
                    n.v.v = dataAcquisitionInfo[str].value
                      ? Number(dataAcquisitionInfo[str].value).toFixed(num0)
                      : dataAcquisitionInfo[str].value;
                  } else {
                    // 直接赋值
                    n.v.v = dataAcquisitionInfo[str].value;
                  }
                  // 传递给主线程
                  result = {
                    method: "changeInput",
                    value: {
                      list: list,
                      n: n,
                    },
                  };
                  self.postMessage(JSON.stringify(result));
                } else if (Number(dataAcquisitionInfo[str].frequency) > num) {
                  // 如果数采次数大于检验值序号,则赋值给最后一个检验值
                  if (n.v.ps.value.includes(num)) {
                    arrSpecial.push(n.i);
                    let num0 = 0;
                    if (
                      n.v.ct &&
@@ -138,6 +169,7 @@
                        : dataAcquisitionInfo[str].value;
                    } else {
                      // 直接赋值
                      console.log(555, dataAcquisitionInfo, str);
                      n.v.v = dataAcquisitionInfo[str].value;
                    }
                    // 传递给主线程
@@ -149,39 +181,6 @@
                      },
                    };
                    self.postMessage(JSON.stringify(result));
                  }, 2000);
                } else if (Number(dataAcquisitionInfo[str].frequency) > num) {
                  // 如果数采次数大于检验值序号,则赋值给最后一个检验值
                  if (n.v.ps.value.includes(num)) {
                    arrSpecial.push(n.i);
                    setTimeout(() => {
                      let num0 = 0;
                      if (
                        n.v.ct &&
                        n.v.ct.fa &&
                        typeof n.v.ct.fa == "string" &&
                        n.v.ct.fa.includes(".")
                      ) {
                        // 保留模板配置的小数点位数
                        let str0 = n.v.ct.fa.split(".")[1];
                        num0 = str0.length;
                        n.v.v = dataAcquisitionInfo[str].value
                          ? Number(dataAcquisitionInfo[str].value).toFixed(num0)
                          : dataAcquisitionInfo[str].value;
                      } else {
                        // 直接赋值
                        n.v.v = dataAcquisitionInfo[str].value;
                      }
                      // 传递给主线程
                      result = {
                        method: "changeInput",
                        value: {
                          list: list,
                          n: n,
                        },
                      };
                      self.postMessage(JSON.stringify(result));
                    }, 2000);
                  }
                }
              }
vue.config.js
@@ -1,5 +1,6 @@
"use strict";
const path = require("path");
const { version } = Math.floor(1); // 引入项目版本号
function resolve(dir) {
  return path.join(__dirname, dir);
@@ -11,33 +12,21 @@
const port = process.env.port || process.env.npm_config_port || 80; // 端口
// vue.config.js 配置说明
//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
// 这里只列一部分,具体配置参考文档
module.exports = {
  // 部署生产环境和开发环境下的URL。
  // 默认情况下,Vue CLI 会假设你的应用是被部署在一个域名的根路径上
  // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 baseUrl 为 /admin/。
  publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
  // 在npm run build 或 yarn build 时 ,生成文件的目录名称(要和baseUrl的生产环境路径一致)(默认dist)
  outputDir: "dist",
  // 用于放置生成的静态资源 (js、css、img、fonts) 的;(项目打包之后,静态资源会放在这个文件夹下)
  assetsDir: "static",
  // 是否开启eslint保存检测,有效值:ture | false | 'error'
  lintOnSave: process.env.NODE_ENV === "development",
  // 如果你不需要生产环境的 source map,可以将其设置为 false 以加速生产环境构建。
  productionSourceMap: false,
  transpileDependencies: ["quill"],
  // webpack-dev-server 相关配置
  devServer: {
    host: "0.0.0.0",
    port: port,
    open: true,
    proxy: {
      // detail: https://cli.vuejs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
        // target: `http://10.21.10.124:8001`, //本地
        target: `http://192.168.18.50:7002`, //测试库
        target: `http://10.21.10.67:8088`, //本地
        // target: `http://192.168.18.50:7002`, //测试库
        changeOrigin: true,
        pathRewrite: {
          ["^" + process.env.VUE_APP_BASE_API]: "",
@@ -45,6 +34,11 @@
      },
    },
    disableHostCheck: true,
    headers: {
      "Cache-Control": "no-cache, no-store, must-revalidate",
      Pragma: "no-cache",
      Expires: 0,
    },
  },
  css: {
    loaderOptions: {
@@ -55,6 +49,10 @@
  },
  configureWebpack: {
    name: name,
    cache: false,
    output: {
      hashDigestLength: 8, // 调整哈希长度
    },
    resolve: {
      alias: {
        "@": resolve("src"),
@@ -68,29 +66,27 @@
            loader: "worker-loader",
            options: {
              inline: "fallback",
              filename: "[name].[contenthash].worker.js", // 添加内容哈希到文件名
              filename: `[name].[contenthash:8].worker.js?v=${version}`, // 添加版本号作为查询参数
            },
          },
        },
      ],
    },
    plugins: [
      // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
      new CompressionPlugin({
        cache: false, // 不启用文件缓存
        test: /\.(js|css|html|jpe?g|png|gif|svg)?$/i, // 压缩文件格式
        filename: "[path][base].gz[query]", // 压缩后的文件名
        algorithm: "gzip", // 使用gzip压缩
        minRatio: 0.8, // 压缩比例,小于 80% 的文件不会被压缩
        deleteOriginalAssets: false, // 压缩后删除原文件
        cache: false,
        test: /\.(js|css|html|jpe?g|png|gif|svg)?$/i,
        filename: "[path][base].gz[query]",
        algorithm: "gzip",
        minRatio: 0.8,
        deleteOriginalAssets: false,
      }),
    ],
  },
  chainWebpack(config) {
    config.plugins.delete("preload"); // TODO: need test
    config.plugins.delete("prefetch"); // TODO: need test
    config.plugins.delete("preload");
    config.plugins.delete("prefetch");
    // set svg-sprite-loader
    config.module.rule("svg").exclude.add(resolve("src/assets/icons")).end();
    config.module
      .rule("icons")
@@ -110,7 +106,6 @@
        .after("html")
        .use("script-ext-html-webpack-plugin", [
          {
            // `runtime` must same as runtimeChunk name. default is `runtime`
            inline: /runtime\..*\.js$/,
          },
        ])
@@ -123,17 +118,17 @@
            name: "chunk-libs",
            test: /[\\/]node_modules[\\/]/,
            priority: 10,
            chunks: "initial", // only package third parties that are initially dependent
            chunks: "initial",
          },
          elementUI: {
            name: "chunk-elementUI", // split elementUI into a single package
            test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm
            priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
            name: "chunk-elementUI",
            test: /[\\/]node_modules[\\/]_?element-ui(.*)/,
            priority: 20,
          },
          commons: {
            name: "chunk-commons",
            test: resolve("src/components"), // can customize your rules
            minChunks: 3, //  minimum common number
            test: resolve("src/components"),
            minChunks: 3,
            priority: 5,
            reuseExistingChunk: true,
          },