Skip to content

A
amos-convertor-view
Commit 9f13cbfd authored by maoying's avatar maoying
Browse files
Options

Merge branch 'dev_upgrade' of 172.16.10.76:station/amos-convertor-view into dev_upgrade

parents 884412f4 59aeed9e
Show whitespace changes
Inline Side-by-side
Showing with 539 additions and 203 deletions
.stylelintignore
View file @ 9f13cbfd
...@@ -3,4 +3,5 @@ lib ...@@ -3,4 +3,5 @@ lib
libs libs
*.js *.js
*.md *.md
*.scss src/styles/**/*.scss
src/view/**/*.scss
package.json
View file @ 9f13cbfd
...@@ -29,25 +29,25 @@ ...@@ -29,25 +29,25 @@
] ]
}, },
"dependencies": { "dependencies": {
"amos-3d": "^2.1.5", "amos-3d": "^2.x",
"amos-amap": "~1.0.9", "amos-amap": "~1.0.9",
"amos-antd": "^2.1.4", "amos-antd": "^2.x",
"amos-devgrid": "^1.0.10", "amos-devgrid": "^1.0.10",
"amos-dll": "^2.0.2", "amos-dll": "^3.x",
"amos-gojs": "^2.0.15", "amos-gojs": "^2.0.15",
"amos-icon": "^1.0.3", "amos-icon": "^1.x",
"amos-mqtt": "^1.0.1", "amos-mqtt": "^1.x",
"amos-pluggable": "^1.0.6", "amos-pluggable": "^1.x",
"amos-processor": "^2.x", "amos-processor": "^2.x",
"amos-richtext": "^1.0.1", "amos-richtext": "^1.0.1",
"amos-rules-config": "^1.0.6", "amos-rules-config": "^1.0.6",
"amos-security": "^2.1.1", "amos-security": "^3.x",
"amos-tool": "^1.x", "amos-tool": "^1.x",
"amos-viz": "^1.x", "amos-viz": "^1.x",
"amos-websocket": "^1.0.3", "amos-websocket": "^1.x",
"classnames": "^2.2.5", "classnames": "^2.2.5",
"dt2react": "^1.x", "dt2react": "^1.x",
"ray-code-split": "^1.0.1", "ray-code-split": "^2.x",
"ray-eventpool": "^1.0.0", "ray-eventpool": "^1.0.0",
"ray-mediaquery": "^1.0.0", "ray-mediaquery": "^1.0.0",
"ray-progress": "^1.0.0", "ray-progress": "^1.0.0",
...@@ -55,11 +55,11 @@ ...@@ -55,11 +55,11 @@
"react-dom": "~16.3.3" "react-dom": "~16.3.3"
}, },
"devDependencies": { "devDependencies": {
"amos-build": "3.1.4", "amos-build": "5.x",
"amos-designer": "^1.0.2", "amos-designer": "^1.x",
"amos-framework": "^1.2.2", "amos-framework": "^1.x",
"amos-iot-3dgraph": "^1.0.0", "amos-iot-3dgraph": "^1.0.8",
"amos-iot-webstudio": "1.0.4", "amos-iot-webstudio": "1.x",
"eslint-config-ray": "^1.0.26", "eslint-config-ray": "^1.0.26",
"mockjs": "^1.0.1-beta3", "mockjs": "^1.0.1-beta3",
"ray-build": "^2.0.2", "ray-build": "^2.0.2",
......
src/base.scss 0 → 100644
View file @ 9f13cbfd
.tsts {
overflow: auto;
}
src/styles/view/3dview/pointsDetails.scss
View file @ 9f13cbfd
...@@ -19,6 +19,9 @@ ...@@ -19,6 +19,9 @@
width: 35px; width: 35px;
margin-bottom: 10px; margin-bottom: 10px;
} }
content {
color: black;
}
} }
.point-details-monitor { .point-details-monitor {
...@@ -48,7 +51,7 @@ ...@@ -48,7 +51,7 @@
.carousel-img { .carousel-img {
width: 100%; width: 100%;
height: 100%; height: 100%;
padding: 5px padding: 5px;
} }
.carousel-indicators { .carousel-indicators {
...@@ -79,7 +82,6 @@ ...@@ -79,7 +82,6 @@
border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0;
} }
.carousel-center-bar { .carousel-center-bar {
position: relative; position: relative;
height: 100%; height: 100%;
...@@ -110,7 +112,7 @@ ...@@ -110,7 +112,7 @@
display: inline; display: inline;
font-size: 7px; font-size: 7px;
line-height: 40px; line-height: 40px;
color: $biz-table-font-color;//white; color: $biz-table-font-color; //white;
.colTitle { .colTitle {
padding-left: 8px; padding-left: 8px;
...@@ -135,9 +137,9 @@ ...@@ -135,9 +137,9 @@
.colTitle { .colTitle {
float: left; float: left;
width: 131px;//9.84%; width: 131px; //9.84%;
height: 40px; height: 40px;
background: $biz-table-title-color;//#333; background: $biz-table-title-color; //#333;
border-left: 1px solid $core-border-color; border-left: 1px solid $core-border-color;
box-sizing: border-box; box-sizing: border-box;
flex: 1; flex: 1;
...@@ -145,40 +147,40 @@ ...@@ -145,40 +147,40 @@
.colValue { .colValue {
float: left; float: left;
width: 131px;//9.83%; width: 131px; //9.83%;
height: 40px; height: 40px;
background: $content-color;//rgb(97, 96, 96); background: $content-color; //rgb(97, 96, 96);
flex: 1; flex: 1;
border-left: 1px solid $core-border-color; border-left: 1px solid $core-border-color;
} }
} }
.point-dialog-modal{ .point-dialog-modal {
width: 100%; width: 100%;
height: 100%; height: 100%;
.amos-modal-container{ .amos-modal-container {
// width: 310px !important; // width: 310px !important;
.amos-modal-close{ .amos-modal-close {
color: white; color: white;
background: linear-gradient(180deg, rgba(255, 0, 102, 1) 0%, rgba(255, 0, 102, 1) 0%, rgba(255, 51, 0, 1) 100%, rgba(255, 51, 0, 1) 100%); background: linear-gradient(180deg, rgba(255, 0, 102, 1) 0%, rgba(255, 0, 102, 1) 0%, rgba(255, 51, 0, 1) 100%, rgba(255, 51, 0, 1) 100%);
.amos-modal-close-x{ .amos-modal-close-x {
width: 30px; width: 30px;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
} }
} }
.amos-modal-header{ .amos-modal-header {
background: $model-header-color-3d; background: $model-header-color-3d;
height: 30px; height: 30px;
padding: 0; padding: 0;
.amos-modal-title{ .amos-modal-title {
line-height: 30px; line-height: 30px;
padding-left: 9px; padding-left: 9px;
} }
} }
.amos-modal-content{ .amos-modal-content {
padding: 0; padding: 0;
.point-dialog-body{ .point-dialog-body {
.point-dialog-modal-row { .point-dialog-modal-row {
display: flex; display: flex;
background: $model-body-color-3d; background: $model-body-color-3d;
...@@ -201,52 +203,51 @@ ...@@ -201,52 +203,51 @@
} }
} }
} }
} }
} }
.risk-warn-modal{ .risk-warn-modal {
height: 100%; height: 100%;
.amos-modal-container{ .amos-modal-container {
width: 740px !important; width: 740px !important;
.amos-modal-close{ .amos-modal-close {
color: white; color: white;
background: linear-gradient(180deg, rgba(255, 0, 102, 1) 0%, rgba(255, 0, 102, 1) 0%, rgba(255, 51, 0, 1) 100%, rgba(255, 51, 0, 1) 100%); background: linear-gradient(180deg, rgba(255, 0, 102, 1) 0%, rgba(255, 0, 102, 1) 0%, rgba(255, 51, 0, 1) 100%, rgba(255, 51, 0, 1) 100%);
.amos-modal-close-x{ .amos-modal-close-x {
width: 30px; width: 30px;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
} }
} }
.amos-modal-header{ .amos-modal-header {
background: $model-header-color-3d; background: $model-header-color-3d;
height: 30px; height: 30px;
padding: 0; padding: 0;
.amos-modal-title{ .amos-modal-title {
line-height: 30px; line-height: 30px;
padding-left: 9px; padding-left: 9px;
} }
} }
.amos-modal-content{ .amos-modal-content {
padding: 1rem 2rem 2rem 2rem; padding: 1rem 2rem 2rem 2rem;
max-height: 45rem; max-height: 45rem;
.risk-warn{ .risk-warn {
.risk-warn-header{ .risk-warn-header {
padding-bottom: 1rem; padding-bottom: 1rem;
padding-top: 0.5rem; padding-top: 0.5rem;
padding-left: 0.5rem; padding-left: 0.5rem;
border: 1px solid $core-border-color; border: 1px solid $core-border-color;
margin-bottom: 1rem; margin-bottom: 1rem;
} }
.risk-warn-table{ .risk-warn-table {
.ant-table-title{ .ant-table-title {
display: none; display: none;
} }
.ant-table-body{ .ant-table-body {
max-height: 35rem !important; max-height: 35rem !important;
} }
} }
.risk-warn-content{ .risk-warn-content {
padding-bottom: 2rem; padding-bottom: 2rem;
border: 1px solid $core-border-color; border: 1px solid $core-border-color;
margin-top: 1rem; margin-top: 1rem;
...@@ -256,34 +257,34 @@ ...@@ -256,34 +257,34 @@
} }
} }
.risk-warn-toast{ .risk-warn-toast {
width: 740px; width: 740px;
.amos-toast-inner-content{ .amos-toast-inner-content {
.amos-toast-inner-title{ .amos-toast-inner-title {
width: 100%; width: 100%;
height: 31px; height: 31px;
background: $model-header-color-3d; background: $model-header-color-3d;
line-height: 31px; line-height: 31px;
padding-left: 9px; padding-left: 9px;
} }
.amos-toast-inner-content{ .amos-toast-inner-content {
.risk-warn{ .risk-warn {
.risk-warn-header{ .risk-warn-header {
padding-bottom: 1rem; padding-bottom: 1rem;
padding-top: 0.5rem; padding-top: 0.5rem;
padding-left: 0.5rem; padding-left: 0.5rem;
border: 1px solid $core-border-color; border: 1px solid $core-border-color;
margin-bottom: 1rem; margin-bottom: 1rem;
} }
.risk-warn-table{ .risk-warn-table {
.ant-table-title{ .ant-table-title {
display: none; display: none;
} }
.ant-table-body{ .ant-table-body {
max-height: 35rem !important; max-height: 35rem !important;
} }
} }
.risk-warn-content{ .risk-warn-content {
padding-bottom: 2rem; padding-bottom: 2rem;
border: 1px solid $core-border-color; border: 1px solid $core-border-color;
margin-top: 1rem; margin-top: 1rem;
...@@ -291,10 +292,10 @@ ...@@ -291,10 +292,10 @@
} }
} }
} }
.amos-toast-inner-close{ .amos-toast-inner-close {
color: white; color: white;
top: 22px; top: 22px;
i{ i {
padding: 9px; padding: 9px;
background: red; background: red;
} }
......
src/styles/view/biz/equipmentLedger/equipment.scss
View file @ 9f13cbfd
...@@ -42,17 +42,17 @@ ...@@ -42,17 +42,17 @@
button { button {
height: 2.5rem; height: 2.5rem;
margin-left: -0.9px !important; margin-left: -0.9px !important;
background: $content-color; background: $header-button;
border: 1px solid $core-border-color; border: $page-border-style;
opacity: 1; opacity: 1;
} }
.ant-table-tbody { .ant-table-tbody {
.highlight-row { .highlight-row {
background: #ecf6fd; background: $table-highlight-row;
&:hover { &:hover {
background: #ecf6fd; background: $table-highlight-row;
} }
} }
...@@ -174,9 +174,9 @@ ...@@ -174,9 +174,9 @@
padding-left: 20px; padding-left: 20px;
font-size: 15px; font-size: 15px;
line-height: 40px; line-height: 40px;
color: $biz-table-font-color; color: $content-color;
text-align: left; text-align: left;
background-color: $biz-title-color;//rgba(40, 40, 40, 1); background-color: $div-header-background;//rgba(40, 40, 40, 1);
} }
} }
...@@ -188,8 +188,8 @@ ...@@ -188,8 +188,8 @@
button { button {
height: 2.5rem; height: 2.5rem;
margin-left: -0.9px !important; margin-left: -0.9px !important;
background: $content-color; background: $header-button;
border: 1px solid $core-border-color; border: $page-border-style;
opacity: 1; opacity: 1;
} }
} }
...@@ -205,12 +205,21 @@ ...@@ -205,12 +205,21 @@
width: 60% !important; width: 60% !important;
height: 76%; height: 76%;
.amos-upload-select-picture-card {
background: $card-backgtround;
}
.amos-modal-close {
height: 4%;
}
.amos-modal-header { .amos-modal-header {
// background: #f2f2f2; // background: #f2f2f2;
height: 4%;
} }
.amos-modal-content { .amos-modal-content {
height: 82%; height: 89%;
max-height: none; max-height: none;
padding-top: 1rem; padding-top: 1rem;
...@@ -218,6 +227,10 @@ ...@@ -218,6 +227,10 @@
padding-bottom: 1rem; padding-bottom: 1rem;
text-align: right; text-align: right;
.ant-select-selection {
background-color: $card-backgtround;
border: $page-border-style;
}
.amos-idropdown-toggle { .amos-idropdown-toggle {
margin-right: 1rem; margin-right: 1rem;
text-align: left; text-align: left;
...@@ -230,10 +243,41 @@ ...@@ -230,10 +243,41 @@
min-width: 42px; min-width: 42px;
} }
} }
.ant-select-tree-node-content-wrapper {
background: none;
span {
color: $content-color;
display: flex;
}
&:hover {
background: $select-tree-hover;
}
&.ant-select-tree-node-selected {
background: $select-tree-hover;
}
}
.ant-select-not-found {
color: $content-color;
}
.ant-select-tree-dropdown .ant-select-dropdown-search .ant-select-search__field {
background: none;
border: $page-border-style;
}
.ant-select-tree li span.ant-select-tree-switcher {
color: $content-color;
}
} }
.amos-modal-footer { .amos-modal-footer {
// background: #f2f2f2; // background: #f2f2f2;
height: 7%;
} }
} }
...@@ -245,6 +289,10 @@ ...@@ -245,6 +289,10 @@
border: 1px solid #d8d8d8; border: 1px solid #d8d8d8;
} }
.amos-upload-list-item {
border: $page-border-style;
}
.risk_factor_input { .risk_factor_input {
width: 20rem; width: 20rem;
} }
...@@ -327,4 +375,16 @@ ...@@ -327,4 +375,16 @@
} }
} }
.custom-eb-modal {
.amos-modal-container {
.amos-modal-header {
.amos-modal-title {
color: white;
}
}
}
.amos-modal-footer {
border: $page-border-style;
}
}
src/styles/view/biz/equipmentLedger/fireResource.scss
View file @ 9f13cbfd
...@@ -300,9 +300,9 @@ ...@@ -300,9 +300,9 @@
padding-left: 20px; padding-left: 20px;
font-size: 15px; font-size: 15px;
line-height: 30px; line-height: 30px;
color: $biz-table-font-color; color: $content-color;
text-align: left; text-align: left;
background-color: $biz-title-color;//rgba(40, 40, 40, 1); background-color: $div-header-background;//rgba(40, 40, 40, 1);
} }
} }
...@@ -366,6 +366,10 @@ ...@@ -366,6 +366,10 @@
.amos-modal-content { .amos-modal-content {
max-height: unset; max-height: unset;
img {
width: 100%;
}
} }
::-webkit-scrollbar { ::-webkit-scrollbar {
......
src/styles/view/biz/point/pointInfo.scss
View file @ 9f13cbfd
...@@ -173,7 +173,6 @@ ...@@ -173,7 +173,6 @@
opacity: 1 !important; opacity: 1 !important;
} }
} }
.amos-cardpane { .amos-cardpane {
&.amos-cardpane-bordered { &.amos-cardpane-bordered {
&.amos-cardpane-animate { &.amos-cardpane-animate {
...@@ -201,4 +200,10 @@ ...@@ -201,4 +200,10 @@
} }
} }
} }
.porint-title {
color: black;
background: transparent;
height: '100%';
width: '100%';
}
} }
src/styles/view/biz/precontrol.scss
View file @ 9f13cbfd
@import './../var.scss'; @import './../var.scss';
@import '~amos-framework/lib/styles/mixins/scrollbar.scss';
$scrollOutColor: rgba(#dedede, 0.3);
$scrollInnerColor: rgba(black, 0.1);
.tabs-outside-precontrol { .tabs-outside-precontrol {
width: 100%; width: 100%;
...@@ -10,10 +14,12 @@ ...@@ -10,10 +14,12 @@
.amos-tabs-list { .amos-tabs-list {
height: 35px; height: 35px;
padding: 0 !important; padding: 0 !important;
border: 0;
.amos-tabs-tabitem-inner { .amos-tabs-tabitem-inner {
height: 35px; height: 35px;
margin-left: 0 !important; margin-left: 0 !important;
color: white;
} }
.amos-tabs-tabitem-active { .amos-tabs-tabitem-active {
...@@ -24,6 +30,11 @@ ...@@ -24,6 +30,11 @@
border-bottom: 1px solid #108ee9 !important; border-bottom: 1px solid #108ee9 !important;
} }
} }
.amos-popover-trigger-disabled * {
background: $page-header-background;
color: $content-color;
}
} }
.amos-tabs-panel { .amos-tabs-panel {
...@@ -54,8 +65,8 @@ ...@@ -54,8 +65,8 @@
button { button {
height: 2.5rem; height: 2.5rem;
margin-left: -0.9px !important; margin-left: -0.9px !important;
background: $content-color; background: $header-button;
border: 1px solid $core-border-color; border: $page-border-style;
opacity: 1; opacity: 1;
} }
} }
...@@ -89,6 +100,7 @@ ...@@ -89,6 +100,7 @@
} }
.eva-model { .eva-model {
@include pretty-scrollbar(5px, 8px, $scrollOutColor, $scrollInnerColor);
height: calc(90vh); height: calc(90vh);
overflow: scroll; overflow: scroll;
...@@ -100,13 +112,25 @@ ...@@ -100,13 +112,25 @@
.ant-table-pagination { .ant-table-pagination {
display: none; display: none;
} }
.amos-cardpane-bordered {
margin-bottom: 5px;
border: $page-border-style;
&:hover {
border: 0;
}
}
.amos-cardpane-body {
border-top: 0;
}
} }
button { button {
height: 2.5rem; height: 2.5rem;
margin-left: -0.9px !important; margin-left: -0.9px !important;
background: $content-color; background: $header-button;
border: 1px solid $core-border-color; border: $page-border-style;
opacity: 1; opacity: 1;
} }
...@@ -133,10 +157,10 @@ ...@@ -133,10 +157,10 @@
.ant-table-tbody { .ant-table-tbody {
.highlight-row { .highlight-row {
background: #ecf6fd; background: $table-highlight-row;
&:hover { &:hover {
background: #ecf6fd; background: $table-highlight-row;
} }
} }
...@@ -151,6 +175,15 @@ ...@@ -151,6 +175,15 @@
background: $biz-title-color; background: $biz-title-color;
} }
.amos-modal-content {
padding-top: 30px;
.amos-textarea {
background: none;
color: white;
}
}
.amos-modal-footer { .amos-modal-footer {
background: $biz-title-color; background: $biz-title-color;
} }
......
src/styles/view/biz/riskModel/riskModel.scss
View file @ 9f13cbfd
@import './../../var.scss'; @import './../../var.scss';
@import '~amos-framework/lib/styles/mixins/scrollbar.scss';
$scrollOutColor: rgba(#dedede, 0.3);
$scrollInnerColor: rgba(black, 0.1);
.risk-model { .risk-model {
height: 100%; height: 100%;
button { button {
opacity: 1; opacity: 1;
background: $page-header-background;
} }
.risk-level-map { .risk-level-map {
...@@ -38,7 +43,7 @@ ...@@ -38,7 +43,7 @@
text-align: center; text-align: center;
padding: 8px 0; padding: 8px 0;
border-color: $biz-border-color; border-color: $biz-border-color;
background-color: $biz-title-color; background-color: $page-header-background;
} }
position: absolute; position: absolute;
width: 60%; width: 60%;
...@@ -74,7 +79,7 @@ ...@@ -74,7 +79,7 @@
text-align: center; text-align: center;
padding: 8px 0; padding: 8px 0;
border-color: $biz-border-color; border-color: $biz-border-color;
background-color: $biz-title-color; background-color: $page-header-background;
} }
.risk-model-eva-con { .risk-model-eva-con {
height: calc(100% - 37px); height: calc(100% - 37px);
...@@ -112,43 +117,57 @@ ...@@ -112,43 +117,57 @@
.ant-tabs-bar { .ant-tabs-bar {
padding-top: 10px; padding-top: 10px;
margin-bottom: -1px; margin-bottom: -1px;
border-bottom: $page-border-style;
.ant-tabs-tab { .ant-tabs-tab {
margin-right: -1px !important; background: $header-button;
background: white !important;
border-radius: 0 !important; border-radius: 0 !important;
border: $page-border-style;
&:hover {
background: $button-hover;
}
} }
.ant-tabs-tab-active { .ant-tabs-tab-active {
margin-right: -1px !important; margin-right: -1px !important;
background: #f4f4f4 !important; background: $button-hover;
border-radius: 0 !important; border-radius: 0 !important;
border: $page-border-style;
border-left: 0;
} }
.ant-tabs-extra-content { .ant-tabs-extra-content {
padding-right: 10px; padding-right: 10px;
} }
.ant-tabs-tab-inner {
color: $content-color;
}
} }
button { button {
height: 2.5rem; height: 2.5rem;
margin-left: -0.9px !important; margin-left: -0.9px !important;
background: $content-color; background: $header-button;
border: 1px solid $core-border-color;
opacity: 1; opacity: 1;
border: $page-border-style;
&:hover {
background: $table-highlight-row;
}
} }
.ant-table-tbody { .ant-table-tbody {
.highlight-row { .highlight-row {
background: #ecf6fd; background: $table-highlight-row;
&:hover { &:hover {
background: #ecf6fd; background: $table-highlight-row;
} }
} }
.normal-row { .normal-row {
background: white; background: $content-color;
} }
} }
...@@ -164,11 +183,21 @@ ...@@ -164,11 +183,21 @@
.ant-tabs-content { .ant-tabs-content {
left: -50px; left: -50px;
padding-top: 50px; padding-top: 50px;
.amos-select-title {
background: none;
}
.amos-select-dropdown-icon {
background: none;
}
} }
} }
} }
.risk-model-table { .risk-model-table {
@include pretty-scrollbar(5px, 8px, $scrollOutColor, $scrollInnerColor);
width: 100%; width: 100%;
&.fmea-table { &.fmea-table {
...@@ -200,6 +229,7 @@ ...@@ -200,6 +229,7 @@
.risk-model-button { .risk-model-button {
display: block; display: block;
margin-left: 0 !important; margin-left: 0 !important;
width: 100%;
} }
.share-model-button { .share-model-button {
...@@ -218,7 +248,7 @@ ...@@ -218,7 +248,7 @@
border: solid; border: solid;
border-width: 1px; border-width: 1px;
border-style: hidden hidden solid hidden; border-style: hidden hidden solid hidden;
background: $biz-title-color; background: $page-header-background;
border-color: $biz-border-color; border-color: $biz-border-color;
text-align: center; text-align: center;
.amos-input { .amos-input {
...@@ -251,7 +281,7 @@ ...@@ -251,7 +281,7 @@
border: solid; border: solid;
border-width: 1px; border-width: 1px;
border-style: hidden hidden solid hidden; border-style: hidden hidden solid hidden;
background: $biz-title-color; background: $page-header-background;
border-color: $biz-border-color; border-color: $biz-border-color;
text-align: center; text-align: center;
.amos-input { .amos-input {
...@@ -273,7 +303,7 @@ ...@@ -273,7 +303,7 @@
.ant-table-tbody { .ant-table-tbody {
.highlight-row { .highlight-row {
background: #ecf6fd; background: $table-highlight-row;
} }
} }
} }
...@@ -287,7 +317,7 @@ ...@@ -287,7 +317,7 @@
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
text-align: center; text-align: center;
background: $biz-title-color; background: $page-header-background;
border: solid; border: solid;
border-color: $biz-border-color; border-color: $biz-border-color;
border-style: hidden hidden solid; border-style: hidden hidden solid;
...@@ -330,7 +360,7 @@ ...@@ -330,7 +360,7 @@
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
text-align: center; text-align: center;
background: $biz-title-color; background: $page-header-background;
border: solid; border: solid;
border-color: $biz-border-color; border-color: $biz-border-color;
border-style: hidden hidden solid; border-style: hidden hidden solid;
...@@ -356,11 +386,14 @@ ...@@ -356,11 +386,14 @@
} }
.risk-model-model { .risk-model-model {
.amos-divider-horizontal {
background: $biz-border-color;
}
.amos-modal-header { .amos-modal-header {
background: $biz-title-color; background: $page-header-background;
} }
.amos-modal-footer { .amos-modal-footer {
background: $biz-title-color; background: $page-header-background;
} }
.amos-modal-container { .amos-modal-container {
// width: 50% !important; // width: 50% !important;
......
src/styles/view/biz/situation/alarm.scss
View file @ 9f13cbfd
@import './../../var.scss'; @import './../../var.scss';
.alarm-view { .alarm-view {
padding: 10px;
.ant-table-title { .ant-table-title {
display: none; display: none;
} }
.alarm-view-search { .custom-alarm-view-search {
width: 100%; width: 100%;
height: 45px; height: 45px;
line-height: 40px; line-height: 40px;
background-color: $biz-title-color; background-color: $page-header-background;
.alarm-view-select-1 { .alarm-view-select-1 {
display: inline-block; display: inline-block;
...@@ -39,16 +38,83 @@ ...@@ -39,16 +38,83 @@
.aficon-down { .aficon-down {
&::before { &::before {
color: $core-color; color: $content-color;
} }
} }
.ant-calendar-picker-icon { .ant-calendar-picker-icon {
color: $core-color; &::after{
color: $content-color;
}
} }
.ant-calendar-picker-input { .ant-calendar-picker-input {
height: 30px; height: 30px;
border: $page-border-style;
background: $page-header-background;
color: $content-color;
}
.amos-select-dropdown {
border: $page-border-style;
}
.amos-input {
border: $page-border-style;
margin-right: 5px;
}
.ant-calendar-range-picker-separator {
color: $content-color;
}
}
}
.custom-picker {
&.ant-calendar-picker-container {
.ant-calendar {
background: $custom-picker-color;
.ant-calendar-month-panel-cell-disabled {
a {
color: #bcbcbc;
}
}
}
.ant-calendar-date-input-wrap {
.ant-calendar-input {
background-color: $custom-picker-color;
color: $content-color;
}
}
}
.ant-calendar-range {
.ant-calendar-range-middle {
color: white;
}
.ant-calendar-in-range-cell {
&:before{
background: #4e6490;
}
}
&.ant-calendar-time{
.ant-calendar-time-picker-combobox {
background: $custom-picker-color;
}
}
}
.ant-calendar-month-panel {
background: $custom-picker-color;
}
.ant-calendar-year-panel {
background: $custom-picker-color;
} }
.ant-calendar-decade-panel {
background: $custom-picker-color;
} }
} }
src/styles/view/console/stationMainten/StationMainten.scss
View file @ 9f13cbfd
@import './../../var.scss';
.stationMainten-body-left { .stationMainten-body-left {
width: 100%; width: 100%;
...@@ -54,4 +56,32 @@ ...@@ -54,4 +56,32 @@
.text-div{ .text-div{
line-height: 35px; line-height: 35px;
} }
.amos-select-title {
background: none;
color: $content-color;
}
.amos-select-dropdown-icon {
background: none;
color: $content-color;
}
.amos-input.amos-textarea {
background: none;
color: $content-color;
}
}
.grid-case-header {
background-color: $page-header-background;
.amos-col-5 {
color: $content-color;
}
}
.stationMainten-body-right {
height: '614px';
border: $page-border-style;
} }
src/styles/view/planMgmt/text.scss
View file @ 9f13cbfd
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
margin-bottom: 10px; margin-bottom: 10px;
cursor: pointer; cursor: pointer;
display: flex; display: flex;
background: url(/src/assets/common/disaster/disaster-item.png) no-repeat; // background: url(../../../assets/common/disaster/disaster-item.png) no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
.plan-item { .plan-item {
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
} }
.nav-item-active { .nav-item-active {
background: url(/src/assets/common/disaster/disaster-active.png) no-repeat; // background: url(/src/assets/common/disaster/disaster-active.png) no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
} }
} }
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
margin-bottom: 10px; margin-bottom: 10px;
cursor: pointer; cursor: pointer;
display: flex; display: flex;
background: url(/src/assets/common/disaster/disaster-item.png) no-repeat; // background: url(../../../assets/common/disaster/disaster-item.png) no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
.plan-item { .plan-item {
...@@ -247,7 +247,7 @@ ...@@ -247,7 +247,7 @@
} }
.nav-item-active { .nav-item-active {
background: url(/src/assets/common/disaster/disaster-active.png) no-repeat; // background: url(/src/assets/common/disaster/disaster-active.png) no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
} }
} }
......
src/styles/view/var.scss
View file @ 9f13cbfd
...@@ -71,6 +71,15 @@ $core-bg2-color: #f2f2f2; ...@@ -71,6 +71,15 @@ $core-bg2-color: #f2f2f2;
$biz-table-font-color: black; $biz-table-font-color: black;
$biz-table-title-color: $component-bg; $biz-table-title-color: $component-bg;
$biz-title-color: rgba(243, 243, 243, 1);//$component-bg-active; $biz-title-color: rgba(243, 243, 243, 1);//$component-bg-active;
$biz-border-color: rgba(201, 201, 201, 1); $biz-border-color: #1f5383;
$model-header-color-3d: #ebebeb; $model-header-color-3d: #ebebeb;
$model-body-color-3d: #f9f9f9; $model-body-color-3d: #f9f9f9;
$page-header-background: #01133b;
$page-border-style: 1px solid #1f5383;
$custom-picker-color: #063c8c;
$table-highlight-row: #4f7e9f;
$button-hover: rgba(30,72,142,0.7);
$header-button: #052152;
$div-header-background: #1f5383;
$card-backgtround: #06153e;
$select-tree-hover: #084bb0;
src/utils/processor.js
View file @ 9f13cbfd
import * as utils from 'amos-processor/lib/utils'; import * as utils from 'amos-processor/lib/utils';
import * as bitUtils from './../view/bizview/common/tableComponent/tool';
const { renderSimpleTime } = utils.tool; const { renderSimpleTime } = utils.tool;
...@@ -23,6 +24,7 @@ const trimFormData = function(form) { ...@@ -23,6 +24,7 @@ const trimFormData = function(form) {
}; };
export default { export default {
tool: { ...bitUtils },
...utils, ...utils,
renderTimeValue, renderTimeValue,
trimFormData trimFormData
......
src/view/bizview/checkManage/checkDetail/CheckDetailNew.js
View file @ 9f13cbfd
...@@ -8,7 +8,7 @@ import { fetchCheckDetailById, fetchCheckInputByIdNew, fetchShortByCheckIdAndChe ...@@ -8,7 +8,7 @@ import { fetchCheckDetailById, fetchCheckInputByIdNew, fetchShortByCheckIdAndChe
import CheckDetailTable from './CheckDetailTable'; import CheckDetailTable from './CheckDetailTable';
import CheckInputTable from './CheckInputTable'; import CheckInputTable from './CheckInputTable';
import { XJBaseURI } from './../../../../consts/urlConsts'; import { XJBaseURI } from './../../../../consts/urlConsts';
import { tool } from './../../../../utils/processor'; import { renderLongTime } from './../../../bizview/common/tableComponent/tool';
import Picture from './Picture'; import Picture from './Picture';
import { pathMapping } from './../../../../routes/customRoutes'; import { pathMapping } from './../../../../routes/customRoutes';
import { Table } from 'amos-antd/lib'; import { Table } from 'amos-antd/lib';
...@@ -16,7 +16,6 @@ import './cdn.scss'; ...@@ -16,7 +16,6 @@ import './cdn.scss';
const CheckListPath = () => pathMapping.checkDetail; const CheckListPath = () => pathMapping.checkDetail;
const { renderLongTime } = tool;
const checkDetailHeaderResult = checkDetail => { const checkDetailHeaderResult = checkDetail => {
let checkTime = '巡检时间'; let checkTime = '巡检时间';
......
src/view/bizview/checkManage/checkDetail/Picture.js
View file @ 9f13cbfd
...@@ -47,7 +47,7 @@ class Picture extends Component { ...@@ -47,7 +47,7 @@ class Picture extends Component {
{ imgs.length === 0 && { imgs.length === 0 &&
<div className="points-details-empty" style={emptyStyle}> <div className="points-details-empty" style={emptyStyle}>
<img src={imgStatic.datapane.smilingFace} style={imgStyle} alt="" /> <img src={imgStatic.datapane.smilingFace} style={imgStyle} alt="" />
<p>暂无图片</p> <p className="content">暂无图片</p>
</div> </div>
} }
</div> </div>
......
src/view/bizview/checkManage/checkDetail/index.js
View file @ 9f13cbfd
...@@ -9,14 +9,14 @@ import CheckDetailTable from './CheckDetailTable'; ...@@ -9,14 +9,14 @@ import CheckDetailTable from './CheckDetailTable';
import CheckInputTable from './CheckInputTable'; import CheckInputTable from './CheckInputTable';
import './../../../../styles/view/biz/checkDetail/checkDetail.scss'; import './../../../../styles/view/biz/checkDetail/checkDetail.scss';
import { XJBaseURI } from './../../../../consts/urlConsts'; import { XJBaseURI } from './../../../../consts/urlConsts';
import { tool } from './../../../../utils/processor'; import { renderLongTime } from './../../../bizview/common/tableComponent/tool';
import Picture from '../../../3dview/points/maxcontent/Picture'; import Picture from '../../../3dview/points/maxcontent/Picture';
import { pathMapping } from './../../../../routes/customRoutes'; import { pathMapping } from './../../../../routes/customRoutes';
import BizIcon from './../../../common/icon/BizIcon'; import BizIcon from './../../../common/icon/BizIcon';
const CheckListPath = () => pathMapping.pointCheckList; const CheckListPath = () => pathMapping.pointCheckList;
const { renderLongTime } = tool;
const checkDetailHeaderResult = checkDetail => { const checkDetailHeaderResult = checkDetail => {
let checkTime; let checkTime;
......
src/view/bizview/common/biz/ImportFile.js
View file @ 9f13cbfd
...@@ -63,7 +63,7 @@ class ImportFile extends Component { ...@@ -63,7 +63,7 @@ class ImportFile extends Component {
const { visible, form, title, rules } = this.state; const { visible, form, title, rules } = this.state;
return ( return (
<Modal <Modal
modalClass="" modalClass="custom-eb-modal"
width={450} width={450}
visible={visible} visible={visible}
onCancel={this.onCancel} onCancel={this.onCancel}
......
src/view/bizview/common/tableComponent/table/AmosGridTable.js
View file @ 9f13cbfd
...@@ -17,15 +17,15 @@ class AmosGridTable extends Component { ...@@ -17,15 +17,15 @@ class AmosGridTable extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
selectedRowKeys: [],//表格选择的行key值集合 selectedRowKeys: [], //表格选择的行key值集合
selectedRows: [],//表格选择的行数据集合 selectedRows: [], //表格选择的行数据集合
loading: false,//页面是否加载中,默认false loading: false, //页面是否加载中,默认false
dataList: [],//表格数据集合 dataList: [], //表格数据集合
size: 'middle',//表格大小 size: 'middle', //表格大小
current: props.defaultPageConfig ? props.defaultPageConfig.current : 1,//当前页初始索引0 current: props.defaultPageConfig ? props.defaultPageConfig.current : 1, //当前页初始索引0
pageSize: props.defaultPageConfig ? props.defaultPageConfig.pageSize : 10,//当前页数据量 pageSize: props.defaultPageConfig ? props.defaultPageConfig.pageSize : 10, //当前页数据量
filter: {},//表格过滤条件 filter: {}, //表格过滤条件
totals: 1,//所有数据总和 totals: 1, //所有数据总和
showFilter: true, showFilter: true,
otherFilter: props.otherFilter, otherFilter: props.otherFilter,
maxHeight: 450 maxHeight: 450
...@@ -42,17 +42,17 @@ class AmosGridTable extends Component { ...@@ -42,17 +42,17 @@ class AmosGridTable extends Component {
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
if (nextProps.url !== this.props.url){ if (nextProps.url !== this.props.url) {
this.reload(); this.reload();
} }
if (nextProps.otherFilter && nextProps.otherFilter !== this.props.otherFilter){ if (nextProps.otherFilter && nextProps.otherFilter !== this.props.otherFilter) {
this.setState({ otherFilter: nextProps.otherFilter }, this.reload); this.setState({ otherFilter: nextProps.otherFilter }, this.reload);
} }
let { current, pageSize } = this.state; let { current, pageSize } = this.state;
if (nextProps.totals > 0 && Math.ceil(nextProps.totals / pageSize) < current ) { if (nextProps.totals > 0 && Math.ceil(nextProps.totals / pageSize) < current) {
this.setState({ current: Math.ceil(nextProps.totals / pageSize) }); this.setState({ current: Math.ceil(nextProps.totals / pageSize) });
} }
if (nextProps.current === 0 && this.state.current !== 1 && (nextProps.current !== this.state.current)){ if (nextProps.current === 0 && this.state.current !== 1 && nextProps.current !== this.state.current) {
this.onPaginationChange(nextProps.current + 1); this.onPaginationChange(nextProps.current + 1);
} }
} }
...@@ -61,104 +61,111 @@ class AmosGridTable extends Component { ...@@ -61,104 +61,111 @@ class AmosGridTable extends Component {
window.removeEventListener('resize', this.onWindowResize); window.removeEventListener('resize', this.onWindowResize);
} }
onWindowResize = (e) => { onWindowResize = e => {
this.getHeightOffset(); this.getHeightOffset();
} };
/** /**
* 获取复选框选择的数据，并进行回调 * 获取复选框选择的数据，并进行回调
*/ */
onSelectChange = (selectedRowKeys,selectedRows) => { onSelectChange = (selectedRowKeys, selectedRows) => {
this.setState({ this.setState(
{
selectedRowKeys, selectedRowKeys,
selectedRows selectedRows
},this.props.getSelectedRows(selectedRows,selectedRowKeys)); },
} this.props.getSelectedRows(selectedRows, selectedRowKeys)
);
};
/** /**
* 设置页面数据大小事件 * 设置页面数据大小事件
*/ */
onSizeChange = (current, pageSize) => { onSizeChange = (current, pageSize) => {
let { setPageConfig } = this.props; let { setPageConfig } = this.props;
setPageConfig && setPageConfig({ current, pageSize }); setPageConfig && setPageConfig({ current, pageSize });
this.setState({ current, pageSize },this.reload); this.setState({ current, pageSize }, this.reload);
} };
/** /**
* 设置当前页事件 * 设置当前页事件
*/ */
onPaginationChange = (current) => { onPaginationChange = current => {
let { setPageConfig } = this.props; let { setPageConfig } = this.props;
setPageConfig && setPageConfig({ current }); setPageConfig && setPageConfig({ current });
this.setState({ current },this.reload); this.setState({ current }, this.reload);
} };
/** /**
* 获取表格所有的外部按钮封装成数组 * 获取表格所有的外部按钮封装成数组
*/ */
getbtns = () => { getbtns = () => {
let btns = []; let btns = [];
return <div key={`btntool`} className='amos-grid-oper-btn'>{this.props.operBtns}</div>; return (
} <div key={`btntool`} className="amos-grid-oper-btn">
{this.props.operBtns}
</div>
);
};
/** /**
* 获取表格数据的筛选条件，通过回调获得的，并通过该条件进行表格刷新获取 * 获取表格数据的筛选条件，通过回调获得的，并通过该条件进行表格刷新获取
*/ */
changeFilters = (obj) => { changeFilters = obj => {
let newobj = obj; let newobj = obj;
let res = {}; let res = {};
let list = Object.keys(newobj); let list = Object.keys(newobj);
list.map(e=>{ list.map(e => {
let varName = newobj[e]; let varName = newobj[e];
if (varName && varName !== ''){ if (varName && varName !== '') {
res[e] = varName; res[e] = varName;
if (e === 'enabled'){ if (e === 'enabled') {
res[e] = varName === '启用'; res[e] = varName === '启用';
} }
} }
}); });
this.setState({ filter: res },this.reload); this.setState({ filter: res }, this.reload);
} };
openFilter = () => { openFilter = () => {
let showFilter = this.state.showFilter; let showFilter = this.state.showFilter;
this.setState({ showFilter: !showFilter }); this.setState({ showFilter: !showFilter });
} };
/** /**
* 获取表格数据（刷新） * 获取表格数据（刷新）
*/ */
reload = () => { reload = () => {
let { current,pageSize,filter,otherFilter } = this.state; let { current, pageSize, filter, otherFilter } = this.state;
this.props.getTableDataAction({ current: current - 1, pageSize },JSON.stringify(filter),otherFilter); this.props.getTableDataAction({ current: current - 1, pageSize }, JSON.stringify(filter), otherFilter);
this.getHeightOffset(); this.getHeightOffset();
} };
/** /**
* 获取表格内部按钮 * 获取表格内部按钮
*/ */
addOperateCol =(text,record) =>{ addOperateCol = (text, record) => {
const { operateCol } = this.props; const { operateCol } = this.props;
let operBtns = operateCol(text,record); let operBtns = operateCol(text, record);
return (<div className='operation-buttons'>{operBtns}</div>); return <div className="operation-buttons">{operBtns}</div>;
} };
showTotal = (total) => { showTotal = total => {
return `共 ${total} 条`; return `共 ${total} 条`;
} };
generateRowkey = (record, index) => { generateRowkey = (record, index) => {
// return record.id ? record.id : UUID.uuidFast(); // return record.id ? record.id : UUID.uuidFast();
return record.id ? record.id : index + (this.state.current - 1) * this.state.pageSize; return record.id ? record.id : index + (this.state.current - 1) * this.state.pageSize;
// return index + (this.state.current - 1) * this.state.pageSize; // return index + (this.state.current - 1) * this.state.pageSize;
} };
getHeightOffset = () => { getHeightOffset = () => {
let { getPanelHeight } = this.props; let { getPanelHeight } = this.props;
let height = getPanelHeight ? getPanelHeight() : 450; let height = getPanelHeight ? getPanelHeight() : 450;
height && this.setState({ maxHeight: height }); height && this.setState({ maxHeight: height });
} };
isVisableSearch(columns){ isVisableSearch(columns) {
let list = columns; let list = columns;
let res = false; let res = false;
list.map((e)=>{ list.map(e => {
if (e.query){ if (e.query) {
res = true; res = true;
return true; return true;
} }
...@@ -167,8 +174,8 @@ class AmosGridTable extends Component { ...@@ -167,8 +174,8 @@ class AmosGridTable extends Component {
} }
render() { render() {
const { loading, selectedRowKeys,size,maxHeight } = this.state; const { loading, selectedRowKeys, size, maxHeight } = this.state;
let { columns, isChecked, operateCol, isTreeTable, isPageable, pagination, dataList, totals,rowClassName, onRowClick, onRowDoubleClick } = this.props; let { columns, isChecked, operateCol, isTreeTable, isPageable, pagination, dataList, totals, rowClassName, onRowClick, onRowDoubleClick } = this.props;
console.log(maxHeight); console.log(maxHeight);
//设置复选框参数 //设置复选框参数
let rowSelection = { let rowSelection = {
...@@ -178,10 +185,11 @@ class AmosGridTable extends Component { ...@@ -178,10 +185,11 @@ class AmosGridTable extends Component {
//设置是否添加复选框 //设置是否添加复选框
rowSelection = isChecked ? rowSelection : undefined; rowSelection = isChecked ? rowSelection : undefined;
//如果表格各行存在内部按钮，将各个按钮添加到表格列模型中 //如果表格各行存在内部按钮，将各个按钮添加到表格列模型中
if (operateCol){ if (operateCol) {
columns[columns.length - 1].render = (text,record) => this.addOperateCol(text,record); columns[columns.length - 1].render = (text, record) => this.addOperateCol(text, record);
} }
let tepmPage = Object.assign({ let tepmPage = Object.assign(
{
size: 'small', size: 'small',
total: totals, total: totals,
current: this.state.current, current: this.state.current,
...@@ -192,7 +200,9 @@ class AmosGridTable extends Component { ...@@ -192,7 +200,9 @@ class AmosGridTable extends Component {
showSizeChanger: true showSizeChanger: true
// style: { position: 'fixed', bottom: 0, right: 0 } // style: { position: 'fixed', bottom: 0, right: 0 }
// showTotal: this.showTotal // showTotal: this.showTotal
}, pagination); },
pagination
);
let _tempPagination = isPageable === false ? false : tepmPage; let _tempPagination = isPageable === false ? false : tepmPage;
let bordered = true; let bordered = true;
// 当为true 或 undefined时则分页 // 当为true 或 undefined时则分页
...@@ -202,19 +212,17 @@ class AmosGridTable extends Component { ...@@ -202,19 +212,17 @@ class AmosGridTable extends Component {
let searchStyle = { display }; let searchStyle = { display };
console.log(_pagination); console.log(_pagination);
return ( return (
<div className='grid-content' style={{ height: '100%' }}> <div className="grid-content" style={{ height: '100%' }}>
<div className='oper-bar'> <div className="oper-bar">
<div className='amos-grid-oper-btns'> <div className="amos-grid-oper-btns">
{ {this.getbtns()}
this.getbtns()
}
{ {
// flag ? <SearchBtn className='search-upordown-btn' onclick={this.openFilter} /> : '' // flag ? <SearchBtn className='search-upordown-btn' onclick={this.openFilter} /> : ''
} }
</div> </div>
</div> </div>
<div className={divStyle} style={{ height: 'calc(100% - 50px)' }}> <div className={divStyle} style={{ height: 'calc(100% - 50px)' }}>
{ onRowClick ? {onRowClick ? (
<Table <Table
title={() => ( title={() => (
<div style={searchStyle}> <div style={searchStyle}>
...@@ -232,7 +240,8 @@ class AmosGridTable extends Component { ...@@ -232,7 +240,8 @@ class AmosGridTable extends Component {
scroll={{ y: maxHeight }} scroll={{ y: maxHeight }}
rowClassName={rowClassName} rowClassName={rowClassName}
onRowClick={onRowClick} onRowClick={onRowClick}
/> : />
) : (
<Table <Table
title={() => ( title={() => (
<div style={searchStyle}> <div style={searchStyle}>
...@@ -244,14 +253,14 @@ class AmosGridTable extends Component { ...@@ -244,14 +253,14 @@ class AmosGridTable extends Component {
rowSelection={rowSelection} rowSelection={rowSelection}
columns={columns} columns={columns}
dataSource={dataList} dataSource={dataList}
pagination={{ ..._pagination, style: { position: 'absolute', bottom: '-55px', right: '430px' } }} pagination={{ ..._pagination, style: {bottom: 0, right: 0 } }}
size={size} size={size}
bordered={bordered} bordered={bordered}
scroll={{ y: maxHeight }} scroll={{ y: maxHeight }}
rowClassName={rowClassName} rowClassName={rowClassName}
onRowDoubleClick={onRowDoubleClick} onRowDoubleClick={onRowDoubleClick}
/> />
} )}
</div> </div>
</div> </div>
); );
...@@ -259,14 +268,14 @@ class AmosGridTable extends Component { ...@@ -259,14 +268,14 @@ class AmosGridTable extends Component {
} }
AmosGridTable.propTypes = { AmosGridTable.propTypes = {
url: PropTypes.string,//请求表格数据的url不带参数的 url: PropTypes.string, //请求表格数据的url不带参数的
columns: PropTypes.array,//表格列模型 columns: PropTypes.array, //表格列模型
getSelectedRows: PropTypes.func,//获取选择的行数据，用于各个具体的表格回调获取数据。 getSelectedRows: PropTypes.func, //获取选择的行数据，用于各个具体的表格回调获取数据。
operBtns: PropTypes.array,//表格外部操作按钮，如'新增'，'编辑'等 operBtns: PropTypes.array, //表格外部操作按钮，如'新增'，'编辑'等
isChecked: PropTypes.bool,//表格是否包含复选框 isChecked: PropTypes.bool, //表格是否包含复选框
operateCol: PropTypes.func,//表格内部操作按钮，如'查看详情'等 operateCol: PropTypes.func, //表格内部操作按钮，如'查看详情'等
callBack: PropTypes.func,//获取表格刷新方法，用于各个具体的表格回调获取，方便各种操作后进行表格刷新。 callBack: PropTypes.func, //获取表格刷新方法，用于各个具体的表格回调获取，方便各种操作后进行表格刷新。
otherFilter: PropTypes.string,//其他查询条件 otherFilter: PropTypes.string, //其他查询条件
dataList: PropTypes.array, dataList: PropTypes.array,
getTableDataAction: PropTypes.func, getTableDataAction: PropTypes.func,
selectedRowKeys: PropTypes.array, selectedRowKeys: PropTypes.array,
......
src/view/bizview/equipmentLedger/Equipment/EquipmentModel.js
View file @ 9f13cbfd
...@@ -269,22 +269,27 @@ class EquipmentModel extends Component { ...@@ -269,22 +269,27 @@ class EquipmentModel extends Component {
switch (file.mylist) { switch (file.mylist) {
case 'imageUrl1': case 'imageUrl1':
_form.imageUrl1 = [...imageUrl1, file]; _form.imageUrl1 = [...imageUrl1, file];
this.setState({ form: _form });
break; break;
case 'imageUrl2': case 'imageUrl2':
_form.imageUrl2 = [...imageUrl2, file]; _form.imageUrl2 = [...imageUrl2, file];
this.setState({ form: _form });
break; break;
case 'imageUrl3': case 'imageUrl3':
_form.imageUrl3 = [...imageUrl3, file]; _form.imageUrl3 = [...imageUrl3, file];
this.setState({ form: _form });
break; break;
case 'imageUrl4': case 'imageUrl4':
_form.imageUrl4 = [...imageUrl4, file]; _form.imageUrl4 = [...imageUrl4, file];
this.setState({ form: _form });
break; break;
case 'equipmentPic': case 'equipmentPic':
_form.equipmentPic = [...equipmentPic, file]; _form.equipmentPic = [...equipmentPic, file];
this.setState({ form: _form });
break; break;
} }
this.setState({ form: _form }); // this.setState({ form: _form });
}; };
handlePreview = file => { handlePreview = file => {
...@@ -532,7 +537,7 @@ class EquipmentModel extends Component { ...@@ -532,7 +537,7 @@ class EquipmentModel extends Component {
> >
{form.imageUrl4 ? form.imageUrl4.length >= 1 ? null : uploadButton : uploadButton} {form.imageUrl4 ? form.imageUrl4.length >= 1 ? null : uploadButton : uploadButton}
</Upload> </Upload>
<Modal className='preview-photo-modal' content={<div style={{ width: '560px', maxHeight: '500px',overflowY: 'scroll' }}><img style={{ width: '520px' }} src={previewImage} /></div>} visible={previewVisible} noDefaultFooter onCancel={this.handleCancel} /> <Modal className='preview-photo-modal' content={<div style={{ width: '560px', maxHeight: '500px',overflowY: 'scroll' }}><img src={previewImage} /></div>} visible={previewVisible} noDefaultFooter onCancel={this.handleCancel} />
</div> </div>
</FormItem> </FormItem>
</div> </div>
......
src/view/bizview/pointInfo/PointInfoContent.js
View file @ 9f13cbfd
...@@ -281,9 +281,9 @@ class PointInfo extends Component { ...@@ -281,9 +281,9 @@ class PointInfo extends Component {
const { goBackAction } = this.props; const { goBackAction } = this.props;
const { name, no, realName, checkType, groupName } = pointDetail || {}; const { name, no, realName, checkType, groupName } = pointDetail || {};
let pointName = name + '(' + no + ')'; let pointName = name + '(' + no + ')';
let reactNodespan = React.createElement('span', { style: { color: 'black', backgroundColor: 'transparent' }, height: '100%', width: '100%' }, pointName); let reactNodespan = React.createElement('span', {className:'porint-title'},pointName);
//设置复选框参数 //设置复选框参数 { style: { color: 'black', backgroundColor: 'transparent' }, height: '100%', width: '100%' }
let rowSelection = { let rowSelection = {
selectedRowKeys: selectedRowKeys, selectedRowKeys: selectedRowKeys,
onChange: this.onSelectChange onChange: this.onSelectChange
......
src/view/bizview/preControl/riskModel/index.js
View file @ 9f13cbfd
...@@ -739,11 +739,11 @@ class RiskModel extends Component { ...@@ -739,11 +739,11 @@ class RiskModel extends Component {
position: 'absolute', position: 'absolute',
left: `${pageX}px`, left: `${pageX}px`,
top: `${pageY - 45}px`, top: `${pageY - 45}px`,
backgroundColor: '#ffffff', backgroundColor: 'rgb(79 125 159)',
border: 'solid', border: 'solid',
height: isRegion === 'TRUE' ? '140px' : '70px', height: isRegion === 'TRUE' ? '137px' : '69px',
borderWidth: '1px', borderWidth: '1px',
borderColor: '#c9c9c9' borderColor: 'rgb(31 83 131)'
}; };
const menu = ( const menu = (
<div style={tmpStyle}> <div style={tmpStyle}>
......
src/view/bizview/situation/alarm/AlarmSearch.js
View file @ 9f13cbfd
...@@ -72,7 +72,7 @@ class AlarmSearch extends Component { ...@@ -72,7 +72,7 @@ class AlarmSearch extends Component {
render() { render() {
let { equipData, searchParam } = this.state; let { equipData, searchParam } = this.state;
return ( return (
<div className="alarm-view-search"> <div className="custom-alarm-view-search">
{/*<div className="alarm-view-select-1"> {/*<div className="alarm-view-select-1">
<span>建/构筑物：</span> <span>建/构筑物：</span>
<Select <Select
...@@ -96,6 +96,7 @@ class AlarmSearch extends Component { ...@@ -96,6 +96,7 @@ class AlarmSearch extends Component {
<div className="alarm-view-select-3"> <div className="alarm-view-select-3">
<span>报警时间：</span> <span>报警时间：</span>
<RangePicker <RangePicker
dropdownClassName = "custom-picker"
style = {{width:400}} style = {{width:400}}
format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"
onChange={e => this.onSelectChange('time', e)} onChange={e => this.onSelectChange('time', e)}
......
src/view/bizview/stationMainten/index.js
View file @ 9f13cbfd
...@@ -418,7 +418,7 @@ class StationMainten extends Component { ...@@ -418,7 +418,7 @@ class StationMainten extends Component {
}; };
return ( return (
<div className="grid-case p-20"> <div className="grid-case p-20">
<Row className="mb-5" style={{ height: '40px', lineHeight: '40px', backgroundColor: '#f3f3f3' }}> <Row className="grid-case-header mb-5" style={{ height: '40px', lineHeight: '40px' }}>
<Col span={5}> <Col span={5}>
<span style={{ height: '40px', fontSize: '15px', paddingLeft: '20px' }}>站端维护</span> <span style={{ height: '40px', fontSize: '15px', paddingLeft: '20px' }}>站端维护</span>
</Col> </Col>
...@@ -582,7 +582,7 @@ class StationMainten extends Component { ...@@ -582,7 +582,7 @@ class StationMainten extends Component {
</div> </div>
</Form> </Form>
</Col> </Col>
<Col span={12} style={{ height: '614px', border: '1px solid black' }}> <Col className="stationMainten-body-right" span={12}>
<div style={{ height: '614px' }}> <div style={{ height: '614px' }}>
{ /**this.state.loadAmap && <BasicMap indexViewChange={this.indexViewChange} pushMarkerPoint={this.handleMarkerMap} /> */} { /**this.state.loadAmap && <BasicMap indexViewChange={this.indexViewChange} pushMarkerPoint={this.handleMarkerMap} /> */}
{ this.state.loadAmap && <BasicMap indexViewChange={this.indexViewChange} pushMarkerPoint={this.handleMarkerMap} lalng={lalng} isCanEidt={isCanEidt} /> } { this.state.loadAmap && <BasicMap indexViewChange={this.indexViewChange} pushMarkerPoint={this.handleMarkerMap} lalng={lalng} isCanEidt={isCanEidt} /> }
......
src/view/bizview/task/taskList.js
View file @ 9f13cbfd
...@@ -4,7 +4,7 @@ import dt2react from 'dt2react'; ...@@ -4,7 +4,7 @@ import dt2react from 'dt2react';
import { fetchTaskListAction } from './../../../services/checkInfoService'; import { fetchTaskListAction } from './../../../services/checkInfoService';
import AmosGridTable from './../common/tableComponent/table/AmosGridTable'; import AmosGridTable from './../common/tableComponent/table/AmosGridTable';
import { pathMapping } from './../../../routes/customRoutes'; import { pathMapping } from './../../../routes/customRoutes';
import {renderLongTime} from './../../bizview/common/tableComponent/tool'; import { renderLongTime } from './../../bizview/common/tableComponent/tool';
import TaskSearch from './taskSearch' import TaskSearch from './taskSearch'
// const CheckListPath = pathMapping.pointCheckList; // const CheckListPath = pathMapping.pointCheckList;
......
src/view/mainframe/BizFrame.js
View file @ 9f13cbfd
...@@ -65,6 +65,7 @@ class BizFrame extends Component { ...@@ -65,6 +65,7 @@ class BizFrame extends Component {
if (header) { if (header) {
const body = document.getElementsByClassName('content-body')[0]; const body = document.getElementsByClassName('content-body')[0];
body.style.top = '0px'; body.style.top = '0px';
body.style.height = '100%';
header.style.display = 'none'; header.style.display = 'none';
} }
} }
......
themes/transparent.css
View file @ 9f13cbfd
...@@ -30,14 +30,23 @@ ...@@ -30,14 +30,23 @@
margin-bottom: 0 !important; margin-bottom: 0 !important;
overflow: hidden; overflow: hidden;
background: transparent; background: transparent;
border-top: 1px solid #1f5383;
}
.ant-table-fixed-header .ant-table-header > table {
border-left: 1px solid #1f5383;
}
.ant-table-fixed-header .ant-table-body >table {
border-left: 1px solid #1f5383;
} }
.ant-table-header > table { .ant-table-header > table {
border-top: #1f5383 !important; border-top: #1f5383 !important;
} }
.ant-table-bordered .ant-table-body > table { .ant-table-header > table {
border: 1px solid #1f5383 !important; border-top: #1f5383 !important;
} }
.ant-table-content .ant-table-placeholder { .ant-table-content .ant-table-placeholder {
...@@ -79,11 +88,6 @@ ...@@ -79,11 +88,6 @@
border: 1px solid rgba(0, 185, 255, 0.6) !important; border: 1px solid rgba(0, 185, 255, 0.6) !important;
} }
/* 分页样式 */
.ant-pagination {
border-top: 1px solid #1f5383 !important;
}
.ant-pagination .ant-pagination-total-text { .ant-pagination .ant-pagination-total-text {
color: white; color: white;
} }
...@@ -822,7 +826,7 @@ carousel-content { ...@@ -822,7 +826,7 @@ carousel-content {
background: rgba(255, 255, 255, 0); background: rgba(255, 255, 255, 0);
} }
.point-view .point-first-row { .point-view .point-first-row {
height: 40%; height: 37%;
margin: 10px; margin: 10px;
color: white; color: white;
background: rgba(255, 255, 255, 0); background: rgba(255, 255, 255, 0);
...@@ -886,7 +890,10 @@ carousel-content { ...@@ -886,7 +890,10 @@ carousel-content {
background: rgba(255, 255, 255, 0); background: rgba(255, 255, 255, 0);
border-color: #143c70; border-color: #143c70;
} }
.point-view .create-device-root .create-device-host-bottom .device-list-content .ant-table-header {
border-top: 1px solid #143c70;
border-left: 1px solid #143c70;
}
.point-view .create-device-root .create-device-host-top { .point-view .create-device-root .create-device-host-top {
width: 100%; width: 100%;
height: 40px; height: 40px;
...@@ -1005,7 +1012,7 @@ carousel-content { ...@@ -1005,7 +1012,7 @@ carousel-content {
background: inherit; background: inherit;
background-color: rgba(255, 255, 255, 0); background-color: rgba(255, 255, 255, 0);
border-radius: 0 0 0 0; border-radius: 0 0 0 0;
border-color: #ddddde; border-color: #143c70;
font-size: 18px; font-size: 18px;
color: white; color: white;
text-align: left; text-align: left;
...@@ -1050,7 +1057,7 @@ carousel-content { ...@@ -1050,7 +1057,7 @@ carousel-content {
background: rgba(255, 255, 255, 0); background: rgba(255, 255, 255, 0);
border-top: 2px solid #143c70; border-top: 2px solid #143c70;
border-bottom: 1px solid #143c70; border-bottom: 1px solid #143c70;
border-left: 24px solid #143c70; border-left: 1px solid #143c70;
} }
.pointinfo-content .col_groupcolor4 { .pointinfo-content .col_groupcolor4 {
width: 8%; width: 8%;
...@@ -1394,6 +1401,15 @@ carousel-content { ...@@ -1394,6 +1401,15 @@ carousel-content {
.rayd-modal { .rayd-modal {
background-color: rgb(6, 21, 62) !important; background-color: rgb(6, 21, 62) !important;
} }
.rayd-modal .rayd-icon.rayd-success.rayd-animate-success-icon .rayd-success-circular-line-left {
display: none;
}
.rayd-modal .rayd-icon.rayd-success.rayd-animate-success-icon .rayd-success-fix {
display: none;
}
.rayd-modal .rayd-icon.rayd-success.rayd-animate-success-icon .rayd-success-circular-line-right {
display: none;
}
:root .amos-tree li span.amos-tree-switcher.amos-tree-switcher-close::after { :root .amos-tree li span.amos-tree-switcher.amos-tree-switcher-close::after {
font-size: 12px; font-size: 12px;
color: white; color: white;
...@@ -1478,10 +1494,10 @@ li.ant-calendar-time-picker-select-option-selected { ...@@ -1478,10 +1494,10 @@ li.ant-calendar-time-picker-select-option-selected {
.risk-assessment-view .amos-layout-has-sider .amos-layout .amos-layout-content .risk-assessment-view-content .risk-incidence-severity-matrix { .risk-assessment-view .amos-layout-has-sider .amos-layout .amos-layout-content .risk-assessment-view-content .risk-incidence-severity-matrix {
width: 494px !important; width: 494px !important;
} }
.risk-assessment-view-situation-matrix amos-layout-content .risk-assessment-view-situation{ .risk-assessment-view-situation-matrix amos-layout-content .risk-assessment-view-situation {
width: 494px !important; width: 494px !important;
} }
.amos-echarts-container{ .amos-echarts-container {
height: 100% !important; height: 100% !important;
} }
...@@ -1491,6 +1507,64 @@ li.ant-calendar-time-picker-select-option-selected { ...@@ -1491,6 +1507,64 @@ li.ant-calendar-time-picker-select-option-selected {
.important-equipment .ant-table-tbody .normal-row { .important-equipment .ant-table-tbody .normal-row {
background: transparent !important; background: transparent !important;
} }
.ant-select-dropdown .ant-select-dropdown-menu-item,
.ant-select-tree li .ant-select-tree-node-content-wrapper,
.ant-select-tree li .ant-select-tree-switcher_open,
.ant-select-tree li .ant-select-tree-switcher_close,
.ant-dropdown-menu .ant-dropdown-menu-item,
.ui-menu .ui-menu-item {
color: white;
background: rgba(27, 52, 87);
}
.pointinfo-content .porint-title {
color: white;
background: transparent;
height: '100%';
width: '100%';
}
.ant-fullcalendar {
font-size: 12px;
line-height: 1.5;
outline: none;
border-top: 1px solid #143c70;
}
.point-view
.create-device-root
.create-device-host-bottom
.create-device-host-left
.ant-fullcalendar.ant-fullcalendar-full
.ant-fullcalendar-calendar-body
.ant-fullcalendar-table
thead
> tr
> th {
line-height: 40px;
color: white;
background: #345fa6;
border: 1px solid #143c70;
}
.checkDetail-root .check-header .check-detail-header {
width: 100%;
float: left;
color: white;
background: #143c70;
padding-left: 10px;
text-align: left;
}
.checkDetail-root .check-detail-content-input .check-detail-content2 .ant-table-content .ant-table-header {
border-top: 1px solid #143c70;
border-left: 1px solid #143c70;
}
.checkDetail-root .check-detail-content-input .check-detail-content2 .ant-table-content .ant-table-body {
border-left: 1px solid #143c70;
}
.checkDetail-root .content-parent .content {
float: left;
width: 70%;
padding-top: 10px;
padding-left: 10px;
color: white;
}
.dutyPage{ .dutyPage{
background-color: transparent !important; background-color: transparent !important;
......
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