Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/PIE.htc
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/PIE.htc (revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/PIE.htc (revision 30222)
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
===================================================================
diff -u -r30219 -r30222
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp (.../tousseInstanceView.jsp) (revision 30219)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp (.../tousseInstanceView.jsp) (revision 30222)
@@ -142,10 +142,11 @@
position: absolute;
left: 10px;
top: 23px;
+ behavior: url(./PIE.htc);
z-index: 87
}
- .order_status .s-step b b {
+ .order_status .s-step b b.green {
display: block;
width: 10px;
height: 10px;
@@ -155,15 +156,39 @@
left: 0;
top: 0;
z-index: 88;
+ behavior: url(./PIE.htc);
border: 5px solid #367f21;
+ display: block;
}
- .order_status .s-step.active b b {
+ .order_status .s-step.active b b.red {
border: 5px solid #f00000;
+ display: block;
+ width: 10px;
+ height: 10px;
+ line-height: 10px;
+ border-radius: 50%;
+ background:#ffffff;
+ left: 0;
+ top: 0;
+ z-index: 88;
+ behavior: url(./PIE.htc);
+ display: none;
}
- .order_status .s-step.none b b {
- border: 5px solid #ccc;
+ .order_status .s-step.none b b.grey {
+ border: 5px solid grey;
+ display: block;
+ width: 10px;
+ height: 10px;
+ line-height: 10px;
+ border-radius: 50%;
+ background:#ffffff;
+ left: 0;
+ top: 0;
+ z-index: 88;
+ behavior: url(./PIE.htc);
+ display: none;
}
.order_status .s-step p {
@@ -220,80 +245,7 @@
cellpadding="0" cellspacing="0">
-
-
-
-
-
-
-
- 科室申领
-
-
-
-
-
-
- 回收清点
-
-
-
-
-
-
- 清洗消毒
-
-
-
-
-
-
- 已装配
-
-
-
-
-
-
- 已审核
-
-
-
-
-
-
- 灭菌中
-
-
-
-
-
-
- 已灭菌
-
-
-
-
-
-
- 已发货
-
-
-
-
-
-
- 已签收
-
-
-
-
-
-
- 已使用
-
-
-
+
|
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r30219 -r30222
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 30219)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 30222)
@@ -457,10 +457,11 @@
var tousseType = '';
var isSterile = '';
for(var i=0;i<10;i++){
- documentGetElementsByClassName('s-step')[i].classList.remove("active");
+ documentGetElementsByClassName('s-step')[i].className = 's-step s-step'+i;
+ documentGetElementsByClassName('green'+i)[0].style.display = 'block';
}
- document.getElementById('step3-line').classList.remove('border');
- document.getElementById('step7-line').classList.remove('border');
+ documentGetElementsByClassName('step3-line')[0].className = 'step3-line';
+ documentGetElementsByClassName('step7-line')[0].className = 'step7-line';
for(var i=0;i 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';
}
}
if(tousseType == '消毒物品' && isSterile == '否'){
documentGetElementsByClassName('s-step5')[0].className = 's-step s-step5 none';
documentGetElementsByClassName('s-step6')[0].className = 's-step s-step6 none';
- document.getElementById('step7-line').className = 'border';
+ documentGetElementsByClassName('step7-line')[0].className = 'step7-line border';
+ documentGetElementsByClassName('green5')[0].style.display = 'none';
+ documentGetElementsByClassName('grey5')[0].style.display = 'block';
+ documentGetElementsByClassName('red5')[0].style.display = 'none';
+ documentGetElementsByClassName('green6')[0].style.display = 'none';
+ documentGetElementsByClassName('grey6')[0].style.display = 'block';
+ documentGetElementsByClassName('red6')[0].style.display = 'none';
}else if(tousseType == '敷料包'){
documentGetElementsByClassName('s-step1')[0].className = 's-step s-step1 none';
documentGetElementsByClassName('s-step2')[0].className = 's-step s-step2 none';
- document.getElementById('step3-line').className = 'border';
+ documentGetElementsByClassName('step3-line')[0].className = 'step3-line border';
+ documentGetElementsByClassName('green1')[0].style.display = 'none';
+ documentGetElementsByClassName('grey1')[0].style.display = 'block';
+ documentGetElementsByClassName('red1')[0].style.display = 'none';
+ documentGetElementsByClassName('green2')[0].style.display = 'none';
+ documentGetElementsByClassName('grey2')[0].style.display = 'block';
+ documentGetElementsByClassName('red2')[0].style.display = 'none';
}else if(tousseType == '自定义器械包'){
documentGetElementsByClassName('s-step0')[0].className = 's-step s-step0 none';
documentGetElementsByClassName('s-step1')[0].className = 's-step s-step1 none';
documentGetElementsByClassName('s-step2')[0].className = 's-step s-step2 none';
- document.getElementById('step3-line').className = 'border';
+ documentGetElementsByClassName('step3-line')[0].className = 'step3-line border';
+ documentGetElementsByClassName('green0')[0].style.display = 'none';
+ documentGetElementsByClassName('grey0')[0].style.display = 'block';
+ documentGetElementsByClassName('red0')[0].style.display = 'none';
+ documentGetElementsByClassName('green1')[0].style.display = 'none';
+ documentGetElementsByClassName('grey1')[0].style.display = 'block';
+ documentGetElementsByClassName('red1')[0].style.display = 'none';
+ documentGetElementsByClassName('green2')[0].style.display = 'none';
+ documentGetElementsByClassName('grey2')[0].style.display = 'block';
+ documentGetElementsByClassName('red2')[0].style.display = 'none';
}
}
@@ -1222,7 +1247,7 @@
// autoHeight : true,
// autoScroll : true,
height : (fontSize == 12 ? 210 : 245),
- margins:sstsConfig.enableTousseStatusProgressBar?'50 0 0 0':'0',
+ margins:sstsConfig.enableTousseStatusProgressBar?(isIE(8)?'70 0 0 0':'50 0 0 0'):'0',
items : {
layout : 'column',
width: fontSize == 12 ? 1100 : 1300,
@@ -1503,14 +1528,35 @@
margins : '0 0 0 0',
layout : 'fit',
items : grid
- }]
- });
-
- Ext.onReady(function(){
- if(sstsConfig.enableTousseStatusProgressBar){
- document.getElementById('progressBars').style.display = 'block';
+ }],
+ listeners:{
+ render:function(){
+ if(sstsConfig.enableTousseStatusProgressBar){
+ var html = '';
+ var arr = ['科室申领','回收清点','清洗消毒','已装配','已审核','灭菌中','已灭菌','已发货','已签收','已使用'];
+ for(var i=0;i
';
+ html += '';
+ html += '';
+ html += '';
+ html += '';
+ html += '';
+ if(i == 0){
+ html += '';
+ }else if(i == 3 || i == 7){
+ html += '';
+ }else {
+ html += '';
+ }
+ html += ''+arr[i]+'
';
+ html += '';
+ }
+ html += ' ';
+ document.getElementById('progressBars').innerHTML = html;
+ }
+ }
}
- })
+ });
}
//回收记录,装配记录视频