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

back/src/views/modules/notice/PortalAnnouncement.vue

@@ -17,11 +17,11 @@
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border
         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 prop="publishTime" label="发布时间" header-align="center" align="center" width="300">
         </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">
             <el-button type="text" size="small" @click="viewHandle(scope.row)">
                详情

front/src/views/home/detailsPageconetentTree.vue

@@ -39,7 +39,7 @@
                     fill="#0058e1"
                   ></path>
                 </svg>
-                <a-tooltip>
+                <a-tooltip @mouseenter="showToolTip">
                   <template #title>{{ val.title }}</template>
                   <span class="name">
                     {{ val.title }}
@@ -88,7 +88,7 @@
                       fill="#0058e1"
                     ></path>
                   </svg>
-                  <a-tooltip>
+                  <a-tooltip @mouseenter="showToolTip">
                     <template #title>{{ child.title }}</template>
                     <span class="name">
                       {{ 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) => {
         if (val.dataList.length > 0) {
@@ -395,6 +402,7 @@
         showBottom,
         showDown,
         selectId,
+        showToolTip,
       }
     },
     beforeUnmount() {
@@ -511,6 +519,7 @@
           -webkit-line-clamp: 1;
           -webkit-box-orient: vertical;
           word-break: break-all;
+          max-width: 200px;
         }
       }
       .up:hover {