|
|
@@ -2840,8 +2840,8 @@ export default {
|
|
|
// row.r4 = parseFloat(this.focusWRow2.r2) / 2 + parseFloat(this.focusWRow2.r4)
|
|
|
let average1 = (parseFloat(this.focusWRow2.r2) / 2).toFixed(parseInt(Cookies.get('decimalr')))
|
|
|
let average2 = (parseFloat(this.focusWRow2.r2) - parseFloat(average1)).toFixed(parseInt(Cookies.get('decimalr')))
|
|
|
- row.r3 = (parseFloat(average1) + parseFloat(this.focusWRow.r3)).toFixed(parseInt(Cookies.get('decimalr')))
|
|
|
- row.r4 = (parseFloat(average2) + parseFloat(this.focusWRow.r4)).toFixed(parseInt(Cookies.get('decimalr')))
|
|
|
+ row.r3 = (parseFloat(average1) + parseFloat(this.focusWRow2.r3)).toFixed(parseInt(Cookies.get('decimalr')))
|
|
|
+ row.r4 = (parseFloat(average2) + parseFloat(this.focusWRow2.r4)).toFixed(parseInt(Cookies.get('decimalr')))
|
|
|
console.log('1班比例为0,34班不为0')
|
|
|
}else if(row.r3 === 0 && row.r1 !== 0 && row.r4 !== 0){
|
|
|
row.r3 = 0
|
|
|
@@ -2849,8 +2849,8 @@ export default {
|
|
|
// row.r4 = parseFloat(this.focusWRow2.r2) / 2 + parseFloat(this.focusWRow2.r4)
|
|
|
let average1 = (parseFloat(this.focusWRow2.r2) / 2).toFixed(parseInt(Cookies.get('decimalr')))
|
|
|
let average2 = (parseFloat(this.focusWRow2.r2) - parseFloat(average1)).toFixed(parseInt(Cookies.get('decimalr')))
|
|
|
- row.r1 = (parseFloat(average1) + parseFloat(this.focusWRow.r1)).toFixed(parseInt(Cookies.get('decimalr')))
|
|
|
- row.r4 = (parseFloat(average2) + parseFloat(this.focusWRow.r4)).toFixed(parseInt(Cookies.get('decimalr')))
|
|
|
+ row.r1 = (parseFloat(average1) + parseFloat(this.focusWRow2.r1)).toFixed(parseInt(Cookies.get('decimalr')))
|
|
|
+ row.r4 = (parseFloat(average2) + parseFloat(this.focusWRow2.r4)).toFixed(parseInt(Cookies.get('decimalr')))
|
|
|
console.log('3班比例为0,14班不为0')
|
|
|
}else if(row.r4 === 0 && row.r1 !== 0 && row.r3 !== 0){
|
|
|
row.r4 = 0
|
