张延森 3 年之前
父節點
當前提交
759a1a3c6f

+ 11
- 0
src/components/ScreenBox/ScreenHeader/index.jsx 查看文件

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 查看文件

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 查看文件

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

+ 8
- 6
src/pages/MonitoringScreen/index.jsx 查看文件

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