diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue index a445534..cdc815c 100644 --- a/src/components/doctorCheck/CheckItemList.vue +++ b/src/components/doctorCheck/CheckItemList.vue @@ -160,35 +160,54 @@ export default { case '3': // 1 是数字型,3 是性激素期 case '1': // console.log('1、3') - if(checkItem.result && checkItem.referenceRangeValue){ + if(checkItem.result){ let tempResult = checkItem.result.replaceAll('<','').replaceAll('>','').replaceAll('=','').replaceAll('≤','').replaceAll('≥','').replaceAll(' ','') console.log('tempResult',isNaN(tempResult),tempResult) if(isNaN(tempResult)) break; let result = Number(tempResult) - let criticalRangeValue = checkItem.criticalRangeValue - let valueArr = checkItem.referenceRangeValue.split('-') - if(valueArr.length == 1) valueArr.unshift(0) - // console.log('valueArr',checkItem.referenceRangeValue,valueArr) - if(criticalRangeValue){ - let criticalArr = criticalRangeValue.split('-') - if(criticalArr.length == 1) criticalArr.unshift(0) - - // console.log('criticalArr',checkItem.criticalRangeValue,criticalArr) - - if(result < Number(criticalArr[0])){ - tooltips = 'tipsSuperLow' - }else if(result > Number(criticalArr[1])){ - tooltips = 'tipsSuperHigh' - }else if(result < Number(valueArr[0])){ - tooltips = 'tipsLow' - }else if(result > Number(valueArr[1])){ - tooltips = 'tipsHigh' + + + if(checkItem.referenceRangeValue){ + let criticalRangeValue = checkItem.criticalRangeValue + let valueArr = checkItem.referenceRangeValue.split('-') + if(valueArr.length == 1) valueArr.unshift(0) + + + // console.log('valueArr',checkItem.referenceRangeValue,valueArr) + if(criticalRangeValue){ + let criticalArr = criticalRangeValue.split('-') + if(criticalArr.length == 1) criticalArr.unshift(0) + + // console.log('criticalArr',checkItem.criticalRangeValue,criticalArr) + + if(result < Number(criticalArr[0])){ + tooltips = 'tipsSuperLow' + }else if(result > Number(criticalArr[1])){ + tooltips = 'tipsSuperHigh' + }else if(result < Number(valueArr[0])){ + tooltips = 'tipsLow' + }else if(result > Number(valueArr[1])){ + tooltips = 'tipsHigh' + } + }else{ + if(result < Number(valueArr[0])){ + tooltips = 'tipsLow' + }else if(result > Number(valueArr[1])){ + tooltips = 'tipsHigh' + } } - }else{ - if(result < Number(valueArr[0])){ - tooltips = 'tipsLow' - }else if(result > Number(valueArr[1])){ - tooltips = 'tipsHigh' + } + + //错误值校验 + let errArr = [] + if(checkItem.inputCheck){ + errArr = checkItem.inputCheck.split('-') + if(errArr.length == 1) errArr.unshift(-1) + } + if(errArr && errArr.length > 1){ + if(result < Number(errArr[0]) || result > Number(errArr[1])){ + tooltips = 'tipsError' + console.log('checkItem',checkItem) } } } diff --git a/src/store/index.js b/src/store/index.js index b65f778..e853bb0 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -18,6 +18,11 @@ export default new Vuex.Store({ window: { pageHeight: 960, //页面高度 pageWidth: 1920, //页面宽度 + pageHeaderHeight: 50, //container-header 高度 + pageMarginWidth: 10, //container-左右边距和 + pageMarginHeight: 10, //container-上下边距和 + cardHeaderHeight: 45, //card-header 高度 + shift: false, //是否按下 shift键 ctrl: false, //是否按下 ctrl键 },