Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js =================================================================== diff -u -r32287 -r32327 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 32287) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 32327) @@ -589,6 +589,7 @@ if(items.length == 0){ for(var i=0;i<=index;i++){ documentGetElementsByClassName('s-step'+i)[0].className = 's-step s-step'+i+''; + documentGetElementsByClassName('title'+i)[0].style.color = '#367f21'; documentGetElementsByClassName('green'+i)[0].style.display = 'block'; documentGetElementsByClassName('grey'+i)[0].style.display = 'none'; documentGetElementsByClassName('red'+i)[0].style.display = 'block'; @@ -598,22 +599,11 @@ for(var i=0;i

'+titleArr[i].split(',')[1]+':'+time+'

'; } + + documentGetElementsByClassName('title'+i)[0].style.color = colorOfUnpassedNode; + documentGetElementsByClassName('green'+i)[0].style.border = '3px solid ' + colorOfUnpassedNode; + documentGetElementsByClassName('red'+i)[0].style.border = '3px solid ' + colorOfPassedNode; + documentGetElementsByClassName('grey'+i)[0].style.border = '3px solid grey'; + documentGetElementsByClassName('green'+i)[0].style.display = 'block'; + documentGetElementsByClassName('red'+i)[0].style.display = 'none'; + documentGetElementsByClassName('grey'+i)[0].style.display = 'none'; + if(documentGetElementsByClassName('line'+i)[0]){ + documentGetElementsByClassName('line'+i)[0].style.border = '1px solid ' + colorOfUnpassedNode; + } + if(documentGetElementsByClassName('step'+i+'-line')[0]){ + documentGetElementsByClassName('step'+i+'-line')[0].style.border = '1px solid ' + colorOfUnpassedNode; + } } if(index > 0){ for(var i=0;i<=index;i++){ documentGetElementsByClassName('s-step'+i)[0].className = 's-step s-step'+i+' active'; documentGetElementsByClassName('green'+i)[0].style.display = 'none'; documentGetElementsByClassName('grey'+i)[0].style.display = 'none'; documentGetElementsByClassName('red'+i)[0].style.display = 'block'; + documentGetElementsByClassName('title'+i)[0].style.color = '#f00000'; var name = ''; var time = ''; if(titleArr[i].split(',')[0] == '申请人'){ @@ -669,15 +674,9 @@ name = useRecordOperator; time = useRecordEnteringDate; } + var colorOfPassedNode = '#f00000'; if(sstsConfig.tousseStatusProgressBarConfig){ - var colorOfPassedNode = sstsConfig.tousseStatusProgressBarConfig.colorOfPassedNode || '#f00000'; - documentGetElementsByClassName('title'+i)[0].style.color = colorOfPassedNode; - if(documentGetElementsByClassName('line'+i)[0]){ - documentGetElementsByClassName('line'+i)[0].style.border = '1px solid ' + colorOfPassedNode; - } - if(documentGetElementsByClassName('step'+i+'-line')[0]){ - documentGetElementsByClassName('step'+i+'-line')[0].style.border = '1px solid ' + colorOfPassedNode; - } + colorOfPassedNode = sstsConfig.tousseStatusProgressBarConfig.colorOfPassedNode || '#f00000'; if(sstsConfig.tousseStatusProgressBarConfig.showPersonAndDateTime){ documentGetElementsByClassName('name'+i)[0].innerHTML = name; documentGetElementsByClassName('time'+i)[0].innerHTML = time; @@ -689,6 +688,14 @@ }else { documentGetElementsByClassName('s-step'+i)[0].title = '

'+titleArr[i].split(',')[0]+':'+name+'

'+titleArr[i].split(',')[1]+':'+time+'

'; } + + documentGetElementsByClassName('title'+i)[0].style.color = colorOfPassedNode; + if(documentGetElementsByClassName('line'+i)[0]){ + documentGetElementsByClassName('line'+i)[0].style.border = '1px solid ' + colorOfPassedNode; + } + if(documentGetElementsByClassName('step'+i+'-line')[0]){ + documentGetElementsByClassName('step'+i+'-line')[0].style.border = '1px solid ' + colorOfPassedNode; + } } }