diff --git a/src/utils/request.js b/src/utils/request.js
index f2d9afc..8252a2c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -15,7 +15,7 @@ const service = axios.create({
// axios中请求配置有baseURL选项,表示请求URL公共部分
baseURL: process.env.VUE_APP_BASE_API,
// 超时
- timeout: 30000,
+ timeout: 1000 * 60 * 5,
})
// request拦截器
diff --git a/src/views/qualityManagement/FQC/qualityStatistics.vue b/src/views/qualityManagement/FQC/qualityStatistics.vue
index 95dc956..34ae86e 100644
--- a/src/views/qualityManagement/FQC/qualityStatistics.vue
+++ b/src/views/qualityManagement/FQC/qualityStatistics.vue
@@ -79,7 +79,6 @@
打磨数:{{ totalDamoTotal }}
报废数:{{ totalBaofeiTotal }}
倒车雷达:{{ parkingSensor }}
-
@@ -348,7 +347,7 @@ export default {
// 统计数据
allDataList: [],
// 倒车雷达
- parkingSensor:0,
+ parkingSensor: 0,
// 自适应
screenWidth: '1920px',
screenHeight: '1080px',
@@ -375,31 +374,31 @@ export default {
computed: {
// 投入数
totalQuantity() {
- return (
+ return Math.trunc(
this.allDataList.reduce((acc, data) => {
if (!data.productDescription.includes('倒车雷达')) {
return acc + data.requireNumber
} else {
return acc
}
- }, 0) / 3
+ }, 0) / 3,
)
},
// 合格数
totalQualifiedNumber() {
- return (
+ return Math.trunc(
this.allDataList.reduce((acc, data) => {
if (!data.productDescription.includes('倒车雷达')) {
return acc + data.qualifiedNumber
} else {
return acc
}
- }, 0) / 3
+ }, 0) / 3,
)
},
// 抛光数
totalPaoguangTotal() {
- return (
+ return Math.trunc(
this.allDataList.reduce((acc, data) => {
let str = data.productDescription
if (!str.includes('倒车雷达')) {
@@ -407,12 +406,12 @@ export default {
} else {
return acc
}
- }, 0) / 3
+ }, 0) / 3,
)
},
// 打磨数
totalDamoTotal() {
- return (
+ return Math.trunc(
this.allDataList.reduce((acc, data) => {
let str = data.productDescription
if (!str.includes('倒车雷达')) {
@@ -420,12 +419,12 @@ export default {
} else {
return acc
}
- }, 0) / 3
+ }, 0) / 3,
)
},
// 报废数
totalBaofeiTotal() {
- return (
+ return Math.trunc(
this.allDataList.reduce((acc, data) => {
let str = data.productDescription
if (!str.includes('倒车雷达')) {
@@ -433,7 +432,7 @@ export default {
} else {
return acc
}
- }, 0) / 3
+ }, 0) / 3,
)
},
// 总合格率