ia.novokshanov/asb_cloud_front
1
0
Fork 0
forked from ddrilling/asb_cloud_front
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Исправлено меню для скважин

Browse Source
This commit is contained in:
Alexey 2021-05-25 12:02:39 +05:00
parent 47262a8b8f
commit aaf926971c
7 changed files with 21385 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -21,3 +21,7 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*
# .idea
.idea
.idea/*

21311
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

71
src/components/Well.jsx
View File

@ -1,6 +1,73 @@
import {Layout, Menu} from "antd";
import {FolderOutlined, FundViewOutlined} from "@ant-design/icons";
import {Link, Redirect, Route, Switch, useParams} from "react-router-dom";
import Files from "../pages/Files";
import Archive from "../pages/Archive";
import Messages from "../pages/Messages";
import Report from "../pages/Report";
import Analysis from "../pages/Analysis";
import TelemetryView from "../pages/TelemetryView";
import Wells from "../pages/Wells";
const { Content } = Layout
export const Well = (props) => {
export default function Well() {
let { id } = useParams()
return(<div></div>)
return (<>
<Layout>
<Menu
mode="horizontal"
selectable={false}
style={{height: '100%', borderRight: 0}}
>
<Menu.Item key="1" icon={<FundViewOutlined/>}>
<Link to='telemetry'>Мониторинг</Link>
</Menu.Item>
<Menu.Item key="2" icon={<FolderOutlined/>}>
<Link to='message'>Сообщения</Link>
</Menu.Item>
<Menu.Item key="3" icon={<FolderOutlined/>}>
<Link to='report'>Рапорт</Link>
</Menu.Item>
<Menu.Item key="4" icon={<FolderOutlined/>}>
<Link to='analysis'>Анализ</Link>
</Menu.Item>
<Menu.Item key="5" icon={<FolderOutlined/>}>
<Link to='file'>Файлы</Link>
</Menu.Item>
<Menu.Item key="6" icon={<FolderOutlined/>}>
<Link to='archive'>Архив</Link>
</Menu.Item>
</Menu>
<Layout>
<Content className="site-layout-background sheet">
<Switch>
<Route path="/well/:id/file">
<Files/>
</Route>
<Route path="/well/:id/archive">
<Archive/>
</Route>
<Route path="/well/:id/message">
<Messages/>
</Route>
<Route path="/well/:id/report">
<Report/>
</Route>
<Route path="/well/:id/analysis">
<Analysis/>
</Route>
<Route path="/well/:id/telemetry">
<TelemetryView/>
</Route>
<Route path="/">
<Redirect to={{pathname: `/well/${id}/telemetry`}}/>
</Route>
</Switch>
</Content>
</Layout>
</Layout>
</>)
}

2
src/components/WellTreeSelector.jsx
View File

@ -57,7 +57,7 @@ export default function WellTreeSelector(props) {
const onSelect = (value) => {
if (value)
history.push(`/well/${value}`);
history.replace(`/well/${value}/`);
console.log(value)
}

80
src/pages/Main.jsx
View File

@ -1,92 +1,32 @@
import { Layout, Menu, } from 'antd' // Button,
import { FundViewOutlined, FolderOutlined } from '@ant-design/icons' // UserOutlined, MenuOutlined,
import { useState } from 'react'
import { Switch, Route, Redirect, Link} from "react-router-dom"
import { Layout, } from 'antd'
import Wells from './Wells'
import TelemetryView from './TelemetryView'
import Files from './Files'
import Archive from './Archive'
import Messages from './Messages'
import Report from './Report'
import Analysis from './Analysis'
import PageHeader from './Header'
import TelemetryView from "./TelemetryView";
import Well from "../components/Well";
import {Redirect, Route, Switch} from "react-router-dom";
const { Content, Sider } = Layout
const { Content } = Layout
export default function Main(){
const [sidebarVisible] = useState(true) // setSidebarVisible
// const login = localStorage['login']
// let handleLogout = () => {
// localStorage.removeItem('login')
// localStorage.removeItem('token')
// }
return(
<Layout>
<Content>
<PageHeader />
<Layout>
{sidebarVisible &&
<Sider width={200} className="site-layout-background">
<Menu
mode="inline"
defaultSelectedKeys={['1']}
defaultOpenKeys={['sub1']}
style={{ height: '100%', borderRight: 0 }}
>
<Menu.Item key="1" icon= {<FundViewOutlined />}>
<Link to="/well">Мониторинг</Link>
</Menu.Item>
<Menu.Item key="2" icon= {<FolderOutlined />}>
<Link to="/archive">Архив</Link>
</Menu.Item>
<Menu.Item key="3" icon= {<FolderOutlined />}>
<Link to="/messages">Сообщения</Link>
</Menu.Item>
<Menu.Item key="4" icon= {<FolderOutlined />}>
<Link to="/report">Рапорт</Link>
</Menu.Item>
<Menu.Item key="5" icon= {<FolderOutlined />}>
<Link to="/analysis">Анализ</Link>
</Menu.Item>
<Menu.Item key="6" icon= {<FolderOutlined />}>
<Link to="/file">Файлы</Link>
</Menu.Item>
</Menu>
</Sider>
}
<Layout>
<Content className="site-layout-background sheet">
<Switch>
<Route path="/file">
<Files />
</Route>
<Route path="/archive">
<Archive />
</Route>
<Route path="/well/:id/messages">
<Messages />
</Route>
<Route path="/report">
<Report />
</Route>
<Route path="/analysis">
<Analysis />
</Route>
<Route path="/well/:id">
<TelemetryView/>
<Route path="/well/:id/">
<Well/>
</Route>
<Route path="/well">
<Wells/>
</Route>
<Route path="/">
<Redirect to={{pathname: "/well"}}/>
<Redirect to={{pathname: `/well`}}/>
</Route>
</Switch>
</Content>
</Layout>
</Layout>
</Layout>
</Content>
);
}

2
src/pages/TelemetryView.jsx
View File

@ -160,7 +160,7 @@ export default function TelemetryView(props) {
const handleReceiveMessages = (messages) => {
if (messages) {
setMessages(messages.items.splice(0, 3))
setMessages(messages.items.splice(0, 4))
}
}

4
src/pages/Wells.jsx
View File

@ -59,7 +59,7 @@ const groupBy = (table, ...keys) => {
export default function Wells(props){
const [wells, setWells] = useState([])
const [wellsTree, setWellsTree] = useState([]) // wellsTree,
const [setWellsTree] = useState([]) // wellsTree,
const [loader, setLoader] = useState(false)
const history = useHistory()
@ -87,7 +87,7 @@ export default function Wells(props){
columns={columns}
onRow={(record) => {
return {
onClick: event => {history.push(`well/${record.id}`)},
onClick: event => {history.push(`/well/${record.id}/`)},
};
}}/>
{loader&&<Loader/>}