Merge branch 'refs/heads/dev' into dev_ztns

gaoluyang

4 天以前 3c03d44a3a3c1fec7d01815e0be51fdd8c92e990

Merge branch 'refs/heads/dev' into dev_ztns

 src/utils/request.js

@@ -52,7 +52,7 @@
            : config.data,
        time: new Date().getTime(),
      };
      const requestSize = Object.keys(JSON.stringify(requestObj)).length; // 请求数据大小
      const requestSize =  new TextEncoder().encode(JSON.stringify(requestObj)).byteLength; // 请求数据大小
      const limitSize = 5 * 1024 * 1024; // 限制存放数据5M
      if (requestSize >= limitSize) {
        console.warn(

 src/views/business/inspectionTask/inspection.vue

@@ -546,8 +546,8 @@
  delfile,
  inspectionOrderDetailsTaskSwitching
} from "@/api/business/inspectionTask.js";
import InspectionWorker from '@/workers/InspectionWorker.worker';
import DataWorker from '../../../workers/DataWorker.worker';
import InspectionWorker from '@/workers/InspectionWorker.worker.js';
import DataWorker from '@/workers/DataWorker.worker.js';
import html2canvas from "html2canvas";
import { mapGetters } from "vuex";
import viewManHourDia from "@/views/business/inspectionTask/components/viewManHourDia.vue";

 src/views/business/materialOrder/customsInspectionOrder.vue

@@ -778,9 +778,8 @@
            if (this.orderType == 1) {
              this.$set(this.addObj, 'orderType', 'Quarterly inspection')
            }
            const str = res.data.treeName.split('-')
            this.selectTreeTem = str.join(' - ')
            this.selectTree = str.join(' - ')
            this.selectTreeTem = res.data.treeName
            this.selectTree = res.data.treeName
            this.addListInfo(this.codeLevel, res.data) // 原材料样品是固定的，就默认赋值一条数据，可拆分
            this.selectInsOrderTemplate() // 原材料模板列表查询
          } else {
@@ -1456,10 +1455,10 @@
      }).then(res => {
        this.methodLoad = false
        try {
          if (res.data.standardMethodList.length == 0 && this.selectTree.split('-').length == 5) {
            let arr = this.selectTree.split('-')
          if (res.data.standardMethodList.length == 0 && this.selectTree.split(' - ').length == 5) {
            let arr = this.selectTree.split(' - ')
            let arr0 = arr.slice(0, arr.length - 1)
            let selectTree = arr0.join('-').substring(0, arr0.join('-').length - 1)
            let selectTree = arr0.join(' - ').substring(0, arr0.join(' - ').length - 1)
            selectsStandardMethodByFLSSM({
              tree: selectTree
            }).then(ress => {
@@ -1651,7 +1650,7 @@
        })
      }
      this.productList = []
      let num = this.selectTreeTem.split('-').length;
      let num = this.selectTreeTem.split(' - ').length;
      if (num != 5) {
        this.selectTree = this.selectTreeTem + ' - ' + e
      } else {

 src/views/business/materialOrder/customsInspectionView.vue

@@ -774,9 +774,8 @@
            if (this.orderType == 1) {
              this.$set(this.addObj, 'orderType', 'Quarterly inspection')
            }
            const str = res.data.treeName.split('-')
            this.selectTreeTem = str.join(' - ')
            this.selectTree = str.join(' - ')
            this.selectTreeTem = res.data.treeName
            this.selectTree = res.data.treeName
            this.addListInfo(this.codeLevel, res.data) // 原材料样品是固定的，就默认赋值一条数据，可拆分
            this.selectInsOrderTemplate() // 原材料模板列表查询
          } else {
@@ -1452,10 +1451,10 @@
      }).then(res => {
        this.methodLoad = false
        try {
          if (res.data.standardMethodList.length == 0 && this.selectTree.split('-').length == 5) {
            let arr = this.selectTree.split('-')
          if (res.data.standardMethodList.length == 0 && this.selectTree.split(' - ').length == 5) {
            let arr = this.selectTree.split(' - ')
            let arr0 = arr.slice(0, arr.length - 1)
            let selectTree = arr0.join('-').substring(0, arr0.join('-').length - 1)
            let selectTree = arr0.join(' - ').substring(0, arr0.join(' - ').length - 1)
            selectsStandardMethodByFLSSM({
              tree: selectTree
            }).then(ress => {
@@ -1647,7 +1646,7 @@
        })
      }
      this.productList = []
      let num = this.selectTreeTem.split('-').length;
      let num = this.selectTreeTem.split(' - ').length;
      if (num != 5) {
        this.selectTree = this.selectTreeTem + ' - ' + e
      } else {

 vue.config.js

@@ -61,17 +61,33 @@
    },
    module: {
      rules: [
        // JS 主体文件处理（含 Babel、Thread Loader）
        {
          test: /\.js$/,
          use: [
            {
              loader: 'thread-loader',
              options: { workers: 4 }
            },
            'babel-loader'
          ],
          exclude: /\.worker\.js$/, // 👈 排除 worker 文件
          include: path.resolve(__dirname, 'src')
        },

        // 单独处理 Worker 文件
        {
          test: /\.worker\.js$/,
          use: {
            loader: "worker-loader",
            loader: 'worker-loader',
            options: {
              filename: "[name].[contenthash].worker.js", // 添加内容哈希到文件名
              inline: "fallback",
            },
              filename: '[name].[contenthash].worker.js',
              inline: 'fallback'
            }
          },
        },
      ],
          type: 'javascript/auto' // 👈 强制 Webpack 不要按模块解析
        }
      ]
    },
    plugins: [
      // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件