From bcbc6eea0677eb0179b828238a38be0ba67ecc95 Mon Sep 17 00:00:00 2001
From: Mr Ke <kelq@hugeinfo.com.cn>
Date: Mon, 06 Apr 2020 10:21:28 +0800
Subject: [PATCH] 修改antd主题颜色
---
src/index.js | 8 +-
src/pages/index/workbench.jsx | 41 +++++++++++++
src/menu/menu.data.js | 60 +++++++++----------
src/style/reset.scss | 11 +--
src/api/httpurl.js | 1
config-overrides.js | 4
6 files changed, 79 insertions(+), 46 deletions(-)
diff --git a/config-overrides.js b/config-overrides.js
index 5ecc03e..d952fdd 100644
--- a/config-overrides.js
+++ b/config-overrides.js
@@ -8,7 +8,7 @@
style: true
}),
addLessLoader({
- javascriptEnabled: true
- // modifyVars: { '@primary-color': '#58bc58' }
+ javascriptEnabled: true,
+ modifyVars: { '@primary-color': '#CC4E45' }
})
);
diff --git a/src/api/httpurl.js b/src/api/httpurl.js
index 394af97..8cbaac2 100644
--- a/src/api/httpurl.js
+++ b/src/api/httpurl.js
@@ -28,5 +28,4 @@
NSF: 89
};
-
export { BASE_URL, NetworkState, MockUrl };
diff --git a/src/index.js b/src/index.js
index 4b40639..fe268fd 100644
--- a/src/index.js
+++ b/src/index.js
@@ -20,6 +20,7 @@
import Index from './pages/Index';
import Login from './pages/login/login';
import JurisdictionPersonMgt from './pages/collect/jurisdictionPersonMgt'; //信息采集--辖区人口管理
+import Workbench from './pages/index/workbench'; //首页--工作台
const { Content } = Layout;
const history = createHashHistory();
@@ -39,11 +40,8 @@
</Switch>
<Content>
<Switch>
- {/* 信息采集 */}
- <Route
- path="/collect/jurisdictionPersonMgt"
- component={JurisdictionPersonMgt}
- />
+ {/* 首页 */}
+ <Route path="/index/workbench" component={Workbench} />
<Route path="/login" component={Login} />
diff --git a/src/menu/menu.data.js b/src/menu/menu.data.js
index 54ca38c..f2ca0af 100644
--- a/src/menu/menu.data.js
+++ b/src/menu/menu.data.js
@@ -5,44 +5,42 @@
*/
const menus = [
{
- key: '0',
+ key: 'index',
name: '首页',
path: '/app',
icon: 'home',
permKey: 'menu.home',
- children: [],
+ children: [{
+ key: 'index_workbench',
+ name: '工作台',
+ path: '/index/workbench',
+ permKey: '/index/workbench',
+ children: []
+ }],
},
// {
- // key: '2',
- // name: '系统配置',
- // path: '/app/system',
- // icon: 'laptop',
- // permKey: 'menu.system',
- // children: [],
+ // key: 'collect',
+ // name: '信息采集',
+ // path: '/collect',
+ // icon: 'user',
+ // permKey: 'menu.users',
+ // children: [
+ // {
+ // key: 'collect_jurisdictionPersonMgt',
+ // name: '辖区人口管理',
+ // path: '/collect/jurisdictionPersonMgt',
+ // permKey: 'collect_jurisdictionPersonMgt',
+ // children: [],
+ // },
+ // {
+ // key: 'collect_personhouseMgt',
+ // name: '查人查房管理',
+ // path: '/collect/personhouseMgt',
+ // permKey: 'collect_personhouseMgt',
+ // children: [],
+ // }
+ // ],
// },
- {
- key: 'collect',
- name: '信息采集',
- path: '/collect',
- icon: 'user',
- permKey: 'menu.users',
- children: [
- {
- key: 'collect_jurisdictionPersonMgt',
- name: '辖区人口管理',
- path: '/collect/jurisdictionPersonMgt',
- permKey: 'collect_jurisdictionPersonMgt',
- children: [],
- },
- {
- key: 'collect_personhouseMgt',
- name: '查人查房管理',
- path: '/collect/personhouseMgt',
- permKey: 'collect_personhouseMgt',
- children: [],
- }
- ],
- },
];
export default menus;
diff --git a/src/pages/index/workbench.jsx b/src/pages/index/workbench.jsx
new file mode 100644
index 0000000..b56a768
--- /dev/null
+++ b/src/pages/index/workbench.jsx
@@ -0,0 +1,41 @@
+/* eslint-disable */
+/**柯礼钦
+ * 4/6/2020, 10:16:55 AM
+ * doc comment for the file goes here
+ */
+
+/** 首页 -- 工作台 */
+import React, { ReactNode, ReactEventHandler, Component } from 'react';
+// import { Link } from 'react-router-dom';
+// import { Icon } from 'antd';
+
+export default class Workbench extends Component {
+ constructor(props) {
+ super(props);
+ this.config = {
+ };
+ this.state = {
+ };
+ }
+
+ componentWillMount() { }
+
+ componentDidMount() { }
+
+ componentDidShow() { }
+
+ render() {
+ return (
+ <div className="workbench-main">
+
+ </div>
+ )
+ }
+}
+//export default function Workbench({ }) {
+// return (
+// <div className="workbench-main">
+//
+// </div>
+// )
+//}
diff --git a/src/style/reset.scss b/src/style/reset.scss
index b5e0fab..b6fc7af 100644
--- a/src/style/reset.scss
+++ b/src/style/reset.scss
@@ -1,10 +1,7 @@
-.ant-layout-content {
- margin: 22px 24px;
- background: #fff;
- height: 100%;
- padding: 18px;
-}
-
.margin-bottom {
margin-bottom: 20px;
}
+
+.ant-layout-sider-trigger{
+ background: #CC4E45;
+}
--
Gitblit v1.8.0