diff --git a/src/components/BottomBar/gasi/index.jsx b/src/components/BottomBar/gasi/index.jsx index 6402e94..2b458ce 100644 --- a/src/components/BottomBar/gasi/index.jsx +++ b/src/components/BottomBar/gasi/index.jsx @@ -4,7 +4,9 @@ import BottomBarItem from '../BottomBarItem'; function GasI(props) { return ( - 助燃风流量 - linechart - 当前流量 - 0 legends - 1 line + {/* 助燃风流量 - linechart - 当前流量 - 0 legends - 1 line */} + {/* 当前流量 */} +
当前流量: 280m³
); } diff --git a/src/components/BottomBar/gasi/index.module.css b/src/components/BottomBar/gasi/index.module.css index e69de29..f846de9 100644 --- a/src/components/BottomBar/gasi/index.module.css +++ b/src/components/BottomBar/gasi/index.module.css @@ -0,0 +1,51 @@ +.chart { + height: 100%; + /* background-color: #00ee33; */ +} + +.gas { + position: relative; +} + +.currentFlow { + position: absolute; + top: 20px; + left: 50%; + transform: translateX(-50%); + padding: 8px 22px; + border-radius: 2px; + letter-spacing: 2px; + box-shadow: inset 0 0 22px 0px hsla(0, 0%, 100%, 0.15); + line-height: 18px; + font-size: 18px; + text-align: center; + color: #12FFF5; +} + +.headWidget { + position: absolute; + /* background: #00ee33; */ + top: 20px; + right: 24px; + height: 32px; + width: 190px; + text-align: right; +} + +.radioGroup * { + border: none !important; + border-radius: 0 !important; +} + +.radioGroup *:focus-within { + box-shadow: none !important; +} + +.radioGroup *::before { + width: 0 !important; +} + +.radioGroup_button_wrapper { + color: #fff !important; + background: #03233c !important; +} diff --git a/src/components/BottomBar/gasii/index.jsx b/src/components/BottomBar/gasii/index.jsx index f71cda5..76a67ef 100644 --- a/src/components/BottomBar/gasii/index.jsx +++ b/src/components/BottomBar/gasii/index.jsx @@ -1,10 +1,31 @@ import cls from './index.module.css'; import BottomBarItem from '../BottomBarItem'; +import { Switch, Radio } from 'antd'; +import ReactECharts from 'echarts-for-react'; +import * as echarts from 'echarts'; +import { randomInt } from '../../../utils'; function GasII(props) { return ( - 天然气流量 - linechart - 当前流量 - 2 legends - 2 lines + {/* 当前流量 */} +
当前流量: 280m³
+ + {/* legend */} +
+
+ + 天然气I +
+
+ + 天然气II +
+
+ +
+ {/* */} +
); } diff --git a/src/components/BottomBar/gasii/index.module.css b/src/components/BottomBar/gasii/index.module.css index e69de29..0059b76 100644 --- a/src/components/BottomBar/gasii/index.module.css +++ b/src/components/BottomBar/gasii/index.module.css @@ -0,0 +1,79 @@ +.chart { + height: 100%; + /* background-color: #00ee33; */ +} + +.gas { + position: relative; +} + +.currentFlow { + position: absolute; + top: 20px; + left: 50%; + transform: translateX(-50%); + padding: 8px 22px; + border-radius: 2px; + letter-spacing: 2px; + box-shadow: inset 0 0 22px 0px hsla(0, 0%, 100%, 0.15); + line-height: 18px; + font-size: 18px; + text-align: center; + color: #12fff5; +} + +.headWidget { + position: absolute; + /* background: #00ee33; */ + top: 20px; + right: 24px; + height: 32px; + width: 190px; + display: flex; + align-items: center; + justify-content: flex-end; +} + +.legend:last-child { + margin-left: 8px; +} + +.legend > span { + display: inline-block; + color: #dff1fe; + font-size: 14px; + letter-spacing: 2px; +} + +.legend > span:first-child { + width: 12px; + height: 12px; + margin-right: 4px; + border-radius: 2px; +} + +.gasIcon { + background: #12fff5; +} + +.gas2Icon { + background: #2760ff; +} + +.radioGroup * { + border: none !important; + border-radius: 0 !important; +} + +.radioGroup *:focus-within { + box-shadow: none !important; +} + +.radioGroup *::before { + width: 0 !important; +} + +.radioGroup_button_wrapper { + color: #fff !important; + background: #03233c !important; +} diff --git a/src/components/BottomBar/index.jsx b/src/components/BottomBar/index.jsx index 2c4422c..20e3fa7 100644 --- a/src/components/BottomBar/index.jsx +++ b/src/components/BottomBar/index.jsx @@ -28,8 +28,8 @@ export default function index() {
- +
);