Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js =================================================================== diff -u -r32286 -r32287 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 32286) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 32287) @@ -601,27 +601,26 @@ if(sstsConfig.tousseStatusProgressBarConfig){ var colorOfUnpassedNode = sstsConfig.tousseStatusProgressBarConfig.colorOfUnpassedNode || '#367f21'; var colorOfPassedNode = sstsConfig.tousseStatusProgressBarConfig.colorOfPassedNode || '#f00000'; + 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(sstsConfig.tousseStatusProgressBarConfig.showPersonAndDateTime){ documentGetElementsByClassName('name'+i)[0].innerHTML = name; documentGetElementsByClassName('time'+i)[0].innerHTML = time; documentGetElementsByClassName('name'+i)[0].style.color = colorOfUnpassedNode; documentGetElementsByClassName('time'+i)[0].style.color = colorOfUnpassedNode; - 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; - } }else { - documentGetElementsByClassName('s-step'+i)[0].title = '

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

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

'; } }else { @@ -672,26 +671,19 @@ } 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; + } if(sstsConfig.tousseStatusProgressBarConfig.showPersonAndDateTime){ documentGetElementsByClassName('name'+i)[0].innerHTML = name; documentGetElementsByClassName('time'+i)[0].innerHTML = time; documentGetElementsByClassName('name'+i)[0].style.color = colorOfPassedNode; documentGetElementsByClassName('time'+i)[0].style.color = colorOfPassedNode; - 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; - } }else { - 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; - } documentGetElementsByClassName('s-step'+i)[0].title = '

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

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

'; } }else {