diff --git a/src/views/jhzx/sygdCX.vue b/src/views/jhzx/sygdCX.vue index fbd6a33..358693a 100644 --- a/src/views/jhzx/sygdCX.vue +++ b/src/views/jhzx/sygdCX.vue @@ -431,11 +431,10 @@ export default { return } getSygdList(this.queryParam).then((res) => { - this.list = res.data.list + this.list = res.data if (this.$refs.xGrid) { this.$refs.xGrid.loadData(this.list) } - }) }, tj(){ diff --git a/src/views/kban/comps/GxChanLiang.vue b/src/views/kban/comps/GxChanLiang.vue index 6838fac..6228420 100644 --- a/src/views/kban/comps/GxChanLiang.vue +++ b/src/views/kban/comps/GxChanLiang.vue @@ -42,9 +42,9 @@ export default { methods: { async getData() { const res=await getGkjhwcqk() - const {计划, 理料, 划线, 切割,预配盘} = this.createData(res.data) + const {计划, 抛丸,理料, 划线, 切割} = this.createData(res.data) this.show = false - this.cards = [计划, 理料, 划线, 切割,预配盘] + this.cards = [计划, 抛丸,理料, 划线, 切割] this.show = true }, clear(){ @@ -284,8 +284,8 @@ export default { color: ['#03d3ec'] } }, - "预配盘": { - title: '预配盘', + "抛丸": { + title: '抛丸', total: { number: [0], content: '{nt}', @@ -347,13 +347,14 @@ export default { let totalZl=0 for (const item of list) { totalZl+=(item.bcshzl/1000)||0 - if (item.zt==='11'){ - if (!!item.sljhrq){ - data.计划.total.number[0]+=1 - data.计划.num.number[0]+=(item.bcshzl/1000)||0 - } + if (item.zt>='2'){ + data.计划.total.number[0]+=1 + data.计划.num.number[0]+=(item.bcshzl/1000)||0 + } + if (item.zt>='22'&&!!item.qgfkrq){ + data.抛丸.total.number[0]+=1 + data.抛丸.num.number[0]+=(item.bcshzl/1000)||0 } - if (item.zt>='42'&&!!item.llfkrq){ data.理料.total.number[0]+=1 data.理料.num.number[0]+=(item.bcshzl/1000)||0 @@ -366,27 +367,30 @@ export default { data.切割.total.number[0]+=1 data.切割.num.number[0]+=(item.bcshzl/1000)||0 } - } - let d1=data.计划.num.number[0]/totalZl*100 - d1=d1>0&&d1<1?1:d1 - data.计划.ring.series[0].data[0].value=parseFloat(d1.toFixed(2)) - let d3=data.理料.num.number[0]/totalZl*100 - d3=d3>0&&d3<1?1:d3 - data.理料.ring.series[0].data[0].value=parseFloat(d3.toFixed(2)) + if (totalZl!==0){ + let d1=data.计划.num.number[0]/totalZl*100 + d1=d1>0&&d1<1?1:d1 + data.计划.ring.series[0].data[0].value=parseFloat(d1.toFixed(2)) - let d4=data.划线.num.number[0]/totalZl*100 - d4=d4>0&&d4<1?1:d4 - data.划线.ring.series[0].data[0].value=parseFloat(d4.toFixed(2)) + let d3=data.理料.num.number[0]/totalZl*100 + d3=d3>0&&d3<1?1:d3 + data.理料.ring.series[0].data[0].value=parseFloat(d3.toFixed(2)) - let d5=data.切割.num.number[0]/totalZl*100 - d5=d5>0&&d5<1?1:d5 - data.切割.ring.series[0].data[0].value=parseFloat(d5.toFixed(2)) + let d4=data.划线.num.number[0]/totalZl*100 + d4=d4>0&&d4<1?1:d4 + data.划线.ring.series[0].data[0].value=parseFloat(d4.toFixed(2)) + + let d5=data.切割.num.number[0]/totalZl*100 + d5=d5>0&&d5<1?1:d5 + data.切割.ring.series[0].data[0].value=parseFloat(d5.toFixed(2)) + + let d6=data.抛丸.num.number[0]/totalZl*100 + d6=d6>0&&d6<1?1:d6 + data.抛丸.ring.series[0].data[0].value=parseFloat(d5.toFixed(2)) + } - let d6=data.预配盘.num.number[0]/totalZl*100 - d6=d6>0&&d6<1?1:d6 - data.预配盘.ring.series[0].data[0].value=parseFloat(d5.toFixed(2)) return data }, }, diff --git a/src/views/kban/comps/MainCq.vue b/src/views/kban/comps/MainCq.vue index b50736e..6ea4917 100644 --- a/src/views/kban/comps/MainCq.vue +++ b/src/views/kban/comps/MainCq.vue @@ -3,6 +3,7 @@
出勤情况
总人数{{totalPerson}}人 + ,出勤率100%
diff --git a/src/views/kban/comps/MainYueChanLiang.vue b/src/views/kban/comps/MainYueChanLiang.vue index 18755f7..4aa4152 100644 --- a/src/views/kban/comps/MainYueChanLiang.vue +++ b/src/views/kban/comps/MainYueChanLiang.vue @@ -20,7 +20,7 @@ export default { show:false, dun:0, config: { - data: [], + data: [0], shape: 'round', waveHeight: 25, waveNum: 2 @@ -40,6 +40,7 @@ export default { methods:{ getData(){ getJhwcqk().then(res=>{ + console.log(res.data) this.show=false let total=0 for (const item of res.data) { @@ -49,7 +50,8 @@ export default { total+=item.t||0 } const point=(this.dun/total*100).toFixed(2) - this.config.data=[point] + console.log(point) + this.config.data[0]=point this.show=true }) },