Skip to content

F
founder_vue
Commit 14492ab2 by 张超军
Options

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

parents 5b5a2925 a0a18d40
Showing with 201 additions and 93 deletions
src/views/xtfkgl/AjXtljfkView.vue
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
</div> </div>
<el-tooltip <el-tooltip
:ref="'ajTooltipP'+scope.row.logicId"
class="item" class="item"
effect="dark" effect="dark"
placement="right" placement="right"
...@@ -46,26 +47,26 @@ ...@@ -46,26 +47,26 @@
v-model="scope.row.disabled" v-model="scope.row.disabled"
v-if="scope.row.groups && scope.row.groups.length > 4"> 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-for="(item,index) in scope.row.groups">
<div v-if="item.type === 1 && item.user && item.user.length >0"> <div v-if="item.type === 1 && item.user && item.user.length >0">
<el-tooltip <el-tooltip
:ref="'ajTooltipC'+item.id"
class="two-tooltip" class="two-tooltip"
effect="dark" effect="dark"
placement="right" placement="right"
:manual="true" style="transform: translateX(8px);">
v-model="item.disabled"
style="transform: translateX(10px);">
<div :class="{divtext:item.type === 1}" <div :class="{divtext:item.type === 1}"
style="padding-right: 10px" style="padding-right: 8px">
@mouseover="twItemFocus(scope.$index,index)">
{{item.name }} {{item.name }}
</div> </div>
<div slot="content" class="tooTipBtn" <div ref="kkk" slot="content" class="tooTipBtn"
@mouseover="twItemFocus(scope.$index,index)" @mouseover.stop="moveChildView()"
@mouseleave="twoItemNoFocus(scope.$index,index)"> @mouseleave.stop="outChildView()">
<div <div
v-for="it in item.user" v-for="it in item.user"
:title="it.name" :title="it.name"
...@@ -192,8 +193,9 @@ export default { ...@@ -192,8 +193,9 @@ export default {
pageSize: 13, // 每页的数据条数 pageSize: 13, // 每页的数据条数
total: 0, // 数据总条数 total: 0, // 数据总条数
totalPage: 0, // 总共页数 totalPage: 0, // 总共页数
curOneGradeIndex: -1, curMoreYhViewIndex: -1,
curTwoGradeIndex: -1, isInParentView: false,
isInChildView: false,
} }
}, },
created() { created() {
...@@ -211,42 +213,56 @@ export default { ...@@ -211,42 +213,56 @@ export default {
// this.initTestData() // this.initTestData()
// this.getList() // this.getList()
}, },
mounted() {
let _that = this
document.addEventListener('click', function (e) {
_that.hideMoreYhView()
})
},
methods: { methods: {
twoItemNoFocus(gindex, cindex) { moveChildView() {
this.tableDate[gindex].groups[cindex].disabled = false this.isInChildView = true
this.tableDate[gindex].disabled = false
this.curOneGradeIndex = -1
}, },
twItemFocus(gindex, cindex) { outChildView() {
if (cindex >= 0 && gindex >= 0) { this.isInChildView = false
if (this.curTwoGradeIndex !== cindex && this.curTwoGradeIndex >= 0) { this.hideMoreYhView()
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
}
}, },
groupItemNoFocus() { showMoreYhView(index) {
if (this.curOneGradeIndex >= 0) { this.isInParentView = true
this.tableDate[this.curOneGradeIndex].disabled = false logger.info('tooltipParentEnter', 'tooltipParentEnter-' + index)
} if (this.curMoreYhViewIndex !== index && this.curMoreYhViewIndex >= 0) {
if (this.curOneGradeIndex >= 0 && this.curTwoGradeIndex >= 0) { this.tableDate[this.curMoreYhViewIndex].disabled = false
this.tableDate[this.curOneGradeIndex].groups[this.curTwoGradeIndex].disabled = false
} }
this.curOneGradeIndex = -1 this.tableDate[index].disabled = true
this.curTwoGradeIndex = -1 this.curMoreYhViewIndex = index
}, },
groupItemFocus(index) { hideMoreYhView(isDelay = true) {
if (this.curOneGradeIndex !== index && this.curOneGradeIndex >= 0) { let _that = this
this.tableDate[this.curOneGradeIndex].disabled = false
} logger.info('hideMoreYhView-visible', this.$refs.kkk)
if (this.curOneGradeIndex >= 0 && this.curTwoGradeIndex >= 0) { logger.info('tooltipParentOut', 'tooltipParentOut')
this.tableDate[this.curOneGradeIndex].groups[this.curTwoGradeIndex].disabled = false 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) { getRowKeys(row) {
return row.logicId return row.logicId
......
src/views/xtfkgl/RyXtljfkView.vue
...@@ -38,35 +38,37 @@ ...@@ -38,35 +38,37 @@
</div> </div>
</div> </div>
<el-tooltip <el-tooltip
:ref="'ryTooltipP'+scope.row.logicId"
class="item" class="item"
effect="dark" effect="dark"
placement="right" placement="right"
:manual="true" :manual="true"
:open-delay="300"
v-model="scope.row.disabled" v-model="scope.row.disabled"
:open-delay="300"
v-if="scope.row.groups && scope.row.groups.length > 4"> 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-for="(item,index) in scope.row.groups">
<div v-if="item.type === 1 && item.user && item.user.length >0"> <div v-if="item.type === 1 && item.user && item.user.length >0">
<el-tooltip <el-tooltip
:ref="'ryTooltipC'+item.id"
class="two-tooltip" class="two-tooltip"
effect="dark" effect="dark"
placement="right" placement="right"
:manual="true" style="transform: translateX(8px);">
v-model="item.disabled"
style="transform: translateX(10px);">
<div :class="{divtext:item.type === 1}" <div :class="{divtext:item.type === 1}"
style="padding-right: 10px" style="padding-right: 8px;">
@mouseover="twItemFocus(scope.$index,index)">
{{item.name }} {{item.name }}
</div> </div>
<div slot="content" class="tooTipBtn" <div ref="kkk" slot="content" class="tooTipBtn"
@mouseover="twItemFocus(scope.$index,index)" @mouseover.stop="moveChildView()"
@mouseleave="twoItemNoFocus(scope.$index,index)"> @mouseleave.stop="outChildView()">
<div <div
v-for="it in item.user" v-for="it in item.user"
:title="it.name" :title="it.name"
...@@ -83,7 +85,6 @@ ...@@ -83,7 +85,6 @@
</div> </div>
</el-tooltip> </el-tooltip>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -157,7 +158,7 @@ ...@@ -157,7 +158,7 @@
</el-table> </el-table>
</div> </div>
<!-- <div class="line-botttom"></div>--> <!-- <div class="line-botttom"></div>-->
<!-- 分页--> <!-- 分页-->
<div class="footer"> <div class="footer">
<span class="count">共&nbsp;{{ total }}&nbsp;条记录 第{{ currPage }}/{{totalPage}}页</span> <span class="count">共&nbsp;{{ total }}&nbsp;条记录 第{{ currPage }}/{{totalPage}}页</span>
...@@ -197,8 +198,9 @@ export default { ...@@ -197,8 +198,9 @@ export default {
pageSize: 13, // 每页的数据条数 pageSize: 13, // 每页的数据条数
total: 0, // 数据总条数 total: 0, // 数据总条数
totalPage: 0, // 总共页数 totalPage: 0, // 总共页数
curOneGradeIndex: -1, curMoreYhViewIndex: -1,
curTwoGradeIndex: -1, isInParentView: false,
isInChildView: false,
} }
}, },
created() { created() {
...@@ -215,42 +217,55 @@ export default { ...@@ -215,42 +217,55 @@ export default {
// this.initTestData() // this.initTestData()
this.getList() this.getList()
}, },
mounted() {
let _that = this
document.addEventListener('click', function (e) {
_that.hideMoreYhView(false)
})
},
methods: { methods: {
twoItemNoFocus(gindex, cindex) { moveChildView() {
this.tableDate[gindex].groups[cindex].disabled = false this.isInChildView = true
this.tableDate[gindex].disabled = false
this.curOneGradeIndex = -1
}, },
twItemFocus(gindex, cindex) { outChildView() {
if (cindex >= 0 && gindex >= 0) { this.isInChildView = false
if (this.curTwoGradeIndex !== cindex && this.curTwoGradeIndex >= 0) { this.hideMoreYhView()
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
}
}, },
groupItemNoFocus() { showMoreYhView(index) {
if (this.curOneGradeIndex >= 0) { this.isInParentView = true
this.tableDate[this.curOneGradeIndex].disabled = false 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[index].disabled = true
this.tableDate[this.curOneGradeIndex].groups[this.curTwoGradeIndex].disabled = false this.curMoreYhViewIndex = index
} logger.info('showMoreYhView-tableDate', this.tableDate)
this.curOneGradeIndex = -1
this.curTwoGradeIndex = -1
}, },
groupItemFocus(index) { hideMoreYhView(isDelay = true) {
if (this.curOneGradeIndex !== index && this.curOneGradeIndex >= 0) { let _that = this
this.tableDate[this.curOneGradeIndex].disabled = false logger.info('tooltipParentOut', 'tooltipParentOut')
} if (isDelay) {
if (this.curOneGradeIndex >= 0 && this.curTwoGradeIndex >= 0) { this.isInParentView = false
this.tableDate[this.curOneGradeIndex].groups[this.curTwoGradeIndex].disabled = 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) { getRowKeys(row) {
return row.logicId return row.logicId
......
src/views/zzwcj/fingerprint.scss
...@@ -689,8 +689,13 @@ $versionColor: var(--versionColor, #000); // #000 ...@@ -689,8 +689,13 @@ $versionColor: var(--versionColor, #000); // #000
top: 35%; top: 35%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
img { img {
width: 150px; width: 160px;
// height: 80px; height: 180px;
min-width: 160px;
min-height:180px ;
max-width: 160px;
max-height: 180px;
margin-top: 30px;
} }
.container { .container {
height: 100%; height: 100%;
...@@ -2851,5 +2856,77 @@ $versionColor: var(--versionColor, #000); // #000 ...@@ -2851,5 +2856,77 @@ $versionColor: var(--versionColor, #000); // #000
} }
} }
} }
.fir {
display: flex;
.cir {
width: 24px;
height: 24px;
background: #055fe7;
font-size: 12px;
border-radius: 50%;
padding: 3px 8px;
color: #fff;
}
span {
font-size: 16px !important;
font-family: HarmonyOS_Sans_SC;
color: #055fe7 !important;
line-height: 22px;
margin-left: 5px;
}
.dashed {
margin: 10px 10px;
width: 112px;
height: 1px;
border: 1px dashed #055fe7;
}
.solid {
margin: 10px 10px;
width: 112px;
height: 1px;
// background: #cccccc;
border: 1px solid #055fe7;
}
}
.unactive {
display: flex;
.cir {
width: 24px;
height: 24px;
border: 1px solid #ECEDF1;
font-size: 12px;
border-radius: 50%;
padding: 2px 7px;
color: #cccccc;
background-color: #ECEDF1;
}
span {
font-size: 16px;
font-family: HarmonyOS_Sans_SC;
color: #999999 !important;
line-height: 22px;
margin-left: 5px;
}
.dashed {
margin: 10px 10px;
width: 112px;
height: 1px;
border: 1px dashed #055fe7;
}
.solid {
margin: 10px 10px;
width: 112px;
height: 1px;
background: #cccccc;
}
}
vue.config.js
...@@ -113,12 +113,12 @@ module.exports = { ...@@ -113,12 +113,12 @@ module.exports = {
// target: "http://192.168.128.166:8099/", // 张 认定 // target: "http://192.168.128.166:8099/", // 张 认定
// target: "http://192.168.128.104:8099", // 湖南-马 // target: "http://192.168.128.104:8099", // 湖南-马
// target: "http://192.168.128.116: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://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
// target: "http://127.0.0.1:8099", // target: "http://127.0.0.1:8099",
// target: "http://47.92.225.109:5602", // target: "http://47.92.225.109:5602",
// target: "http://www.meetfood.cn:2390", // 湖南-线上 // 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", // 江 // target: "http://192.168.128.119:8099", // 江
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
...@@ -129,9 +129,9 @@ module.exports = { ...@@ -129,9 +129,9 @@ module.exports = {
"/security": { "/security": {
// target: "http://192.168.128.106:8765", // 湖南-王 // 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://www.meetfood.cn:2390", // 湖南-王
// target: "http://zwpt.xzclub.top:9333/", target: "http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.109:8765", // target: "http://192.168.128.109:8765",
ws: true, ws: true,
changeOrigin: 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