Merge branch 'master' of http://10.0.41.100:3000/lishenfeng/tsg-web

src/views/Home/MapCtrl/Pops/ShenYa/index.js

@@ -8,6 +8,7 @@ import moment from "moment"
 import ToolBar from './toolbar';
 import TableData from './TableData'
 import drpOption from './drpOption';
+import '../TangYanBa.less'
 
 function ShenYa({ id, data, dispatch, onCancel }) {
   console.log('SY',data);
@@ -96,7 +97,7 @@ function ShenYa({ id, data, dispatch, onCancel }) {
           <div style={{padding:'0 20px'}}>
             <ToolBar search={(tms)=>getData(tms,data.stationCode)} setTabVal={setTabVal}/>
           </div>
-          <div className='homeModal2_content'>
+          <div className='homeModal2_content' >
               {
                   tabVal==='1'?
                     tableData.length>0?

src/views/Home/MapCtrl/Pops/TangYanBa.less

@@ -103,6 +103,7 @@
         flex: 1;
         display: flex;
         flex-direction: row-reverse;
+        // float: right;
       }
     }
   }
@@ -111,3 +112,13 @@
         border-radius: 10px;
     }
   }
+  .homeModal2{
+    display: flex;
+    flex-direction: column;
+    .homeModal2_content{
+      height: 504px;
+      display: flex;
+      padding: 5px 20px 20px 20px;
+    }
+  }
+  

src/views/gcaqjc/gcaqfx/jrx/index.js

@@ -317,13 +317,13 @@ export default function Xmzlmb() {
               columns={columns1}
               key="inx"
               dataSource={dataSources}
+              pagination={{pageSize:5}}
               scroll={{ x: width, y: 250, scrollToFirstRowOnChange: true }}
               onRow={record => {
                 return {
                   onClick:() => {echartsRef.current.getEchartsInstance().setOption(jrxOption(record,dbType))}
                 }
               }}
-              pagination={false} 
           />
           </div>
       </div>

src/views/sq/qys/kqys/index.js

@@ -66,7 +66,7 @@ const Page = () => {
                 >
             <div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', width:'72%',height:'98%',}}>
                
-                    <Image src={url} id="img"  preview={false} />
+                    <Image src={url} id="img" style={{margin:'auto',margin:'20px',height:'750px'}}  preview={false} />
                 
             </div>
             </Rnd>