Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-station-module-view
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
station
amos-station-module-view
Commits
8a39e93c
Commit
8a39e93c
authored
Jul 16, 2020
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.修改弹出框样式
2.调整沙盘模式进入后默认显示顶牌
parent
858ea212
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
14 deletions
+29
-14
common.scss
mods/components/3dviewConvertor/styles/common.scss
+11
-1
marker3DFactory.js
...components/3dviewConvertor/view/points/marker3DFactory.js
+18
-13
No files found.
mods/components/3dviewConvertor/styles/common.scss
View file @
8a39e93c
...
@@ -150,11 +150,21 @@
...
@@ -150,11 +150,21 @@
color
:
#fff
;
color
:
#fff
;
background-color
:
transparent
;
background-color
:
transparent
;
}
}
}
}
.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);
...
...
mods/components/3dviewConvertor/view/points/marker3DFactory.js
View file @
8a39e93c
...
@@ -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,18 +187,23 @@ export default function marker3DFactory(WrappedComponent = 'div', options) {
...
@@ -187,18 +187,23 @@ 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
)
{
obj
.
node
.
on
(
EVENT_TYPE_CORE
.
MouseEnter
,
evt
=>
{
this
.
setTopCardConf
(
obj
,
extData
);
if
(
!
isEditMode
)
{
}
else
{
this
.
setTopCardConf
(
obj
,
extData
);
// 鼠标移入
}
obj
.
node
.
on
(
EVENT_TYPE_CORE
.
MouseEnter
,
evt
=>
{
});
if
(
!
isEditMode
)
{
// 鼠标移出
this
.
setTopCardConf
(
obj
,
extData
);
obj
.
node
.
on
(
EVENT_TYPE_CORE
.
MouseLeave
,
evt
=>
{
}
if
(
!
isEditMode
)
{
});
obj
.
baseObjHelper
.
title
=
null
;
// 鼠标移出
}
obj
.
node
.
on
(
EVENT_TYPE_CORE
.
MouseLeave
,
evt
=>
{
});
if
(
!
isEditMode
)
{
obj
.
baseObjHelper
.
title
=
null
;
}
});
}
});
});
}
}
buildMarkerOptions
=
(
markers
,
markerType
,
defaultParams
=
{})
=>
{
buildMarkerOptions
=
(
markers
,
markerType
,
defaultParams
=
{})
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment