Merge branch 'master-v32-lushangqing' into 'master'

【990】 【故障管理】npm的样式优化



See merge request !838

@@ -64,14 +64,13 @@
             </div>
         </div>
     </div>
-    <div v-if="cardOpen" style="margin-top:10px;background-color: whitesmoke;display: flex;justify-content: flex-start;flex-wrap: wrap;padding: 6px;max-height: 380px;overflow-y: auto;">
+    <div v-if="cardOpen" style="margin-top:10px;background-color: whitesmoke;display: flex;justify-content: flex-start;flex-wrap: wrap;padding: 6px;max-height: 380px;overflow-y: auto;overflow-x: hidden;">
         <div v-if="cardData.length == 0" class="align-center" style="flex: 1">
             <el-empty  :image-size="50" />
         </div>
         <div v-else  v-for="item in cardData" style="width: 25%;">
-            <div style="min-width: 340px;min-height: 184px;background: url('../src/style/img/fault/npm/npmCard.png') no-repeat;background-size: 100% 100%;padding-top: 20px;margin-bottom: 26px;box-sizing: border-box;">
-                <div class="text-overflow" style="width: 220px;margin-left: 40px;font-size: 16px">
-<!--                    {{item.streamName}}-->
+            <div style="min-height: 184px;background: url('../src/style/img/fault/npm/npmCard.png') no-repeat;background-size: 100% 100%;padding-top: 20px;margin-bottom: 26px;box-sizing: border-box;">
+                <div class="text-overflow" style="width: 220px;margin-left: 40px;font-size: 16px;padding-top:15px;">
                     <el-tooltip ref="tlp" :content="item.streamName" placement="bottom"  :disabled="item.isShowTooltip == undefined || item.isShowTooltip == false">
                         <span  @mouseenter="visibilityChange($event,item)"> {{item.streamName}}</span>
                     </el-tooltip>