Merge remote-tracking branch 'origin/master'

zhuzhuanzhuan

2024-03-01 84d12f2a9f883732219b273e697e23010af19c0f

 src/views/mdc/base/EquipmentOperationParamsAlarm.vue

@@ -6,7 +6,7 @@
        <a-row :gutter="24">
          <a-col :md="6" :sm="12">
            <a-form-item label="设备编号">
              <a-input placeholder="请输入设备编号" v-model="queryParam.equipmentid"></a-input>
              <j-input placeholder="请输入设备编号" v-model="queryParam.equipmentId"></j-input>
            </a-form-item>
          </a-col>

@@ -58,46 +58,57 @@
          {
            title: '设备编号',
            align: 'center',
            dataIndex: 'equipmentid',
            dataIndex: 'equipmentId',
            width: 250
          },
          {
            title: '报警时间',
            align: 'center',
            dataIndex: 'collecttime',
            dataIndex: 'createTime',
            width: 250
          },
          {
            title: '设定值',
            align: 'center',
            width: 250,
            dataIndex: 'setvalue'
            dataIndex: 'setValue'
          },
          {
            title: '实际值',
            align: 'center',
            width: 250,
            dataIndex: 'realvalue'
            dataIndex: 'realValue'
          },
          {
            title: '报警号',
            align: 'center',
            width: 250,
            dataIndex: 'alarmno'
          },
          // {
          //   title: '报警号',
          //   align: 'center',
          //   width: 250,
          //   dataIndex: 'alarmno'
          // },
          {
            title: '报警内容',
            align: 'center',
            width: 250,
            dataIndex: 'alarmcontent'
            dataIndex: 'alarmContent'
          }
        ],
        url: {
          list: '/mdc/equipmentBeilvAlarm/list'
          list: '/mdc/mdcOverrunAlarm/list'
        },
        ipagination:{
          current: 1,
          pageSize: 30,
          pageSizeOptions: ['30', '50', '100'],
          showTotal: (total, range) => {
            return range[0] + "-" + range[1] + " 共" + total + "条"
          },
          showQuickJumper: true,
          showSizeChanger: true,
          total: 0
        },
        /* 排序参数 */
        isorter: {
          column: 'collecttime',
          column: 'createTime',
          order: 'desc'
        }
      }