Commit 281248ef authored by wuhao's avatar wuhao 🎯

asder

parent 0d299f54
...@@ -11,7 +11,7 @@ export default { ...@@ -11,7 +11,7 @@ export default {
// localhost:8000/api/** -> https://preview.pro.ant.design/api/** // localhost:8000/api/** -> https://preview.pro.ant.design/api/**
"/wms/": { "/wms/": {
// 要代理的地址 // 要代理的地址
target: "http://192.168.40.134:18040/", //39:18040 23/wms/ //60 翔 target: "http://192.168.40.212:18040/", //39:18040 23/wms/ //60 翔
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
"^/wms": "", "^/wms": "",
......
...@@ -7,7 +7,7 @@ export default (props) => { ...@@ -7,7 +7,7 @@ export default (props) => {
const screens = useBreakpoint(); const screens = useBreakpoint();
return ( return (
<div> <div className="diycard">
{screens.xs ? ( {screens.xs ? (
<div <div
style={{ display: "flex", flexDirection: "column", height: "100%" }} style={{ display: "flex", flexDirection: "column", height: "100%" }}
...@@ -20,12 +20,13 @@ export default (props) => { ...@@ -20,12 +20,13 @@ export default (props) => {
</div> </div>
</div> </div>
) : props.withCard === false ? ( ) : props.withCard === false ? (
<div style={{ display: "flex" }}> <div style={{ display: "flex", width: "100%" }}>
<div style={{ flex: 1 }}> {(props.childposition == "left" || !props.childposition) &&
props.children}
<div style={{ flex: 1, width: "100%" }}>
{props.childposition == "top" && props.children} {props.childposition == "top" && props.children}
<Mtable {...props} /> <Mtable {...props} />
</div> </div>
{(props.childposition == "right" || !props.childposition) && {(props.childposition == "right" || !props.childposition) &&
props.children} props.children}
</div> </div>
...@@ -39,8 +40,10 @@ export default (props) => { ...@@ -39,8 +40,10 @@ export default (props) => {
tabList={props.tabList} tabList={props.tabList}
onTabChange={props.onTabChange} onTabChange={props.onTabChange}
> >
<div style={{ display: "flex" }}> <div style={{ display: "flex", width: "100%" }}>
<div style={{ flex: 1 }}> {(props.childposition == "left" || !props.childposition) &&
props.children}
<div style={{ flex: 1, width: "100%" }}>
{props.childposition == "top" && props.children} {props.childposition == "top" && props.children}
<Mtable {...props} /> <Mtable {...props} />
</div> </div>
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment