diff --git a/src/api/base/qualityInspectionItem.js b/src/api/base/qualityInspectionItem.js index b6287b2..94528c7 100644 --- a/src/api/base/qualityInspectionItem.js +++ b/src/api/base/qualityInspectionItem.js @@ -9,6 +9,15 @@ export function listQualityInspectionItem(query) { }) } +// 查询缺陷下拉框 +export function getDefectList(query) { + return request({ + url: '/base/qualityInspectionItem/getDefectList', + method: 'get', + params: query + }) +} + // 查询质检项信息维护详细 export function getQualityInspectionItem(objId) { return request({ diff --git a/src/api/base/stationDefectRelation.js b/src/api/base/stationDefectRelation.js new file mode 100644 index 0000000..907687f --- /dev/null +++ b/src/api/base/stationDefectRelation.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询质检工位/缺陷维护列表 +export function listStationDefectRelation(query) { + return request({ + url: '/base/stationDefectRelation/list', + method: 'get', + params: query + }) +} + +// 查询质检工位/缺陷维护详细 +export function getStationDefectRelation(objId) { + return request({ + url: '/base/stationDefectRelation/' + objId, + method: 'get' + }) +} + +// 新增质检工位/缺陷维护 +export function addStationDefectRelation(data) { + return request({ + url: '/base/stationDefectRelation', + method: 'post', + data: data + }) +} + +// 修改质检工位/缺陷维护 +export function updateStationDefectRelation(data) { + return request({ + url: '/base/stationDefectRelation', + method: 'put', + data: data + }) +} + +// 删除质检工位/缺陷维护 +export function delStationDefectRelation(objId) { + return request({ + url: '/base/stationDefectRelation/' + objId, + method: 'delete' + }) +} 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/base/processStation/index.vue b/src/views/base/processStation/index.vue index 8bf89d3..2031ce9 100644 --- a/src/views/base/processStation/index.vue +++ b/src/views/base/processStation/index.vue @@ -2,7 +2,7 @@
- + - - - - - - + + + + + + + + - + @@ -91,12 +93,12 @@ - - + + - - + + @@ -124,7 +126,7 @@ type="text" icon="el-icon-s-grid" @click="findStation(scope.row)" - >所属工位 + >下级工位 - - + + - - + + @@ -170,8 +172,8 @@ > - - + + 所属工位 + >下级工位 @@ -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..d0a9048 100644 --- a/src/views/base/productStation/index.vue +++ b/src/views/base/productStation/index.vue @@ -2,7 +2,8 @@
- + + + + + + + 搜索 重置 @@ -93,11 +104,11 @@ - - - - - + + + @@ -154,16 +165,15 @@ - - - - - - - - - - + + + {{dict.label}} + + - - - {{dict.label}} - -
确 定 @@ -215,7 +216,7 @@ import { findFactoryList } from '@/api/base/factory' export default { name: "ProductLine", - dicts: ['line_type', 'is_flag'], + dicts: ['station_type', 'is_flag'], data() { return { // 遮罩层 @@ -245,6 +246,7 @@ export default { productLineType: 2, plantCode: null, isFlag: null, + stationType: null, createdBy: null, createdTime: null, updatedBy: null, @@ -262,10 +264,10 @@ export default { { key: 2, label: `工位名称`, visible: true }, { key: 3, label: `工位类别`, visible: true }, { key: 4, label: `所属工厂`, visible: true }, - { key: 5, label: `启用标识`, visible: true }, - { key: 6, label: `创建人`, visible: true }, + { key: 5, label: `启用标识`, visible: false }, + { key: 6, label: `创建人`, visible: false }, { key: 7, label: `创建时间`, visible: true }, - { key: 8, label: `更新人`, visible: true }, + { key: 8, label: `更新人`, visible: false }, { key: 9, label: `更新时间`, visible: true }, { key: 10, label: `所属产线`, visible: true }, ], @@ -276,8 +278,10 @@ export default { }; }, created() { - if (!this.$route.params){ + if (this.$route.params.productLineCode != null){ this.queryParams.parentId = this.$route.params && this.$route.params.productLineCode; + } + if (this.$route.params.processCode != null){ this.queryParams.processCode = this.$route.params && this.$route.params.processCode; } this.getList(); @@ -311,6 +315,7 @@ export default { productLineName: null, productLineType: 2, plantCode: null, + stationType: 1, isFlag: 0, createdBy: null, createdTime: null, diff --git a/src/views/base/qualityInspectionItem/defectIndex.vue b/src/views/base/qualityInspectionItem/defectIndex.vue new file mode 100644 index 0000000..93cf963 --- /dev/null +++ b/src/views/base/qualityInspectionItem/defectIndex.vue @@ -0,0 +1,403 @@ + + + diff --git a/src/views/base/qualityProcess/index.vue b/src/views/base/qualityProcess/index.vue new file mode 100644 index 0000000..4e68c50 --- /dev/null +++ b/src/views/base/qualityProcess/index.vue @@ -0,0 +1,413 @@ + + + diff --git a/src/views/base/stationDefectRelation/index.vue b/src/views/base/stationDefectRelation/index.vue new file mode 100644 index 0000000..7eee54c --- /dev/null +++ b/src/views/base/stationDefectRelation/index.vue @@ -0,0 +1,371 @@ + + + diff --git a/src/views/base/storeInfo/index.vue b/src/views/base/storeInfo/index.vue index 43df8fb..c0ef93c 100644 --- a/src/views/base/storeInfo/index.vue +++ b/src/views/base/storeInfo/index.vue @@ -138,7 +138,7 @@ type="text" icon="el-icon-d-arrow-right" @click="findSpaceInfo(scope.row)" - >所属货道 + >查看货道 - + + + diff --git a/src/views/report/electricalInspection/index.vue b/src/views/report/electricalInspection/index.vue index 75190e3..dc1f0ad 100644 --- a/src/views/report/electricalInspection/index.vue +++ b/src/views/report/electricalInspection/index.vue @@ -35,29 +35,29 @@ - - 新增 - - - - 修改 - - + + + + + + + + + + + + + + + + + + + + + + +
-
货道占用统计
+
货道占用统计(货道容量:{{this.spaceNumber}} 已占用容量:{{this.occupancyNumber}})
@@ -116,11 +116,13 @@ 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() { - if (!this.$route.params){ + if (this.$route.params != null){ this.queryParams.storeCode = this.$route.params && this.$route.params.storeCode; } this.getList() @@ -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, }, ] }; diff --git a/src/views/report/qualityInspection/index.vue b/src/views/report/qualityInspection/index.vue index 05df3f1..d9be7c2 100644 --- a/src/views/report/qualityInspection/index.vue +++ b/src/views/report/qualityInspection/index.vue @@ -1,10 +1,10 @@