张延森 3 years ago
parent
commit
e6d447d28e

+ 1
- 1
src/pages/MonitoringScreen/components/BasicChart.jsx View File

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

+ 0
- 2
src/pages/MonitoringScreen/components/List/style.less View File

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

+ 2
- 1
src/pages/MonitoringScreen/index.jsx View File

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

+ 0
- 1
src/pages/MonitoringScreen/style.less View File

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