集团户

dsk-operate-ui/src/views/detail/party-a/overview/component/infoheader.vue

@@ -101,11 +101,12 @@
                 <div class="flex-box" @click="linkTo(statistic.combineMember)">
                   <img src="@/assets/images/detail/overview/company_ssjt.png" alt="所属集团" title="所属集团" class="swiper-img">
                   <div class="swiper-item">
-                    <el-popover  trigger="hover" :content="'所属集团-'+statistic.combineMember.companyName">
+                    <el-popover v-if="statistic.combineMember.companyName.length>9" trigger="hover" :content="'所属集团-'+statistic.combineMember.companyName">
                       <span class="swiper-name" slot="reference">
                         所属集团-{{ statistic.combineMember.companyName }}
                       </span>
                     </el-popover>
+                    <span v-else class="swiper-name">所属集团-{{statistic.combineMember.companyName}}</span>
                     <div  >
                         <span >集团成员：</span><i class="num" >{{statistic.combineMember.memberNum}}</i>
                       </div>

dsk-operate-ui/src/views/enterpriseData/components/Group/index.vue

@@ -31,7 +31,7 @@
                 <div class="contetn_wrap">
                     <div class="wrap" id="anchorRef" @scroll="handleScroll">
                         <template  v-if="activeIndex==0">
-                            <div class="count">共{{ total }}条</div>
+                            <span class="count">共{{ total }}条</span><el-popover style="margin-left:8px;position: relative;top: 2px;color:#515a6e;" trigger="hover" content="央企集团数据包含国资委及财政部公示的央企名录。" placement="right"><i slot="reference" class="el-icon-warning-outline"></i></el-popover>
                             <div >
                                 <div  class="infinite-list-item" v-for="(item,index) in companData" @click="selCompany(item)" :key="index">
                                     <img v-if="item.logoUrl" :src="item.logoUrl" alt="" >