From 6ec7f031648e9959babc628eff058abaac7293d3 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 24 Mar 2025 18:43:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/quality/checkTypeProject.js | 8 + src/views/kanban/quality/kanban1.vue | 221 +++++++++----- .../mes/report/proAssistTable/assistqty.vue | 288 ++++++++++++++++++ src/views/mes/report/proAssistTable/index.vue | 251 +++++++++++++++ .../mes/report/proEfficiencyTable/index.vue | 259 ++++++++++++++++ src/views/mes/reportWork/index.vue | 7 +- src/views/wms/equipment/index.vue | 3 + 7 files changed, 956 insertions(+), 81 deletions(-) create mode 100644 src/views/mes/report/proAssistTable/assistqty.vue create mode 100644 src/views/mes/report/proAssistTable/index.vue create mode 100644 src/views/mes/report/proEfficiencyTable/index.vue diff --git a/src/api/quality/checkTypeProject.js b/src/api/quality/checkTypeProject.js index e4b0ea2..cfa6d06 100644 --- a/src/api/quality/checkTypeProject.js +++ b/src/api/quality/checkTypeProject.js @@ -74,6 +74,14 @@ export function getProjectInfoList(query) { }); } //方案下拉 +export function getProjectOptions(query) { + return request({ + url: '/quality/checkTypeProject/getProjectOptions', + method: 'get', + params: query + }); +} + export function getAutoDataOption(query) { return request({ url: '/quality/checkTypeProject/getAutoDataOption', diff --git a/src/views/kanban/quality/kanban1.vue b/src/views/kanban/quality/kanban1.vue index 1d64a23..a7956a9 100644 --- a/src/views/kanban/quality/kanban1.vue +++ b/src/views/kanban/quality/kanban1.vue @@ -19,16 +19,16 @@ - -
+
+
@@ -116,8 +116,23 @@
质量异常信息
+ +
- +
@@ -138,12 +153,28 @@
不良类型占比
+ +
-
产品不合格数量对比
+
本年各月产品不合格数量对比
@@ -151,7 +182,7 @@
-
产品异常趋势
+
本年各日产品异常趋势
@@ -195,7 +226,7 @@ export default { return { classOption:{ direction: 1, - hoverstop:true, step: 0.5, + hoverstop:true, step: 0.1, openNatch: true, limitMoveNum:7 }, @@ -235,21 +266,51 @@ export default { seriesmyChart5: [], dictDatatype: [], RefreshTime: null, + yearShow:false, + monthShow:true, + dateShow:false, + ymdArray:[], + ymdStart:null, + ymdEnd:null }; }, - created() { }, + created() { + this.getDate(); + + }, destroyed() { clearInterval(this.time1); this.time1 = null; }, + mounted() { - // this.datetime = moment().subtract(2, "day").format("yyyy-MM-DD"); - //console.log('zhuanhuahou',this.dateRangeone) - // this.getdatalist(this.selectxt) this.selectFactorylist(); this.gettime(); }, methods: { + /**获取默认查询时间段**/ + getDate() { + let start = this.Fungetdate (0); + let end = this.Fungetdate (0); + this.ymdArray.push(start,end); + this.optionDatalist1 = []; + this.optionDatalist2 = []; + this.optionDatalist3 = []; + this.optionDatalist4 = []; + this.ymdStart = moment(this.ymdArray[0]).format('YYYY-MM-DD'); + this.ymdEnd = moment(this.ymdArray[1]).format('YYYY-MM-DD'); + this.getdatalist(moment(this.ymdArray[0]).format('YYYY-MM-DD'),moment(this.ymdArray[1]).format('YYYY-MM-DD')); + this.initChart1() + }, + + Fungetdate (num) { + var dd = new Date(); + dd.setDate(dd.getDate() + num); + var y = dd.getFullYear(); + var m = dd.getMonth() + 1;//获取当前月份的日期 + var d = dd.getDate(); + return y + "-" + m + "-" + d; + }, back() { this.$router.push({ path: "/index" }); }, @@ -268,7 +329,7 @@ export default { _this.getLineList = response.data; _this.selectxt = _this.getLineList[0].parentName; - this.getDictData() + //this.getDictData() this.getDeviceRefreshTime() } }); @@ -280,33 +341,38 @@ export default { // console.log(response.data) this.RefreshTime = response.data this.time1 = setInterval(() => { - _this.getdatalist(_this.selectxt) + _this.getdatalist( + _this.ymdStart,_this.ymdEnd + ) _this.initChart1() }, 1000 * 60 * this.RefreshTime); } }); }, - getDictData() { - const _this = this; - getDictData( - { - dictType: 'static_dims', - } - ).then((response) => { - if (response) { - // console.log(response) - this.dictDatatype = response - _this.selectxtclasses = _this.dictDatatype[0].ymdType; - this.getDeviceRefreshTime() - this.getdatalist() - this.initChart1() - } - }); - }, + +// getDictData() { +// const _this = this; +// getDictData( +// { +// dictType: 'static_dims', +// } +// ).then((response) => { +// if (response) { +// // console.log(response) +// this.dictDatatype = response +// _this.selectxtclasses = _this.dictDatatype[1].ymdType; +// this.getDeviceRefreshTime() +// this.getdatalist() +// this.initChart1() +// } +// }); +// }, + getdatalist() { const _this = this; + //检验统计 getProduceStaticInfo({ - ymdType: _this.selectxtclasses,//moment().format(_this.selectxtclasses), + ymdType: _this.selectxtclasses, typeCode: 'produce', factoryCode: 'ds_' + _this.selectxt, }).then((response) => { @@ -316,18 +382,24 @@ export default { this.initChart2() } }); + //质量异常信息 getProduceNoOkList({ typeCode: 'produce', ymdType: _this.selectxtclasses, + productDateStart:this.ymdStart, + productDateEnd:this.ymdEnd, factoryCode: 'ds_' + _this.selectxt, }).then((response) => { if (response) { _this.Qualitylist = response } }); + //不良类型占比 getCheckProjectsPie({ typeCode: 'produce', - ymdType: _this.selectxtclasses,//moment().format(_this.selectxtclasses), + ymdType: _this.selectxtclasses, + productDateStart:this.ymdStart, + productDateEnd:this.ymdEnd, factoryCode: 'ds_' + _this.selectxt, }).then((response) => { if (response) { @@ -361,7 +433,7 @@ export default { type: "none", }, formatter: function (e) { - return `${e[0].data.name}\n${e[0].marker}${e[0].data.value}`; + return `${e[0].data.name}\n${e[0].marker}${e[0].data.value} PC`; }, }, xAxis: { @@ -451,6 +523,7 @@ export default { getProMonthNoOk({ typeCode: 'produce', factoryCode: 'ds_' + _this.selectxt, + }).then((response) => { if (response) { let numberlist = []; @@ -600,7 +673,7 @@ export default { min: 0, max: 1000, axisLabel: { - formatter: '{value}', + formatter: '{value} PC', textStyle: { color: '#D0DEEE' } @@ -705,7 +778,7 @@ export default { // nameTextStyle:{ // color: '#D0DEEE' // }, - data: ['已采纳', '已发布', '浏览量'] + data: [] }, xAxis: [ { @@ -742,7 +815,7 @@ export default { min: 0, max: 1000, axisLabel: { - formatter: '{value}', + formatter: '{value} PC', textStyle: { color: '#D0DEEE' } @@ -810,10 +883,15 @@ export default { } }, + label: { + show: true, // 开启显示 + position: 'top', // 显示位置，可以是'top', 'bottom', 'left', 'right'等 + formatter: '{c}' // {c} 表示系列中的当前数据值 + }, data: [] }, { - name: '不合格比例', + name: "本年", type: 'line', stack: '总量', symbol: 'circle', @@ -832,7 +910,7 @@ export default { data: [] }, { - name: '不合格数量', + name: "上年", data: [], type: 'bar', showBackground: true, @@ -891,6 +969,10 @@ export default { let max2 = Math.max(...seriesdata3) + 5 let max3 = Math.max(...seriesdata2) + 5 let max4 = Math.max(...seriesdata4) + 5 + + let legenddata = [] + legenddata.push("上年") + legenddata.push("本年") let yAxismax1 = 0 let yAxismax2 = 0 if (max1 > max2) { @@ -930,7 +1012,10 @@ export default { { data: seriesdata3, } - ] + ], + legend: { + data: legenddata + } }; myChart6.setOption(option6); } @@ -1388,37 +1473,6 @@ export default { const _this = this var colorList = ['#2D6ACA', '#72C6B5', '#F0D766', '#80B5F4', '#FD866A', '#9E87FF', '#58D5FF']; var data = _this.optionDatalist2 - // var data = [{ - // 'name': '热点网格', - // 'value': 5600 - // }, { - // 'name': '大气污染', - // 'value': 3600 - // }, { - // 'name': '水质超标', - // 'value': 1500 - // }, { - // 'name': '在线超标', - // 'value': 2000 - // }, { - // 'name': '未知', - // 'value': 899 - // }, { - // 'name': '系统对接', - // 'value': 4000 - // }, { - // 'name': '系统对接1', - // 'value': 4000 - // }, { - // 'name': '系统对接2', - // 'value': 4000 - // }, { - // 'name': '系统对接3', - // 'value': 4000 - // }, { - // 'name': '系统对接4', - // 'value': 4000 - // }] var myChart2 = echarts.init(document.querySelector("#echart2")); var option2 = { //提示框组件。开发实际中去掉了指针，提示框可以不用设置。 @@ -1816,14 +1870,21 @@ export default { this.getdatalist() this.initChart1() }, - selectline2() { - const _this = this; - this.optionDatalist1 = []; - this.optionDatalist2 = []; - this.optionDatalist3 = []; - this.optionDatalist4 = []; - this.getdatalist() - this.initChart1() + selectline2(ymd) { + if(ymd =='yyyy'){ + this.yearShow = true; + this.monthShow = false; + this.dateShow = false; + }else if(ymd =='mm'){ + this.yearShow = false; + this.monthShow = true; + this.dateShow = false; + }else if(ymd =='dd'){ + this.yearShow = false; + this.monthShow = false; + this.dateShow = true; + } + }, //左侧第一个选择类型下拉框 回调函数 }, @@ -1887,7 +1948,7 @@ export default { position: relative; .factory { - width: 540px; + width: 600px; height: 60px; background: url("../../../assets/images/bg- border1.png") no-repeat; background-size: 100% 100%; @@ -2171,7 +2232,7 @@ export default { display: flex; align-items: center; justify-content: space-around; - width: 350px; + width: 280px; margin-left: 50px; } @@ -2183,7 +2244,7 @@ export default { display: flex; align-items: center; justify-content: space-around; - width: 88px; + width: 66px; margin-left: 25px; } diff --git a/src/views/mes/report/proAssistTable/assistqty.vue b/src/views/mes/report/proAssistTable/assistqty.vue new file mode 100644 index 0000000..ce6cdba --- /dev/null +++ b/src/views/mes/report/proAssistTable/assistqty.vue @@ -0,0 +1,288 @@ + + + diff --git a/src/views/mes/report/proAssistTable/index.vue b/src/views/mes/report/proAssistTable/index.vue new file mode 100644 index 0000000..3bb073a --- /dev/null +++ b/src/views/mes/report/proAssistTable/index.vue @@ -0,0 +1,251 @@ + + + diff --git a/src/views/mes/report/proEfficiencyTable/index.vue b/src/views/mes/report/proEfficiencyTable/index.vue new file mode 100644 index 0000000..e943832 --- /dev/null +++ b/src/views/mes/report/proEfficiencyTable/index.vue @@ -0,0 +1,259 @@ + + + diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index 9942ff3..ccb0532 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -392,6 +392,11 @@ + + + @@ -710,7 +715,7 @@ import moment from "moment"; import { getlistCK } from "@/api/wms/outorder"; export default { name: "ReportWork", - dicts: ["report_type", "report_sap_status", 'workorder_type'], + dicts: ["report_type", "report_sap_status", 'workorder_type',"check_result"], components: { ReportWorkConsume, ItemSelectUser, diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue index 19d4af5..2441561 100644 --- a/src/views/wms/equipment/index.vue +++ b/src/views/wms/equipment/index.vue @@ -486,6 +486,7 @@ @@ -1326,6 +1327,7 @@ export default { single: true, // 非多个禁用 multiple: true, + canEdit: true, // 显示搜索条件 showSearch: true, // 总条数 @@ -1754,6 +1756,7 @@ export default { this.queryAuxiliaryEquipmentParams.equipmentCode = null; this.open = true; this.title = "修改设备管理"; + this.canEdit = false; }); }, From 87fac3149ffbdfd36e805be1fc258e21d9c170d0 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 24 Mar 2025 18:46:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/report.js | 63 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 src/api/mes/report.js diff --git a/src/api/mes/report.js b/src/api/mes/report.js new file mode 100644 index 0000000..8d97f5b --- /dev/null +++ b/src/api/mes/report.js @@ -0,0 +1,63 @@ +import request from '@/utils/request' + + + +// 查询辅助工时摊分列表 +export function listQty(query) { + return request({ + url: '/mes/reportWorks/assistqty/list', + method: 'get', + params: query + }); +} + +// 查询辅助工时摊分详细 +export function getQty(id) { + return request({ + url: '/mes/reportWorks/assistqty/' + id, + method: 'get' + }); +} + +// 新增辅助工时摊分 +export function addQty(data) { + return request({ + url: '/mes/reportWorks/assistqty', + method: 'post', + data: data + }); +} + +// 修改辅助工时摊分 +export function updateQty(data) { + return request({ + url: '/mes/reportWorks/assistqty', + method: 'put', + data: data + }); +} + +// 删除辅助工时摊分 +export function delQty(id) { + return request({ + url: '/mes/reportWorks/assistqty/' + id, + method: 'delete' + }); +} + +// 辅助工时摊分方式报表列表 +export function listAssistHour(query) { + return request({ + url: '/mes/reportWorks/assistqty/listAssistHour', + method: 'get', + params: query + }); +} +//生产效率报表 +export function listEfficiencyDayList(query) { + return request({ + url: '/mes/reportWorks/assistqty/listEfficiencyDayList', + method: 'get', + params: query + }); +} From 5abc73f54d9b34bba33daf26649e20149f73e7dc Mon Sep 17 00:00:00 2001 From: lijing Date: Mon, 24 Mar 2025 19:56:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/kanban/quality/kanban1.vue | 4548 +++++++++++++------------- 1 file changed, 2286 insertions(+), 2262 deletions(-) diff --git a/src/views/kanban/quality/kanban1.vue b/src/views/kanban/quality/kanban1.vue index a7956a9..ebf2b2d 100644 --- a/src/views/kanban/quality/kanban1.vue +++ b/src/views/kanban/quality/kanban1.vue @@ -1,2370 +1,2394 @@