diff --git a/src/assets/good-bg.png b/src/assets/good-bg.png new file mode 100644 index 0000000..5da0ce8 Binary files /dev/null and b/src/assets/good-bg.png differ diff --git a/src/assets/kiln-bg.png b/src/assets/kiln-bg.png new file mode 100644 index 0000000..7b12f15 Binary files /dev/null and b/src/assets/kiln-bg.png differ diff --git a/src/components/LeftBar/good.module.less b/src/components/LeftBar/good.module.less index 3b4237a..f77cf69 100644 --- a/src/components/LeftBar/good.module.less +++ b/src/components/LeftBar/good.module.less @@ -1,11 +1,7 @@ .goodProd { - background: url(../../assets/good.png) no-repeat; + background: url(../../assets/good-bg.png) no-repeat; background-size: 100% 100%; - width: 625px; - // height: 626px; - flex: 1; - height: 1px; - margin-top: 24px; + height: 610px; .goodProd__content { display: flex; diff --git a/src/components/LeftBar/kiln.module.less b/src/components/LeftBar/kiln.module.less index ef3c423..501858b 100644 --- a/src/components/LeftBar/kiln.module.less +++ b/src/components/LeftBar/kiln.module.less @@ -1,9 +1,7 @@ .leftBar__top { - width: 625px; - // height: 305px; - height: 300px; - background: url('../../assets/ItemBg.png') no-repeat; + background: url('../../assets/kiln-bg.png') no-repeat; background-size: 100% 100%; + height: 306px; .leftBar__top__content { flex: 1; @@ -11,7 +9,7 @@ display: grid; grid-template-columns: 1fr 1fr; gap: 10px; - padding-top: 18px; + padding-top: 8px; .info__item { border-radius: 2px; diff --git a/src/components/LeftBar/substitutionCharts/GoodRateChart/index.jsx b/src/components/LeftBar/substitutionCharts/GoodRateChart/index.jsx index 4d78ae4..7f43468 100644 --- a/src/components/LeftBar/substitutionCharts/GoodRateChart/index.jsx +++ b/src/components/LeftBar/substitutionCharts/GoodRateChart/index.jsx @@ -8,7 +8,7 @@ import { randomInt } from '../../../../utils'; const GoodRateChart = (props) => { const options = { color: ['#FFD160', '#12FFF5', '#2760FF'], - grid: { top: 28, right: 12, bottom: 32, left: 48 }, + grid: { top: 28, right: 12, bottom: 64, left: 48 }, xAxis: { type: 'category', data: Array(7) @@ -29,7 +29,7 @@ const GoodRateChart = (props) => { axisLine: { lineStyle: { width: 1, - color: '#213259', + color: '#4561AE', }, }, }, @@ -43,12 +43,12 @@ const GoodRateChart = (props) => { axisLine: { show: true, lineStyle: { - color: '#213259', + color: '#4561AE', }, }, splitLine: { lineStyle: { - color: '#213259a0', + color: '#4561AEa0', }, }, interval: 10, diff --git a/src/components/LeftBar/substitutionCharts/TodayTableData/index.jsx b/src/components/LeftBar/substitutionCharts/TodayTableData/index.jsx index eac6e62..f93d371 100644 --- a/src/components/LeftBar/substitutionCharts/TodayTableData/index.jsx +++ b/src/components/LeftBar/substitutionCharts/TodayTableData/index.jsx @@ -5,7 +5,8 @@ import { ScrollBoard } from '@jiaminghi/data-view-react'; const TodayTableData = (props) => { const [config, setConfig] = useState({ // headerBGC: 'rgba(4, 44, 76, 0.3)', - headerBGC: 'rgba(4, 44, 76, .8)', + // headerBGC: 'rgba(4, 44, 76, .8)', + headerBGC: '#044A8425', header: [ '产线', '一等率', @@ -13,8 +14,10 @@ const TodayTableData = (props) => { '成品率', '废品率', ], - oddRowBGC: '#042444', - evenRowBGC: '#042c4c', + // oddRowBGC: '#042444', + oddRowBGC: '#044A8425', + // evenRowBGC: '#042c4c', + evenRowBGC: '#0B549945', columnWidth: [90], headerHeight: 40, hoverPause: false, @@ -28,7 +31,11 @@ const TodayTableData = (props) => { }); return (
- +
); }; diff --git a/src/components/container.module.less b/src/components/container.module.less index 472c5ca..e08402e 100644 --- a/src/components/container.module.less +++ b/src/components/container.module.less @@ -10,7 +10,7 @@ align-items: center; img { - width: 20px; + width: 24px; &.bigger { width: 24px; @@ -24,7 +24,7 @@ sans-serif; margin: 0; margin-left: 6px; - font-size: 18px; + font-size: 24px; color: #fff; letter-spacing: 2px; font-weight: 500; diff --git a/src/components/yx-dark/LeftContent.jsx b/src/components/yx-dark/LeftContent.jsx index 554db57..88ef70f 100644 --- a/src/components/yx-dark/LeftContent.jsx +++ b/src/components/yx-dark/LeftContent.jsx @@ -1,5 +1,13 @@ import './styles/left.module.css'; +import Kiln from '../LeftBar/Kiln'; +import GoodProduction from '../LeftBar/GoodProduction'; + export default (props) => { - return
; + return ( +
+ + +
+ ); }; diff --git a/src/components/yx-dark/styles/left.module.css b/src/components/yx-dark/styles/left.module.css index 0c314c9..ecb442b 100644 --- a/src/components/yx-dark/styles/left.module.css +++ b/src/components/yx-dark/styles/left.module.css @@ -3,5 +3,5 @@ display: flex; flex-direction: column; gap: 20px; - background: #fcc3; + /* background: #fcc3; */ } \ No newline at end of file diff --git a/src/components/yx-dark/styles/main.module.css b/src/components/yx-dark/styles/main.module.css index 0cdc2c6..a613445 100644 --- a/src/components/yx-dark/styles/main.module.css +++ b/src/components/yx-dark/styles/main.module.css @@ -1,7 +1,7 @@ .main-container { height: 1px; flex: 1; - background: #ccc4; + /* background: #ccc4; */ display: grid; grid-template-columns: 626px 576px 580px 626px 626px 450px 626px; grid-template-rows: 600px 306px;