jcnet/webio-node
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update modbus db and view

Browse Source
This commit is contained in:
Jay
2017-03-28 13:53:16 +08:00
parent 52e18de9ac
commit eeead43baf
10 changed files with 110 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/admin_bundle.js
+48 -15
View File
@@ -84434,21 +84434,27 @@ var DeviceListItem = function DeviceListItem(_ref) {
return _react2.default.createElement(
_semanticUiReact.List.Item,
{ active: data.uid == showDev },
_react2.default.createElement(_semanticUiReact.Icon, { style: { cursor: 'pointer' }, name: 'trash', title: 'Delete', onClick: function onClick() {
delModbus(data.uid || '');
} }),
_react2.default.createElement(_semanticUiReact.Icon, { style: { cursor: 'pointer' }, name: 'write', title: 'Edit', onClick: function onClick() {
editModbus(1, data);
} }),
_react2.default.createElement(
'span',
_semanticUiReact.List.Content,
{ style: { cursor: 'pointer' }, onClick: function onClick() {
selectDevToShow(data.uid);
} },
data.name,
' / Node:',
data.node
),
_react2.default.createElement(_semanticUiReact.Icon, { style: { cursor: 'pointer' }, name: 'trash', onClick: function onClick() {
delModbus(data.uid || '');
} }),
_react2.default.createElement(_semanticUiReact.Icon, { style: { cursor: 'pointer' }, name: 'write', onClick: function onClick() {
editModbus(1, data);
} })
_react2.default.createElement(
_semanticUiReact.List.Header,
null,
data.name
),
'Node: ',
data.node,
' / Type: ',
data.type
)
);
};
@@ -84501,6 +84507,7 @@ var IOModal = function IOModal(_ref) {
id: data.uid || '',
addr: '',
num: '',
datalen: '',
type: ''
};
@@ -84510,6 +84517,8 @@ var IOModal = function IOModal(_ref) {
if (num && 'value' in num) json.num = num.value;
var type = e.querySelector('select[name="io_type"]');
if (type && 'value' in type) json.type = type.value;
var len = e.querySelector('input[name="datalen"]');
if (len && 'value' in len) json.datalen = len.value;
return json;
} },
@@ -84541,12 +84550,17 @@ var IOModal = function IOModal(_ref) {
_react2.default.createElement(
_semanticUiReact.Form.Field,
null,
_react2.default.createElement(_semanticUiReact.Input, { name: 'addr', label: '\u8D77\u59CB\u4F4D\u5740', defaultValue: data.addr || '' })
_react2.default.createElement(_semanticUiReact.Input, { name: 'addr', label: '\u8D77\u59CB\u4F4D\u5740', defaultValue: data.addr })
),
_react2.default.createElement(
_semanticUiReact.Form.Field,
null,
_react2.default.createElement(_semanticUiReact.Input, { name: 'num', label: '\u6578\u91CF', defaultValue: data.num || '' })
_react2.default.createElement(_semanticUiReact.Input, { name: 'num', label: '\u6578\u91CF', defaultValue: data.num })
),
_react2.default.createElement(
_semanticUiReact.Form.Field,
null,
_react2.default.createElement(_semanticUiReact.Input, { name: 'datalen', label: '\u8CC7\u6599\u9577\u5EA6', defaultValue: data.datalen, placeholder: '\u9577\u5EA6\u4E0D\u586B\u5247\u9810\u8A2D2' })
),
_react2.default.createElement(
_semanticUiReact.Grid,
@@ -84701,7 +84715,12 @@ var IOPanel = function (_React$Component) {
_react2.default.createElement(
_semanticUiReact.Table.HeaderCell,
null,
'\u63A5\u53E3\u6578\u91CF'
'\u8B80\u53D6\u6578\u91CF'
),
_react2.default.createElement(
_semanticUiReact.Table.HeaderCell,
null,
'\u8CC7\u6599\u9577\u5EA6'
),
_react2.default.createElement(
_semanticUiReact.Table.HeaderCell,
@@ -84784,6 +84803,11 @@ var IOPanelListItem = function IOPanelListItem(_ref) {
null,
data.num
),
_react2.default.createElement(
_semanticUiReact.Table.Cell,
null,
data.datalen
),
_react2.default.createElement(
_semanticUiReact.Table.Cell,
null,
@@ -84847,6 +84871,7 @@ var ModbusModal = function ModbusModal(_ref) {
var json = {
name: '',
node: '',
type: '',
id: data.uid || '',
original_node: data.node || ''
};
@@ -84855,6 +84880,8 @@ var ModbusModal = function ModbusModal(_ref) {
if (n && 'value' in n) json.name = n.value;
var nn = e.querySelector('input[name="node"]');
if (nn && 'value' in nn) json.node = nn.value;
var type = e.querySelector('input[name="type"]');
if (type && 'value' in type) json.type = type.value;
return json;
} },
@@ -84866,7 +84893,12 @@ var ModbusModal = function ModbusModal(_ref) {
_react2.default.createElement(
_semanticUiReact.Form.Field,
null,
_react2.default.createElement(_semanticUiReact.Input, { name: 'node', defaultValue: data.node || '', label: 'Node' })
_react2.default.createElement(_semanticUiReact.Input, { name: 'node', defaultValue: data.node, label: 'Node' })
),
_react2.default.createElement(
_semanticUiReact.Form.Field,
null,
_react2.default.createElement(_semanticUiReact.Input, { name: 'type', defaultValue: data.type, label: 'Type', placeholder: '\u9810\u8A2D\u8ACB\u7559\u7A7A' })
),
_react2.default.createElement(
_semanticUiReact.Grid,
@@ -85024,6 +85056,7 @@ var ModbusPage = function (_React$Component) {
var i18n = _this.props.i18n;
if (type == 1 && !data.id || !('addr' in data) || !('num' in data) || !('type' in data)) return _this.props.showDialog(i18n.t('tip.input_empty'));
if (data.datalen == 0) return _this.props.showDialog('資料長度不能為0');
data.devuid = _this.state.showDev;
if (type == 1) {