From 108e7db8f3a88aebde7619657ccc20b673fad7c6 Mon Sep 17 00:00:00 2001 From: Jay Date: Mon, 10 Apr 2017 10:03:43 +0800 Subject: [PATCH] update --- public/js/admin_bundle.js | 531 +++++++++++++++++++------------------- public/js/index_bundle.js | 14 +- route/api/wristband.js | 2 +- 3 files changed, 274 insertions(+), 273 deletions(-) diff --git a/public/js/admin_bundle.js b/public/js/admin_bundle.js index 9f9dcf6..adad645 100644 --- a/public/js/admin_bundle.js +++ b/public/js/admin_bundle.js @@ -63,7 +63,7 @@ /******/ __webpack_require__.p = ""; /******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 1144); +/******/ return __webpack_require__(__webpack_require__.s = 1146); /******/ }) /************************************************************************/ /******/ ([ @@ -2083,7 +2083,7 @@ function loadLocale(name) { module && module.exports) { try { oldLocale = globalLocale._abbr; - __webpack_require__(1120)("./" + name); + __webpack_require__(1122)("./" + name); // because defineLocale currently also sets the global locale, we // want to undo that for lazy loaded locales getSetGlobalLocale(oldLocale); @@ -19887,7 +19887,7 @@ var locationsAreEqual = exports.locationsAreEqual = function locationsAreEqual(a var assign = __webpack_require__(1016), moment = __webpack_require__(5), React = __webpack_require__(0), - CalendarContainer = __webpack_require__(1122) + CalendarContainer = __webpack_require__(1124) ; var TYPES = React.PropTypes; @@ -20608,21 +20608,21 @@ function _resetWarned() { "use strict"; Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Router__ = __webpack_require__(1131); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Router__ = __webpack_require__(1133); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Router", function() { return __WEBPACK_IMPORTED_MODULE_0__Router__["a"]; }); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Link__ = __webpack_require__(1017); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Link", function() { return __WEBPACK_IMPORTED_MODULE_1__Link__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__IndexLink__ = __webpack_require__(1127); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__IndexLink__ = __webpack_require__(1129); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "IndexLink", function() { return __WEBPACK_IMPORTED_MODULE_2__IndexLink__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__withRouter__ = __webpack_require__(1142); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__withRouter__ = __webpack_require__(1144); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "withRouter", function() { return __WEBPACK_IMPORTED_MODULE_3__withRouter__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__IndexRedirect__ = __webpack_require__(1128); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__IndexRedirect__ = __webpack_require__(1130); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "IndexRedirect", function() { return __WEBPACK_IMPORTED_MODULE_4__IndexRedirect__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__IndexRoute__ = __webpack_require__(1129); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__IndexRoute__ = __webpack_require__(1131); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "IndexRoute", function() { return __WEBPACK_IMPORTED_MODULE_5__IndexRoute__["a"]; }); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__Redirect__ = __webpack_require__(1019); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Redirect", function() { return __WEBPACK_IMPORTED_MODULE_6__Redirect__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__Route__ = __webpack_require__(1130); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__Route__ = __webpack_require__(1132); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Route", function() { return __WEBPACK_IMPORTED_MODULE_7__Route__["a"]; }); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__RouteUtils__ = __webpack_require__(149); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "createRoutes", function() { return __WEBPACK_IMPORTED_MODULE_8__RouteUtils__["a"]; }); @@ -20631,17 +20631,17 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__PropTypes__ = __webpack_require__(814); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "locationShape", function() { return __WEBPACK_IMPORTED_MODULE_10__PropTypes__["a"]; }); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "routerShape", function() { return __WEBPACK_IMPORTED_MODULE_10__PropTypes__["b"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__match__ = __webpack_require__(1140); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__match__ = __webpack_require__(1142); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "match", function() { return __WEBPACK_IMPORTED_MODULE_11__match__["a"]; }); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__useRouterHistory__ = __webpack_require__(1024); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "useRouterHistory", function() { return __WEBPACK_IMPORTED_MODULE_12__useRouterHistory__["a"]; }); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__PatternUtils__ = __webpack_require__(246); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "formatPattern", function() { return __WEBPACK_IMPORTED_MODULE_13__PatternUtils__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_14__applyRouterMiddleware__ = __webpack_require__(1133); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_14__applyRouterMiddleware__ = __webpack_require__(1135); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "applyRouterMiddleware", function() { return __WEBPACK_IMPORTED_MODULE_14__applyRouterMiddleware__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15__browserHistory__ = __webpack_require__(1134); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15__browserHistory__ = __webpack_require__(1136); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "browserHistory", function() { return __WEBPACK_IMPORTED_MODULE_15__browserHistory__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_16__hashHistory__ = __webpack_require__(1138); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_16__hashHistory__ = __webpack_require__(1140); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "hashHistory", function() { return __WEBPACK_IMPORTED_MODULE_16__hashHistory__["a"]; }); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_17__createMemoryHistory__ = __webpack_require__(1021); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "createMemoryHistory", function() { return __WEBPACK_IMPORTED_MODULE_17__createMemoryHistory__["a"]; }); @@ -37208,7 +37208,7 @@ var canUseDOM = exports.canUseDOM = !!(typeof window !== 'undefined' && window.d exports.__esModule = true; -var _AsyncUtils = __webpack_require__(1114); +var _AsyncUtils = __webpack_require__(1116); var _PathUtils = __webpack_require__(148); @@ -56500,7 +56500,7 @@ var locationShape = shape({ /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_invariant___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_invariant__); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_react__ = __webpack_require__(0); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1_react__); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__getRouteParams__ = __webpack_require__(1137); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__getRouteParams__ = __webpack_require__(1139); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ContextUtils__ = __webpack_require__(813); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__RouteUtils__ = __webpack_require__(149); var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; @@ -68958,7 +68958,7 @@ exports.__esModule = true; var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; -var _queryString = __webpack_require__(1121); +var _queryString = __webpack_require__(1123); var _runTransitionHook = __webpack_require__(539); @@ -79766,7 +79766,7 @@ function assignRouterState(router, _ref) { /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_history_lib_useQueries___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_history_lib_useQueries__); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_history_lib_useBasename__ = __webpack_require__(906); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_history_lib_useBasename___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1_history_lib_useBasename__); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_history_lib_createMemoryHistory__ = __webpack_require__(1119); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_history_lib_createMemoryHistory__ = __webpack_require__(1121); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_history_lib_createMemoryHistory___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2_history_lib_createMemoryHistory__); /* harmony export (immutable) */ __webpack_exports__["a"] = createMemoryHistory; @@ -79807,11 +79807,11 @@ var canUseDOM = !!(typeof window !== 'undefined' && window.document && window.do "use strict"; /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__routerWarning__ = __webpack_require__(247); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__computeChangedRoutes__ = __webpack_require__(1135); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__TransitionUtils__ = __webpack_require__(1132); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__isActive__ = __webpack_require__(1139); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__getComponents__ = __webpack_require__(1136); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__matchRoutes__ = __webpack_require__(1141); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__computeChangedRoutes__ = __webpack_require__(1137); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__TransitionUtils__ = __webpack_require__(1134); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__isActive__ = __webpack_require__(1141); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__getComponents__ = __webpack_require__(1138); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__matchRoutes__ = __webpack_require__(1143); /* harmony export (immutable) */ __webpack_exports__["a"] = createTransitionManager; var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; @@ -80103,67 +80103,67 @@ var _react2 = _interopRequireDefault(_react); var _reactRouter = __webpack_require__(248); -var _AdminPage = __webpack_require__(1111); +var _AdminPage = __webpack_require__(1113); var _AdminPage2 = _interopRequireDefault(_AdminPage); -var _SystemInfo = __webpack_require__(1105); +var _SystemInfo = __webpack_require__(1107); var _SystemInfo2 = _interopRequireDefault(_SystemInfo); -var _UserList = __webpack_require__(1106); +var _UserList = __webpack_require__(1108); var _UserList2 = _interopRequireDefault(_UserList); -var _DIO = __webpack_require__(1095); +var _DIO = __webpack_require__(1097); var _DIO2 = _interopRequireDefault(_DIO); -var _Log = __webpack_require__(1100); +var _Log = __webpack_require__(1102); var _Log2 = _interopRequireDefault(_Log); -var _LeOne = __webpack_require__(1099); +var _LeOne = __webpack_require__(1101); var _LeOne2 = _interopRequireDefault(_LeOne); -var _IOGroup = __webpack_require__(1097); +var _IOGroup = __webpack_require__(1099); var _IOGroup2 = _interopRequireDefault(_IOGroup); -var _IOCmd = __webpack_require__(1096); +var _IOCmd = __webpack_require__(1098); var _IOCmd2 = _interopRequireDefault(_IOCmd); -var _Schedule = __webpack_require__(1104); +var _Schedule = __webpack_require__(1106); var _Schedule2 = _interopRequireDefault(_Schedule); -var _Modbus = __webpack_require__(1101); +var _Modbus = __webpack_require__(1103); var _Modbus2 = _interopRequireDefault(_Modbus); -var _ModbusCmd = __webpack_require__(1102); +var _ModbusCmd = __webpack_require__(1104); var _ModbusCmd2 = _interopRequireDefault(_ModbusCmd); -var _ModbusLog = __webpack_require__(1103); +var _ModbusLog = __webpack_require__(1105); var _ModbusLog2 = _interopRequireDefault(_ModbusLog); -var _ActionLink = __webpack_require__(1093); +var _ActionLink = __webpack_require__(1095); var _ActionLink2 = _interopRequireDefault(_ActionLink); -var _ActionLinkAdd = __webpack_require__(1094); +var _ActionLinkAdd = __webpack_require__(1096); var _ActionLinkAdd2 = _interopRequireDefault(_ActionLinkAdd); -var _IPCam = __webpack_require__(1098); +var _IPCam = __webpack_require__(1100); var _IPCam2 = _interopRequireDefault(_IPCam); -var _Wristband = __webpack_require__(1110); +var _Wristband = __webpack_require__(1112); var _Wristband2 = _interopRequireDefault(_Wristband); @@ -88123,6 +88123,146 @@ exports.default = LocStatus; "use strict"; +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _react = __webpack_require__(0); + +var _react2 = _interopRequireDefault(_react); + +var _semanticUiReact = __webpack_require__(8); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var ListItem = function ListItem(_ref) { + var i18n = _ref.i18n, + data = _ref.data, + delLocation = _ref.delLocation, + editLocation = _ref.editLocation; + + + return _react2.default.createElement( + _semanticUiReact.Table.Row, + null, + _react2.default.createElement( + _semanticUiReact.Table.Cell, + null, + _react2.default.createElement(_semanticUiReact.Button, { content: 'Edit', basic: true, onClick: function onClick() { + editLocation(1, data); + } }), + _react2.default.createElement(_semanticUiReact.Button, { content: 'Delete', basic: true, onClick: function onClick() { + delLocation(data.uid); + } }) + ), + _react2.default.createElement( + _semanticUiReact.Table.Cell, + null, + data.serialnumber + ), + _react2.default.createElement( + _semanticUiReact.Table.Cell, + null, + data.name + ) + ); +}; + +exports.default = ListItem; + +/***/ }), +/* 1084 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _react = __webpack_require__(0); + +var _react2 = _interopRequireDefault(_react); + +var _semanticUiReact = __webpack_require__(8); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var WristbandModal = function WristbandModal(_ref) { + var i18n = _ref.i18n, + open = _ref.open, + type = _ref.type, + data = _ref.data, + closeModal = _ref.closeModal, + submitModal = _ref.submitModal; + + + return _react2.default.createElement( + _semanticUiReact.Modal, + { open: open }, + _react2.default.createElement(_semanticUiReact.Modal.Header, { content: type == 1 ? '修改資料' : '新增資料' }), + _react2.default.createElement( + _semanticUiReact.Modal.Content, + null, + _react2.default.createElement( + _semanticUiReact.Form, + { onSubmit: function onSubmit(e, d) { + e.preventDefault(); + submitModal(type, d.formData); + }, serializer: function serializer(e) { + var json = { + name: '', + sn: '', + id: type == 1 ? data.uid : '' + }; + + var name = e.querySelector('input[name="name"]'); + if (name && 'value' in name) json.name = name.value; + var sn = e.querySelector('input[name="serialnumber"]'); + if (sn && 'value' in sn) json.sn = sn.value; + + return json; + } }, + _react2.default.createElement( + _semanticUiReact.Form.Field, + null, + _react2.default.createElement(_semanticUiReact.Input, { label: '\u88DD\u7F6E\u5E8F\u865F', name: 'serialnumber', defaultValue: data.serialnumber, disabled: type == 1 }) + ), + _react2.default.createElement( + _semanticUiReact.Form.Field, + null, + _react2.default.createElement(_semanticUiReact.Input, { label: '\u540D\u7A31', name: 'name', defaultValue: data.name }) + ), + _react2.default.createElement( + _semanticUiReact.Grid, + { columns: 2 }, + _react2.default.createElement( + _semanticUiReact.Grid.Column, + null, + _react2.default.createElement(_semanticUiReact.Button, { content: '\u9001\u51FA', fluid: true, type: 'submit' }) + ), + _react2.default.createElement( + _semanticUiReact.Grid.Column, + null, + _react2.default.createElement(_semanticUiReact.Button, { content: '\u53D6\u6D88', fluid: true, type: 'button', onClick: function onClick() { + closeModal(); + } }) + ) + ) + ) + ) + ); +}; +exports.default = WristbandModal; + +/***/ }), +/* 1085 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + Object.defineProperty(exports, "__esModule", { value: true }); @@ -88139,11 +88279,11 @@ var _semanticUiReact = __webpack_require__(8); var _actions = __webpack_require__(20); -var _ListItem = __webpack_require__(1146); +var _ListItem = __webpack_require__(1083); var _ListItem2 = _interopRequireDefault(_ListItem); -var _LocationModal = __webpack_require__(1147); +var _LocationModal = __webpack_require__(1084); var _LocationModal2 = _interopRequireDefault(_LocationModal); @@ -88316,7 +88456,7 @@ var Location = function (_React$Component) { exports.default = Location; /***/ }), -/* 1084 */ +/* 1086 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -88390,7 +88530,7 @@ var ListItem = function ListItem(_ref) { exports.default = ListItem; /***/ }), -/* 1085 */ +/* 1087 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -88508,7 +88648,7 @@ var WristbandModal = function WristbandModal(_ref) { exports.default = WristbandModal; /***/ }), -/* 1086 */ +/* 1088 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -88530,11 +88670,11 @@ var _semanticUiReact = __webpack_require__(8); var _actions = __webpack_require__(20); -var _ListItem = __webpack_require__(1084); +var _ListItem = __webpack_require__(1086); var _ListItem2 = _interopRequireDefault(_ListItem); -var _WristbandModal = __webpack_require__(1085); +var _WristbandModal = __webpack_require__(1087); var _WristbandModal2 = _interopRequireDefault(_WristbandModal); @@ -88725,7 +88865,7 @@ var WristbandInfo = function (_React$Component) { exports.default = WristbandInfo; /***/ }), -/* 1087 */ +/* 1089 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -88743,15 +88883,15 @@ var _react2 = _interopRequireDefault(_react); var _semanticUiReact = __webpack_require__(8); -var _LocStatus = __webpack_require__(1107); +var _LocStatus = __webpack_require__(1109); var _LocStatus2 = _interopRequireDefault(_LocStatus); -var _WristbandInfo = __webpack_require__(1109); +var _WristbandInfo = __webpack_require__(1111); var _WristbandInfo2 = _interopRequireDefault(_WristbandInfo); -var _Location = __webpack_require__(1108); +var _Location = __webpack_require__(1110); var _Location2 = _interopRequireDefault(_Location); @@ -88870,7 +89010,7 @@ var WristbandPage = function (_React$Component) { exports.default = WristbandPage; /***/ }), -/* 1088 */ +/* 1090 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -88920,7 +89060,7 @@ var AlertItem = function AlertItem(_ref) { exports.default = AlertItem; /***/ }), -/* 1089 */ +/* 1091 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -88942,7 +89082,7 @@ var _actions = __webpack_require__(20); var _tools = __webpack_require__(147); -var _AlertItem = __webpack_require__(1088); +var _AlertItem = __webpack_require__(1090); var _AlertItem2 = _interopRequireDefault(_AlertItem); @@ -89096,8 +89236,8 @@ var DashBoardUnit = function (_React$Component) { exports.default = DashBoardUnit; /***/ }), -/* 1090 */, -/* 1091 */ +/* 1092 */, +/* 1093 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -89132,7 +89272,7 @@ var MItem = function MItem(_ref) { exports.default = MItem; /***/ }), -/* 1092 */ +/* 1094 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -89150,7 +89290,7 @@ var _semanticUiReact = __webpack_require__(8); var _reactRouter = __webpack_require__(248); -var _Item = __webpack_require__(1091); +var _Item = __webpack_require__(1093); var _Item2 = _interopRequireDefault(_Item); @@ -89261,7 +89401,7 @@ var MainMenu = function MainMenu(_ref) { exports.default = MainMenu; /***/ }), -/* 1093 */ +/* 1095 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -89319,7 +89459,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_ActionLink2.default); /***/ }), -/* 1094 */ +/* 1096 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -89361,7 +89501,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_ActionLinkAdd2.default); /***/ }), -/* 1095 */ +/* 1097 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -89414,7 +89554,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_DIO2.default); /***/ }), -/* 1096 */ +/* 1098 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -89472,7 +89612,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_IOCmd2.default); /***/ }), -/* 1097 */ +/* 1099 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -89545,7 +89685,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_IOGroup2.default); /***/ }), -/* 1098 */ +/* 1100 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -89587,7 +89727,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_IPCam2.default); /***/ }), -/* 1099 */ +/* 1101 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -89659,7 +89799,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_LeOne2.default); /***/ }), -/* 1100 */ +/* 1102 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -89703,7 +89843,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_Log2.default); /***/ }), -/* 1101 */ +/* 1103 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -89780,7 +89920,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_Modbus2.default); /***/ }), -/* 1102 */ +/* 1104 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -89822,7 +89962,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_ModbusCmd2.default); /***/ }), -/* 1103 */ +/* 1105 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -89875,7 +90015,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_ModbusLog2.default); /***/ }), -/* 1104 */ +/* 1106 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -89952,7 +90092,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_Schedule2.default); /***/ }), -/* 1105 */ +/* 1107 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -89985,7 +90125,7 @@ var mapStateToProps = function mapStateToProps(state) { exports.default = (0, _reactRedux.connect)(mapStateToProps)(_SystemInfo2.default); /***/ }), -/* 1106 */ +/* 1108 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -90042,7 +90182,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_UserList2.default); /***/ }), -/* 1107 */ +/* 1109 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -90084,7 +90224,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_LocStatus2.default); /***/ }), -/* 1108 */ +/* 1110 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -90098,7 +90238,7 @@ var _reactRedux = __webpack_require__(24); var _actions = __webpack_require__(20); -var _Location = __webpack_require__(1083); +var _Location = __webpack_require__(1085); var _Location2 = _interopRequireDefault(_Location); @@ -90126,7 +90266,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_Location2.default); /***/ }), -/* 1109 */ +/* 1111 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -90140,7 +90280,7 @@ var _reactRedux = __webpack_require__(24); var _actions = __webpack_require__(20); -var _WristbandInfo = __webpack_require__(1086); +var _WristbandInfo = __webpack_require__(1088); var _WristbandInfo2 = _interopRequireDefault(_WristbandInfo); @@ -90168,7 +90308,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_WristbandInfo2.default); /***/ }), -/* 1110 */ +/* 1112 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -90182,7 +90322,7 @@ var _reactRedux = __webpack_require__(24); var _actions = __webpack_require__(20); -var _Wristband = __webpack_require__(1087); +var _Wristband = __webpack_require__(1089); var _Wristband2 = _interopRequireDefault(_Wristband); @@ -90210,7 +90350,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_Wristband2.default); /***/ }), -/* 1111 */ +/* 1113 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -90232,7 +90372,7 @@ var _reactDatetime = __webpack_require__(245); var _reactDatetime2 = _interopRequireDefault(_reactDatetime); -var _MenuControl = __webpack_require__(1113); +var _MenuControl = __webpack_require__(1115); var _MenuControl2 = _interopRequireDefault(_MenuControl); @@ -90244,7 +90384,7 @@ var _DialogControl = __webpack_require__(460); var _DialogControl2 = _interopRequireDefault(_DialogControl); -var _DashBoard = __webpack_require__(1112); +var _DashBoard = __webpack_require__(1114); var _DashBoard2 = _interopRequireDefault(_DashBoard); @@ -90318,7 +90458,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(AdmPage); /***/ }), -/* 1112 */ +/* 1114 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -90332,7 +90472,7 @@ var _reactRedux = __webpack_require__(24); var _actions = __webpack_require__(20); -var _DashBoard = __webpack_require__(1089); +var _DashBoard = __webpack_require__(1091); var _DashBoard2 = _interopRequireDefault(_DashBoard); @@ -90363,7 +90503,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_DashBoard2.default); /***/ }), -/* 1113 */ +/* 1115 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -90375,7 +90515,7 @@ Object.defineProperty(exports, "__esModule", { var _reactRedux = __webpack_require__(24); -var _MainMenu = __webpack_require__(1092); +var _MainMenu = __webpack_require__(1094); var _MainMenu2 = _interopRequireDefault(_MainMenu); @@ -90415,7 +90555,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_MainMenu2.default); /***/ }), -/* 1114 */ +/* 1116 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -90477,7 +90617,7 @@ var loopAsync = exports.loopAsync = function loopAsync(turns, work, callback) { }; /***/ }), -/* 1115 */ +/* 1117 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -90619,7 +90759,7 @@ var replaceLocation = exports.replaceLocation = function replaceLocation(locatio }; /***/ }), -/* 1116 */ +/* 1118 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -90662,7 +90802,7 @@ var replaceLocation = exports.replaceLocation = function replaceLocation(locatio }; /***/ }), -/* 1117 */ +/* 1119 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -90682,7 +90822,7 @@ var _BrowserProtocol = __webpack_require__(536); var BrowserProtocol = _interopRequireWildcard(_BrowserProtocol); -var _RefreshProtocol = __webpack_require__(1116); +var _RefreshProtocol = __webpack_require__(1118); var RefreshProtocol = _interopRequireWildcard(_RefreshProtocol); @@ -90761,7 +90901,7 @@ var createBrowserHistory = function createBrowserHistory() { exports.default = createBrowserHistory; /***/ }), -/* 1118 */ +/* 1120 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -90783,7 +90923,7 @@ var _ExecutionEnvironment = __webpack_require__(537); var _DOMUtils = __webpack_require__(453); -var _HashProtocol = __webpack_require__(1115); +var _HashProtocol = __webpack_require__(1117); var HashProtocol = _interopRequireWildcard(_HashProtocol); @@ -90914,7 +91054,7 @@ var createHashHistory = function createHashHistory() { exports.default = createHashHistory; /***/ }), -/* 1119 */ +/* 1121 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -91060,7 +91200,7 @@ var createMemoryHistory = function createMemoryHistory() { exports.default = createMemoryHistory; /***/ }), -/* 1120 */ +/* 1122 */ /***/ (function(module, exports, __webpack_require__) { var map = { @@ -91295,16 +91435,16 @@ webpackContext.keys = function webpackContextKeys() { }; webpackContext.resolve = webpackContextResolve; module.exports = webpackContext; -webpackContext.id = 1120; +webpackContext.id = 1122; /***/ }), -/* 1121 */ +/* 1123 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var strictUriEncode = __webpack_require__(1143); +var strictUriEncode = __webpack_require__(1145); var objectAssign = __webpack_require__(16); function encoderForArrayFormat(opts) { @@ -91509,14 +91649,14 @@ exports.stringify = function (obj, opts) { /***/ }), -/* 1122 */ +/* 1124 */ /***/ (function(module, exports, __webpack_require__) { var React = __webpack_require__(0), - DaysView = __webpack_require__(1123), - MonthsView = __webpack_require__(1124), - YearsView = __webpack_require__(1126), - TimeView = __webpack_require__(1125) + DaysView = __webpack_require__(1125), + MonthsView = __webpack_require__(1126), + YearsView = __webpack_require__(1128), + TimeView = __webpack_require__(1127) ; var CalendarContainer = React.createClass({ @@ -91536,7 +91676,7 @@ module.exports = CalendarContainer; /***/ }), -/* 1123 */ +/* 1125 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -91687,7 +91827,7 @@ module.exports = DateTimePickerDays; /***/ }), -/* 1124 */ +/* 1126 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -91801,7 +91941,7 @@ module.exports = DateTimePickerMonths; /***/ }), -/* 1125 */ +/* 1127 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -92036,7 +92176,7 @@ module.exports = DateTimePickerTime; /***/ }), -/* 1126 */ +/* 1128 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -92148,7 +92288,7 @@ module.exports = DateTimePickerYears; /***/ }), -/* 1127 */ +/* 1129 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -92173,7 +92313,7 @@ var IndexLink = __WEBPACK_IMPORTED_MODULE_0_react___default.a.createClass({ /* harmony default export */ __webpack_exports__["a"] = IndexLink; /***/ }), -/* 1128 */ +/* 1130 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -92231,7 +92371,7 @@ var IndexRedirect = __WEBPACK_IMPORTED_MODULE_0_react___default.a.createClass({ /* harmony default export */ __webpack_exports__["a"] = IndexRedirect; /***/ }), -/* 1129 */ +/* 1131 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -92288,7 +92428,7 @@ var IndexRoute = __WEBPACK_IMPORTED_MODULE_0_react___default.a.createClass({ /* harmony default export */ __webpack_exports__["a"] = IndexRoute; /***/ }), -/* 1130 */ +/* 1132 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -92344,7 +92484,7 @@ var Route = __WEBPACK_IMPORTED_MODULE_0_react___default.a.createClass({ /* harmony default export */ __webpack_exports__["a"] = Route; /***/ }), -/* 1131 */ +/* 1133 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -92512,7 +92652,7 @@ var Router = __WEBPACK_IMPORTED_MODULE_1_react___default.a.createClass({ /* harmony default export */ __webpack_exports__["a"] = Router; /***/ }), -/* 1132 */ +/* 1134 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -92670,7 +92810,7 @@ function runLeaveHooks(routes, prevState) { } /***/ }), -/* 1133 */ +/* 1135 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -92721,11 +92861,11 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument }; /***/ }), -/* 1134 */ +/* 1136 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_history_lib_createBrowserHistory__ = __webpack_require__(1117); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_history_lib_createBrowserHistory__ = __webpack_require__(1119); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_history_lib_createBrowserHistory___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_history_lib_createBrowserHistory__); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__createRouterHistory__ = __webpack_require__(1022); @@ -92733,7 +92873,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument /* harmony default export */ __webpack_exports__["a"] = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__createRouterHistory__["a" /* default */])(__WEBPACK_IMPORTED_MODULE_0_history_lib_createBrowserHistory___default.a); /***/ }), -/* 1135 */ +/* 1137 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -92812,7 +92952,7 @@ function computeChangedRoutes(prevState, nextState) { /* harmony default export */ __webpack_exports__["a"] = computeChangedRoutes; /***/ }), -/* 1136 */ +/* 1138 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -92854,7 +92994,7 @@ function getComponents(nextState, callback) { /* harmony default export */ __webpack_exports__["a"] = getComponents; /***/ }), -/* 1137 */ +/* 1139 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -92882,11 +93022,11 @@ function getRouteParams(route, params) { /* harmony default export */ __webpack_exports__["a"] = getRouteParams; /***/ }), -/* 1138 */ +/* 1140 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_history_lib_createHashHistory__ = __webpack_require__(1118); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_history_lib_createHashHistory__ = __webpack_require__(1120); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_history_lib_createHashHistory___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_history_lib_createHashHistory__); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__createRouterHistory__ = __webpack_require__(1022); @@ -92894,7 +93034,7 @@ function getRouteParams(route, params) { /* harmony default export */ __webpack_exports__["a"] = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__createRouterHistory__["a" /* default */])(__WEBPACK_IMPORTED_MODULE_0_history_lib_createHashHistory___default.a); /***/ }), -/* 1139 */ +/* 1141 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -93047,7 +93187,7 @@ function isActive(_ref, indexOnly, currentLocation, routes, params) { } /***/ }), -/* 1140 */ +/* 1142 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -93116,7 +93256,7 @@ function match(_ref, callback) { /* harmony default export */ __webpack_exports__["a"] = match; /***/ }), -/* 1141 */ +/* 1143 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -93376,7 +93516,7 @@ function matchRoutes(routes, location, callback, remainingPathname) { } /***/ }), -/* 1142 */ +/* 1144 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -93448,7 +93588,7 @@ function withRouter(WrappedComponent, options) { } /***/ }), -/* 1143 */ +/* 1145 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -93461,7 +93601,7 @@ module.exports = function (str) { /***/ }), -/* 1144 */ +/* 1146 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -93576,146 +93716,5 @@ var PageRoot = function (_React$Component) { _reactDom2.default.render(_react2.default.createElement(PageRoot, null), document.getElementById('app')); -/***/ }), -/* 1145 */, -/* 1146 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -var _react = __webpack_require__(0); - -var _react2 = _interopRequireDefault(_react); - -var _semanticUiReact = __webpack_require__(8); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -var ListItem = function ListItem(_ref) { - var i18n = _ref.i18n, - data = _ref.data, - delLocation = _ref.delLocation, - editLocation = _ref.editLocation; - - - return _react2.default.createElement( - _semanticUiReact.Table.Row, - null, - _react2.default.createElement( - _semanticUiReact.Table.Cell, - null, - _react2.default.createElement(_semanticUiReact.Button, { content: 'Edit', basic: true, onClick: function onClick() { - editLocation(1, data); - } }), - _react2.default.createElement(_semanticUiReact.Button, { content: 'Delete', basic: true, onClick: function onClick() { - delLocation(data.uid); - } }) - ), - _react2.default.createElement( - _semanticUiReact.Table.Cell, - null, - data.serialnumber - ), - _react2.default.createElement( - _semanticUiReact.Table.Cell, - null, - data.name - ) - ); -}; - -exports.default = ListItem; - -/***/ }), -/* 1147 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -var _react = __webpack_require__(0); - -var _react2 = _interopRequireDefault(_react); - -var _semanticUiReact = __webpack_require__(8); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -var WristbandModal = function WristbandModal(_ref) { - var i18n = _ref.i18n, - open = _ref.open, - type = _ref.type, - data = _ref.data, - closeModal = _ref.closeModal, - submitModal = _ref.submitModal; - - - return _react2.default.createElement( - _semanticUiReact.Modal, - { open: open }, - _react2.default.createElement(_semanticUiReact.Modal.Header, { content: type == 1 ? '修改資料' : '新增資料' }), - _react2.default.createElement( - _semanticUiReact.Modal.Content, - null, - _react2.default.createElement( - _semanticUiReact.Form, - { onSubmit: function onSubmit(e, d) { - e.preventDefault(); - submitModal(type, d.formData); - }, serializer: function serializer(e) { - var json = { - name: '', - sn: '', - id: type == 1 ? data.uid : '' - }; - - var name = e.querySelector('input[name="name"]'); - if (name && 'value' in name) json.name = name.value; - var sn = e.querySelector('input[name="serialnumber"]'); - if (sn && 'value' in sn) json.sn = sn.value; - - return json; - } }, - _react2.default.createElement( - _semanticUiReact.Form.Field, - null, - _react2.default.createElement(_semanticUiReact.Input, { label: '\u88DD\u7F6E\u5E8F\u865F', name: 'serialnumber', defaultValue: data.serialnumber, disabled: type == 1 }) - ), - _react2.default.createElement( - _semanticUiReact.Form.Field, - null, - _react2.default.createElement(_semanticUiReact.Input, { label: '\u540D\u7A31', name: 'name', defaultValue: data.name }) - ), - _react2.default.createElement( - _semanticUiReact.Grid, - { columns: 2 }, - _react2.default.createElement( - _semanticUiReact.Grid.Column, - null, - _react2.default.createElement(_semanticUiReact.Button, { content: '\u9001\u51FA', fluid: true, type: 'submit' }) - ), - _react2.default.createElement( - _semanticUiReact.Grid.Column, - null, - _react2.default.createElement(_semanticUiReact.Button, { content: '\u53D6\u6D88', fluid: true, type: 'button', onClick: function onClick() { - closeModal(); - } }) - ) - ) - ) - ) - ); -}; -exports.default = WristbandModal; - /***/ }) /******/ ]); \ No newline at end of file diff --git a/public/js/index_bundle.js b/public/js/index_bundle.js index 5ae1f92..8b72079 100644 --- a/public/js/index_bundle.js +++ b/public/js/index_bundle.js @@ -63,7 +63,7 @@ /******/ __webpack_require__.p = ""; /******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 1145); +/******/ return __webpack_require__(__webpack_require__.s = 1147); /******/ }) /************************************************************************/ /******/ ([ @@ -62129,7 +62129,7 @@ var _i18next2 = _interopRequireDefault(_i18next); var _semanticUiReact = __webpack_require__(8); -var _Form = __webpack_require__(1090); +var _Form = __webpack_require__(1092); var _Form2 = _interopRequireDefault(_Form); @@ -62327,7 +62327,9 @@ exports.default = (0, _reactRedux.connect)()(Root); /* 1087 */, /* 1088 */, /* 1089 */, -/* 1090 */ +/* 1090 */, +/* 1091 */, +/* 1092 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -62383,8 +62385,6 @@ var loginForm = function loginForm(_ref) { exports.default = loginForm; /***/ }), -/* 1091 */, -/* 1092 */, /* 1093 */, /* 1094 */, /* 1095 */, @@ -62437,7 +62437,9 @@ exports.default = loginForm; /* 1142 */, /* 1143 */, /* 1144 */, -/* 1145 */ +/* 1145 */, +/* 1146 */, +/* 1147 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; diff --git a/route/api/wristband.js b/route/api/wristband.js index 6d049a3..2b0fdc4 100644 --- a/route/api/wristband.js +++ b/route/api/wristband.js @@ -52,7 +52,7 @@ router res.db.query(q, p, (err, row) => { let pros = []; if (!(err || row.length == 0 || row[0].c > 0)) { - let q = "insert into ??.?? values (null, ?, '', unix_timestamp(), unix_timestamp())"; + let q = "insert into ??.?? (`mac`, `name`, `cuser`, `muser`, `ctime`, `mtime`) values (?, '', 'API', 'API', unix_timestamp(), unix_timestamp())"; let p = [config.db.db9, 'wristband', arr.mac]; pros.push(tool.promiseQuery(res, q, p, 'q1')); }