Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js =================================================================== diff -u -r15769 -r15770 --- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js (.../printCustomDesign.js) (revision 15769) +++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js (.../printCustomDesign.js) (revision 15770) @@ -145,7 +145,11 @@ function insertTable() { var tableConfigs = currentConfig.templateInfo.tableConfigs; if(tableConfigs.length > 0){ - showResult("表格已存在!"); + showResultExt({ + title:'提示', + message:'表格已存在!', + alignTo:'tr-tr' + }); return; } var itemsPerRow = Ext4.getCmp('itemsPerRow').getValue(); @@ -233,7 +237,11 @@ getLODOP2(); if(isUndefinedOrNullOrEmpty(currentConfig.programCodes)){ - showResult('保存成功'); + showResultExt({ + title:'提示', + message:'保存成功!', + alignTo:'tr-tr' + }); return ; } eval(document.getElementById('S1').value);// 执行eval方法，装载模板 @@ -272,7 +280,11 @@ function saveConfig() { getProgram(); if(isUndefinedOrNullOrEmpty(currentConfig.programCodes)){ - showResult('保存成功'); + showResultExt({ + title:'提示', + message:'保存成功!', + alignTo:'tr-tr' + }); return ; } top.Ext.MessageBox.wait('正在保存……', '请稍候'); @@ -286,12 +298,20 @@ }, success : function(response, options) { hideMessageBox(true); - showResult('保存成功'); + showResultExt({ + title:'提示', + message:'保存成功!', + alignTo:'tr-tr' + }); cancel(); }, failure : function(response, options) { hideMessageBox(true); - showResult('保存失败'); + showResultExt({ + title:'提示', + message:'保存失败!', + alignTo:'tr-tr' + }); } }); } @@ -712,7 +732,11 @@ handler : function() { var insertTableForm = Ext4.getCmp('insertTableForm'); if(!insertTableForm.form.isValid()){ - showResult('请正确填写表单各值!'); + showResultExt({ + title:'提示', + message:'请正确填写表单各值!', + alignTo:'tr-tr' + }); return; } insertTable(); @@ -785,7 +809,11 @@ text: '编辑表头文字', handler : function() { if(currentTableConfig == null){ - showResult('请先新建表格!'); + showResultExt({ + title:'提示', + message:'请先新建表格!', + alignTo:'tr-tr' + }); return ; } showEditTableHeadWindow(currentTableConfig,currentTableConfig.getFirstHeadRowConfig()); @@ -795,7 +823,11 @@ text: '编辑数据项', handler : function() { if(currentTableConfig == null){ - showResult('请先新建表格!'); + showResultExt({ + title:'提示', + message:'请先新建表格!', + alignTo:'tr-tr' + }); return ; } showEditTableDataItemWindow(currentTableConfig,currentTableConfig.getFirstDataItemRowConfig()); @@ -805,7 +837,11 @@ text: '编辑列属性', handler : function() { if(currentTableConfig == null){ - showResult('请先新建表格!'); + showResultExt({ + title:'提示', + message:'请先新建表格!', + alignTo:'tr-tr' + }); return ; } showEditTableColumnConfigsWindow(currentTableConfig); @@ -815,23 +851,39 @@ text: '保存表格属性', handler : function() { if(currentTableConfig == null){ - showResult('请先新建表格!'); + showResultExt({ + title:'提示', + message:'请先新建表格!', + alignTo:'tr-tr' + }); return ; } saveTableConfig(currentTableConfig); - showResult('保存成功!'); + showResultExt({ + title:'提示', + message:'保存成功!', + alignTo:'tr-tr' + }); } },{ xtype: 'button', text: '同步表格到lodop设计窗口', hidden: true, handler : function() { if(currentTableConfig == null){ - showResult('请先新建表格!'); + showResultExt({ + title:'提示', + message:'请先新建表格!', + alignTo:'tr-tr' + }); return ; } insertTableToLodop(currentTableConfig); - showResult('同步成功!'); + showResultExt({ + title:'提示', + message:'同步成功!', + alignTo:'tr-tr' + }); } }] }, { @@ -1007,12 +1059,20 @@ // showTableDesignWindow(); // restoreDesign(); } else { - showResult('系统加载出错，请稍候再试'); + showResultExt({ + title:'提示', + message:'系统加载出错，请稍候再试!', + alignTo:'tr-tr' + }); } }, failure : function(response, options) { hideMessageBox(true); - showResult('系统加载出错，请稍候再试'); + showResultExt({ + title:'提示', + message:'系统加载出错，请稍候再试!', + alignTo:'tr-tr' + }); } }); } Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r15730 -r15770 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 15730) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 15770) @@ -1790,6 +1790,11 @@ showResultWithoutSpeak(message,title,pauseTime) speaker.speak(message); } +function showResultExt(result) { + var message = result.message; + top.MsgTip.msgExt(result); + speaker.speak(message); +} /** * 功能与先前的showResult一样，但是没有语音 * @param message 显示的消息内容 Index: ssts-web/src/main/webapp/ext/example/examples.js =================================================================== diff -u -r15629 -r15770 --- ssts-web/src/main/webapp/ext/example/examples.js (.../examples.js) (revision 15629) +++ ssts-web/src/main/webapp/ext/example/examples.js (.../examples.js) (revision 15770) @@ -37,6 +37,43 @@ } } }, + msgExt : function(paramsCfg){ + var cfg = { + title:'提示', + message:'', + autoHide:true, + pauseTime:5, + alignTo:'t-t' + } + top.Ext.apply(cfg,paramsCfg); + var title = cfg.title; + var message = cfg.message; + var autoHide = cfg.autoHide; + var pauseTime = cfg.pauseTime; + var alignTo = cfg.alignTo; + var message = ''+message+''; + if(!msgCt){ + msgCt = Ext.DomHelper.insertFirst(document.body, {id:'msg-div22',style:'position:absolute;top:10px;width:300px;margin:0 auto;z-index:20000;'}, true); + } + msgCt.alignTo(document, alignTo); + //给消息框右下角增加一个关闭按钮 + message+='
' + + '关闭' + var m = Ext.DomHelper.append(msgCt, {html:createBox(title, message)}, true); + m.slideIn('t'); + if(!Ext.isEmpty(autoHide)&&autoHide==true){ + if(Ext.isEmpty(pauseTime)){ + pauseTime=5; + } + //如果pauseTime小于0,则永远不会关闭,需要点击才可以关闭 + if (pauseTime < 0){ + m.pause(pauseTime); + } + else { + m.pause(pauseTime).ghost("tr", {remove:true}); + } + } + }, hide:function(v){ var msg=Ext.get(v.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement); msg.ghost("tr", {remove:true});