Merge branch 'master-v32-xwx' into 'master'

故障诊断基础资源诊断指标优化



See merge request !810

@@ -129,7 +129,7 @@ export default {
         }
         }
         //诊断指标
         //诊断指标
         const openKpiList = () => {
         const openKpiList = () => {
-            service.sendEventDiagnoseKpiList(props.parentEmit, faultNo,targetType);
+            service.sendEventDiagnoseKpiList(props.parentEmit, faultNo,targetType,resClass);
         }
         }
 
 
         //诊断项（正常、异常）
         //诊断项（正常、异常）

@@ -479,7 +479,7 @@ const faultEvent = () => {
      * @param targetType 诊断类型
      * @param targetType 诊断类型
      * @param columns 数组，表格列对象
      * @param columns 数组，表格列对象
      */
      */
-    const sendEventDiagnoseKpiList = (emit, faultNo, targetType) => {
+    const sendEventDiagnoseKpiList = (emit, faultNo, targetType,resClass) => {
 
 
         var obj = {
         var obj = {
             title: '诊断指标',
             title: '诊断指标',
@@ -507,7 +507,7 @@ const faultEvent = () => {
             data: '',
             data: '',
         }
         }
 
 
-        store.dispatch('getFaultKpiList', {faultNo: faultNo, targetType: targetType}).then((res) => {
+        store.dispatch('getFaultKpiList', {faultNo: faultNo, targetType: targetType,resClass:resClass}).then((res) => {
             if (res && res.success) {
             if (res && res.success) {
                 obj.data = res.data;
                 obj.data = res.data;
                 emit('openDialog', 'more', {}, obj);
                 emit('openDialog', 'more', {}, obj);