Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JSH ERP
Commits
6abbddea
Commit
6abbddea
authored
Sep 05, 2021
by
季圣华
Browse files
iframe高度优化
parent
0ed2101e
Changes
2
Hide whitespace changes
Inline
Side-by-side
jshERP-web/src/components/layouts/IframePageView.vue
View file @
6abbddea
...
...
@@ -5,12 +5,12 @@
<
script
>
import
Vue
from
'
vue
'
import
{
ACCESS_TOKEN
}
from
"
@/store/mutation-types
"
import
PageLayout
from
'
../page/PageLayout
'
import
RouteView
from
'
./RouteView
'
import
{
mixinDevice
}
from
'
@/utils/mixin.js
'
export
default
{
name
:
"
IframePageContent
"
,
inject
:[
'
closeCurrent
'
],
mixins
:
[
mixinDevice
],
data
()
{
return
{
url
:
""
,
...
...
@@ -33,7 +33,11 @@
goUrl
()
{
let
url
=
this
.
$route
.
meta
.
url
this
.
id
=
this
.
$route
.
path
this
.
height
=
document
.
documentElement
.
clientHeight
-
130
if
(
this
.
isMobile
())
{
this
.
height
=
800
}
else
{
this
.
height
=
document
.
documentElement
.
clientHeight
-
130
}
console
.
log
(
"
------url------
"
+
url
)
console
.
log
(
"
------token------
"
+
Vue
.
ls
.
get
(
ACCESS_TOKEN
))
if
(
url
!==
null
&&
url
!==
undefined
)
{
...
...
jshERP-web/src/mixins/JeecgListMixin.js
View file @
6abbddea
...
...
@@ -61,7 +61,6 @@ export const JeecgListMixin = {
}
},
created
()
{
this
.
initScroll
()
if
(
!
this
.
disableMixinCreated
){
//console.log(' -- mixin created -- ')
this
.
loadData
();
...
...
@@ -69,16 +68,11 @@ export const JeecgListMixin = {
this
.
initDictConfig
();
//初始化按钮权限
this
.
initActiveBtnStr
();
//初始化列表横向或纵向滚动
this
.
initScroll
()
}
},
methods
:{
initScroll
()
{
if
(
this
.
isMobile
())
{
this
.
scroll
.
y
=
''
}
else
{
this
.
scroll
.
y
=
document
.
documentElement
.
clientHeight
-
330
}
},
loadData
(
arg
)
{
if
(
!
this
.
url
.
list
){
this
.
$message
.
error
(
"
请设置url.list属性!
"
)
...
...
@@ -362,6 +356,13 @@ export const JeecgListMixin = {
}
}
}
},
initScroll
()
{
if
(
this
.
isMobile
())
{
this
.
scroll
.
y
=
''
}
else
{
this
.
scroll
.
y
=
document
.
documentElement
.
clientHeight
-
330
}
}
}
...
...
Write
Preview
Supports
Markdown
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