Commit aacad12792074f9ec057cac2199f4fd9e89ab81d
1 parent
397a40fe
1.扩大放大镜弹窗窗体宽度高度
Showing
3 changed files
with
6 additions
and
6 deletions
src/components/Common/CommonListSelect/index.js
| ... | ... | @@ -213,7 +213,7 @@ const CommonListComponent = Form.create({ |
| 213 | 213 | ...commonBusiness.getTableTypes('slave', props), |
| 214 | 214 | enabled: false, |
| 215 | 215 | tableProps: { |
| 216 | - rowKey: 'sSlaveId', pagination, onChange: props.onTitleChange, AutoTableHeight: 350, | |
| 216 | + rowKey: 'sSlaveId', pagination, onChange: props.onTitleChange, AutoTableHeight: 550, | |
| 217 | 217 | }, |
| 218 | 218 | }; |
| 219 | 219 | const name = 'filterTree'; |
| ... | ... | @@ -276,7 +276,7 @@ const CommonListComponent = Form.create({ |
| 276 | 276 | const bPadPop = |
| 277 | 277 | props.sModelsId === "12710101117211852461310" || |
| 278 | 278 | props.sModelsId === "12710101117218031681520"; |
| 279 | - | |
| 279 | + | |
| 280 | 280 | if (bPadPop) { |
| 281 | 281 | tableProps.fixedHeight = "325px"; |
| 282 | 282 | } | ... | ... |
src/components/Common/CommonTable/index.js
| ... | ... | @@ -11239,7 +11239,7 @@ class CommonTableRc extends React.Component { |
| 11239 | 11239 | )} |
| 11240 | 11240 | {commonPopupVisible ? ( |
| 11241 | 11241 | <AntdDraggableModal |
| 11242 | - width={1300} | |
| 11242 | + width='90vw' | |
| 11243 | 11243 | zIndex={1000} |
| 11244 | 11244 | title={commonPopupTitle} |
| 11245 | 11245 | visible={commonPopupVisible} | ... | ... |
src/mes/common/commonOperationBarComponent/MesToolbar.js
| 1 | 1 | /* eslint-disable */ |
| 2 | -import { message } from "antd"; | |
| 2 | +import { message, Progress } from "antd"; | |
| 3 | 3 | import * as commonUtils from "@/utils/utils"; |
| 4 | 4 | import * as commonFunc from "@/components/Common/commonFunc"; |
| 5 | 5 | import commonConfig from "@/utils/config"; |
| ... | ... | @@ -203,7 +203,7 @@ const ToolbarFun = async (props) => { |
| 203 | 203 | const asyncFunc = async () => { |
| 204 | 204 | for (let i = 0; i < afterInterfaceArr.length; i++) { |
| 205 | 205 | if (bProgressBar) { |
| 206 | - xlyProcessPercent = 0; | |
| 206 | + let xlyProcessPercent = 0; | |
| 207 | 207 | clearInterval(xlyProcessTimer); |
| 208 | 208 | message.loading({ |
| 209 | 209 | content: <Progress percent={xlyProcessPercent} />, |
| ... | ... | @@ -1088,4 +1088,4 @@ const handleScanFace = (props) => { |
| 1088 | 1088 | |
| 1089 | 1089 | } |
| 1090 | 1090 | |
| 1091 | -export default ToolbarFun; | |
| 1092 | 1091 | \ No newline at end of file |
| 1092 | +export default ToolbarFun; | ... | ... |