From 3c03d44a3a3c1fec7d01815e0be51fdd8c92e990 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 10 六月 2025 09:53:36 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev' into dev_ztns
---
src/utils/request.js | 2 +-
src/views/business/materialOrder/customsInspectionView.vue | 13 ++++++-------
vue.config.js | 28 ++++++++++++++++++++++------
src/views/business/inspectionTask/inspection.vue | 4 ++--
src/views/business/materialOrder/customsInspectionOrder.vue | 13 ++++++-------
5 files changed, 37 insertions(+), 23 deletions(-)
diff --git a/src/utils/request.js b/src/utils/request.js
index e58925d..d04da70 100644
--- a/src/utils/request.js
+++ b/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(
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index 06fe550..3ac981d 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/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";
diff --git a/src/views/business/materialOrder/customsInspectionOrder.vue b/src/views/business/materialOrder/customsInspectionOrder.vue
index cfb2675..044ca47 100644
--- a/src/views/business/materialOrder/customsInspectionOrder.vue
+++ b/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 {
diff --git a/src/views/business/materialOrder/customsInspectionView.vue b/src/views/business/materialOrder/customsInspectionView.vue
index 33b7687..b95acfb 100644
--- a/src/views/business/materialOrder/customsInspectionView.vue
+++ b/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 {
diff --git a/vue.config.js b/vue.config.js
index a760992..b86dc03 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -61,17 +61,33 @@
},
module: {
rules: [
+ // JS 涓讳綋鏂囦欢澶勭悊锛堝惈 Babel銆乀hread 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瑙ｅ帇缂╅潤鎬佹枃浠�
--
Gitblit v1.9.3