Commit e8dfceba authored by 高宇's avatar 高宇

1.修改 检查表

parent 5a523db5
......@@ -191,7 +191,7 @@
</div>
<div class="Value">
<TextToolTip
:text="inspectJbAl2o3List.recode1[0].differenceValue3"
:text="inspectJbAl2o3List.recode1[0].differenceValue"
:max-length="8"
:disabled-show="false"
/>
......@@ -239,7 +239,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode1[1].differenceValue3 === '合格'? 'Value': 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode1[1].differenceValue3"
:max-length="8"
......@@ -289,7 +289,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode1[2].differenceValue3 === '合格'? 'Value': 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode1[2].differenceValue3"
:max-length="8"
......@@ -339,7 +339,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode1[3].differenceValue3 === '合格'? 'Value': 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode1[3].differenceValue3"
:max-length="8"
......@@ -389,7 +389,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode1[4].differenceValue3 === '合格'? 'Value': 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode1[4].differenceValue3"
:max-length="8"
......@@ -439,7 +439,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode1[5].differenceValue3 === '合格'? 'Value': 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode1[5].differenceValue3"
:max-length="8"
......@@ -489,7 +489,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode1[6].differenceValue3 === '合格'? 'Value': 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode1[6].differenceValue3"
:max-length="8"
......@@ -539,7 +539,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode1[7].differenceValue3 === '合格'? 'Value': 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode1[7].differenceValue3"
:max-length="8"
......@@ -589,7 +589,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode1[8].differenceValue3 === '合格'? 'Value': 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode1[8].differenceValue"
:max-length="8"
......@@ -639,7 +639,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode1[9].differenceValue3 === '合格'? 'Value': 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode1[9].differenceValue3"
:max-length="8"
......@@ -689,7 +689,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode1[10].differenceValue3 === '合格'? 'Value': 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode1[10].differenceValue3"
:max-length="8"
......@@ -739,7 +739,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode1[11].differenceValue3 === '合格'? 'Value': 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode1[11].differenceValue3"
:max-length="8"
......@@ -789,7 +789,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode1[12].differenceValue3 === '合格'? 'Value': 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode1[12].differenceValue3"
:max-length="8"
......@@ -839,7 +839,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode1[13].differenceValue3 === '合格'? 'Value': 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode1[13].differenceValue3"
:max-length="8"
......@@ -889,7 +889,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode1[14].differenceValue3 === '合格'? 'Value': 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode1[14].differenceValue3"
:max-length="8"
......@@ -1006,7 +1006,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode2[0].differenceValue3 === '合格' ? 'Value' : 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode2[0].differenceValue3"
:max-length="8"
......@@ -1056,7 +1056,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode2[1].differenceValue3 === '合格' ? 'Value' : 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode2[1].differenceValue3"
:max-length="8"
......@@ -1106,7 +1106,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode2[2].differenceValue3 === '合格' ? 'Value' : 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode2[2].differenceValue3"
:max-length="8"
......@@ -1156,7 +1156,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode2[3].differenceValue3 === '合格' ? 'Value' : 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode2[3].differenceValue3"
:max-length="8"
......@@ -1206,7 +1206,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode2[4].differenceValue3 === '合格' ? 'Value' : 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode2[4].differenceValue3"
:max-length="8"
......@@ -1256,7 +1256,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode2[5].differenceValue3 === '合格' ? 'Value' : 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode2[5].differenceValue3"
:max-length="8"
......@@ -1306,7 +1306,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode2[6].differenceValue3 === '合格' ? 'Value' : 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode2[6].differenceValue3"
:max-length="8"
......@@ -1356,7 +1356,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode2[7].differenceValue3 === '合格' ? 'Value' : 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode2[7].differenceValue3"
:max-length="8"
......@@ -1406,7 +1406,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode2[8].differenceValue3 === '合格' ? 'Value' : 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode2[8].differenceValue3"
:max-length="8"
......@@ -1456,7 +1456,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode2[9].differenceValue3 === '合格' ? 'Value' : 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode2[9].differenceValue3"
:max-length="8"
......@@ -1506,7 +1506,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode2[10].differenceValue3 === '合格' ? 'Value' : 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode2[10].differenceValue3"
:max-length="8"
......@@ -1556,7 +1556,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode2[11].differenceValue3 === '合格' ? 'Value' : 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode2[11].differenceValue3"
:max-length="8"
......@@ -1606,7 +1606,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode2[12].differenceValue3 === '合格' ? 'Value' : 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode2[12].differenceValue3"
:max-length="8"
......@@ -1656,7 +1656,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode2[13].differenceValue3 === '合格' ? 'Value' : 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode2[13].differenceValue3"
:max-length="8"
......@@ -1706,7 +1706,7 @@
/>
</div>
</div>
<div class="Value">
<div :class="inspectJbAl2o3List.recode2[14].differenceValue3 === '合格' ? 'Value' : 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode2[14].differenceValue3"
:max-length="8"
......@@ -3243,7 +3243,7 @@ export default {
if (value === this.manufacturer[0].value) {
console.log('选中第一个厂家')
this.disableInput = true
for (var i = 9; i < 15; i++) {
for (var i = 10; i < 15; i++) {
this.inspectJbAl2o3List.recode1[i].recordData = '';
this.inspectJbAl2o3List.recode1[i].differenceValue = '';
this.inspectJbAl2o3List.recode1[i].differenceValue1 = '';
......@@ -3516,10 +3516,10 @@ export default {
this.inspectJbAl2o3List.recode1[index].differenceValue = this.digitalFormat(Math.abs(num1 - num2).toFixed(this.LIMITNGHOURS))
this.inspectJbAl2o3List.recode1[index].differenceValue1 = this.digitalFormat(((num1 + num2) / 2).toFixed(this.LIMITNGHOURS))
if (this.inspectJbAl2o3List.standonePx && this.inspectJbAl2o3List.standonePx != '') {
if (this.inspectJbAl2o3List.recode1[index].differenceValue >= this.inspectJbAl2o3List.standonePx) {
this.inspectJbAl2o3List.recode1[index].differenceValue3 = '合格'
} else {
if (this.inspectJbAl2o3List.recode1[index].differenceValue > this.inspectJbAl2o3List.standonePx) {
this.inspectJbAl2o3List.recode1[index].differenceValue3 = '不合格'
} else {
this.inspectJbAl2o3List.recode1[index].differenceValue3 = '合格'
}
} else {
this.inspectJbAl2o3List.recode1[index].differenceValue3 = ''
......@@ -3785,7 +3785,11 @@ export default {
let decimalValue = value.substring(decimalIndex); // 获取小数点及其后面的部分
console.log('integerValue',integerValue)
console.log('decimalValue',decimalValue)
if (decimalValue.length <= 3) {
// 如果小数部分为1位小数添加一个0
if (decimalValue.length === 1) {
s = value + '0'
}
if (decimalValue.length === 3) {
// 如果小数部分长度小于等于3,说明已经有两位小数或没有小数
s = value; // 不需要进行四舍五入,保留原始值
} else {
......@@ -3798,7 +3802,19 @@ export default {
}
return String(s)
},
// 对于整数添加两位小数
reserve1(value) {
let s = '0';
// 将 value 转换为字符串类型
value = value.toString();
if (value.lastIndexOf('.') == -1) {
s = value + '.00';
console.log('s', s);
} else {
s = value;
}
return s;
},
// 计算标签一的校验标准1 和 检验标准2 之间的差值
getCalculateDifferences() {
for (var i = 0; i < 15; i++) {
......@@ -3901,13 +3917,23 @@ export default {
}
this.inspectJbAl2o3List.limitThree = response.data.limitThree
this.inspectJbAl2o3List.businessId = response.data.businessId
this.inspectJbAl2o3List.standardOne = response.data.standardOne
this.inspectJbAl2o3List.standardTwo = response.data.standardTwo
if (response.data.standardOne) {
this.inspectJbAl2o3List.standardOne = this.reserve1(String(response.data.standardOne))
}
if (response.data.standardTwo) {
this.inspectJbAl2o3List.standardTwo = this.reserve1(String(response.data.standardTwo))
}
this.inspectJbAl2o3List.standonePx = response.data.standonePx
this.inspectJbAl2o3List.standtwoPx = response.data.standtwoPx
this.inspectJbAl2o3List.standardOneData = response.data.standardOneData
this.inspectJbAl2o3List.standardTwoData = response.data.standardTwoData
// this.inspectJbAl2o3List.recordData = response.data.recordData
this.inspectJbAl2o3List.standonePlus = response.data.standonePlus
this.inspectJbAl2o3List.standtwoPlus = response.data.standtwoPlus
if (response.data.standonePlus) {
this.inspectJbAl2o3List.standonePlus = this.reserve1(String(response.data.standonePlus))
}
if (response.data.standtwoPlus) {
this.inspectJbAl2o3List.standtwoPlus = this.reserve1(String(response.data.standtwoPlus))
}
this.inspectJbAl2o3List.standoneCy = response.data.standoneCy
this.inspectJbAl2o3List.standtwoCy = response.data.standtwoCy
this.inspectJbAl2o3List.inspector = response.data.inspector
......@@ -3945,7 +3971,7 @@ export default {
if (this.inspectJbAl2o3List.limitData && this.inspectJbAl2o3List.limitData.length > 0) {
this.getRecordThreeList(this.inspectJbAl2o3List.limitData.split(','))
}
this.handleJcCjChange()
/** 审批信息**/
this.inspectInfoList.approveStatus = response.data.approveStatus
this.inspectsForm.approveUser = response.data.approveName
......@@ -3960,15 +3986,20 @@ export default {
getRecordList(list1) {
for (let i = 0; i < list1.length; i++) {
this.inspectJbAl2o3List.recode1[i].recordData = list1[i]
if (i<list1.length - 1 ) {
this.handleData1Input(i)
}
}
},
// 数组2
getRecordTwoList(list1) {
console.log('list1',list1)
for (let i = 0; i < list1.length; i++) {
this.inspectJbAl2o3List.recode2[i].recordData = list1[i]
if(i< list1.length-1) {
this.handleData2Input(i)
}
}
},
// 数组3
getRecordThreeList(list1) {
......@@ -5332,7 +5363,7 @@ export default {
}
.Value {
width: 25%;
width: 27%;
display: flex;
justify-content: center;
padding-left: 22%;
......@@ -5344,12 +5375,25 @@ export default {
color: #0057ff;
margin-top: -3%;
}
.errValue {
width: 27%;
display: flex;
justify-content: center;
padding-left: 22%;
height: 18px;
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
text-align: LEFT;
color: red;
margin-top: -3%;
}
.averageValue {
width: 25%;
display: flex;
justify-content: center;
padding-left: 16%;
padding-left: 14%;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
font-size: 14px;
......@@ -5884,7 +5928,7 @@ export default {
}
.Value {
width: 25%;
width: 27%;
display: flex;
justify-content: center;
padding-left: 22%;
......@@ -5897,12 +5941,26 @@ export default {
margin-top: -3%;
}
.errValue {
width: 27%;
display: flex;
justify-content: center;
padding-left: 22%;
height: 18px;
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
text-align: LEFT;
color: red;
margin-top: -3%;
}
.averageValue {
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
display: flex;
justify-content: center;
padding-left: 16%;
padding-left: 14%;
font-size: 14px;
text-align: LEFT;
color: #0057ff;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment