Skip to content

A
amos-station-module-view
Commit b4770190 authored by suhuiguang's avatar suhuiguang
Browse files
Options

Merge branch 'developer' of http://172.16.10.76/station/amos-station-module-view into developer

# Conflicts: # mods/components/3dviewConvertor/styles/view/panoramic/statistical.scss
parents 568c914c 4db3067d
Show whitespace changes
Inline Side-by-side
Showing with 118 additions and 141 deletions
amos.config.js
View file @ b4770190
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
objModelURI: '/a3dres', objModelURI: '/a3dres',
// 根url // 根url
// baseURI: 'http://172.16.11.30:9008/', // baseURI: 'http://172.16.11.30:9008/',
baseURI: 'http://172.16.3.77:8083/', baseURI: 'http://172.16.3.122:8083/',
// convertorURI: 'http://172.16.3.122:8083/', // convertorURI: 'http://172.16.3.122:8083/',
convertorURI: 'http://172.16.3.77:8083/', convertorURI: 'http://172.16.3.122:8083/',
patrolURI: 'http://172.16.3.77:9000/', patrolURI: 'http://172.16.3.122:9000/',
rulesConfigURI: 'http://172.16.10.91:8080/', rulesConfigURI: 'http://172.16.10.91:8080/',
// plugin URI // plugin URI
pluginURI: 'http://172.16.11.40:8099/', pluginURI: 'http://172.16.11.40:8099/',
......
mods/components/3dviewConvertor/styles/searchpane.scss
View file @ b4770190
.search-pane-bg{ .search-pane-bg {
position: absolute; position: absolute;
right: 20px; right: 20px;
bottom: 20px; bottom: 20px;
width: 460px; width: 460px;
height: 600px; height: 600px;
background: url('../assets/convertor/3dview/searchpane-background.png'); background: url('../assets/convertor/3dview/searchpane-background.png');
filter:blur(3px); filter: blur(3px);
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
z-index: 99; z-index: 99;
} }
#amos-ad-triger-6--root{
.ant-calendar{
background-color: #13428f !important;
border:none !important;
.ant-calendar-input{
background-color: #13428f !important;
}
}
}
.amos-popover-content{ .amos-popover-content {
::-webkit-scrollbar { /* 血槽宽度 */ ::-webkit-scrollbar {
width:5px; /* 血槽宽度 */
width: 5px;
height: 5px; height: 5px;
background-color: rgba(10, 53, 62, 1); background-color: rgba(10, 53, 62, 1);
border-radius: 5px; border-radius: 5px;
} }
::-webkit-scrollbar-thumb { /* 拖动条 */ ::-webkit-scrollbar-thumb {
/* 拖动条 */
border-radius: 5px; border-radius: 5px;
background-color: rgba(255, 255, 255, 0.4); background-color: rgba(255, 255, 255, 0.4);
} }
::-webkit-scrollbar-track { /* 背景槽 */ ::-webkit-scrollbar-track {
background-color:rgba(17, 44, 88, 0.2); /* 背景槽 */
background-color: rgba(17, 44, 88, 0.2);
} }
.amos-select-options{ .amos-select-options {
.modalSelectOption{ .modalSelectOption {
color:#fff; color: #fff;
background-color: #13428f; background-color: #13428f;
} }
.modalSelectOption:hover{ .modalSelectOption:hover {
color:#F0DF2D; color: #f0df2d;
background-color: #13428f background-color: #13428f;
} }
} }
} }
.search-pane{ .search-pane {
position: absolute !important; position: absolute !important;
right: 20px !important; right: 20px !important;
bottom: 20px !important; bottom: 20px !important;
...@@ -56,73 +49,67 @@ ...@@ -56,73 +49,67 @@
height: 600px; height: 600px;
color: white; color: white;
z-index: 999 !important; z-index: 999 !important;
border:1px solid rgba(39,85,162,0.3); border: 1px solid rgba(39, 85, 162, 0.3);
border-radius: 10px; border-radius: 10px;
.search-pane-close {
.search-pane-close{
position: absolute; position: absolute;
width: 30px; width: 30px;
height: 30px; height: 30px;
right: 0; right: 0;
background-image: linear-gradient(0deg, background-image: linear-gradient(0deg, #eb0404 0%, #ff0057 100%);
#eb0404 0%,
#ff0057 100%);
opacity: 0.6; opacity: 0.6;
text-align: center; text-align: center;
padding: 4px; padding: 4px;
.amosicon-close{ .amosicon-close {
font-style: normal; font-style: normal;
} }
} }
.amos-tabs-list {
.amos-tabs-list{
border: none !important; border: none !important;
height: 30px; height: 30px;
background: #13428f !important; background: #13428f !important;
border-radius: 5px; border-radius: 5px;
.amos-tabs-tabitem{ .amos-tabs-tabitem {
background-color: #2755a2; background-color: #2755a2;
margin-right: 8px; margin-right: 8px;
border-radius: 5px; border-radius: 5px;
.amos-tabs-tabitem-inner{ .amos-tabs-tabitem-inner {
padding: 3px 15px; padding: 3px 15px;
.amos-tabs-tabitem-content{ .amos-tabs-tabitem-content {
color: white; color: white;
} }
} }
} }
.amos-tabs-tabitem-active{ .amos-tabs-tabitem-active {
background-color: #036fa7 !important; background-color: #036fa7 !important;
color: white; color: white;
border-radius: 2px 2px 0 0; border-radius: 2px 2px 0 0;
} }
} }
.params-header {
.params-header{
padding: 5px 14px; padding: 5px 14px;
height: 40px; height: 40px;
width: 100%; width: 100%;
.amos-group-item{ .amos-group-item {
float: left; float: left;
} }
.amos-select-dropdown{ .amos-select-dropdown {
border: none !important; border: none !important;
background-color: #13428f; background-color: #13428f;
border-radius: 5px; border-radius: 5px;
} }
.amos-input{ .amos-input {
width: 100%; width: 100%;
border: none !important; border: none !important;
background-color: #13428f; background-color: #13428f;
...@@ -131,16 +118,14 @@ ...@@ -131,16 +118,14 @@
padding: 0 2em 0 0.6em !important; padding: 0 2em 0 0.6em !important;
} }
.params-input-img{ .params-input-img {
position: absolute; position: absolute;
width: 28px; width: 28px;
height: 28px; height: 28px;
right: 14px; right: 14px;
cursor: pointer; cursor: pointer;
} }
.params-input-img1{ .params-input-img1 {
position: absolute; position: absolute;
width: 28px; width: 28px;
height: 28px; height: 28px;
...@@ -148,14 +133,14 @@ ...@@ -148,14 +133,14 @@
cursor: pointer; cursor: pointer;
} }
// .params-datePicker{ // .params-datePicker{
.ant-input{ .ant-input {
background-color: #13428f; background-color: #13428f;
border: none !important; border: none !important;
border-radius: 5px; border-radius: 5px;
color: white; color: white;
} }
// } // }
.ant-calendar-picker-icon:after{ .ant-calendar-picker-icon:after {
color: white; color: white;
} }
...@@ -168,27 +153,20 @@ ...@@ -168,27 +153,20 @@
padding-top: 0px !important; padding-top: 0px !important;
} }
// .search-pane-table{ // .search-pane-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;
} }
.ant-table-thead {
}
.ant-table-content { .ant-table-content {
height: 100%; height: 100%;
.ant-table-header { .ant-table-header {
overflow: hidden !important; overflow: hidden !important;
} }
.ant-table-placeholder { .ant-table-placeholder {
...@@ -200,19 +178,19 @@ ...@@ -200,19 +178,19 @@
.ant-table-body { .ant-table-body {
color: white; color: white;
max-height: 500px !important ; margin-top: 16px;
min-height: 500px !important ; max-height: 464px !important ;
min-height: 464px !important ;
overflow-y: auto !important; overflow-y: auto !important;
overflow-x: hidden; overflow-x: hidden;
background:transparent!important; background: transparent !important;
border:1px solid rgba(234,234,234,0.3); border: 1px solid rgba(234, 234, 234, 0.3);
table { table {
border-color: transparent !important; border-color: transparent !important;
td { td {
border:1px solid rgba(234,234,234,0.3) !important; border: 1px solid rgba(234, 234, 234, 0.3) !important;
} }
th { th {
...@@ -222,118 +200,120 @@ ...@@ -222,118 +200,120 @@
} }
} }
.ant-table-placeholder{ .ant-table-placeholder {
background:transparent!important; background: transparent !important;
color: white; color: white;
} }
.ant-table-thead > tr >th{ .ant-table-thead > tr > th {
color: white; color: white;
background: #2755a2 !important; background: #2755a2 !important;
//background: #222b51 !important; //background: #222b51 !important;
border-color: transparent !important; border-color: transparent !important;
text-align: center; text-align: center;
} }
.ant-table-header > table {
border: 0 !important;
.ant-table-thead > tr.ant-table-row-hover > td, .ant-table-tbody > tr.ant-table-row-hover > td, .ant-table-thead > tr:hover > td, .ant-table-tbody > tr:hover > td { }
background: rgba(255,255,255,0.3); .ant-table-thead > tr.ant-table-row-hover > td,
.ant-table-tbody > tr.ant-table-row-hover > td,
.ant-table-thead > tr:hover > td,
.ant-table-tbody > tr:hover > td {
background: rgba(255, 255, 255, 0.3);
} }
//滚动条样式 //滚动条样式
.ant-table-body{ .ant-table-body {
&::-webkit-scrollbar { &::-webkit-scrollbar {
width: 10px; width: 10px;
height: 10px; height: 10px;
} }
&::-webkit-scrollbar-thumb { &::-webkit-scrollbar-thumb {
background: rgba(39,85,162,0.8); background: rgba(39, 85, 162, 0.8);
border-radius: 10px; border-radius: 10px;
} }
&::-webkit-scrollbar-track { &::-webkit-scrollbar-track {
border-radius: 10px; border-radius: 10px;
background: rgba(2,11,45,0.5); background: rgba(2, 11, 45, 0.5);
border: none; border: none;
} }
&::-webkit-scrollbar-corner { &::-webkit-scrollbar-corner {
background: transparent; background: transparent;
} }
&::-webkit-scrollbar-thumb:hover { &::-webkit-scrollbar-thumb:hover {
background: rgba(39,85,162,1); background: rgba(39, 85, 162, 1);
} }
} }
} }
.ant-table-pagination { .ant-table-pagination {
margin: 0 10px; margin: 0 10px;
float: right; float: right;
.ant-select-selection{ .ant-select-selection {
display: none; display: none;
} }
.ant-pagination-prev{ .ant-pagination-prev {
background-color: rgba(255,255,255,0.5); background-color: rgba(255, 255, 255, 0.5);
} }
.ant-pagination-next{ .ant-pagination-next {
background-color: rgba(255,255,255,0.5); background-color: rgba(255, 255, 255, 0.5);
} }
.ant-pagination-item{ .ant-pagination-item {
background-color: rgba(255,255,255,0.5); background-color: rgba(255, 255, 255, 0.5);
} }
.ant-pagination-jump-prev { .ant-pagination-jump-prev {
background-color: rgba(255,255,255,0.5); background-color: rgba(255, 255, 255, 0.5);
} }
.ant-pagination-jump-next { .ant-pagination-jump-next {
background-color: rgba(255,255,255,0.5); background-color: rgba(255, 255, 255, 0.5);
} }
.ant-pagination-item-active a, .ant-pagination-item-active:focus a, .ant-pagination-item-active:hover a { .ant-pagination-item-active a,
.ant-pagination-item-active:focus a,
.ant-pagination-item-active:hover a {
color: #fff; color: #fff;
} }
} }
// } // }
} }
.ant-calendar-picker-container{ .ant-calendar-picker-container {
.ant-calendar{ .ant-calendar {
border: 1px solid #2b8dd4; border: 1px solid #2b8dd4;
background-color: #2b8dd4; background-color: #2b8dd4;
.ant-calendar-date-input-wrap{ .ant-calendar-date-input-wrap {
color: white; color: white;
.ant-calendar-input{ .ant-calendar-input {
background-color: #2b8dd4; background-color: #2b8dd4;
} }
.ant-calendar-input::-webkit-input-placeholder { .ant-calendar-input::-webkit-input-placeholder {
color: white; color: white;
} }
} }
.ant-calendar-header{ .ant-calendar-header {
color: white; color: white;
div a{ div a {
color: white; color: white;
} }
div span a{ div span a {
color: white; color: white;
} }
} }
.ant-calendar-body{ .ant-calendar-body {
color: white; color: white;
.ant-calendar-cell>.ant-calendar-date{ .ant-calendar-cell > .ant-calendar-date {
color: white; color: white;
} }
.ant-calendar-today>.ant-calendar-date{ .ant-calendar-today > .ant-calendar-date {
color: black; color: black;
} }
} }
.ant-calendar-footer{ .ant-calendar-footer {
color: white; color: white;
.ant-calendar-today-btn { .ant-calendar-today-btn {
color: white; color: white;
} }
} }
} }
} }
mods/components/3dviewConvertor/styles/view/panoramic/statistical.scss
View file @ b4770190
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
// position: absolute; // position: absolute;
// height: 100%; // height: 100%;
// width: 100%; // width: 100%;
.statistical-left { .statistical-left {
position: absolute; position: absolute;
height: 100%; height: 100%;
...@@ -19,20 +18,19 @@ ...@@ -19,20 +18,19 @@
height: 21.7%; height: 21.7%;
overflow-y: auto; overflow-y: auto;
.title-child{ .title-child {
width: 100%; width: 100%;
margin-bottom: 5px; margin-bottom: 5px;
} }
.title-date{ .title-date {
height: 20px; height: 20px;
font-size: 13px; font-size: 13px;
} }
.title-text{ .title-text {
font-size: 15px; font-size: 15px;
} }
} }
::-webkit-scrollbar { ::-webkit-scrollbar {
height: 3px; height: 3px;
width: 3px; width: 3px;
...@@ -42,13 +40,13 @@ ...@@ -42,13 +40,13 @@
background: rgba(255, 0, 0, 0.466); background: rgba(255, 0, 0, 0.466);
} }
::-webkit-scrollbar-track { ::-webkit-scrollbar-track {
border-radius:10px; border-radius: 10px;
background: #0000006e; background: #0000006e;
} }
::-webkit-scrollbar-button{ ::-webkit-scrollbar-button {
display: none; display: none;
} }
::-webkit-scrollbar-corner{ ::-webkit-scrollbar-corner {
display: none; display: none;
} }
...@@ -72,23 +70,22 @@ ...@@ -72,23 +70,22 @@
text-align: center; text-align: center;
} }
.right{ .right {
float: left; float: left;
padding-left: 30px; padding-left: 30px;
.date{ .date {
font-size: 44px; font-size: 44px;
color: rgba(1,248,64,1);; color: rgba(1, 248, 64, 1);
} }
.day{ .day {
margin-left: 5px; margin-left: 5px;
font-size: 18px; font-size: 18px;
} }
span{ span {
font-size: 18px; font-size: 18px;
} }
} }
}
.down{ .down{
height: calc(100% - 90px); height: calc(100% - 90px);
margin-left: 20px; margin-left: 20px;
...@@ -109,21 +106,21 @@ ...@@ -109,21 +106,21 @@
} }
} }
.arrow{ .arrow {
float: right; float: right;
cursor: pointer; cursor: pointer;
} }
.describe{ .describe {
position: absolute; position: absolute;
width: 70px; width: 70px;
margin-top: -5px; margin-top: -5px;
margin-left: 36px; margin-left: 36px;
font-size: 16px; font-size: 16px;
color: rgba(240,223,45,1); color: rgba(240, 223, 45, 1);
} }
.bottom-line{ .bottom-line {
height: 2px; height: 2px;
width: 100%; width: 100%;
margin-top: 25px; margin-top: 25px;
...@@ -131,26 +128,26 @@ ...@@ -131,26 +128,26 @@
} }
} }
.content{ .content {
padding: 0px 30px; padding: 0px 30px;
height: calc(100% - 60px); height: calc(100% - 60px);
overflow: auto; overflow: auto;
span{ span {
margin-top: 3px; margin-top: 3px;
font-size: 14px; font-size: 14px;
color: rgba(255,255,255,1); color: rgba(255, 255, 255, 1);
} }
.title-child{ .title-child {
border-bottom: 1px solid rgba(196,86,86,0.3); border-bottom: 1px solid rgba(196, 86, 86, 0.3);
padding-top: 7px; padding-top: 7px;
} }
} }
} }
} }
.common-title{ .common-title {
font-size: 18px; font-size: 18px;
font-family: SourceHanSansCN-Medium, SourceHanSansCN; font-family: SourceHanSansCN-Medium, SourceHanSansCN;
font-weight: 500; font-weight: 500;
...@@ -187,7 +184,7 @@ ...@@ -187,7 +184,7 @@
margin: 5px; margin: 5px;
} }
.safetyIndex-content-title{ .safetyIndex-content-title {
font-size: 18px; font-size: 18px;
font-family: SourceHanSansCN-Medium, SourceHanSansCN; font-family: SourceHanSansCN-Medium, SourceHanSansCN;
font-weight: 500; font-weight: 500;
...@@ -224,9 +221,9 @@ ...@@ -224,9 +221,9 @@
height: 220px !important; height: 220px !important;
} }
} }
} }
.statistical-right { .statistical-right {
position: absolute; position: absolute;
height: 100%; height: 100%;
width: 355px; width: 355px;
...@@ -254,7 +251,7 @@ ...@@ -254,7 +251,7 @@
margin-top: -4px; margin-top: -4px;
} }
.titleIcon-check{ .titleIcon-check {
display: inline-block; display: inline-block;
height: 22px; height: 22px;
width: 22px; width: 22px;
...@@ -496,7 +493,7 @@ ...@@ -496,7 +493,7 @@
} }
} }
} }
} }
//} //}
.warnModal { .warnModal {
...@@ -505,7 +502,7 @@ ...@@ -505,7 +502,7 @@
// height: 600px; // height: 600px;
width: calc(100% - 800px); width: calc(100% - 800px);
height: calc(100% - 300px); height: calc(100% - 300px);
margin:auto; margin: auto;
top: 250px; top: 250px;
bottom: 250px; bottom: 250px;
left: 250px; left: 250px;
...@@ -513,13 +510,13 @@ ...@@ -513,13 +510,13 @@
background-image: url('../../assets/panoramic/main_bg_model.png'); background-image: url('../../assets/panoramic/main_bg_model.png');
background-repeat: repeat; background-repeat: repeat;
background-size: 100% 100%; background-size: 100% 100%;
.close{ .close {
width: 100%; width: 100%;
height: 50px; height: 50px;
text-align: right; text-align: right;
margin-top: 5px; margin-top: 5px;
margin-right: 3px; margin-right: 3px;
img{ img {
cursor: pointer; cursor: pointer;
} }
} }
...@@ -541,7 +538,7 @@ ...@@ -541,7 +538,7 @@
.model-title { .model-title {
height: 30px; height: 30px;
font-size: 16px; font-size: 16px;
color:rgba(240,223,45,1); color: rgba(240, 223, 45, 1);
} }
.model-content { .model-content {
...@@ -559,7 +556,7 @@ ...@@ -559,7 +556,7 @@
.title { .title {
height: 30px; height: 30px;
font-size: 16px; font-size: 16px;
color:rgba(240,223,45,1); color: rgba(240, 223, 45, 1);
} }
.next-title { .next-title {
...@@ -569,12 +566,12 @@ ...@@ -569,12 +566,12 @@
.rows { .rows {
padding-left: 15px; padding-left: 15px;
font-size: 14px; font-size: 14px;
color:rgba(255,255,255,1); color: rgba(255, 255, 255, 1);
.row { .row {
display: inline-block; display: inline-block;
height: 28px; height: 28px;
>span{ > span {
display: block; display: block;
white-space: nowrap; white-space: nowrap;
margin-right: 15px; margin-right: 15px;
......
mods/components/3dviewConvertor/view/MaskContent.js
View file @ b4770190
...@@ -113,7 +113,7 @@ class MaskContent extends Component { ...@@ -113,7 +113,7 @@ class MaskContent extends Component {
return ( return (
<div className="mask-content"> <div className="mask-content">
<AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData} reconnect debug /> <AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData} reconnect debug />
{ !alarmStarted && sideControlShow && <SideControl multiple={multiple} errorAreaId={errorAreaId} onItemClick={onItemClick} layerConfig={layerConfig} animationProps={controlAnimation} activeAction={activeAction}/>} { !alarmStarted && sideControlShow && <SideControl multiple={multiple} errorAreaId={errorAreaId} onItemClick={onItemClick} layerConfig={layerConfig} animationProps={controlAnimation} />}
{ !alarmStarted && isShowActionBar && <SearchPane visible={searchPaneVisible} focusPosition={focusPosition} changeSearchPaneVisible={this.changeSearchPaneVisible} />} { !alarmStarted && isShowActionBar && <SearchPane visible={searchPaneVisible} focusPosition={focusPosition} changeSearchPaneVisible={this.changeSearchPaneVisible} />}
<TopMsg alarmStart={alarmStart} /> <TopMsg alarmStart={alarmStart} />
{ !alarmStarted && !isShowActionBar && <ModelHeader animationProps={controlAnimation} headerName={headerName} handleExceptModel={this.handleExceptModel} />} { !alarmStarted && !isShowActionBar && <ModelHeader animationProps={controlAnimation} headerName={headerName} handleExceptModel={this.handleExceptModel} />}
......
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