From b1c2b59492031b96a1c4dca9c65ba4d1c5843693 Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Mon, 30 Mar 2020 11:14:02 +0800 Subject: [PATCH 1/4] =?UTF-8?q?ANDON=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManufacturingCenter/AntonMonitoring.js | 41 +-- .../ManufacturingCenter/AddingOrder/index.vue | 3 +- .../AntonMonitoring/index.vue | 292 ++++++------------ .../ContractApprovalQuery1/index.vue | 1 - 4 files changed, 103 insertions(+), 234 deletions(-) diff --git a/src/api/ManufacturingCenter/AntonMonitoring.js b/src/api/ManufacturingCenter/AntonMonitoring.js index 59fd253f..578b7ba1 100644 --- a/src/api/ManufacturingCenter/AntonMonitoring.js +++ b/src/api/ManufacturingCenter/AntonMonitoring.js @@ -1,31 +1,18 @@ import request from '@/utils/request' import state from '@/store' import router from '@/router' -// 电子看板_线体上下线数量统计_查询 -export function ANDON_countselect() { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: 'ANDON_大屏幕显示', - param: 'WorkShopType=A' - } - }) -} -export function ANDON_opselect(opname) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: 'ANDON_办公室监控_消息通知', - param: 'WorkShopType=A' + '&工位号=' + opname + '=string' - } - }) -} +export function searchTable(check, dateRange0, dateRange1, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'ANDON监控_查询', + param: `日期_check=${check}&开始时间=${dateRange0}&结束时间=${dateRange1}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/views/ManufacturingCenter/AddingOrder/index.vue b/src/views/ManufacturingCenter/AddingOrder/index.vue index 803c7836..ad157475 100644 --- a/src/views/ManufacturingCenter/AddingOrder/index.vue +++ b/src/views/ManufacturingCenter/AddingOrder/index.vue @@ -617,7 +617,8 @@ export default { if (row.完成日期 !== '') { return 'CompleteColor' } - }, // 重置表单 + }, + // 重置表单 callOff(formName) { this.dialogFormVisible = false this.$refs[formName].resetFields() diff --git a/src/views/ManufacturingCenter/AntonMonitoring/index.vue b/src/views/ManufacturingCenter/AntonMonitoring/index.vue index 7d22fc11..208a4cb7 100644 --- a/src/views/ManufacturingCenter/AntonMonitoring/index.vue +++ b/src/views/ManufacturingCenter/AntonMonitoring/index.vue @@ -1,243 +1,120 @@ @@ -249,3 +126,8 @@ export default { margin-right: 2px; } + diff --git a/src/views/ManufacturingCenter/ContractApprovalQuery1/index.vue b/src/views/ManufacturingCenter/ContractApprovalQuery1/index.vue index a5b7beaa..31dfc8d5 100644 --- a/src/views/ManufacturingCenter/ContractApprovalQuery1/index.vue +++ b/src/views/ManufacturingCenter/ContractApprovalQuery1/index.vue @@ -146,7 +146,6 @@ export default { this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '') this.personValue ? check3 = 1 : check3 = 0 searchTable1(this.radio, check1, this.billNames, check2, this.dateRange[0], this.dateRange[1], check3, this.personValue, this.pageCurrent1, this.pageSize1).then(response => { - console.log(response.data) this.loading1 = false this.tableData1 = response.data.rows this.total1 = response.data.total From fabc90da0de8280d67173a497c38707ef80bcaed Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Mon, 30 Mar 2020 14:32:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=B0=E8=B4=A7=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorkshopProcurement/ArrivalStateSearch.js | 5 +- .../ArrivalStateSearch/index.vue | 100 +++++++++++------- 2 files changed, 66 insertions(+), 39 deletions(-) diff --git a/src/api/WorkshopProcurement/ArrivalStateSearch.js b/src/api/WorkshopProcurement/ArrivalStateSearch.js index 29211ee2..0f211745 100644 --- a/src/api/WorkshopProcurement/ArrivalStateSearch.js +++ b/src/api/WorkshopProcurement/ArrivalStateSearch.js @@ -16,7 +16,7 @@ export function initArrivalStateContact() { }) } // 查询到货情况 -export function searchArrivalState(num) { +export function searchArrivalState(check1, num1, check2, num2, num3, pageCurrent, pageSize) { return request({ url: '', method: 'post', @@ -25,7 +25,8 @@ export function searchArrivalState(num) { ModularID: router.currentRoute.path, type: '1', name: '车间管理_到货情况_查询数据_新_成组采购', - param: `采购合同流水号=${num}` + param: `零件名_check=${check1}&零件名=${num1}&采购时间_check=${check2}&采购开始时间=${num2}&采购结束时间=${num3}`, + Pagination: pageCurrent + '&' + pageSize } }) } diff --git a/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue b/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue index 47939403..5b52da8a 100644 --- a/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue +++ b/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue @@ -1,19 +1,32 @@ @@ -64,16 +88,17 @@ import { initArrivalStateContact, searchArrivalState } from '@/api/WorkshopProcu import { mapGetters } from 'vuex' export default { - name: '', // 项目总价查询 data() { return { - check1: 0, - contractNumValue: '', + billNames: '', + dateRange: '', // 日期 + contractNumValue: '', // 已屏蔽下拉框 contractNum: [], - supplierName: '', tableData: [], - arrival: [], - judge: [] + total1: 0, + pageCurrent1: 1, + pageSize1: 50, + loading1: false } }, computed: { @@ -85,7 +110,7 @@ export default { ]) }, created() { - this.fetchData() + // this.fetchData() }, methods: { fetchData() { @@ -99,34 +124,35 @@ export default { }) }, searchTable() { - searchArrivalState(this.contractNumValue).then(response => { + this.loading1 = true + var check1, check2 + this.billNames ? check1 = 1 : check1 = 0 + this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '') + searchArrivalState(check1, this.billNames, check2, this.dateRange[0], this.dateRange[1], this.pageCurrent1, this.pageSize1).then(response => { console.log(response.data) - for (let i = 0; i < response.data.length; i++) { - if (response.data[i].物料型号 === '' || response.data[i].物料型号 === null) { - response.data[i].物料型号 = response.data[i].零件图号 + for (let i = 0; i < response.data.rows.length; i++) { + if (!response.data.rows[i].物料型号) { + response.data.rows[i].物料型号 = response.data.rows[i].零件图号 } } - this.tableData = response.data + this.tableData = response.data.rows + this.total1 = response.data.total + this.loading1 = false }) + }, + handleSizeChange1(val) { + this.pageCurrent1 = 1 + this.pageSize1 = val + this.searchTable() + }, + handleCurrentChange1(val) { + this.pageCurrent1 = val + this.searchTable() } } } From 0c2a3f1513208bbb0a6f2e89a3a7762fd48b10eb Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Mon, 30 Mar 2020 17:51:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EquipmentMonitoringNew.js | 44 ++++ .../EquipmentMonitoringNew/index.vue | 230 ++++++++++++++++++ 2 files changed, 274 insertions(+) create mode 100644 src/api/ManufacturingCenter/EquipmentMonitoringNew.js create mode 100644 src/views/ManufacturingCenter/EquipmentMonitoringNew/index.vue diff --git a/src/api/ManufacturingCenter/EquipmentMonitoringNew.js b/src/api/ManufacturingCenter/EquipmentMonitoringNew.js new file mode 100644 index 00000000..8ba0a6c7 --- /dev/null +++ b/src/api/ManufacturingCenter/EquipmentMonitoringNew.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 初始化工位 +export function getMachine() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_加工顺序调整_查询工位及人员' + } + }) +} +// 获取状态 +export function searchState() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'MES_机加工MES_设备状态查询_初始化' + } + }) +} + +export function getData3(num, num1, num2) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理_设备运行情况_查询数据_状态分布图', + param: '工位号=' + num + '&开始时间=' + num1 + '&结束时间=' + num2 + } + }) +} diff --git a/src/views/ManufacturingCenter/EquipmentMonitoringNew/index.vue b/src/views/ManufacturingCenter/EquipmentMonitoringNew/index.vue new file mode 100644 index 00000000..f3ea4029 --- /dev/null +++ b/src/views/ManufacturingCenter/EquipmentMonitoringNew/index.vue @@ -0,0 +1,230 @@ + + + + + From c811f599cd82799704cbf888f1fb1aa1f3621168 Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Mon, 30 Mar 2020 17:52:32 +0800 Subject: [PATCH 4/4] a --- .../ManufacturingCenter/EquipmentMonitoringNew/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/ManufacturingCenter/EquipmentMonitoringNew/index.vue b/src/views/ManufacturingCenter/EquipmentMonitoringNew/index.vue index f3ea4029..3391e440 100644 --- a/src/views/ManufacturingCenter/EquipmentMonitoringNew/index.vue +++ b/src/views/ManufacturingCenter/EquipmentMonitoringNew/index.vue @@ -33,7 +33,7 @@ 查询 -
+
@@ -122,7 +122,7 @@ export default { }) } } - const myChart = _this.$echarts.init(document.getElementById('myChart3')) + const myChart = _this.$echarts.init(document.getElementById('myChart')) myChart.clear() myChart.setOption({ title: {