张延森 před 3 roky
rodič
revize
e6d447d28e

+ 1
- 1
src/pages/MonitoringScreen/components/BasicChart.jsx Zobrazit soubor

@@ -7,7 +7,7 @@ export default (props) => {
7 7
   return (
8 8
     <div style={{ height: '100%' }}>
9 9
       <TitleBox value={props.title} />
10
-      <SquareBox style={{ height: 'calc(100% - 48px)' }}>
10
+      <SquareBox style={{ height: 'calc(100% - 48px)', minHeight: '200px', maxHeight: '350px' }}>
11 11
         <ECharts option={props.option} />
12 12
       </SquareBox>
13 13
     </div>

+ 0
- 2
src/pages/MonitoringScreen/components/List/style.less Zobrazit soubor

@@ -1,6 +1,4 @@
1 1
 .screen-list {
2
-  padding: 20px 0;
3
-
4 2
   .list-title {
5 3
     position: relative;
6 4
     padding: 0 20px;

+ 2
- 1
src/pages/MonitoringScreen/index.jsx Zobrazit soubor

@@ -21,7 +21,7 @@ import Styles from './style.less';
21 21
 
22 22
 export default (props) => {
23 23
   const screenRef = useRef();
24
-  const [height, setHeight] = useState('700px');
24
+  const [height, setHeight] = useState('1080px');
25 25
   const { isFullScreen, toggleFullScreen } = useFullScreen(screenRef);
26 26
 
27 27
   const [machineryTypeData, setMachineryTypeData] = useState([
@@ -141,6 +141,7 @@ export default (props) => {
141 141
                 </div>
142 142
               </div>
143 143
             </SquareBox>
144
+            <div className={Styles['pd-tp-30']} style={{ height: '30px' }} />
144 145
           </div>
145 146
         </div>
146 147
       </div>

+ 0
- 1
src/pages/MonitoringScreen/style.less Zobrazit soubor

@@ -2,7 +2,6 @@
2 2
   position: relative;
3 3
   width: 100%;
4 4
   height: 100%;
5
-  overflow-y: auto;
6 5
 
7 6
   background-color: #021222;
8 7
   background-image: url('~@/assets/images/screen/bg.png');