diff --git a/src/components/CenterTopData/RightTable/index.jsx b/src/components/CenterTopData/RightTable/index.jsx index 43086bf..6d075ce 100644 --- a/src/components/CenterTopData/RightTable/index.jsx +++ b/src/components/CenterTopData/RightTable/index.jsx @@ -1,59 +1,65 @@ - import React, { Component } from 'react'; -import './righttable.module.less' +import './righttable.module.less'; -import { ScrollBoard } from '@jiaminghi/data-view-react' +import { ScrollBoard } from '@jiaminghi/data-view-react'; let data = [ - ['产线0', '10mm', '10mm', '10mm'], - ['产线2', '8mm', '8mm', '8mm'], - ['产线3', '15mm', '15mm', '15mm'], - ['产线4', '15mm', '15mm', '15mm'], -] + ['产线0', '10mm', '10mm', '10mm'], + ['产线2', '8mm', '8mm', '8mm'], + ['产线3', '15mm', '15mm', '15mm'], + ['产线4', '15mm', '15mm', '15mm'], +]; -let header = ['产线名', '原板宽度', '净板宽', '玻璃厚度'] +let header = ['产线名', '原板宽度', '净板宽', '玻璃厚度']; let config = { - headerBGC: 'rgba(4, 44, 76, 0.3)', - header: ['产线名', '原板宽度', '净板宽', '玻璃厚度'], - oddRowBGC: "#042444", - evenRowBGC: "#042c4c", - columnWidth: [90], - headerHeight: 40, - hoverPause: false, - data: replaceStyle(data, 0.7) -} + headerBGC: 'rgba(4, 44, 76, 0.3)', + header: [ + '产线名', + '原板宽度', + '净板宽', + '玻璃厚度', + ], + oddRowBGC: '#042444', + evenRowBGC: '#042c4c', + columnWidth: [90], + headerHeight: 40, + hoverPause: false, + data: replaceStyle(data, 0.7), +}; function replaceStyle(Arr, opencity) { - let temp = []; + let temp = []; - for (let i = 0; i < Arr.length; i++) { - temp[i] = []; - for (let j = 0; j < Arr[i].length; j++) { - temp[i][j] = ` ${Arr[i][j]}` - } - } + for (let i = 0; i < Arr.length; i++) { + temp[i] = []; + for (let j = 0; j < Arr[i].length; j++) { + temp[i][ + j + ] = ` ${Arr[i][j]}`; + } + } - return temp; + return temp; } class Chart1 extends Component { - - - render() { - return ( -
-

当前产线生产规格

-
- - - - -
- -
- ); - } + render() { + return ( +
+

当前产线生产规格

+
+ + + + +
+
+ ); + } } export default Chart1; diff --git a/src/components/LeftBar/GoodProduction.jsx b/src/components/LeftBar/GoodProduction.jsx index 625aac2..d69c67e 100644 --- a/src/components/LeftBar/GoodProduction.jsx +++ b/src/components/LeftBar/GoodProduction.jsx @@ -7,7 +7,7 @@ import TechSplitline from './substitutionCharts/TechSplitline'; const GoodProduction = () => { return ( -
+
diff --git a/src/components/LeftBar/good.module.less b/src/components/LeftBar/good.module.less index f56adbc..63f1b7d 100644 --- a/src/components/LeftBar/good.module.less +++ b/src/components/LeftBar/good.module.less @@ -6,4 +6,9 @@ flex: 1; height: 1px; margin-top: 24px; + + .goodProd__content { + display: flex; + flex-direction: column; + } } diff --git a/src/components/LeftBar/index.module.less b/src/components/LeftBar/index.module.less index 2b8661d..6997ecf 100644 --- a/src/components/LeftBar/index.module.less +++ b/src/components/LeftBar/index.module.less @@ -1,25 +1,25 @@ .leftBar { - border: 2px solid red; - width: 625px; - height: 966px; - margin-left: 40px; + // border: 2px solid red; + width: 625px; + height: 966px; + margin-left: 40px; - display: flex; - flex-direction: column; - justify-content: space-between; + display: flex; + flex-direction: column; + justify-content: space-between; - // .LeftChart1Border { - // width: 100%; - // height: 304px; - // background: url('../../assets/ItemBg.png'); - // } + // .LeftChart1Border { + // width: 100%; + // height: 304px; + // background: url('../../assets/ItemBg.png'); + // } - // .LeftChart2Border { - // width: 624px; - // height: 632px; - // background: url('../../assets/ItemBg2.png'); - // display: flex; - // flex-direction: column; - // //justify-content: space-between; - // } + // .LeftChart2Border { + // width: 624px; + // height: 632px; + // background: url('../../assets/ItemBg2.png'); + // display: flex; + // flex-direction: column; + // //justify-content: space-between; + // } } diff --git a/src/components/LeftBar/kiln.module.less b/src/components/LeftBar/kiln.module.less index 2e8a6ed..c5894e6 100644 --- a/src/components/LeftBar/kiln.module.less +++ b/src/components/LeftBar/kiln.module.less @@ -2,7 +2,8 @@ width: 625px; // height: 305px; height: 300px; - background: url('../../assets/ItemBg.png') 100% 100% no-repeat; + background: url('../../assets/ItemBg.png') no-repeat; + background-size: 100% 100%; .leftBar__top__content { flex: 1; diff --git a/src/components/LeftBar/substitutionCharts/GoodRateChart/index.module.less b/src/components/LeftBar/substitutionCharts/GoodRateChart/index.module.less index e69de29..0fcd823 100644 --- a/src/components/LeftBar/substitutionCharts/GoodRateChart/index.module.less +++ b/src/components/LeftBar/substitutionCharts/GoodRateChart/index.module.less @@ -0,0 +1,4 @@ +.GoodRateChart { + height: 1px; + flex: 1; +} diff --git a/src/components/LeftBar/substitutionCharts/TodayTableData/index.jsx b/src/components/LeftBar/substitutionCharts/TodayTableData/index.jsx index ab36061..eac6e62 100644 --- a/src/components/LeftBar/substitutionCharts/TodayTableData/index.jsx +++ b/src/components/LeftBar/substitutionCharts/TodayTableData/index.jsx @@ -1,7 +1,36 @@ +import { useState } from 'react'; import cls from './index.module.less'; +import { ScrollBoard } from '@jiaminghi/data-view-react'; const TodayTableData = (props) => { - return
today table data
; + const [config, setConfig] = useState({ + // headerBGC: 'rgba(4, 44, 76, 0.3)', + headerBGC: 'rgba(4, 44, 76, .8)', + header: [ + '产线', + '一等率', + '二等率', + '成品率', + '废品率', + ], + oddRowBGC: '#042444', + evenRowBGC: '#042c4c', + columnWidth: [90], + headerHeight: 40, + hoverPause: false, + data: [ + ['产线1', '37%', '62%', '97%', '7%'], + ['产线2', '95%', '10%', '99%', '3%'], + ['产线3', '68%', '1%', '92%', '4%'], + ['产线4', '94%', '21%', '97%', '2%'], + ['产线5', '99%', '30%', '95%', '5%'], + ], + }); + return ( +
+ +
+ ); }; export default TodayTableData; diff --git a/src/components/LeftBar/substitutionCharts/TodayTableData/index.module.less b/src/components/LeftBar/substitutionCharts/TodayTableData/index.module.less index e69de29..287daa8 100644 --- a/src/components/LeftBar/substitutionCharts/TodayTableData/index.module.less +++ b/src/components/LeftBar/substitutionCharts/TodayTableData/index.module.less @@ -0,0 +1,5 @@ +.todayTableData { + height: 240px; + // flex: 1; + padding-top: 12px; +}