Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-cr20g
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
Administrator
dsk-cr20g
Commits
19c4c11d
Commit
19c4c11d
authored
Oct 20, 2023
by
tianhongyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
style fix
parent
68aa5757
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
5 deletions
+13
-5
index.vue
.../views/enterpriseData/components/searchTheOwner/index.vue
+8
-0
index.vue
dsk-operate-ui/src/views/market/index.vue
+5
-5
No files found.
dsk-operate-ui/src/views/enterpriseData/components/searchTheOwner/index.vue
View file @
19c4c11d
...
@@ -916,6 +916,14 @@ export default {
...
@@ -916,6 +916,14 @@ export default {
}
}
}
}
}
}
.
checkbox
{
.
checkbox
-
content
{
.
el
-
checkbox
{
margin
-
bottom
:
15
px
;
}
}
}
}
}
::
v
-
deep
.
dialog
-
renlin
{
::
v
-
deep
.
dialog
-
renlin
{
margin
-
top
:
40
vh
!
important
;
margin
-
top
:
40
vh
!
important
;
...
...
dsk-operate-ui/src/views/market/index.vue
View file @
19c4c11d
<
template
>
<
template
>
<div
v-loading=
"loading"
class=
"market-container"
>
<div
v-loading=
"loading"
class=
"market-container"
>
<!--
<iframe
id=
"companyIframe"
class=
"market-iframe"
marginwidth=
"0"
marginheight=
"0"
frameborder=
"0"
scrolling=
"no"
width=
"100%"
:style=
"
{ height: iframeHight + 'px' }"
:src="src" /> -->
<iframe
id=
"companyIframe"
class=
"market-iframe"
marginwidth=
"0"
marginheight=
"0"
scrolling=
"no"
frameborder=
"0"
width=
"100%"
:src=
"src"
/>
<iframe
id=
"companyIframe"
class=
"market-iframe"
marginwidth=
"0"
marginheight=
"0"
scrolling=
"no"
frameborder=
"0"
width=
"100%"
:src=
"src"
/>
<transition
name=
"fade"
mode=
"out-in"
appear
>
<transition
name=
"fade"
mode=
"out-in"
appear
>
...
@@ -24,7 +22,7 @@ export default {
...
@@ -24,7 +22,7 @@ export default {
loading
:
false
,
// 是否加载完成-当前页控制
loading
:
false
,
// 是否加载完成-当前页控制
iframeTimer
:
''
,
// 是否加载中定时器-当前页控制
iframeTimer
:
''
,
// 是否加载中定时器-当前页控制
footHeight
:
0
,
//底部高度,若为0(页面内部嵌套或者没有底部板块)
footHeight
:
0
,
//底部高度,若为0(页面内部嵌套或者没有底部板块)
iframeHight
:
window
.
innerHeight
,
// iframe高度-当前页控制
iframeHight
:
`
${
window
.
innerHeight
}
px`
,
// iframe高度-当前页控制
navigation
:
{
isFixed
:
true
,
fixedHeight
:
56
,
totalHeight
:
68
},
// iframe之外页面顶部对象,ifFixed:是否浮动;fixedHeight:浮动对象高度;totalHeight:顶部整体高度
navigation
:
{
isFixed
:
true
,
fixedHeight
:
56
,
totalHeight
:
68
},
// iframe之外页面顶部对象,ifFixed:是否浮动;fixedHeight:浮动对象高度;totalHeight:顶部整体高度
src
:
''
,
//iframe嵌套页面地址
src
:
''
,
//iframe嵌套页面地址
domain
:
'https://plug.jiansheku.com'
,
// 插件地址
domain
:
'https://plug.jiansheku.com'
,
// 插件地址
...
@@ -40,14 +38,16 @@ export default {
...
@@ -40,14 +38,16 @@ export default {
if
(
window
.
location
.
host
===
'http://szh.jiansheku.com'
||
window
.
location
.
host
===
'szh.jiansheku.com'
)
{
if
(
window
.
location
.
host
===
'http://szh.jiansheku.com'
||
window
.
location
.
host
===
'szh.jiansheku.com'
)
{
this
.
domain
=
'https://plug.jiansheku.com'
;
this
.
domain
=
'https://plug.jiansheku.com'
;
}
else
{
}
else
{
this
.
domain
=
'https://pre-plug.jiansheku.com'
this
.
domain
=
'https://pre-plug.jiansheku.com'
;
// this.domain = 'http://192.168.60.104:3400';
}
}
this
.
gettokens
();
this
.
gettokens
();
window
.
addEventListener
(
"message"
,
this
.
pagecapListener
,
{
passive
:
true
});
window
.
addEventListener
(
"message"
,
this
.
pagecapListener
,
{
passive
:
true
});
},
},
mounted
()
{
mounted
()
{
//
this.iframeLoading(); // 判断iframe页面是否加载完成-当前页控制
this
.
iframeLoading
();
// 判断iframe页面是否加载完成-当前页控制
// steerScroll('companyIframe', this.navigation, this.footHeight, true); // iframeId: iframe的id;navigation:页面排除iframe后剩下的顶部高度;footHeight: 页面排除iframe后剩下的底部高度;state:监听or移除监听;parentId: 父级id[不带默认就是铺满整个页面]];_this:指向当前实例(可忽略)
// steerScroll('companyIframe', this.navigation, this.footHeight, true); // iframeId: iframe的id;navigation:页面排除iframe后剩下的顶部高度;footHeight: 页面排除iframe后剩下的底部高度;state:监听or移除监听;parentId: 父级id[不带默认就是铺满整个页面]];_this:指向当前实例(可忽略)
console
.
log
(
document
.
querySelector
(
".market-iframe"
).
contentWindow
.
document
.
documentElement
.
scrollHeight
);
},
},
beforeDestroy
()
{
beforeDestroy
()
{
clearInterval
(
this
.
iframeTimer
);
// -当前页控制
clearInterval
(
this
.
iframeTimer
);
// -当前页控制
...
...
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