Skip to content

Y
YeeAMOSIotView
Commit f878d562 authored by 田功镭's avatar 田功镭
Browse files
Options

*)modify iot access bugs

parent 8306380c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 581 additions and 571 deletions
amos.config.js
View file @ f878d562
......@@ -15,6 +15,7 @@
// pluginURI: 'http://172.16.11.30:8201/',
// 安全模块api地址
securityBaseURI: '/baseURI/',
loginURI: ''
},
// websocket 地址
wsURI: {
......
lib/entry/index.js
View file @ f878d562
"use strict";
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard"), _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"), _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray")), _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireWildcard(require("react")), _reactDom = require("react-dom"), _reactRedux = require("react-redux"), _rayProgress = _interopRequireDefault(require("ray-progress")), _amosReactRouter = require("amos-react-router"), _reactRouterRedux = require("react-router-redux"), _amosTool = require("amos-tool"), _amosFramework = require("amos-framework"), endConf = _interopRequireWildcard(require("amos-processor/lib/config/endconf")), _routes = _interopRequireDefault(require("./../routes")), _store = _interopRequireDefault(require("./../store")), _securityService = require("../services/securityService"), _consts = _interopRequireDefault(require("amos-processor/lib/config/consts"));
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard"), _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"), _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray")), _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireWildcard(require("react")), _reactDom = require("react-dom"), _reactRedux = require("react-redux"), _rayProgress = _interopRequireDefault(require("ray-progress")), _amosReactRouter = require("amos-react-router"), _reactRouterRedux = require("react-router-redux"), _amosTool = require("amos-tool"), _amosFramework = require("amos-framework"), endConf = _interopRequireWildcard(require("amos-processor/lib/config/endconf")), _consts = _interopRequireDefault(require("amos-processor/lib/config/consts")), _routes = _interopRequireDefault(require("./../routes")), _store = _interopRequireDefault(require("./../store")), _securityService = require("../services/securityService");
function _createSuper(e) {
var r = _isNativeReflectConstruct();
......
lib/entry/index.prod.js
View file @ f878d562
"use strict";
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard"), _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"), _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray")), _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireWildcard(require("react")), _reactDom = require("react-dom"), _reactRedux = require("react-redux"), _rayProgress = _interopRequireDefault(require("ray-progress")), _amosReactRouter = require("amos-react-router"), _reactRouterRedux = require("react-router-redux"), _amosTool = require("amos-tool"), _amosFramework = require("amos-framework"), endConf = _interopRequireWildcard(require("amos-processor/lib/config/endconf")), _asyncRoutes = _interopRequireDefault(require("./../routes/asyncRoutes")), _store = _interopRequireDefault(require("./../store")), _securityService = require("../services/securityService"), _consts = _interopRequireDefault(require("amos-processor/lib/config/consts"));
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard"), _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"), _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray")), _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireWildcard(require("react")), _reactDom = require("react-dom"), _reactRedux = require("react-redux"), _rayProgress = _interopRequireDefault(require("ray-progress")), _amosReactRouter = require("amos-react-router"), _reactRouterRedux = require("react-router-redux"), _amosTool = require("amos-tool"), _amosFramework = require("amos-framework"), endConf = _interopRequireWildcard(require("amos-processor/lib/config/endconf")), _consts = _interopRequireDefault(require("amos-processor/lib/config/consts")), _asyncRoutes = _interopRequireDefault(require("./../routes/asyncRoutes")), _store = _interopRequireDefault(require("./../store")), _securityService = require("../services/securityService");
function _createSuper(e) {
var r = _isNativeReflectConstruct();
......
lib/routes/asyncRoutes.js
View file @ f878d562
......@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", {
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray")), _amosTool = require("amos-tool"), _rayProgress = _interopRequireDefault(require("ray-progress")), endConf = _interopRequireWildcard(require("amos-processor/lib/config/endconf")), _calcRoutes = _interopRequireDefault(require("./calcRoutes")), _customRoutes = _interopRequireDefault(require("./customRoutes")), _asyncView = _interopRequireWildcard(require("./asyncView")), AmosConfig = endConf.AmosConfig, loginURI = AmosConfig.httpURI.loginURI, progressStart = function() {
_rayProgress.default.start();
}, injectRoutes = function(e) {
var o = (0, _customRoutes.default)((0, _calcRoutes.default)(e, _asyncView.default));
var r = (0, _customRoutes.default)((0, _calcRoutes.default)(e, _asyncView.default));
return [ {
path: "login",
component: _asyncView.AsyncLogin
......@@ -19,7 +19,7 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
}, {
path: "main",
component: _asyncView.AsyncRootView,
childRoutes: (0, _toConsumableArray2.default)(o)
childRoutes: (0, _toConsumableArray2.default)(r)
} ];
}, rootRoutes = function(e) {
return {
......@@ -27,8 +27,8 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
onChange: progressStart,
indexRedirect: _asyncView.AsyncLogin,
indexRoute: {
onEnter: function(e, o) {
window.location.href = loginURI;
onEnter: function(e, r) {
r("/login");
}
},
childRoutes: injectRoutes(e)
......
lib/styles/view/biz/login.scss
View file @ f878d562
......@@ -6,7 +6,7 @@ $btn-border-color: #173B97;
.login-content {
width: 100%;
height: 99.7%;
background: url("/src/assets/auth/login-bg.png") no-repeat;
background: url("../../assets/auth/login-bg.png") no-repeat;
background-size: cover;
border-bottom: 3px solid #3139C7;
......@@ -18,7 +18,7 @@ $btn-border-color: #173B97;
display: inline-block;
width: 62%;
height: 100%;
background: url("/src/assets/auth/login-desc.png") no-repeat;
background: url("../../assets/auth/login-desc.png") no-repeat;
background-size: 100% 100%;
.login-language-bottom {
......@@ -59,7 +59,7 @@ $btn-border-color: #173B97;
.signup-container {
width: 100%;
height: 99.7%;
background: url("/src/assets/auth/login-bg.png") no-repeat;
background: url("../../assets/auth/login-bg.png") no-repeat;
background-size: cover;
border-bottom: 3px solid #3139C7;
......
lib/utils/processor.js
View file @ f878d562
"use strict";
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard"), _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
Object.defineProperty(exports, "__esModule", {
value: !0
}), exports.getToken = getToken, exports.AmosFetch = exports.default = void 0;
});
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _amosProcessor = require("amos-processor"), utils = _interopRequireWildcard(require("amos-processor/lib/utils")), _AmosEnum = _interopRequireDefault(require("amos-processor/lib/enum/AmosEnum")), permission = _interopRequireWildcard(require("amos-processor/lib/config/permission")), _amosTool = require("amos-tool"), _config = _interopRequireDefault(require("amos-processor/lib/config"));
var _exportNames = {
getToken: !0,
AmosFetch: !0,
AmosEnum: !0
};
exports.getToken = getToken, Object.defineProperty(exports, "AmosEnum", {
enumerable: !0,
get: function() {
return _AmosEnum.default;
}
}), exports.AmosFetch = void 0;
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _amosProcessor = require("amos-processor"), _AmosEnum = _interopRequireDefault(require("amos-processor/lib/enum/AmosEnum")), _amosTool = require("amos-tool"), _config = _interopRequireDefault(require("amos-processor/lib/config")), _utils = require("amos-processor/lib/utils");
Object.keys(_utils).forEach((function(e) {
"default" !== e && "__esModule" !== e && (Object.prototype.hasOwnProperty.call(_exportNames, e) || e in exports && exports[e] === _utils[e] || Object.defineProperty(exports, e, {
enumerable: !0,
get: function() {
return _utils[e];
}
}));
}));
var _permission = require("amos-processor/lib/config/permission");
function ownKeys(e, r) {
var t = Object.keys(e);
......@@ -31,21 +55,26 @@ function _objectSpread(e) {
return e;
}
Object.keys(_permission).forEach((function(e) {
"default" !== e && "__esModule" !== e && (Object.prototype.hasOwnProperty.call(_exportNames, e) || e in exports && exports[e] === _permission[e] || Object.defineProperty(exports, e, {
enumerable: !0,
get: function() {
return _permission[e];
}
}));
}));
var lsTool = _amosTool.Store.lsTool, defaultHeaders = function() {
return window.isIotPluginsToAmos ? window.iotRequestInfo.staticHeader : {
appKey: "AMOS_IOT",
product: "AMOS_IOT_WEB"
};
}, _default = _objectSpread(_objectSpread({}, utils), {}, {
AmosEnum: _AmosEnum.default
}, permission);
};
function getToken() {
return lsTool.read(_config.default.token);
}
exports.default = _default;
var AmosFetch = {
_fetch: function(e) {
return function(r, t, o) {
......
lib/view/common/utils/processor.js
View file @ f878d562
"use strict";
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard"), _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
Object.defineProperty(exports, "__esModule", {
value: !0
}), exports.default = void 0;
});
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _fetch = _interopRequireWildcard(require("amos-processor/lib/fetch")), utils = _interopRequireWildcard(require("amos-processor/lib/utils")), _AmosEnum = _interopRequireDefault(require("amos-processor/lib/enum/AmosEnum")), permission = _interopRequireWildcard(require("amos-processor/lib/config/permission"));
var _exportNames = {
AmosEnum: !0
};
function ownKeys(e, r) {
var t = Object.keys(e);
if (Object.getOwnPropertySymbols) {
var i = Object.getOwnPropertySymbols(e);
r && (i = i.filter((function(r) {
return Object.getOwnPropertyDescriptor(e, r).enumerable;
}))), t.push.apply(t, i);
Object.defineProperty(exports, "AmosEnum", {
enumerable: !0,
get: function() {
return _AmosEnum.default;
}
return t;
}
function _objectSpread(e) {
for (var r = 1; r < arguments.length; r++) {
var t = null != arguments[r] ? arguments[r] : {};
r % 2 ? ownKeys(Object(t), !0).forEach((function(r) {
(0, _defineProperty2.default)(e, r, t[r]);
})) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach((function(r) {
Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
}));
}
return e;
}
});
var _AmosEnum = _interopRequireDefault(require("amos-processor/lib/enum/AmosEnum")), _permission = require("amos-processor/lib/config/permission");
Object.keys(_permission).forEach((function(e) {
"default" !== e && "__esModule" !== e && (Object.prototype.hasOwnProperty.call(_exportNames, e) || e in exports && exports[e] === _permission[e] || Object.defineProperty(exports, e, {
enumerable: !0,
get: function() {
return _permission[e];
}
}));
}));
var _fetch = require("amos-processor/lib/fetch");
Object.keys(_fetch).forEach((function(e) {
"default" !== e && "__esModule" !== e && (Object.prototype.hasOwnProperty.call(_exportNames, e) || e in exports && exports[e] === _fetch[e] || Object.defineProperty(exports, e, {
enumerable: !0,
get: function() {
return _fetch[e];
}
}));
}));
var _default = _objectSpread(_objectSpread(_objectSpread({}, _fetch), utils), {}, {
AmosEnum: _AmosEnum.default
}, permission);
var _utils = require("amos-processor/lib/utils");
exports.default = _default;
\ No newline at end of file
Object.keys(_utils).forEach((function(e) {
"default" !== e && "__esModule" !== e && (Object.prototype.hasOwnProperty.call(_exportNames, e) || e in exports && exports[e] === _utils[e] || Object.defineProperty(exports, e, {
enumerable: !0,
get: function() {
return _utils[e];
}
}));
}));
\ No newline at end of file
lib/view/createEquipment/deviceType/CommonDeviceCell.js
View file @ f878d562
......@@ -79,18 +79,6 @@ var CommonDeviceCell = function(e) {
})), a.state = {}, a;
}
return (0, _createClass2.default)(r, [ {
key: "componentWillMount",
value: function() {}
}, {
key: "componentDidMount",
value: function() {}
}, {
key: "componentWillReceiveProps",
value: function(e) {}
}, {
key: "componentWillUnmount",
value: function() {}
}, {
key: "render",
value: function() {
var e = this.props, t = e.type, r = e.deviceInfo;
......
lib/view/createEquipment/deviceType/CreateDeviceSearch.js
View file @ f878d562
......@@ -169,7 +169,7 @@ var Option = _amosAntd.Select.Option, dataTypeOption = (0, _DeviceLang.enums2arr
onPressEnter: this.searchData,
style: {
width: "150px",
"border-radius": "10px"
borderRadius: "10px"
}
}), _react.default.createElement("img", {
src: require("./../../../assets/iot/deviceManage/search.png"),
......
lib/view/deviceInterface/common/TableCard.js
View file @ f878d562
......@@ -94,8 +94,8 @@ var TableCard = function(e) {
title: a,
style: {
overflow: "hidden",
"text-overflow": "ellipsis",
"white-space": "nowrap"
textOverflow: "ellipsis",
whiteSpace: "nowrap"
}
}, "说  明：", a))));
}
......
lib/view/deviceInterface/common/searchBar.js
View file @ f878d562
......@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
value: !0
}), exports.default = void 0;
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")), _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireWildcard(require("react")), _propTypes = _interopRequireDefault(require("prop-types")), _amosAntd = require("amos-antd"), _FilterBtn = _interopRequireDefault(require("./FilterBtn"));
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")), _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireWildcard(require("react")), _propTypes = _interopRequireDefault(require("prop-types")), _amosFramework = require("amos-framework"), _FilterBtn = _interopRequireDefault(require("./FilterBtn"));
function _createSuper(e) {
var t = _isNativeReflectConstruct();
......@@ -90,12 +90,11 @@ var SearchBar = function(e) {
className: "search-bar"
}, _react.default.createElement("div", {
className: "search-input"
}, _react.default.createElement(_amosAntd.Input, {
}, _react.default.createElement(_amosFramework.Input, {
placeholder: "请输入搜索内容",
onFocus: this.showFilter,
onChange: this.onChange
}), _react.default.createElement(_amosAntd.Button, {
type: "primary",
}), _react.default.createElement(_amosFramework.Button, {
onClick: this.onSearch
}, "搜索"), _react.default.createElement("div", {
className: r,
......
lib/view/deviceInterface/privateInterface/AddEditInterfaceProperty.js
View file @ f878d562
......@@ -462,7 +462,7 @@ _InterfaceLang.enums2array)(_InterfaceEnum.dataTypeEnum).map((function(e) {
label: "是否必填: "
}), _react.default.createElement(_amosAntd.Checkbox, (0, _extends2.default)({}, i, {
style: {
"line-height": "31px",
lineHeight: "31px",
float: "left",
"margin-left": "7px"
}
......
lib/view/deviceManage/common/searchBar.js
View file @ f878d562
......@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
value: !0
}), exports.default = void 0;
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")), _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireWildcard(require("react")), _propTypes = _interopRequireDefault(require("prop-types")), _amosAntd = require("amos-antd"), _FilterBtn = _interopRequireDefault(require("./FilterBtn"));
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")), _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireWildcard(require("react")), _propTypes = _interopRequireDefault(require("prop-types")), _amosFramework = require("amos-framework"), _FilterBtn = _interopRequireDefault(require("./FilterBtn"));
function _createForOfIteratorHelper(e, t) {
var r = "undefined" != typeof Symbol && e[Symbol.iterator] || e["@@iterator"];
......@@ -182,12 +182,11 @@ var SearchBar = function(e) {
className: "search-bar"
}, _react.default.createElement("div", {
className: "search-input"
}, _react.default.createElement(_amosAntd.Input, {
}, _react.default.createElement(_amosFramework.Input, {
placeholder: "请输入搜索内容",
onFocus: this.showFilter,
onChange: this.onChange
}), _react.default.createElement(_amosAntd.Button, {
type: "primary",
}), _react.default.createElement(_amosFramework.Button, {
onClick: this.onSearch
}, "搜索"), _react.default.createElement("div", {
className: r,
......
lib/view/deviceManage/privateDevice/deviceAddEdit/AddEditCapacityProperty.js
View file @ f878d562
......@@ -539,7 +539,7 @@ _DeviceLang.enums2array)(_DeviceEnum.dataTypeEnum).map((function(e) {
label: "是否必填: "
}), _react.default.createElement(_amosAntd.Checkbox, (0, _extends2.default)({}, h, {
style: {
"line-height": "31px",
lineHeight: "31px",
float: "left",
"margin-left": "7px"
}
......
lib/view/deviceManage/privateDevice/deviceAddEdit/AddEditDeviceProperty.js
View file @ f878d562
......@@ -481,7 +481,7 @@ _DeviceLang.enums2array)(_DeviceEnum.dataTypeEnum).map((function(e) {
label: "是否必填: "
}), _react.default.createElement(_amosAntd.Checkbox, (0, _extends2.default)({}, s, {
style: {
"line-height": "31px",
lineHeight: "31px",
float: "left",
"margin-left": "7px"
}
......
lib/view/deviceProtocol/common/TableCard.js
View file @ f878d562
......@@ -98,8 +98,8 @@ var TableCard = function(e) {
title: l,
style: {
overflow: "hidden",
"text-overflow": "ellipsis",
"white-space": "nowrap"
textOverflow: "ellipsis",
whiteSpace: "nowrap"
}
}, "说  明：", l))));
}
......
lib/view/deviceProtocol/common/searchBar.js
View file @ f878d562
......@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
value: !0
}), exports.default = void 0;
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")), _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireWildcard(require("react")), _propTypes = _interopRequireDefault(require("prop-types")), _amosAntd = require("amos-antd"), _FilterBtn = _interopRequireDefault(require("./FilterBtn"));
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")), _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireWildcard(require("react")), _propTypes = _interopRequireDefault(require("prop-types")), _amosFramework = require("amos-framework"), _FilterBtn = _interopRequireDefault(require("./FilterBtn"));
function _createSuper(e) {
var t = _isNativeReflectConstruct();
......@@ -90,12 +90,11 @@ var SearchBar = function(e) {
className: "search-bar"
}, _react.default.createElement("div", {
className: "search-input"
}, _react.default.createElement(_amosAntd.Input, {
}, _react.default.createElement(_amosFramework.Input, {
placeholder: "请输入搜索内容",
onFocus: this.showFilter,
onChange: this.onChange
}), _react.default.createElement(_amosAntd.Button, {
type: "primary",
}), _react.default.createElement(_amosFramework.Button, {
onClick: this.onSearch
}, "搜索"), _react.default.createElement("div", {
className: r,
......
lib/view/historicalData/historyPanel/HistoryChartView.js
View file @ f878d562
......@@ -155,7 +155,7 @@ var setToolTip = function(e, t) {
var e = this.chartOptions();
return _react.default.createElement("div", {
className: "three-phase-view"
}, _react.default.createElement(_amosViz.LineCharts, {
}, _react.default.createElement(_amosViz.LineChart, {
lineOps: e,
shouldDispose: this.props.shouldDispose,
chartStyle: this.props.chartStyle
......
lib/view/recentAlarm/AlarmManageMent.js
View file @ f878d562
......@@ -89,7 +89,7 @@ var Option = _amosAntd.Select.Option, TabPane = _amosAntd.Tabs.TabPane, alarmLev
float: "right",
"background-color": "#E3E3E3",
height: "50px",
"line-height": "50px",
lineHeight: "50px",
"font-size": "16px"
}
}, u));
......@@ -109,7 +109,7 @@ var Option = _amosAntd.Select.Option, TabPane = _amosAntd.Tabs.TabPane, alarmLev
float: "right",
"background-color": "#E3E3E3",
height: "50px",
"line-height": "50px",
lineHeight: "50px",
"font-size": "16px"
}
}, o));
......@@ -120,7 +120,7 @@ var Option = _amosAntd.Select.Option, TabPane = _amosAntd.Tabs.TabPane, alarmLev
float: "right",
"background-color": "#E3E3E3",
height: "50px",
"line-height": "50px",
lineHeight: "50px",
"font-size": "16px"
}
}, c));
......@@ -130,7 +130,7 @@ var Option = _amosAntd.Select.Option, TabPane = _amosAntd.Tabs.TabPane, alarmLev
float: "right",
"background-color": "#E3E3E3",
height: "50px",
"line-height": "50px",
lineHeight: "50px",
"font-size": "16px"
}
}, "告警刷新时间:")), e.push(_react.default.createElement("div", {
......
lib/view/ruleDesign/ruleSetting/OutputNodeConfig.js
View file @ f878d562
......@@ -252,7 +252,7 @@ var maxPort = 65535, FormItem = _amosFramework.Form.Item, formItemLayout = {
return a.onSelectedChange(e);
},
style: {
"line-height": "31px",
lineHeight: "31px",
float: "left",
"margin-left": "7px"
}
......
lib/view/topoManage/common/cell/CommonDeviceCell.js
View file @ f878d562
......@@ -143,18 +143,6 @@ var createForm = _amosAntd.Form.create(), FormItem = _amosAntd.Form.Item, formIt
}, a;
}
return (0, _createClass2.default)(r, [ {
key: "componentWillMount",
value: function() {}
}, {
key: "componentDidMount",
value: function() {}
}, {
key: "componentWillReceiveProps",
value: function(e) {}
}, {
key: "componentWillUnmount",
value: function() {}
}, {
key: "render",
value: function() {
var e = this.props, t = e.type, r = e.subviewInfo, a = (0, this.props.form.getFieldProps)("newNodeName", {
......
lib/view/topoManage/topoView/AddView.js
View file @ f878d562
......@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
value: !0
}), exports.default = void 0;
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")), _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireWildcard(require("react")), _propTypes = _interopRequireDefault(require("prop-types")), _amosAntd = require("amos-antd"), _amosIcon = _interopRequireDefault(require("amos-icon")), _amosFramework = require("amos-framework");
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")), _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireWildcard(require("react")), _propTypes = _interopRequireDefault(require("prop-types")), _amosAntd = require("amos-antd"), _amosFramework = require("amos-framework"), _amosIcon = _interopRequireDefault(require("amos-icon"));
function _createSuper(e) {
var t = _isNativeReflectConstruct();
......@@ -123,7 +123,7 @@ var createForm = _amosAntd.Form.create(), FormItem = _amosAntd.Form.Item, formIt
}, _react.default.createElement(FormItem, (0, _extends2.default)({}, formItemLayout, {
hasFeedback: !0,
label: "视图名称: "
}), _react.default.createElement(_amosAntd.Input, (0, _extends2.default)({}, e, {
}), _react.default.createElement(_amosFramework.Input, (0, _extends2.default)({}, e, {
placeholder: "视图名称（支持1-20位非空格字符）"
}))))));
}
......
lib/view/topoManage/topoView/CapacityInterfacePanel.js
View file @ f878d562
......@@ -70,18 +70,18 @@ var Panel = _amosFramework.Collapse.Panel, collapseHeadHeight = 95, CapacityInte
offset: 1,
style: {
height: "30px",
"line-height": "30px",
"text-overflow": "ellipsis",
"white-space": "nowrap",
lineHeight: "30px",
textOverflow: "ellipsis",
whiteSpace: "nowrap",
overflow: "hidden"
}
}, t.displayName, "："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, a)));
})) : void 0 !== t && void 0 === l.cfgParamMap && t.map((function(t) {
......@@ -90,18 +90,18 @@ var Panel = _amosFramework.Collapse.Panel, collapseHeadHeight = 95, CapacityInte
offset: 1,
style: {
height: "30px",
"line-height": "30px",
"text-overflow": "ellipsis",
"white-space": "nowrap",
lineHeight: "30px",
textOverflow: "ellipsis",
whiteSpace: "nowrap",
overflow: "hidden"
}
}, t.displayName, "："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, t.valueStr)));
})), e;
......@@ -117,20 +117,20 @@ var Panel = _amosFramework.Collapse.Panel, collapseHeadHeight = 95, CapacityInte
span: 8,
offset: 1,
style: {
"text-align": "right",
textAlign: "right",
height: "30px",
"line-height": "30px",
"text-overflow": "ellipsis",
"white-space": "nowrap",
lineHeight: "30px",
textOverflow: "ellipsis",
whiteSpace: "nowrap",
overflow: "hidden"
}
}, t.displayName, "："), _react.default.createElement(_amosFramework.Col, {
span: 14,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement(_amosAntd.Input, {
style: {
......@@ -147,20 +147,20 @@ var Panel = _amosFramework.Collapse.Panel, collapseHeadHeight = 95, CapacityInte
span: 8,
offset: 1,
style: {
"text-align": "right",
textAlign: "right",
height: "30px",
"line-height": "30px",
"text-overflow": "ellipsis",
"white-space": "nowrap",
lineHeight: "30px",
textOverflow: "ellipsis",
whiteSpace: "nowrap",
overflow: "hidden"
}
}, t.displayName, "："), _react.default.createElement(_amosFramework.Col, {
span: 14,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement(_amosAntd.Input, {
style: {
......@@ -298,15 +298,15 @@ var Panel = _amosFramework.Collapse.Panel, collapseHeadHeight = 95, CapacityInte
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "名称："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, t.intfcName))))), _react.default.createElement(Panel, {
showArrow: !1,
......
lib/view/topoManage/topoView/ContextMenu.js
View file @ f878d562
......@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
value: !0
}), exports.default = void 0;
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireWildcard(require("react")), _propTypes = _interopRequireDefault(require("prop-types")), _dt2react = _interopRequireDefault(require("dt2react")), _amosAntd = require("amos-antd"), _AddView = _interopRequireDefault(require("./AddView")), _EditView = _interopRequireDefault(require("./EditView"));
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireWildcard(require("react")), _propTypes = _interopRequireDefault(require("prop-types")), _dt2react = _interopRequireDefault(require("dt2react")), _amosFramework = require("amos-framework"), _AddView = _interopRequireDefault(require("./AddView")), _EditView = _interopRequireDefault(require("./EditView"));
function _createSuper(e) {
var t = _isNativeReflectConstruct();
......@@ -89,7 +89,7 @@ var ContextMenu = function(e) {
editTreeData: n
})), _react.default.createElement("div", {
className: "contextMenu--option"
}, _react.default.createElement(_amosAntd.Button, {
}, _react.default.createElement(_amosFramework.Button, {
onClick: l
}, "删除视图")));
}
......
lib/view/topoManage/topoView/DeviceCapacityPanel.js
View file @ f878d562
......@@ -79,18 +79,18 @@ var Panel = _amosFramework.Collapse.Panel, collapseHeadHeight = 95, DeviceCapaci
span: 21,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px",
"text-overflow": "ellipsis",
"white-space": "nowrap",
lineHeight: "30px",
textOverflow: "ellipsis",
whiteSpace: "nowrap",
overflow: "hidden"
}
}, t.intfcName), _react.default.createElement(_amosFramework.Col, {
span: 2,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement("div", {
onClick: function(e) {
......@@ -113,18 +113,18 @@ var Panel = _amosFramework.Collapse.Panel, collapseHeadHeight = 95, DeviceCapaci
offset: 1,
style: {
height: "30px",
"line-height": "30px",
"text-overflow": "ellipsis",
"white-space": "nowrap",
lineHeight: "30px",
textOverflow: "ellipsis",
whiteSpace: "nowrap",
overflow: "hidden"
}
}, t.displayName, "："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, a)));
})) : void 0 !== t && void 0 === n.cfgParamMap && t.map((function(t) {
......@@ -133,18 +133,18 @@ var Panel = _amosFramework.Collapse.Panel, collapseHeadHeight = 95, DeviceCapaci
offset: 1,
style: {
height: "30px",
"line-height": "30px",
"text-overflow": "ellipsis",
"white-space": "nowrap",
lineHeight: "30px",
textOverflow: "ellipsis",
whiteSpace: "nowrap",
overflow: "hidden"
}
}, t.displayName, "："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, t.valueStr)));
})), e;
......@@ -163,20 +163,20 @@ var Panel = _amosFramework.Collapse.Panel, collapseHeadHeight = 95, DeviceCapaci
span: 8,
offset: 1,
style: {
"text-align": "right",
textAlign: "right",
height: "30px",
"line-height": "30px",
"text-overflow": "ellipsis",
"white-space": "nowrap",
lineHeight: "30px",
textOverflow: "ellipsis",
whiteSpace: "nowrap",
overflow: "hidden"
}
}, t.displayName, "："), _react.default.createElement(_amosFramework.Col, {
span: 14,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement(_amosAntd.Input, {
style: {
......@@ -195,20 +195,20 @@ var Panel = _amosFramework.Collapse.Panel, collapseHeadHeight = 95, DeviceCapaci
span: 8,
offset: 1,
style: {
"text-align": "right",
textAlign: "right",
height: "30px",
"line-height": "30px",
"text-overflow": "ellipsis",
"white-space": "nowrap",
lineHeight: "30px",
textOverflow: "ellipsis",
whiteSpace: "nowrap",
overflow: "hidden"
}
}, t.displayName, "："), _react.default.createElement(_amosFramework.Col, {
span: 14,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement(_amosAntd.Input, {
style: {
......@@ -349,45 +349,45 @@ var Panel = _amosFramework.Collapse.Panel, collapseHeadHeight = 95, DeviceCapaci
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "名称："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, t.name)), _react.default.createElement(_amosFramework.Row, null, _react.default.createElement(_amosFramework.Col, {
span: 4,
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "协议："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, r)), _react.default.createElement(_amosFramework.Row, null, _react.default.createElement(_amosFramework.Col, {
span: 4,
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "类型："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, (0, _DeviceLang.stringUtil)(_DeviceEnum.capacityClassifyEnum, parseInt(t.type))))))), _react.default.createElement(Panel, {
showArrow: !1,
......
lib/view/topoManage/topoView/DevicePropertyPanel.js
View file @ f878d562
......@@ -121,20 +121,20 @@ var createForm = _amosAntd.Form.create(), Panel = _amosFramework.Collapse.Panel,
span: 8,
offset: 1,
style: {
"text-align": "right",
textAlign: "right",
height: "30px",
"line-height": "30px",
"text-overflow": "ellipsis",
"white-space": "nowrap",
lineHeight: "30px",
textOverflow: "ellipsis",
whiteSpace: "nowrap",
overflow: "hidden"
}
}, e.displayName, "："), _react.default.createElement(_amosFramework.Col, {
span: 14,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement(_amosAntd.Input, {
style: {
......@@ -151,20 +151,20 @@ var createForm = _amosAntd.Form.create(), Panel = _amosFramework.Collapse.Panel,
span: 8,
offset: 1,
style: {
"text-align": "right",
textAlign: "right",
height: "30px",
"line-height": "30px",
"text-overflow": "ellipsis",
"white-space": "nowrap",
lineHeight: "30px",
textOverflow: "ellipsis",
whiteSpace: "nowrap",
overflow: "hidden"
}
}, e.displayName, "："), _react.default.createElement(_amosFramework.Col, {
span: 14,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement(_amosAntd.Input, {
style: {
......@@ -184,17 +184,17 @@ var createForm = _amosAntd.Form.create(), Panel = _amosFramework.Collapse.Panel,
offset: 1,
style: {
height: "30px",
"line-height": "30px",
"text-overflow": "ellipsis",
"white-space": "nowrap",
lineHeight: "30px",
textOverflow: "ellipsis",
whiteSpace: "nowrap",
overflow: "hidden",
"text-align": "left"
textAlign: "left"
}
}, e.name), _react.default.createElement(_amosFramework.Col, {
span: 2,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement("div", {
onClick: function(t) {
......@@ -354,13 +354,13 @@ var createForm = _amosAntd.Form.create(), Panel = _amosFramework.Collapse.Panel,
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "名称："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left"
textAlign: "left"
}
}, _react.default.createElement(_amosFramework.Editable, {
value: t,
......@@ -371,45 +371,45 @@ var createForm = _amosAntd.Form.create(), Panel = _amosFramework.Collapse.Panel,
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "型号："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, e.model)), _react.default.createElement(_amosFramework.Row, null, _react.default.createElement(_amosFramework.Col, {
span: 4,
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "类别："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, e ? (0, _DeviceLang.stringUtil)(_DeviceEnum.deviceCategoryEnum, parseInt(e.type)) : "")), _react.default.createElement(_amosFramework.Row, null, _react.default.createElement(_amosFramework.Col, {
span: 4,
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "备注："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, e.descr))))), _react.default.createElement(Panel, {
showArrow: !1,
......
lib/view/topoManage/topoView/TopoTree.js
View file @ f878d562
This diff is collapsed.
lib/view/topoManage/topoView/TopoView.js
View file @ f878d562
......@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
value: !0
}), exports.default = void 0;
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")), _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireWildcard(require("react")), _propTypes = _interopRequireDefault(require("prop-types")), _processor = require("../../../utils/processor"), _urlConsts = require("../../../consts/urlConsts"), _amosAntd = require("amos-antd"), _amosFramework = require("amos-framework"), _TopoTree = _interopRequireDefault(require("./TopoTree")), _topoMangent = _interopRequireDefault(require("./topoMangent"));
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")), _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireWildcard(require("react")), _propTypes = _interopRequireDefault(require("prop-types")), _amosFramework = require("amos-framework"), _processor = require("../../../utils/processor"), _urlConsts = require("../../../consts/urlConsts"), _TopoTree = _interopRequireDefault(require("./TopoTree")), _topoMangent = _interopRequireDefault(require("./topoMangent"));
function _createSuper(e) {
var t = _isNativeReflectConstruct();
......
lib/view/topoManage/topoView/equipmentChoose/ChooseEquipmentPanel.js
View file @ f878d562
......@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
value: !0
}), exports.default = void 0;
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireWildcard(require("react")), _propTypes = _interopRequireDefault(require("prop-types")), _amosAntd = require("amos-antd"), _amosIcon = _interopRequireDefault(require("amos-icon")), _urlConsts = _interopRequireDefault(require("../../../../consts/urlConsts")), _amosFramework = require("amos-framework"), _processor = require("../../../../utils/processor"), _SearchBar = _interopRequireDefault(require("./../../common/SearchBar")), _DeviceEnum = require("./../../../deviceManage/common/DeviceEnum"), _DeviceLang = require("./../../../deviceManage/common/DeviceLang");
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireWildcard(require("react")), _propTypes = _interopRequireDefault(require("prop-types")), _amosAntd = require("amos-antd"), _amosIcon = _interopRequireDefault(require("amos-icon")), _amosFramework = require("amos-framework"), _urlConsts = _interopRequireDefault(require("../../../../consts/urlConsts")), _processor = require("../../../../utils/processor"), _SearchBar = _interopRequireDefault(require("./../../common/SearchBar")), _DeviceEnum = require("./../../../deviceManage/common/DeviceEnum"), _DeviceLang = require("./../../../deviceManage/common/DeviceLang");
function _createSuper(e) {
var t = _isNativeReflectConstruct();
......
lib/view/topoManage/topoView/topoleft/AddView.js
View file @ f878d562
......@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
value: !0
}), exports.default = void 0;
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")), _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireWildcard(require("react")), _propTypes = _interopRequireDefault(require("prop-types")), _amosAntd = require("amos-antd");
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")), _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireWildcard(require("react")), _propTypes = _interopRequireDefault(require("prop-types")), _amosAntd = require("amos-antd"), _amosFramework = require("amos-framework");
function _createSuper(e) {
var t = _isNativeReflectConstruct();
......@@ -94,7 +94,7 @@ var createForm = _amosAntd.Form.create(), FormItem = _amosAntd.Form.Item, formIt
}, _react.default.createElement(FormItem, (0, _extends2.default)({}, formItemLayout, {
hasFeedback: !0,
label: "视图名称: "
}), _react.default.createElement(_amosAntd.Input, (0, _extends2.default)({}, a, {
}), _react.default.createElement(_amosFramework.Input, (0, _extends2.default)({}, a, {
placeholder: "视图名称（支持1-20位非空格字符）"
}))))));
}
......
lib/view/topoManage/topoView/topoleft/ContextMenu.js
View file @ f878d562
......@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
value: !0
}), exports.default = void 0;
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireWildcard(require("react")), _propTypes = _interopRequireDefault(require("prop-types")), _dt2react = _interopRequireDefault(require("dt2react")), _amosAntd = require("amos-antd"), _AddView = _interopRequireDefault(require("./AddView")), _EditView = _interopRequireDefault(require("./EditView"));
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireWildcard(require("react")), _propTypes = _interopRequireDefault(require("prop-types")), _dt2react = _interopRequireDefault(require("dt2react")), _amosFramework = require("amos-framework"), _AddView = _interopRequireDefault(require("./AddView")), _EditView = _interopRequireDefault(require("./EditView"));
function _createSuper(e) {
var t = _isNativeReflectConstruct();
......@@ -89,7 +89,7 @@ var ContextMenu = function(e) {
editTreeData: n
})), _react.default.createElement("div", {
className: "contextMenu--option"
}, _react.default.createElement(_amosAntd.Button, {
}, _react.default.createElement(_amosFramework.Button, {
onClick: l
}, "删除视图")));
}
......
lib/view/topoManage/topoView/topoleft/TopoTree.js
View file @ f878d562
......@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
value: !0
}), exports.default = void 0;
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")), _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireWildcard(require("react")), _propTypes = _interopRequireDefault(require("prop-types")), _amosAntd = require("amos-antd"), _amosIcon = _interopRequireDefault(require("amos-icon")), _dt2react = _interopRequireDefault(require("dt2react")), _processor = require("../../../../utils/processor"), _urlConsts = _interopRequireDefault(require("../../../../consts/urlConsts")), _amosFramework = require("amos-framework"), _TreeHeader = _interopRequireDefault(require("./../header/TreeHeader")), _AddView = _interopRequireDefault(require("./AddView")), _ContextMenu = _interopRequireDefault(require("./ContextMenu")), _userConfig = require("./../../../../utils/userConfig");
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")), _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireWildcard(require("react")), _propTypes = _interopRequireDefault(require("prop-types")), _amosAntd = require("amos-antd"), _amosIcon = _interopRequireDefault(require("amos-icon")), _dt2react = _interopRequireDefault(require("dt2react")), _amosFramework = require("amos-framework"), _processor = require("../../../../utils/processor"), _urlConsts = _interopRequireDefault(require("../../../../consts/urlConsts")), _TreeHeader = _interopRequireDefault(require("./../header/TreeHeader")), _AddView = _interopRequireDefault(require("./AddView")), _ContextMenu = _interopRequireDefault(require("./ContextMenu")), _userConfig = require("./../../../../utils/userConfig");
function _createSuper(e) {
var t = _isNativeReflectConstruct();
......@@ -152,7 +152,7 @@ var TreeNode = _amosAntd.Tree.TreeNode, loop = function e(t, r, a) {
} ]
});
})), (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(a), "nodeRightClick", (function(e) {
a.refs.contextMenu.showMenu(e.event, e.node.props.eventKey);
a.contextMenuRef.showMenu(e.event, e.node.props.eventKey);
})), (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(a), "toggleView", (function() {
var e = arguments.length > 0 && void 0 !== arguments[0] && arguments[0];
a.setState({
......@@ -375,7 +375,9 @@ var TreeNode = _amosAntd.Tree.TreeNode, loop = function e(t, r, a) {
onDelClick: this.delView,
currentNode: s,
editTreeData: this.editTreeData,
ref: "contextMenu"
ref: function(t) {
return e.contextMenuRef = t;
}
})), _react.default.createElement(_AddView.default, {
visible: a,
selectedKeys: n,
......
lib/view/topoManage/topoView/toporight/demofile/CapacityInterfacePanel.js
View file @ f878d562
......@@ -67,15 +67,15 @@ var CapacityInterfacePanel = function(e) {
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "设备ID", "："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement(_amosAntd.Input, {
style: {
......@@ -87,15 +87,15 @@ var CapacityInterfacePanel = function(e) {
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "帧类型", "："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement(_amosAntd.Input, {
style: {
......@@ -114,15 +114,15 @@ var CapacityInterfacePanel = function(e) {
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, t.displayName, "："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement(_amosAntd.Input, {
style: {
......@@ -139,15 +139,15 @@ var CapacityInterfacePanel = function(e) {
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, t.displayName, "："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement(_amosAntd.Input, {
style: {
......@@ -255,15 +255,15 @@ var CapacityInterfacePanel = function(e) {
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "名称："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement(_amosAntd.Input, {
style: {
......
lib/view/topoManage/topoView/toporight/demofile/DeviceCapacityPanel.js
View file @ f878d562
......@@ -80,15 +80,15 @@ var DeviceCapacityPanel = function(e) {
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "采集压力"), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement("div", {
onClick: function(e) {
......@@ -106,15 +106,15 @@ var DeviceCapacityPanel = function(e) {
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "采集GPS"), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement("div", {
onClick: function(e) {
......@@ -135,15 +135,15 @@ var DeviceCapacityPanel = function(e) {
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "压力", "："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement(_amosAntd.Input, {
style: {
......@@ -155,15 +155,15 @@ var DeviceCapacityPanel = function(e) {
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "经度", "："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement(_amosAntd.Input, {
style: {
......@@ -175,15 +175,15 @@ var DeviceCapacityPanel = function(e) {
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "纬度", "："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement(_amosAntd.Input, {
style: {
......@@ -319,15 +319,15 @@ var DeviceCapacityPanel = function(e) {
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "名称："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement(_amosAntd.Input, {
style: {
......@@ -339,15 +339,15 @@ var DeviceCapacityPanel = function(e) {
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "协议："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement(_amosAntd.Input, {
style: {
......@@ -359,15 +359,15 @@ var DeviceCapacityPanel = function(e) {
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "类型："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement(_amosAntd.Input, {
style: {
......
lib/view/topoManage/topoView/toporight/demofile/DevicePropertyPanel.js
View file @ f878d562
......@@ -109,15 +109,15 @@ var createForm = _amosAntd.Form.create(), FormItem = _amosAntd.Form.Item, formIt
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "编码："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement(_amosAntd.Input, {
style: {
......@@ -129,15 +129,15 @@ var createForm = _amosAntd.Form.create(), FormItem = _amosAntd.Form.Item, formIt
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "端口："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement(_amosAntd.Input, {
style: {
......@@ -154,15 +154,15 @@ var createForm = _amosAntd.Form.create(), FormItem = _amosAntd.Form.Item, formIt
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, e.name, "："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement(_amosAntd.Input, {
style: {
......@@ -179,15 +179,15 @@ var createForm = _amosAntd.Form.create(), FormItem = _amosAntd.Form.Item, formIt
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, e.name, "："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement(_amosAntd.Input, {
style: {
......@@ -207,15 +207,15 @@ var createForm = _amosAntd.Form.create(), FormItem = _amosAntd.Form.Item, formIt
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "经纬度"), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement("div", {
onClick: function(e) {
......@@ -234,15 +234,15 @@ var createForm = _amosAntd.Form.create(), FormItem = _amosAntd.Form.Item, formIt
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "压力"), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement("div", {
onClick: function(e) {
......@@ -351,13 +351,13 @@ var createForm = _amosAntd.Form.create(), FormItem = _amosAntd.Form.Item, formIt
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "名称："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left"
textAlign: "left"
}
}, _react.default.createElement(_amosAntd.Input, {
style: {
......@@ -369,15 +369,15 @@ var createForm = _amosAntd.Form.create(), FormItem = _amosAntd.Form.Item, formIt
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "型号："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement(_amosAntd.Input, {
style: {
......@@ -389,15 +389,15 @@ var createForm = _amosAntd.Form.create(), FormItem = _amosAntd.Form.Item, formIt
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "类别："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement(_amosAntd.Input, {
style: {
......@@ -409,15 +409,15 @@ var createForm = _amosAntd.Form.create(), FormItem = _amosAntd.Form.Item, formIt
offset: 1,
style: {
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, "备注："), _react.default.createElement(_amosFramework.Col, {
span: 18,
offset: 1,
style: {
"text-align": "left",
textAlign: "left",
height: "30px",
"line-height": "30px"
lineHeight: "30px"
}
}, _react.default.createElement(_amosAntd.Input, {
style: {
......
lib/view/zonglan/home/statistics/Alarm.js
View file @ f878d562
......@@ -78,7 +78,7 @@ var Alarm = function(e) {
className: "overview-item-chart"
}, _react.default.createElement("div", {
className: "overview-alarm-chart"
}, _react.default.createElement(_echarts.PieCharts, {
}, _react.default.createElement(_echarts.PieChart, {
pieOps: (0, _AlarmData.option)(a, l, i),
chartStyle: {
width: "100%",
......
lib/view/zonglan/home/statistics/EquipInterface.js
View file @ f878d562
......@@ -78,7 +78,7 @@ var num = 20, EquipInterface = function(e) {
className: "overview-item-chart"
}, _react.default.createElement("div", {
className: "overview-prototypeequip-chart"
}, _react.default.createElement(_echarts.PieCharts, {
}, _react.default.createElement(_echarts.PieChart, {
pieOps: o,
chartStyle: {
width: "100%",
......
lib/view/zonglan/home/statistics/EquipProtocol.js
View file @ f878d562
......@@ -78,7 +78,7 @@ var num = 20, EquipProtocol = function(e) {
className: "overview-item-chart"
}, _react.default.createElement("div", {
className: "overview-prototypeequip-chart"
}, _react.default.createElement(_echarts.PieCharts, {
}, _react.default.createElement(_echarts.PieChart, {
pieOps: _EquipProtocolData.option,
chartStyle: {
width: "100%",
......
lib/view/zonglan/home/statistics/PrototypeEquip.js
View file @ f878d562
......@@ -78,7 +78,7 @@ var PrototypeEquip = function(e) {
className: "overview-item-chart"
}, _react.default.createElement("div", {
className: "overview-prototypeequip-chart"
}, _react.default.createElement(_echarts.PieCharts, {
}, _react.default.createElement(_echarts.PieChart, {
pieOps: (0, _PrototypeEquipData.option)(a, i),
chartStyle: {
width: "100%",
......
lib/view/zonglan/home/statistics/Task.js
View file @ f878d562
......@@ -77,7 +77,7 @@ var AccountInfo = function(e) {
className: "overview-item-chart"
}, _react.default.createElement("div", {
className: "overview-task-item"
}, _react.default.createElement(_echarts.PieCharts, {
}, _react.default.createElement(_echarts.PieChart, {
pieOps: i,
chartStyle: {
width: "100%",
......@@ -86,7 +86,7 @@ var AccountInfo = function(e) {
eventpool: o
})), _react.default.createElement("div", {
className: "overview-task-item"
}, _react.default.createElement(_echarts.PieCharts, {
}, _react.default.createElement(_echarts.PieChart, {
pieOps: t,
chartStyle: {
width: "100%",
......@@ -95,7 +95,7 @@ var AccountInfo = function(e) {
eventpool: o
})), _react.default.createElement("div", {
className: "overview-task-item"
}, _react.default.createElement(_echarts.PieCharts, {
}, _react.default.createElement(_echarts.PieChart, {
pieOps: r,
chartStyle: {
width: "100%",
......@@ -104,7 +104,7 @@ var AccountInfo = function(e) {
eventpool: o
})), _react.default.createElement("div", {
className: "overview-task-item"
}, _react.default.createElement(_echarts.PieCharts, {
}, _react.default.createElement(_echarts.PieChart, {
pieOps: a,
chartStyle: {
width: "100%",
......
lib/view/zonglan/home/statistics/TubeEquipNum.js
View file @ f878d562
......@@ -84,7 +84,7 @@ var TubeEquipNum = function(e) {
className: "overview-item-chart"
}, _react.default.createElement("div", {
className: "overview-tubeequipnum-left"
}, _react.default.createElement(_echarts.PieCharts, {
}, _react.default.createElement(_echarts.PieChart, {
pieOps: (0, _TubeEquipNumData.option)(t, r, u),
chartStyle: {
width: "100%",
......@@ -92,7 +92,7 @@ var TubeEquipNum = function(e) {
}
})), _react.default.createElement("div", {
className: "overview-tubeequipnum-right"
}, _react.default.createElement(_echarts.PieCharts, {
}, _react.default.createElement(_echarts.PieChart, {
pieOps: (0, _TubeEquipNumData.option2)(i, a, o, n, s),
chartStyle: {
width: "100%",
......
package.json
View file @ f878d562
......@@ -12,8 +12,8 @@
"build": "set NODE_ENV=production && npm run clean && webpack",
"themes": "amos-run themes",
"themes-watch": "amos-run themes-watch",
"start": "set NODE_ENV=development && nodemon --exec \"webpack-dev-server\"",
"start2": "set NODE_ENV=development && webpack-dev-server",
"start": "set NODE_ENV=development && webpack-dev-server",
"start2": "set NODE_ENV=development && nodemon --exec \"webpack-dev-server\"",
"startDev": "set NODE_ENV=development && webpack-dev-server --config webpack.config.dev.js",
"compile:dev": "set NODE_ENV=development && npm run clean && webpack --config webpack.config.dev.js",
"compile:pro": "set NODE_ENV=production && npm run clean && webpack --config webpack.config.prod.js",
......@@ -23,8 +23,8 @@
"stylelint": "stylelint src",
"zip": "amos-run released2zip",
"pub:dev": "npm run compile:dev && amos-run dllreleased",
"pub": "set NODE_ENV=production && npm run clean && ray-build react && ray-build stylescss && npm publish",
"pub:build": "npm run build:pro && amos-run dllreleased",
"pub": "set NODE_ENV=production && npm run clean && ray-build react && ray-build stylescss && npm publish",
"precommit": "lint-staged"
},
"lint-staged": {
......
src/entry/index.js
View file @ f878d562
......@@ -14,12 +14,11 @@ import { syncHistoryWithStore } from 'react-router-redux';
import { browerSupport, consts, Store, LocationParam } from 'amos-tool';
import { DownloadBrowsers, AmosAlert } from 'amos-framework';
import * as endConf from 'amos-processor/lib/config/endconf';
import SysConsts from 'amos-processor/lib/config/consts';
// import 'amos-security/lib/style';
import rootRoutes from './../routes';
import configureStore from './../store';
import { getSystemAllMenu } from '../services/securityService';
import SysConsts from 'amos-processor/lib/config/consts';
// import { loginAuth } from 'amos-security/lib/model/auth';
......@@ -33,12 +32,11 @@ const AmosConfig = endConf.AmosConfig;
const loginURI = AmosConfig.httpURI.loginURI;
const history = syncHistoryWithStore(browserHistory, store);
const support = browerSupport([ 'firefox/', 'chrome/' ], {
const support = browerSupport(['firefox/', 'chrome/'], {
'firefox/': { limit: consts.GREATER_EQUAL, version: 50 },
'chrome/': { limit: consts.GREATER_EQUAL, version: 55 }
});
class App extends Component {
constructor(props) {
super(props);
......@@ -48,7 +46,6 @@ class App extends Component {
};
}
componentWillMount() {
let token = LocationParam.getLocationParamByName('token');
if (!token) {
......@@ -59,7 +56,7 @@ class App extends Component {
}
this.setState({ rootRoutes: rootRoutes(systemMenu), visible: true });
return;
}else{
} else {
lsTool.write(SysConsts.token, token);
}
getSystemAllMenu(token).then(
......@@ -88,7 +85,7 @@ class App extends Component {
filterSystemMenus = (menus = []) => {
return menus.filter(menu => menu.permissionType === 'MENU');
}
};
render() {
if (this.state.visible) {
......
src/entry/index.prod.js
View file @ f878d562
......@@ -14,11 +14,11 @@ import { syncHistoryWithStore } from 'react-router-redux';
import { browerSupport, consts, Store, LocationParam } from 'amos-tool';
import { DownloadBrowsers, AmosAlert } from 'amos-framework';
import * as endConf from 'amos-processor/lib/config/endconf';
import SysConsts from 'amos-processor/lib/config/consts';
// import 'amos-security/lib/style';
import rootRoutes from './../routes/asyncRoutes';
import configureStore from './../store';
import { getSystemAllMenu } from '../services/securityService';
import SysConsts from 'amos-processor/lib/config/consts';
// import { loginAuth } from 'amos-security/lib/model/auth';
......@@ -32,12 +32,11 @@ const AmosConfig = endConf.AmosConfig;
const loginURI = AmosConfig.httpURI.loginURI;
const history = syncHistoryWithStore(browserHistory, store);
const support = browerSupport([ 'firefox/', 'chrome/' ], {
const support = browerSupport(['firefox/', 'chrome/'], {
'firefox/': { limit: consts.GREATER_EQUAL, version: 50 },
'chrome/': { limit: consts.GREATER_EQUAL, version: 55 }
});
class App extends Component {
constructor(props) {
super(props);
......@@ -47,7 +46,6 @@ class App extends Component {
};
}
componentWillMount() {
let token = LocationParam.getLocationParamByName('token');
if (!token) {
......@@ -58,7 +56,7 @@ class App extends Component {
}
this.setState({ rootRoutes: rootRoutes(systemMenu), visible: true });
return;
}else{
} else {
lsTool.write(SysConsts.token, token);
}
......@@ -88,7 +86,7 @@ class App extends Component {
filterSystemMenus = (menus = []) => {
return menus.filter(menu => menu.permissionType === 'MENU');
}
};
render() {
if (this.state.visible) {
......
src/index.js
View file @ f878d562
......@@ -40,4 +40,4 @@ export const initPluginsConfig = ({
};
};
export default plugView;
\ No newline at end of file
export default plugView;
src/routes/asyncRoutes.js
View file @ f878d562
......@@ -19,20 +19,20 @@ const progressStart = () => {
RProgress.start();
};
const injectRoutes = (menus) => {
const injectRoutes = menus => {
const mainChilds = addCustomRoutes(calcRoutes(menus, pageCompontent));
const routes = [
{ path: 'login', component: AsyncLogin },
{ path: 'region', component: AsyncRegionList }, // 区域选择
// ...signUp,
{
path: 'main' ,
path: 'main',
component: AsyncRootView,
// indexRoute: {
// component: AsyncOverview
// },
childRoutes: [...mainChilds]
},
}
// notFound,
// redirect
];
......@@ -48,7 +48,7 @@ const injectRoutes = (menus) => {
// callback();
// };
const rootRoutes = (menus) => {
const rootRoutes = menus => {
return {
path: '/',
// onEnter: onEnterValidate,
......@@ -58,8 +58,8 @@ const rootRoutes = (menus) => {
indexRoute: {
onEnter(nextState, replace) {
// replace('/main');
// replace('/login');
window.location.href = loginURI;
replace('/login');
// window.location.href = loginURI;
}
},
childRoutes: injectRoutes(menus)
......
src/routes/index.js
View file @ f878d562
......@@ -14,20 +14,20 @@ import pageCompontent, { RootView, Login, RegionList } from './view';
const AmosConfig = endConf.AmosConfig;
const loginURI = AmosConfig.httpURI.loginURI;
const injectRoutes = (menus) => {
const injectRoutes = menus => {
const mainChilds = addCustomRoutes(calcRoutes(menus, pageCompontent));
const routes = [
{ path: 'login', component: Login },
{ path: 'region', component: RegionList }, // 区域选择
// ...signUp,
{
path: 'main' ,
path: 'main',
component: RootView,
// indexRoute: {
// component: Overview
// },
childRoutes: [...mainChilds ]
},
childRoutes: [...mainChilds]
}
// notFound,
// redirect
];
......@@ -47,7 +47,7 @@ const progressStart = () => {
RProgress.start();
};
const rootRoutes = (menus) => {
const rootRoutes = menus => {
return {
path: '/',
// onEnter: onEnterValidate,
......
src/styles/view/biz/login.scss
View file @ f878d562
......@@ -6,7 +6,7 @@ $btn-border-color: #173B97;
.login-content {
width: 100%;
height: 99.7%;
background: url("/src/assets/auth/login-bg.png") no-repeat;
background: url("../../assets/auth/login-bg.png") no-repeat;
background-size: cover;
border-bottom: 3px solid #3139C7;
......@@ -18,7 +18,7 @@ $btn-border-color: #173B97;
display: inline-block;
width: 62%;
height: 100%;
background: url("/src/assets/auth/login-desc.png") no-repeat;
background: url("../../assets/auth/login-desc.png") no-repeat;
background-size: 100% 100%;
.login-language-bottom {
......@@ -59,7 +59,7 @@ $btn-border-color: #173B97;
.signup-container {
width: 100%;
height: 99.7%;
background: url("/src/assets/auth/login-bg.png") no-repeat;
background: url("../../assets/auth/login-bg.png") no-repeat;
background-size: cover;
border-bottom: 3px solid #3139C7;
......
src/utils/processor.js
View file @ f878d562
// import * as _fetch from 'amos-processor/lib/fetch';
import { AmosFetch as oaf, XssAmosFetch as oxaf } from 'amos-processor';
import * as utils from 'amos-processor/lib/utils';
import AmosEnum from 'amos-processor/lib/enum/AmosEnum';
import * as permission from 'amos-processor/lib/config/permission';
import { utils as toolUtils, Store } from 'amos-tool';
import sysConsts from 'amos-processor/lib/config';
export * from 'amos-processor/lib/utils';
export * from 'amos-processor/lib/config/permission';
const lsTool = Store.lsTool;
const defaultHeaders = () => {
return window.isIotPluginsToAmos ? window.iotRequestInfo.staticHeader : {
appKey: 'AMOS_IOT',
product: 'AMOS_IOT_WEB'
};
}
return window.isIotPluginsToAmos
? window.iotRequestInfo.staticHeader
: {
appKey: 'AMOS_IOT',
product: 'AMOS_IOT_WEB'
};
};
export default{
export {
// ..._fetch,
...utils,
AmosEnum,
...permission
AmosEnum
};
export function getToken(){
export function getToken() {
return lsTool.read(sysConsts.token);
}
......@@ -37,7 +39,7 @@ export const AmosFetch = {
headers: {
...defaultHeaders(),
token: getToken()
},
}
// ÆôÓà cookie£¬ `include, same-origin, *omit`
// credentials: 'include'
},
......
src/view/common/filterOptions/communityOptionsFilter.js
View file @ f878d562
......@@ -85,9 +85,7 @@ class CommunityOptionsFilter extends Component {
}
render() {
return (
this.AllCommunityOptionFunc()
);
return this.AllCommunityOptionFunc();
}
}
......
src/view/common/utils/processor.js
View file @ f878d562
import * as _fetch from 'amos-processor/lib/fetch';
import * as utils from 'amos-processor/lib/utils';
import AmosEnum from 'amos-processor/lib/enum/AmosEnum';
/**
......@@ -11,11 +10,11 @@ import AmosEnum from 'amos-processor/lib/enum/AmosEnum';
* checkHomePermissions,
* getSubSystemPermissions
*/
import * as permission from 'amos-processor/lib/config/permission';
export * from 'amos-processor/lib/config/permission';
export * from 'amos-processor/lib/fetch';
export * from 'amos-processor/lib/utils';
export default{
..._fetch,
...utils,
AmosEnum,
...permission
export {
AmosEnum
};
src/view/createEquipment/deviceType/CreateDeviceSearch.js
View file @ f878d562
......@@ -138,11 +138,11 @@ class CreateDeviceSearch extends Component {
placeholder='型号'
allowClear
>
{modelOptions}
{modelOptions}
</Select>
</div>
<div className='search-device'>
<Input placeholder="请输入搜索内容" onChange={this.onChange} onPressEnter={this.searchData} style={{ width: '150px','border-radius': '10px' }} />
<Input placeholder="请输入搜索内容" onChange={this.onChange} onPressEnter={this.searchData} style={{ width: '150px',borderRadius: '10px' }} />
<img src={require('./../../../assets/iot/deviceManage/search.png')} alt='' onClick={this.searchData} />
</div>
</div>
......
src/view/deviceInterface/common/TableCard.js
View file @ f878d562
......@@ -65,7 +65,7 @@ class TableCard extends Component {
<Card title={protocolName} extra={this.extraBtn()} >
<div onClick={this.showDetail} >
<p title={comMethod}>通讯方式：{comMethod}</p>
<p title={info} style={{ 'overflow': 'hidden','text-overflow': 'ellipsis','white-space': 'nowrap' }}>说&emsp;&emsp;明：{info}</p>
<p title={info} style={{ 'overflow': 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap' }}>说&emsp;&emsp;明：{info}</p>
</div>
</Card>
</div>
......
src/view/deviceInterface/common/searchBar.js
View file @ f878d562
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { Input,Button } from 'amos-antd';
import { Input, Button } from 'amos-framework';
import FilterBtn from './FilterBtn';
/**
......@@ -72,7 +72,7 @@ class SearchBar extends Component {
<div className='search-bar'>
<div className='search-input'>
<Input placeholder="请输入搜索内容" onFocus={this.showFilter} onChange={this.onChange} />
<Button type='primary' onClick={this.onSearch}>搜索</Button>
<Button onClick={this.onSearch}>搜索</Button>
<div className={modalStyle} onClick={this.hidFilter} />
<div className={filterStyle} >
<FilterBtn filterOnChange={this.filterOnChange} {...this.props} />
......
src/view/deviceInterface/privateInterface/AddEditInterfaceProperty.js
View file @ f878d562
......@@ -580,7 +580,7 @@ class AddEditInterfaceProperty extends Component {
//是否必填
const disRequiredProps = getFieldProps('isRequired', {
initialValue: propertyInfo ?propertyInfo.isRequired : false,
valuePropName: 'checked',
valuePropName: 'checked',
rules: [
]
......@@ -618,7 +618,7 @@ class AddEditInterfaceProperty extends Component {
<FormItem {...formItemLayout} hasFeedback label='是否必填: ' >
<Checkbox
{...disRequiredProps}
style={{ 'line-height': '31px',float: 'left','margin-left': '7px' }}
style={{ lineHeight: '31px',float: 'left','margin-left': '7px' }}
/>
</FormItem>
<FormItem wrapperCol={{
......
src/view/deviceManage/common/searchBar.js
View file @ f878d562
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { Input,Button } from 'amos-antd';
import { Input, Button } from 'amos-framework';
import FilterBtn from './FilterBtn';
/**
......@@ -11,55 +11,51 @@ class SearchBar extends Component {
super(props);
this.state = {
filterDisplay: 'hide-div',
//搜索名称
// 搜索名称
inputName: '',
//选择的筛选条件，格式为filterList: [{name: 'dicIdCommMode',type: 'IN',value: filterList}]
// 选择的筛选条件，格式为filterList: [{name: 'dicIdCommMode',type: 'IN',value: filterList}]
filterList: {}
};
}
//点击搜索
onSearch = (values) => {
let { inputName,filterList } = this.state;
// 点击搜索
onSearch = values => {
let { inputName, filterList } = this.state;
let criterias = {};
if (inputName.length !== 0){
if (inputName.length !== 0) {
criterias.name = inputName;
}
if (filterList.types !== undefined && filterList.types.length !== 0)
{
if (filterList.types !== undefined && filterList.types.length !== 0) {
criterias.types = filterList.types;
}
if (filterList.protocolIds !== undefined && filterList.protocolIds.length !== 0)
{
if (filterList.protocolIds !== undefined && filterList.protocolIds.length !== 0) {
criterias.protocolIds = filterList.protocolIds;
}
if (filterList.commIds !== undefined && filterList.commIds.length !== 0)
{
if (filterList.commIds !== undefined && filterList.commIds.length !== 0) {
criterias.commIds = filterList.commIds;
}
if (filterList.industryIds !== undefined && filterList.industryIds.length !== 0)
{
if (filterList.industryIds !== undefined && filterList.industryIds.length !== 0) {
criterias.industryIds = filterList.industryIds;
}
this.props.handleCriterias(criterias);
}
};
onChange = (e) => {
onChange = e => {
this.setState({ inputName: e.target.value.trim() });
}
};
//显示筛选栏
// 显示筛选栏
showFilter = () => {
this.setState({ filterDisplay: 'show-div' });
}
};
//隐藏筛选栏
// 隐藏筛选栏
hidFilter = () => {
this.setState({ filterDisplay: 'hide-div' });
}
};
obilityValueChange = (obilitySelectedOption) => {
obilityValueChange = obilitySelectedOption => {
let { filterList } = this.state;
let types = [];
for (let option of obilitySelectedOption) {
......@@ -67,9 +63,9 @@ class SearchBar extends Component {
}
filterList.types = types;
this.setState(filterList);
}
};
protocolValueChange = (protocolSelectedOption) => {
protocolValueChange = protocolSelectedOption => {
let { filterList } = this.state;
let protocolIds = [];
for (let option of protocolSelectedOption) {
......@@ -77,9 +73,9 @@ class SearchBar extends Component {
}
filterList.protocolIds = protocolIds;
this.setState(filterList);
}
};
communityValueChange = (communitySelectedOption) => {
communityValueChange = communitySelectedOption => {
let { filterList } = this.state;
let commIds = [];
for (let option of communitySelectedOption) {
......@@ -87,9 +83,9 @@ class SearchBar extends Component {
}
filterList.commIds = commIds;
this.setState(filterList);
}
};
industryValueChange = (industrySelectedOption) => {
industryValueChange = industrySelectedOption => {
let { filterList } = this.state;
let industryIds = [];
for (let option of industrySelectedOption) {
......@@ -97,24 +93,26 @@ class SearchBar extends Component {
}
filterList.industryIds = industryIds;
this.setState(filterList);
}
};
render() {
let { filterDisplay } = this.state;
let filterStyle = `search-filter ${filterDisplay}`;
let modalStyle = `modal-box ${filterDisplay}`;
return (
<div className='search-bar'>
<div className='search-input'>
<div className="search-bar">
<div className="search-input">
<Input placeholder="请输入搜索内容" onFocus={this.showFilter} onChange={this.onChange} />
<Button type='primary' onClick={this.onSearch}>搜索</Button>
<Button onClick={this.onSearch}>
搜索
</Button>
<div className={modalStyle} onClick={this.hidFilter} />
<div className={filterStyle} >
<div className={filterStyle}>
<FilterBtn
obilityValueChange={this.obilityValueChange}
protocolValueChange={this.protocolValueChange}
communityValueChange={this.communityValueChange}
industryValueChange = {this.industryValueChange}
industryValueChange={this.industryValueChange}
{...this.props}
/>
</div>
......@@ -127,7 +125,7 @@ class SearchBar extends Component {
SearchBar.propTypes = {
handleCriterias: PropTypes.func,
communityOptions: PropTypes.array,
equiptemplateIndustryOptions:PropTypes.array,
equiptemplateIndustryOptions: PropTypes.array,
flag: PropTypes.string
};
......
src/view/deviceManage/privateDevice/deviceAddEdit/AddEditCapacityProperty.js
View file @ f878d562
......@@ -737,7 +737,7 @@ class AddEditCapacityProperty extends Component {
<FormItem {...formItemLayout} hasFeedback label='是否必填: ' >
<Checkbox
{...disRequiredProps}
style={{ 'line-height': '31px',float: 'left','margin-left': '7px' }}
style={{ lineHeight: '31px',float: 'left','margin-left': '7px' }}
/>
</FormItem>
<FormItem wrapperCol={{
......
src/view/deviceManage/privateDevice/deviceAddEdit/AddEditDeviceProperty.js
View file @ f878d562
......@@ -599,7 +599,7 @@ class AddEditDeviceProperty extends Component {
//是否必填
const disRequiredProps = getFieldProps('isRequired', {
initialValue: propertyInfo ? propertyInfo.isRequired : false,
valuePropName: 'checked',
valuePropName: 'checked',
rules: [
]
......@@ -637,7 +637,7 @@ class AddEditDeviceProperty extends Component {
<FormItem {...formItemLayout} hasFeedback label='是否必填: ' >
<Checkbox
{...disRequiredProps}
style={{ 'line-height': '31px',float: 'left','margin-left': '7px' }}
style={{ lineHeight: '31px',float: 'left','margin-left': '7px' }}
/>
</FormItem>
<FormItem wrapperCol={{
......
src/view/deviceProtocol/common/TableCard.js
View file @ f878d562
......@@ -70,7 +70,7 @@ class TableCard extends Component {
<p title={version}>版&emsp;&emsp;本：{version}</p>
<p title={method}>实现方式：{method}</p>
<p title={dateToStr(time)}>时&emsp;&emsp;间：{dateToStr(time)}</p>
<p title={info} style={{ 'overflow': 'hidden','text-overflow': 'ellipsis','white-space': 'nowrap' }} >说&emsp;&emsp;明：{info}</p>
<p title={info} style={{ 'overflow': 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap' }} >说&emsp;&emsp;明：{info}</p>
</div>
</Card>
</div>
......
src/view/deviceProtocol/common/searchBar.js
View file @ f878d562
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { Input,Button } from 'amos-antd';
import { Input,Button } from 'amos-framework';
import FilterBtn from './FilterBtn';
/**
......@@ -73,7 +73,7 @@ class SearchBar extends Component {
<div className='search-bar'>
<div className='search-input'>
<Input placeholder="请输入搜索内容" onFocus={this.showFilter} onChange={this.onChange} />
<Button type='primary' onClick={this.onSearch}>搜索</Button>
<Button onClick={this.onSearch}>搜索</Button>
<div className={modalStyle} onClick={this.hidFilter} />
<div className={filterStyle} >
<FilterBtn filterOnChange={this.filterOnChange} {...this.props} />
......
src/view/historicalData/historyPanel/HistoryChartView.js
View file @ f878d562
import React, { Component } from 'react'; import PropTypes from 'prop-types';
import { LineCharts } from 'amos-viz';
import { LineChart } from 'amos-viz';
import { isNum } from 'ray-validate';
import { dateToNoYS } from './../common/date/DateUtil';
......@@ -100,7 +100,7 @@ class HistoryChartView extends Component {
let op = this.chartOptions();
return (
<div className='three-phase-view'>
<LineCharts lineOps={op} shouldDispose={this.props.shouldDispose} chartStyle={this.props.chartStyle} />
<LineChart lineOps={op} shouldDispose={this.props.shouldDispose} chartStyle={this.props.chartStyle} />
</div>
);
}
......
src/view/recentAlarm/AlarmManageMent.js
View file @ f878d562
......@@ -51,19 +51,19 @@ class AlarmManageMent extends Component {
let getDataAction = this.refs.currentAlarmChild.getSelectedRowKeys;
content.push(<BatchClearAlarm title='批量清除' type='batch' selectedRowKeys={getDataAction} clearAlarm={deleteAction} btnType='primary' size='default' />);
let time = this.refs.currentAlarmChild.getRefreshTime();
content.push(<div style={{ float: 'right','background-color': '#E3E3E3',height: '50px','line-height': '50px','font-size': '16px' }}>{time}</div>);
content.push(<div style={{ float: 'right','background-color': '#E3E3E3',height: '50px',lineHeight: '50px','font-size': '16px' }}>{time}</div>);
} else if (selectedKey === '2' && this.refs.historyAlarmChild) {
let deleteAction = this.refs.historyAlarmChild.batchClearAlarm;
content.push(<div className='alarm-delete' title={'批量删除'} onClick={deleteAction}>
<img src={require('./../../assets/iot/alarm/delete.png')} alt='' />
</div>);
let time = this.refs.historyAlarmChild.getRefreshTime();
content.push(<div style={{ float: 'right','background-color': '#E3E3E3',height: '50px','line-height': '50px','font-size': '16px' }}>{time}</div>);
content.push(<div style={{ float: 'right','background-color': '#E3E3E3',height: '50px',lineHeight: '50px','font-size': '16px' }}>{time}</div>);
} else {
let time = this.getCurrentTime();
content.push(<div style={{ float: 'right','background-color': '#E3E3E3',height: '50px','line-height': '50px','font-size': '16px' }}>{time}</div>);
content.push(<div style={{ float: 'right','background-color': '#E3E3E3',height: '50px',lineHeight: '50px','font-size': '16px' }}>{time}</div>);
}
content.push(<div style={{ float: 'right','background-color': '#E3E3E3',height: '50px','line-height': '50px','font-size': '16px' }}>告警刷新时间:</div>);
content.push(<div style={{ float: 'right','background-color': '#E3E3E3',height: '50px',lineHeight: '50px','font-size': '16px' }}>告警刷新时间:</div>);
content.push(<div className='current-alarm-input'>
<Input placeholder="告警源" value={filterCondition.name} onChange={this.onChange} />
</div>);
......
src/view/ruleDesign/ruleSetting/OutputNodeConfig.js
View file @ f878d562
......@@ -210,7 +210,7 @@ class OutputNodeConfig extends Component {
value="0"
checked={form['emailSsl']}
onChange={selects => this.onSelectedChange(selects)}
style={{ 'line-height': '31px',float: 'left','margin-left': '7px' }}
style={{ lineHeight: '31px',float: 'left','margin-left': '7px' }}
>使用安全连接(SSL)</Checkbox>
</FormItem>
<FormItem label="发送邮箱" field="emailUser" {...formItemLayout} >
......
src/view/ruleDesign/ruleStatge/RuleStage.js
View file @ f878d562
......@@ -24,7 +24,7 @@ const extraSize = {
/**
* 舞台
*
* @class RuleStage
* @class RuleStage
* @extends {Component}
*/
class RuleStage extends Component {
......@@ -81,7 +81,7 @@ class RuleStage extends Component {
this.setState({
zoom
});
}
}
changeZoom = (zoomIn) => {
let zoom = this.props.zoom;
if (zoomIn) {
......@@ -413,14 +413,14 @@ class RuleStage extends Component {
}
//检查是否已经建立过连接
beforeDrop = (info) => {
info.targetId = info.dropEndpoint.elementId;
info.targetId = info.dropEndpoint.elementId;
if (info.targetId === info.sourceId) {
return;
} else {
let connections = this.jspInstance.getConnections({ source: info.sourceId, target: info.targetId });
if (!connections.length === 0) {
return;
}
}
}
}
updateGraph = (args = {}) => {
......@@ -465,14 +465,14 @@ onDropHandler = (id, left, top) => {
const dataSource = {
nodes,
connections
};
};
const nodeProps = {
onDrop: this.onDropHandler
}
}
const { objId,...restProps } = this.props;
const newRestProps = tools.omit(restProps, [
'updateGraph', 'updateGraphWithDestroy'
]);
]);
const eventListeners = {
dblclick: this.onConnectionDbClick,
connection: handlers.onConnectionEventHandler,
......@@ -492,9 +492,9 @@ onDropHandler = (id, left, top) => {
<RuleScene
handleDrop={this.handleDrop}
onAddConnection={this.onAddConnection}
onRemoveConnection={this.onRemoveConnection}
onRemoveNode ={this.onRemoveNode}
dataSource={dataSource}
onRemoveConnection={this.onRemoveConnection}
onRemoveNode ={this.onRemoveNode}
dataSource={dataSource}
newRestProps ={newRestProps}
onPlumbChange={this.onChange}
nodeProps = {nodeProps}
......
src/view/topoManage/topoView/AddView.js
View file @ f878d562
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { Modal,Input,Form } from 'amos-antd';
import { Modal, Form } from 'amos-antd';
import { Input, message } from 'amos-framework';
import Icon from 'amos-icon';
import { message } from 'amos-framework';
const createForm = Form.create();
const FormItem = Form.Item;
......
src/view/topoManage/topoView/CapacityInterfacePanel.js
View file @ f878d562
......@@ -90,10 +90,10 @@ class CapacityInterfacePanel extends Component {
displayValue = displayValue === undefined ? item.valueStr : displayValue;
content.push(
<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px','text-overflow': 'ellipsis','white-space': 'nowrap','overflow': 'hidden' }}>
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px',textOverflow: 'ellipsis',whiteSpace: 'nowrap','overflow': 'hidden' }}>
{item.displayName}：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
{displayValue}
</Col>
</Row>);
......@@ -103,10 +103,10 @@ class CapacityInterfacePanel extends Component {
propertyList.map((item)=> {
content.push(
<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px','text-overflow': 'ellipsis','white-space': 'nowrap','overflow': 'hidden' }}>
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px',textOverflow: 'ellipsis',whiteSpace: 'nowrap','overflow': 'hidden' }}>
{item.displayName}：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
{item.valueStr}
</Col>
</Row>);
......@@ -131,10 +131,10 @@ class CapacityInterfacePanel extends Component {
item.valueStr = tempEdit[item.id] ? tempEdit[item.id] : displayValue;
content.push(
<Row>
<Col title={item.displayName} span={8} offset={1} style={{ 'text-align': 'right',height: '30px', 'line-height': '30px','text-overflow': 'ellipsis','white-space': 'nowrap','overflow': 'hidden' }}>
<Col title={item.displayName} span={8} offset={1} style={{ textAlign: 'right',height: '30px', lineHeight: '30px',textOverflow: 'ellipsis',whiteSpace: 'nowrap','overflow': 'hidden' }}>
{item.displayName}：
</Col>
<Col span={14} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={14} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
<Input style={{ width: '90%' }}
onChange={(e) => this.onAttributeChange(e, item.id)}
value={item.valueStr}
......@@ -147,10 +147,10 @@ class CapacityInterfacePanel extends Component {
propertyList.map((item)=> {
content.push(
<Row>
<Col title={item.displayName} span={8} offset={1} style={{ 'text-align': 'right',height: '30px', 'line-height': '30px','text-overflow': 'ellipsis','white-space': 'nowrap','overflow': 'hidden' }}>
<Col title={item.displayName} span={8} offset={1} style={{ textAlign: 'right',height: '30px', lineHeight: '30px',textOverflow: 'ellipsis',whiteSpace: 'nowrap','overflow': 'hidden' }}>
{item.displayName}：
</Col>
<Col span={14} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={14} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
<Input style={{ width: '90%' }}
onChange={(e) => this.onAttributeChange(e, item.id)}
value={item.valueStr}
......@@ -263,10 +263,10 @@ class CapacityInterfacePanel extends Component {
<div className='capacity-interface-basic' >
<div>
<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }}>
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }}>
名称：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
{interfaceBasicInfo.intfcName}
</Col>
</Row>
......
src/view/topoManage/topoView/ContextMenu.js
View file @ f878d562
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import dt2react from 'dt2react';
import { Button } from 'amos-antd';
import { Button } from 'amos-framework';
import AddView from './AddView';
import EditView from './EditView';
......
src/view/topoManage/topoView/DeviceCapacityPanel.js
View file @ f878d562
......@@ -108,17 +108,17 @@ class DeviceCapacityPanel extends Component {
<Col span={21}
offset={1}
style={{
'text-align': 'left',
textAlign: 'left',
height: '30px',
'line-height': '30px',
'text-overflow': 'ellipsis',
'white-space': 'nowrap',
lineHeight: '30px',
textOverflow: 'ellipsis',
whiteSpace: 'nowrap',
'overflow': 'hidden'
}}
>
{item.intfcName}
</Col>
<Col span={2} style={{ height: '30px', 'line-height': '30px' }} >
<Col span={2} style={{ height: '30px', lineHeight: '30px' }} >
<div onClick={(e) => this.onClickInterface(e, item)} className='edit-interface-img'>
<img src={require('./../../../assets/iot/img/list_nlsx.png')} alt='' />
</div>
......@@ -144,10 +144,10 @@ class DeviceCapacityPanel extends Component {
displayValue = displayValue === undefined ? item.valueStr : displayValue;
content.push(
<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px','text-overflow': 'ellipsis','white-space': 'nowrap','overflow': 'hidden' }}>
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px',textOverflow: 'ellipsis',whiteSpace: 'nowrap','overflow': 'hidden' }}>
{item.displayName}：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
{displayValue}
</Col>
</Row>
......@@ -157,10 +157,10 @@ class DeviceCapacityPanel extends Component {
propertyList.map((item)=> {
content.push(
<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px','text-overflow': 'ellipsis','white-space': 'nowrap','overflow': 'hidden' }}>
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px',textOverflow: 'ellipsis',whiteSpace: 'nowrap','overflow': 'hidden' }}>
{item.displayName}：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
{item.valueStr}
</Col>
</Row>);
......@@ -189,10 +189,10 @@ class DeviceCapacityPanel extends Component {
item.valueStr = tempEdit[item.id] ? tempEdit[item.id] : displayValue;
content.push(
<Row>
<Col title={item.displayName} span={8} offset={1} style={{ 'text-align': 'right',height: '30px', 'line-height': '30px','text-overflow': 'ellipsis','white-space': 'nowrap','overflow': 'hidden' }}>
<Col title={item.displayName} span={8} offset={1} style={{ textAlign: 'right',height: '30px', lineHeight: '30px',textOverflow: 'ellipsis',whiteSpace: 'nowrap','overflow': 'hidden' }}>
{item.displayName}：
</Col>
<Col span={14} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={14} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
<Input style={{ width: '90%' }}
onChange={(e) => this.onAttributeChange(e,item.id)}
value={item.valueStr}
......@@ -206,10 +206,10 @@ class DeviceCapacityPanel extends Component {
propertyList.map((item)=> {
content.push(
<Row>
<Col title={item.displayName} span={8} offset={1} style={{ 'text-align': 'right',height: '30px', 'line-height': '30px','text-overflow': 'ellipsis','white-space': 'nowrap','overflow': 'hidden' }}>
<Col title={item.displayName} span={8} offset={1} style={{ textAlign: 'right',height: '30px', lineHeight: '30px',textOverflow: 'ellipsis',whiteSpace: 'nowrap','overflow': 'hidden' }}>
{item.displayName}：
</Col>
<Col span={14} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={14} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
<Input style={{ width: '90%' }}
onChange={(e) => this.onAttributeChange(e,item.id)}
value={item.valueStr}
......@@ -322,26 +322,26 @@ class DeviceCapacityPanel extends Component {
<div className='device-capacity-basic' >
<div>
<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }}>
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }}>
名称：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
{capacityBasicInfo.name}
</Col>
</Row>
<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }}>
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }}>
协议：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
{protocolName}
</Col>
</Row>
<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }}>
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }}>
类型：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
{stringUtil(capacityClassifyEnum,parseInt(capacityBasicInfo.type))}
</Col>
</Row>
......
src/view/topoManage/topoView/DevicePropertyPanel.js
View file @ f878d562
......@@ -171,10 +171,10 @@ class DevicePropertyPanel extends Component {
let displayValue = item.valueStr;
content.push(
<Row>
<Col title={item.displayName} span={8} offset={1} style={{ 'text-align': 'right',height: '30px', 'line-height': '30px','text-overflow': 'ellipsis','white-space': 'nowrap','overflow': 'hidden' }} >
<Col title={item.displayName} span={8} offset={1} style={{ textAlign: 'right',height: '30px', lineHeight: '30px',textOverflow: 'ellipsis',whiteSpace: 'nowrap','overflow': 'hidden' }} >
{item.displayName}：
</Col>
<Col span={14} offset={1} style={{ 'text-align': 'left',height: '30px', 'line-height': '30px' }} >
<Col span={14} offset={1} style={{ textAlign: 'left',height: '30px', lineHeight: '30px' }} >
<Input style={{ width: '90%' }}
onChange={(e) => this.onAttributeChange(e, item.id)}
value={displayValue}
......@@ -186,10 +186,10 @@ class DevicePropertyPanel extends Component {
attributes.map((item)=>{
content.push(
<Row>
<Col title={item.displayName} span={8} offset={1} style={{ 'text-align': 'right',height: '30px', 'line-height': '30px','text-overflow': 'ellipsis','white-space': 'nowrap','overflow': 'hidden' }} >
<Col title={item.displayName} span={8} offset={1} style={{ textAlign: 'right',height: '30px', lineHeight: '30px',textOverflow: 'ellipsis',whiteSpace: 'nowrap','overflow': 'hidden' }} >
{item.displayName}：
</Col>
<Col span={14} offset={1} style={{ 'text-align': 'left',height: '30px', 'line-height': '30px' }} >
<Col span={14} offset={1} style={{ textAlign: 'left',height: '30px', lineHeight: '30px' }} >
<Input style={{ width: '90%' }}
onChange={(e) => this.onAttributeChange(e, item.id)}
value={item.valueStr}
......@@ -213,16 +213,16 @@ class DevicePropertyPanel extends Component {
offset={1}
style={{
height: '30px',
'line-height': '30px',
'text-overflow': 'ellipsis',
'white-space': 'nowrap',
lineHeight: '30px',
textOverflow: 'ellipsis',
whiteSpace: 'nowrap',
'overflow': 'hidden',
'text-align': 'left'
textAlign: 'left'
}}
>
{item.name}
</Col>
<Col span={2} style={{ height: '30px','line-height': '30px' }} >
<Col span={2} style={{ height: '30px',lineHeight: '30px' }} >
<div onClick={(e) => this.onClickCapacity(e,item)} className='edit-interface-img'>
<img src={require('./../../../assets/iot/img/list_nlsx.png')} alt='' style={{ position: 'relative',top: '5px' }} />
</div>
......@@ -403,34 +403,34 @@ class DevicePropertyPanel extends Component {
<div className='property-basic-info'>
<div style={{ height: '100%' }}>
<Row>
<Col span={4} offset={1} style={{ height: '30px','line-height': '30px' }} >
<Col span={4} offset={1} style={{ height: '30px',lineHeight: '30px' }} >
名称：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left' }} >
<Col span={18} offset={1} style={{ textAlign: 'left' }} >
<Editable value={name} onChange={this.updateName} showOkCancel={false} />
</Col>
</Row>
<Row>
<Col span={4} offset={1} style={{ height: '30px','line-height': '30px' }}>
<Col span={4} offset={1} style={{ height: '30px',lineHeight: '30px' }}>
型号：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left',height: '30px','line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left',height: '30px',lineHeight: '30px' }} >
{propertyContent.model}
</Col>
</Row>
<Row>
<Col span={4} offset={1} style={{ height: '30px','line-height': '30px' }}>
<Col span={4} offset={1} style={{ height: '30px',lineHeight: '30px' }}>
类别：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left',height: '30px','line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left',height: '30px',lineHeight: '30px' }} >
{propertyContent ? stringUtil(deviceCategoryEnum, parseInt(propertyContent.type)) : ''}
</Col>
</Row>
<Row>
<Col span={4} offset={1} style={{ height: '30px','line-height': '30px' }}>
<Col span={4} offset={1} style={{ height: '30px',lineHeight: '30px' }}>
备注：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left',height: '30px','line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left',height: '30px',lineHeight: '30px' }} >
{propertyContent.descr}
</Col>
</Row>
......
src/view/topoManage/topoView/TopoTree.js
View file @ f878d562
......@@ -2,13 +2,13 @@ import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { Tree } from 'amos-antd';
import dt2react from 'dt2react';
import { Store } from 'amos-tool';
import { AmosFetch } from '../../../utils/processor';
import OltSerUrl from '../../../consts/urlConsts';
import Icon from 'amos-icon';
import ContextMenu from './ContextMenu';
import UploadMultiPicModal from './uploadPicture/UploadPicsModal';
import './topo.scss';
import { Store } from 'amos-tool';
const lsTool = Store.lsTool;
......
src/view/topoManage/topoView/TopoView.js
View file @ f878d562
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { message } from 'amos-framework';
import { AmosFetch } from '../../../utils/processor';
import { OltSerUrl } from '../../../consts/urlConsts';
import { Modal } from 'amos-antd';
import { message } from 'amos-framework';
import TopoTree from './TopoTree';
import TopoMangent from './topoMangent';
......
src/view/topoManage/topoView/equipmentChoose/ChooseEquipmentPanel.js
View file @ f878d562
......@@ -2,8 +2,8 @@ import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { Button,Select } from 'amos-antd';
import Icon from 'amos-icon';
import OltSerUrl from '../../../../consts/urlConsts';
import { Input } from 'amos-framework';
import OltSerUrl from '../../../../consts/urlConsts';
import { AmosFetch } from '../../../../utils/processor';
import SearchBar from './../../common/SearchBar';
import { deviceCategoryEnum } from './../../../deviceManage/common/DeviceEnum';
......
src/view/topoManage/topoView/topoleft/AddView.js
View file @ f878d562
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { Modal, Input, Form } from 'amos-antd';
import { Modal, Form } from 'amos-antd';
import { Input } from 'amos-framework';
const createForm = Form.create();
const FormItem = Form.Item;
......
src/view/topoManage/topoView/topoleft/ContextMenu.js
View file @ f878d562
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import dt2react from 'dt2react';
import { Button } from 'amos-antd';
import { Button } from 'amos-framework';
import AddView from './AddView';
import EditView from './EditView';
......
src/view/topoManage/topoView/topoleft/TopoTree.js
View file @ f878d562
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { Tree,Modal } from 'amos-antd';
import { Tree, Modal } from 'amos-antd';
import Icon from 'amos-icon';
import dt2react from 'dt2react';
import { message } from 'amos-framework';
// import { currentUser } from 'amos-security/lib/model/auth';
import { AmosFetch } from '../../../../utils/processor';
import OltSerUrl from '../../../../consts/urlConsts';
import { message } from 'amos-framework';
import TreeHeader from './../header/TreeHeader';
import AddView from './AddView';
import ContextMenu from './ContextMenu';
......@@ -192,7 +192,7 @@ class TopoTree extends Component {
}
nodeRightClick = (e) => {
this.refs.contextMenu.showMenu(e.event,e.node.props.eventKey);
this.contextMenuRef.showMenu(e.event,e.node.props.eventKey);
}
toggleView = (flag = false) => {
......@@ -490,7 +490,7 @@ class TopoTree extends Component {
onDelClick={this.delView}
currentNode={currentNode}
editTreeData={this.editTreeData}
ref='contextMenu'
ref={node => this.contextMenuRef = node}
/>
</div>
<AddView visible={viewVisable} selectedKeys={selectedKeys} addTreeData={this.addTreeData} toggleView={this.toggleView} />
......
src/view/topoManage/topoView/toporight/demofile/CapacityInterfacePanel.js
View file @ f878d562
......@@ -78,10 +78,10 @@ class CapacityInterfacePanel extends Component {
let { getCurrentEquipment,capacityBasicInfo } = this.props;
content.push(
<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }}>
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }}>
{'设备ID'}：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
<Input style={{ width: '60%' }}
defaultValue={''}
/>
......@@ -89,10 +89,10 @@ class CapacityInterfacePanel extends Component {
</Row>);
content.push(
<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }}>
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }}>
{'帧类型'}：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
<Input style={{ width: '60%' }}
defaultValue={'1'}
/>
......@@ -108,10 +108,10 @@ class CapacityInterfacePanel extends Component {
// displayValue = displayValue === undefined ? item.valueStr : displayValue;
// content.push(
// <Row>
// <Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }}>
// <Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }}>
// {item.displayName}：
// </Col>
// <Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
// <Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
// {displayValue}
// </Col>
// </Row>);
......@@ -121,10 +121,10 @@ class CapacityInterfacePanel extends Component {
// propertyList.map((item)=> {
// content.push(
// <Row>
// <Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }}>
// <Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }}>
// {item.displayName}：
// </Col>
// <Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
// <Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
// {item.valueStr}
// </Col>
// </Row>);
......@@ -149,10 +149,10 @@ class CapacityInterfacePanel extends Component {
item.valueStr = displayValue;
content.push(
<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }}>
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }}>
{item.displayName}：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
<Input style={{ width: '60%' }}
onChange={(e) => this.onAttributeChange(e, item.id)}
defaultValue={displayValue}
......@@ -165,10 +165,10 @@ class CapacityInterfacePanel extends Component {
propertyList.map((item)=> {
content.push(
<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }}>
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }}>
{item.displayName}：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
<Input style={{ width: '60%' }}
onChange={(e) => this.onAttributeChange(e, item.id)}
defaultValue={item.valueStr}
......@@ -281,10 +281,10 @@ class CapacityInterfacePanel extends Component {
</div>
<div>
<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }}>
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }}>
名称：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
<Input style={{ width: '60%' }}
value={interfaceBasicInfo}
/>
......
src/view/topoManage/topoView/toporight/demofile/DeviceCapacityPanel.js
View file @ f878d562
......@@ -99,10 +99,10 @@ class DeviceCapacityPanel extends Component {
let { capacityBasicInfo } = this.props;
if (capacityBasicInfo === '压力') {
content.push(<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }}>
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }}>
{'采集压力'}
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
<div onClick={(e) => this.onClickInterface(e, '压力')} className='edit-interface-img'>
<img src={require('./../../../../../assets/iot/img/list_nlsx.png')} alt='' style={{ paddingTop: '3px' }} />
</div>
......@@ -110,10 +110,10 @@ class DeviceCapacityPanel extends Component {
</Row>);
} else {
content.push(<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }}>
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }}>
{'采集GPS'}
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
<div onClick={(e) => this.onClickInterface(e, '采集GPS')} className='edit-interface-img'>
<img src={require('./../../../../../assets/iot/img/list_nlsx.png')} alt='' style={{ paddingTop: '3px' }} />
</div>
......@@ -130,10 +130,10 @@ class DeviceCapacityPanel extends Component {
if (capacityBasicInfo === '压力') {
content.push(
<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }}>
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }}>
{'压力'}：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
<Input style={{ width: '60%' }}
value={'2.6mPa'}
/>
......@@ -142,10 +142,10 @@ class DeviceCapacityPanel extends Component {
} else {
content.push(
<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }}>
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }}>
{'经度'}：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
<Input style={{ width: '60%' }}
value={'113:42E'}
/>
......@@ -153,10 +153,10 @@ class DeviceCapacityPanel extends Component {
</Row>);
content.push(
<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }}>
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }}>
{'纬度'}：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
<Input style={{ width: '60%' }}
value={'34:44N'}
/>
......@@ -175,10 +175,10 @@ class DeviceCapacityPanel extends Component {
// displayValue = displayValue === undefined ? item.valueStr : displayValue;
// content.push(
// <Row>
// <Col span={5} style={{ height: '30px', 'line-height': '30px' }}>
// <Col span={5} style={{ height: '30px', lineHeight: '30px' }}>
// {item.displayName}：
// </Col>
// <Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
// <Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
// {displayValue}
// </Col>
// </Row>
......@@ -188,10 +188,10 @@ class DeviceCapacityPanel extends Component {
// propertyList.map((item)=> {
// content.push(
// <Row>
// <Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }}>
// <Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }}>
// {item.displayName}：
// </Col>
// <Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
// <Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
// {item.valueStr}
// </Col>
// </Row>);
......@@ -343,30 +343,30 @@ class DeviceCapacityPanel extends Component {
</div>
<div>
<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }}>
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }}>
名称：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
<Input style={{ width: '60%' }}
value={capacityBasicInfo}
/>
</Col>
</Row>
<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }}>
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }}>
协议：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
<Input style={{ width: '60%' }}
value={capacityBasicInfo === '压力' ? '压力数据' : 'GPS数据'}
/>
</Col>
</Row>
<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }}>
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }}>
类型：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
<Input style={{ width: '60%' }}
defaultValue={'采集'}
/>
......
src/view/topoManage/topoView/toporight/demofile/DevicePropertyPanel.js
View file @ f878d562
......@@ -158,10 +158,10 @@ class DevicePropertyPanel extends Component {
let content = [];
content.push(
<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }} >
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }} >
编码：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left',height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left',height: '30px', lineHeight: '30px' }} >
<Input style={{ width: '60%' }}
defaultValue={'BGK-Micro-40D'}
/>
......@@ -169,10 +169,10 @@ class DevicePropertyPanel extends Component {
</Row>);
content.push(
<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }} >
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }} >
端口：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left',height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left',height: '30px', lineHeight: '30px' }} >
<Input style={{ width: '60%' }}
defaultValue={'10003'}
/>
......@@ -184,10 +184,10 @@ class DevicePropertyPanel extends Component {
// let displayValue = equipment.cfgParamMap[`equip_${item.id}`] === undefined ? item.valueStr : equipment.cfgParamMap[`equip_${item.id}`];
// content.push(
// <Row>
// <Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }} >
// <Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }} >
// {item.name}：
// </Col>
// <Col span={18} offset={1} style={{ 'text-align': 'left',height: '30px', 'line-height': '30px' }} >
// <Col span={18} offset={1} style={{ textAlign: 'left',height: '30px', lineHeight: '30px' }} >
// {displayValue}
// </Col>
// </Row>);
......@@ -196,10 +196,10 @@ class DevicePropertyPanel extends Component {
// attributes.map((item)=>{
// content.push(
// <Row>
// <Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }} >
// <Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }} >
// {item.name}：
// </Col>
// <Col span={18} offset={1} style={{ 'text-align': 'left',height: '30px', 'line-height': '30px' }} >
// <Col span={18} offset={1} style={{ textAlign: 'left',height: '30px', lineHeight: '30px' }} >
// {item.valueStr}
// </Col>
// </Row>);
......@@ -217,10 +217,10 @@ class DevicePropertyPanel extends Component {
let displayValue = equipment.cfgParamMap[`equip_${item.id}`] === undefined ? item.valueStr : equipment.cfgParamMap[`equip_${item.id}`];
content.push(
<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }} >
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }} >
{item.name}：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left',height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left',height: '30px', lineHeight: '30px' }} >
<Input style={{ width: '60%' }}
onChange={(e) => this.onAttributeChange(e, item.id)}
defaultValue={displayValue}
......@@ -232,10 +232,10 @@ class DevicePropertyPanel extends Component {
attributes.map((item)=>{
content.push(
<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }} >
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }} >
{item.name}：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left',height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left',height: '30px', lineHeight: '30px' }} >
<Input style={{ width: '60%' }}
onChange={(e) => this.onAttributeChange(e, item.id)}
defaultValue={item.valueStr}
......@@ -253,10 +253,10 @@ class DevicePropertyPanel extends Component {
let content = [];
content.push(
<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }}>
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }}>
{'经纬度'}
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
<div onClick={(e) => this.onClickCapacity(e,'经纬度')} className='edit-interface-img'>
<img src={require('./../../../../../assets/iot/img/list_nlsx.png')} alt='' style={{ position: 'relative', top: '5px' }} />
</div>
......@@ -264,10 +264,10 @@ class DevicePropertyPanel extends Component {
</Row>);
content.push(
<Row>
<Col span={4} offset={1} style={{ height: '30px', 'line-height': '30px' }}>
<Col span={4} offset={1} style={{ height: '30px', lineHeight: '30px' }}>
{'压力'}
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left', height: '30px', 'line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left', height: '30px', lineHeight: '30px' }} >
<div onClick={(e) => this.onClickCapacity(e,'压力')} className='edit-interface-img'>
<img src={require('./../../../../../assets/iot/img/list_nlsx.png')} alt='' style={{ position: 'relative', top: '5px' }} />
</div>
......@@ -420,40 +420,40 @@ class DevicePropertyPanel extends Component {
</div>
<div style={{ height: '100%' }}>
<Row>
<Col span={4} offset={1} style={{ height: '30px','line-height': '30px' }} >
<Col span={4} offset={1} style={{ height: '30px',lineHeight: '30px' }} >
名称：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left' }} >
<Col span={18} offset={1} style={{ textAlign: 'left' }} >
<Input style={{ width: '60%' }}
value={deviceLabel}
/>
</Col>
</Row>
<Row>
<Col span={4} offset={1} style={{ height: '30px','line-height': '30px' }}>
<Col span={4} offset={1} style={{ height: '30px',lineHeight: '30px' }}>
型号：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left',height: '30px','line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left',height: '30px',lineHeight: '30px' }} >
<Input style={{ width: '60%' }}
defaultValue={'BGK-Micro-40D'}
/>
</Col>
</Row>
<Row>
<Col span={4} offset={1} style={{ height: '30px','line-height': '30px' }}>
<Col span={4} offset={1} style={{ height: '30px',lineHeight: '30px' }}>
类别：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left',height: '30px','line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left',height: '30px',lineHeight: '30px' }} >
<Input style={{ width: '60%' }}
defaultValue={'传感设备'}
/>
</Col>
</Row>
<Row>
<Col span={4} offset={1} style={{ height: '30px','line-height': '30px' }}>
<Col span={4} offset={1} style={{ height: '30px',lineHeight: '30px' }}>
备注：
</Col>
<Col span={18} offset={1} style={{ 'text-align': 'left',height: '30px','line-height': '30px' }} >
<Col span={18} offset={1} style={{ textAlign: 'left',height: '30px',lineHeight: '30px' }} >
<Input style={{ width: '60%' }}
defaultValue={deviceLabel}
/>
......
src/view/zonglan/home/statistics/Alarm.js
View file @ f878d562
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { PieCharts } from 'amos-viz/lib/echarts';
import { PieChart } from 'amos-viz/lib/echarts';
import { browserHistory } from 'amos-react-router';
import { AmosFetch } from '../../../../utils/processor';
import OltSerUrl from '../../../../consts/urlConsts';
......@@ -73,7 +73,7 @@ class Alarm extends Component {
return (
<div className="overview-item-chart">
<div className="overview-alarm-chart">
<PieCharts
<PieChart
pieOps={option(critical,major,minor)}
chartStyle={{ width: '100%', height: '82px' }}
eventpool={array}
......
src/view/zonglan/home/statistics/EquipInterface.js
View file @ f878d562
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { PieCharts } from 'amos-viz/lib/echarts';
import { PieChart } from 'amos-viz/lib/echarts';
import { browserHistory } from 'amos-react-router';
import { PubSub } from 'ray-eventpool';
import {
......@@ -69,7 +69,7 @@ class EquipInterface extends Component {
return (
<div className="overview-item-chart">
<div className="overview-prototypeequip-chart">
<PieCharts
<PieChart
pieOps={tempOption}
chartStyle={{ width: '100%', height: '82px' }}
eventpool={array}
......
src/view/zonglan/home/statistics/EquipProtocol.js
View file @ f878d562
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { PieCharts } from 'amos-viz/lib/echarts';
import { PieChart } from 'amos-viz/lib/echarts';
import { browserHistory } from 'amos-react-router';
import { PubSub } from 'ray-eventpool';
import {
......@@ -69,7 +69,7 @@ class EquipProtocol extends Component {
return (
<div className="overview-item-chart">
<div className="overview-prototypeequip-chart">
<PieCharts
<PieChart
pieOps={option}
chartStyle={{ width: '100%', height: '82px' }}
eventpool={array}
......
src/view/zonglan/home/statistics/PrototypeEquip.js
View file @ f878d562
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { PieCharts } from 'amos-viz/lib/echarts';
import { PieChart } from 'amos-viz/lib/echarts';
import { browserHistory } from 'amos-react-router';
import { AmosFetch } from '../../../../utils/processor';
import OltSerUrl from '../../../../consts/urlConsts';
......@@ -75,7 +75,7 @@ class PrototypeEquip extends Component {
return (
<div className="overview-item-chart">
<div className="overview-prototypeequip-chart">
<PieCharts
<PieChart
pieOps={option(pubCount,priCount)}
chartStyle={{ width: '100%', height: '82px' }}
eventpool={array}
......
src/view/zonglan/home/statistics/Task.js
View file @ f878d562
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { PieCharts } from 'amos-viz/lib/echarts';
import { PieChart } from 'amos-viz/lib/echarts';
import { AmosFetch } from '../../../../utils/processor';
import { browserHistory } from 'amos-react-router';
import OltSerUrl from '../../../../consts/urlConsts';
......@@ -69,28 +69,28 @@ class AccountInfo extends Component {
return (
<div className="overview-item-chart">
<div className="overview-task-item">
<PieCharts
<PieChart
pieOps={optionData}
chartStyle={{ width: '100%', height: '300px' }}
eventpool={array}
/>
</div>
<div className="overview-task-item">
<PieCharts
<PieChart
pieOps={option1Data}
chartStyle={{ width: '100%', height: '300px' }}
eventpool={array}
/>
</div>
<div className="overview-task-item">
<PieCharts
<PieChart
pieOps={option2Data}
chartStyle={{ width: '100%', height: '300px' }}
eventpool={array}
/>
</div>
<div className="overview-task-item">
<PieCharts
<PieChart
pieOps={option3Data}
chartStyle={{ width: '100%', height: '300px' }}
eventpool={array}
......
src/view/zonglan/home/statistics/TubeEquipNum.js
View file @ f878d562
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { PieCharts } from 'amos-viz/lib/echarts';
import { PieChart } from 'amos-viz/lib/echarts';
import { AmosFetch } from '../../../../utils/processor';
import OltSerUrl from '../../../../consts/urlConsts';
import {
......@@ -66,13 +66,13 @@ class TubeEquipNum extends Component {
return (
<div className="overview-item-chart">
<div className="overview-tubeequipnum-left">
<PieCharts
<PieChart
pieOps={option(controller,sensor,collector)}
chartStyle={{ width: '100%', height: '309px' }}
/>
</div>
<div className="overview-tubeequipnum-right">
<PieCharts
<PieChart
pieOps={option2(electric,fire,net,others,industrial)}
chartStyle={{ width: '100%', height: '309px' }}
/>
......
webpack.config.js
View file @ f878d562
......@@ -62,7 +62,8 @@ if (__ENV__ === 'development'){
defaultConfig.devServer.proxy = {
'/baseURI': {
// target: 'http://172.16.10.70:10005/',
target: 'http://172.16.3.3:10005/',
// target: 'http://172.16.3.3:10005/',
target: 'http://39.98.45.134:10005/',
pathRewrite: { '^/baseURI': '' }
}
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment