diff --git a/src/components/BottomBar/BottomBarItem/index.jsx b/src/components/BottomBar/BottomBarItem/index.jsx index 0831ec1..5c26383 100644 --- a/src/components/BottomBar/BottomBarItem/index.jsx +++ b/src/components/BottomBar/BottomBarItem/index.jsx @@ -6,7 +6,7 @@ function BottomBarItem(props) { {props.children} diff --git a/src/components/BottomBar/BottomBarItem/index.module.css b/src/components/BottomBar/BottomBarItem/index.module.css index eb128cc..8d1c8b6 100644 --- a/src/components/BottomBar/BottomBarItem/index.module.css +++ b/src/components/BottomBar/BottomBarItem/index.module.css @@ -1,5 +1 @@ -.bottomBarItem { - background: url(../../../assets/bg-bottom-item.png) no-repeat; - background-size: 100% 100%; - width: 600px; -} \ No newline at end of file + diff --git a/src/components/BottomBar/FaultTotal/index.module.css b/src/components/BottomBar/FaultTotal/index.module.css index d1457f9..be0efa1 100644 --- a/src/components/BottomBar/FaultTotal/index.module.css +++ b/src/components/BottomBar/FaultTotal/index.module.css @@ -4,13 +4,14 @@ } .faultTotal { + height: 100%; position: relative; } .headWidget { position: absolute; /* background: #00ee33; */ - top: 20px; + top: 28px; right: 24px; height: 32px; width: 190px; diff --git a/src/components/BottomBar/FaultType/index.jsx b/src/components/BottomBar/FaultType/index.jsx index 207aaba..57d59c1 100644 --- a/src/components/BottomBar/FaultType/index.jsx +++ b/src/components/BottomBar/FaultType/index.jsx @@ -38,11 +38,11 @@ function FaultType(props) { }, textStyle: { color: '#DFF1FE', - fontSize: 18, + fontSize: 16, rich: { sub: { color: '#fff9', - fontSize: 18, + fontSize: 16, }, }, }, @@ -109,7 +109,7 @@ function FaultType(props) { {l.label} diff --git a/src/components/BottomBar/FaultType/index.module.css b/src/components/BottomBar/FaultType/index.module.css index 1f811e2..bb915ce 100644 --- a/src/components/BottomBar/FaultType/index.module.css +++ b/src/components/BottomBar/FaultType/index.module.css @@ -4,11 +4,12 @@ .faultType { position: relative; + height: 100%; } .headWidget { position: absolute; - top: 20px; + top: 28px; right: 24px; height: 32px; width: 340px; @@ -32,3 +33,7 @@ color: #fff !important; background: #03233c !important; } + +.radio-group__item { + padding: 0 8px; +} \ No newline at end of file diff --git a/src/components/yx-dark/Bottom.jsx b/src/components/yx-dark/Bottom.jsx index f622b72..6803977 100644 --- a/src/components/yx-dark/Bottom.jsx +++ b/src/components/yx-dark/Bottom.jsx @@ -1,5 +1,5 @@ import './styles/bottom.module.css'; export default (props) => { - return
bottom
; + return
{props.children}
; }; diff --git a/src/components/yx-dark/MainContainer.jsx b/src/components/yx-dark/MainContainer.jsx index aae92f5..66196f1 100644 --- a/src/components/yx-dark/MainContainer.jsx +++ b/src/components/yx-dark/MainContainer.jsx @@ -3,13 +3,20 @@ import LeftContent from './LeftContent'; import RightContent from './RightContent'; import './styles/main.module.css'; +import FaultTotal from '../BottomBar/FaultTotal'; +import FaultType from '../BottomBar/FaultType'; + export default (props) => { return (
- - + + + + + + diff --git a/src/components/yx-dark/images/3d.png b/src/components/yx-dark/images/3d.png new file mode 100644 index 0000000..829f5fd Binary files /dev/null and b/src/components/yx-dark/images/3d.png differ diff --git a/src/components/yx-dark/images/fenlei-bg.png b/src/components/yx-dark/images/fenlei-bg.png new file mode 100644 index 0000000..54e8b76 Binary files /dev/null and b/src/components/yx-dark/images/fenlei-bg.png differ diff --git a/src/components/yx-dark/images/gas-bg.png b/src/components/yx-dark/images/gas-bg.png new file mode 100644 index 0000000..4df7291 Binary files /dev/null and b/src/components/yx-dark/images/gas-bg.png differ diff --git a/src/components/yx-dark/images/spec-bg.png b/src/components/yx-dark/images/spec-bg.png new file mode 100644 index 0000000..e52ae90 Binary files /dev/null and b/src/components/yx-dark/images/spec-bg.png differ diff --git a/src/components/yx-dark/images/tongji-bg.png b/src/components/yx-dark/images/tongji-bg.png new file mode 100644 index 0000000..d8edc0b Binary files /dev/null and b/src/components/yx-dark/images/tongji-bg.png differ diff --git a/src/components/yx-dark/styles/main.module.css b/src/components/yx-dark/styles/main.module.css index a613445..801aecd 100644 --- a/src/components/yx-dark/styles/main.module.css +++ b/src/components/yx-dark/styles/main.module.css @@ -15,7 +15,7 @@ .main-center { grid-area: main; - background: #0f93; + background: url(../images/3d.png) 100% 100% / contain no-repeat; } .left { @@ -24,22 +24,27 @@ .bottom-1 { grid-area: bottom1; + background: url('../images/tongji-bg.png') 100% / contain no-repeat; } .bottom-2 { grid-area: bottom2; + background: url('../images/fenlei-bg.png') 100% / contain no-repeat; } .bottom-3 { grid-area: bottom3; + background: url('../images/gas-bg.png') 100% / contain no-repeat; } .bottom-4 { grid-area: bottom4; + background: url('../images/gas-bg.png') 100% / contain no-repeat; } .bottom-5 { grid-area: bottom5; + background: url('../images/spec-bg.png') 100% / contain no-repeat; } .right {