Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into …

…master-v32-lushangqing

@@ -72,15 +72,7 @@
                     <span>{{item.shortName}}</span>
                     <span>{{item.shortName}}</span>
                 </div>
                 </div>
                 <div class="text-overflow-line2 align-center" style="padding: 0px 25px;">
                 <div class="text-overflow-line2 align-center" style="padding: 0px 25px;">
-                    <!--<el-tooltip
-                            effect="light"
-                            placement="top-start">
-                        <template #content>
-                            {{item.taskName}}
-                        </template>
-                        {{item.taskName}}
-                    </el-tooltip>-->
-                    <el-tooltip :content="item.taskName" placement="bottom" effect="light" :disabled="item.isShowTooltip && item.isShowTooltip == true">
+                    <el-tooltip :content="item.taskName" placement="top" effect="light" :disabled="item.isShowTooltip == undefined || item.isShowTooltip == false">
                         <span class="member-label member-span text-hidden" @mouseenter="visibilityChange($event,item)"> {{item.taskName}}</span>
                         <span class="member-label member-span text-hidden" @mouseenter="visibilityChange($event,item)"> {{item.taskName}}</span>
                     </el-tooltip>
                     </el-tooltip>
                 </div>
                 </div>

@@ -51,7 +51,7 @@ export default {
             store.dispatch('getFaultList', params).then((res) => {
             store.dispatch('getFaultList', params).then((res) => {
                 if (res.data && res.success) {
                 if (res.data && res.success) {
                     dialTest.value = res.data[0];
                     dialTest.value = res.data[0];
-                    card.value = dialTest.value.faultFixInfoList;
+                    card.value = res.data[0].faultFixInfoList;
                 }
                 }
             }).catch(e => {
             }).catch(e => {
                 console.log(e);
                 console.log(e);
@@ -69,11 +69,10 @@ export default {
                         resItem.shortName = data[i][j].shortName;
                         resItem.shortName = data[i][j].shortName;
                         resItem.taskName = data[i][j].taskName;
                         resItem.taskName = data[i][j].taskName;
                         resItem.color = data[i][j].color;
                         resItem.color = data[i][j].color;
+                        cardData.value.push(resItem);
                     }
                     }
                 }
                 }
-                cardData.value.push(resItem);
             }
             }
-            console.log(cardData.value)
         }
         }
 
 
 
 
@@ -93,7 +92,7 @@ export default {
                     }
                     }
                 }
                 }
             }]
             }]
-            service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param);
+            service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param,'','诊断业务场景');
         }
         }
         const openKpiList = () => {
         const openKpiList = () => {
             service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase());
             service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase());
@@ -107,12 +106,11 @@ export default {
             service.sendEventNormalDialog(emit, proxy.$global, props.faultNo, props.targetType.toLocaleLowerCase(), '',type);
             service.sendEventNormalDialog(emit, proxy.$global, props.faultNo, props.targetType.toLocaleLowerCase(), '',type);
         }
         }
 
 
-        const visibilityChange = (e,item) => {
+        const visibilityChange = (e, item) => {
             const ev = e.target;
             const ev = e.target;
-            const ev_weight = ev.scrollWidth;
-            const content_weight = ev.target.offsetWidth;
-
-            if (ev_weight > content_weight) {
+            var height = $(ev).scroll().height()
+            // 超过2行
+            if (height > 33) {
                 // 实际宽度 > 可视宽度  文字溢出
                 // 实际宽度 > 可视宽度  文字溢出
                 item.isShowTooltip = true;
                 item.isShowTooltip = true;
             } else {
             } else {
@@ -120,7 +118,6 @@ export default {
                 item.isShowTooltip = false;
                 item.isShowTooltip = false;
             }
             }
         }
         }
-
         // 挂载完
         // 挂载完
         Vue.onMounted(() => {
         Vue.onMounted(() => {
             getDialtestList();
             getDialtestList();

@@ -208,7 +208,7 @@ const resListService = () => {
                 openLine(row);
                 openLine(row);
             },
             },
             render: function (row) {
             render: function (row) {
-                return `<span style="text-decoration: underline;color: blue;">${row.kpiValue}</span>`
+                return `<span style="text-decoration: underline;color: green;">${row.kpiValue}</span>`
             }
             }
         }, {
         }, {
             prop: "collTime",
             prop: "collTime",