Skip to content

F
founder_vue
Commit a0a18d40 by 李姝悦
Options

Merge branch 'dev_zwpt' of http://39.99.224.27:9022/changchao/founder_vue into dev

parents 7680cc03 aab9cbb9
Showing with 122 additions and 91 deletions
src/views/xtfkgl/AjXtljfkView.vue
......@@ -38,6 +38,7 @@
</div>
<el-tooltip
:ref="'ajTooltipP'+scope.row.logicId"
class="item"
effect="dark"
placement="right"
......@@ -46,26 +47,26 @@
v-model="scope.row.disabled"
v-if="scope.row.groups && scope.row.groups.length > 4">
<span style="margin-left: 5px" @mouseover="groupItemFocus(scope.$index)">...</span>
<span style="margin-left: 5px"
@mouseenter.stop="showMoreYhView(scope.$index)">...</span>
<div slot="content" class="tooTipBtn" @mouseleave="groupItemNoFocus()">
<div slot="content" class="tooTipBtn" @mouseover="showMoreYhView(scope.$index)"
@mouseleave="hideMoreYhView()">
<div v-for="(item,index) in scope.row.groups">
<div v-if="item.type === 1 && item.user && item.user.length >0">
<el-tooltip
:ref="'ajTooltipC'+item.id"
class="two-tooltip"
effect="dark"
placement="right"
:manual="true"
v-model="item.disabled"
style="transform: translateX(10px);">
style="transform: translateX(8px);">
<div :class="{divtext:item.type === 1}"
style="padding-right: 10px"
@mouseover="twItemFocus(scope.$index,index)">
style="padding-right: 8px">
{{item.name }}
</div>
<div slot="content" class="tooTipBtn"
@mouseover="twItemFocus(scope.$index,index)"
@mouseleave="twoItemNoFocus(scope.$index,index)">
<div ref="kkk" slot="content" class="tooTipBtn"
@mouseover.stop="moveChildView()"
@mouseleave.stop="outChildView()">
<div
v-for="it in item.user"
:title="it.name"
......@@ -192,8 +193,9 @@ export default {
pageSize: 13, // 每页的数据条数
total: 0, // 数据总条数
totalPage: 0, // 总共页数
curOneGradeIndex: -1,
curTwoGradeIndex: -1,
curMoreYhViewIndex: -1,
isInParentView: false,
isInChildView: false,
}
},
created() {
......@@ -211,42 +213,56 @@ export default {
// this.initTestData()
// this.getList()
},
mounted() {
let _that = this
document.addEventListener('click', function (e) {
_that.hideMoreYhView()
})
},
methods: {
twoItemNoFocus(gindex, cindex) {
this.tableDate[gindex].groups[cindex].disabled = false
this.tableDate[gindex].disabled = false
this.curOneGradeIndex = -1
moveChildView() {
this.isInChildView = true
},
twItemFocus(gindex, cindex) {
if (cindex >= 0 && gindex >= 0) {
if (this.curTwoGradeIndex !== cindex && this.curTwoGradeIndex >= 0) {
this.tableDate[gindex].groups[this.curTwoGradeIndex].disabled = false
}
this.tableDate[gindex].groups[cindex].disabled = true
this.tableDate[gindex].disabled = true
this.curOneGradeIndex = gindex
this.curTwoGradeIndex = cindex
}
outChildView() {
this.isInChildView = false
this.hideMoreYhView()
},
groupItemNoFocus() {
if (this.curOneGradeIndex >= 0) {
this.tableDate[this.curOneGradeIndex].disabled = false
}
if (this.curOneGradeIndex >= 0 && this.curTwoGradeIndex >= 0) {
this.tableDate[this.curOneGradeIndex].groups[this.curTwoGradeIndex].disabled = false
showMoreYhView(index) {
this.isInParentView = true
logger.info('tooltipParentEnter', 'tooltipParentEnter-' + index)
if (this.curMoreYhViewIndex !== index && this.curMoreYhViewIndex >= 0) {
this.tableDate[this.curMoreYhViewIndex].disabled = false
}
this.curOneGradeIndex = -1
this.curTwoGradeIndex = -1
this.tableDate[index].disabled = true
this.curMoreYhViewIndex = index
},
groupItemFocus(index) {
if (this.curOneGradeIndex !== index && this.curOneGradeIndex >= 0) {
this.tableDate[this.curOneGradeIndex].disabled = false
}
if (this.curOneGradeIndex >= 0 && this.curTwoGradeIndex >= 0) {
this.tableDate[this.curOneGradeIndex].groups[this.curTwoGradeIndex].disabled = false
hideMoreYhView(isDelay = true) {
let _that = this
logger.info('hideMoreYhView-visible', this.$refs.kkk)
logger.info('tooltipParentOut', 'tooltipParentOut')
if (isDelay) {
_that.isInParentView = false
setTimeout(function () {
if (_that.isInChildView || _that.isInParentView) {
return
}
if (_that.curMoreYhViewIndex >= 0) {
_that.tableDate[_that.curMoreYhViewIndex].disabled = false
}
_that.curMoreYhViewIndex = -1
_that.isInParentView = false
_that.isInChildView = false
}, 200)
} else {
if (_that.curMoreYhViewIndex >= 0) {
_that.tableDate[_that.curMoreYhViewIndex].disabled = false
}
_that.curMoreYhViewIndex = -1
_that.isInParentView = false
_that.isInChildView = false
}
this.tableDate[index].disabled = true
this.curOneGradeIndex = index
},
getRowKeys(row) {
return row.logicId
......
src/views/xtfkgl/RyXtljfkView.vue
......@@ -38,35 +38,37 @@
</div>
</div>
<el-tooltip
:ref="'ryTooltipP'+scope.row.logicId"
class="item"
effect="dark"
placement="right"
:manual="true"
:open-delay="300"
v-model="scope.row.disabled"
:open-delay="300"
v-if="scope.row.groups && scope.row.groups.length > 4">
<span style="margin-left: 5px" @mouseover="groupItemFocus(scope.$index)">...</span>
<span style="margin-left: 5px"
@mouseenter.stop="showMoreYhView(scope.$index)">...</span>
<div slot="content" class="tooTipBtn" @mouseleave="groupItemNoFocus()">
<div slot="content" class="tooTipBtn" @mouseover="showMoreYhView(scope.$index)"
@mouseleave="hideMoreYhView()">
<div v-for="(item,index) in scope.row.groups">
<div v-if="item.type === 1 && item.user && item.user.length >0">
<el-tooltip
:ref="'ryTooltipC'+item.id"
class="two-tooltip"
effect="dark"
placement="right"
:manual="true"
v-model="item.disabled"
style="transform: translateX(10px);">
style="transform: translateX(8px);">
<div :class="{divtext:item.type === 1}"
style="padding-right: 10px"
@mouseover="twItemFocus(scope.$index,index)">
style="padding-right: 8px;">
{{item.name }}
</div>
<div slot="content" class="tooTipBtn"
@mouseover="twItemFocus(scope.$index,index)"
@mouseleave="twoItemNoFocus(scope.$index,index)">
<div ref="kkk" slot="content" class="tooTipBtn"
@mouseover.stop="moveChildView()"
@mouseleave.stop="outChildView()">
<div
v-for="it in item.user"
:title="it.name"
......@@ -83,7 +85,6 @@
</div>
</el-tooltip>
</div>
</template>
</el-table-column>
......@@ -157,7 +158,7 @@
</el-table>
</div>
<!-- <div class="line-botttom"></div>-->
<!-- <div class="line-botttom"></div>-->
<!-- 分页-->
<div class="footer">
<span class="count">共&nbsp;{{ total }}&nbsp;条记录 第{{ currPage }}/{{totalPage}}页</span>
......@@ -197,8 +198,9 @@ export default {
pageSize: 13, // 每页的数据条数
total: 0, // 数据总条数
totalPage: 0, // 总共页数
curOneGradeIndex: -1,
curTwoGradeIndex: -1,
curMoreYhViewIndex: -1,
isInParentView: false,
isInChildView: false,
}
},
created() {
......@@ -215,42 +217,55 @@ export default {
// this.initTestData()
this.getList()
},
mounted() {
let _that = this
document.addEventListener('click', function (e) {
_that.hideMoreYhView(false)
})
},
methods: {
twoItemNoFocus(gindex, cindex) {
this.tableDate[gindex].groups[cindex].disabled = false
this.tableDate[gindex].disabled = false
this.curOneGradeIndex = -1
moveChildView() {
this.isInChildView = true
},
twItemFocus(gindex, cindex) {
if (cindex >= 0 && gindex >= 0) {
if (this.curTwoGradeIndex !== cindex && this.curTwoGradeIndex >= 0) {
this.tableDate[gindex].groups[this.curTwoGradeIndex].disabled = false
}
this.tableDate[gindex].groups[cindex].disabled = true
this.tableDate[gindex].disabled = true
this.curOneGradeIndex = gindex
this.curTwoGradeIndex = cindex
}
outChildView() {
this.isInChildView = false
this.hideMoreYhView()
},
groupItemNoFocus() {
if (this.curOneGradeIndex >= 0) {
this.tableDate[this.curOneGradeIndex].disabled = false
showMoreYhView(index) {
this.isInParentView = true
logger.info('tooltipParentEnter', 'tooltipParentEnter-' + index)
if (this.curMoreYhViewIndex !== index && this.curMoreYhViewIndex >= 0) {
this.tableDate[this.curMoreYhViewIndex].disabled = false
}
if (this.curOneGradeIndex >= 0 && this.curTwoGradeIndex >= 0) {
this.tableDate[this.curOneGradeIndex].groups[this.curTwoGradeIndex].disabled = false
}
this.curOneGradeIndex = -1
this.curTwoGradeIndex = -1
this.tableDate[index].disabled = true
this.curMoreYhViewIndex = index
logger.info('showMoreYhView-tableDate', this.tableDate)
},
groupItemFocus(index) {
if (this.curOneGradeIndex !== index && this.curOneGradeIndex >= 0) {
this.tableDate[this.curOneGradeIndex].disabled = false
}
if (this.curOneGradeIndex >= 0 && this.curTwoGradeIndex >= 0) {
this.tableDate[this.curOneGradeIndex].groups[this.curTwoGradeIndex].disabled = false
hideMoreYhView(isDelay = true) {
let _that = this
logger.info('tooltipParentOut', 'tooltipParentOut')
if (isDelay) {
this.isInParentView = false
setTimeout(function () {
if (_that.isInChildView || _that.isInParentView) {
return
}
if (_that.curMoreYhViewIndex >= 0) {
_that.tableDate[_that.curMoreYhViewIndex].disabled = false
}
this.curMoreYhViewIndex = -1
_that.isInParentView = false
_that.isInChildView = false
}, 200)
} else {
if (this.curMoreYhViewIndex >= 0) {
this.tableDate[this.curMoreYhViewIndex].disabled = false
}
this.curMoreYhViewIndex = -1
this.isInParentView = false
this.isInChildView = false
}
this.tableDate[index].disabled = true
this.curOneGradeIndex = index
},
getRowKeys(row) {
return row.logicId
......
vue.config.js
......@@ -113,12 +113,12 @@ module.exports = {
// target: "http://192.168.128.166:8099/", // 张 认定
// target: "http://192.168.128.104:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
target: "http://192.168.128.117:8099", // 湖南-张呈光
// target: "http://192.168.128.117:8099", // 湖南-张呈光
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
// target: "http://127.0.0.1:8099",
// target: "http://47.92.225.109:5602",
// target: "http://www.meetfood.cn:2390", // 湖南-线上
// target: "http://zwpt.xzclub.top:9333/",
target: "http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.119:8099", // 江
ws: true,
changeOrigin: true,
......@@ -129,9 +129,9 @@ module.exports = {
"/security": {
// target: "http://192.168.128.106:8765", // 湖南-王
target: "http://192.168.128.117:8765/", // 张 认定
// target: "http://192.168.128.117:8765/", // 张 认定
// target: "http://www.meetfood.cn:2390", // 湖南-王
// target: "http://zwpt.xzclub.top:9333/",
target: "http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.109:8765",
ws: true,
changeOrigin: true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment