Przeglądaj źródła

病理人员档案改进及优化

cyy 1 rok temu
rodzic
commit
8ed7b3849d

+ 40 - 5
src/views/component/personnelFile/components/SCIwzglbTag.vue

@@ -30,7 +30,13 @@
                     min-width="20%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("lunWenTiMu") > 0 ? scope.row.lunWenTiMu:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.lunWenTiMu" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("lunWenTiMu") > 0 ? scope.row.lunWenTiMu:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("lunWenTiMu") > 0 ? scope.row.lunWenTiMu:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -38,7 +44,13 @@
                     min-width="20%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("qiKanMingCheng") > 0 ? scope.row.qiKanMingCheng:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.qiKanMingCheng" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("qiKanMingCheng") > 0 ? scope.row.qiKanMingCheng:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("qiKanMingCheng") > 0 ? scope.row.qiKanMingCheng:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -46,7 +58,13 @@
                     min-width="15%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("qiJuanHao") > 0 ? scope.row.qiJuanHao:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.qiJuanHao" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("qiJuanHao") > 0 ? scope.row.qiJuanHao:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("qiJuanHao") > 0 ? scope.row.qiJuanHao:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -54,7 +72,13 @@
                     min-width="15%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("yingXiangYZIf") > 0 ? scope.row.yingXiangYZIf:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.yingXiangYZIf" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("yingXiangYZIf") > 0 ? scope.row.yingXiangYZIf:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("yingXiangYZIf") > 0 ? scope.row.yingXiangYZIf:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -135,7 +159,8 @@ export default {
             multipleSelection: [],
             currentPage: 1,
             dialogDetails: false,
-            dialogData: []
+            dialogData: [],
+            isShowTooltip: true
         }
     },
     watch: {
@@ -162,6 +187,11 @@ export default {
         }
     },
     methods: {
+        inputOnMouseOver (e) {
+            const { offsetWidth, scrollWidth } = e.target || {}
+            this.isShowTooltip = offsetWidth < scrollWidth
+            console.log(this.isShowTooltip)
+        },
         handleSelectionChange (val) {
             this.multipleSelection = val
         },
@@ -259,6 +289,11 @@ export default {
                 width: 100%;
             }
         }
+        .ellipsis {
+            white-space: nowrap; /* 确保文本不换行 */
+            overflow: hidden; /* 隐藏超出容器的文本 */
+            text-overflow: ellipsis; /* 显示省略号 */
+        }
     }
 }
 

+ 26 - 3
src/views/component/personnelFile/components/bmsmTag.vue

@@ -30,7 +30,13 @@
                     min-width="20%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("bianZhiShiJian") > 0 ? scope.row.bianZhiShiJian:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.bianZhiShiJian" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("bianZhiShiJian") > 0 ? scope.row.bianZhiShiJian:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("bianZhiShiJian") > 0 ? scope.row.bianZhiShiJian:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -38,7 +44,13 @@
                     min-width="45%"
                 >
                     <template slot-scope="scope">
-                        <div class="text-overflow">{{ scope.row.hasOwnProperty("shuoMing") > 0 ? scope.row.shuoMing:'/' }}</div>
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:400px">
+                                <div v-html="scope.row.shuoMing" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("shuoMing") > 0 ? scope.row.shuoMing:'/' }}</div>
+                        </el-tooltip>
+                        <!-- <div class="text-overflow">{{ scope.row.hasOwnProperty("shuoMing") > 0 ? scope.row.shuoMing:'/' }}</div> -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -119,7 +131,8 @@ export default {
             multipleSelection: [],
             currentPage: 1,
             dialogDetails: false,
-            dialogData: []
+            dialogData: [],
+            isShowTooltip: true
         }
     },
     watch: {
@@ -146,6 +159,11 @@ export default {
         }
     },
     methods: {
+        inputOnMouseOver (e) {
+            const { offsetWidth, scrollWidth } = e.target || {}
+            this.isShowTooltip = offsetWidth < scrollWidth
+            console.log(this.isShowTooltip)
+        },
         handleSelectionChange (val) {
             this.multipleSelection = val
         },
@@ -247,6 +265,11 @@ export default {
                 width: 100%;
             }
         }
+        .ellipsis {
+            white-space: nowrap; /* 确保文本不换行 */
+            overflow: hidden; /* 隐藏超出容器的文本 */
+            text-overflow: ellipsis; /* 显示省略号 */
+        }
     }
 }
 

+ 54 - 7
src/views/component/personnelFile/components/gzjlTag.vue

@@ -36,7 +36,13 @@
                 >
                     <template slot-scope="scope">
                         <div v-if="judgeTag()">
-                            <div>{{ scope.row.hasOwnProperty("ruZhiShiJian") > 0 ? scope.row.ruZhiShiJian:'/' }}</div>
+                            <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                                <div slot="content" style="max-width:200px">
+                                    <div v-html="scope.row.ruZhiShiJian" />
+                                </div>
+                                <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("ruZhiShiJian") > 0 ? scope.row.ruZhiShiJian:'/' }}</div>
+                            </el-tooltip>
+                            <!-- <div>{{ scope.row.hasOwnProperty("ruZhiShiJian") > 0 ? scope.row.ruZhiShiJian:'/' }}</div> -->
                         </div>
                         <div v-else class="grid-content">
                             <el-form-item :prop="'nowData.'+ (10*(currentPage-1) +scope.$index)+'.ruZhiShiJian'" :rules="rules.bianzhiriqi">
@@ -58,7 +64,13 @@
                 >
                     <template slot-scope="scope">
                         <div v-if="judgeTag()">
-                            <div>{{ scope.row.hasOwnProperty("liZhiShiJian") > 0 ? scope.row.liZhiShiJian:'/' }}</div>
+                            <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                                <div slot="content" style="max-width:200px">
+                                    <div v-html="scope.row.liZhiShiJian" />
+                                </div>
+                                <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("liZhiShiJian") > 0 ? scope.row.liZhiShiJian:'/' }}</div>
+                            </el-tooltip>
+                            <!-- <div>{{ scope.row.hasOwnProperty("liZhiShiJian") > 0 ? scope.row.liZhiShiJian:'/' }}</div> -->
                         </div>
                         <div v-else class="grid-content">
                             <el-form-item :prop="'nowData.'+ (10*(currentPage-1) +scope.$index)+'.liZhiShiJian'" :rules="rules.jieshuriqi">
@@ -80,7 +92,13 @@
                 >
                     <template slot-scope="scope">
                         <div v-if="judgeTag()">
-                            <div>{{ scope.row.hasOwnProperty("danWeiMingChen") > 0 ? scope.row.danWeiMingChen:'/' }}</div>
+                            <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                                <div slot="content" style="max-width:200px">
+                                    <div v-html="scope.row.danWeiMingChen" />
+                                </div>
+                                <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("danWeiMingChen") > 0 ? scope.row.danWeiMingChen:'/' }}</div>
+                            </el-tooltip>
+                            <!-- <div>{{ scope.row.hasOwnProperty("danWeiMingChen") > 0 ? scope.row.danWeiMingChen:'/' }}</div> -->
                         </div>
                         <div v-else class="grid-content">
                             <el-form-item :prop="'nowData.'+ (10*(currentPage-1) +scope.$index)+'.danWeiMingChen'" :rules="rules.school">
@@ -100,7 +118,13 @@
                 >
                     <template slot-scope="scope">
                         <div v-if="judgeTag()">
-                            <div>{{ scope.row.hasOwnProperty("buMen") > 0 ? scope.row.buMen:'/' }}</div>
+                            <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                                <div slot="content" style="max-width:200px">
+                                    <div v-html="scope.row.buMen" />
+                                </div>
+                                <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("buMen") > 0 ? scope.row.buMen:'/' }}</div>
+                            </el-tooltip>
+                            <!-- <div>{{ scope.row.hasOwnProperty("buMen") > 0 ? scope.row.buMen:'/' }}</div> -->
                         </div>
                         <div v-else class="grid-content">
                             <el-form-item :prop="'nowData.'+ (10*(currentPage-1) +scope.$index)+'.buMen'" :rules="rules.optional">
@@ -120,7 +144,13 @@
                 >
                     <template slot-scope="scope">
                         <div v-if="judgeTag()">
-                            <div>{{ scope.row.hasOwnProperty("zhiWei") > 0 ? scope.row.zhiWei:'/' }}</div>
+                            <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                                <div slot="content" style="max-width:200px">
+                                    <div v-html="scope.row.zhiWei" />
+                                </div>
+                                <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("zhiWei") > 0 ? scope.row.zhiWei:'/' }}</div>
+                            </el-tooltip>
+                            <!-- <div>{{ scope.row.hasOwnProperty("zhiWei") > 0 ? scope.row.zhiWei:'/' }}</div> -->
                         </div>
                         <div v-else class="grid-content">
                             <el-form-item :prop="'nowData.'+ (10*(currentPage-1) +scope.$index)+'.zhiWei'" :rules="rules.optional">
@@ -140,7 +170,13 @@
                 >
                     <template slot-scope="scope">
                         <div v-if="judgeTag()">
-                            <div>{{ scope.row.hasOwnProperty("gongZuoNeiRong") > 0 ? scope.row.gongZuoNeiRong:'/' }}</div>
+                            <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                                <div slot="content" style="max-width:200px">
+                                    <div v-html="scope.row.gongZuoNeiRong" />
+                                </div>
+                                <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("gongZuoNeiRong") > 0 ? scope.row.gongZuoNeiRong:'/' }}</div>
+                            </el-tooltip>
+                            <!-- <div>{{ scope.row.hasOwnProperty("gongZuoNeiRong") > 0 ? scope.row.gongZuoNeiRong:'/' }}</div> -->
                         </div>
                         <div v-else class="grid-content">
                             <el-form-item :prop="'nowData.'+ (10*(currentPage-1) +scope.$index)+'.gongZuoNeiRong'" :rules="rules.optional">
@@ -269,7 +305,8 @@ export default {
                 // ]
             },
             multipleSelection: [],
-            currentPage: 1
+            currentPage: 1,
+            isShowTooltip: true
         }
     },
     watch: {
@@ -296,6 +333,11 @@ export default {
         }
     },
     methods: {
+        inputOnMouseOver (e) {
+            const { offsetWidth, scrollWidth } = e.target || {}
+            this.isShowTooltip = offsetWidth < scrollWidth
+            console.log(this.isShowTooltip)
+        },
         judgeTag () {
             // return this.planeData.length>0&& this.btnShow === true && this.buttonType!==1 ? true : false
             return !!(this.btnShow === true && this.buttonType !== 1 && this.buttonType !== 4)
@@ -422,6 +464,11 @@ export default {
                 width: 100%;
             }
         }
+        .ellipsis {
+            white-space: nowrap; /* 确保文本不换行 */
+            overflow: hidden; /* 隐藏超出容器的文本 */
+            text-overflow: ellipsis; /* 显示省略号 */
+        }
     }
 
 }

+ 47 - 6
src/views/component/personnelFile/components/jxjyxmxshdglbTag.vue

@@ -30,7 +30,13 @@
                     min-width="15%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("xiangMuBianHao") > 0 ? scope.row.xiangMuBianHao:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.xiangMuBianHao" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("xiangMuBianHao") > 0 ? scope.row.xiangMuBianHao:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("xiangMuBianHao") > 0 ? scope.row.xiangMuBianHao:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -38,7 +44,13 @@
                     min-width="15%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("huiYiMingCheng") > 0 ? scope.row.huiYiMingCheng:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.huiYiMingCheng" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("huiYiMingCheng") > 0 ? scope.row.huiYiMingCheng:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("huiYiMingCheng") > 0 ? scope.row.huiYiMingCheng:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -46,7 +58,13 @@
                     min-width="15%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("xueFenJiBie") > 0 ? scope.row.xueFenJiBie:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.xueFenJiBie" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("xueFenJiBie") > 0 ? scope.row.xueFenJiBie:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("xueFenJiBie") > 0 ? scope.row.xueFenJiBie:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -54,7 +72,13 @@
                     min-width="15%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("xueFen") > 0 ? scope.row.xueFen:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.xueFen" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("xueFen") > 0 ? scope.row.xueFen:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("xueFen") > 0 ? scope.row.xueFen:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -62,7 +86,13 @@
                     min-width="15%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("juBanShiJian") > 0 ? scope.row.juBanShiJian:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.juBanShiJian" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("juBanShiJian") > 0 ? scope.row.juBanShiJian:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("juBanShiJian") > 0 ? scope.row.juBanShiJian:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -144,7 +174,8 @@ export default {
             multipleSelection: [],
             currentPage: 1,
             dialogDetails: false,
-            dialogData: []
+            dialogData: [],
+            isShowTooltip: true
         }
     },
     watch: {
@@ -171,6 +202,11 @@ export default {
         }
     },
     methods: {
+        inputOnMouseOver (e) {
+            const { offsetWidth, scrollWidth } = e.target || {}
+            this.isShowTooltip = offsetWidth < scrollWidth
+            console.log(this.isShowTooltip)
+        },
         handleSelectionChange (val) {
             this.multipleSelection = val
         },
@@ -268,6 +304,11 @@ export default {
                 width: 100%;
             }
         }
+        .ellipsis {
+            white-space: nowrap; /* 确保文本不换行 */
+            overflow: hidden; /* 隐藏超出容器的文本 */
+            text-overflow: ellipsis; /* 显示省略号 */
+        }
     }
 }
 

+ 47 - 6
src/views/component/personnelFile/components/jyjlTag.vue

@@ -36,7 +36,13 @@
                 >
                     <template slot-scope="scope">
                         <div v-if="judgeTag()">
-                            <div>{{ scope.row.hasOwnProperty("kaiShiShiJian") > 0 ? scope.row.kaiShiShiJian:'/' }}</div>
+                            <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                                <div slot="content" style="max-width:200px">
+                                    <div v-html="scope.row.kaiShiShiJian" />
+                                </div>
+                                <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("kaiShiShiJian") > 0 ? scope.row.kaiShiShiJian:'/' }}</div>
+                            </el-tooltip>
+                            <!-- <div>{{ scope.row.hasOwnProperty("kaiShiShiJian") > 0 ? scope.row.kaiShiShiJian:'/' }}</div> -->
                         </div>
                         <div v-else class="grid-content">
                             <el-form-item :prop="'nowData.'+ (10*(currentPage-1) +scope.$index)+'.kaiShiShiJian'" :rules="rules.kaiShiShiJian">
@@ -58,7 +64,13 @@
                 >
                     <template slot-scope="scope">
                         <div v-if="judgeTag()">
-                            <div>{{ scope.row.hasOwnProperty("jieShuShiJian") > 0 ? scope.row.jieShuShiJian:'/' }}</div>
+                            <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                                <div slot="content" style="max-width:200px">
+                                    <div v-html="scope.row.jieShuShiJian" />
+                                </div>
+                                <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("jieShuShiJian") > 0 ? scope.row.jieShuShiJian:'/' }}</div>
+                            </el-tooltip>
+                            <!-- <div>{{ scope.row.hasOwnProperty("jieShuShiJian") > 0 ? scope.row.jieShuShiJian:'/' }}</div> -->
                         </div>
                         <div v-else class="grid-content">
                             <el-form-item :prop="'nowData.'+ (10*(currentPage-1) +scope.$index)+'.jieShuShiJian'" :rules="rules.jieShuShiJian">
@@ -80,7 +92,13 @@
                 >
                     <template slot-scope="scope">
                         <div v-if="judgeTag()">
-                            <div>{{ scope.row.hasOwnProperty("xueXiao") > 0 ? scope.row.xueXiao:'/' }}</div>
+                            <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                                <div slot="content" style="max-width:200px">
+                                    <div v-html="scope.row.xueXiao" />
+                                </div>
+                                <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("xueXiao") > 0 ? scope.row.xueXiao:'/' }}</div>
+                            </el-tooltip>
+                            <!-- <div>{{ scope.row.hasOwnProperty("xueXiao") > 0 ? scope.row.xueXiao:'/' }}</div> -->
                         </div>
                         <div v-else class="grid-content">
                             <el-form-item :prop="'nowData.'+ (10*(currentPage-1) +scope.$index)+'.xueXiao'" :rules="rules.school">
@@ -100,7 +118,13 @@
                 >
                     <template slot-scope="scope">
                         <div v-if="judgeTag()">
-                            <div>{{ scope.row.hasOwnProperty("zhuanYe") > 0 ? scope.row.zhuanYe:'/' }}</div>
+                            <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                                <div slot="content" style="max-width:200px">
+                                    <div v-html="scope.row.zhuanYe" />
+                                </div>
+                                <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("zhuanYe") > 0 ? scope.row.zhuanYe:'/' }}</div>
+                            </el-tooltip>
+                            <!-- <div>{{ scope.row.hasOwnProperty("zhuanYe") > 0 ? scope.row.zhuanYe:'/' }}</div> -->
                         </div>
                         <div v-else class="grid-content">
                             <el-form-item :prop="'nowData.'+ (10*(currentPage-1) +scope.$index)+'.zhuanYe'" :rules="rules.optional">
@@ -120,7 +144,13 @@
                 >
                     <template slot-scope="scope">
                         <div v-if="judgeTag()">
-                            <div>{{ scope.row.hasOwnProperty("xueLiXueWei") > 0 ? scope.row.xueLiXueWei:'/' }}</div>
+                            <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                                <div slot="content" style="max-width:200px">
+                                    <div v-html="scope.row.xueLiXueWei" />
+                                </div>
+                                <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("xueLiXueWei") > 0 ? scope.row.xueLiXueWei:'/' }}</div>
+                            </el-tooltip>
+                            <!-- <div>{{ scope.row.hasOwnProperty("xueLiXueWei") > 0 ? scope.row.xueLiXueWei:'/' }}</div> -->
                         </div>
                         <div v-else class="grid-content">
                             <el-form-item :prop="'nowData.'+ (10*(currentPage-1) +scope.$index)+'.xueLiXueWei'" :rules="rules.optional">
@@ -248,7 +278,8 @@ export default {
                 ]
             },
             multipleSelection: [],
-            currentPage: 1
+            currentPage: 1,
+            isShowTooltip: true
         }
     },
     watch: {
@@ -275,6 +306,11 @@ export default {
         }
     },
     methods: {
+        inputOnMouseOver (e) {
+            const { offsetWidth, scrollWidth } = e.target || {}
+            this.isShowTooltip = offsetWidth < scrollWidth
+            console.log(this.isShowTooltip)
+        },
         judgeTag () {
             // return this.planeData.length>0&& this.btnShow === true && this.buttonType!==1 ? true : false
             return !!(this.btnShow === true && this.buttonType !== 1 && this.buttonType !== 4)
@@ -400,6 +436,11 @@ export default {
                 width: 100%;
             }
         }
+        .ellipsis {
+            white-space: nowrap; /* 确保文本不换行 */
+            overflow: hidden; /* 隐藏超出容器的文本 */
+            text-overflow: ellipsis; /* 显示省略号 */
+        }
     }
 
 }

+ 33 - 4
src/views/component/personnelFile/components/kjhjcgglbTag.vue

@@ -30,7 +30,13 @@
                     min-width="25%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("jiangLiXiangMu") > 0 ? scope.row.jiangLiXiangMu:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.jiangLiXiangMu" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("jiangLiXiangMu") > 0 ? scope.row.jiangLiXiangMu:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("jiangLiXiangMu") > 0 ? scope.row.jiangLiXiangMu:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -38,7 +44,13 @@
                     min-width="20%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("jiangLiLeiXing") > 0 ? scope.row.jiangLiLeiXing:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.jiangLiLeiXing" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("jiangLiLeiXing") > 0 ? scope.row.jiangLiLeiXing:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("jiangLiLeiXing") > 0 ? scope.row.jiangLiLeiXing:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -46,7 +58,13 @@
                     min-width="20%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("huoJiangShiJia") > 0 ? scope.row.huoJiangShiJia:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.huoJiangShiJia" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("huoJiangShiJia") > 0 ? scope.row.huoJiangShiJia:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("huoJiangShiJia") > 0 ? scope.row.huoJiangShiJia:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -127,7 +145,8 @@ export default {
             multipleSelection: [],
             currentPage: 1,
             dialogDetails: false,
-            dialogData: []
+            dialogData: [],
+            isShowTooltip: true
         }
     },
     watch: {
@@ -154,6 +173,11 @@ export default {
         }
     },
     methods: {
+        inputOnMouseOver (e) {
+            const { offsetWidth, scrollWidth } = e.target || {}
+            this.isShowTooltip = offsetWidth < scrollWidth
+            console.log(this.isShowTooltip)
+        },
         handleSelectionChange (val) {
             this.multipleSelection = val
         },
@@ -250,6 +274,11 @@ export default {
                 width: 100%;
             }
         }
+        .ellipsis {
+            white-space: nowrap; /* 确保文本不换行 */
+            overflow: hidden; /* 隐藏超出容器的文本 */
+            text-overflow: ellipsis; /* 显示省略号 */
+        }
     }
 }
 

+ 47 - 6
src/views/component/personnelFile/components/kphdglbTag.vue

@@ -30,7 +30,13 @@
                     min-width="15%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("kePuMingCheng") > 0 ? scope.row.kePuMingCheng:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.kePuMingCheng" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("kePuMingCheng") > 0 ? scope.row.kePuMingCheng:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("kePuMingCheng") > 0 ? scope.row.kePuMingCheng:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -38,7 +44,13 @@
                     min-width="14%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("kePuBianHao") > 0 ? scope.row.kePuBianHao:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.kePuBianHao" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("kePuBianHao") > 0 ? scope.row.kePuBianHao:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("kePuBianHao") > 0 ? scope.row.kePuBianHao:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -46,7 +58,13 @@
                     min-width="14%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("huoDongShiJian") > 0 ? scope.row.huoDongShiJian:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.huoDongShiJian" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("huoDongShiJian") > 0 ? scope.row.huoDongShiJian:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("huoDongShiJian") > 0 ? scope.row.huoDongShiJian:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -54,7 +72,13 @@
                     min-width="14%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("kePuXingShi") > 0 ? scope.row.kePuXingShi:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.kePuXingShi" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("kePuXingShi") > 0 ? scope.row.kePuXingShi:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("kePuXingShi") > 0 ? scope.row.kePuXingShi:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -62,7 +86,13 @@
                     min-width="12%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("beiZhu") > 0 ? scope.row.beiZhu:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.beiZhu" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("beiZhu") > 0 ? scope.row.beiZhu:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("beiZhu") > 0 ? scope.row.beiZhu:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -165,7 +195,8 @@ export default {
             multipleSelection: [],
             currentPage: 1,
             dialogDetails: false,
-            dialogData: []
+            dialogData: [],
+            isShowTooltip: true
         }
     },
     watch: {
@@ -192,6 +223,11 @@ export default {
         }
     },
     methods: {
+        inputOnMouseOver (e) {
+            const { offsetWidth, scrollWidth } = e.target || {}
+            this.isShowTooltip = offsetWidth < scrollWidth
+            console.log(this.isShowTooltip)
+        },
         handleSelectionChange (val) {
             this.multipleSelection = val
         },
@@ -286,6 +322,11 @@ export default {
                 width: 100%;
             }
         }
+        .ellipsis {
+            white-space: nowrap; /* 确保文本不换行 */
+            overflow: hidden; /* 隐藏超出容器的文本 */
+            text-overflow: ellipsis; /* 显示省略号 */
+        }
     }
 }
 

+ 46 - 5
src/views/component/personnelFile/components/kyxmglbTag.vue

@@ -30,7 +30,12 @@
                     min-width="15%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("xiangMuBianHao") > 0 ? scope.row.xiangMuBianHao:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.xiangMuBianHao" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("xiangMuBianHao") > 0 ? scope.row.xiangMuBianHao:'/' }}</div>
+                        </el-tooltip>
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -38,6 +43,12 @@
                     min-width="15%"
                 >
                     <template slot-scope="scope">
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.xiangMuBianHao" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("xiangMuBianHao") > 0 ? scope.row.xiangMuBianHao:'/' }}</div>
+                        </el-tooltip>
                         {{ scope.row.hasOwnProperty("xiangMuLeiXing") > 0 ? scope.row.xiangMuLeiXing:'/' }}
                     </template>
                 </el-table-column>
@@ -46,7 +57,13 @@
                     min-width="15%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("xiangMuMingChe") > 0 ? scope.row.xiangMuMingChe:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.xiangMuMingChe" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("xiangMuMingChe") > 0 ? scope.row.xiangMuMingChe:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("xiangMuMingChe") > 0 ? scope.row.xiangMuMingChe:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -54,7 +71,13 @@
                     min-width="15%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("qiZhiShiJian") > 0 ? scope.row.qiZhiShiJian:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.qiZhiShiJian" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("qiZhiShiJian") > 0 ? scope.row.qiZhiShiJian:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("qiZhiShiJian") > 0 ? scope.row.qiZhiShiJian:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -62,7 +85,13 @@
                     min-width="15%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("jieShuShiJian") > 0 ? scope.row.jieShuShiJian:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.jieShuShiJian" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("jieShuShiJian") > 0 ? scope.row.jieShuShiJian:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("jieShuShiJian") > 0 ? scope.row.jieShuShiJian:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -143,7 +172,9 @@ export default {
             multipleSelection: [],
             currentPage: 1,
             dialogDetails: false,
-            dialogData: []
+            dialogData: [],
+            isShowTooltip: true
+
         }
     },
     watch: {
@@ -170,6 +201,11 @@ export default {
         }
     },
     methods: {
+        inputOnMouseOver (e) {
+            const { offsetWidth, scrollWidth } = e.target || {}
+            this.isShowTooltip = offsetWidth < scrollWidth
+            console.log(this.isShowTooltip)
+        },
         handleSelectionChange (val) {
             this.multipleSelection = val
         },
@@ -267,6 +303,11 @@ export default {
                 width: 100%;
             }
         }
+        .ellipsis {
+            white-space: nowrap; /* 确保文本不换行 */
+            overflow: hidden; /* 隐藏超出容器的文本 */
+            text-overflow: ellipsis; /* 显示省略号 */
+        }
     }
 }
 

+ 47 - 6
src/views/component/personnelFile/components/kyzlglbTag.vue

@@ -30,7 +30,13 @@
                     min-width="15%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("zhuanLiMingChe") > 0 ? scope.row.zhuanLiMingChe:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.zhuanLiMingChe" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("zhuanLiMingChe") > 0 ? scope.row.zhuanLiMingChe:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("zhuanLiMingChe") > 0 ? scope.row.zhuanLiMingChe:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -38,7 +44,13 @@
                     min-width="15%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("zhuanLiQuanRen") > 0 ? scope.row.zhuanLiQuanRen:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.zhuanLiQuanRen" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("zhuanLiQuanRen") > 0 ? scope.row.zhuanLiQuanRen:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("zhuanLiQuanRen") > 0 ? scope.row.zhuanLiQuanRen:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -46,7 +58,13 @@
                     min-width="15%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("leiBie") > 0 ? scope.row.leiBie:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.leiBie" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("leiBie") > 0 ? scope.row.leiBie:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("leiBie") > 0 ? scope.row.leiBie:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -54,7 +72,13 @@
                     min-width="15%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("shenQingShiJia") > 0 ? scope.row.shenQingShiJia:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.shenQingShiJia" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("shenQingShiJia") > 0 ? scope.row.shenQingShiJia:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("shenQingShiJia") > 0 ? scope.row.shenQingShiJia:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -62,7 +86,13 @@
                     min-width="15%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("shouQuanShiJia") > 0 ? scope.row.shouQuanShiJia:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.shouQuanShiJia" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("shouQuanShiJia") > 0 ? scope.row.shouQuanShiJia:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("shouQuanShiJia") > 0 ? scope.row.shouQuanShiJia:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -143,7 +173,8 @@ export default {
             multipleSelection: [],
             currentPage: 1,
             dialogDetails: false,
-            dialogData: []
+            dialogData: [],
+            isShowTooltip: true
         }
     },
     watch: {
@@ -170,6 +201,11 @@ export default {
         }
     },
     methods: {
+        inputOnMouseOver (e) {
+            const { offsetWidth, scrollWidth } = e.target || {}
+            this.isShowTooltip = offsetWidth < scrollWidth
+            console.log(this.isShowTooltip)
+        },
         handleSelectionChange (val) {
             this.multipleSelection = val
         },
@@ -266,6 +302,11 @@ export default {
                 width: 100%;
             }
         }
+        .ellipsis {
+            white-space: nowrap; /* 确保文本不换行 */
+            overflow: hidden; /* 隐藏超出容器的文本 */
+            text-overflow: ellipsis; /* 显示省略号 */
+        }
     }
 }
 

+ 33 - 4
src/views/component/personnelFile/components/kyzzglbTag.vue

@@ -30,7 +30,13 @@
                     min-width="25%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("zhuanZhuoMingC") > 0 ? scope.row.zhuanZhuoMingC:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.zhuanZhuoMingC" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("zhuanZhuoMingC") > 0 ? scope.row.zhuanZhuoMingC:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("zhuanZhuoMingC") > 0 ? scope.row.zhuanZhuoMingC:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -38,7 +44,13 @@
                     min-width="20%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("chuBanShe") > 0 ? scope.row.chuBanShe:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.chuBanShe" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("chuBanShe") > 0 ? scope.row.chuBanShe:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("chuBanShe") > 0 ? scope.row.chuBanShe:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -46,7 +58,13 @@
                     min-width="20%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("chuBanShiJian") > 0 ? scope.row.chuBanShiJian:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.chuBanShiJian" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("chuBanShiJian") > 0 ? scope.row.chuBanShiJian:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("chuBanShiJian") > 0 ? scope.row.chuBanShiJian:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -127,7 +145,8 @@ export default {
             multipleSelection: [],
             currentPage: 1,
             dialogDetails: false,
-            dialogData: []
+            dialogData: [],
+            isShowTooltip: true
         }
     },
     watch: {
@@ -154,6 +173,11 @@ export default {
         }
     },
     methods: {
+        inputOnMouseOver (e) {
+            const { offsetWidth, scrollWidth } = e.target || {}
+            this.isShowTooltip = offsetWidth < scrollWidth
+            console.log(this.isShowTooltip)
+        },
         handleSelectionChange (val) {
             this.multipleSelection = val
         },
@@ -250,6 +274,11 @@ export default {
                 width: 100%;
             }
         }
+        .ellipsis {
+            white-space: nowrap; /* 确保文本不换行 */
+            overflow: hidden; /* 隐藏超出容器的文本 */
+            text-overflow: ellipsis; /* 显示省略号 */
+        }
     }
 }
 

+ 4 - 0
src/views/component/personnelFile/components/modulesTag.vue

@@ -333,6 +333,9 @@ export default {
         ::v-deep .el-tabs--left .el-tabs__item.is-left{
             // text-align: left;
         }
+        ::v-deep .el-tabs__item{
+            padding: 0 20px 0 0 !important;
+        }
     }
     .tabsAll{
         height: 100%;
@@ -356,6 +359,7 @@ export default {
         .paddingInner{
             padding: 12px 0 0 0;
             height: 100%;
+            width: 100%;
         }
     }
 

+ 19 - 2
src/views/component/personnelFile/components/publicList.vue

@@ -34,7 +34,12 @@
                     :min-width="item.width"
                 >
                     <template slot-scope="scope">
-                        <span v-if="item.type==='text'">{{ scope.row.hasOwnProperty(item.field) > 0 ? scope.row[item.field]:'/' }}</span>
+                        <el-tooltip v-if="item.type==='text'" class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.hasOwnProperty(item.field) > 0 ? scope.row[item.field]:'/'" />
+                            </div>
+                            <p class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty(item.field) > 0 ? scope.row[item.field]:'/' }}</p>
+                        </el-tooltip>
                         <div v-else-if="item.type==='user'||item.type==='position'" class="grid-content bg-purple-light">
                             <ibps-user-selector
                                 v-model="scope.row[item.field]"
@@ -74,6 +79,7 @@
                             />
                         </div>
                         <div v-else>/</div>
+
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -154,7 +160,8 @@ export default {
                 scriptContent: '',
                 type: 'user',
                 userType: 'position'
-            }]
+            }],
+            isShowTooltip: true
         }
     },
     watch: {
@@ -186,6 +193,11 @@ export default {
         }, 2000)
     },
     methods: {
+        inputOnMouseOver (e) {
+            const { offsetWidth, scrollWidth } = e.target || {}
+            this.isShowTooltip = offsetWidth < scrollWidth
+            console.log(this.isShowTooltip)
+        },
         handleSelectionChange (val) {
             this.multipleSelection = val
         },
@@ -285,6 +297,11 @@ export default {
                 width: 100%;
             }
         }
+        .ellipsis {
+            white-space: nowrap; /* 确保文本不换行 */
+            overflow: hidden; /* 隐藏超出容器的文本 */
+            text-overflow: ellipsis; /* 显示省略号 */
+        }
     }
 }
 

+ 47 - 6
src/views/component/personnelFile/components/zsbTag.vue

@@ -36,7 +36,13 @@
                 >
                     <template slot-scope="scope">
                         <div v-if="judgeTag()">
-                            <div>{{ scope.row.hasOwnProperty("zhengShuMingC") > 0 ? scope.row.zhengShuMingC:'/' }}</div>
+                            <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                                <div slot="content" style="max-width:200px">
+                                    <div v-html="scope.row.zhengShuMingC" />
+                                </div>
+                                <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("zhengShuMingC") > 0 ? scope.row.zhengShuMingC:'/' }}</div>
+                            </el-tooltip>
+                            <!-- <div>{{ scope.row.hasOwnProperty("zhengShuMingC") > 0 ? scope.row.zhengShuMingC:'/' }}</div> -->
                         </div>
                         <div v-else class="grid-content">
                             <el-form-item :prop="'nowData.'+ (10*(currentPage-1) +scope.$index)+'.zhengShuMingC'" :rules="rules.school">
@@ -56,7 +62,13 @@
                 >
                     <template slot-scope="scope">
                         <div v-if="judgeTag()">
-                            <div>{{ scope.row.hasOwnProperty("zhengJianHao") > 0 ? scope.row.zhengJianHao:'/' }}</div>
+                            <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                                <div slot="content" style="max-width:200px">
+                                    <div v-html="scope.row.zhengJianHao" />
+                                </div>
+                                <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("zhengJianHao") > 0 ? scope.row.zhengJianHao:'/' }}</div>
+                            </el-tooltip>
+                            <!-- <div>{{ scope.row.hasOwnProperty("zhengJianHao") > 0 ? scope.row.zhengJianHao:'/' }}</div> -->
                         </div>
                         <div v-else class="grid-content">
                             <el-form-item :prop="'nowData.'+ (10*(currentPage-1) +scope.$index)+'.zhengJianHao'" :rules="rules.school">
@@ -76,7 +88,13 @@
                 >
                     <template slot-scope="scope">
                         <div v-if="judgeTag()">
-                            <div>{{ scope.row.hasOwnProperty("faZhengDanWei") > 0 ? scope.row.faZhengDanWei:'/' }}</div>
+                            <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                                <div slot="content" style="max-width:200px">
+                                    <div v-html="scope.row.faZhengDanWei" />
+                                </div>
+                                <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("faZhengDanWei") > 0 ? scope.row.faZhengDanWei:'/' }}</div>
+                            </el-tooltip>
+                            <!-- <div>{{ scope.row.hasOwnProperty("faZhengDanWei") > 0 ? scope.row.faZhengDanWei:'/' }}</div> -->
                         </div>
                         <div v-else class="grid-content">
                             <el-form-item :prop="'nowData.'+ (10*(currentPage-1) +scope.$index)+'.faZhengDanWei'" :rules="rules.optional">
@@ -96,7 +114,13 @@
                 >
                     <template slot-scope="scope">
                         <div v-if="judgeTag()">
-                            <div>{{ scope.row.hasOwnProperty("faZhengShiJian") > 0 ? scope.row.faZhengShiJian:'/' }}</div>
+                            <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                                <div slot="content" style="max-width:200px">
+                                    <div v-html="scope.row.faZhengShiJian" />
+                                </div>
+                                <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("faZhengShiJian") > 0 ? scope.row.faZhengShiJian:'/' }}</div>
+                            </el-tooltip>
+                            <!-- <div>{{ scope.row.hasOwnProperty("faZhengShiJian") > 0 ? scope.row.faZhengShiJian:'/' }}</div> -->
                         </div>
                         <div v-else class="grid-content">
                             <el-form-item :prop="'nowData.'+ (10*(currentPage-1) +scope.$index)+'.faZhengShiJian'" :rules="rules.bianzhiriqi">
@@ -118,7 +142,13 @@
                 >
                     <template slot-scope="scope">
                         <div v-if="judgeTag()">
-                            <div>{{ scope.row.hasOwnProperty("dangAnBaoCun") > 0 ? scope.row.dangAnBaoCun:'/' }}</div>
+                            <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                                <div slot="content" style="max-width:200px">
+                                    <div v-html="scope.row.dangAnBaoCun" />
+                                </div>
+                                <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("dangAnBaoCun") > 0 ? scope.row.dangAnBaoCun:'/' }}</div>
+                            </el-tooltip>
+                            <!-- <div>{{ scope.row.hasOwnProperty("dangAnBaoCun") > 0 ? scope.row.dangAnBaoCun:'/' }}</div> -->
                         </div>
                         <div v-else class="grid-content">
                             <el-form-item :prop="'nowData.'+ (10*(currentPage-1) +scope.$index)+'.dangAnBaoCun'" :rules="rules.school">
@@ -245,7 +275,8 @@ export default {
                 ]
             },
             multipleSelection: [],
-            currentPage: 1
+            currentPage: 1,
+            isShowTooltip: true
         }
     },
     watch: {
@@ -272,6 +303,11 @@ export default {
         }
     },
     methods: {
+        inputOnMouseOver (e) {
+            const { offsetWidth, scrollWidth } = e.target || {}
+            this.isShowTooltip = offsetWidth < scrollWidth
+            console.log(this.isShowTooltip)
+        },
         judgeTag () {
             // return this.planeData.length>0&& this.btnShow === true && this.buttonType!==1 ? true : false
             return !!(this.btnShow === true && this.buttonType !== 1 && this.buttonType !== 4)
@@ -397,6 +433,11 @@ export default {
                 width: 100%;
             }
         }
+        .ellipsis {
+            white-space: nowrap; /* 确保文本不换行 */
+            overflow: hidden; /* 隐藏超出容器的文本 */
+            text-overflow: ellipsis; /* 显示省略号 */
+        }
     }
 
 }

+ 47 - 6
src/views/component/personnelFile/components/zwlwglbTag.vue

@@ -30,7 +30,13 @@
                     min-width="15%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("lunWenTiMu") > 0 ? scope.row.lunWenTiMu:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.lunWenTiMu" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("lunWenTiMu") > 0 ? scope.row.lunWenTiMu:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("lunWenTiMu") > 0 ? scope.row.lunWenTiMu:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -38,7 +44,13 @@
                     min-width="15%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("qiKanMingCheng") > 0 ? scope.row.qiKanMingCheng:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.qiKanMingCheng" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("qiKanMingCheng") > 0 ? scope.row.qiKanMingCheng:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("qiKanMingCheng") > 0 ? scope.row.qiKanMingCheng:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -46,7 +58,13 @@
                     min-width="15%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("qiJuanHao") > 0 ? scope.row.qiJuanHao:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.qiJuanHao" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("qiJuanHao") > 0 ? scope.row.qiJuanHao:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("qiJuanHao") > 0 ? scope.row.qiJuanHao:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -54,7 +72,13 @@
                     min-width="15%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("faBiaoShiJian") > 0 ? scope.row.faBiaoShiJian:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.faBiaoShiJian" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("faBiaoShiJian") > 0 ? scope.row.faBiaoShiJian:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("faBiaoShiJian") > 0 ? scope.row.faBiaoShiJian:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -62,7 +86,13 @@
                     min-width="15%"
                 >
                     <template slot-scope="scope">
-                        {{ scope.row.hasOwnProperty("qiKanLeiBie") > 0 ? scope.row.qiKanLeiBie:'/' }}
+                        <el-tooltip class="item" effect="dark" placement="top" :disabled="!isShowTooltip">
+                            <div slot="content" style="max-width:200px">
+                                <div v-html="scope.row.qiKanLeiBie" />
+                            </div>
+                            <div class="ellipsis" @mouseover="inputOnMouseOver($event)">{{ scope.row.hasOwnProperty("qiKanLeiBie") > 0 ? scope.row.qiKanLeiBie:'/' }}</div>
+                        </el-tooltip>
+                        <!-- {{ scope.row.hasOwnProperty("qiKanLeiBie") > 0 ? scope.row.qiKanLeiBie:'/' }} -->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -143,7 +173,8 @@ export default {
             multipleSelection: [],
             currentPage: 1,
             dialogDetails: false,
-            dialogData: []
+            dialogData: [],
+            isShowTooltip: true
         }
     },
     watch: {
@@ -170,6 +201,11 @@ export default {
         }
     },
     methods: {
+        inputOnMouseOver (e) {
+            const { offsetWidth, scrollWidth } = e.target || {}
+            this.isShowTooltip = offsetWidth < scrollWidth
+            console.log(this.isShowTooltip)
+        },
         handleSelectionChange (val) {
             this.multipleSelection = val
         },
@@ -267,6 +303,11 @@ export default {
                 width: 100%;
             }
         }
+        .ellipsis {
+            white-space: nowrap; /* 确保文本不换行 */
+            overflow: hidden; /* 隐藏超出容器的文本 */
+            text-overflow: ellipsis; /* 显示省略号 */
+        }
     }
 }
 

+ 8 - 7
src/views/component/personnelFile/constants/simulated.js

@@ -431,7 +431,7 @@ export function correlationSql (type, val) {
     if (type === 'jyrykhjlb' || type === 'lhrynlqr' || type === 'lhrypxjlb' || type === 'lhpxsqb') {
         sql = `select * from t_${type} where FIND_IN_SET('${val}',${col[type]}) and shi_fou_guo_shen_ = '已完成' `
     } else if (type === 'kaoshijilu') {
-        sql = `select * from v_examination where FIND_IN_SET('${val}',${col[type]}) and examState = '已完成' ORDER BY createTime asc`
+        sql = `select * from v_examination where FIND_IN_SET('${val}',${col[type]}) and paperState = '已完成' ORDER BY createTime asc`
     }
     return sql
 }
@@ -459,24 +459,25 @@ export const correlationConfig = {
         config: [
             { label: '授权使用设备', width: '20%', type: 'dialog', field: 'shou_quan_shi_yon', dialogKey: 'sbwxdhk' },
             { label: '授权岗位', width: '16%', type: 'dialog', field: 'shou_quan_gang_we', dialogKey: 'gwzzdhkrysqy' },
-            { label: '直属上级', width: '10%', type: 'user', field: 'shen_he_ren_' },
+            { label: '审核人', width: '10%', type: 'user', field: 'shen_he_ren_' },
             { label: '检验专业', width: '10%', type: 'text', field: 'jian_yan_zhuan_ye' },
-            { label: '考核结果', width: '10%', type: 'text', field: 'kao_he_jie_guo_' },
+            { label: '能力评估结果', width: '10%', type: 'text', field: 'kao_he_jie_guo_' },
             { label: '附件', width: '12%', type: 'file', field: 'shang_chuan_fu_ji' },
             { label: '表单', width: '12%', type: 'file', field: 'kuai_zhao_' }
 
         ],
         dialog: [
-            [{ name: '授权使用设备', field: 'shou_quan_shi_yon', type: 'dialog', dialogKey: 'sbwxdhk' }, { name: '考核结果', field: 'kao_he_jie_guo_', type: 'text' }],
+            [{ name: '授权使用设备', field: 'shou_quan_shi_yon', type: 'dialog', dialogKey: 'sbwxdhk' }, { name: '能力评估结果', field: 'kao_he_jie_guo_', type: 'text' }],
             [{ name: '授权岗位', field: 'shou_quan_gang_we', type: 'dialog', dialogKey: 'gwzzdhkrysqy' }, { name: '考核日期', field: 'kao_he_shi_jian_', type: 'text' }],
-            [{ name: '直属上级', field: 'shen_he_ren_', type: 'user' }, { name: '检验专业', field: 'jian_yan_zhuan_ye', type: 'text' }],
+            [{ name: '审核人', field: 'shen_he_ren_', type: 'user' }, { name: '检验专业', field: 'jian_yan_zhuan_ye', type: 'text' }],
+            [{ name: '考核记录', field: 'xuan_ze_kao_he_ji', type: 'dialog', dialogKey: 'jyrykhdhkrysqy' }, { name: '是否合格', field: 'shi_fou_he_ge_', type: 'text' }],
             [{ name: '附件', field: 'shang_chuan_fu_ji', type: 'file' }],
             [{ name: '表单', field: 'kuai_zhao_', type: 'file' }]
         ]
     },
     lhrypxjlb: {
         config: [
-            { label: '培训名称', width: '15%', type: 'text', field: 'pei_xun_nei_rong_' },
+            { label: '培训主题', width: '15%', type: 'text', field: 'pei_xun_nei_rong_' },
             { label: '培训老师', width: '12%', type: 'text', field: 'pei_xun_lao_shi_' },
             { label: '培训时间', width: '12%', type: 'text', field: 'pei_xun_shi_jian_' },
             { label: '培训地点', width: '10%', type: 'text', field: 'pei_xun_di_dian_' },
@@ -486,7 +487,7 @@ export const correlationConfig = {
 
         ],
         dialog: [
-            [{ name: '培训名称', field: 'pei_xun_nei_rong_', type: 'text' }, { name: '培训目标', field: 'pei_xun_mu_di_', type: 'text' }],
+            [{ name: '培训主题', field: 'pei_xun_nei_rong_', type: 'text' }, { name: '培训目标', field: 'pei_xun_mu_di_', type: 'text' }],
             [{ name: '培训开始时间', field: 'pei_xun_shi_jian_', type: 'text' }, { name: '培训结束时间', field: 'pei_xun_jie_shu_s', type: 'text' }],
             [{ name: '培训老师', field: 'pei_xun_lao_shi_', type: 'text' }, { name: '培训地点', field: 'pei_xun_di_dian_', type: 'text' }],
             [{ name: '培训内容', field: 'pei_xun_xue_xi_ne', type: 'text' }],