Merge pull request 'pc-master' (#134) from pc-master into portal

Reviewed-on: #134
portal
xiaomeng 2024-03-15 01:19:03 +00:00
commit fce8754c80
2 changed files with 9 additions and 6 deletions

View File

@ -122,7 +122,7 @@
v-model="inputData[store.formulaNum[indexs - 1] + 28]" v-model="inputData[store.formulaNum[indexs - 1] + 28]"
@input="change(store.formulaNum[indexs - 1] + 28, $event)" type="number" style="height: 34px;margin: 0 5px;" @input="change(store.formulaNum[indexs - 1] + 28, $event)" type="number" style="height: 34px;margin: 0 5px;"
placeholder="0.0"> placeholder="0.0">
<span style="padding:0">%</span> <span style="padding:0"></span>
</div> </div>
</div> </div>
</template> </template>
@ -353,8 +353,8 @@ export default {
value: el.target.value * 10 value: el.target.value * 10
} }
}; };
console.log(data,11); // console.log(data,11);
this.changeBtn(code, data) // this.changeBtn(code, data)
}, },
// //
blurChangeCount(code, el) { blurChangeCount(code, el) {

View File

@ -495,17 +495,20 @@ export default {
this.openType = this.getType29(typeNumber) this.openType = this.getType29(typeNumber)
var statusIndex = 8 var statusIndex = 8
var list=[]
for (var j = 0; j < statusIndex; j++) { for (var j = 0; j < statusIndex; j++) {
if (Number(number[number.length - 1 - j])) { if (Number(number[number.length - 1 - j])) {
if (j == 0) { if (j == 0) {
this.right2Index.push('1') list.push('1')
} else if (j == 1) { } else if (j == 1) {
this.right2Index.push('0') list.push('0')
} else { } else {
this.right2Index.push(j) list.push(j)
} }
} }
} }
this.right2Index=list
}, },
// //
getData30() { getData30() {