From c34b4a4c64ff9f24bceef1db4b4080db1529a18b Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Wed, 22 Nov 2023 10:34:38 +0800 Subject: [PATCH 1/6] =?UTF-8?q?update=20-=20=E8=B4=A7=E9=81=93=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/inventoryStatistics/index.vue | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/views/report/inventoryStatistics/index.vue b/src/views/report/inventoryStatistics/index.vue index a0e1183..490f875 100644 --- a/src/views/report/inventoryStatistics/index.vue +++ b/src/views/report/inventoryStatistics/index.vue @@ -46,7 +46,7 @@
-
货道占用统计
+
货道占用统计(货道容量:{{this.spaceNumber}} 已占用容量:{{this.occupancyNumber}})
@@ -116,7 +116,9 @@ export default { xValue: ['货道01', '货道02', '货道03', '货道04', '货道05', '货道06', '货道07'], yValueOne: [120, 132, 101, 134, 90, 230, 210], yValueTwo: [150, 232, 201, 154, 190, 330, 410] - } + }, + spaceNumber: 0, + occupancyNumber: 0, } }, created() { @@ -130,6 +132,8 @@ export default { }, mounted() { this.$nextTick(() => { + this.barChart = echarts.init(this.$refs.barChart); + this.pieChart = echarts.init(this.$refs.pieChart); this.initPieChart(); this.initBarChart(); }); @@ -151,13 +155,15 @@ export default { this.barChartData = { xValue: response.data.map(item => item.storeName + item.spaceName), yValueOne: response.data.map(item => item.spaceStock), - yValueTwo: response.data.map(item => item.spaceCapacity), + yValueTwo: response.data.map(item => item.spaceCapacity - item.spaceStock), }; + this.spaceNumber = response.data.map(item => item.spaceCapacity).reduce((accumulator, currentValue) => accumulator + currentValue); + this.occupancyNumber = response.data.map(item => item.spaceStock).reduce((accumulator, currentValue) => accumulator + currentValue); + console.log(this.spaceNumber) this.initBarChart(); }); }, initPieChart() { - this.pieChart = echarts.init(this.$refs.pieChart); // 在这里添加饼图的数据和配置 const option = { tooltip: { @@ -192,7 +198,6 @@ export default { this.pieChart.setOption(option); }, initBarChart() { - this.barChart = echarts.init(this.$refs.barChart); // 在这里添加柱状图的数据和配置 const option = { tooltip: { @@ -230,13 +235,13 @@ export default { data: this.barChartData.yValueOne }, { - name: '货道容量', + name: '货道空余容量', type: 'bar', stack: 'Ad', emphasis: { focus: 'series' }, - data: this.barChartData.yValueTwo + data: this.barChartData.yValueTwo, }, ] }; From 02d473a620dba8b69e6da626758e22960aafecdf Mon Sep 17 00:00:00 2001 From: yinq Date: Fri, 24 Nov 2023 09:52:47 +0800 Subject: [PATCH 2/6] =?UTF-8?q?update=20-=20add=E7=94=9F=E4=BA=A7=E6=97=A5?= =?UTF-8?q?=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/production/calendarInfo.js | 53 ++ src/views/production/calendarInfo/index.vue | 522 ++++++++++++++++++++ 2 files changed, 575 insertions(+) create mode 100644 src/api/production/calendarInfo.js create mode 100644 src/views/production/calendarInfo/index.vue diff --git a/src/api/production/calendarInfo.js b/src/api/production/calendarInfo.js new file mode 100644 index 0000000..abbce29 --- /dev/null +++ b/src/api/production/calendarInfo.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询生产日历列表 +export function listCalendarInfo(query) { + return request({ + url: '/production/calendarInfo/list', + method: 'get', + params: query + }) +} + +// 查询生产日历详细 +export function getCalendarInfo(objId) { + return request({ + url: '/production/calendarInfo/' + objId, + method: 'get' + }) +} + +// 新增生产日历 +export function addCalendarInfo(data) { + return request({ + url: '/production/calendarInfo', + method: 'post', + data: data + }) +} + +// 新增SAP生产日历 +export function addSAPCalendar(data) { + return request({ + url: '/production/calendarInfo/addSAPCalendar', + method: 'post', + data: data + }) +} + +// 修改生产日历 +export function updateCalendarInfo(data) { + return request({ + url: '/production/calendarInfo', + method: 'put', + data: data + }) +} + +// 删除生产日历 +export function delCalendarInfo(objId) { + return request({ + url: '/production/calendarInfo/' + objId, + method: 'delete' + }) +} diff --git a/src/views/production/calendarInfo/index.vue b/src/views/production/calendarInfo/index.vue new file mode 100644 index 0000000..0919dcb --- /dev/null +++ b/src/views/production/calendarInfo/index.vue @@ -0,0 +1,522 @@ + + + From 2dad118699cc6980d82651cff80791d2eee9e1e0 Mon Sep 17 00:00:00 2001 From: yinq Date: Mon, 27 Nov 2023 18:18:12 +0800 Subject: [PATCH 3/6] =?UTF-8?q?update=20-=20add=E8=B4=A8=E6=A3=80=E5=B7=A5?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/base/processStation/index.vue | 30 +- src/views/base/productLine/index.vue | 4 +- src/views/base/productStation/index.vue | 3 +- src/views/base/qualityProcess/index.vue | 413 +++++++++++++++++++ src/views/base/teamMembers/index.vue | 10 +- src/views/report/qualityInspection/index.vue | 14 +- 6 files changed, 445 insertions(+), 29 deletions(-) create mode 100644 src/views/base/qualityProcess/index.vue diff --git a/src/views/base/processStation/index.vue b/src/views/base/processStation/index.vue index 8bf89d3..cf22f10 100644 --- a/src/views/base/processStation/index.vue +++ b/src/views/base/processStation/index.vue @@ -2,7 +2,7 @@
- + - - - - - - + + + + + + + + - - + + @@ -124,7 +126,7 @@ type="text" icon="el-icon-s-grid" @click="findStation(scope.row)" - >所属工位 + >下级工位 - - + + 所属工位 + >下级工位 @@ -308,7 +308,7 @@ export default { }); }, - /** 查看所属工位 */ + /** 查看下级工位 */ findStation: function(row) { const productLineCode = row.productLineCode; this.$router.push("/base/product-station/index/" + productLineCode); diff --git a/src/views/base/productStation/index.vue b/src/views/base/productStation/index.vue index 4f43788..293e9f3 100644 --- a/src/views/base/productStation/index.vue +++ b/src/views/base/productStation/index.vue @@ -276,7 +276,8 @@ export default { }; }, created() { - if (!this.$route.params){ + console.log(this.$route.params) + if (this.$route.params != null){ this.queryParams.parentId = this.$route.params && this.$route.params.productLineCode; this.queryParams.processCode = this.$route.params && this.$route.params.processCode; } diff --git a/src/views/base/qualityProcess/index.vue b/src/views/base/qualityProcess/index.vue new file mode 100644 index 0000000..c152f49 --- /dev/null +++ b/src/views/base/qualityProcess/index.vue @@ -0,0 +1,413 @@ + + + diff --git a/src/views/base/teamMembers/index.vue b/src/views/base/teamMembers/index.vue index 7a633d0..daf667f 100644 --- a/src/views/base/teamMembers/index.vue +++ b/src/views/base/teamMembers/index.vue @@ -84,7 +84,7 @@ - +