diff --git a/src/views/Home/MapCtrl/Pops/ShenYa/index.js b/src/views/Home/MapCtrl/Pops/ShenYa/index.js
index 4b009916e..2cb1fe63d 100644
--- a/src/views/Home/MapCtrl/Pops/ShenYa/index.js
+++ b/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(data);
@@ -58,7 +59,7 @@ function ShenYa({ id, data, dispatch, onCancel }) {
getData(tms,data.stationCode)} setTabVal={setTabVal}/>
-
+
{
tabVal==='1'?
tableData.length>0?
diff --git a/src/views/Home/MapCtrl/Pops/TangYanBa.less b/src/views/Home/MapCtrl/Pops/TangYanBa.less
index 555bf728e..f496667bf 100644
--- a/src/views/Home/MapCtrl/Pops/TangYanBa.less
+++ b/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;
+ }
+ }
+
\ No newline at end of file
diff --git a/src/views/gcaqjc/gcaqfx/jrx/index.js b/src/views/gcaqjc/gcaqfx/jrx/index.js
index b25aeda2f..4068f1b65 100644
--- a/src/views/gcaqjc/gcaqfx/jrx/index.js
+++ b/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}
/>
diff --git a/src/views/sq/qys/kqys/index.js b/src/views/sq/qys/kqys/index.js
index 68e6f7226..eeea3d4a9 100644
--- a/src/views/sq/qys/kqys/index.js
+++ b/src/views/sq/qys/kqys/index.js
@@ -66,7 +66,7 @@ const Page = () => {
>
-
+