wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
wuhongjian 2022-07-26 18:08:28 +08:00
parent c2b323b14c 7c2cc4a7f1
commit a0361b2eba
2 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
back/src/views/modules/ability/bsabilityai.vue
View File

@ -50,7 +50,7 @@
border border
@selection-change="dataListSelectionChangeHandle" @selection-change="dataListSelectionChangeHandle"
style="width: 100%" style="width: 100%"
:height="qp ? '650px' : '650px'" height="650px"
> >
<el-table-column <el-table-column
type="selection" type="selection"
@ -126,7 +126,7 @@
fixed="right" fixed="right"
header-align="center" header-align="center"
align="center" align="center"
width="300" width="150"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-button <!-- <el-button
@ -284,7 +284,7 @@ export default {
selectType: 0, selectType: 0,
type: '组件服务' type: '组件服务'
}, },
qp: false, // qp: false,
// 关联应用弹窗 // 关联应用弹窗
relateApplicationVisible: false, relateApplicationVisible: false,
relateInfo: { relateInfo: {
@ -306,8 +306,8 @@ export default {
this.dataForm.type = '组件服务' this.dataForm.type = '组件服务'
}, },
mounted () { mounted () {
window.addEventListener('resize', this.a) // window.addEventListener('resize', this.a)
this.fullScreen() // this.fullScreen()
}, },
methods: { methods: {
reset () { reset () {
@ -448,17 +448,17 @@ export default {
this.$message.error('查询信息不能为空') this.$message.error('查询信息不能为空')
} }
}, },
fullScreen () { // fullScreen () {
if (window.outerHeight === screen.availHeight) { // if (window.outerHeight === screen.availHeight) {
if (window.outerWidth === screen.availWidth) { // if (window.outerWidth === screen.availWidth) {
this.qp = false // this.qp = false
} else { // } else {
this.qp = true // this.qp = true
} // }
} else { // } else {
this.qp = true // this.qp = true
} // }
}, // },
// 点击关联应用按钮 // 点击关联应用按钮
showRelateApplication (row) { showRelateApplication (row) {
this.$http this.$http

70
back/src/views/modules/ability/bsabilityservice.vue
View File

@ -52,7 +52,7 @@
border border
@selection-change="dataListSelectionChangeHandle" @selection-change="dataListSelectionChangeHandle"
style="width: 100%" style="width: 100%"
:height="qp ? '810px' : '650px'" height="650px"
> >
<el-table-column <el-table-column
type="selection" type="selection"
@ -287,8 +287,8 @@ export default {
this.dataForm.type = '应用资源' this.dataForm.type = '应用资源'
}, },
mounted () { mounted () {
window.addEventListener('resize', this.a) // window.addEventListener('resize', this.a)
this.fullScreen() // this.fullScreen()
}, },
methods: { methods: {
reset () { reset () {
@ -425,38 +425,38 @@ export default {
this.$message.error('查询不能输入为空') this.$message.error('查询不能输入为空')
} }
}, },
fullScreen () { // fullScreen () {
if (window.outerHeight === screen.availHeight) { // if (window.outerHeight === screen.availHeight) {
if (window.outerWidth === screen.availWidth) { // if (window.outerWidth === screen.availWidth) {
console.log( // console.log(
'全屏1', // '全屏1',
window.outerHeight, // window.outerHeight,
screen.availHeight, // screen.availHeight,
window.outerWidth, // window.outerWidth,
screen.availWidth // screen.availWidth
) // )
this.qp = false // this.qp = false
} else { // } else {
console.log( // console.log(
'不是全屏2', // '不是全屏2',
window.outerHeight, // window.outerHeight,
screen.availHeight, // screen.availHeight,
window.outerWidth, // window.outerWidth,
screen.availWidth // screen.availWidth
) // )
this.qp = true // this.qp = true
} // }
} else { // } else {
console.log( // console.log(
'不是全屏3', // '不是全屏3',
window.outerHeight, // window.outerHeight,
screen.availHeight, // screen.availHeight,
window.outerWidth, // window.outerWidth,
screen.availWidth // screen.availWidth
) // )
this.qp = true // this.qp = true
} // }
}, // },
// 应用与组件 // 应用与组件
applyAndAssembly (val) { applyAndAssembly (val) {
console.log('vvvv', val) console.log('vvvv', val)