Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wisdom-components
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ReactWeb5
wisdom-components
Commits
749358b8
Commit
749358b8
authored
Jun 07, 2024
by
李纪文
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 组态增加三维版本
parent
b6823e28
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
10 deletions
+8
-10
EC_ConfigurationView.md
...mponents/EC_ConfigurationView/src/EC_ConfigurationView.md
+0
-1
RealModel.js
...s/extend-components/EC_ConfigurationView/src/RealModel.js
+1
-9
configuration_custom.js
...mponents/EC_ConfigurationView/src/configuration_custom.js
+0
-0
ConfigurationDetailCustom.js
.../EC_ConfigurationView/src/js/ConfigurationDetailCustom.js
+7
-0
No files found.
packages/extend-components/EC_ConfigurationView/src/EC_ConfigurationView.md
View file @
749358b8
...
@@ -36,7 +36,6 @@ group:
...
@@ -36,7 +36,6 @@ group:
| isZoom | 是否可缩放(手持上建议设置 true) | boolean | false |
| isZoom | 是否可缩放(手持上建议设置 true) | boolean | false |
| flowShow | 是否水流效果(无数据表现) | boolean | true |
| flowShow | 是否水流效果(无数据表现) | boolean | true |
| messaged | 传递信息给组态 | object | {} |
| messaged | 传递信息给组态 | object | {} |
| params | Mqtt 订阅参数传递 | object | {} |
| customBack | 自定义交互的回调,返回点击的模型 | function(node){} | - |
| customBack | 自定义交互的回调,返回点击的模型 | function(node){} | - |
### 工艺回放
### 工艺回放
...
...
packages/extend-components/EC_ConfigurationView/src/RealModel.js
View file @
749358b8
...
@@ -134,7 +134,6 @@ const ConfigurationView = (props) => {
...
@@ -134,7 +134,6 @@ const ConfigurationView = (props) => {
imgUrl
=
online
?
`
${
url
}
PandaMonitor/Monitor/`
:
`/PandaMonitor/Monitor/`
;
imgUrl
=
online
?
`
${
url
}
PandaMonitor/Monitor/`
:
`/PandaMonitor/Monitor/`
;
// 获取画板信息
// 获取画板信息
const
drawInfo
=
await
getSketchPadList
({
const
drawInfo
=
await
getSketchPadList
({
...(
props
.
params
||
{}),
name
:
props
.
name
,
name
:
props
.
name
,
siteCode
:
siteCodeStr
,
siteCode
:
siteCodeStr
,
version
:
'全部'
,
version
:
'全部'
,
...
@@ -187,7 +186,6 @@ const ConfigurationView = (props) => {
...
@@ -187,7 +186,6 @@ const ConfigurationView = (props) => {
// 获取点表信息
// 获取点表信息
const
pointInfo
=
devicesCode
.
length
const
pointInfo
=
devicesCode
.
length
?
await
getPointAddress
({
?
await
getPointAddress
({
...(
props
.
params
||
{}),
code
:
devicesCode
.
join
(
','
),
code
:
devicesCode
.
join
(
','
),
_site
:
siteCodeStr
,
_site
:
siteCodeStr
,
})
})
...
@@ -196,7 +194,6 @@ const ConfigurationView = (props) => {
...
@@ -196,7 +194,6 @@ const ConfigurationView = (props) => {
// 获取数据字典组态控制权限
// 获取数据字典组态控制权限
const
dictInfoRes
=
await
getDictionaryInfo
({
const
dictInfoRes
=
await
getDictionaryInfo
({
...(
props
.
params
||
{}),
level
:
'组态控制权限'
,
level
:
'组态控制权限'
,
_site
:
siteCodeStr
,
_site
:
siteCodeStr
,
});
});
...
@@ -978,7 +975,6 @@ const ConfigurationView = (props) => {
...
@@ -978,7 +975,6 @@ const ConfigurationView = (props) => {
/** ************************************获取画板JSON******************************* */
/** ************************************获取画板JSON******************************* */
const
getDiagramJson
=
async
(
list
,
siteInfo
)
=>
{
const
getDiagramJson
=
async
(
list
,
siteInfo
)
=>
{
const
response
=
await
getSketchPadContent
({
const
response
=
await
getSketchPadContent
({
...(
props
.
params
||
{}),
dimension
:
list
.
dimension
,
dimension
:
list
.
dimension
,
siteCode
:
list
.
siteCode
,
siteCode
:
list
.
siteCode
,
fileName
:
list
.
deployURL
.
split
(
'
\
\'
).pop(),
fileName
:
list
.
deployURL
.
split
(
'
\
\'
).pop(),
...
@@ -1004,7 +1000,6 @@ const ConfigurationView = (props) => {
...
@@ -1004,7 +1000,6 @@ const ConfigurationView = (props) => {
mqttSsl: globalConfig.mqtt_IsSSL,
mqttSsl: globalConfig.mqtt_IsSSL,
siteCode: globalConfig?.mqtt_mess?.site_code || '',
siteCode: globalConfig?.mqtt_mess?.site_code || '',
devices: devicesCode,
devices: devicesCode,
params: props.params || {},
callback: refreshData,
callback: refreshData,
controlback: controlData,
controlback: controlData,
})
})
...
@@ -1046,7 +1041,7 @@ const ConfigurationView = (props) => {
...
@@ -1046,7 +1041,7 @@ const ConfigurationView = (props) => {
equipmentCode: devicesCode.join('
,
'),
equipmentCode: devicesCode.join('
,
'),
accountFieldParams,
accountFieldParams,
};
};
const results = await getDeviceRealInfo(params
, props.params || {}
);
const results = await getDeviceRealInfo(params);
const realData = results && results.data && results.data.list ? results.data.list : [];
const realData = results && results.data && results.data.list ? results.data.list : [];
chartDataRender(flatten(realData));
chartDataRender(flatten(realData));
} catch (err) {}
} catch (err) {}
...
@@ -1542,7 +1537,6 @@ const ConfigurationView = (props) => {
...
@@ -1542,7 +1537,6 @@ const ConfigurationView = (props) => {
if (!vdCode) return setVideoData([]);
if (!vdCode) return setVideoData([]);
if (vdType && !vdList) return setVideoData([]);
if (vdType && !vdList) return setVideoData([]);
const detail = await getVideoDetail({
const detail = await getVideoDetail({
...(props.params || {}),
UserID: 1,
UserID: 1,
DeviceCode: vdCode,
DeviceCode: vdCode,
_site: siteCodeStr,
_site: siteCodeStr,
...
@@ -3335,7 +3329,6 @@ ConfigurationView.defaultProps = {
...
@@ -3335,7 +3329,6 @@ ConfigurationView.defaultProps = {
isZoom
:
false
,
isZoom
:
false
,
flowShow
:
true
,
flowShow
:
true
,
messaged
:
{},
messaged
:
{},
params
:
{},
customBack
:
()
=>
{},
customBack
:
()
=>
{},
};
};
...
@@ -3347,7 +3340,6 @@ ConfigurationView.propTypes = {
...
@@ -3347,7 +3340,6 @@ ConfigurationView.propTypes = {
isZoom
:
PropTypes
.
bool
,
isZoom
:
PropTypes
.
bool
,
flowShow
:
PropTypes
.
bool
,
flowShow
:
PropTypes
.
bool
,
messaged
:
PropTypes
.
object
,
messaged
:
PropTypes
.
object
,
params
:
PropTypes
.
object
,
customBack
:
PropTypes
.
func
,
customBack
:
PropTypes
.
func
,
};
};
...
...
packages/extend-components/EC_ConfigurationView/src/configuration_custom.js
0 → 100644
View file @
749358b8
This source diff could not be displayed because it is too large. You can
view the blob
instead.
packages/extend-components/EC_ConfigurationView/src/js/ConfigurationDetailCustom.js
0 → 100644
View file @
749358b8
import
React
from
'react'
;
import
ConfigurationView
from
'../configuration_custom'
;
const
ConfigurationDetail
=
(
props
)
=>
{
return
<
ConfigurationView
{...
props
}
/>
;
};
export
default
ConfigurationDetail
;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment