From 46ce982cfc38db9221b1ed2ef2982483c78d740c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’> Date: Fri, 19 Apr 2024 16:59:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 6 +- src/api/report/qcReport.js | 10 +- src/views/OperationalOverview/coldBoard.vue | 6 +- .../components/pileBarChart.vue | 4 +- src/views/report/ingredientReport/day.vue | 504 +++++------------- .../report/qcReport/fullInspection/index.vue | 435 +++++++++++++++ 6 files changed, 586 insertions(+), 379 deletions(-) create mode 100644 src/views/report/qcReport/fullInspection/index.vue diff --git a/.env.dev b/.env.dev index 72036ff0..599cea9f 100644 --- a/.env.dev +++ b/.env.dev @@ -1,7 +1,7 @@ ### # @Author: zhp # @Date: 2024-04-12 14:30:48 - # @LastEditTime: 2024-04-12 14:31:16 + # @LastEditTime: 2024-04-19 16:11:56 # @LastEditors: zhp # @Description: ### @@ -12,8 +12,8 @@ ENV = 'development' VUE_APP_TITLE = MES系统 # 芋道管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.0.33:48082' - +# VUE_APP_BASE_API = 'http://192.168.0.33:48082' +VUE_APP_BASE_API = 'http://192.168.1.104:48082' # 积木报表指向地址 VUE_APP_JIMU_API = 'http://192.168.0.33:48082' diff --git a/src/api/report/qcReport.js b/src/api/report/qcReport.js index 65207331..63907fcb 100644 --- a/src/api/report/qcReport.js +++ b/src/api/report/qcReport.js @@ -1,7 +1,7 @@ /* * @Author: zhp * @Date: 2024-04-18 09:27:54 - * @LastEditTime: 2024-04-18 16:00:59 + * @LastEditTime: 2024-04-19 16:12:49 * @LastEditors: zhp * @Description: */ @@ -38,3 +38,11 @@ export function getAutoDailyData(data) { data: data }) } + +export function getQualityRecordReport(data) { + return request({ + url: 'base/quality-inspection-record/qualityRecordReport', + method: 'get', + data: data + }) +} diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue index b9fbc41f..6829ebae 100644 --- a/src/views/OperationalOverview/coldBoard.vue +++ b/src/views/OperationalOverview/coldBoard.vue @@ -1,7 +1,7 @@ @@ -625,8 +625,8 @@ export default { `${this.getSize(item.size) || ''}`, `${this.NumFormat(item.productArea) + '㎡' || ''}`, `${this.NumFormat(item.wasteArea) + '㎡' || ''}`, - `
${(item.product * 100).toFixed(0) + '%' || ''}
-
${(item.product * 100).toFixed(0) + '%' || ''}
` + `
${(item.product * 100).toFixed(0) + '%' || ''}
+
${(item.product * 100).toFixed(0) + '%' || ''}
` ]) this.cutConfig.data = cutArr // this.$nextTick(() => { diff --git a/src/views/OperationalOverview/components/pileBarChart.vue b/src/views/OperationalOverview/components/pileBarChart.vue index 80da4bb5..4c955012 100644 --- a/src/views/OperationalOverview/components/pileBarChart.vue +++ b/src/views/OperationalOverview/components/pileBarChart.vue @@ -1,7 +1,7 @@ @@ -170,7 +170,7 @@ export default { let singleData = series.filter(function (item) { return item.name == name }) - return name + parseFloat((singleData[0].data * 100).toFixed(0)) + '%' + return name + parseFloat((singleData[0].data * 100).toFixed(2)) + '%' }, itemWidth: 12, itemHeight: 12, diff --git a/src/views/report/ingredientReport/day.vue b/src/views/report/ingredientReport/day.vue index d0cb8d0b..7172ba60 100644 --- a/src/views/report/ingredientReport/day.vue +++ b/src/views/report/ingredientReport/day.vue @@ -1,7 +1,7 @@ @@ -24,14 +24,18 @@ --> - - + + + + - + + + + + + + +