Browse Source

添加详细属性

cl 4 years ago
parent
commit
95d004d16c

File diff suppressed because it is too large
+ 1 - 1
boniu/.eslintcache


+ 277 - 27
boniu/src/IndexApiList.jsx

@@ -2,9 +2,9 @@ const indexApiList = [
   {
     name: "指数基本信息",
     url: "/indexApi/indexBasicInfo",
-    key:'indexBasic',
-    data:{
-      outputResult:[
+    key: "indexBasic",
+    data: {
+      outputResult: [
         {
           key: "1",
           name: "message_code",
@@ -32,11 +32,11 @@ const indexApiList = [
         },
         {
           key: "6",
-          name: "sector",
+          name: "exchange",
           desc: "所属市场"
         }
       ],
-      errorResult:[
+      errorResult: [
         {
           key: "1",
           type: "股票代码错误",
@@ -61,15 +61,15 @@ const indexApiList = [
           code: 501,
           message: "服务器错误"
         }
-      ],
-    },
+      ]
+    }
   },
   {
     name: "指数当天信息",
     url: "/indexApi/indexNow",
-    key:'indexNow',
-    data:{
-      outputResult:[
+    key: "indexNow",
+    data: {
+      outputResult: [
         {
           key: "1",
           name: "message_code",
@@ -92,16 +92,51 @@ const indexApiList = [
         },
         {
           key: "5",
-          name: "sector",
-          desc: "交易板块"
+          name: "date",
+          desc: "交易日期"
         },
         {
           key: "6",
-          name: "sector",
-          desc: "所属市场"
+          name: "open_price",
+          desc: "开盘价"
+        },
+        {
+          key: "7",
+          name: "close_price",
+          desc: "收盘价"
+        },
+        {
+          key: "8",
+          name: "highest_price",
+          desc: "最高价"
+        },
+        {
+          key: "9",
+          name: "lowest_price",
+          desc: "最低价"
+        },
+        {
+          key: "10",
+          name: "amount",
+          desc: "成交量"
+        },
+        {
+          key: "11",
+          name: "value",
+          desc: "成交金额"
+        },
+        {
+          key: "12",
+          name: "increase_ratio",
+          desc: "涨跌幅"
+        },
+        {
+          key: "13",
+          name: "increase_price",
+          desc: "涨跌额"
         }
       ],
-      errorResult:[
+      errorResult: [
         {
           key: "1",
           type: "股票代码错误",
@@ -126,15 +161,86 @@ const indexApiList = [
           code: 501,
           message: "服务器错误"
         }
+      ]
+    }
+  },
+  {
+    name: "时间段信息(指数代码+起止日期)",
+    url: "/indexApi/indexQuant",
+    key: "indexQuant",
+    data: {
+      outputResult: [
+        {
+          key: "1",
+          name: "message_code",
+          desc: 200
+        },
+        {
+          key: "2",
+          name: "message",
+          desc: "success"
+        },
+        {
+          key: "3",
+          name: "code",
+          desc: "指数代码"
+        },
+        {
+          key: "4",
+          name: "start_date",
+          desc: "开始日期"
+        },
+        {
+          key: "5",
+          name: "end_date",
+          desc: "结束日期"
+        },
+        {
+          key: "6",
+          name: "order",
+          desc: "列表正序/倒序"
+        },
+        {
+          key: "7",
+          name: "list",
+          desc: ""
+        }
       ],
-    },
+
+      errorResult: [
+        {
+          key: "1",
+          type: "股票代码错误",
+          code: 301,
+          message: "股票代码不存在/错误"
+        },
+        {
+          key: "3",
+          type: "签名错误",
+          code: 304,
+          message: "非法签名"
+        },
+        {
+          key: "4",
+          type: "返回数据为空",
+          code: 401,
+          message: "股票数据为空"
+        },
+        {
+          key: "5",
+          type: "服务器错误",
+          code: 501,
+          message: "服务器错误"
+        }
+      ]
+    }
   },
   {
     name: "指数回溯",
     url: "/indexApi/indexBack",
-    key:'indexBack',
-    data:{
-      outputResult:[
+    key: "indexBack",
+    data: {
+      outputResult: [
         {
           key: "1",
           name: "message_code",
@@ -152,21 +258,27 @@ const indexApiList = [
         },
         {
           key: "4",
-          name: "name",
-          desc: "指数名称"
+          name: "start_date",
+          desc: "开始日期"
         },
         {
           key: "5",
-          name: "sector",
-          desc: "交易板块"
+          name: "end_date",
+          desc: "回溯天数"
         },
         {
           key: "6",
-          name: "sector",
-          desc: "所属市场"
+          name: "order",
+          desc: "列表正序/倒序"
+        },
+        {
+          key: "7",
+          name: "list",
+          desc: ""
         }
       ],
-      errorResult:[
+
+      errorResult: [
         {
           key: "1",
           type: "股票代码错误",
@@ -191,8 +303,146 @@ const indexApiList = [
           code: 501,
           message: "服务器错误"
         }
+      ]
+    }
+  },
+  {
+    name: "指数某天信息",
+    url: "/indexApi/indexSomeDay",
+    key: "indexSomeDay",
+    data: {
+      outputResult: [
+        {
+          key: "1",
+          name: "message_code",
+          desc: 200
+        },
+        {
+          key: "2",
+          name: "message",
+          desc: "success"
+        },
+        {
+          key: "3",
+          name: "code",
+          desc: "指数代码"
+        },
+        {
+          key: "4",
+          name: "name",
+          desc: "指数名称"
+        },
+        {
+          key: "5",
+          name: "date",
+          desc: "交易日期"
+        },
+        {
+          key: "6",
+          name: "open_price",
+          desc: "开盘价"
+        },
+        {
+          key: "7",
+          name: "close_price",
+          desc: "收盘价"
+        },
+        {
+          key: "8",
+          name: "highest_price",
+          desc: "最高价"
+        },
+        {
+          key: "9",
+          name: "lowest_price",
+          desc: "最低价"
+        },
+        {
+          key: "10",
+          name: "amount",
+          desc: "成交量"
+        },
+        {
+          key: "11",
+          name: "value",
+          desc: "成交金额"
+        },
+        {
+          key: "12",
+          name: "increase_ratio",
+          desc: "涨跌幅"
+        },
+        {
+          key: "13",
+          name: "increase_price",
+          desc: "涨跌额"
+        }
       ],
-    },
+      errorResult: [
+        {
+          key: "1",
+          type: "指数代码错误",
+          code: 300,
+          message: "指数代码不存在/错误"
+        },
+        {
+          key: "2",
+          type: "返回数据为空",
+          code: 301,
+          message: "指数数据为空"
+        },
+        {
+          key: "3",
+          type: "签名错误",
+          code: 401,
+          message: "非法签名"
+        }
+      ]
+    }
+  },
+  {
+    name: "指数列表信息",
+    url: "/indexApi/indexListInf",
+    key: "indexListInf",
+    data: {
+      outputResult: [
+        {
+          key: "1",
+          name: "message_code",
+          desc: 200
+        },
+        {
+          key: "2",
+          name: "message",
+          desc: "success"
+        },
+        {
+          key: "3",
+          name: "list",
+          desc: ""
+        }
+      ],
+      errorResult: [
+        {
+          key: "1",
+          type: "交易板块错误",
+          code: 302,
+          message: "交易板块不存在/错误"
+        },
+        {
+          key: "2",
+          type: "所属市场错误",
+          code: 303,
+          message: "所属市场不存在/错误"
+        },
+        {
+          key: "3",
+          type: "签名错误",
+          code: 401,
+          message: "非法签名"
+        }
+      ]
+    }
   }
 ];
 

+ 10 - 10
boniu/src/components/Navbar/navbar.jsx

@@ -1,5 +1,5 @@
 import React, { Component } from "react";
-import { Route, Switch, Link, withRouter} from "react-router-dom";
+import { Route, Switch, Link, withRouter } from "react-router-dom";
 import Overview from "../../components/Overview/overview";
 import indexBasicInfo from "../../components/indexBasicInfo/indexBasicInfo";
 import stocksApiList from "../../StocksApiList";
@@ -26,7 +26,7 @@ class NavBar extends Component {
     const pathNames = this.props.history.location.pathname;
     let defaultS = [];
     defaultS.push(pathNames);
-   // console.log(defaultS)//实时根据当前路径更新
+    // console.log(defaultS)//实时根据当前路径更新
     return (
       <Layout style={{ minHeight: "100vh" }}>
         <Header className="header">BoNiu</Header>
@@ -42,15 +42,13 @@ class NavBar extends Component {
               <Menu.Item key="overview" icon={<UserOutlined />}>
                 <Link to="/overview">总体说明</Link>
               </Menu.Item>
-              <SubMenu
-                key="stocks"
-                icon={<LaptopOutlined />}
-                title="股票接口"
-              >
+              <SubMenu key="stocks" icon={<LaptopOutlined />} title="股票接口">
                 {stocksApiList.map((item) => {
                   return (
                     <Menu.Item key={item.key}>
-                      <Link to={{pathname: item.url, state: item.data}}>{item.name}</Link>
+                      <Link to={{ pathname: item.url, state: item }}>
+                        {item.name}
+                      </Link>
                     </Menu.Item>
                   );
                 })}
@@ -63,7 +61,9 @@ class NavBar extends Component {
                 {indexApiList.map((item) => {
                   return (
                     <Menu.Item key={item.key}>
-                      <Link to={{pathname: item.url, state: item.data}}>{item.name}</Link>
+                      <Link to={{ pathname: item.url, state: item }}>
+                        {item.name}
+                      </Link>
                     </Menu.Item>
                   );
                 })}
@@ -93,4 +93,4 @@ class NavBar extends Component {
   }
 }
 
-export default withRouter(NavBar)
+export default withRouter(NavBar);

+ 116 - 67
boniu/src/components/indexBasicInfo/indexBasicInfo.jsx

@@ -10,12 +10,13 @@ class indexBasicInfo extends React.Component {
     // this.title = title[props.location.pathname];
   }
   render() {
-    console.log(this.props.location.state);
-    const outPutList = this.props.location.state.outputResult;
-    const errorList = this.props.location.state.errorResult;
+    const nowKey = this.props.location.state.key;
+    const outPutList = this.props.location.state.data.outputResult;
+    const errorList = this.props.location.state.data.errorResult;
+    const title = this.props.location.state.name;
     return (
       <div>
-        <Title level={4}>{title[this.props.location.pathname]}</Title>
+        <Title level={4}>{title}</Title>
         <div>
           <Title className="stocks-title" level={5}>
             输入参数:
@@ -31,6 +32,21 @@ class indexBasicInfo extends React.Component {
           </Title>
           <Table
             columns={columns}
+            expandable={{
+              expandedRowRender: (record) =>
+                record.name === "list" ? (
+                  <Table
+                    columns={columns}
+                    dataSource={
+                      nowKey !== "indexListInf" ? subListTime : subList
+                    }
+                    pagination={false}
+                  />
+                ) : (
+                  ""
+                ),
+              rowExpandable: (record) => record.name === "list"
+            }}
             dataSource={outPutList}
             pagination={false}
             size="small"
@@ -68,11 +84,6 @@ class indexBasicInfo extends React.Component {
 }
 
 export default indexBasicInfo;
-var title = {
-  "/indexBasicInfo": "指数基本信息",
-  "/indexNow": "指数当天信息",
-  "/indexBefore": "指数回溯"
-};
 const columns = [
   {
     title: "名称",
@@ -86,38 +97,6 @@ const columns = [
     key: "desc"
   }
 ];
-// var data = [
-//   {
-//     key: "1",
-//     name: "message_code",
-//     desc: 200
-//   },
-//   {
-//     key: "2",
-//     name: "message",
-//     desc: "success"
-//   },
-//   {
-//     key: "3",
-//     name: "code",
-//     desc: "指数代码"
-//   },
-//   {
-//     key: "4",
-//     name: "name",
-//     desc: "指数名称"
-//   },
-//   {
-//     key: "5",
-//     name: "sector",
-//     desc: "交易板块"
-//   },
-//   {
-//     key: "6",
-//     name: "sector",
-//     desc: "所属市场"
-//   }
-// ];
 const errColumns = [
   {
     title: "错误类型",
@@ -136,29 +115,99 @@ const errColumns = [
     key: "message"
   }
 ];
-// var errdata = [
-//   {
-//     key: "1",
-//     type: "股票代码错误",
-//     code: 301,
-//     message: "股票代码不存在/错误"
-//   },
-//   {
-//     key: "3",
-//     type: "签名错误",
-//     code: 304,
-//     message: "非法签名"
-//   },
-//   {
-//     key: "4",
-//     type: "返回数据为空",
-//     code: 401,
-//     message: "股票数据为空"
-//   },
-//   {
-//     key: "5",
-//     type: "服务器错误",
-//     code: 501,
-//     message: "服务器错误"
-//   }
-// ];
+var subList = [
+  {
+    key: "3",
+    name: "code",
+    desc: "指数代码"
+  },
+  {
+    key: "3",
+    name: "name",
+    desc: "指数名称"
+  },
+  {
+    key: "4",
+    name: "name",
+    desc: "sector"
+  },
+  {
+    key: "5",
+    name: "exchange",
+    desc: "所属市场"
+  }
+];
+var subListTime = [
+  {
+    key: "3",
+    name: "code",
+    desc: "指数代码"
+  },
+  {
+    key: "4",
+    name: "name",
+    desc: "指数名称"
+  },
+  {
+    key: "5",
+    name: "date",
+    desc: "交易日期"
+  },
+  {
+    key: "6",
+    name: "open_price",
+    desc: "开盘价"
+  },
+  {
+    key: "7",
+    name: "close_price",
+    desc: "收盘价"
+  },
+  {
+    key: "8",
+    name: "highest_price",
+    desc: "最高价"
+  },
+  {
+    key: "9",
+    name: "lowest_price",
+    desc: "最低价"
+  },
+  {
+    key: "10",
+    name: "amount",
+    desc: "成交量"
+  },
+  {
+    key: "11",
+    name: "value",
+    desc: "成交金额"
+  },
+  {
+    key: "12",
+    name: "increase_ratio",
+    desc: "涨跌幅"
+  },
+  {
+    key: "13",
+    name: "increase_price",
+    desc: "涨跌额"
+  }
+];
+const expandFunc = (input) => {
+  columns = [
+    {
+      title: "名称",
+      dataIndex: "name",
+      key: "name",
+      render: (text) => <span>{text}</span>
+    },
+    {
+      title: "说明",
+      dataIndex: "desc",
+      key: "desc"
+    }
+  ];
+  console.log(input);
+  return <Table columns={columns} dataSource={input} pagination={false} />;
+};