diff --git a/src/assets/moxing.png b/src/assets/moxing.png new file mode 100644 index 0000000..be01926 Binary files /dev/null and b/src/assets/moxing.png differ diff --git a/src/assets/wave.png b/src/assets/wave.png new file mode 100644 index 0000000..09eb6e9 Binary files /dev/null and b/src/assets/wave.png differ diff --git a/src/components/模块组件/总览/CenterTop/RightTable/index.jsx b/src/components/模块组件/总览/CenterTop/RightTable/index.jsx index 6d075ce..367cad7 100644 --- a/src/components/模块组件/总览/CenterTop/RightTable/index.jsx +++ b/src/components/模块组件/总览/CenterTop/RightTable/index.jsx @@ -46,7 +46,7 @@ function replaceStyle(Arr, opencity) { class Chart1 extends Component { render() { return ( -
+

当前产线生产规格

diff --git a/src/pages/index.less b/src/pages/index.less index 65b67b8..b56d1a1 100644 --- a/src/pages/index.less +++ b/src/pages/index.less @@ -15,10 +15,11 @@ margin: 22px; width: 2472px; height: 940px; + position: relative; .CenterData { position: absolute; - background: #fff4; + // background: #fff4; width: 2472px; height: 240px; z-index: 2; @@ -34,13 +35,14 @@ } .V3DBorder { - background: #00f3; + // background: #00f3; width: 100%; height: 486px; margin-top: 160px; // background: url('../assets/3D.png'); - background-size: 100% 100%; - background-repeat: no-repeat; + background: url('../assets/moxing.png') no-repeat; + background-position: 50% 50%; + background-size: 170% 200%; } .Button { @@ -64,3 +66,28 @@ background-position: -800px 0; background-size: 100%; } + +.bgOverview { + position: fixed; + z-index: -1000; + top: 0; + left: 0; + width: 100%; + height: 100%; + /* background: #f003; */ + background: url(../assets/wave.png) no-repeat; + background-position: 0 0; + background-size: 100%; +} + +.bgFire { + position: absolute; + top: 16%; + left: 2%; + width: 100%; + height: 100%; + /* background: #f003; */ + background: url('../assets/moxing.png') no-repeat; + background-position: 50% 50%; + background-size: 170% 200%; +} diff --git a/src/pages/总览/index.jsx b/src/pages/总览/index.jsx index 4323bed..b282c34 100644 --- a/src/pages/总览/index.jsx +++ b/src/pages/总览/index.jsx @@ -11,7 +11,7 @@ import QualityCheckLeft from '../../components/模块组件/质检统计/LeftSid import FireCheckRight from '../../components/模块组件/退火监测/RightSide'; import QualityCheckRight from '../../components/模块组件/质检统计/RightSide'; -import V3DBG from '../../assets/V3DBG.png'; +// import V3DBG from '../../assets/V3DBG.png'; const KilnTotalRight = (props) => { return ( @@ -36,7 +36,8 @@ export default function Home({ active }) { return (
- {active != '总览' &&
} + {active != '窑炉总览' &&
} + {active == '窑炉总览' &&
}
{active == '窑炉总览' && ( <> -
- -
- 图片加载错误 -
-
+ + + + + +
+
)} + + {active == '退火监测' &&
} + + {active == '质检统计' &&
}
{active == '窑炉总览' && }