张延森 il y a 3 ans
Parent
révision
759a1a3c6f

+ 11
- 0
src/components/ScreenBox/ScreenHeader/index.jsx Voir le fichier

@@ -0,0 +1,11 @@
1
+import Styles from './style.less';
2
+
3
+export default () => {
4
+  return (
5
+    <div className={Styles['screen-header-box']}>
6
+      <div className={Styles['screen-header-left']}></div>
7
+      <div className={Styles['screen-header-content']}></div>
8
+      <div className={Styles['screen-header-right']}></div>
9
+    </div>
10
+  );
11
+};

+ 12
- 0
src/components/ScreenBox/ScreenHeader/style.less Voir le fichier

@@ -0,0 +1,12 @@
1
+.screen-header-box {
2
+  display: flex;
3
+
4
+  .screen-header-left,
5
+  .screen-header-right {
6
+    flex: 1;
7
+  }
8
+
9
+  .screen-header-content {
10
+    flex: 6;
11
+  }
12
+}

+ 0
- 1
src/components/ScreenBox/SquareBox/style.less Voir le fichier

@@ -1,6 +1,5 @@
1 1
 .SquareBox-box {
2 2
   position: relative;
3
-  display: inline-block;
4 3
 }
5 4
 .SquareBox-body {
6 5
   padding: 20px;

+ 8
- 6
src/pages/MonitoringScreen/index.jsx Voir le fichier

@@ -9,6 +9,7 @@ import { useFullScreen } from './hook';
9 9
 import DateCommponets from './DateCommponets';
10 10
 import Styles from './style.less';
11 11
 import SquareBox from '@/components/ScreenBox/SquareBox';
12
+import ScreenHeader from '@/components/ScreenBox/ScreenHeader';
12 13
 
13 14
 export default (props) => {
14 15
   const { style, isFullScreen, onFullScreen } = useFullScreen();
@@ -21,23 +22,24 @@ export default (props) => {
21 22
         </Button>
22 23
       }
23 24
     >
24
-
25
-
26 25
       <div
27 26
         className={classNames(Styles['screen-page'], { [Styles['full-screen']]: isFullScreen })}
28 27
         style={style}
29 28
       >
30 29
         <div className={Styles['grail-layout']}>
31 30
           <div className={Styles['grail-header']}>
32
-            <SquareBox>asdfasdf</SquareBox>
31
+            <ScreenHeader weather="多云 21-28 °C" />
33 32
           </div>
34 33
           <div className={Styles['grail-container']}>
35
-            <div className={Styles['grail-left']}></div>
34
+            <div className={Styles['grail-left']}>
35
+              <SquareBox>asdfasdf</SquareBox>
36
+            </div>
36 37
             <div className={Styles['grail-content']}>
37
-
38 38
               <DateCommponets />
39 39
             </div>
40
-            <div className={Styles['grail-right']}></div>
40
+            <div className={Styles['grail-right']}>
41
+              <SquareBox>asdfasdf</SquareBox>
42
+            </div>
41 43
           </div>
42 44
           <div className={Styles['grail-footer']}></div>
43 45
         </div>