diff --git a/src/views/bigScreen/index_heihuadept.vue b/src/views/bigScreen/index_heihuadept.vue index e37a867b..efd98513 100644 --- a/src/views/bigScreen/index_heihuadept.vue +++ b/src/views/bigScreen/index_heihuadept.vue @@ -448,10 +448,11 @@ export default { let end_time = this.$TOOL.dateFormat(new Date(endDate), "yyyy-MM-dd hh:mm:ss"); this.start_time = start_time; this.end_time = end_time; + this.getMgroups(); this.$nextTick(() => { //设备数据 - this.getEqState1(); - this.getEqState2(); + // this.getEqState1(); + // this.getEqState2(); //任务进度 this.getMtask1(); this.getMtask2(); @@ -604,6 +605,24 @@ export default { }, 3000); }); }, + getMgroups(){ + let that = this; + that.$API.mtm.mgroup.list.req({page:0}).then((res) => { + res.forEach((item) => { + if(item.name == '黑化'){ + that.mgroup_hh = item.id; + console.log('黑化',item.id); + that.getEqState1(); + } + if(item.name == '退火'){ + that.mgroup_th = item.id; + console.log('退火',item.id); + that.getEqState2(); + } + }); + + }); + }, //黑化设备运行状态0 getEqState10() { let that = this; @@ -659,7 +678,7 @@ export default { //黑化设备运行状态 getEqState1() { let that = this; - that.$API.wpm.ana.equipLastMlog.req({mgroup_name: '黑化'}).then((res) => { + that.$API.wpm.ana.equipLastMlog.req({mgroup:that.mgroup_hh}).then((res) => { console.log('黑化设备运行状态',res); that.hh.bw = res.保温; that.hh.lq = res.冷却; @@ -712,7 +731,7 @@ export default { getMtask1() { let that = this; let obj = {}; - obj.mgroup__name = '黑化'; + obj.mgroup__name = that.mgroup_hh; obj.page = 0; that.$API.pm.mtask.list.req(obj).then((res) => { that.configData1.data = []; @@ -740,7 +759,7 @@ export default { //退火设备运行状态 getEqState2() { let that = this; - that.$API.wpm.ana.equipLastMlog.req({mgroup_name: '退火'}).then((res) => { + that.$API.wpm.ana.equipLastMlog.req({mgroup:that.mgroup_th}).then((res) => { console.log('退火设备运行状态',res); that.th.bw = res.保温; that.th.lq = res.冷却; diff --git a/src/views/bigScreen/index_jianbodept.vue b/src/views/bigScreen/index_jianbodept.vue index 1621c0fd..8525b89f 100644 --- a/src/views/bigScreen/index_jianbodept.vue +++ b/src/views/bigScreen/index_jianbodept.vue @@ -239,27 +239,22 @@ export default { legend: { icon: "stack", right: 0, + orient: 'vertical', + itemWidth: 12, + itemHeight: 12, + textStyle: { + color: '#fff', + fontSize: 11, + }, }, - series: [ - { + series: { name: '不合格占比', type: 'pie', radius: ['1%', '60%'], - center: ['50%', '55%'], + center: ['35%', '50%'], label: false, - data: [ - {value: 0, name: '划伤'}, - {value: 0, name: '气泡'}, - {value: 0, name: '水纹'}, - {value: 0, name: '崩边'}, - {value: 0, name: '雾面'}, - {value: 0, name: '麻点'}, - {value: 0, name: '线痕'}, - {value: 0, name: '破损'}, - {value: 0, name: '其他'}, - ] + data: [] } - ] }, tableHeight: 100, speed: 2000, @@ -373,6 +368,7 @@ export default { this.getMtask(); //投产/生产分析 this.getProductLine(); + this.getCountnotok(); }) }, methods: { @@ -411,7 +407,7 @@ export default { }, 500); return myChart; }, - //投产分析 + //生产统计 getProductLine() { let that = this; let obj = { @@ -444,15 +440,6 @@ export default { seriesData0[indexs] = item.生产数; seriesData1[indexs] = item.合格数; seriesData2[indexs] = item.合格率; - that.pieOption.series.data[0].value += item.划伤; - that.pieOption.series.data[1].value += item.气泡; - that.pieOption.series.data[2].value += item.水纹; - that.pieOption.series.data[3].value += item.崩边; - that.pieOption.series.data[4].value += item.雾面; - that.pieOption.series.data[5].value += item.麻点; - that.pieOption.series.data[6].value += item.线痕; - that.pieOption.series.data[7].value += item.破损; - that.pieOption.series.data[8].value += item.其他; }); } that.barOption.xAxis.data = that.xAxisData; @@ -460,8 +447,7 @@ export default { that.barOption.series[1].data = seriesData1; that.barOption.series[2].data = seriesData2; let chart1 = this.setChart("chart1", that.barOption); - let chart2 = this.setChart("chart2", that.pieOption); - let index1 = 0,index2 = 0; + let index1 = 0; this.chartInterval1 = setInterval(function () { if (index1 < that.barOption.series[0].data.length) { chart1.dispatchAction({ @@ -483,6 +469,25 @@ export default { index1 = 0; } }, 3000); + }); + }, + //不合格分布 + getCountnotok(){ + let that = this; + let obj = {query:{start_date:that.start_time,end_date:that.end_time}}; + that.$API.bi.dataset.exec.req('notok_dis', obj).then((res) => { + let seriesData = []; + if(res.data2.ds0){ + res.data2.ds0.forEach((item) => { + let obj = {}; + obj.name = item.不合格项; + obj.value = item.数量; + seriesData.push(obj); + }) + } + that.pieOption.series.data = seriesData; + let index2 = 0; + let chart2 = this.setChart("chart2", that.pieOption); this.chartInterval2 = setInterval(function () { if (index2 < that.barOption.series[0].data.length) { chart2.dispatchAction({ @@ -504,7 +509,7 @@ export default { index2 = 0; } }, 3000); - }); + }) }, //设备状态 getEqState(id) { diff --git a/src/views/wpm_gx/f_mlogs_form.vue b/src/views/wpm_gx/f_mlogs_form.vue index 5f562f71..8abc0e4f 100644 --- a/src/views/wpm_gx/f_mlogs_form.vue +++ b/src/views/wpm_gx/f_mlogs_form.vue @@ -312,8 +312,8 @@ const defaultForm = { shift: null, wm_in: null, fmlog:null, - handle_user:null, - handle_users:null, + handle_user:'', + handle_users:[], material_out:'', count_pn_jgqbl:0, count_use:0, diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue index 2ec3c8bc..511551df 100644 --- a/src/views/wpm_gx/mlog_form.vue +++ b/src/views/wpm_gx/mlog_form.vue @@ -294,8 +294,8 @@ const defaultForm = { supplier:'', route: "", equipment: "", - handle_user: null, - handle_users:null, + handle_user: '', + handle_users:[], work_start_time: "", work_end_time:null, note:'',