Commit 8a39e93c authored by suhuiguang's avatar suhuiguang

1.修改弹出框样式

2.调整沙盘模式进入后默认显示顶牌
parent 858ea212
...@@ -153,8 +153,18 @@ ...@@ -153,8 +153,18 @@
} }
} }
.ant-table-thead > tr > th {
text-align: center;
background: #2755a2 !important;
border-color: transparent !important;
}
.ant-table-body { .ant-table-body {
margin-top: 1px;
tr { tr {
text-align: center;
background: #2755a2 !important;
border-color: transparent !important;
td { td {
// color: $biz-table-font-color;//#ffffff; // color: $biz-table-font-color;//#ffffff;
// background: $content-color;//rgba(51, 51, 51, 1); // background: $content-color;//rgba(51, 51, 51, 1);
......
...@@ -85,7 +85,7 @@ export default function marker3DFactory(WrappedComponent = 'div', options) { ...@@ -85,7 +85,7 @@ export default function marker3DFactory(WrappedComponent = 'div', options) {
}; };
onMarkerClick = (marker, e) => { onMarkerClick = (marker, e) => {
console.log('click',marker,e);
const { isClick } = this.state; const { isClick } = this.state;
if (this.props.isEditMode) { if (this.props.isEditMode) {
this.props.showRightPanelOnclick(marker); this.props.showRightPanelOnclick(marker);
...@@ -187,6 +187,9 @@ export default function marker3DFactory(WrappedComponent = 'div', options) { ...@@ -187,6 +187,9 @@ export default function marker3DFactory(WrappedComponent = 'div', options) {
if (extData.type === 'riskSource' && markerType !== 'impEquipmentMode' && !isEditMode) { if (extData.type === 'riskSource' && markerType !== 'impEquipmentMode' && !isEditMode) {
this.setTwinkleConf(obj); this.setTwinkleConf(obj);
} }
if (markerType !== 'impEquipmentMode' && !isEditMode) {
this.setTopCardConf(obj, extData);
} else {
// 鼠标移入 // 鼠标移入
obj.node.on(EVENT_TYPE_CORE.MouseEnter, evt => { obj.node.on(EVENT_TYPE_CORE.MouseEnter, evt => {
if (!isEditMode) { if (!isEditMode) {
...@@ -199,6 +202,8 @@ export default function marker3DFactory(WrappedComponent = 'div', options) { ...@@ -199,6 +202,8 @@ export default function marker3DFactory(WrappedComponent = 'div', options) {
obj.baseObjHelper.title = null; obj.baseObjHelper.title = null;
} }
}); });
}
}); });
} }
buildMarkerOptions = (markers, markerType, defaultParams = {}) => { buildMarkerOptions = (markers, markerType, defaultParams = {}) => {
......
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