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