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

故障诊断性能曲线图



See merge request !824

@@ -29,7 +29,7 @@ const lineService = () => {
     let getLineData = (proxy, faultNo, targetType, resId, kpiId, flag) => {
     let getLineData = (proxy, faultNo, targetType, resId, kpiId, flag) => {
         let params = {
         let params = {
             faultNo: faultNo,
             faultNo: faultNo,
-            targetType: targetType,
+            targetType: targetType.toLocaleUpperCase(),
             resId: resId,
             resId: resId,
             kpiId: kpiId,
             kpiId: kpiId,
             flag: flag
             flag: flag
@@ -331,8 +331,6 @@ const faultEvent = () => {
                         prop: kpiId,
                         prop: kpiId,
                         label: kpiName + units
                         label: kpiName + units
                     }
                     }
-
-                    debugger
                     if(listItem.kpiIdent == 1){
                     if(listItem.kpiIdent == 1){
                         colObj['click'] =  (row) => {
                         colObj['click'] =  (row) => {
                             if (row) {
                             if (row) {
@@ -433,26 +431,12 @@ const faultEvent = () => {
                 prop: 'isAbnormal',
                 prop: 'isAbnormal',
                 width: 200,
                 width: 200,
                 label: '诊断结果',
                 label: '诊断结果',
-                click: (row) => {
-                    if (row && row.kpiIdent == 1) {
-                        sendEventLineDialog(emit, {
-                            faultNo: faultNo,
-                            targetType: targetType,
-                            resId: row.resId,
-                            kpiId: row.kpiId,
-                            flag: row.flag,
-                            resClass: ''
-                        })
-                    }
-
-                },
                 render: function (row) {
                 render: function (row) {
                     if (row) {
                     if (row) {
-                        var lineClass = row.kpiIdent == 1 ? 'text-decoration: underline;' : '';
                         if (row.isAbnormal != 1 && row.isAbnormal != null) {
                         if (row.isAbnormal != 1 && row.isAbnormal != null) {
-                            return `<span style="${lineClass}color:#00A522;">正常</span>`
+                            return `<span style="color:#00A522;">正常</span>`
                         } else {
                         } else {
-                            return `<span style="${lineClass}color: red ">异常</span>`
+                            return `<span style="color: red">异常</span>`
                         }
                         }
                     }
                     }
                     return '';
                     return '';