Index: ssts-web/src/main/webapp/common/common.css =================================================================== diff -u -r26325 -r26371 --- ssts-web/src/main/webapp/common/common.css (.../common.css) (revision 26325) +++ ssts-web/src/main/webapp/common/common.css (.../common.css) (revision 26371) @@ -77,43 +77,83 @@ } /* 加急级别颜色 */ /* 红*/ -.urgent_red_color div{background-color: #ff0000;} +.urgent_red_color, .urgent_red_color div{background-color: #ff0000;} /* 橙红 */ -.urgent_orange_red_color div{background-color: #ff3300;} +.urgent_orange_red_color, .urgent_orange_red_color div{background-color: #ff3300;} /* 橙 */ -.urgent_orange_color div{background-color: #ff6600;} +.urgent_orange_color, .urgent_orange_color div{background-color: #ff6600;} /* 橙黄 */ -.urgent_orange_yellow_color div{background-color: #ff9900;} +.urgent_orange_yellow_color, .urgent_orange_yellow_color div{background-color: #ff9900;} /* 黄 */ -.urgent_yellow_color div{background-color: #ffff00;} +.urgent_yellow_color, .urgent_yellow_color div{background-color: #ffff00;} /* 黄绿 */ -.urgent_yellow_green_color div{background-color: #99ff00;} +.urgent_yellow_green_color, .urgent_yellow_green_color div{background-color: #99ff00;} /* 绿 */ -.urgent_green_color div{background-color: #00ff00;} +.urgent_green_color, .urgent_green_color div{background-color: #00ff00;} /*蓝绿 */ -.urgent_blue_green_color div{background-color: #00ffff;} +.urgent_blue_green_color, .urgent_blue_green_color div{background-color: #00ffff;} /*蓝 */ -.urgent_blue_color div{background-color: #0000ff;} +.urgent_blue_color, .urgent_blue_color div{background-color: #0000ff;} /*蓝紫 */ -.urgent_blue_purple_color div{background-color: #6600ff;} +.urgent_blue_purple_color, .urgent_blue_purple_color div{background-color: #6600ff;} /*紫 */ -.urgent_purple_color div{background-color: #ff00ff;} +.urgent_purple_color, .urgent_purple_color div{background-color: #ff00ff;} /*紫红 */ -.urgent_purple_red_color div{background-color: #ff0066;} +.urgent_purple_red_color, .urgent_purple_red_color div{background-color: #ff0066;} /*鼠标移动到行上的时候变色 */ .x-grid3-row-over div{background-color:#efefef;} -/*表格的有加急的行*/ -.urgentRow div{ - position: relative; -} /*加急的图片*/ .serialNumberHrefUrgImg{ width: 18px; height: 18px; display: inline-block; - position: absolute;top: 0;left: 0; + position: absolute; + top: 0; + left: 0; } -/*加急图片旁边的流水号*/ -.serialNumberHref{ - margin-left: 15px; +.underCell{ + width: 100%; + display: inline-block; + position: relative; + margin: 0 0 0 0; + vertical-align: top; +} +/* 审核模块的加急div的间距,样式 */ +.review-urgentImgDiv{ + height: 18px; + padding: 0 0 0 20px; +} +/* 灭菌装载模块的加急div的间距,样式 */ +.sL-urgentImgDiv{ + width: 100%; + height: 16px; + padding: 0 0 0 16px; +} +.sL-urgentImgBasket{ + width: 16px; + height: 16px; +} +/* 灭菌管理 */ +.sR-urgentImgDiv{ + height: 18px; + padding: 0 0 0 20px; +} +/*发货,加急div的间距,样式*/ +.invoice-urgentImgDiv{ + padding-left: 20px; +} +/*灭菌装载*/ +/*待灭菌装载器械信息*/ +.sL-beforeSterillzationPackageInfo-img{ + width: 15px; + height: 15px; +} +.sL-beforeSterillzationPackageInfo-text{ + vertical-align: top; +} +#tousseGrid .x-grid3-cell-inner, #waitSterileLoadingTousseGrid .x-grid3-cell-inner{ + padding : 0 0 0 0; +} +#insideBasketTousse .x-tree-col-text, #reviewedBasketTab .x-tree-col-text{ + padding : 0 0 0 0; } \ No newline at end of file Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r26351 -r26371 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 26351) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 26371) @@ -2836,3 +2836,36 @@ return object; } + +//获取颜色的类名 +function getClassNameForColor(rgbVal){ + var rowClassName = ""; + if(rgbVal == "#ff0000"){ + rowClassName = "urgent_red_color"; + }else if(rgbVal == "#ff3300"){ + rowClassName = "urgent_orange_red_color"; + }else if(rgbVal == "#ff6600"){ + rowClassName = "urgent_orange_color"; + }else if(rgbVal == "#ff9900"){ + rowClassName = "urgent_orange_yellow_color"; + }else if(rgbVal == "#ffff00"){ + rowClassName = "urgent_yellow_color"; + }else if(rgbVal == "#99ff00"){ + rowClassName = "urgent_yellow_green_color"; + }else if(rgbVal == "#00ff00"){ + rowClassName = "urgent_green_color"; + }else if(rgbVal == "#00ffff"){ + rowClassName = "urgent_blue_green_color"; + }else if(rgbVal == "#0000ff"){ + rowClassName = "urgent_blue_color"; + }else if(rgbVal == "#6600ff"){ + rowClassName = "urgent_blue_purple_color"; + }else if(rgbVal == "#ff00ff"){ + rowClassName = "urgent_purple_color"; + }else if(rgbVal == "#ff0066"){ + rowClassName = "urgent_purple_red_color"; + }else{ + rowClassName = "my_row_white"; + } + return rowClassName; +} \ No newline at end of file