Merge remote-tracking branch 'origin/master'

cuilei

7 天以前 83f051915bbe4562abfb5f1589642dd393ea8490

 src/views/andon/AndonOrderList.vue

@@ -149,7 +149,7 @@
          {
            title:'安灯人',
            align:"center",
            dataIndex: 'operator'
            dataIndex: 'operator_dictText'
          },
          {
            title:'安灯时间',
@@ -164,7 +164,7 @@
          {
            title:'响应人',
            align:"center",
            dataIndex: 'responder'
            dataIndex: 'responder_dictText'
          },
          {
            title:'响应时间',
@@ -174,7 +174,7 @@
          {
            title:'处理人',
            align:"center",
            dataIndex: 'processor'
            dataIndex: 'processor_dictText'
          },
          {
            title:'处理完成时间',