From f8a9d0f85017537fc2ac5d1cdb7a9a90f22c556e Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 06 十二月 2022 14:48:53 +0800 Subject: [PATCH] 2022-12-06 --- src/index.js | 6 - src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx | 4 src/menu/components/table/base-table/columns/editColumn/index.jsx | 4 src/menu/components/form/step-form/index.jsx | 5 - src/menu/components/card/cardcellcomponent/index.jsx | 6 + src/menu/components/share/markcomponent/index.jsx | 10 -- src/menu/stylecontroller/index.jsx | 14 +++ src/menu/components/form/tab-form/index.jsx | 5 - src/menu/components/share/actioncomponent/formconfig.jsx | 10 ++ src/menu/components/card/cardcellcomponent/elementform/index.jsx | 10 -- src/tabviews/zshare/actionList/funcMegvii/index.jsx | 8 +- src/tabviews/zshare/actionList/printbutton/index.jsx | 39 +++++++++ src/menu/components/form/simple-form/index.jsx | 5 - src/views/billprint/index.scss | 12 ++ src/menu/components/table/normal-table/columns/editColumn/index.jsx | 4 src/templates/modalconfig/index.jsx | 5 - src/api/direct.js | 10 +- src/api/index.js | 10 ++ src/menu/modalconfig/index.jsx | 5 - src/mob/modalconfig/index.jsx | 5 - src/menu/components/table/edit-table/columns/editColumn/index.jsx | 4 src/views/systemfunc/sidemenu/config.jsx | 8 ++ src/views/login/index.jsx | 10 ++ 23 files changed, 127 insertions(+), 72 deletions(-) diff --git a/src/api/w4k.js b/src/api/direct.js similarity index 94% rename from src/api/w4k.js rename to src/api/direct.js index 5c47975..e800992 100644 --- a/src/api/w4k.js +++ b/src/api/direct.js @@ -1,12 +1,12 @@ import axios from 'axios' import jsSHA from 'jssha' -class W4kApi { +class DirectApi { /** * @description 閴存潈鎸戞垬 * @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁� */ - login (ip, username = 'admin', password) { + w4kLogin (ip, username = 'admin', password) { return new Promise((resolve, reject) => { let challurl = ip + '/api/auth/login/challenge?username=' + username challurl = '/trans/redirect?rd=' + challurl + '&method=get' @@ -45,7 +45,7 @@ }) } - queryUsers (ip) { + w4kQueryUsers (ip) { let url = ip + '/api/persons/query' url = '/trans/redirect?rd=' + url + '&method=post' @@ -64,7 +64,7 @@ }) } - addUsers (ip, data) { + w4kAddUsers (ip, data) { return new Promise((resolve, reject) => { let delurl = ip + '/api/persons/item/' + data.id delurl = '/trans/redirect?rd=' + delurl + '&method=DELETE' @@ -110,4 +110,4 @@ } } -export default new W4kApi() \ No newline at end of file +export default new DirectApi() \ No newline at end of file diff --git a/src/api/index.js b/src/api/index.js index c64be2d..8a542d5 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -32,7 +32,7 @@ axios.defaults.withCredentials = false axios.interceptors.request.use((config) => { - if (config.url.includes('LoginAndRedirect') || config.url.includes('getjsonresult') || config.url.includes('wxNativePay')) { + if (/LoginAndRedirect|getjsonresult|wxNativePay|postek/ig.test(config.url)) { config.data = qs.stringify(config.data) } else if (/\/doupload|\/dopreload|\/upload/.test(config.url)) { config.headers = { 'Content-Type': 'multipart/form-data' } @@ -1184,6 +1184,14 @@ }) } + postekPrint (data) { + return axios({ + url: 'http://127.0.0.1:888/postek/print', + method: 'post', + data: data + }) + } + // /** // * @description 鏂囦欢涓婁紶 // */ diff --git a/src/index.js b/src/index.js index c6693cf..c2afd0c 100644 --- a/src/index.js +++ b/src/index.js @@ -201,11 +201,7 @@ document.title = GLOB.platTitle || '' if (config.filter === 'true' || (/^20\d{2}-\d{2}-\d{2}$/.test(config.filter) && new Date(config.filter).getTime() + 86400000 >= new Date().getTime())) { - let html = document.getElementsByTagName('html')[0] - - if (html) { - html.style.filter = 'grayscale(100%)' - } + GLOB.filter = true } if (process.env.NODE_ENV === 'production') { // 鐢ㄤ簬鏍¢獙鏄惁瀛樺湪寮�鍙戞潈闄� diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx index b720973..93e0b43 100644 --- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx +++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx @@ -64,10 +64,7 @@ if (item.key === 'field' || item.key === 'linkurl' || item.key === 'bgImage' || item.key === 'posterField') { item.options = [] config.columns.forEach(col => { - let label = col.label - if (label.toLowerCase() !== col.field.toLowerCase()) { - label = col.field + ' ' + col.label - } + let label = `${col.field}锛�${col.label}锛塦 if (/^(Int|Decimal)/ig.test(col.datatype) && (card.eleType === 'number' || card.eleType === 'slider')) { item.options.push({ value: col.field, @@ -173,10 +170,7 @@ if (item.key === 'field') { item.options = [] config.columns.forEach(col => { - let label = col.label - if (label.toLowerCase() !== col.field.toLowerCase()) { - label = col.field + ' ' + col.label - } + let label = `${col.field}锛�${col.label}锛塦 if (/^(Int|Decimal)/ig.test(col.datatype) && (value === 'number' || value === 'slider')) { item.options.push({ diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx index 9241c6a..96f02a0 100644 --- a/src/menu/components/card/cardcellcomponent/index.jsx +++ b/src/menu/components/card/cardcellcomponent/index.jsx @@ -157,6 +157,7 @@ options = ['border', 'margin'] } else if (element.eleType === 'text') { options[0] = 'font2' + options.push('display') } else if (element.eleType === 'slider') { options = ['padding', 'margin'] } else if (element.eleType === 'splitline') { @@ -356,6 +357,11 @@ let _elements = elements.map(cell => { if (cell.uuid === res.uuid) { res.style = cell.style || {} + + if (res.eleType !== 'text') { + delete res.style.display + } + if (res.eleType === 'splitline' && (cell.eleType !== 'splitline' || cell.focus)) { res.style.paddingTop = '5px' res.style.paddingBottom = '5px' diff --git a/src/menu/components/form/simple-form/index.jsx b/src/menu/components/form/simple-form/index.jsx index beaab97..a6de6f5 100644 --- a/src/menu/components/form/simple-form/index.jsx +++ b/src/menu/components/form/simple-form/index.jsx @@ -348,10 +348,7 @@ index = i } - let label = item.label || '' - if (item.field && item.field.toLowerCase() !== label.toLowerCase()) { - label = label + ' (' + item.field + ')' - } + let label = `${item.field || ''}锛�${item.label}锛塦 if (['text', 'number', 'textarea', 'color'].includes(item.type) && _item.field !== item.field) { _inputfields.push({ diff --git a/src/menu/components/form/step-form/index.jsx b/src/menu/components/form/step-form/index.jsx index 73888c0..55dd906 100644 --- a/src/menu/components/form/step-form/index.jsx +++ b/src/menu/components/form/step-form/index.jsx @@ -449,10 +449,7 @@ index = i } - let label = item.label || '' - if (item.field && item.field.toLowerCase() !== label.toLowerCase()) { - label = label + ' (' + item.field + ')' - } + let label = `${item.field || ''}锛�${item.label}锛塦 if (['text', 'number', 'textarea', 'color'].includes(item.type) && _item.field !== item.field) { _inputfields.push({ diff --git a/src/menu/components/form/tab-form/index.jsx b/src/menu/components/form/tab-form/index.jsx index c6eb98b..a354870 100644 --- a/src/menu/components/form/tab-form/index.jsx +++ b/src/menu/components/form/tab-form/index.jsx @@ -455,10 +455,7 @@ index = i } - let label = item.label || '' - if (item.field && item.field.toLowerCase() !== label.toLowerCase()) { - label = label + ' (' + item.field + ')' - } + let label = `${item.field || ''}锛�${item.label}锛塦 if (['text', 'number', 'textarea', 'color'].includes(item.type) && _item.field !== item.field) { _inputfields.push({ diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx index 196f05c..ae79d94 100644 --- a/src/menu/components/share/actioncomponent/formconfig.jsx +++ b/src/menu/components/share/actioncomponent/formconfig.jsx @@ -933,7 +933,10 @@ initVal: card.controlField || '', required: true, allowClear: true, - options: columns + options: columns.map(item => ({ + value: item.field, + text: `${item.label}锛�${item.field}锛塦 + })) }, { type: 'text', @@ -1718,7 +1721,10 @@ initVal: card.controlField || '', required: true, allowClear: true, - options: columns + options: columns.map(item => ({ + value: item.field, + text: `${item.label}锛�${item.field}锛塦 + })) }, { type: 'text', diff --git a/src/menu/components/share/markcomponent/index.jsx b/src/menu/components/share/markcomponent/index.jsx index 50c608f..a17b5dd 100644 --- a/src/menu/components/share/markcomponent/index.jsx +++ b/src/menu/components/share/markcomponent/index.jsx @@ -144,10 +144,7 @@ _columns.unshift({field: '$Index', label: '搴忓彿'}) let options = _columns.map(col => { - let label = col.label - if (col.label.toLowerCase() !== col.field.toLowerCase()) { - label += `锛�${col.field}锛塦 - } + let label = `${col.field}锛�${col.label}锛塦 return { value: col.field, label: label, @@ -161,10 +158,7 @@ value: 'dynamic', label: '鍔ㄦ�佸��', children: _columns.map(cell => { - let _label = cell.label - if (cell.label.toLowerCase() !== cell.field.toLowerCase()) { - _label += `锛�${cell.field}锛塦 - } + let _label = `${cell.field}锛�${cell.label}锛塦 return { value: cell.field, label: _label diff --git a/src/menu/components/table/base-table/columns/editColumn/index.jsx b/src/menu/components/table/base-table/columns/editColumn/index.jsx index aa252c7..044e8ad 100644 --- a/src/menu/components/table/base-table/columns/editColumn/index.jsx +++ b/src/menu/components/table/base-table/columns/editColumn/index.jsx @@ -45,9 +45,7 @@ editColumn = (column) => { let fields = fromJS(this.props.fields).toJS().map(item => { - if (item.label.toLowerCase() !== item.field.toLowerCase()) { - item.text = item.label + '锛�' + item.field + '锛�' - } + item.text = `${item.field}锛�${item.label}锛塦 return item }) diff --git a/src/menu/components/table/edit-table/columns/editColumn/index.jsx b/src/menu/components/table/edit-table/columns/editColumn/index.jsx index 102006c..1fac697 100644 --- a/src/menu/components/table/edit-table/columns/editColumn/index.jsx +++ b/src/menu/components/table/edit-table/columns/editColumn/index.jsx @@ -85,9 +85,7 @@ editColumn = (column) => { let fields = fromJS(this.props.fields).toJS().map(item => { - if (item.label.toLowerCase() !== item.field.toLowerCase()) { - item.text = item.label + '锛�' + item.field + '锛�' - } + item.text = `${item.field}锛�${item.label}锛塦 return item }) diff --git a/src/menu/components/table/normal-table/columns/editColumn/index.jsx b/src/menu/components/table/normal-table/columns/editColumn/index.jsx index 0639e7d..19aa359 100644 --- a/src/menu/components/table/normal-table/columns/editColumn/index.jsx +++ b/src/menu/components/table/normal-table/columns/editColumn/index.jsx @@ -45,9 +45,7 @@ editColumn = (column) => { let fields = fromJS(this.props.fields).toJS().map(item => { - if (item.label.toLowerCase() !== item.field.toLowerCase()) { - item.text = item.label + '锛�' + item.field + '锛�' - } + item.text = `${item.field}锛�${item.label}锛塦 return item }) diff --git a/src/menu/modalconfig/index.jsx b/src/menu/modalconfig/index.jsx index eda92fa..8f2e1b0 100644 --- a/src/menu/modalconfig/index.jsx +++ b/src/menu/modalconfig/index.jsx @@ -127,10 +127,7 @@ index = i } - let label = item.label || '' - if (item.field && item.field.toLowerCase() !== label.toLowerCase()) { - label = label + ' (' + item.field + ')' - } + let label = `${item.field || ''}锛�${item.label}锛塦 if (['text', 'number', 'textarea', 'color'].includes(item.type) && card.field !== item.field) { _inputfields.push({ diff --git a/src/menu/stylecontroller/index.jsx b/src/menu/stylecontroller/index.jsx index 736abb5..80cde31 100644 --- a/src/menu/stylecontroller/index.jsx +++ b/src/menu/stylecontroller/index.jsx @@ -911,6 +911,20 @@ </Form.Item> </Col> </Panel> : null} + {options.includes('display') ? <Panel header="鏄剧ず" key="display"> + <Col span={24}> + <Form.Item + colon={false} + label={<SwapOutlined title="娴姩"/>} + labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} } + > + <Radio.Group style={{whiteSpace: 'nowrap'}} defaultValue={card.display || 'block'} onChange={(e) => this.changeNormalStyle(e.target.value, 'display')}> + <Radio value="block">鍧楃骇鍏冪礌</Radio> + <Radio value="inline-block">琛屽唴鍧楀厓绱�</Radio> + </Radio.Group> + </Form.Item> + </Col> + </Panel> : null} </Collapse> : null} </Form> <div style={{textAlign: 'right'}}> diff --git a/src/mob/modalconfig/index.jsx b/src/mob/modalconfig/index.jsx index 21f6370..97d305d 100644 --- a/src/mob/modalconfig/index.jsx +++ b/src/mob/modalconfig/index.jsx @@ -148,10 +148,7 @@ index = i } - let label = item.label || '' - if (item.field && item.field.toLowerCase() !== label.toLowerCase()) { - label = label + ' (' + item.field + ')' - } + let label = `${item.field || ''}锛�${item.label}锛塦 if (['text', 'number', 'textarea', 'color'].includes(item.type) && card.field !== item.field) { _inputfields.push({ diff --git a/src/tabviews/zshare/actionList/funcMegvii/index.jsx b/src/tabviews/zshare/actionList/funcMegvii/index.jsx index 7ff8bf6..2f8cdd5 100644 --- a/src/tabviews/zshare/actionList/funcMegvii/index.jsx +++ b/src/tabviews/zshare/actionList/funcMegvii/index.jsx @@ -7,7 +7,7 @@ import NApi from '@/api' import Utils from '@/utils/utils.js' -import Api from '@/api/w4k.js' +import Api from '@/api/direct.js' import MKEmitter from '@/utils/events.js' import MkIcon from '@/components/mk-icon' @@ -194,7 +194,7 @@ // let ip = 'http://localhost:3001' let ip = selectIp.face_ip - Api.login(ip, selectIp.face_uname, selectIp.face_pwd).then(result => { + Api.w4kLogin(ip, selectIp.face_uname, selectIp.face_pwd).then(result => { if (result.errors) { this.execPreError(result) return @@ -202,7 +202,7 @@ document.cookie = 'sessionID=' + result.session_id - Api.queryUsers(ip).then(res => { + Api.w4kQueryUsers(ip).then(res => { if (res.errors) { this.execPreError(res) return @@ -289,7 +289,7 @@ data.id_number = CryptoJS.enc.Base64.stringify(encrypted.ciphertext) } - Api.addUsers(ip, data).then(res => { + Api.w4kAddUsers(ip, data).then(res => { if (res.errors) { this.execPreError(res, data) return diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx index 99b5db8..0e665c5 100644 --- a/src/tabviews/zshare/actionList/printbutton/index.jsx +++ b/src/tabviews/zshare/actionList/printbutton/index.jsx @@ -1087,10 +1087,49 @@ } } + // execRfidPrint = () => { + // let type = 'HF' + // let printparamsJsonArray = [] + + // let mm = 12 + // if (type === 'HF') { + // printparamsJsonArray.push({PTK_OpenUSBPort: 255}); // 鎵撳紑鎵撳嵃鏈篣SB绔彛 + // printparamsJsonArray.push({PTK_ClearBuffer: ''}); // 娓呯┖缂撳瓨 + // printparamsJsonArray.push({PTK_SetDarkness: 10}); // 璁剧疆鎵撳嵃榛戝害 鍙栧�艰寖鍥� 0-20 + // printparamsJsonArray.push({PTK_SetPrintSpeed: 4}); // 璁剧疆鎵撳嵃閫熷害 + // printparamsJsonArray.push({PTK_SetDirection: 'B'}); // 璁剧疆鎵撳嵃鏂瑰悜 + // printparamsJsonArray.push({PTK_SetLabelHeight: 25*mm + ","+ 10*mm +","+ 0 +","+ false}); // 璁剧疆鏍囩楂樺害銆侀棿闅欏強鍋忕Щ + // printparamsJsonArray.push({PTK_SetLabelWidth: 60*mm}); // 璁剧疆鏍囩瀹藉害 + // printparamsJsonArray.push({PTK_SetRFID: 0+","+0+","+0+","+0+","+0}); // UHF RFID鎵撳嵃璁剧疆 + // printparamsJsonArray.push({PTK_RWRFIDLabel: 1+","+0+","+0+","+4+","+1+',EEBA99192945C746'}); + // printparamsJsonArray.push({PTK_DrawText_TrueType: "50,10,36,0,寰蒋闆呴粦,1,700,0,0,0,鍖椾含鏄庣鏈夐檺鍏徃"}); + // // printparamsJsonArray.push({PTK_DrawText_TrueType: x+","+y+","+FHeight+","+FWidth+","+FType+","+Fspin+","+FWeight+","+FItalic+","+FUnline+","+FStrikeOut+","+data}); + // // printparamsJsonArray.push({PTK_EncodeRFIDPC:'mkA040'}); + // printparamsJsonArray.push({PTK_PrintLabel:1+","+1}); + // printparamsJsonArray.push({PTK_CloseUSBPort: ""}); // 鍏抽棴USB閫氳绔彛 + // } + + // let data = { + // reqParam: '1', + // printparams: JSON.stringify(printparamsJsonArray) + // // printparams: JSON.stringify([{PTK_OpenUSBPort: 255},{PTK_ErrorReport_USBInterrupt: 'status:'},{PTK_GetPrinterDPI: 'DPI:'},{PTK_CloseUSBPort: ''}]) + // // printparams: JSON.stringify([{PTK_OpenUSBPort: 255},{PTK_RFIDCalibrate: ''},{PTK_CloseUSBPort: ''}]) + // } + + // Api.postekPrint(data).then(result => { + + // }) + // } + execPrint = (list, template, formdata) => { const { btn } = this.props let _errors = [] + // if (btn) { + // this.execRfidPrint() + // return + // } + let defaultPrinter = btn.verify.defaultPrinter || 'lackprinter' let printers = {} if (btn.verify.printerTypeList && btn.verify.printerTypeList.length > 0) { diff --git a/src/templates/modalconfig/index.jsx b/src/templates/modalconfig/index.jsx index f44811b..3adf6d8 100644 --- a/src/templates/modalconfig/index.jsx +++ b/src/templates/modalconfig/index.jsx @@ -257,10 +257,7 @@ index = i } - let label = item.label || '' - if (item.field && item.field.toLowerCase() !== label.toLowerCase()) { - label = label + ' (' + item.field + ')' - } + let label = `${item.field || ''}锛�${item.label}锛塦 if (['text', 'number', 'textarea', 'color'].includes(item.type) && card.field !== item.field) { _inputfields.push({ diff --git a/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx index 591bbc8..1c8b257 100644 --- a/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx +++ b/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx @@ -255,7 +255,7 @@ <Form {...formItemLayout}> <Row gutter={24}> <Col span={8}> - <Form.Item label={'鎵撳嵃妯″紡'}> + <Form.Item label="鎵撳嵃妯″紡"> {getFieldDecorator('printMode', { initialValue: printMode || 'normal' })( @@ -267,7 +267,7 @@ </Form.Item> </Col> <Col span={8}> - <Form.Item label={'閾炬帴绫诲瀷'}> + <Form.Item label="閾炬帴绫诲瀷"> {getFieldDecorator('linkType', { initialValue: linkType || 'system' })( diff --git a/src/views/billprint/index.scss b/src/views/billprint/index.scss index 0903dc2..fa8b84a 100644 --- a/src/views/billprint/index.scss +++ b/src/views/billprint/index.scss @@ -46,9 +46,6 @@ .g2-tooltip { display: none; } - .mk-action-space { - display: none; - } } .print-page { @@ -72,6 +69,15 @@ padding: 2px 8px!important; line-height: 1.5; } + .ant-table-placeholder { + display: none; + } + .ant-empty { + display: none; + } + .mk-action-space { + display: none; + } } .print-page.auto:last-child { height: auto!important; diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx index faa33c5..a84496f 100644 --- a/src/views/login/index.jsx +++ b/src/views/login/index.jsx @@ -300,6 +300,14 @@ // if (!res || !res.ip) return // sessionStorage.setItem('ipAddress', res.ip) // }) + if (window.GLOB.filter) { + let view = document.getElementById('mk-login-view') + + if (view) { + view.style.filter = 'grayscale(100%)' + } + } + if (sessionStorage.getItem('loginError')) { try { let res = JSON.parse(sessionStorage.getItem('loginError')) @@ -862,7 +870,7 @@ const { lineColor, bgImage, loginlogo, copyRight, webSite, ICP, loginWays, touristLogin } = this.state return ( - <div className="login-container" style={bgImage ? {backgroundImage: 'url(' + bgImage + ')'} : {}}> + <div className="login-container" id="mk-login-view" style={bgImage ? {backgroundImage: 'url(' + bgImage + ')'} : {}}> <div className="logo" style={lineColor ? {borderColor: lineColor} : {}}> {loginlogo ? <img src={loginlogo} alt=""/> : null} {this.state.platName ? <p className="plat-name">{this.state.platName}</p> : null} diff --git a/src/views/systemfunc/sidemenu/config.jsx b/src/views/systemfunc/sidemenu/config.jsx index f98e20f..6726114 100644 --- a/src/views/systemfunc/sidemenu/config.jsx +++ b/src/views/systemfunc/sidemenu/config.jsx @@ -248,5 +248,13 @@ MenuID: '1588493493409k9guqp067d31lu7blsv', MenuNo: 's_job_stepM', MenuName: '璁″垝浠诲姟', + }, { + src: '', + systems: ['production', 'local', 'SSO', 'cloud'], + PageParam: {OpenType: 'newtab', Template: 'BaseTable'}, + type: 'BaseTable', + MenuID: '1670296054432ab9d5c0pf76o93315ag', + MenuNo: 's_sys_job_history_M', + MenuName: '浠g悊浣滀笟璁板綍', }] }] -- Gitblit v1.8.0