diff --git a/src/views/inm/mioitem_check.vue b/src/views/inm/mioitem_check.vue index 2f18b563..a9869012 100644 --- a/src/views/inm/mioitem_check.vue +++ b/src/views/inm/mioitem_check.vue @@ -640,6 +640,7 @@ style="width: 100%" placeholder="不合格数量" controls-position="right" + @change="count_notok_change" > @@ -1210,6 +1211,7 @@ export default { if(this.form.count_notok>count_notok){ this.form.count_n_qt = this.form.count_notok-count_notok; } + this.form.count_ok = this.form.count - this.form.count_notok; }, getMaterialItem(){ let that = this; diff --git a/src/views/statistics/bxerp/workHoursRY.vue b/src/views/statistics/bxerp/workHoursRY.vue index d6fab545..2178302a 100644 --- a/src/views/statistics/bxerp/workHoursRY.vue +++ b/src/views/statistics/bxerp/workHoursRY.vue @@ -49,6 +49,26 @@ @click="handleQuery" > +
+ + + + + +
@@ -402,6 +422,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -432,6 +542,9 @@ export default { time_gte:'', time_lte:'', }, + query2:{ + process_name:'压板出炉', + }, query:{ end_date:'', start_date:'', @@ -440,6 +553,7 @@ export default { mgruops:[], tableData:[], detailRow:[], + processList:['装模','装炉','压板出炉','脱膜测量'], params:{cate:'热压'}, apiObj1: this.$API.wpm.wpr.query, apiObj: this.$API.mtm.process.list, @@ -455,15 +569,22 @@ export default { getData(){ let that = this; let params = {}; - params.query = that.query; let biStr = ''; if(that.activeName=='luhao'){ + params.query = that.query; biStr = 'product_defect_equip_bdgy'; params.query.select_cols = ",ls.板段编号列表,ls.切片编号列表"; }else if(that.activeName=='muju'){ + params.query = that.query; biStr = 'product_defect_model'; params.query.select_cols = ""; + }else if(that.activeName=='gongxu'){ + params.query = that.query2; + biStr = 'product_defect_reya'; + }else if(that.activeName=='total'){ + biStr = 'product_defect_sg'; } + console.log('params',params); that.$API.bi.dataset.exec.req(biStr, params).then((res) => { let data = res.data2.ds0; data.forEach(item=>{ @@ -528,7 +649,7 @@ export default { console.log('e.props.name',e.props.name); this.activeName = e.props.name; this.showTable=false; - if(e.props.name=='luhao'||e.props.name=='muju'){ + if(e.props.name=='luhao'||e.props.name=='muju'||e.props.name=='gongxu'||e.props.name=='total'){ this.getData(); } }, diff --git a/src/views/statistics/bxerp/zhongjian1.vue b/src/views/statistics/bxerp/zhongjian1.vue index 4bdc831f..cd53cc66 100644 --- a/src/views/statistics/bxerp/zhongjian1.vue +++ b/src/views/statistics/bxerp/zhongjian1.vue @@ -160,16 +160,16 @@ diff --git a/src/views/statistics/good_check_gx.vue b/src/views/statistics/good_check_gx.vue index 5347b899..e109fd5f 100644 --- a/src/views/statistics/good_check_gx.vue +++ b/src/views/statistics/good_check_gx.vue @@ -565,7 +565,7 @@ export default { obj.compare = "lte"; obj.field = "data__外观检验_返修_日期"; } - if(that.query.batch.indexOf(' ')>-1){ + if(that.query.batch != "" && that.query.batch != null && that.query.batch != undefined&&that.query.batch.indexOf(' ')){ let arrs = that.query.batch.split(' '); arrs.forEach((item,index)=>{ let newArrayName1 = 'arr1' + index; diff --git a/src/views/wpm_bx/monitor_detail.vue b/src/views/wpm_bx/monitor_detail.vue index 406ebdbf..9b8b3a13 100644 --- a/src/views/wpm_bx/monitor_detail.vue +++ b/src/views/wpm_bx/monitor_detail.vue @@ -7,7 +7,32 @@ destroy-on-close @closed="$emit('closed')" > -
+
+ + + + + + + + + + + + +
+
{ let height = document.getElementById("tableWap").clientHeight; that.tableHeight = height - 345; + that.tableHeight1 = height - 40; + that.chartHeight =(height - 40)+'px'; }) that.params.timex__gte = that.startTime; that.params.timex__lte = that.endTime; @@ -109,7 +143,14 @@ export default { that.activeName = res[0].nickname; that.params.mpoint = res[0].id; that.apiObj = that.$API.enm.mplogx; - that.handleClick(); + if(this.route_code =='zlybcl'){ + let obj = {name:'折线图',nickname:'折线图',id:'666'}; + that.mpointList.push(obj); + that.chartData(); + that.handleClick1(); + }else{ + that.handleClick(); + } }else{ that.$message.error("该设备没有监测点"); } @@ -118,7 +159,7 @@ export default { handleClick(val){ let that = this; that.option.xAxis.data = []; - that.option.series.data = []; + that.option.series[0].data = []; that.mpointList.forEach(item=>{ if(item.nickname == that.activeName){ that.query.mpoint = item.id; @@ -141,11 +182,64 @@ export default { that.option.yAxis.min = minNum; that.option.yAxis.max = maxNum; that.option.xAxis.data = xAxisData; - that.option.series.data = seriesData; + that.option.series[0].data = seriesData; }) } }) }, + handleClick1(val){ + let that = this; + that.mpointList.forEach(item=>{ + if(item.nickname == that.activeName){ + that.query.mpoint = item.id; + that.query.page = 1; + } + }) + }, + chartData(){ + let that = this; + const promises = that.mpointList.map(item => { + if (item.name !== '折线图') { + let params = { + mpoint: item.id, + timex__gte: that.startTime, + timex__lte: that.endTime, + page: 0 + }; + return that.$API.enm.mplogx.req(params); + } + }); + Promise.all(promises).then(responses => { + that.option.xAxis.data = []; + that.option.series.data = []; + let minNum = null,maxNum = 0,series = []; + responses.forEach((res,index) => { + if(res!==undefined){ + let minNum0=0,maxNum0=0,seriesData = [],xAxisData = []; + res.forEach(item=>{ + xAxisData.unshift(item.timex); + let value = Number(item.val_float); + seriesData.unshift(value); + }) + that.option.xAxis.data = xAxisData; + minNum0 = seriesData.reduce((a, b) => a < b ? a : b); + minNum = minNum === null ? minNum0 : Math.min(minNum,minNum0); + maxNum0 = Math.max(...seriesData); + maxNum = Math.max(maxNum,maxNum0); + series.push({ + name: that.mpointList[index].nickname, + type: "line", + data: seriesData, + }) + } + }); + that.option.yAxis.min = minNum; + that.option.yAxis.max = maxNum; + that.option.series = series; + }).catch(error => { + console.error('Error:', error); + }); + }, }, }; diff --git a/src/views/wpm_gx/f_mlogs_form.vue b/src/views/wpm_gx/f_mlogs_form.vue index 09018bde..8c0fd849 100644 --- a/src/views/wpm_gx/f_mlogs_form.vue +++ b/src/views/wpm_gx/f_mlogs_form.vue @@ -40,25 +40,20 @@ - - -
- {{ item.batch }}({{ item.material_name }}) - {{ item.count }} -
- - + + + + @@ -407,6 +402,9 @@ export default { show: "查看日志", }, //表单数据 + apiObj:this.$API.wpm.wmaterial.list, + params:{}, + materialrow:{}, form: Object.assign({}, defaultForm), //验证规则 rules: { @@ -532,7 +530,7 @@ export default { }) }else{ if(route!==null){ - that.$API.qm.qct.getQct.req({material:material_in,tag:'process'}).then((res) => { + that.$API.qm.qct.getQct.req({material:material_in,tag:'process',type:'in'}).then((res) => { res.qct_defects.forEach((item) => { that.defectinform[item.defect_name] = 0; }) @@ -548,7 +546,7 @@ export default { } }) //material_out - that.$API.qm.qct.getQct.req({material:material_out,tag:'process'}).then((res) => { + that.$API.qm.qct.getQct.req({material:material_out,tag:'process',type:'out'}).then((res) => { res.qct_defects.forEach((item) => { that.defectform[item.defect_name] = 0; }) @@ -638,20 +636,19 @@ export default { params.state = 10;//合格 params.material = that.material_in!==''?that.material_in:''; } - console.log('that.material_in:',that.material_in); - that.$API.wpm.wmaterial.list.req(params).then((res) => { - that.materialOptions = res; - if(that.codeText!==''){ - res.forEach(item=>{ - if(item.batch == that.codeBatch){ - that.form.wm_in = item.id; - that.form.batch = item.batch; - that.materialCount = that.form.count_use = that.form.count_ok = item.count_cando; - that.form.count_real = item.count-that.form.count_pn_jgqbl; - } - }) - } - }); + that.params = params; + }, + materialChange(){ + let that = this; + that.qct_defects.forEach((item) => { + that.defectform[item.defect_name] = 0; + that.defectinform[item.defect_name] = 0; + }) + that.materialFix = that.materialrow.material; + that.form.batch = that.materialrow.batch; + that.materialCount = that.form.count_use = that.form.count_real = that.form.count_ok = Number(that.materialrow.count); + that.form.count_real = Number(that.materialrow.count)-that.form.count_pn_jgqbl; + that.getdefects(that.route,that.material_in,that.material_out); }, changeMaterial(val){ let that = this; diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue index 3e46a10b..f0022b62 100644 --- a/src/views/wpm_gx/handover.vue +++ b/src/views/wpm_gx/handover.vue @@ -136,21 +136,12 @@ 检验 检验记录 打签