From 662e5ac2ae7537dfd0b6bb7e4d35f3d4cb098b91 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 30 Oct 2023 15:27:51 +0800
Subject: [PATCH] =?UTF-8?q?conf:=20=E8=B0=83=E6=95=B4=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.jsx           | 15 +++++++++------
 src/views/Welcome.jsx | 26 ++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 src/views/Welcome.jsx

diff --git a/src/App.jsx b/src/App.jsx
index 7dd8e9c..7900f94 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -10,7 +10,7 @@ import {
   DollarOutlined,
   AreaChartOutlined,
   WechatOutlined,
-  UserOutlined, FlagOutlined, PieChartOutlined, BarChartOutlined
+  UserOutlined, FlagOutlined, PieChartOutlined, BarChartOutlined, CoffeeOutlined,
 } from '@ant-design/icons';
 import { Layout, Menu, Image, Badge } from 'antd';
 import { BrowserRouter, Route, Routes, NavLink } from 'react-router-dom';
@@ -39,13 +39,15 @@ import ExchangeRate from './charts/ExchangeRate';
 import KPI from './views/KPI';
 import Distribution from './views/Distribution';
 import Detail from './views/Detail';
+import Welcome from './views/Welcome';
 
 const App = () => {
   const { Content, Footer, Sider } = Layout;
   const { auth_store } = useContext(stores_Context);
 
   const menu_items = [
-    { key: 1, label: <NavLink to="/">主页</NavLink>, icon: <HomeOutlined /> },
+    { key: 1, label: <NavLink to="/">欢迎</NavLink>, icon: <CoffeeOutlined /> },
+    { key: 'annual', label: <NavLink to="/annual">综合看板</NavLink>, icon: <BarChartOutlined /> },
     {
       key: 2,
       label: '市场',
@@ -176,8 +178,12 @@ const App = () => {
             }}
           >
             <Routes>
-              <Route path="/" element={<Home />} />
+              <Route path="/" element={<Welcome />} />
               <Route path="/detail" element={<Detail />} />
+              <Route element={<ProtectedRoute auth={['admin', 'director_bu']} />}>
+                <Route path="/annual" element={<Home />} />
+                <Route path="/kpi" element={<KPI />} />
+              </Route>
               <Route element={<ProtectedRoute auth={['admin', 'director_bu', 'marketing']} />}>
                 <Route path="/orders" element={<Orders />} />
                 <Route path="/orders_sub/:ordertype/:ordertype_sub/:ordertype_title" element={<Orders_sub />} />
@@ -198,9 +204,6 @@ const App = () => {
                 <Route path="/credit_card_bill" element={<Credit_card_bill />} />
                 <Route path="/exchange_rate" element={<ExchangeRate />} />
               </Route>
-              <Route element={<ProtectedRoute auth={['admin', 'director_bu']} />}>
-                <Route path="/kpi" element={<KPI />} />
-              </Route>
               <Route element={<ProtectedRoute auth={['admin', 'director_bu', 'sale']} />}>
                 <Route path="/sale" element={<Sale />} />
                 <Route path="/sale_sub/:type_sub" element={<Sale_sub />} />
diff --git a/src/views/Welcome.jsx b/src/views/Welcome.jsx
new file mode 100644
index 0000000..19ff3da
--- /dev/null
+++ b/src/views/Welcome.jsx
@@ -0,0 +1,26 @@
+import { useContext } from 'react';
+import { observer } from "mobx-react";
+import { stores_Context } from '../config';
+import { Table } from 'antd';
+import {
+    SlackOutlined,
+    SketchOutlined,
+    AntCloudOutlined,
+    RedditOutlined,
+    GithubOutlined
+} from '@ant-design/icons';
+
+export default observer((props) => {
+  // const {  } = useContext(stores_Context);
+    return (
+      <>
+      <div>
+          <SketchOutlined/> <AntCloudOutlined/> <SlackOutlined/> <RedditOutlined/> <GithubOutlined/>
+          <br/>
+          欢迎
+          <br/>
+          <SketchOutlined/> <AntCloudOutlined/> <SlackOutlined/> <RedditOutlined/> <GithubOutlined/>
+      </div>
+      </>
+    );
+});