yuhan hai 5 meses
pai
achega
05ffb47124

+ 4 - 4
src/views/module_interLock/InterlockSummary/InterlockSummaryList.vue

@@ -180,7 +180,7 @@
           {
             title:'仪表状态',
             align:"center",
-            dataIndex: 'instrumentStatus_dictText'
+            dataIndex: 'instrumentStatusName'
           },
           // {
           //   title:'系统id',
@@ -195,17 +195,17 @@
           {
             title:'控制系统状态',
             align:"center",
-            dataIndex: 'controlSystemStatus_dictText',
+            dataIndex: 'controlSystemStatusName',
           },
           {
             title:'旁路状态',
             align:"center",
-            dataIndex: 'bypass_dictText',
+            dataIndex: 'bypassName',
           },
           {
             title:'联锁状态',
             align:"center",
-            dataIndex: 'interlockStatus_dictText',
+            dataIndex: 'interlockStatusName',
             customRender:function (t,r,index) {
               return {children: t,attrs: {rowSpan:r.rowSpan2}};
             },

+ 3 - 3
src/views/module_interLock/interlockHistoryData/InterlockHistory/InterlockHistoryList.vue

@@ -191,7 +191,7 @@
           {
             title:'仪表状态',
             align:"center",
-            dataIndex: 'instrumentStatus_dictText'
+            dataIndex: 'instrumentStatusName'
           },
           // {
           //   title:'系统id',
@@ -206,7 +206,7 @@
           {
             title:'联锁状态',
             align:"center",
-            dataIndex: 'interlockStatus_dictText',
+            dataIndex: 'interlockStatusName',
             customRender:function (t,r,index) {
               return {children: t,attrs: {rowSpan:r.rowSpan2}};
             },
@@ -214,7 +214,7 @@
           {
             title:'控制系统状态',
             align:"center",
-            dataIndex: 'controlSystemStatus_dictText',
+            dataIndex: 'controlSystemStatusName',
           },
           {
             title:'回路健康级别',