Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r26429 -r26440
--- ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 26429)
+++ ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 26440)
@@ -1400,16 +1400,16 @@
})
}),
columns: [
- {header: "告警类型", width: 200, dataIndex: 'warningItemType'},
+ {header: "告警类型", width: 300, dataIndex: 'warningItemType'},
{header: "告警数量", width: 60,dataIndex: 'warningAmount'},
{header: "操作", width: 70,dataIndex: 'warningItemType',renderer : hrefPage}
],
stripeRows: true,
viewConfig: {
forceFit:true
},
- height:140,
- width:400
+ height:200,
+ width:600
});
//根据配置项判断告警类型的信息是否需要提示(中大五院期望不要提示“已过期的器械包物品”)
var needLoadingWarnningData = [];
@@ -1428,7 +1428,7 @@
warningWindow = new Ext.Window({
autoHeight:true,
title : '系统告警',
- width:415,
+ width:615,
draggable:true,
modal:true,
closeAction:'close',
@@ -1481,7 +1481,7 @@
initTipPosition();//注意顺序
}
-function gopage(v,remark){
+function gopage(v){
if(v == recall){//召回页面
addTab('recallRecord','器械包召回',WWWROOT + '/disinfectsystem/recallRecord/recallRecordViewForDepart.jsp');
}else if(v ==disabledGoods || v == diposableGoods){
@@ -1501,16 +1501,15 @@
}else if(v == warningContract){
addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/assestManagement/contract/contractWarningView.jsp');
}
- if(v == NOTDOBIOLOGICALMONITORING){
- Ext4.MessageBox.alert("提示",remark);
- }else{
- warningWindow.close();
- }
+ warningWindow.close();
}
function hrefPage(v, p, record){
var mess = "查看详细";
- return ""+mess+"";
+ if(v != null && v.indexOf("生物监测") != -1){
+ mess = " ";
+ }
+ return ""+mess+"";
}
/**