update

src/components/AdminPage/Modbus/IOPanel.js

@@ -41,10 +41,10 @@ class IOPanel extends React.Component {
 		return (
 			<div>
 				<Menu attached="top" tabular>
-					<Menu.Item content="DigitOutput" name="1" active={this.state.tabIdx == "1"} onClick={this.tabItemClick} />
-					<Menu.Item content="DigitInput" name="2" active={this.state.tabIdx == "2"} onClick={this.tabItemClick} />
-					<Menu.Item content="AnalogyOutput" name="3" active={this.state.tabIdx == "3"} onClick={this.tabItemClick} />
-					<Menu.Item content="AnalogyInput" name="4" active={this.state.tabIdx == "4"} onClick={this.tabItemClick} />
+					<Menu.Item content="DigitalOutput" name="1" active={this.state.tabIdx == "1"} onClick={this.tabItemClick} />
+					<Menu.Item content="DigitalInput" name="2" active={this.state.tabIdx == "2"} onClick={this.tabItemClick} />
+					<Menu.Item content="AnalogOutput" name="3" active={this.state.tabIdx == "3"} onClick={this.tabItemClick} />
+					<Menu.Item content="AnalogInput" name="4" active={this.state.tabIdx == "4"} onClick={this.tabItemClick} />
 					<Menu.Menu position="right">
 						<Menu.Item content="AddIO" icon="plus" onClick={()=>{ioModal(0)}}/>
 					</Menu.Menu>

src/components/AdminPage/Wristband/LocStatus/ListItem.js

@@ -6,7 +6,7 @@ const ListItem = ({i18n, data}) => {
 
     return (
         <Table.Row>
-            <Table.Cell>{data.mac}</Table.Cell>
+            <Table.Cell>{data.wristband}</Table.Cell>
             <Table.Cell>{data.locname}</Table.Cell>
             <Table.Cell>{data.val3 ? parseInt(data.val3, 16) : ''}</Table.Cell>
             <Table.Cell>{data.val4 ? `${parseInt(data.val4, 16)}%` : ''}</Table.Cell>

src/components/AdminPage/Wristband/Location/index.js

@@ -0,0 +1,50 @@
+import React from 'react';
+import {Container, Segment, Button} from 'semantic-ui-react';
+import {getRequest} from '../../../../actions';
+
+const stateDefault = ()=>({
+    list: [],
+    modal: {
+        open: false,
+        type: 0,
+        data: {}
+    }
+})
+
+class Location extends React.Component {
+
+    state = {
+        ...stateDefault()
+    }
+
+    componentDidMount() {
+        this.getList();
+    }
+
+    getList = () => {
+        let {showDialog, toggleLoading} = this.props;
+        toggleLoading(1);
+        fetch('/api/wristband/getlocationlist', getRequest())
+            .then(response=>response.json())
+            .then(json => {
+                toggleLoading(0);
+                if(json.status != 1) return showDialog(json.message);
+                this.setState({
+                    list: json.data.record || []
+                })
+            })
+    }
+
+    render() {
+    
+        return (
+            <Container fluid>
+                <Segment className="clearfix">
+                    <Button floated="right" basic color="green" style={{marginBottom: '15px'}} content="新增" icon="plus" />
+                </Segment>
+            </Container>
+        )
+    }
+}
+
+export default Location;

src/components/AdminPage/Wristband/WristbandInfo/ListItem.js

@@ -11,6 +11,10 @@ const ListItem = ({ i18n, data, delWristband, editWristband }) => {
             </Table.Cell>
             <Table.Cell>{data.mac}</Table.Cell>
             <Table.Cell>{data.name}</Table.Cell>
+            <Table.Cell>{data.identity}</Table.Cell>
+            <Table.Cell>{data.monitor == 1 ? '啟用' : '停用'}</Table.Cell>
+            <Table.Cell>{data.notify == 1 ? '啟用' : '停用'}</Table.Cell>
+            <Table.Cell>{data.switch == 1 ? '啟用' : '停用'}</Table.Cell>
         </Table.Row>
     )
 }

src/components/AdminPage/Wristband/WristbandInfo/index.js

@@ -24,10 +24,11 @@ class WristbandInfo extends React.Component {
 
     getList = () => {
         let {showDialog, toggleLoading} = this.props;
-
+        toggleLoading(1);
         fetch('/api/wristband/getwristbandlist', getRequest())
             .then(response=>response.json())
             .then(json =>{
+                toggleLoading(0);
                 if(json.status != 1) return showDialog(json.message);
                 this.setState({
                     list: json.data.record || []
@@ -95,6 +96,10 @@ class WristbandInfo extends React.Component {
                                 <Table.HeaderCell>操作</Table.HeaderCell>
                                 <Table.HeaderCell>手環ID</Table.HeaderCell>
                                 <Table.HeaderCell>手環名稱</Table.HeaderCell>
+                                <Table.HeaderCell>身份</Table.HeaderCell>
+                                <Table.HeaderCell>監控</Table.HeaderCell>
+                                <Table.HeaderCell>通知</Table.HeaderCell>
+                                <Table.HeaderCell>啟用</Table.HeaderCell>
                             </Table.Row>
                         </Table.Header>
                         <Table.Body>

src/components/AdminPage/Wristband/index.js

@@ -2,6 +2,7 @@ import React from 'react';
 import {Grid, Container, Segment, Menu, List} from 'semantic-ui-react';
 import LocStatus from '../../../containers/AdminPage/Wristband/LocStatus';
 import WristbandInfo from '../../../containers/AdminPage/Wristband/WristbandInfo';
+import Location from '../../../containers/AdminPage/Wristband/Location';
 
 class WristbandPage extends React.Component{
     state = {
@@ -20,7 +21,9 @@ class WristbandPage extends React.Component{
             case 'locstatus':
                 return <LocStatus/>;
             case 'wristband':
-                return <WristbandInfo />
+                return <WristbandInfo />;
+            case 'location':
+                return <Location />
             default:
                 return null;
         }
@@ -39,6 +42,9 @@ class WristbandPage extends React.Component{
                                     <Menu.Item active={this.state.page == 'wristband'} onClick={()=>{this.changePage('wristband')}}>
                                         手環名稱設定
                                     </Menu.Item>
+                                    <Menu.Item active={this.state.page == 'location'} onClick={()=>{this.changePage('location')}}>
+                                        定位點設定
+                                    </Menu.Item>
                                     <Menu.Item active={this.state.page == 'locstatus'} onClick={()=>{ this.changePage('locstatus'); }}>
                                         位置資訊
                                     </Menu.Item>

src/containers/AdminPage/Wristband/Location.js

@@ -0,0 +1,19 @@
+import { connect } from 'react-redux';
+import { add_dialog_msg, toggle_loading } from '../../../actions';
+import LocationPage from '../../../components/AdminPage/Wristband/Location';
+
+
+const mapStateToProps = (state) => ({
+    i18n: state.i18n
+});
+
+const mapDispatchToProps = (dispatch, ownProps) => ({
+    showDialog: (msg) => {
+        dispatch(add_dialog_msg(msg));
+    },
+    toggleLoading: (flag = false) => {
+        dispatch(toggle_loading(flag));
+    }
+})
+
+export default connect(mapStateToProps, mapDispatchToProps)(LocationPage);