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

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

This commit is contained in:
gongjiale 2022-12-08 15:09:10 +08:00
parent 3306e8b6ac 50e730c9ff
commit 9ae885b985
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
back/src/views/modules/notice/PortalAnnouncement.vue
View File

@ -17,11 +17,11 @@
</el-form> </el-form>
<el-table v-loading="dataListLoading" :data="dataList" border <el-table v-loading="dataListLoading" :data="dataList" border
style="width: 100%;"> style="width: 100%;">
<el-table-column prop="content" label="内容" header-align="center" align="center" width="950"> <el-table-column prop="content" label="内容" header-align="center" align="center" width="1100">
</el-table-column> </el-table-column>
<el-table-column prop="publishTime" label="发布时间" header-align="center" align="center" width="300"> <el-table-column prop="publishTime" label="发布时间" header-align="center" align="center" width="300">
</el-table-column> </el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="viewHandle(scope.row)"> <el-button type="text" size="small" @click="viewHandle(scope.row)">
详情 详情

13
front/src/views/home/detailsPageconetentTree.vue
View File

@ -39,7 +39,7 @@
fill="#0058e1" fill="#0058e1"
></path> ></path>
</svg> </svg>
<a-tooltip> <a-tooltip @mouseenter="showToolTip">
<template #title>{{ val.title }}</template> <template #title>{{ val.title }}</template>
<span class="name"> <span class="name">
{{ val.title }} {{ val.title }}
@ -88,7 +88,7 @@
fill="#0058e1" fill="#0058e1"
></path> ></path>
</svg> </svg>
<a-tooltip> <a-tooltip @mouseenter="showToolTip">
<template #title>{{ child.title }}</template> <template #title>{{ child.title }}</template>
<span class="name"> <span class="name">
{{ child.title }} {{ child.title }}
@ -251,6 +251,13 @@
}) })
} }
} }
const showToolTip = (e) => {
console.log('鼠标移入', e, e.target.clientWidth, e.target.scrollWidth)
debugger
if (e.target.clientWidth < 200) {
e.target.style.pointerEvents = 'none' // 阻止鼠标事件
}
}
// 区级特殊处理 // 区级特殊处理
const generateChildren2 = (val, obj) => { const generateChildren2 = (val, obj) => {
if (val.dataList.length > 0) { if (val.dataList.length > 0) {
@ -395,6 +402,7 @@
showBottom, showBottom,
showDown, showDown,
selectId, selectId,
showToolTip,
} }
}, },
beforeUnmount() { beforeUnmount() {
@ -511,6 +519,7 @@
-webkit-line-clamp: 1; -webkit-line-clamp: 1;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
word-break: break-all; word-break: break-all;
max-width: 200px;
} }
} }
.up:hover { .up:hover {