From f5b834e911ac20929f8f88ec4b773d9370a98621 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期六, 14 九月 2024 21:13:00 +0800 Subject: [PATCH] 2024-09-14 --- src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 6 +- src/tabviews/zshare/actionList/tabbutton/index.jsx | 12 +++--- src/tabviews/zshare/actionList/newpagebutton/index.jsx | 11 +---- src/components/header/index.jsx | 6 +- src/tabviews/zshare/actionList/popupbutton/index.jsx | 6 +- src/components/sidemenu/index.jsx | 6 +- src/tabviews/zshare/actionList/normalbutton/index.jsx | 20 +++++----- src/views/main/index.jsx | 4 +- src/tabviews/zshare/actionList/excelInbutton/index.jsx | 6 +- src/tabviews/zshare/actionList/printbutton/index.jsx | 6 +- 10 files changed, 39 insertions(+), 44 deletions(-) diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx index 66ef265..2edc3e1 100644 --- a/src/components/header/index.jsx +++ b/src/components/header/index.jsx @@ -559,9 +559,9 @@ MKEmitter.emit('modifyTabs', menu) } - // if (window.GLOB.systemType === 'production') { - // MKEmitter.emit('queryTrigger', {menuId: menu.MenuID, name: '鑿滃崟'}) - // } + if (window.GLOB.systemType === 'production') { + MKEmitter.emit('queryTrigger', {menuId: menu.MenuID, name: '鑿滃崟'}) + } } } diff --git a/src/components/sidemenu/index.jsx b/src/components/sidemenu/index.jsx index 1889c7f..802743b 100644 --- a/src/components/sidemenu/index.jsx +++ b/src/components/sidemenu/index.jsx @@ -79,9 +79,9 @@ MKEmitter.emit('modifyTabs', menu) } - // if (window.GLOB.systemType === 'production') { - // MKEmitter.emit('queryTrigger', {menuId: menu.MenuID, name: '鑿滃崟'}) - // } + if (window.GLOB.systemType === 'production') { // positecgroup + MKEmitter.emit('queryTrigger', {menuId: menu.MenuID, name: '鑿滃崟'}) + } } onOpenChange = openKeys => { diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx index fde146a..513cdc5 100644 --- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx +++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx @@ -144,9 +144,9 @@ this.refs.excelIn.exceltrigger() }) - // if (window.GLOB.systemType === 'production') { - // MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎叆Excel'}) - // } + if (window.GLOB.systemType === 'production') { // positecgroup + MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎叆Excel'}) + } } } diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx index 6cc49b6..5bb8a51 100644 --- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx +++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx @@ -107,9 +107,9 @@ }) } else { MKEmitter.emit('queryModuleParam', btn.$menuId, this.triggerExcelout) - // if (window.GLOB.systemType === 'production') { - // MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎嚭Excel'}) - // } + if (window.GLOB.systemType === 'production') { // positecgroup + MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎嚭Excel'}) + } } } diff --git a/src/tabviews/zshare/actionList/newpagebutton/index.jsx b/src/tabviews/zshare/actionList/newpagebutton/index.jsx index 206d758..6721fb5 100644 --- a/src/tabviews/zshare/actionList/newpagebutton/index.jsx +++ b/src/tabviews/zshare/actionList/newpagebutton/index.jsx @@ -159,10 +159,7 @@ lang = data[0].lang_s || '' } - // let _name = '鏂伴〉闈�' - if (btn.pageTemplate === 'billprint') { - // _name = '鍗曟嵁鎵撳嵃' if (btn.preHandle === 'true' && btn.pre_func) { MKEmitter.emit('queryModuleParam', btn.$menuId, (res) => { let searches = {} @@ -273,8 +270,6 @@ let src = '#/print/' + window.btoa(window.encodeURIComponent(JSON.stringify({ ID: Id, lang }))) window.open(src) } else if (btn.pageTemplate === 'pay') { - // _name = '鏀粯' - let appId = '' let merchId = '' @@ -372,9 +367,9 @@ window.open(url) } - // if (window.GLOB.systemType === 'production') { - // MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: _name}) - // } + if (window.GLOB.systemType === 'production') { // positecgroup + MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: btn.label}) + } } prequest = (ID, data, appId, merchId) => { diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx index 930e5db..1611aa5 100644 --- a/src/tabviews/zshare/actionList/normalbutton/index.jsx +++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx @@ -307,16 +307,16 @@ } } - // if (window.GLOB.systemType === 'production') { - // let _change = { - // prompt: '鎻愮ず妗�', - // exec: '鐩存帴鎵ц', - // pop: '寮圭獥锛堣〃鍗曪級', - // formSubmit: '琛ㄥ崟', - // form: '琛ㄥ崟', - // } - // MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: _change[btn.OpenType]}) - // } + if (window.GLOB.systemType === 'production') { // positecgroup + let _change = { + prompt: '鎻愮ず妗�', + exec: '鐩存帴鎵ц', + pop: '寮圭獥锛堣〃鍗曪級', + formSubmit: '琛ㄥ崟', + form: '琛ㄥ崟', + } + MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: _change[btn.OpenType]}) + } } preTrigger = (callback) => { diff --git a/src/tabviews/zshare/actionList/popupbutton/index.jsx b/src/tabviews/zshare/actionList/popupbutton/index.jsx index 68f3828..8ef0d17 100644 --- a/src/tabviews/zshare/actionList/popupbutton/index.jsx +++ b/src/tabviews/zshare/actionList/popupbutton/index.jsx @@ -184,9 +184,9 @@ visible: true }) - // if (window.GLOB.systemType === 'production') { - // MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '寮圭獥锛堟爣绛撅級'}) - // } + if (window.GLOB.systemType === 'production') { // positecgroup + MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '寮圭獥锛堟爣绛撅級'}) + } } syspopclose = () => { diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx index 27c3a94..fd2771a 100644 --- a/src/tabviews/zshare/actionList/printbutton/index.jsx +++ b/src/tabviews/zshare/actionList/printbutton/index.jsx @@ -205,9 +205,9 @@ this.triggerPrint(data) } - // if (window.GLOB.systemType === 'production') { - // MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '鏍囩鎵撳嵃'}) - // } + if (window.GLOB.systemType === 'production') { // positecgroup + MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '鏍囩鎵撳嵃'}) + } } triggerPrint = (data, formlist = []) => { diff --git a/src/tabviews/zshare/actionList/tabbutton/index.jsx b/src/tabviews/zshare/actionList/tabbutton/index.jsx index 0dbb778..e6c76ac 100644 --- a/src/tabviews/zshare/actionList/tabbutton/index.jsx +++ b/src/tabviews/zshare/actionList/tabbutton/index.jsx @@ -213,9 +213,9 @@ MKEmitter.emit('openNewTab') } - // if (window.GLOB.systemType === 'production') { - // MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '鏍囩椤�'}) - // } + if (window.GLOB.systemType === 'production') { // positecgroup + MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '鏍囩椤�'}) + } } triggerMenu = (tab) => { @@ -300,9 +300,9 @@ MKEmitter.emit('openNewTab') } - // if (window.GLOB.systemType === 'production') { - // MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '鏍囩椤�'}) - // } + if (window.GLOB.systemType === 'production') { // positecgroup + MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '鏍囩椤�'}) + } } render() { diff --git a/src/views/main/index.jsx b/src/views/main/index.jsx index cf36bd0..8723ebc 100644 --- a/src/views/main/index.jsx +++ b/src/views/main/index.jsx @@ -4,7 +4,7 @@ import Header from '@/components/header' import MKEmitter from '@/utils/events.js' import Sidemenu from '@/components/sidemenu' -// import QueryLog from '@/components/querylog' +import QueryLog from '@/components/querylog' import ImgScale from '@/components/imgScale' // import './index.scss' @@ -78,7 +78,7 @@ {navBar === 'shutter' || navBar === 'menu_board_navigation' ? <Tabview key="tabview"/> : <Breadview key="breadview"/>} - {/* {window.GLOB.systemType === 'production' ? <QueryLog /> : null} */} + {window.GLOB.systemType === 'production' ? <QueryLog /> : null} <ImgScale /> </div> ) -- Gitblit v1.8.0