Index: ssts-web/src/main/webapp/disinfectsystem/test/scanSNCode.jsp =================================================================== diff -u -r41065 -r41066 --- ssts-web/src/main/webapp/disinfectsystem/test/scanSNCode.jsp (.../scanSNCode.jsp) (revision 41065) +++ ssts-web/src/main/webapp/disinfectsystem/test/scanSNCode.jsp (.../scanSNCode.jsp) (revision 41066) @@ -33,9 +33,12 @@
+ + \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r41063 -r41066 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 41063) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 41066) @@ -8680,6 +8680,7 @@ }, 1000); }, close: function () { + document.getElementById('snIframe').contentWindow.document.getElementById('close').click(); clearInterval(enableSNCodeTime) } }); Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r41064 -r41066 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 41064) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 41066) @@ -4018,6 +4018,8 @@ text: '' + '连接视觉识别设备' + '', handler: function () { document.getElementById('snIframe').contentWindow.document.getElementById('click').click(); + Ext4.getCmp('enableSNCode').hide(); + Ext4.getCmp('disableSNCode').show(); enableSNCode = setInterval(function () { var title = windowLocalStorage('get', 'title'); if (title.indexOf('装配') > -1) { @@ -4028,7 +4030,21 @@ } } }, 2000); + Ext4.getCmp('SNCodeBox').show(); } + },{ + xtype: 'button', + margin: '0 0 0 10', + id: 'disableSNCode', + hidden: true, + text: '' + '关闭视觉识别设备' + '', + handler: function () { + document.getElementById('snIframe').contentWindow.document.getElementById('close').click(); + Ext4.getCmp('enableSNCode').show(); + Ext4.getCmp('disableSNCode').hide(); + Ext4.getCmp('SNCodeBox').hide(); + clearInterval(enableSNCode) + } }] } ] @@ -8984,8 +9000,9 @@ autoScroll: false,//自动显示滚动条 collapsible: false,//允许展开和收缩 bodyPadding: 0, + id: 'SNCodeBox', height: sstsConfig.enableSNRecognition ? (document.body.clientHeight - 22)/2 : (document.body.clientHeight - 22), - hidden:!sstsConfig.enableSNRecognition, + hidden:true, title:'摄像头OCR识别', html: '' })] Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js =================================================================== diff -u -r41063 -r41066 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 41063) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 41066) @@ -1969,6 +1969,7 @@ }, 1000); }, close: function () { + document.getElementById('snIframe').contentWindow.document.getElementById('close').click(); clearInterval(enableSNCodeTime) } });