Compare commits

..

No commits in common. "d3a55d163bd32260e572c46704dffb78846a822e" and "3ea7b0f103a0adc5fddd0ef406bb7173f8caf5ef" have entirely different histories.

4 changed files with 3 additions and 15 deletions

View File

@ -8,7 +8,6 @@ import moment from "moment"
import ToolBar from './toolbar'; import ToolBar from './toolbar';
import TableData from './TableData' import TableData from './TableData'
import drpOption from './drpOption'; import drpOption from './drpOption';
import '../TangYanBa.less'
function ShenYa({ id, data, dispatch, onCancel }) { function ShenYa({ id, data, dispatch, onCancel }) {
console.log('SY',data); console.log('SY',data);

View File

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

View File

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

View File

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