1.修复月度计划审核生成作业计划时状态错误的问题

2.修复看板数据显示异常问题
3.排产功能优化
master
董哲奇 8 months ago
parent a62d88a55a
commit 6c8a20a4ae

@ -431,11 +431,10 @@ export default {
return return
} }
getSygdList(this.queryParam).then((res) => { getSygdList(this.queryParam).then((res) => {
this.list = res.data.list this.list = res.data
if (this.$refs.xGrid) { if (this.$refs.xGrid) {
this.$refs.xGrid.loadData(this.list) this.$refs.xGrid.loadData(this.list)
} }
}) })
}, },
tj(){ tj(){

@ -42,9 +42,9 @@ export default {
methods: { methods: {
async getData() { async getData() {
const res=await getGkjhwcqk() const res=await getGkjhwcqk()
const {计划, 理料, 划线, 切割,预配盘} = this.createData(res.data) const {计划, 抛丸,理料, 划线, 切割} = this.createData(res.data)
this.show = false this.show = false
this.cards = [计划, 理料, 划线, 切割,预配盘] this.cards = [计划, 抛丸,理料, 划线, 切割]
this.show = true this.show = true
}, },
clear(){ clear(){
@ -284,8 +284,8 @@ export default {
color: ['#03d3ec'] color: ['#03d3ec']
} }
}, },
"预配盘": { "抛丸": {
title: '预配盘', title: '抛丸',
total: { total: {
number: [0], number: [0],
content: '{nt}', content: '{nt}',
@ -347,13 +347,14 @@ export default {
let totalZl=0 let totalZl=0
for (const item of list) { for (const item of list) {
totalZl+=(item.bcshzl/1000)||0 totalZl+=(item.bcshzl/1000)||0
if (item.zt==='11'){ if (item.zt>='2'){
if (!!item.sljhrq){
data.计划.total.number[0]+=1 data.计划.total.number[0]+=1
data.计划.num.number[0]+=(item.bcshzl/1000)||0 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){ if (item.zt>='42'&&!!item.llfkrq){
data.理料.total.number[0]+=1 data.理料.total.number[0]+=1
data.理料.num.number[0]+=(item.bcshzl/1000)||0 data.理料.num.number[0]+=(item.bcshzl/1000)||0
@ -366,8 +367,9 @@ export default {
data.切割.total.number[0]+=1 data.切割.total.number[0]+=1
data.切割.num.number[0]+=(item.bcshzl/1000)||0 data.切割.num.number[0]+=(item.bcshzl/1000)||0
} }
} }
if (totalZl!==0){
let d1=data.计划.num.number[0]/totalZl*100 let d1=data.计划.num.number[0]/totalZl*100
d1=d1>0&&d1<1?1:d1 d1=d1>0&&d1<1?1:d1
data.计划.ring.series[0].data[0].value=parseFloat(d1.toFixed(2)) data.计划.ring.series[0].data[0].value=parseFloat(d1.toFixed(2))
@ -384,9 +386,11 @@ export default {
d5=d5>0&&d5<1?1:d5 d5=d5>0&&d5<1?1:d5
data.切割.ring.series[0].data[0].value=parseFloat(d5.toFixed(2)) data.切割.ring.series[0].data[0].value=parseFloat(d5.toFixed(2))
let d6=data.预配盘.num.number[0]/totalZl*100 let d6=data.抛丸.num.number[0]/totalZl*100
d6=d6>0&&d6<1?1:d6 d6=d6>0&&d6<1?1:d6
data.预配盘.ring.series[0].data[0].value=parseFloat(d5.toFixed(2)) data.抛丸.ring.series[0].data[0].value=parseFloat(d5.toFixed(2))
}
return data return data
}, },
}, },

@ -3,6 +3,7 @@
<div class="cq__title">出勤情况</div> <div class="cq__title">出勤情况</div>
<div class="water-level-chart-details"> <div class="water-level-chart-details">
总人数<span>{{totalPerson}}</span> 总人数<span>{{totalPerson}}</span>
,出勤率<span>100%</span>
</div> </div>
<div class="chart-container"> <div class="chart-container">
<dv-active-ring-chart v-if="show" :config="config" /> <dv-active-ring-chart v-if="show" :config="config" />

@ -20,7 +20,7 @@ export default {
show:false, show:false,
dun:0, dun:0,
config: { config: {
data: [], data: [0],
shape: 'round', shape: 'round',
waveHeight: 25, waveHeight: 25,
waveNum: 2 waveNum: 2
@ -40,6 +40,7 @@ export default {
methods:{ methods:{
getData(){ getData(){
getJhwcqk().then(res=>{ getJhwcqk().then(res=>{
console.log(res.data)
this.show=false this.show=false
let total=0 let total=0
for (const item of res.data) { for (const item of res.data) {
@ -49,7 +50,8 @@ export default {
total+=item.t||0 total+=item.t||0
} }
const point=(this.dun/total*100).toFixed(2) const point=(this.dun/total*100).toFixed(2)
this.config.data=[point] console.log(point)
this.config.data[0]=point
this.show=true this.show=true
}) })
}, },

Loading…
Cancel
Save