Commit 9124644e authored by 李纪文's avatar 李纪文

fix: 组态修改

parent 060c540a
...@@ -23,12 +23,12 @@ group: ...@@ -23,12 +23,12 @@ group:
## API ## API
| 参数 | 说明 | 类型 | 默认值 | | 参数 | 说明 | 类型 | 默认值 |
| ----------------------- | ------------------------------- | ------- | ------ | | ---------------- | -------------------------------- | ------- | ------ |
| name `必需` | 画板名称 | string | '' | | name `必需` | 画板名称 | string | '' |
| devices `必需` | 画板设备 | array | [] | | devices `必需` | 画板设备 | array | [] |
| deviceName | 画板设备名称 | array | [] | | deviceName | 画板设备名称 | array | [] |
| dictionaryParams `必需` | 图标颜色数据字典参数 | object | {} | | dictionaryParams | 图标颜色数据字典参数 | object | {} |
| config `必需` | 全局 globalConfig | object | {} | | config | 全局 globalConfig,没有时需要传递 | object | {} |
| isZoom | 是否可缩放(手持上建议设置 true) | boolean | false | | isZoom | 是否可缩放(手持上建议设置 true) | boolean | false |
| flowShow | 是否水流效果(无数据表现) | boolean | true | | flowShow | 是否水流效果(无数据表现) | boolean | true |
...@@ -5,20 +5,21 @@ const Demo = () => { ...@@ -5,20 +5,21 @@ const Demo = () => {
return ( return (
<div style={{ width: '100%', height: '600px', background: '#242835' }}> <div style={{ width: '100%', height: '600px', background: '#242835' }}>
<PandaConfigurationView <PandaConfigurationView
// name={'水厂工艺流程段'} name={'水厂工艺流程段'}
// devices={'EQZT00000008,EQZT00000007,CPDA00000001,JYBZ00000003,JYBZ00000005,JYBZ00000004,SC00000003'.split( devices={'EQZT00000008,EQZT00000007,CPDA00000001,JYBZ00000003,JYBZ00000005,JYBZ00000004,SC00000003'.split(
// ',',
// )}
name={'崇左丽江水厂原水泵房'}
devices={'EQZT00000007,CPBA00000001,CPAA00000001,EQZT00000008,CPDA00000001,CPAD00000001,LJSC00000002,EQZT00000005,EQZT00000004,EQZT00000002,EQZT00000003'.split(
',', ',',
)} )}
// name={'崇左丽江水厂原水泵房'}
// devices={'EQZT00000007,CPBA00000001,CPAA00000001,EQZT00000008,CPDA00000001,CPAD00000001,LJSC00000002,EQZT00000005,EQZT00000004,EQZT00000002,EQZT00000003'.split(
// ',',
// )}
// name={'丽江水厂原水提升泵D单元'} // name={'丽江水厂原水提升泵D单元'}
// devices={'CPAA00000001, CPAD00000001, LJSC00000002'.split(',')} // devices={'CPAA00000001, CPAD00000001, LJSC00000002'.split(',')}
dictionaryParams={{ nodeID: 149 }} // dictionaryParams={{nodeID: 149}}
config={globalConfig} config={globalConfig}
deviceName={['工艺流程1', '工艺流程2', '工艺流程3']} deviceName={['工艺流程1', '工艺流程2', '工艺流程3']}
// isZoom={true} // isZoom={true}
// flowShow={false}
/> />
</div> </div>
); );
......
...@@ -2141,7 +2141,7 @@ const ConfigurationView = (props) => { ...@@ -2141,7 +2141,7 @@ const ConfigurationView = (props) => {
visible={isModalVisible} visible={isModalVisible}
onOk={handleOk} onOk={handleOk}
onCancel={handleCancel} onCancel={handleCancel}
wrapClassName={classNames(`${prefixCls}-modal`)} wrapClassName={classNames(`${prefixCls}-baseModal`)}
getContainer={ConfigurationRef.current} getContainer={ConfigurationRef.current}
{...modalProps} {...modalProps}
> >
...@@ -2159,7 +2159,7 @@ const ConfigurationView = (props) => { ...@@ -2159,7 +2159,7 @@ const ConfigurationView = (props) => {
onOk={handleAuOk} onOk={handleAuOk}
onCancel={() => setIsAuModalVisible(false)} onCancel={() => setIsAuModalVisible(false)}
getContainer={ConfigurationRef.current} getContainer={ConfigurationRef.current}
wrapClassName={classNames(`${prefixCls}-modal`)} wrapClassName={classNames(`${prefixCls}-baseModal`)}
> >
<Form className={classNames('authorizeControlContent')} ref={AuthorFrom} name="loginForm"> <Form className={classNames('authorizeControlContent')} ref={AuthorFrom} name="loginForm">
<Form.Item className={classNames('authorizeControlItem')} name="userName" label="账户"> <Form.Item className={classNames('authorizeControlItem')} name="userName" label="账户">
...@@ -2189,7 +2189,9 @@ const ConfigurationView = (props) => { ...@@ -2189,7 +2189,9 @@ const ConfigurationView = (props) => {
historyInfoService={getHistoryInfo} historyInfoService={getHistoryInfo}
historyInfoParams={historyInfoParams} historyInfoParams={historyInfoParams}
dictionaryService={getDictionaryList} dictionaryService={getDictionaryList}
dictionaryParams={dictionaryParams} dictionaryParams={
Object.keys(dictionaryParams).length ? dictionaryParams : { nodeID: 0 }
}
/> />
</Modal> </Modal>
)} )}
......
...@@ -6,16 +6,7 @@ ...@@ -6,16 +6,7 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
.configurationView { &-baseModal {
width: 100%;
height: 100%;
canvas {
border: 0;
outline: none;
}
}
&-modal {
color: white; color: white;
.switchControlContent { .switchControlContent {
...@@ -202,9 +193,6 @@ ...@@ -202,9 +193,6 @@
} }
} }
.@{ant-prefix}-modal-body {
}
.@{ant-prefix}-modal-footer { .@{ant-prefix}-modal-footer {
background: none; background: none;
border-color: #1c202c; border-color: #1c202c;
...@@ -267,6 +255,7 @@ ...@@ -267,6 +255,7 @@
justify-content: center; justify-content: center;
width: 100%; width: 100%;
height: 100%; height: 100%;
canvas { canvas {
border: 0; border: 0;
outline: none; outline: none;
......
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