From f398d51991323eb7a788a0b34cea30b754d7b0d9 Mon Sep 17 00:00:00 2001
From: xuyucheng <Nd17cCxTS4SSDDh21SaA>
Date: Fri, 26 Nov 2021 15:11:38 +0800
Subject: [PATCH] build

---
 nginx.conf                                    |  2 +-
 public/index.html                             |  2 +-
 public/manifest.json                          | 25 -------
 src/api/request.js                            |  9 ++-
 src/assets/style/general.css                  |  2 +-
 src/pages/home/branch/dashboard.js            | 46 ++++++-------
 src/pages/home/branch/service.js              | 10 +--
 src/pages/home/branch/userBranch/company.js   |  8 +--
 .../home/branch/userBranch/invitation.js      |  8 +--
 src/pages/home/branch/userBranch/login.js     |  8 +--
 src/pages/home/branch/userBranch/mail.js      |  8 +--
 src/pages/home/branch/userBranch/userInfo.js  | 66 +++++++++----------
 src/pages/home/side.js                        | 10 +--
 src/pages/user/index.js                       | 11 +++-
 14 files changed, 96 insertions(+), 119 deletions(-)
 delete mode 100644 public/manifest.json

diff --git a/nginx.conf b/nginx.conf
index ec1ebd6..4b9507d 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -15,7 +15,7 @@ http {
   sendfile on;
   keepalive_timeout 65;
   server {
-    listen 5555;
+    listen 51004;
     server_name localhost;
     location / {
       root /app;
diff --git a/public/index.html b/public/index.html
index 54295ce..0b71943 100644
--- a/public/index.html
+++ b/public/index.html
@@ -14,7 +14,7 @@
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <!-- <link rel="manifest" href="%PUBLIC_URL%/manifest.json" /> -->
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
diff --git a/public/manifest.json b/public/manifest.json
deleted file mode 100644
index 080d6c7..0000000
--- a/public/manifest.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "logo512.png",
-      "type": "image/png",
-      "sizes": "512x512"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}
diff --git a/src/api/request.js b/src/api/request.js
index 23a97c6..72ca500 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -1,4 +1,5 @@
 import axios from 'axios'
+import { message } from 'antd'
 
 axios.defaults.timeout = 3000;
 axios.defaults.baseURL = 'http://console.fecribd.com/'
@@ -20,7 +21,11 @@ axios.interceptors.response.use(function (response) {
     return Promise.reject(response);
   }
 }, function (error) {
-  console.log('拦截器报错');
+  const { status } = error.response;
+  if (status === 401) {
+    message.warning("认证失效，请重新登录");
+    window.location.href = '/#/login'
+  }
   return Promise.reject(error);
 });
 
@@ -71,7 +76,7 @@ const api = {
   BlobGet: function (path = '', data = {}) {
     return new Promise(function (resolve, reject) {
       axios.get(
-        path,{ params: data },{ responseType: 'blob'})
+        path, { params: data }, { responseType: 'blob' })
         .then(function (response) {
           const blob = new Blob([response.data]);
           resolve(window.URL.createObjectURL(blob));
diff --git a/src/assets/style/general.css b/src/assets/style/general.css
index c600d94..4e9c1b0 100644
--- a/src/assets/style/general.css
+++ b/src/assets/style/general.css
@@ -151,7 +151,7 @@ p{
 .ant-card-body{
   height: calc(100% - 50px);
   overflow: auto;
-  padding: 30px 20px 20px 20px;
+  padding: 10px 20px 20px 20px;
 }
 
 .content-p{
diff --git a/src/pages/home/branch/dashboard.js b/src/pages/home/branch/dashboard.js
index 61f11d4..e13adaa 100644
--- a/src/pages/home/branch/dashboard.js
+++ b/src/pages/home/branch/dashboard.js
@@ -19,9 +19,9 @@ class Dashboard extends Component {
         { name: 'Project Wombat', start_date: "01/01/2020", end_date: '31/06/2020', status: 0, assignee: 'Vanessa Tucker' },
       ],
       columns: [
-        { title: 'Name', dataIndex: 'name', key: 'name' },
-        { title: 'Start Date', dataIndex: 'start_date', key: 'start_date' },
-        { title: 'End Date', dataIndex: 'end_date', key: 'end_date' },
+        { title: '企业名称', dataIndex: 'name', key: 'name' },
+        { title: '所属行业', dataIndex: 'start_date', key: 'start_date' },
+        { title: '认证日期', dataIndex: 'end_date', key: 'end_date' },
         {
           title: 'Status', dataIndex: 'status', key: 'status', render: tags => (
             <Tag color={tags === 1 ? '#87d068' : tags === 0 ? "#55acee" : "#cd201f"}>
@@ -29,7 +29,7 @@ class Dashboard extends Component {
             </Tag>
           ),
         },
-        { title: 'Assignee', dataIndex: 'assignee', key: 'assignee' },
+        { title: '评价信息', dataIndex: 'assignee', key: 'assignee' },
       ]
     }
   }
@@ -95,7 +95,6 @@ class Dashboard extends Component {
   }
 
   initPie() {
-    console.log(document.getElementById('pie'))
     const myChart = echarts.init(document.getElementById('pie'))
     myChart.setOption({
       grid: {
@@ -107,9 +106,6 @@ class Dashboard extends Component {
         height: '100%'
       },
       color: ['#377AE4', '#F4C100', '#FF3525'],
-      tooltip: {
-        trigger: 'item'
-      },
       series: [
         {
           name: 'Data',
@@ -124,9 +120,9 @@ class Dashboard extends Component {
             borderColor: '#fff',
           },
           data: [
-            { value: 4306, name: 'Chrome' },
-            { value: 3801, name: 'Firefox' },
-            { value: 1689, name: 'IE' },
+            { value: 4306, name: '电子行业' },
+            { value: 3801, name: '服务行业' },
+            { value: 1689, name: '金融行业' },
           ]
         }
       ]
@@ -149,42 +145,42 @@ class Dashboard extends Component {
       <React.Fragment>
         <Row gutter={32} style={{ marginBottom: '20px' }}>
           <Col span={4}>
-            <Card title='Sales' style={{ marginBottom: '20px' }}>
-              <p className='content-p'>2.382</p>
+            <Card title='留言反馈' style={{ marginBottom: '20px' }}>
+              <p className='content-p'>282</p>
               <span><span className='reduce'>-3.65%</span> Since last week</span>
             </Card>
-            <Card title='Visitors'>
-              <p className='content-p'>14.212</p>
+            <Card title='新增注册'>
+              <p className='content-p'>1413</p>
               <span><span className='increase'>5.25%</span> Since last week</span>
             </Card>
           </Col>
           <Col span={4}>
-            <Card title='Earnings' style={{ marginBottom: '20px' }}>
-              <p className='content-p'>$21.300</p>
+            <Card title='新增认证' style={{ marginBottom: '20px' }}>
+              <p className='content-p'>523</p>
               <span><span className='increase'>6.65%</span> Since last week</span>
             </Card>
-            <Card title='Order'>
-              <p className='content-p'>64</p>
+            <Card title='新增评测'>
+              <p className='content-p'>66</p>
               <span><span className='reduce'>-2.25%</span> Since last week</span>
             </Card>
           </Col>
           <Col span={16}>
-            <Card title='Recent Movement'>
+            <Card title='留言反馈'>
               <div id='line' style={{ width: '100%', height: '255%' }}></div>
             </Card>
           </Col>
         </Row>
         <Row gutter={32} style={{ paddingBottom: '20px' }}>
           <Col span={8}>
-            <Card title='Browser Usage'>
+            <Card title='行业分布'>
               <div id='pie' style={{ width: '100%', height: '300px' }}></div>
-              <p className='space-word'><span>Chrome</span><span>4306</span></p>
-              <p className='space-word'><span>Firefox</span><span>3801</span></p>
-              <p className='space-word'><span>IE</span><span>1689</span></p>
+              <p className='space-word'><span>电子行业</span><span>4306</span></p>
+              <p className='space-word'><span>服务行业</span><span>3801</span></p>
+              <p className='space-word'><span>金融行业</span><span>1689</span></p>
             </Card>
           </Col>
           <Col span={16}>
-            <Card title="Last Projects">
+            <Card title="新增企业信息">
               <Table style={{ marginTop: '30px' }} pagination={false} dataSource={this.state.data} columns={this.state.columns}></Table>
             </Card>
           </Col>
diff --git a/src/pages/home/branch/service.js b/src/pages/home/branch/service.js
index d4415e4..29ba2ea 100644
--- a/src/pages/home/branch/service.js
+++ b/src/pages/home/branch/service.js
@@ -37,8 +37,8 @@ class ServiceList extends Component {
       .then(res => {
         this.setState({
           targetData: res.data,
-          columns: Object.keys(res.data[0]).map(key => {
-            return { title: key, dataIndex: key, align: 'center' }
+          columns: Object.keys(res.data[0]).map((key,i) => {
+            return { title: key, dataIndex: key, align: 'center',key:i }
           }),
           total: res.total
         })
@@ -56,8 +56,8 @@ class ServiceList extends Component {
       .then(res => {
         this.setState({
           targetData: res.data,
-          columns: Object.keys(res.data[0]).map(key => {
-            return { title: key, dataIndex: key, align: 'center' }
+          columns: Object.keys(res.data[0]).map((key,i) => {
+            return { title: key, dataIndex: key, align: 'center',key:i }
           }),
           total: res.total
         })
@@ -70,7 +70,7 @@ class ServiceList extends Component {
   render() {
     return (
       <Card title="服务管理" className='card'>
-        <Form layout="inline" style={{ marginBottom: 20 }} onFinish={this.onFinish}>
+        <Form layout="inline" style={{ margin: '20px 0 40px 0' }} onFinish={this.onFinish}>
           <Row style={{width:"100%"}}>
             <Col span={5}>
               <Form.Item label="服务ID" name="service_id">
diff --git a/src/pages/home/branch/userBranch/company.js b/src/pages/home/branch/userBranch/company.js
index 676a2e8..094ec1c 100644
--- a/src/pages/home/branch/userBranch/company.js
+++ b/src/pages/home/branch/userBranch/company.js
@@ -32,8 +32,8 @@ class Company extends Component {
       .then(res => {
         this.setState({
           targetData: res.data,
-          columns: Object.keys(res.data[0]).map(key => {
-            return { title: key, dataIndex: key, align: 'center' }
+          columns: Object.keys(res.data[0]).map((key,i) => {
+            return { title: key, dataIndex: key, align: 'center',key:i }
           }),
           total: res.total
         })
@@ -51,8 +51,8 @@ class Company extends Component {
       .then(res => {
         this.setState({
           targetData: res.data,
-          columns: Object.keys(res.data[0]).map(key => {
-            return { title: key, dataIndex: key, align: 'center' }
+          columns: Object.keys(res.data[0]).map((key,i) => {
+            return { title: key, dataIndex: key, align: 'center',key:i }
           }),
           total: res.total
         })
diff --git a/src/pages/home/branch/userBranch/invitation.js b/src/pages/home/branch/userBranch/invitation.js
index c9554d4..6591642 100644
--- a/src/pages/home/branch/userBranch/invitation.js
+++ b/src/pages/home/branch/userBranch/invitation.js
@@ -31,8 +31,8 @@ class Invitation extends Component {
       .then(res => {
         this.setState({
           targetData: res.data,
-          columns: Object.keys(res.data[0]).map(key => {
-            return { title: key, dataIndex: key, align: 'center' }
+          columns: Object.keys(res.data[0]).map((key,i) => {
+            return { title: key, dataIndex: key, align: 'center',key:i }
           }),
           total: res.total
         })
@@ -50,8 +50,8 @@ class Invitation extends Component {
       .then(res => {
         this.setState({
           targetData: res.data,
-          columns: Object.keys(res.data[0]).map(key => {
-            return { title: key, dataIndex: key, align: 'center' }
+          columns: Object.keys(res.data[0]).map((key,i) => {
+            return { title: key, dataIndex: key, align: 'center',key:i }
           }),
           total: res.total
         })
diff --git a/src/pages/home/branch/userBranch/login.js b/src/pages/home/branch/userBranch/login.js
index 8797765..0348332 100644
--- a/src/pages/home/branch/userBranch/login.js
+++ b/src/pages/home/branch/userBranch/login.js
@@ -32,8 +32,8 @@ class Login extends Component {
       .then(res => {
         this.setState({
           targetData: res.data,
-          columns: Object.keys(res.data[0]).map(key => {
-            return { title: key, dataIndex: key, align: 'center' }
+          columns: Object.keys(res.data[0]).map((key,i) => {
+            return { title: key, dataIndex: key, align: 'center',key:i }
           }),
           total: res.total
         })
@@ -51,8 +51,8 @@ class Login extends Component {
       .then(res => {
         this.setState({
           targetData: res.data,
-          columns: Object.keys(res.data[0]).map(key => {
-            return { title: key, dataIndex: key, align: 'center' }
+          columns: Object.keys(res.data[0]).map((key,i) => {
+            return { title: key, dataIndex: key, align: 'center',key:i }
           }),
           total: res.total
         })
diff --git a/src/pages/home/branch/userBranch/mail.js b/src/pages/home/branch/userBranch/mail.js
index eeaeab1..e560056 100644
--- a/src/pages/home/branch/userBranch/mail.js
+++ b/src/pages/home/branch/userBranch/mail.js
@@ -31,8 +31,8 @@ class Mail extends Component {
       .then(res => {
         this.setState({
           targetData: res.data,
-          columns: Object.keys(res.data[0]).map(key => {
-            return { title: key, dataIndex: key, align: 'center' }
+          columns: Object.keys(res.data[0]).map((key,i) => {
+            return { title: key, dataIndex: key, align: 'center',key:i }
           }),
           total: res.total
         })
@@ -50,8 +50,8 @@ class Mail extends Component {
       .then(res => {
         this.setState({
           targetData: res.data,
-          columns: Object.keys(res.data[0]).map(key => {
-            return { title: key, dataIndex: key, align: 'center' }
+          columns: Object.keys(res.data[0]).map((key,i) => {
+            return { title: key, dataIndex: key, align: 'center',key:i }
           }),
           total: res.total
         })
diff --git a/src/pages/home/branch/userBranch/userInfo.js b/src/pages/home/branch/userBranch/userInfo.js
index c484f67..77e5ddc 100644
--- a/src/pages/home/branch/userBranch/userInfo.js
+++ b/src/pages/home/branch/userBranch/userInfo.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react'
-import { Table, Form, Input,  Button, Row, Col } from 'antd'
+import { Table, Form, Input, Button, Row, Col } from 'antd'
 
 class UserInfo extends Component {
   constructor(props) {
@@ -32,8 +32,8 @@ class UserInfo extends Component {
       .then(res => {
         this.setState({
           targetData: res.data,
-          columns: Object.keys(res.data[0]).map(key => {
-            return { title: key, dataIndex: key, align: 'center' }
+          columns: Object.keys(res.data[0]).map((key,i) => {
+            return { title: key, dataIndex: key, align: 'center',key:i }
           }),
           total: res.total
         })
@@ -51,8 +51,8 @@ class UserInfo extends Component {
       .then(res => {
         this.setState({
           targetData: res.data,
-          columns: Object.keys(res.data[0]).map(key => {
-            return { title: key, dataIndex: key, align: 'center' }
+          columns: Object.keys(res.data[0]).map((key, i) => {
+            return { title: key, dataIndex: key, align: 'center', key: i }
           }),
           total: res.total
         })
@@ -65,35 +65,35 @@ class UserInfo extends Component {
   render() {
     return (
       <React.Fragment>
-       <Form layout="inline" style={{ marginBottom: 20 }} onFinish={this.onFinish}>
-            <Row style={{ width: "100%" }}>
-              <Col span={5}>
-                <Form.Item label="用户名称" name="username">
-                  <Input></Input>
-                </Form.Item>
-              </Col>
-              <Col span={5}>
-                <Form.Item label="用户ID" name="user_id">
-                  <Input></Input>
-                </Form.Item>
-              </Col>
-              <Col span={2}>
-                <Form.Item>
-                  <Button type='primary' htmlType="submit" style={{ width: '100%' }}>查询</Button>
-                </Form.Item>
-              </Col>
-            </Row>
-          </Form>
+        <Form layout="inline" style={{ marginBottom: 20 }} onFinish={this.onFinish}>
+          <Row style={{ width: "100%" }}>
+            <Col span={5}>
+              <Form.Item label="用户名称" name="username">
+                <Input></Input>
+              </Form.Item>
+            </Col>
+            <Col span={5}>
+              <Form.Item label="用户ID" name="user_id">
+                <Input></Input>
+              </Form.Item>
+            </Col>
+            <Col span={2}>
+              <Form.Item>
+                <Button type='primary' htmlType="submit" style={{ width: '100%' }}>查询</Button>
+              </Form.Item>
+            </Col>
+          </Row>
+        </Form>
 
-          <Table bordered dataSource={this.state.targetData} columns={this.state.columns} pagination={
-            {
-              total: this.state.total,
-              showSizeChanger: true,
-              showTotal: () => `共 ${this.state.total} 条`,
-              onChange: (current, pageSize) => this.getServiceList(current, pageSize),
-              onShowSizeChange: (current, pageSize) => this.getServiceList(current, pageSize)
-            }
-          } />
+        <Table bordered dataSource={this.state.targetData} columns={this.state.columns} pagination={
+          {
+            total: this.state.total,
+            showSizeChanger: true,
+            showTotal: () => `共 ${this.state.total} 条`,
+            onChange: (current, pageSize) => this.getServiceList(current, pageSize),
+            onShowSizeChange: (current, pageSize) => this.getServiceList(current, pageSize)
+          }
+        } />
       </React.Fragment>
     )
   }
diff --git a/src/pages/home/side.js b/src/pages/home/side.js
index df7c57d..498a391 100644
--- a/src/pages/home/side.js
+++ b/src/pages/home/side.js
@@ -1,6 +1,6 @@
 import { Menu, PageHeader } from 'antd';
 import React, { Component } from 'react'
-import { AreaChartOutlined, BookOutlined, UsergroupDeleteOutlined,CodepenOutlined, PaperClipOutlined, FireOutlined, PieChartOutlined } from '@ant-design/icons';
+import { AreaChartOutlined, BookOutlined, UsergroupDeleteOutlined } from '@ant-design/icons';
 
 class Side extends Component {
   constructor(props) {
@@ -11,10 +11,6 @@ class Side extends Component {
         { title: '服务管理', path: '/service', icon: <BookOutlined />, category: 'Manager' },
         { title: '用户管理', path: '/user', icon: <UsergroupDeleteOutlined />, category: 'Manager' },
         { title: '财报管理', path: '/financial', icon: <BookOutlined />, category: 'Manager' },
-        { title: '企查查', path: '/qcc', icon: <CodepenOutlined />, category: 'Crawler' },
-        { title: '天眼查', path: '/tyc', icon: <PaperClipOutlined />, category: 'Crawler' },
-        { title: '企业预警通', path: '/qyyjt', icon: <FireOutlined />, category: 'Crawler' },
-        { title: '爱企查', path: '/aqc', icon: <PieChartOutlined />, category: 'Crawler' }
       ]
     }
   }
@@ -24,8 +20,8 @@ class Side extends Component {
   }
 
   render() {
-    const menuItem = ['Board', 'Manager', 'Crawler'].map((item, index) => {
-      return <Menu.ItemGroup title={item}>
+    const menuItem = ['Board', 'Manager'].map((item,i) => {
+      return <Menu.ItemGroup title={item} key={i}>
         {this.state.data.map((ele, index) => {
           return ele.category === item?<Menu.Item key={index} icon={ele.icon} onClick={this.handleClick}>{ele.title}</Menu.Item>:null
         })}
diff --git a/src/pages/user/index.js b/src/pages/user/index.js
index aa560f6..0ad1157 100644
--- a/src/pages/user/index.js
+++ b/src/pages/user/index.js
@@ -11,6 +11,10 @@ class User extends Component {
     this.state = {}
   }
 
+  componentDidMount(){
+    
+  }
+
   onFinish = async (value) => {
     const data = {
       mail: value.mail,
@@ -36,18 +40,19 @@ class User extends Component {
             name="normal_login"
             className='login-form'
             onFinish={this.onFinish}
+            initialValues={{mail:"wangsichuan@fecr.com.cn",password:"Wangsichuan1234."}}
           >
             <Form.Item
               name="mail"
-              rules={[{ required: true, message: 'Please input your username!' }]}
+              rules={[{ required: true, message: 'Please input your mail!' }]}
             >
-              <Input prefix={<UserOutlined className="site-form-item-icon" />} placeholder="Username" defaultValue="wangsichuan@fecr.com.cn"/>
+              <Input prefix={<UserOutlined className="site-form-item-icon" />} placeholder="Mail"/>
             </Form.Item>
             <Form.Item
               name="password"
               rules={[{ required: true, message: 'Please input your password!' }]}
             >
-              <Input.Password prefix={<LockOutlined className="site-form-item-icon" />} placeholder="Password" defaultValue="Wangsichuan1234."/>
+              <Input.Password prefix={<LockOutlined className="site-form-item-icon" />} placeholder="Password"/>
             </Form.Item>
             <Form.Item>
               <Button type="primary" htmlType="submit" className="login-form-button">