Commit b69e2ec5 authored by xinglei's avatar xinglei

修改样式遮挡

parent 48925c86
...@@ -179,6 +179,7 @@ ...@@ -179,6 +179,7 @@
// 右侧数据区 // 右侧数据区
.datapane-drawer { .datapane-drawer {
display: flex; display: flex;
padding-top: 40px;
// background: $datapane-drawer; // background: $datapane-drawer;
.drawer-bar { .drawer-bar {
......
...@@ -266,7 +266,7 @@ ...@@ -266,7 +266,7 @@
} }
} }
.check-header { .check-header {
height: 40px; height: 40px;
...@@ -360,17 +360,17 @@ ...@@ -360,17 +360,17 @@
display: none; display: none;
} }
} }
.xun{ .xun{
.amos-modal-container{ .amos-modal-container{
top: 6%; top: 13%;
} }
.amos-modal-content { .amos-modal-content {
max-height: 48em; max-height: 48em;
} }
} }
\ No newline at end of file
...@@ -470,7 +470,6 @@ class View3D extends Component { ...@@ -470,7 +470,6 @@ class View3D extends Component {
this.timer = setTimeout(() => { this.timer = setTimeout(() => {
this.transferAlarmData(); this.transferAlarmData();
let flag= this.props.flag; let flag= this.props.flag;
debugger
if(flag&&flag===1){ if(flag&&flag===1){
let pointName= this.props.pointName; let pointName= this.props.pointName;
let pointAttrs= this.props.pointAttrs; let pointAttrs= this.props.pointAttrs;
...@@ -479,8 +478,8 @@ class View3D extends Component { ...@@ -479,8 +478,8 @@ class View3D extends Component {
let floor= this.props.floor; let floor= this.props.floor;
let pointtype= this.props.pointtype; let pointtype= this.props.pointtype;
if(this.props.city==='xian'){ if(this.props.city==='xian'){
this.onAlarmClick1(pointtype,'floor_'+floor,{ this.onAlarmClick1(pointtype,'floor_'+floor,{
...@@ -519,7 +518,7 @@ class View3D extends Component { ...@@ -519,7 +518,7 @@ class View3D extends Component {
} }
}, 1500); }, 1500);
......
...@@ -31,8 +31,8 @@ class Setting extends Component { ...@@ -31,8 +31,8 @@ class Setting extends Component {
<Scrollbars> <Scrollbars>
<div className="datapane-setting-content"> <div className="datapane-setting-content">
<Collapse className="datapane-setting-collapse" activeKey={['1', '2', '3']} onChange={key=>console.log(key)}> <Collapse className="datapane-setting-collapse" activeKey={['1', '2', '3']} onChange={key=>console.log(key)}>
<Panel header="厂区选择" key="1"> <Panel header="部门选择" key="1">
<Button className="region-select" onClick={this.changeRegion}>切换厂区</Button> <Button className="region-select" onClick={this.changeRegion}>切换部门</Button>
</Panel> </Panel>
<Panel header="账户设置" key="2"> <Panel header="账户设置" key="2">
<UserSetting /> <UserSetting />
......
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