Merge branch 'master' into release

This commit is contained in:
Jay 2017-05-05 18:02:21 +08:00
commit 00eb87487e

View File

@ -169,7 +169,7 @@ class IPCamPage extends React.Component {
<Message> <Message>
<Message.Header>攝影機事件通知位址</Message.Header> <Message.Header>攝影機事件通知位址</Message.Header>
<p> <p>
{`${location.protocol}//${location.host}${location.port != '' ? `:${location.port}` : ''}/camevent`} {`${location.protocol}//${location.host}/camevent`}
</p> </p>
</Message> </Message>
<Button basic content="新增" icon="plus" floated="right" type="button" style={{marginBottom: '15px'}} color="green" onClick={()=>{this.openModal(0)}} /> <Button basic content="新增" icon="plus" floated="right" type="button" style={{marginBottom: '15px'}} color="green" onClick={()=>{this.openModal(0)}} />