From 15b4a879882f59160f8f83645fad20dfc822c419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=B2=E5=85=B8=E5=8D=93?=
 <shidianzhuo@shidianzhuodeMacBook-Pro.local>
Date: Thu, 5 Dec 2024 16:32:02 +0800
Subject: [PATCH] flat:123

---
 config/routes.ts                       |  11 ++
 src/app.tsx                            |   6 +-
 src/pages/Area/Business/detail.tsx     |   0
 src/pages/Area/Business/edit.tsx       | 125 ++++++++++++++++++++++
 src/pages/Area/Business/index.tsx      | 114 +++++++++++++++++++-
 src/pages/Area/Subway/UpLine/edit.tsx  |  70 +++++++++++++
 src/pages/Area/Subway/UpLine/index.tsx | 139 +++++++++++++++++++++++++
 src/pages/Area/Subway/edit.tsx         |  70 +++++++++++++
 src/pages/Area/Subway/index.tsx        |  89 +++++++++++++++-
 src/pages/Management/List/edit.tsx     |   6 +-
 src/pages/Management/List/index.tsx    |   1 +
 src/services/area/business.ts          |  18 ++++
 src/services/area/subway.ts            |  15 +++
 src/services/area/upline.ts            |  26 +++++
 src/types/area/business.d.ts           |   8 ++
 src/types/area/subway.d.ts             |  15 +++
 src/types/area/upline.d.ts             |  44 ++++++++
 17 files changed, 746 insertions(+), 11 deletions(-)
 create mode 100644 src/pages/Area/Business/detail.tsx
 create mode 100644 src/pages/Area/Business/edit.tsx
 create mode 100644 src/pages/Area/Subway/UpLine/edit.tsx
 create mode 100644 src/pages/Area/Subway/UpLine/index.tsx
 create mode 100644 src/pages/Area/Subway/edit.tsx
 create mode 100644 src/services/area/upline.ts
 create mode 100644 src/types/area/upline.d.ts

diff --git a/config/routes.ts b/config/routes.ts
index e7ea339..dae11c1 100644
--- a/config/routes.ts
+++ b/config/routes.ts
@@ -46,6 +46,17 @@ export default [
       },
     ],
   },
+  {
+    name: 'area',
+    path: '/area',
+    routes: [
+      {
+        name: '字典数据',
+        path: '/area/updata-router/index/:id',
+        component: './Area/Subway/UpLine',
+      },
+    ]
+  },
   {
     name: 'system',
     path: '/system',
diff --git a/src/app.tsx b/src/app.tsx
index 9397980..46d38ff 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -11,6 +11,7 @@ import { getRemoteMenu, getRoutersInfo, getUserInfo, patchRouteWithRemoteMenus,
 import { PageEnum } from './enums/pagesEnums';
 import {logout} from "@/services/system/auth";
 import { stringify } from 'querystring';
+import { message } from 'antd'
 
 const isDev = process.env.NODE_ENV === 'development';
 
@@ -247,7 +248,10 @@ export const request = {
         case 401:
           loginOut()
       }
-      // console.log('data: ', data)
+      if(data.code !== 200 && data.msg) {
+        message.info(data.msg)
+      }
+      console.log('data: ', data)
       // console.log('config: ', config)
       return response
     },
diff --git a/src/pages/Area/Business/detail.tsx b/src/pages/Area/Business/detail.tsx
new file mode 100644
index 0000000..e69de29
diff --git a/src/pages/Area/Business/edit.tsx b/src/pages/Area/Business/edit.tsx
new file mode 100644
index 0000000..d81185f
--- /dev/null
+++ b/src/pages/Area/Business/edit.tsx
@@ -0,0 +1,125 @@
+import { PlusOutlined } from '@ant-design/icons';
+import {
+  ModalForm,
+  ProForm,
+  ProFormDateRangePicker,
+  ProFormSelect,
+  ProFormText,
+  ProFormDigit,
+} from '@ant-design/pro-components';
+import React, {useEffect} from "react";
+import { Button, Form, message, InputNumber } from 'antd';
+import {DictOptionType, DictValueEnumObj} from "@/components/DictTag";
+
+export type ListFormProps = {
+  onCancel: (flag?: boolean, formVals?: unknown) => void;
+  onSubmit: (values:  API.AreaBusiness.CircleEditParams) => Promise<void>;
+  open: boolean;
+  values?: Partial< API.AreaBusiness.CircleEditParams>;
+  jobGroupOptions?: DictOptionType[];
+  statusOptions?: DictValueEnumObj;
+};
+
+const waitTime = (time: number = 100) => {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve(true);
+    }, time);
+  });
+};
+
+const SubWayEdit: React.FC<ListFormProps> = (props) => {
+  const [form] = Form.useForm();
+  useEffect(() => {
+    form.resetFields();
+    if(props.values) {
+      form.setFieldsValue({
+        commercialAreaId: props.values.commercialAreaId,
+        commercialAreaName: props.values.commercialAreaName,
+        latitude: props.values.latitude,
+        longitude: props.values.longitude,
+      });
+    }
+  }, [form, props]);
+  const handleCancel = () => {
+    props.onCancel();
+    form.resetFields();
+  };
+
+  const handleFinish = async (values: Record<string, any>) => {
+    console.log(values)
+    props.onSubmit(values as API.AreaBusiness.CircleEditParams);
+  };
+
+  return (
+    <ModalForm<API.AreaBusiness.CircleParams>
+      title="新增线路"
+      form={form}
+      // layout="inline"
+      autoFocusFirstInput
+      open={props.open}
+      modalProps={{
+        destroyOnClose: true,
+        onCancel: () => handleCancel(),
+      }}
+      submitTimeout={2000}
+      onFinish={handleFinish}
+    >
+      <ProFormDigit
+        name="commercialAreaId"
+        label={'字典主键'}
+        placeholder="请输入字典主键"
+        disabled
+        hidden={true}
+      />
+      <ProForm.Group>
+        <ProFormText
+          width="md"
+          name="commercialAreaName"
+          label="商圈名称"
+          placeholder="请输入名称"
+          rules={[
+            {
+              required: true,
+              message: "请输入商圈名称！" ,
+            },
+          ]}
+        />
+      </ProForm.Group>
+      <ProForm.Group>
+        <ProFormDigit
+          label="纬度"
+          placeholder="请输入纬度"
+          name="latitude"
+          width="md"
+          min={-90}
+          max={90}
+          fieldProps={{ controls: false }}
+          rules={[
+            {
+              required: true,
+              message: "请输入纬度！" ,
+            },
+          ]}
+        />
+        <ProFormDigit
+          label="经度"
+          placeholder="请输入经度"
+          name="longitude"
+          width="md"
+          min={-180}
+          max={180}
+          fieldProps={{ controls: false }}
+          rules={[
+            {
+              required: true,
+              message: "请输入经度！" ,
+            },
+          ]}
+        />
+      </ProForm.Group>
+    </ModalForm>
+  );
+};
+
+export default SubWayEdit
diff --git a/src/pages/Area/Business/index.tsx b/src/pages/Area/Business/index.tsx
index a20f258..25139b6 100644
--- a/src/pages/Area/Business/index.tsx
+++ b/src/pages/Area/Business/index.tsx
@@ -2,8 +2,30 @@ import React, {Fragment, useRef, useState} from "react";
 import { useIntl, FormattedMessage, useAccess, history } from '@umijs/max';
 import { Dropdown, FormInstance, Space, Button, message, Modal } from 'antd';
 import { ActionType, FooterToolbar, PageContainer, ProColumns, ProTable } from '@ant-design/pro-components';
-import { PlusOutlined, DeleteOutlined, ExclamationCircleOutlined, DownOutlined, EditOutlined } from '@ant-design/icons';
-import {getCmsAreaList} from "@/services/area/business";
+import { PlusOutlined, DeleteOutlined, FormOutlined, DownOutlined, AlignLeftOutlined } from '@ant-design/icons';
+import {getCmsAreaList, addCmsAreaListRow, updateCmsAreaListRow, deleteCmsAreaListRow} from "@/services/area/business";
+import SubWayEdit from "@/pages/Area/Business/edit";
+import {deleteCmsLineSubWay} from "@/services/area/subway";
+
+
+const handleRemoveOne = async (selectedRow: API.AreaBusiness.Circle) => {
+  const hide = message.loading('正在删除');
+  if (!selectedRow) return true;
+  try {
+    const resp = await deleteCmsAreaListRow(selectedRow.commercialAreaId);
+    hide();
+    if (resp.code === 200) {
+      message.success('删除成功，即将刷新');
+    } else {
+      message.error(resp.msg);
+    }
+    return true;
+  } catch (error) {
+    hide();
+    message.error('删除失败，请重试');
+    return false;
+  }
+};
 function ManagementList() {
   const access = useAccess();
 
@@ -18,8 +40,68 @@ function ManagementList() {
       title: '商圈名称',
       dataIndex: 'commercialAreaName',
       valueType: 'text',
+      align: 'center',
       hideInSearch: true,
     },
+    {
+      title: '操作',
+      align: 'center',
+      hideInSearch: true,
+      render: (_, record) => [
+        <Button
+          type="link"
+          size="small"
+          key="detail"
+          icon = <AlignLeftOutlined />
+          hidden={!access.hasPerms('area:business:list.detail')}
+          onClick={() => {
+            setModalVisible(true);
+            setCurrentRow(record);
+          }}
+        >
+          详细
+        </Button>,
+        <Button
+          type="link"
+          size="small"
+          key="edit"
+          icon = <FormOutlined />
+          hidden={!access.hasPerms('area:business:list.update')}
+          onClick={() => {
+            setModalVisible(true);
+            setCurrentRow(record);
+          }}
+        >
+          编辑
+        </Button>,
+        <Button
+          type="link"
+          size="small"
+          danger
+          key="batchRemove"
+          icon = <DeleteOutlined/>
+          hidden={!access.hasPerms('area:business:list')}
+          onClick={async () => {
+            Modal.confirm({
+              title: '删除',
+              content: '确定删除该项吗？',
+              okText: '确认',
+              cancelText: '取消',
+              onOk: async () => {
+                const success = await handleRemoveOne(record);
+                if (success) {
+                  if (actionRef.current) {
+                    actionRef.current.reload();
+                  }
+                }
+              },
+            });
+          }}
+        >
+          删除
+        </Button>
+      ]
+    }
   ]
   return (
     <Fragment>
@@ -55,6 +137,34 @@ function ManagementList() {
           ]}
         />
       </div>
+      <SubWayEdit
+        open={modalVisible}
+        onSubmit={async (values) => {
+          let resData
+          if(values.commercialAreaId) {
+            resData = await updateCmsAreaListRow(values)
+          } else {
+            resData = await addCmsAreaListRow(values)
+          }
+          if (resData.code === 200) {
+            setModalVisible(false);
+            setCurrentRow(undefined);
+            if(values.commercialAreaId) {
+              message.success('修改成功')
+            } else {
+              message.success('新增成功')
+            }
+            if (actionRef.current) {
+              actionRef.current.reload();
+            }
+          }
+        }}
+        values={currentRow}
+        onCancel={() => {
+          setModalVisible(false);
+          setCurrentRow(undefined)
+        }}
+      ></SubWayEdit>
     </Fragment>
   )
 }
diff --git a/src/pages/Area/Subway/UpLine/edit.tsx b/src/pages/Area/Subway/UpLine/edit.tsx
new file mode 100644
index 0000000..0175f5f
--- /dev/null
+++ b/src/pages/Area/Subway/UpLine/edit.tsx
@@ -0,0 +1,70 @@
+import { PlusOutlined } from '@ant-design/icons';
+import {
+  ModalForm,
+  ProForm,
+  ProFormDateRangePicker,
+  ProFormSelect,
+  ProFormText,
+} from '@ant-design/pro-components';
+import { Button, Form, message } from 'antd';
+import {DictOptionType, DictValueEnumObj} from "@/components/DictTag";
+
+export type ListFormProps = {
+  onCancel: (flag?: boolean, formVals?: unknown) => void;
+  onSubmit: (values: API.AreaSubWay.Line) => Promise<void>;
+  open: boolean;
+  values?: Partial<API.AreaSubWay.Line>;
+  jobGroupOptions?: DictOptionType[];
+  statusOptions?: DictValueEnumObj;
+};
+
+const waitTime = (time: number = 100) => {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve(true);
+    }, time);
+  });
+};
+
+const SubWayEdit: React.FC<ListFormProps> = (props) => {
+  const [form] = Form.useForm<{ name: string; company: string }>();
+
+  const handleCancel = () => {
+    props.onCancel();
+    form.resetFields();
+  };
+
+  const handleFinish = async (values: Record<string, any>) => {
+    props.onSubmit(values as API.AreaSubWay.Line);
+  };
+
+  return (
+    <ModalForm<{
+      name: string;
+      company: string;
+    }>
+      title="新增线路"
+      form={form}
+      // layout="inline"
+      autoFocusFirstInput
+      open={props.open}
+      modalProps={{
+        destroyOnClose: true,
+        onCancel: () => handleCancel(),
+      }}
+      submitTimeout={2000}
+      onFinish={handleFinish}
+    >
+      <ProForm.Group>
+        <ProFormText
+          width="xl"
+          name="lineName"
+          label="线路名称:"
+          placeholder="请输入名称"
+        />
+      </ProForm.Group>
+    </ModalForm>
+  );
+};
+
+export default SubWayEdit
diff --git a/src/pages/Area/Subway/UpLine/index.tsx b/src/pages/Area/Subway/UpLine/index.tsx
new file mode 100644
index 0000000..3bba3e2
--- /dev/null
+++ b/src/pages/Area/Subway/UpLine/index.tsx
@@ -0,0 +1,139 @@
+import React, {Fragment, useRef, useState} from "react";
+import { useIntl, FormattedMessage, useAccess, history } from '@umijs/max';
+import { Dropdown, FormInstance, Space, Button, message, Modal } from 'antd';
+import { ActionType, FooterToolbar, PageContainer, ProColumns, ProTable } from '@ant-design/pro-components';
+import { PlusOutlined, DeleteOutlined, ExclamationCircleOutlined, DownOutlined, EditOutlined } from '@ant-design/icons';
+import {getCmsLineListPlatForm, addCmsLinePlatForm, deleteCmsLinePlatForm} from "@/services/area/upline";
+import SubWayEdit from "@/pages/Area/Subway/UpLine/edit";
+const handleRemoveOne = async (selectedRow: API.AreaSubWay.Line) => {
+  const hide = message.loading('正在删除');
+  if (!selectedRow) return true;
+  try {
+    const resp = await deleteCmsLinePlatForm(selectedRow.lineId);
+    hide();
+    if (resp.code === 200) {
+      message.success('删除成功，即将刷新');
+    } else {
+      message.error(resp.msg);
+    }
+    return true;
+  } catch (error) {
+    hide();
+    message.error('删除失败，请重试');
+    return false;
+  }
+};
+
+function ManagementList() {
+  const access = useAccess();
+
+  const formTableRef = useRef<FormInstance>();
+  const actionRef = useRef<ActionType>();
+
+  const [currentRow, setCurrentRow] = useState<API.AreaPlatForm.Line>()
+  const [modalVisible, setModalVisible] = useState<boolean>(false)
+
+  const columns: ProColumns<API.AreaSubWay.Line>[] = [
+    {
+      title: '线路名称',
+      dataIndex: 'lineName',
+      align: 'center',
+      valueType: 'text',
+      render: (dom, record) => <Button type="link" onClick={() => history.push(`/area/updata-router/index/${record.lineId}`)} block>
+        {dom}
+      </Button>
+    },
+    {
+      title: '操作',
+      hideInSearch: true,
+      align: 'center',
+      render: (_, record) => [
+        <Button
+          type="link"
+          size="small"
+          danger
+          key="batchRemove"
+          icon = <DeleteOutlined/>
+          hidden={!access.hasPerms('area:subway:list')}
+          onClick={async () => {
+            Modal.confirm({
+              title: '删除',
+              content: '确定删除该项吗？',
+              okText: '确认',
+              cancelText: '取消',
+              onOk: async () => {
+                const success = await handleRemoveOne(record);
+                if (success) {
+                  if (actionRef.current) {
+                    actionRef.current.reload();
+                  }
+                }
+              },
+            });
+          }}
+        >
+          删除
+        </Button>
+      ]
+    }
+  ]
+  return (
+    <Fragment>
+      <div style={{ width: '100%', float: 'right' }}>
+        <ProTable<API.AreaPlatForm.Line>
+          // params 是需要自带的参数
+          // 这个参数优先级更高，会覆盖查询表单的参数
+          actionRef={actionRef}
+          formRef={formTableRef}
+          columns={columns}
+          headerTitle='信息'
+          rowKey="lineId"
+          key="lineIdList"
+          request={(params) => {
+            return getCmsLineListPlatForm(params as API.AreaPlatForm.LineParams).then((res) => {
+              console.log(params)
+              const result = {
+                data: res.rows,
+                total: res.total,
+                success: true,
+              };
+              return result;
+            })
+          }}
+          toolBarRender={() => [
+            <Button
+              type="primary"
+              key="add"
+              hidden={!access.hasPerms('manage:list:add')}
+              onClick={async () => {
+                setCurrentRow(undefined);
+                setModalVisible(true);
+              }}
+            >
+              <PlusOutlined /> 新建
+            </Button>,
+          ]}
+        />
+      </div>
+      <SubWayEdit
+        open={modalVisible}
+        onSubmit={async (values) => {
+          const resData = await addCmsLinePlatForm(values)
+          if (resData.code === 200) {
+            setModalVisible(false);
+            setCurrentRow(undefined);
+            message.success('添加成功')
+            if (actionRef.current) {
+              actionRef.current.reload();
+            }
+          }
+        }}
+        onCancel={() => {
+          setModalVisible(false);
+          setCurrentRow(undefined)
+        }}
+      ></SubWayEdit>
+    </Fragment>
+  )
+}
+export default ManagementList
diff --git a/src/pages/Area/Subway/edit.tsx b/src/pages/Area/Subway/edit.tsx
new file mode 100644
index 0000000..0175f5f
--- /dev/null
+++ b/src/pages/Area/Subway/edit.tsx
@@ -0,0 +1,70 @@
+import { PlusOutlined } from '@ant-design/icons';
+import {
+  ModalForm,
+  ProForm,
+  ProFormDateRangePicker,
+  ProFormSelect,
+  ProFormText,
+} from '@ant-design/pro-components';
+import { Button, Form, message } from 'antd';
+import {DictOptionType, DictValueEnumObj} from "@/components/DictTag";
+
+export type ListFormProps = {
+  onCancel: (flag?: boolean, formVals?: unknown) => void;
+  onSubmit: (values: API.AreaSubWay.Line) => Promise<void>;
+  open: boolean;
+  values?: Partial<API.AreaSubWay.Line>;
+  jobGroupOptions?: DictOptionType[];
+  statusOptions?: DictValueEnumObj;
+};
+
+const waitTime = (time: number = 100) => {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve(true);
+    }, time);
+  });
+};
+
+const SubWayEdit: React.FC<ListFormProps> = (props) => {
+  const [form] = Form.useForm<{ name: string; company: string }>();
+
+  const handleCancel = () => {
+    props.onCancel();
+    form.resetFields();
+  };
+
+  const handleFinish = async (values: Record<string, any>) => {
+    props.onSubmit(values as API.AreaSubWay.Line);
+  };
+
+  return (
+    <ModalForm<{
+      name: string;
+      company: string;
+    }>
+      title="新增线路"
+      form={form}
+      // layout="inline"
+      autoFocusFirstInput
+      open={props.open}
+      modalProps={{
+        destroyOnClose: true,
+        onCancel: () => handleCancel(),
+      }}
+      submitTimeout={2000}
+      onFinish={handleFinish}
+    >
+      <ProForm.Group>
+        <ProFormText
+          width="xl"
+          name="lineName"
+          label="线路名称:"
+          placeholder="请输入名称"
+        />
+      </ProForm.Group>
+    </ModalForm>
+  );
+};
+
+export default SubWayEdit
diff --git a/src/pages/Area/Subway/index.tsx b/src/pages/Area/Subway/index.tsx
index a3bf47b..a129650 100644
--- a/src/pages/Area/Subway/index.tsx
+++ b/src/pages/Area/Subway/index.tsx
@@ -3,7 +3,27 @@ import { useIntl, FormattedMessage, useAccess, history } from '@umijs/max';
 import { Dropdown, FormInstance, Space, Button, message, Modal } from 'antd';
 import { ActionType, FooterToolbar, PageContainer, ProColumns, ProTable } from '@ant-design/pro-components';
 import { PlusOutlined, DeleteOutlined, ExclamationCircleOutlined, DownOutlined, EditOutlined } from '@ant-design/icons';
-import {getCmsLineList} from "@/services/area/subway";
+import {getCmsLineList, addCmsLineSubWay, deleteCmsLineSubWay} from "@/services/area/subway";
+import SubWayEdit from "@/pages/Area/Subway/edit";
+const handleRemoveOne = async (selectedRow: API.AreaSubWay.Line) => {
+  const hide = message.loading('正在删除');
+  if (!selectedRow) return true;
+  try {
+    const resp = await deleteCmsLineSubWay(selectedRow.lineId);
+    hide();
+    if (resp.code === 200) {
+      message.success('删除成功，即将刷新');
+    } else {
+      message.error(resp.msg);
+    }
+    return true;
+  } catch (error) {
+    hide();
+    message.error('删除失败，请重试');
+    return false;
+  }
+};
+
 function ManagementList() {
   const access = useAccess();
 
@@ -17,9 +37,45 @@ function ManagementList() {
     {
       title: '线路名称',
       dataIndex: 'lineName',
+      align: 'center',
       valueType: 'text',
-      hideInSearch: true,
+      render: (dom, record) => <Button type="link" onClick={() => history.push(`/area/updata-router/index/${record.lineId}`)} block>
+        {dom}
+      </Button>
     },
+    {
+      title: '操作',
+      hideInSearch: true,
+      align: 'center',
+      render: (_, record) => [
+        <Button
+          type="link"
+          size="small"
+          danger
+          key="batchRemove"
+          icon = <DeleteOutlined/>
+          hidden={!access.hasPerms('area:subway:list')}
+          onClick={async () => {
+            Modal.confirm({
+              title: '删除',
+              content: '确定删除该项吗？',
+              okText: '确认',
+              cancelText: '取消',
+              onOk: async () => {
+                const success = await handleRemoveOne(record);
+                if (success) {
+                  if (actionRef.current) {
+                    actionRef.current.reload();
+                  }
+                }
+              },
+            });
+          }}
+        >
+          删除
+        </Button>
+      ]
+    }
   ]
   return (
     <Fragment>
@@ -30,8 +86,12 @@ function ManagementList() {
           actionRef={actionRef}
           formRef={formTableRef}
           columns={columns}
-          request={(params) =>
-            getCmsLineList({ ...params } as API.AreaSubWay.LineParams).then((res) => {
+          headerTitle='信息'
+          rowKey="lineId"
+          key="lineIdList"
+          request={(params) => {
+            return getCmsLineList(params as API.AreaSubWay.LineParams).then((res) => {
+              console.log(params)
               const result = {
                 data: res.rows,
                 total: res.total,
@@ -39,7 +99,7 @@ function ManagementList() {
               };
               return result;
             })
-          }
+          }}
           toolBarRender={() => [
             <Button
               type="primary"
@@ -55,6 +115,25 @@ function ManagementList() {
           ]}
         />
       </div>
+      <SubWayEdit
+        open={modalVisible}
+        onSubmit={async (values) => {
+          const resData = await addCmsLineSubWay(values)
+          if (resData.code === 200) {
+            setModalVisible(false);
+            setCurrentRow(undefined);
+            message.success('添加成功')
+            if (actionRef.current) {
+              actionRef.current.reload();
+            }
+          }
+        }}
+        onCancel={() => {
+          setModalVisible(false);
+          setCurrentRow(undefined)
+        }}
+        values={currentRow}
+      ></SubWayEdit>
     </Fragment>
   )
 }
diff --git a/src/pages/Management/List/edit.tsx b/src/pages/Management/List/edit.tsx
index 7547a20..208aea2 100644
--- a/src/pages/Management/List/edit.tsx
+++ b/src/pages/Management/List/edit.tsx
@@ -13,9 +13,9 @@ export type ListFormProps = {
   onCancel: (flag?: boolean, formVals?: unknown) => void;
   onSubmit: (values: API.Management.Manage) => Promise<void>;
   open: boolean;
-  values: Partial<API.Management.Manage>;
-  jobGroupOptions: DictOptionType[];
-  statusOptions: DictValueEnumObj;
+  // values: Partial<API.Management.Manage>;
+  // jobGroupOptions: DictOptionType[];
+  // statusOptions: DictValueEnumObj;
 };
 
 const waitTime = (time: number = 100) => {
diff --git a/src/pages/Management/List/index.tsx b/src/pages/Management/List/index.tsx
index cf88065..66c8f92 100644
--- a/src/pages/Management/List/index.tsx
+++ b/src/pages/Management/List/index.tsx
@@ -60,6 +60,7 @@ function ManagementList() {
         open={modalVisible}
         onSubmit={(values) => {
           console.log(values)
+          return Promise.resolve()
         }}
         onCancel={() => {
           setModalVisible(false);
diff --git a/src/services/area/business.ts b/src/services/area/business.ts
index 7eb2002..88c2362 100644
--- a/src/services/area/business.ts
+++ b/src/services/area/business.ts
@@ -1,11 +1,29 @@
 
 import { request } from '@umijs/max';
 
+
 export async function getCmsAreaList(params?: API.AreaBusiness.CircleParams) {
   return request<API.AreaBusiness.CirclePageResult>(`/api/cms/area/list`, {
     method: 'GET',
   });
 }
 
+export async function addCmsAreaListRow(params?: API.AreaBusiness.CircleEditParams) {
+  return request<API.AreaBusiness.CirclePageResult>(`/api/cms/area`, {
+    method: 'post',
+    data: params
+  });
+}
 
+export async function updateCmsAreaListRow(params?: API.AreaBusiness.CircleEditParams) {
+  return request<API.AreaBusiness.CirclePageResult>(`/api/cms/area`, {
+    method: 'put',
+    data: params
+  });
+}
 
+export async function deleteCmsAreaListRow(ids: number) {
+  return request<API.AreaPlatForm.LinePageResult>(`/api/cms/area/${ids}`, {
+    method: 'delete',
+  });
+}
diff --git a/src/services/area/subway.ts b/src/services/area/subway.ts
index 542f69f..58b148a 100644
--- a/src/services/area/subway.ts
+++ b/src/services/area/subway.ts
@@ -4,6 +4,21 @@ import { request } from '@umijs/max';
 export async function getCmsLineList(params?: API.AreaSubWay.LineParams) {
   return request<API.AreaSubWay.LinePageResult>(`/api/cms/line/list`, {
     method: 'GET',
+    params: params
+  });
+}
+
+// 新增
+export async function addCmsLineSubWay(params?: API.AreaSubWay.AddLineParams) {
+  return request<API.AreaSubWay.LinePageResult>(`/api/cms/line`, {
+    method: 'post',
+    data: params,
+  });
+}
+
+export async function deleteCmsLineSubWay(ids: number) {
+  return request<API.AreaSubWay.LinePageResult>(`/api/cms/line/${ids}`, {
+    method: 'delete',
   });
 }
 
diff --git a/src/services/area/upline.ts b/src/services/area/upline.ts
new file mode 100644
index 0000000..d23a1bb
--- /dev/null
+++ b/src/services/area/upline.ts
@@ -0,0 +1,26 @@
+
+import { request } from '@umijs/max';
+
+export async function getCmsLineListPlatForm(params?: API.AreaPlatForm.LineParams) {
+  return request<API.AreaPlatForm.LinePageResult>(`/api/cms/station/list`, {
+    method: 'GET',
+    params: params
+  });
+}
+
+// 新增
+export async function addCmsLinePlatForm(params?: API.AreaPlatForm.AddLineParams) {
+  return request<API.AreaPlatForm.LinePageResult>(`/api/cms/station`, {
+    method: 'post',
+    data: params,
+  });
+}
+
+export async function deleteCmsLinePlatForm(ids: number) {
+  return request<API.AreaPlatForm.LinePageResult>(`/api/cms/station/${ids}`, {
+    method: 'delete',
+  });
+}
+
+
+
diff --git a/src/types/area/business.d.ts b/src/types/area/business.d.ts
index bc91a9e..c40f8bc 100644
--- a/src/types/area/business.d.ts
+++ b/src/types/area/business.d.ts
@@ -4,6 +4,7 @@ declare namespace API.AreaBusiness {
     commercialAreaName: string;
     latitude: number;
     longitude: number;
+    createTime: string;
   }
 
   export  interface  LinePoint {
@@ -21,6 +22,13 @@ declare namespace API.AreaBusiness {
     current?: string;
   }
 
+  export interface CircleEditParams {
+    commercialAreaName: string;
+    latitude: number;
+    longitude: number;
+    commercialAreaId?: number;
+  }
+
   export interface CirclePageResult {
     code: number;
     msg: string;
diff --git a/src/types/area/subway.d.ts b/src/types/area/subway.d.ts
index 0588339..ef490b3 100644
--- a/src/types/area/subway.d.ts
+++ b/src/types/area/subway.d.ts
@@ -8,18 +8,33 @@ declare namespace API.AreaSubWay {
   export  interface  LinePoint {
     latitude: number;
     longitude: numberl;
+    lineId:	number;
     lineName: string;
     stationId: number;
     stationName: string;
   }
 
   export interface LineParams {
+    lineId: number;
     createTime?: string;
     updateTime?: string;
     pageSize?: string;
     current?: string;
   }
 
+  export interface AddLineParams {
+    lineName: string;
+  }
+
+  export interface linePointParams {
+    latitude?:	number;
+    lineId?:	number;
+    lineName?:	string;
+    longitude?: number;
+    stationId?:	number;
+    stationName?: string;
+  }
+
   export interface LinePageResult {
     code: number;
     msg: string;
diff --git a/src/types/area/upline.d.ts b/src/types/area/upline.d.ts
new file mode 100644
index 0000000..375abc3
--- /dev/null
+++ b/src/types/area/upline.d.ts
@@ -0,0 +1,44 @@
+declare namespace API.AreaPlatForm {
+  export interface Line {
+    lineId: number;
+    lineName: string;
+    subwayStationList: Array<LinePoint>;
+  }
+
+  export  interface  LinePoint {
+    latitude: number;
+    longitude: numberl;
+    lineId:	number;
+    lineName: string;
+    stationId: number;
+    stationName: string;
+  }
+
+  export interface LineParams {
+    lineId: number;
+    createTime?: string;
+    updateTime?: string;
+    pageSize?: string;
+    current?: string;
+  }
+
+  export interface AddLineParams {
+    lineName: string;
+  }
+
+  export interface linePointParams {
+    latitude?:	number;
+    lineId?:	number;
+    lineName?:	string;
+    longitude?: number;
+    stationId?:	number;
+    stationName?: string;
+  }
+
+  export interface LinePageResult {
+    code: number;
+    msg: string;
+    total: number;
+    rows: Array<Line>;
+  }
+}