|
|
@@ -550,6 +550,7 @@ export default {
|
|
|
let total = 0;
|
|
|
//完成检查项数量
|
|
|
let yes = 0;
|
|
|
+ let loading = 0
|
|
|
//完成NFC扫描的数量
|
|
|
let nfc_num = 0;
|
|
|
let nfc_no = 0;
|
|
|
@@ -559,12 +560,11 @@ export default {
|
|
|
if (item.areaId === areaId) {
|
|
|
total++
|
|
|
if (point.dataStatus === 2) {
|
|
|
+ yes++
|
|
|
if(point.resValue === 1){
|
|
|
- if(point.resRemark !== null && point.resRemark !== "" && point.rectificationDeadline !== null){
|
|
|
- yes++;
|
|
|
+ if(point.resRemark === null || point.resRemark === "" || point.rectificationDeadline === null){
|
|
|
+ loading++;
|
|
|
}
|
|
|
- }else{
|
|
|
- yes++
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -584,7 +584,10 @@ export default {
|
|
|
if (total === yes && nfc_no === 0) {
|
|
|
//检查项完成检查,nfc完成扫描,或者没有nfc扫描
|
|
|
areaStatus = '1'
|
|
|
- } else if (yes === 0 && nfc_no === nfc_num ) {
|
|
|
+ if(loading > 0){
|
|
|
+ areaStatus = '2'
|
|
|
+ }
|
|
|
+ } else if ( yes === 0 && nfc_no === nfc_num ) {
|
|
|
//检查项完成检查项为0,nfc也没动
|
|
|
areaStatus = '0'
|
|
|
} else {
|
|
|
@@ -951,7 +954,10 @@ export default {
|
|
|
align-items: center;
|
|
|
box-shadow: 0 2px 6px #ddd;
|
|
|
position: relative;
|
|
|
-
|
|
|
+ height: 80px;
|
|
|
+ display: flex;
|
|
|
+ justify-content: center;
|
|
|
+ align-items: center;
|
|
|
.ysj {
|
|
|
position: absolute;
|
|
|
right: 5px;
|