From e50dfdb575694d51d944bb32e924922ebfacf29a Mon Sep 17 00:00:00 2001 From: lb Date: Wed, 1 Nov 2023 13:44:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E6=94=B9=E5=8F=98=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BottomBar/index.jsx | 8 ++++---- src/components/LeftBar/index.jsx | 2 +- src/components/RightBar/index.jsx | 4 ++-- .../BottomItemBackground}/index.jsx | 0 .../BottomItemBackground}/index.module.css | 0 .../TechSplitline/index.jsx | 0 .../TechSplitline/index.module.less | 0 src/components/公共组件/产线当日缺陷分类/1 | 1 - .../产线当日缺陷分类}/index.jsx | 16 ++-------------- .../产线当日缺陷分类}/index.module.css | 0 src/components/公共组件/产线缺陷统计/1 | 1 - .../产线缺陷统计}/index.jsx | 6 ++---- .../产线缺陷统计}/index.module.css | 0 src/components/公共组件/助燃风流量/1 | 1 - .../gasi => 公共组件/助燃风流量}/index.jsx | 2 +- .../助燃风流量}/index.module.css | 0 src/components/公共组件/天然气流量/1 | 1 - .../天然气流量}/gasChart/chart.config.js | 0 .../天然气流量}/gasChart/index.jsx | 0 .../天然气流量}/gasChart/index.module.css | 0 .../天然气流量}/gridList/index.jsx | 0 .../天然气流量}/gridList/index.module.css | 0 .../gasii => 公共组件/天然气流量}/index.jsx | 2 +- .../天然气流量}/index.module.css | 0 .../公共组件/本日生产良品率/GoodProduction.jsx | 2 +- .../components/TechSplitline/index.jsx | 7 ------- .../components/TechSplitline/index.module.less | 5 ----- src/components/公共组件/烟气处理/1 | 1 - .../烟气处理}/SmokeTrendChart/index.jsx | 0 .../烟气处理}/SmokeTrendChart/index.module.css | 0 .../SmokeHandle => 公共组件/烟气处理}/index.jsx | 2 -- .../烟气处理}/index.module.less | 0 src/components/公共组件/能耗/1 | 1 - .../能耗}/EnergyCostChart/index.jsx | 0 .../能耗}/EnergyCostChart/index.module.css | 0 .../EnergyCost => 公共组件/能耗}/index.jsx | 0 .../能耗}/index.module.less | 0 src/components/窑炉信息/1 | 1 - src/components/{LeftBar => 窑炉信息}/Kiln.jsx | 2 +- .../{LeftBar => 窑炉信息}/kiln.module.less | 0 40 files changed, 15 insertions(+), 50 deletions(-) rename src/components/{BottomBar/BottomBarItem => 公共组件/BottomItemBackground}/index.jsx (100%) rename src/components/{BottomBar/BottomBarItem => 公共组件/BottomItemBackground}/index.module.css (100%) rename src/components/{RightBar => 公共组件}/TechSplitline/index.jsx (100%) rename src/components/{RightBar => 公共组件}/TechSplitline/index.module.less (100%) delete mode 100644 src/components/公共组件/产线当日缺陷分类/1 rename src/components/{BottomBar/FaultType => 公共组件/产线当日缺陷分类}/index.jsx (86%) rename src/components/{BottomBar/FaultType => 公共组件/产线当日缺陷分类}/index.module.css (100%) delete mode 100644 src/components/公共组件/产线缺陷统计/1 rename src/components/{BottomBar/FaultTotal => 公共组件/产线缺陷统计}/index.jsx (94%) rename src/components/{BottomBar/FaultTotal => 公共组件/产线缺陷统计}/index.module.css (100%) delete mode 100644 src/components/公共组件/助燃风流量/1 rename src/components/{BottomBar/gasi => 公共组件/助燃风流量}/index.jsx (98%) rename src/components/{BottomBar/gasi => 公共组件/助燃风流量}/index.module.css (100%) delete mode 100644 src/components/公共组件/天然气流量/1 rename src/components/{BottomBar/gasii => 公共组件/天然气流量}/gasChart/chart.config.js (100%) rename src/components/{BottomBar/gasii => 公共组件/天然气流量}/gasChart/index.jsx (100%) rename src/components/{BottomBar/gasii => 公共组件/天然气流量}/gasChart/index.module.css (100%) rename src/components/{BottomBar/gasii => 公共组件/天然气流量}/gridList/index.jsx (100%) rename src/components/{BottomBar/gasii => 公共组件/天然气流量}/gridList/index.module.css (100%) rename src/components/{BottomBar/gasii => 公共组件/天然气流量}/index.jsx (96%) rename src/components/{BottomBar/gasii => 公共组件/天然气流量}/index.module.css (100%) delete mode 100644 src/components/公共组件/本日生产良品率/components/TechSplitline/index.jsx delete mode 100644 src/components/公共组件/本日生产良品率/components/TechSplitline/index.module.less delete mode 100644 src/components/公共组件/烟气处理/1 rename src/components/{RightBar/SmokeHandle => 公共组件/烟气处理}/SmokeTrendChart/index.jsx (100%) rename src/components/{RightBar/SmokeHandle => 公共组件/烟气处理}/SmokeTrendChart/index.module.css (100%) rename src/components/{RightBar/SmokeHandle => 公共组件/烟气处理}/index.jsx (99%) rename src/components/{RightBar/SmokeHandle => 公共组件/烟气处理}/index.module.less (100%) delete mode 100644 src/components/公共组件/能耗/1 rename src/components/{RightBar/EnergyCost => 公共组件/能耗}/EnergyCostChart/index.jsx (100%) rename src/components/{RightBar/EnergyCost => 公共组件/能耗}/EnergyCostChart/index.module.css (100%) rename src/components/{RightBar/EnergyCost => 公共组件/能耗}/index.jsx (100%) rename src/components/{RightBar/EnergyCost => 公共组件/能耗}/index.module.less (100%) delete mode 100644 src/components/窑炉信息/1 rename src/components/{LeftBar => 窑炉信息}/Kiln.jsx (95%) rename src/components/{LeftBar => 窑炉信息}/kiln.module.less (100%) diff --git a/src/components/BottomBar/index.jsx b/src/components/BottomBar/index.jsx index 8e150f0..4ccb66a 100644 --- a/src/components/BottomBar/index.jsx +++ b/src/components/BottomBar/index.jsx @@ -1,10 +1,10 @@ import React from 'react'; import { useEffect, useState } from 'react'; -import GasI from './gasi'; -import GasII from './gasii'; -import FaultTotal from './FaultTotal'; -import FaultType from './FaultType'; +import GasI from '../公共组件/助燃风流量'; +import GasII from '../公共组件/天然气流量'; +import FaultTotal from '../公共组件/产线缺陷统计'; +import FaultType from '../公共组件/产线当日缺陷分类'; import './index.less'; import cls from './index.module.css'; diff --git a/src/components/LeftBar/index.jsx b/src/components/LeftBar/index.jsx index 1c147ee..ac9a867 100644 --- a/src/components/LeftBar/index.jsx +++ b/src/components/LeftBar/index.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import Kiln from './Kiln'; +import Kiln from '../窑炉信息/Kiln'; import GoodProduction from '../公共组件/本日生产良品率/GoodProduction'; import cls from './index.module.less'; diff --git a/src/components/RightBar/index.jsx b/src/components/RightBar/index.jsx index 8105e89..3e22690 100644 --- a/src/components/RightBar/index.jsx +++ b/src/components/RightBar/index.jsx @@ -1,6 +1,6 @@ import React from 'react'; -import SmokeHandle from './SmokeHandle'; -import EnergyCost from './EnergyCost'; +import SmokeHandle from '../公共组件/烟气处理'; +import EnergyCost from '../公共组件/能耗'; import cls from './index.module.less'; diff --git a/src/components/BottomBar/BottomBarItem/index.jsx b/src/components/公共组件/BottomItemBackground/index.jsx similarity index 100% rename from src/components/BottomBar/BottomBarItem/index.jsx rename to src/components/公共组件/BottomItemBackground/index.jsx diff --git a/src/components/BottomBar/BottomBarItem/index.module.css b/src/components/公共组件/BottomItemBackground/index.module.css similarity index 100% rename from src/components/BottomBar/BottomBarItem/index.module.css rename to src/components/公共组件/BottomItemBackground/index.module.css diff --git a/src/components/RightBar/TechSplitline/index.jsx b/src/components/公共组件/TechSplitline/index.jsx similarity index 100% rename from src/components/RightBar/TechSplitline/index.jsx rename to src/components/公共组件/TechSplitline/index.jsx diff --git a/src/components/RightBar/TechSplitline/index.module.less b/src/components/公共组件/TechSplitline/index.module.less similarity index 100% rename from src/components/RightBar/TechSplitline/index.module.less rename to src/components/公共组件/TechSplitline/index.module.less diff --git a/src/components/公共组件/产线当日缺陷分类/1 b/src/components/公共组件/产线当日缺陷分类/1 deleted file mode 100644 index 56a6051..0000000 --- a/src/components/公共组件/产线当日缺陷分类/1 +++ /dev/null @@ -1 +0,0 @@ -1 \ No newline at end of file diff --git a/src/components/BottomBar/FaultType/index.jsx b/src/components/公共组件/产线当日缺陷分类/index.jsx similarity index 86% rename from src/components/BottomBar/FaultType/index.jsx rename to src/components/公共组件/产线当日缺陷分类/index.jsx index 207aaba..c184ad4 100644 --- a/src/components/BottomBar/FaultType/index.jsx +++ b/src/components/公共组件/产线当日缺陷分类/index.jsx @@ -1,9 +1,7 @@ import cls from './index.module.css'; -import BottomBarItem from '../BottomBarItem'; -import { Switch, Radio } from 'antd'; +import BottomBarItem from '../BottomItemBackground'; +import { Radio } from 'antd'; import ReactECharts from 'echarts-for-react'; -import * as echarts from 'echarts'; -import { randomInt } from '../../../utils'; import { useState } from 'react'; function FaultType(props) { @@ -62,16 +60,6 @@ function FaultType(props) { labelLine: { length: 0, }, - // emphasis: { - // label: { - // show: true, - // fontSize: 40, - // fontWeight: 'bold', - // }, - // }, - // labelLine: { - // show: false, - // }, data: [ { value: 1048, name: '缺陷1' }, { value: 735, name: '缺陷2' }, diff --git a/src/components/BottomBar/FaultType/index.module.css b/src/components/公共组件/产线当日缺陷分类/index.module.css similarity index 100% rename from src/components/BottomBar/FaultType/index.module.css rename to src/components/公共组件/产线当日缺陷分类/index.module.css diff --git a/src/components/公共组件/产线缺陷统计/1 b/src/components/公共组件/产线缺陷统计/1 deleted file mode 100644 index 56a6051..0000000 --- a/src/components/公共组件/产线缺陷统计/1 +++ /dev/null @@ -1 +0,0 @@ -1 \ No newline at end of file diff --git a/src/components/BottomBar/FaultTotal/index.jsx b/src/components/公共组件/产线缺陷统计/index.jsx similarity index 94% rename from src/components/BottomBar/FaultTotal/index.jsx rename to src/components/公共组件/产线缺陷统计/index.jsx index 983e13e..511622c 100644 --- a/src/components/BottomBar/FaultTotal/index.jsx +++ b/src/components/公共组件/产线缺陷统计/index.jsx @@ -1,9 +1,7 @@ import cls from './index.module.css'; -import BottomBarItem from '../BottomBarItem'; -import { Switch, Radio } from 'antd'; +import BottomBarItem from '../BottomItemBackground'; +import { Radio } from 'antd'; import ReactECharts from 'echarts-for-react'; -import * as echarts from 'echarts'; -import { randomInt } from '../../../utils'; function FaultTotal(props) { const options = { diff --git a/src/components/BottomBar/FaultTotal/index.module.css b/src/components/公共组件/产线缺陷统计/index.module.css similarity index 100% rename from src/components/BottomBar/FaultTotal/index.module.css rename to src/components/公共组件/产线缺陷统计/index.module.css diff --git a/src/components/公共组件/助燃风流量/1 b/src/components/公共组件/助燃风流量/1 deleted file mode 100644 index 56a6051..0000000 --- a/src/components/公共组件/助燃风流量/1 +++ /dev/null @@ -1 +0,0 @@ -1 \ No newline at end of file diff --git a/src/components/BottomBar/gasi/index.jsx b/src/components/公共组件/助燃风流量/index.jsx similarity index 98% rename from src/components/BottomBar/gasi/index.jsx rename to src/components/公共组件/助燃风流量/index.jsx index a4b8fd5..66bc095 100644 --- a/src/components/BottomBar/gasi/index.jsx +++ b/src/components/公共组件/助燃风流量/index.jsx @@ -1,6 +1,6 @@ // 助燃风流量 import cls from './index.module.css'; -import BottomBarItem from '../BottomBarItem'; +import BottomBarItem from '../BottomItemBackground'; import ReactECharts from 'echarts-for-react'; import * as echarts from 'echarts'; import { randomInt } from '../../../utils'; diff --git a/src/components/BottomBar/gasi/index.module.css b/src/components/公共组件/助燃风流量/index.module.css similarity index 100% rename from src/components/BottomBar/gasi/index.module.css rename to src/components/公共组件/助燃风流量/index.module.css diff --git a/src/components/公共组件/天然气流量/1 b/src/components/公共组件/天然气流量/1 deleted file mode 100644 index 56a6051..0000000 --- a/src/components/公共组件/天然气流量/1 +++ /dev/null @@ -1 +0,0 @@ -1 \ No newline at end of file diff --git a/src/components/BottomBar/gasii/gasChart/chart.config.js b/src/components/公共组件/天然气流量/gasChart/chart.config.js similarity index 100% rename from src/components/BottomBar/gasii/gasChart/chart.config.js rename to src/components/公共组件/天然气流量/gasChart/chart.config.js diff --git a/src/components/BottomBar/gasii/gasChart/index.jsx b/src/components/公共组件/天然气流量/gasChart/index.jsx similarity index 100% rename from src/components/BottomBar/gasii/gasChart/index.jsx rename to src/components/公共组件/天然气流量/gasChart/index.jsx diff --git a/src/components/BottomBar/gasii/gasChart/index.module.css b/src/components/公共组件/天然气流量/gasChart/index.module.css similarity index 100% rename from src/components/BottomBar/gasii/gasChart/index.module.css rename to src/components/公共组件/天然气流量/gasChart/index.module.css diff --git a/src/components/BottomBar/gasii/gridList/index.jsx b/src/components/公共组件/天然气流量/gridList/index.jsx similarity index 100% rename from src/components/BottomBar/gasii/gridList/index.jsx rename to src/components/公共组件/天然气流量/gridList/index.jsx diff --git a/src/components/BottomBar/gasii/gridList/index.module.css b/src/components/公共组件/天然气流量/gridList/index.module.css similarity index 100% rename from src/components/BottomBar/gasii/gridList/index.module.css rename to src/components/公共组件/天然气流量/gridList/index.module.css diff --git a/src/components/BottomBar/gasii/index.jsx b/src/components/公共组件/天然气流量/index.jsx similarity index 96% rename from src/components/BottomBar/gasii/index.jsx rename to src/components/公共组件/天然气流量/index.jsx index 329103c..cfff43c 100644 --- a/src/components/BottomBar/gasii/index.jsx +++ b/src/components/公共组件/天然气流量/index.jsx @@ -1,6 +1,6 @@ // 天然气流量 import cls from './index.module.css'; -import BottomBarItem from '../BottomBarItem'; +import BottomBarItem from '../BottomItemBackground'; import { Switch, Radio } from 'antd'; import { useState } from 'react'; diff --git a/src/components/BottomBar/gasii/index.module.css b/src/components/公共组件/天然气流量/index.module.css similarity index 100% rename from src/components/BottomBar/gasii/index.module.css rename to src/components/公共组件/天然气流量/index.module.css diff --git a/src/components/公共组件/本日生产良品率/GoodProduction.jsx b/src/components/公共组件/本日生产良品率/GoodProduction.jsx index 412f4fa..49cf402 100644 --- a/src/components/公共组件/本日生产良品率/GoodProduction.jsx +++ b/src/components/公共组件/本日生产良品率/GoodProduction.jsx @@ -2,7 +2,7 @@ import cls from './good.module.less'; import Container from '../../Container'; import TodayTableData from './components/TodayTableData'; import GoodRateChart from './components/GoodRateChart'; -import TechSplitline from './components/TechSplitline'; +import TechSplitline from '../TechSplitline'; const GoodProduction = () => { return ( diff --git a/src/components/公共组件/本日生产良品率/components/TechSplitline/index.jsx b/src/components/公共组件/本日生产良品率/components/TechSplitline/index.jsx deleted file mode 100644 index fe9e623..0000000 --- a/src/components/公共组件/本日生产良品率/components/TechSplitline/index.jsx +++ /dev/null @@ -1,7 +0,0 @@ -import cls from './index.module.less'; - -const TechSplitline = (props) => { - return
; -}; - -export default TechSplitline; diff --git a/src/components/公共组件/本日生产良品率/components/TechSplitline/index.module.less b/src/components/公共组件/本日生产良品率/components/TechSplitline/index.module.less deleted file mode 100644 index 38f1cd0..0000000 --- a/src/components/公共组件/本日生产良品率/components/TechSplitline/index.module.less +++ /dev/null @@ -1,5 +0,0 @@ -.techSplitline { - height: 2px; - width: 100%; - background: radial-gradient(#3ce7ff, #3ce8ff92, #3ce8ff32, transparent); -} diff --git a/src/components/公共组件/烟气处理/1 b/src/components/公共组件/烟气处理/1 deleted file mode 100644 index 56a6051..0000000 --- a/src/components/公共组件/烟气处理/1 +++ /dev/null @@ -1 +0,0 @@ -1 \ No newline at end of file diff --git a/src/components/RightBar/SmokeHandle/SmokeTrendChart/index.jsx b/src/components/公共组件/烟气处理/SmokeTrendChart/index.jsx similarity index 100% rename from src/components/RightBar/SmokeHandle/SmokeTrendChart/index.jsx rename to src/components/公共组件/烟气处理/SmokeTrendChart/index.jsx diff --git a/src/components/RightBar/SmokeHandle/SmokeTrendChart/index.module.css b/src/components/公共组件/烟气处理/SmokeTrendChart/index.module.css similarity index 100% rename from src/components/RightBar/SmokeHandle/SmokeTrendChart/index.module.css rename to src/components/公共组件/烟气处理/SmokeTrendChart/index.module.css diff --git a/src/components/RightBar/SmokeHandle/index.jsx b/src/components/公共组件/烟气处理/index.jsx similarity index 99% rename from src/components/RightBar/SmokeHandle/index.jsx rename to src/components/公共组件/烟气处理/index.jsx index ae34ca5..980945e 100644 --- a/src/components/RightBar/SmokeHandle/index.jsx +++ b/src/components/公共组件/烟气处理/index.jsx @@ -13,9 +13,7 @@ function SmokeHandle(props) {
二氧化硫排放浓度:59mg/m³
二氧化氮排放浓度:59mg/m³
- - diff --git a/src/components/RightBar/SmokeHandle/index.module.less b/src/components/公共组件/烟气处理/index.module.less similarity index 100% rename from src/components/RightBar/SmokeHandle/index.module.less rename to src/components/公共组件/烟气处理/index.module.less diff --git a/src/components/公共组件/能耗/1 b/src/components/公共组件/能耗/1 deleted file mode 100644 index 56a6051..0000000 --- a/src/components/公共组件/能耗/1 +++ /dev/null @@ -1 +0,0 @@ -1 \ No newline at end of file diff --git a/src/components/RightBar/EnergyCost/EnergyCostChart/index.jsx b/src/components/公共组件/能耗/EnergyCostChart/index.jsx similarity index 100% rename from src/components/RightBar/EnergyCost/EnergyCostChart/index.jsx rename to src/components/公共组件/能耗/EnergyCostChart/index.jsx diff --git a/src/components/RightBar/EnergyCost/EnergyCostChart/index.module.css b/src/components/公共组件/能耗/EnergyCostChart/index.module.css similarity index 100% rename from src/components/RightBar/EnergyCost/EnergyCostChart/index.module.css rename to src/components/公共组件/能耗/EnergyCostChart/index.module.css diff --git a/src/components/RightBar/EnergyCost/index.jsx b/src/components/公共组件/能耗/index.jsx similarity index 100% rename from src/components/RightBar/EnergyCost/index.jsx rename to src/components/公共组件/能耗/index.jsx diff --git a/src/components/RightBar/EnergyCost/index.module.less b/src/components/公共组件/能耗/index.module.less similarity index 100% rename from src/components/RightBar/EnergyCost/index.module.less rename to src/components/公共组件/能耗/index.module.less diff --git a/src/components/窑炉信息/1 b/src/components/窑炉信息/1 deleted file mode 100644 index 56a6051..0000000 --- a/src/components/窑炉信息/1 +++ /dev/null @@ -1 +0,0 @@ -1 \ No newline at end of file diff --git a/src/components/LeftBar/Kiln.jsx b/src/components/窑炉信息/Kiln.jsx similarity index 95% rename from src/components/LeftBar/Kiln.jsx rename to src/components/窑炉信息/Kiln.jsx index 1b2f708..ddda905 100644 --- a/src/components/LeftBar/Kiln.jsx +++ b/src/components/窑炉信息/Kiln.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import { useState, useEffect, useContext } from 'react'; +import { useContext } from 'react'; import Container from '../Container'; import SocketContext from '../../store/socket-data-provider'; import cls from './kiln.module.less'; diff --git a/src/components/LeftBar/kiln.module.less b/src/components/窑炉信息/kiln.module.less similarity index 100% rename from src/components/LeftBar/kiln.module.less rename to src/components/窑炉信息/kiln.module.less