root/apt-nl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iframe

Browse Source
This commit is contained in:
caill
2023-05-25 17:33:51 +08:00
parent 40fa4484ce
commit d8d2702e9f
5 changed files with 46 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/pages/modules/systemmanage/role.vue
View File

@@ -187,9 +187,11 @@ export default {
return return
} }
try { try {
await sysRoleAdd(this.rolename, this.remark) let res = await sysRoleAdd(this.rolename, this.remark)
this.toast('操作成功') if (res.code === '1') {
this._sysRoleQuery() this._sysRoleQuery()
}
this.toast(res.desc)
this.$refs.child.active = false this.$refs.child.active = false
this.$refs.child.disabled = false this.$refs.child.disabled = false
} catch (e) { } catch (e) {
@@ -205,9 +207,11 @@ export default {
return return
} }
try { try {
await sysRoleEdit(this.pkObj.roleId, this.rolename, this.remark) let res = await sysRoleEdit(this.pkObj.roleId, this.rolename, this.remark)
this.toast('操作成功') if (res.code === '1') {
this._sysRoleQuery() this._sysRoleQuery()
}
this.toast(res.desc)
this.$refs.child.active = false this.$refs.child.active = false
this.$refs.child.disabled = false this.$refs.child.disabled = false
} catch (e) { } catch (e) {
@@ -218,9 +222,11 @@ export default {
async _sysRoleDelete () { async _sysRoleDelete () {
this.$refs.child.disabled = true this.$refs.child.disabled = true
try { try {
await sysRoleDelete([this.pkObj.roleId]) let res = await sysRoleDelete([this.pkObj.roleId])
this.toast('操作成功') if (res.code === '1') {
this._sysRoleQuery() this._sysRoleQuery()
}
this.toast(res.desc)
this.$refs.child.active = false this.$refs.child.active = false
this.$refs.child.disabled = false this.$refs.child.disabled = false
} catch (e) { } catch (e) {

24
src/pages/modules/systemmanage/user.vue
View File

@@ -290,9 +290,11 @@ export default {
phone: this.phone, phone: this.phone,
rolesIds: rolesIds rolesIds: rolesIds
} }
await usersEdit(obj) let res = await usersEdit(obj)
this.toast('操作成功') if (res.code === '1') {
this._usersQuery() this._usersQuery()
}
this.toast(res.desc)
this.$refs.child.active = false this.$refs.child.active = false
this.$refs.child.disabled = false this.$refs.child.disabled = false
} catch (e) { } catch (e) {
@@ -307,9 +309,11 @@ export default {
userId: this.pkObj.userId, userId: this.pkObj.userId,
password: '123456' password: '123456'
} }
await usersEdit(obj) let res = await usersEdit(obj)
this.toast('操作成功') if (res.code === '1') {
this._usersQuery() this._usersQuery()
}
this.toast(res.desc)
this.$refs.child.active = false this.$refs.child.active = false
this.$refs.child.disabled = false this.$refs.child.disabled = false
} catch (e) { } catch (e) {
@@ -320,9 +324,11 @@ export default {
async _usersDelete () { async _usersDelete () {
this.$refs.child.disabled = true this.$refs.child.disabled = true
try { try {
await usersDelete([this.pkObj.userId]) let res = await usersDelete([this.pkObj.userId])
this.toast('操作成功') if (res.code === '1') {
this._usersQuery() this._usersQuery()
}
this.toast(res.desc)
this.$refs.child.active = false this.$refs.child.active = false
this.$refs.child.disabled = false this.$refs.child.disabled = false
} catch (e) { } catch (e) {

11
src/pages/modules/teach/teach.vue
View File

@@ -1,12 +1,19 @@
<template> <template>
<div class="body-conatiner"> <div class="body-conatiner">
<iframe class="iframe" src="../static/Magic4/HMI_JavaApp_FullScreen.html" frameborder="0"></iframe> <div class="iframe_wrap">
<!-- <iframe class="iframe" src="http://127.0.0.1:5555/HMI_JavaApp_FullScreen.html" frameborder="0"></iframe> --> <iframe class="iframe" src="../static/Magic4/HMI_JavaApp_FullScreen.html" frameborder="0" vspace="70"></iframe>
</div>
</div> </div>
</template> </template>
<style lang="stylus" scoped> <style lang="stylus" scoped>
@import '~@style/mixin' @import '~@style/mixin'
.iframe_wrap
position relative
_wh(100%, 100%)
.iframe .iframe
position absolute
top -70px
left 0
_wh(100%, 100%) _wh(100%, 100%)
</style> </style>

2
src/pages/shells/index/index.vue
View File

@@ -228,7 +228,6 @@ export default {
z-index 150 z-index 150
_fj() _fj()
_wh(100%, 81px) _wh(100%, 81px)
overflow-x auto
line-height 79px line-height 79px
padding 0 10px padding 0 10px
border-bottom 1px solid #f1f1f1 border-bottom 1px solid #f1f1f1
@@ -348,4 +347,5 @@ export default {
padding 0 10px padding 0 10px
} }
} }
</style> </style>

6
src/style/reset.css
View File

@@ -71,6 +71,12 @@ html,body {
/* max-width: 1920px; */ /* max-width: 1920px; */
} }
@media only screen and (max-width: 1440px) {
html,body {
width: 1440px
}
}
select, option, textarea { select, option, textarea {
appearance: none; appearance: none;
outline: none; outline: none;