Index: ssts-web/src/main/webapp/ext/fontSize12/styles/common.css =================================================================== diff -u -r36693 -r36728 --- ssts-web/src/main/webapp/ext/fontSize12/styles/common.css (.../common.css) (revision 36693) +++ ssts-web/src/main/webapp/ext/fontSize12/styles/common.css (.../common.css) (revision 36728) @@ -602,8 +602,6 @@ #downloadImagePanel .x-panel-body-noheader{ text-align: center; } -#downloadImageBrowse { - width: auto !important; - height: auto !important; - margin-top: 20px; +#downloadImageBrowse img,#downloadImageBrowse table{ + margin: 20px auto !important; } \ No newline at end of file Index: ssts-web/src/main/webapp/ext/fontSize15/styles/common.css =================================================================== diff -u -r36693 -r36728 --- ssts-web/src/main/webapp/ext/fontSize15/styles/common.css (.../common.css) (revision 36693) +++ ssts-web/src/main/webapp/ext/fontSize15/styles/common.css (.../common.css) (revision 36728) @@ -521,8 +521,6 @@ #downloadImagePanel .x-panel-body-noheader{ text-align: center; } -#downloadImageBrowse { - width: auto !important; - height: auto !important; - margin-top: 20px; +#downloadImageBrowse img,#downloadImageBrowse table{ + margin: 20px auto !important; } \ No newline at end of file Index: ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js =================================================================== diff -u -r36693 -r36728 --- ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js (.../showModifyPWDWindowByExt.js) (revision 36693) +++ ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js (.../showModifyPWDWindowByExt.js) (revision 36728) @@ -132,6 +132,7 @@ //DGKHYY-25:显示PDA安装包下载地址的二维码 function showPDADownloadWindow(){ + document.getElementById('downloadImage').innerHTML = ''; var imagePanel = new top.Ext.Panel({ id : 'downloadImagePanel', layout : 'fit', @@ -145,9 +146,7 @@ fieldLabel : "二维码", autoEl : { id : 'downloadImageBrowse', - tag : 'img', - src : Ext.BLANK_IMAGE_URL, - style : 'filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod=scale);', + tag : 'div', complete : 'off' } }] @@ -156,10 +155,10 @@ var url = WWWROOT + '/mobileClient/mobileClientAction!downloadPdaInstallPackage.do'; var qrcode = new QRCode("downloadImage",url); setTimeout(function(){ - var imgSrc = document.getElementById('downloadImage').getElementsByTagName('img')[0].getAttribute('src'); + var imgHtml = document.getElementById('downloadImage').innerHTML; var downloadImageBrowse = top.Ext.get('downloadImageBrowse'); var image = downloadImageBrowse.dom; - image.src = imgSrc; + image.innerHTML = imgHtml; }, 1000); var window = new top.Ext.Window( { id : 'PDADownloadWindow', Index: ssts-web/src/main/webapp/homepage/portalPage.js =================================================================== diff -u -r36693 -r36728 --- ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 36693) +++ ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 36728) @@ -1804,8 +1804,8 @@ //DGKHYY-25:新增二维码支持PDA扫码下载 function setting(){ var style = documentGetElementsByClassName('setting',document)[0].getElementsByTagName('ul')[0].getAttribute('style'); - match = style.match(/display:(.*?);/i); - if(match && match[1] && match[1] == ' none'){ + match = style.split(':'); + if(match && match[1] && (match[1] == ' none' || match[1] == ' none;')){ documentGetElementsByClassName('setting',document)[0].getElementsByTagName('ul')[0].style.display = 'block'; }else { documentGetElementsByClassName('setting',document)[0].getElementsByTagName('ul')[0].style.display = 'none';