设备属性:
diff --git a/code/web/client/src/sections/edition/components/plugInModel.jsx b/code/web/client/src/sections/edition/components/plugInModel.jsx
index df90f65..3d6337d 100644
--- a/code/web/client/src/sections/edition/components/plugInModel.jsx
+++ b/code/web/client/src/sections/edition/components/plugInModel.jsx
@@ -7,18 +7,22 @@ import { IconSearch, IconHelpCircle, IconAlertCircle, IconMinusCircle, IconPlusC
import { SkeletonScreen } from "$components";
const AddModel = props => {
- const { dispatch, user, error, actions, close, editionData, searchValue, dataToModal } = props
+ const { dispatch, user, error, actions, close, editionData, searchValue, dataToModal, cancel } = props
const { edition } = actions
const [query, setQuery] = useState({ limit: 10, page: 0 }); //页码信息
const [limits, setLimits] = useState()//每页实际条数
const [detailV, setDetailV] = useState(false)
const [property, setProperty] = useState([{ key: 'hb', value: 'ture' }])
- const [type, setType] = useState('group') //类型的判断
+ const [type, setType] = useState('antenna') //类型的判断
const [isEditor, setIsEditor] = useState(false)
const [appearType, setAppearType] = useState('mqtt')
const api = useRef()
useEffect(() => {
+ if (dataToModal?.Plugin?.id) {
+ setType(dataToModal?.Plugin?.type)
+ setAppearType(dataToModal?.AntennaCtx?.type)
+ }
}, [])
@@ -32,20 +36,23 @@ const AddModel = props => {
visible={true}
onOk={() => {
api.current.validate().then(r => {
- console.log(r);
- r.ctx_res = JSON.parse(r.ctx_res)
+ if (r.ctx_res) {
+ // r.ctx_res = JSON.parse(r.ctx_res)
+ }
+ if (r.ctx_group_content) {
+ // r.ctx_group_content='[0]'
+ }
// delete r.type
if (editionData) {
dispatch(edition.postAlterPlugIn(searchValue, editionData, r)).then(res => {
- console.log(res)
if (res.success) {
- // close()
+ close()
}
})
} else {
dispatch(edition.postAddPlugIn(searchValue, r)).then(res => {
if (res.success) {
- console.log(res);
+ // console.log(res);
close()
}
})
@@ -54,7 +61,7 @@ const AddModel = props => {
})
}}
width={560}
- onCancel={() => close()}
+ onCancel={() => cancel()}
>
-
);
}
diff --git a/code/web/client/src/sections/edition/containers/gateway.jsx b/code/web/client/src/sections/edition/containers/gateway.jsx
index cee7ab2..9c2b2ac 100644
--- a/code/web/client/src/sections/edition/containers/gateway.jsx
+++ b/code/web/client/src/sections/edition/containers/gateway.jsx
@@ -2,7 +2,7 @@
import React, { useEffect, useState, useRef } from 'react';
import { connect } from 'react-redux';
import { push } from 'react-router-redux';
-import { Popconfirm, Button, Popover, Skeleton, Table, Tag, Input, Pagination } from '@douyinfe/semi-ui';
+import { Popconfirm, Button, Popover, Skeleton, Table, Tag, Input, Pagination, TagInput, Modal, Select } from '@douyinfe/semi-ui';
import { IconSearch } from '@douyinfe/semi-icons';
import { SkeletonScreen } from "$components";
import GatewayStatusModal from './gatewayStatusModal'
@@ -19,6 +19,10 @@ const GatewayManage = props => {
const [addModel, setAddModel] = useState(false)
const [editionData, setEditionData] = useState([])
const [searchValue, setSearchValue] = useState('')
+ const [addStruc, setAddStruc] = useState(false)
+ const [edgeId, setEdgeId] = useState('')
+ const [addStrucData, setAddStrucData] = useState([])
+ const [thingList, setThingList] = useState([])
useEffect(() => {
@@ -29,6 +33,11 @@ const GatewayManage = props => {
setEditionData(data)
}
})
+ dispatch(edition.getThingList()).then(res => {
+ if (res.success) {
+ setThingList(res.payload.data?.data)
+ }
+ })
}, [])
const getTableData = (obj) => {
@@ -100,7 +109,7 @@ const GatewayManage = props => {
dataIndex: "action",
key: "action",
render: (text, record) => {
- return
}
}
];
@@ -190,8 +200,13 @@ const GatewayManage = props => {
}
})
}}>
- 重启应用
+ 重启应用
+ {
+ setAddStruc(true)
+ setEdgeId(record.id)
+ setAddStrucData(record.thingIds)
+ }}>绑定结构物
)
}
@@ -341,6 +356,7 @@ const GatewayManage = props => {