From a29edbd4c670e1907e38e98f20257e5519745a4d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 08 十二月 2022 17:36:21 +0800
Subject: [PATCH] 2022-12-08
---
src/views/systemproc/index.scss | 9 ++
src/mob/components/topbar/normal-navbar/index.scss | 2
src/views/design/header/index.scss | 46 ++--------
src/views/design/header/index.jsx | 86 ++++++++++++---------
src/views/pcdesign/index.jsx | 2
src/mob/components/menubar/normal-menubar/menucomponent/options.jsx | 2
src/router/index.js | 2
src/components/mkIcon/index.jsx | 19 ++++
src/views/systemfunc/index.jsx | 4
src/views/systemproc/index.jsx | 26 ++++++
src/tabviews/custom/components/card/cardcellList/index.scss | 3
src/views/mobdesign/index.jsx | 8 +-
src/components/mk-icon/index.jsx | 2
13 files changed, 124 insertions(+), 87 deletions(-)
diff --git a/src/components/mk-icon/index.jsx b/src/components/mk-icon/index.jsx
index bb8a2ee..939b7ff 100644
--- a/src/components/mk-icon/index.jsx
+++ b/src/components/mk-icon/index.jsx
@@ -471,7 +471,7 @@
MkIcons[type](resProps)
)
} else {
- return <span className={'anticon ' + (resProps.className || '')} style={resProps.style || null} dangerouslySetInnerHTML={{ __html: type }}></span>
+ return <span className={'anticon anticon-mk ' + (resProps.className || '')} style={resProps.style || null} dangerouslySetInnerHTML={{ __html: type }}></span>
}
}
}
diff --git a/src/components/mkIcon/index.jsx b/src/components/mkIcon/index.jsx
index 0447f06..105f627 100644
--- a/src/components/mkIcon/index.jsx
+++ b/src/components/mkIcon/index.jsx
@@ -89,13 +89,26 @@
})
}
+ trigger = () => {
+ const { selectIcon, cusicons } = this.state
+
+ this.setState({visible: true})
+
+ if (cusicons.length > 0 && selectIcon && /<svg/.test(selectIcon)) {
+ setTimeout(() => {
+ let node = document.getElementById('mk-custom-tab')
+ node && node.click()
+ }, 200)
+ }
+ }
+
render() {
const { selectIcon, visible, icons, allowClear, cusicons } = this.state
return (
<div className="mk-icon-box">
{selectIcon ? <MkIcon type={selectIcon}/> : <span style={{color: '#bcbcbc'}}>璇烽�夋嫨</span>}
- <MkIcon className="trigger" onClick={() => this.setState({visible: true})} type="swap"/>
+ <MkIcon className="trigger" onClick={this.trigger} type="swap"/>
{allowClear && selectIcon ? <CloseCircleFilled className="close" onClick={() => this.checkIcon('')}/> : null}
<Modal
wrapClassName="mk-pop-modal mk-icon-wrap"
@@ -118,13 +131,13 @@
</Row>
</TabPane>
<TabPane tab={
- <span className="tab-control">
+ <span className="tab-control" id="mk-custom-tab">
<RedoOutlined onClick={(e) => {this.getIcons()}}/>
鑷畾涔�
</span>
} key="scripts">
<Row>
- {cusicons.map(icon => <Col key={icon.id} span={4} onClick={() => this.checkIcon(icon.icon_svg)}>
+ {cusicons.map(icon => <Col className={icon.icon_svg === selectIcon ? 'active' : ''} key={icon.id} span={4} onClick={() => this.checkIcon(icon.icon_svg)}>
<MkIcon type={icon.icon_svg} />
</Col>)}
</Row>
diff --git a/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx b/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx
index 8e189c7..5ce1a43 100644
--- a/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx
+++ b/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx
@@ -204,7 +204,7 @@
field: 'primaryId',
label: '闈欐�佷富閿��',
initval: setting.primaryId || '',
- tooltip: '鍙綔涓築ID浼犲埌涓嬩竴椤甸潰銆�',
+ tooltip: '鍙綔涓築ID浼犲埌涓嬩竴椤甸潰銆傛敞锛欯userid@浼氭浛鎹负鐢ㄦ埛ID銆�',
required: false
}
]
diff --git a/src/mob/components/topbar/normal-navbar/index.scss b/src/mob/components/topbar/normal-navbar/index.scss
index 80403dc..eb91cad 100644
--- a/src/mob/components/topbar/normal-navbar/index.scss
+++ b/src/mob/components/topbar/normal-navbar/index.scss
@@ -39,7 +39,7 @@
.img {
width: 30px;
height: 30px;
- border-radius: 4px;
+ border-radius: 30px;
margin-top: 9px;
margin-right: 5px;
background-size: cover;
diff --git a/src/router/index.js b/src/router/index.js
index ab91632..b384ad4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -25,6 +25,7 @@
const Interface = asyncLoadComponent(() => import('@/views/interface'))
const RoleManage = asyncLoadComponent(() => import('@/views/rolemanage'))
const SystemFunc = asyncLoadComponent(() => import('@/views/systemfunc'))
+const SystemProc = asyncLoadComponent(() => import('@/views/systemproc'))
const routers = [
{path: '/login', name: 'login', component: Login, auth: false},
@@ -47,6 +48,7 @@
{path: '/tab/:menuId', name: 'tab', component: MainParams, auth: false},
{path: '/role/:param', name: 'role', component: RoleManage, auth: true},
{path: '/hs', name: 'hs', component: SystemFunc, auth: true},
+ {path: '/proc', name: 'proc', component: SystemProc, auth: true},
{path: '/interface', name: 'interface', component: Interface, auth: true}
]
diff --git a/src/tabviews/custom/components/card/cardcellList/index.scss b/src/tabviews/custom/components/card/cardcellList/index.scss
index fa2af83..587b487 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.scss
+++ b/src/tabviews/custom/components/card/cardcellList/index.scss
@@ -33,6 +33,9 @@
}
span {
text-indent: 0px;
+ font-style: inherit;
+ font-weight: inherit;
+ text-decoration: inherit;
}
}
.ant-mk-text:not(.line1):not(.line) {
diff --git a/src/views/design/header/index.jsx b/src/views/design/header/index.jsx
index 01a85fd..eb9e26a 100644
--- a/src/views/design/header/index.jsx
+++ b/src/views/design/header/index.jsx
@@ -2,7 +2,7 @@
import { withRouter } from 'react-router-dom'
import {connect} from 'react-redux'
import { Dropdown, Menu, Modal, notification, Switch, Button, Popover } from 'antd'
-import { MenuFoldOutlined, SettingOutlined, AppstoreOutlined, DownOutlined, HomeOutlined, ApiOutlined, PlusOutlined, EditOutlined, MenuOutlined } from '@ant-design/icons'
+import { MenuFoldOutlined, SettingOutlined, AppstoreOutlined, DownOutlined, HomeOutlined, ApiOutlined, PlusOutlined, EditOutlined, MenuOutlined, DatabaseOutlined } from '@ant-design/icons'
import moment from 'moment'
import asyncComponent from '@/utils/asyncComponent'
@@ -452,45 +452,55 @@
<SettingOutlined className="edit-check"/>
</Popover> : null}
{/* window.btoa(window.encodeURIComponent(JSON.stringify({ MenuType: 'home', MenuId: 'home_page_id', MenuName: '棣栭〉' }))) */}
- {window.GLOB.systemType !== 'production' ?
- <div className="home-entrance entrance">
- <div className="icon"><HomeOutlined /></div>
- <div className="title">棣栭〉</div>
- <div className="detail">鍩轰簬鑷畾涔夐〉闈㈢殑棣栭〉璁捐锛屽彲瀹炵幇鐏垫椿鐨勫厓绱犻厤缃強鏍峰紡璋冩暣锛屽睍鐜板綋鍓嶇郴缁熺殑椋庢牸銆�</div>
- <Button type="primary" disabled={!(memberLevel >= 20)} title={memberLevel >= 20 ? '' : '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��'} onClick={() => {window.open('#/menudesign/JTdCJTIyTWVudVR5cGUlMjIlM0ElMjJob21lJTIyJTJDJTIyTWVudUlkJTIyJTNBJTIyaG9tZV9wYWdlX2lkJTIyJTJDJTIyTWVudU5hbWUlMjIlM0ElMjIlRTklQTYlOTYlRTklQTElQjUlMjIlN0Q=')}}>
- 缂栬緫
- </Button>
- </div> : null
- }
- <div className="api-entrance entrance">
- <div className="icon"><ApiOutlined /></div>
- <div className="title">鎺ュ彛璋冭瘯</div>
- <div className="detail">鍙嚜鍔ㄥ鐞嗙櫥褰曟帴鍙ｇ殑鍙傛暟鍔犲瘑锛屼互鍙婁笟鍔℃帴鍙ｇ殑绛惧悕璁＄畻锛屾柟渚垮紑鍙戜汉鍛樼殑鎺ュ彛娴嬭瘯宸ヤ綔銆�</div>
- <Button type="primary" disabled={!(memberLevel >= 20)} title={memberLevel >= 20 ? '' : '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��'} onClick={() => {window.open('#/interface')}}>
- 缂栬緫
- </Button>
- </div>
- <div className="app-entrance entrance">
- <div className="icon"><AppstoreOutlined /></div>
- <div className="title">搴旂敤绠＄悊</div>
- <div className="detail">鍙垱寤哄強绠＄悊PC銆乸ad鍙婄Щ鍔ㄧ绛変笉鍚岃澶囩殑搴旂敤锛屽疄鐜版槑绉戜簯APP銆佸井淇″叕浼楀彿銆佸皬绋嬪簭绛夊骞冲彴鐨勫簲鐢ㄥ叡浜��</div>
- {window.GLOB.systemType !== 'production' ?
- <Button type="primary" disabled={!(memberLevel >= 20)} title={memberLevel >= 20 ? '' : '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��'} onClick={() => {window.open('#/appmanage')}}>
- 缂栬緫
- </Button> :
- <Button type="primary" disabled={!(memberLevel >= 20)} title={memberLevel >= 20 ? '' : '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��'} onClick={() => {window.open('#/appcheck')}}>
- 鏌ョ湅
- </Button>
+ <div className="entrance-wrap">
+ {window.GLOB.systemType !== 'production' ?
+ <div className="entrance">
+ <div className="icon"><HomeOutlined /></div>
+ <div className="title">棣栭〉</div>
+ <div className="detail">鍩轰簬鑷畾涔夐〉闈㈢殑棣栭〉璁捐锛屽彲瀹炵幇鐏垫椿鐨勫厓绱犻厤缃強鏍峰紡璋冩暣锛屽睍鐜板綋鍓嶇郴缁熺殑椋庢牸銆�</div>
+ <Button type="primary" disabled={!(memberLevel >= 20)} title={memberLevel >= 20 ? '' : '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��'} onClick={() => {window.open('#/menudesign/JTdCJTIyTWVudVR5cGUlMjIlM0ElMjJob21lJTIyJTJDJTIyTWVudUlkJTIyJTNBJTIyaG9tZV9wYWdlX2lkJTIyJTJDJTIyTWVudU5hbWUlMjIlM0ElMjIlRTklQTYlOTYlRTklQTElQjUlMjIlN0Q=')}}>
+ 缂栬緫
+ </Button>
+ </div> : null
}
+ <div className="entrance">
+ <div className="icon"><ApiOutlined /></div>
+ <div className="title">鎺ュ彛璋冭瘯</div>
+ <div className="detail">鍙嚜鍔ㄥ鐞嗙櫥褰曟帴鍙ｇ殑鍙傛暟鍔犲瘑锛屼互鍙婁笟鍔℃帴鍙ｇ殑绛惧悕璁＄畻锛屾柟渚垮紑鍙戜汉鍛樼殑鎺ュ彛娴嬭瘯宸ヤ綔銆�</div>
+ <Button type="primary" disabled={!(memberLevel >= 20)} title={memberLevel >= 20 ? '' : '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��'} onClick={() => {window.open('#/interface')}}>
+ 缂栬緫
+ </Button>
+ </div>
+ <div className="entrance">
+ <div className="icon"><AppstoreOutlined /></div>
+ <div className="title">搴旂敤绠＄悊</div>
+ <div className="detail">鍙垱寤哄強绠＄悊PC銆乸ad鍙婄Щ鍔ㄧ绛変笉鍚岃澶囩殑搴旂敤锛屽疄鐜版槑绉戜簯APP銆佸井淇″叕浼楀彿銆佸皬绋嬪簭绛夊骞冲彴鐨勫簲鐢ㄥ叡浜��</div>
+ {window.GLOB.systemType !== 'production' ?
+ <Button type="primary" disabled={!(memberLevel >= 20)} title={memberLevel >= 20 ? '' : '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��'} onClick={() => {window.open('#/appmanage')}}>
+ 缂栬緫
+ </Button> :
+ <Button type="primary" disabled={!(memberLevel >= 20)} title={memberLevel >= 20 ? '' : '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��'} onClick={() => {window.open('#/appcheck')}}>
+ 鏌ョ湅
+ </Button>
+ }
+ </div>
+ {window.GLOB.systemType !== 'production' ? <div className="entrance">
+ <div className="icon"><MenuOutlined /></div>
+ <div className="title">鑿滃崟鎿嶄綔璇存槑</div>
+ <div className="detail">榧犳爣鎮仠 <SettingOutlined style={{color: '#1890ff'}}/> 鍙樉绀鸿彍鍗曠殑娣诲姞銆佹帓搴忥紙鍖呮嫭缂栬緫銆佸垹闄わ級涓庤В鍐诲姛鑳斤紝鍙屽嚮涓夌骇鑿滃崟鍙繘鍏ョ紪杈戠獥鍙ｃ��</div>
+ <Button type="primary" onClick={() => {window.open('#/main')}}>
+ 鏂扮獥鍙�
+ </Button>
+ </div> : null}
+ {window.GLOB.systemType !== 'production' ? <div className="entrance">
+ <div className="icon"><DatabaseOutlined /></div>
+ <div className="title">瀛樺偍杩囩▼</div>
+ <div className="detail">鍙湪椤甸潰涓煡鐪嬫垨缂栬緫鏈湴瀛樺偍杩囩▼銆�</div>
+ <Button type="primary" onClick={() => {window.open('#/proc')}}>
+ 缂栬緫
+ </Button>
+ </div> : null}
</div>
- {window.GLOB.systemType !== 'production' ? <div className="menu-entrance entrance">
- <div className="icon"><MenuOutlined /></div>
- <div className="title">鑿滃崟鎿嶄綔璇存槑</div>
- <div className="detail">榧犳爣鎮仠 <SettingOutlined style={{color: '#1890ff'}}/> 鍙樉绀鸿彍鍗曠殑娣诲姞銆佹帓搴忥紙鍖呮嫭缂栬緫銆佸垹闄わ級涓庤В鍐诲姛鑳斤紝鍙屽嚮涓夌骇鑿滃崟鍙繘鍏ョ紪杈戠獥鍙ｃ��</div>
- <Button type="primary" onClick={() => {window.open('#/main')}}>
- 鏂扮獥鍙�
- </Button>
- </div> : null}
{/* 缂栬緫鑿滃崟 */}
{editLevel === 'level1' ? <EditMenu menulist={this.state.menulist} reload={this.reload} exitEdit={this.exitEdit}/> : null}
{/* 澶村儚銆佺敤鎴峰悕 */}
diff --git a/src/views/design/header/index.scss b/src/views/design/header/index.scss
index 587ca14..aef0f9b 100644
--- a/src/views/design/header/index.scss
+++ b/src/views/design/header/index.scss
@@ -113,43 +113,16 @@
margin-left: 10px;
cursor: pointer;
}
- .level4-close {
- position: relative;
- top: 13px;
- left: 20px;
- height: 26px;
- padding: 0 10px;
- z-index: 2;
- }
- .mobile {
- position: absolute;
- top: 135px;
- right: 50px;
- color: #1890ff;
- cursor: pointer;
- }
- .interface {
- position: absolute;
- top: 170px;
- right: 50px;
- color: #1890ff;
- cursor: pointer;
- }
- .home-entrance {
- left: 260px;
- }
- .api-entrance {
- left: 540px;
- }
- .app-entrance {
- left: 820px;
- }
- .menu-entrance {
- left: 1100px;
- }
- .entrance {
+
+ .entrance-wrap {
position: absolute;
top: 100px;
+ left: 240px;
+ width: calc(100vw - 270px);
+ }
+ .entrance {
+ margin-left: 30px;
+ margin-bottom: 30px;
background: #ffffff;
box-shadow: 0 0 5px #d9d9d9;
border-radius: 5px;
@@ -157,6 +130,8 @@
height: 250px;
color: rgba(0, 0, 0, 0.85);
text-align: center;
+ display: inline-block;
+ vertical-align: top;
.icon {
text-align: center;
padding: 15px 0px;
@@ -180,6 +155,7 @@
color: rgba(0, 0, 0, 0.65);
text-align: center;
padding: 0 10px;
+ min-height: 60px;
}
.ant-btn {
margin-top: 15px;
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index 1eed346..c392429 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -631,11 +631,11 @@
let appIndeList = sessionStorage.getItem('appViewList')
appIndeList = JSON.parse(appIndeList)
- appIndeList = appIndeList.map(item => (item.keys_type !== 'index' ? item.keys_id : '')).join(',')
+ appIndeList = appIndeList.map(item => (item.keys_type === 'navbar' ? item.keys_id : '')).join(',')
- if (sessionStorage.getItem('userbind')) {
- appIndeList = appIndeList + ',' + sessionStorage.getItem('userbind')
- }
+ // if (sessionStorage.getItem('userbind')) {
+ // appIndeList = appIndeList + ',' + sessionStorage.getItem('userbind')
+ // }
if (sessionStorage.getItem('instantMessage')) {
appIndeList = appIndeList + ',' + sessionStorage.getItem('instantMessage')
}
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index fa764b8..a9f4e5e 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -711,7 +711,7 @@
let appIndeList = sessionStorage.getItem('appViewList')
appIndeList = JSON.parse(appIndeList)
- appIndeList = appIndeList.map(item => (item.keys_type !== 'index' ? item.keys_id : '')).join(',')
+ appIndeList = appIndeList.map(item => (item.keys_type === 'navbar' ? item.keys_id : '')).join(',')
let menus = res.menus.filter(item => appIndeList.indexOf(item.MenuID) === -1)
menus = menus.map(item => {
diff --git a/src/views/systemfunc/index.jsx b/src/views/systemfunc/index.jsx
index 6fd02fb..26ae9c0 100644
--- a/src/views/systemfunc/index.jsx
+++ b/src/views/systemfunc/index.jsx
@@ -1,6 +1,5 @@
import React, {Component} from 'react'
import { ConfigProvider } from 'antd'
-import enUS from 'antd/es/locale/en_US'
import zhCN from 'antd/es/locale/zh_CN'
import asyncComponent from '@/utils/asyncComponent'
@@ -10,7 +9,6 @@
import './index.scss'
const Tabview = asyncComponent(() => import('@/components/tabview'))
-const _locale = sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
class Design extends Component {
UNSAFE_componentWillMount() {
@@ -30,7 +28,7 @@
render () {
return (
<div className="mk-hs-view">
- <ConfigProvider locale={_locale}>
+ <ConfigProvider locale={zhCN}>
<Sidemenu key="sidemenu"/>
<Tabview key="tabview"/>
<Header key="header"/>
diff --git a/src/views/systemproc/index.jsx b/src/views/systemproc/index.jsx
new file mode 100644
index 0000000..734e26b
--- /dev/null
+++ b/src/views/systemproc/index.jsx
@@ -0,0 +1,26 @@
+import React, {Component} from 'react'
+import { ConfigProvider } from 'antd'
+import zhCN from 'antd/es/locale/zh_CN'
+
+// import Api from '@/api'
+// import Utils from '@/utils/utils.js'
+import Header from '../systemfunc/header'
+import './index.scss'
+
+class SSOLogin extends Component {
+ UNSAFE_componentWillMount() {
+
+ }
+
+ render () {
+ return (
+ <div className="mk-proc-view">
+ <ConfigProvider locale={zhCN}>
+ <Header key="header"/>
+ </ConfigProvider>
+ </div>
+ )
+ }
+}
+
+export default SSOLogin
\ No newline at end of file
diff --git a/src/views/systemproc/index.scss b/src/views/systemproc/index.scss
new file mode 100644
index 0000000..567e4ef
--- /dev/null
+++ b/src/views/systemproc/index.scss
@@ -0,0 +1,9 @@
+.mk-proc-view {
+ .sys-header-container {
+ color: rgba(255, 255, 255, 0.65);
+ background: #001529;
+ .title {
+ display: none;
+ }
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0