Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into dev...

qushaowei

2024-01-15 017886be8a6c07ccaaf6300b8c7652ddbd41d734

 src/views/mdc/base/AlarmManager.vue

@@ -171,7 +171,7 @@
      <a-table
        ref="table"
        size="middle"
        :scroll="{x:true}"
        :scroll="{x:'max-content',y:465}"
        bordered
        rowKey="id"
        :columns="columns"
@@ -258,20 +258,23 @@
            title: '报警号',
            align: "center",
            // sorter: true,
            dataIndex: 'alarmCode'
            dataIndex: 'alarmCode',
            width:400
          },
          {
            title: '报警内容',
            align: "center",
            // sorter: true,
            dataIndex: 'alarmContent'
            dataIndex: 'alarmContent',
            width:400
          },

          {
            title: '设备驱动类型',
            align: "center",
            // sorter: true,
            dataIndex: 'driveType'
            dataIndex: 'driveType',
            width:400
          },
          // {
          //   title: '是否过滤',
@@ -283,6 +286,7 @@
            dataIndex:'isUse_dictText',
            title: '是否过滤',
            align: "center",
            width:380
           // dictCode:'alarm_is_use'
          },
          {
@@ -290,7 +294,7 @@
            dataIndex: 'action',
            align: "center",
            fixed: "right",
            width: 147,
            width: 150,
            scopedSlots: { customRender: 'action' }
          }
        ],